Skip to content

Commit 9da6058

Browse files
author
Rafal Maciag
committed
Add .NET 10 support
- Added NET10_0 preprocessor condition to AssemblyLoadContext.cs - Updated nng.NET.Shared.csproj to target both net9.0 and net10.0 - Updated nng.NET.csproj to target both net9.0 and net10.0
1 parent add855b commit 9da6058

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

nng.NET.Shared/AssemblyLoadContext.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,19 +46,21 @@ protected override Assembly Load(AssemblyName assemblyName)
4646
if (assemblyName.Name == managedAssemblyName)
4747
{
4848
// Try framework-specific managed assembly path
49-
var path = Path.Combine(assemblyPath, "runtimes", "any", "lib",
49+
var path = Path.Combine(assemblyPath, "runtimes", "any", "lib",
5050
#if NETSTANDARD1_5
5151
"netstandard1.5"
5252
#elif NETSTANDARD2_0
5353
"netstandard2.0"
5454
#elif NETSTANDARD2_1
55-
"netstandard2.1"
55+
"netstandard2.1"
5656
#elif NET5_0
5757
"net5.0"
5858
#elif NET6_0
59-
"net6.0"
59+
"net6.0"
6060
#elif NET9_0
61-
"net9.0"
61+
"net9.0"
62+
#elif NET10_0
63+
"net10.0"
6264
#else
6365
#error "Unsupported framework?"
6466
#endif

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<PropertyGroup>
66
<!-- To enable code coverage -->
77
<DebugType>full</DebugType>
8-
<TargetFrameworks>net9.0;</TargetFrameworks>
8+
<TargetFrameworks>net9.0;net10.0</TargetFrameworks>
99
</PropertyGroup>
1010

1111
<PropertyGroup>

nng.NET/nng.NET.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
Assemblies for targetted frameworks are in runtimes/ instead of lib/ or ref/
1111
See: https://docs.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu5128#scenario-2
1212
-->
13-
<TargetFrameworks>net9.0;</TargetFrameworks>
13+
<TargetFrameworks>net9.0;net10.0</TargetFrameworks>
1414
</PropertyGroup>
1515

1616
<ItemGroup>

0 commit comments

Comments
 (0)