Merge in 'release/5.0' changes

dotnet · Mar 16, 2021 · 2f740ad · 2f740ad
2 parents c0b1287 + 55e7712
commit 2f740ad
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/libraries/System.Text.Encodings.Web/ref/System.Text.Encodings.Web.csproj b/src/libraries/System.Text.Encodings.Web/ref/System.Text.Encodings.Web.csproj
@@ -3,6 +3,7 @@
     <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461</TargetFrameworks>
     <ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <AssemblyVersion Condition="!$(TargetFramework.StartsWith('net4'))">5.0.0.0</AssemblyVersion>
     <!-- Only CLS-compliant members can be abstract -->
     <NoWarn>$(NoWarn);CS3011</NoWarn>
     <Nullable>enable</Nullable>
@@ -20,4 +21,4 @@
     <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" />
     <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
   </ItemGroup>
-</Project>
+</Project>