Skip to content

Commit 2f740ad

Browse files
committed
Merge in 'release/5.0' changes
2 parents c0b1287 + 55e7712 commit 2f740ad

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/libraries/System.Text.Encodings.Web/ref/System.Text.Encodings.Web.csproj

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461</TargetFrameworks>
44
<ExcludeCurrentNetCoreAppFromPackage>true</ExcludeCurrentNetCoreAppFromPackage>
55
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
6+
<AssemblyVersion Condition="!$(TargetFramework.StartsWith('net4'))">5.0.0.0</AssemblyVersion>
67
<!-- Only CLS-compliant members can be abstract -->
78
<NoWarn>$(NoWarn);CS3011</NoWarn>
89
<Nullable>enable</Nullable>
@@ -20,4 +21,4 @@
2021
<PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" />
2122
<PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
2223
</ItemGroup>
23-
</Project>
24+
</Project>

0 commit comments

Comments
 (0)