Visitar URL original
Merge pull request #2684 from losttech/net10 · pythonnet/pythonnet@1b43410 · GitHub
Skip to content

Commit 1b43410

Browse files
lostmsulostmsu
authored
Merge pull request #2684 from losttech/net10
Switch to .NET SDK 10
1 parent da7fc0c commit 1b43410

5 files changed

Lines changed: 10 additions & 5 deletions

File tree

‎.github/workflows/main.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
- name: Setup .NET
5454
uses: actions/setup-dotnet@v5
5555
with:
56-
dotnet-version: '8.0.x'
56+
dotnet-version: '10.0.x'
5757

5858
- name: Set up Python ${{ matrix.python }}
5959
uses: astral-sh/setup-uv@v7
@@ -77,7 +77,7 @@ jobs:
7777
MONO_THREADS_SUSPEND: preemptive # https://github.com/mono/mono/issues/21466
7878

7979
- name: Embedding tests (.NET Core)
80-
run: dotnet test --runtime any-${{ matrix.os.platform }} --framework net8.0 --logger "console;verbosity=detailed" src/embed_tests/
80+
run: dotnet test --runtime any-${{ matrix.os.platform }} --framework net10.0 --logger "console;verbosity=detailed" src/embed_tests/
8181
if: always()
8282

8383
- name: Python Tests (Mono)

‎src/embed_tests/Python.EmbeddingTest.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net472;net8.0</TargetFrameworks>
4+
<TargetFrameworks>net472;net10.0</TargetFrameworks>
55
<AssemblyOriginatorKeyFile>..\pythonnet.snk</AssemblyOriginatorKeyFile>
66
<SignAssembly>true</SignAssembly>
77
</PropertyGroup>

‎src/python_tests_runner/Python.PythonTestsRunner.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net472;net8.0</TargetFrameworks>
4+
<TargetFrameworks>net472;net10.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>

‎src/runtime/AssemblyManager.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,11 @@ private static void AssemblyLoadHandler(object ob, AssemblyLoadEventArgs args)
123123

124124
internal static AssemblyName? TryParseAssemblyName(string name)
125125
{
126+
// workaround for https://github.com/dotnet/runtime/issues/123951
127+
if (name.IndexOfAny(new[] { Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar }) >= 0)
128+
{
129+
return null;
130+
}
126131
try
127132
{
128133
return new AssemblyName(name);

‎src/testing/Python.Test.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
3+
<TargetFrameworks>netstandard2.0;net10.0</TargetFrameworks>
44
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
55
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
66
<AssemblyOriginatorKeyFile>..\pythonnet.snk</AssemblyOriginatorKeyFile>

0 commit comments

Comments
 (0)