Skip to content

Commit 73f01f4

Browse files
committed
.NET Standard 2.1
1 parent 49d121b commit 73f01f4

File tree

5 files changed

+8
-9
lines changed

5 files changed

+8
-9
lines changed

common.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard1.5;netstandard2.0;net6.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.1;net6.0</TargetFrameworks>
55
<RootNamespace>nng</RootNamespace>
66
<MSBuildTreatWarningsAsErrors>true</MSBuildTreatWarningsAsErrors>
77
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -16,7 +16,7 @@
1616
</PropertyGroup>
1717

1818
<PropertyGroup>
19-
<VersionPrefix>1.4.4</VersionPrefix>
19+
<VersionPrefix>1.4.5</VersionPrefix>
2020
<VersionSuffix></VersionSuffix>
2121
<Authors>Jeikabu, James Freiwirth</Authors>
2222
<PackageLicenseExpression>MIT</PackageLicenseExpression>

nng.NET.Shared/AssemblyLoadContext.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ protected override Assembly Load(AssemblyName assemblyName)
5151
"netstandard1.5"
5252
#elif NETSTANDARD2_0
5353
"netstandard2.0"
54+
#elif NETSTANDARD2_1
55+
"netstandard2.1"
5456
#elif NET5_0
5557
"net5.0"
5658
#elif NET6_0

nng.NET.Shared/nng.NET.Shared.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<OutputPath>..\packer\bin\$(Configuration)\lib\</OutputPath>
77
<!-- To enable code coverage -->
88
<DebugType>full</DebugType>
9+
<TargetFrameworks>net6.0;netstandard2.1</TargetFrameworks>
910
</PropertyGroup>
1011

1112
<PropertyGroup>
@@ -14,8 +15,6 @@
1415
</PropertyGroup>
1516

1617
<ItemGroup>
17-
<PackageReference Include="system.memory" Version="4.5.4" />
18-
<PackageReference Include="system.valuetuple" Version="4.5.0" />
1918
<PackageReference Include="system.runtime.loader" Version="4.3.0" />
2019
</ItemGroup>
2120

nng.NET/nng.NET.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
See: https://docs.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu5128#scenario-2
1616
-->
1717
<NoWarn>$(NoWarn);NU5128</NoWarn>
18+
<TargetFrameworks>net6.0;netstandard2.1</TargetFrameworks>
1819
</PropertyGroup>
1920

2021
<ItemGroup>

tests/tests.csproj

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@
44
<Import Project="..\nng.NET\build\nng.NET.targets" />
55

66
<PropertyGroup>
7-
<TargetFramework>net6.0</TargetFramework>
87

98
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
109
<IsPackable>false</IsPackable>
1110
<RootNamespace>nng.Tests</RootNamespace>
1211
<LangVersion>8.0</LangVersion>
12+
<TargetFrameworks>net6.0;netstandard2.1</TargetFrameworks>
13+
<OutputType>Library</OutputType>
1314
</PropertyGroup>
1415

1516
<ItemGroup>
@@ -19,10 +20,6 @@
1920
</PackageReference>
2021
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
2122
<PackageReference Include="xunit" Version="2.5.0" />
22-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
23-
<PrivateAssets>all</PrivateAssets>
24-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
25-
</PackageReference>
2623
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
2724
</ItemGroup>
2825
<ItemGroup>

0 commit comments

Comments
 (0)