diff --git a/.github/workflows/ARM.yml b/.github/workflows/ARM.yml index e436c009e..baca6fc9e 100644 --- a/.github/workflows/ARM.yml +++ b/.github/workflows/ARM.yml @@ -14,12 +14,12 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v5 - name: Setup .NET - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v5 with: - dotnet-version: '6.0.x' + dotnet-version: '10.0.x' - name: Clean previous install run: | diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2a4a74f11..b528f5b1d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -42,12 +42,12 @@ jobs: mono-version: latest - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v5 - name: Setup .NET - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v5 with: - dotnet-version: '6.0.x' + dotnet-version: '10.0.100-preview.5.25277.114' - name: Set up Python ${{ matrix.python }} uses: actions/setup-python@v2 diff --git a/Directory.Build.props b/Directory.Build.props index e45c16f6a..6a0d6f901 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -4,7 +4,7 @@ Copyright (c) 2006-2022 The Contributors of the Python.NET Project pythonnet Python.NET - 10.0 + 12.0 false $([System.IO.File]::ReadAllText("$(MSBuildThisFileDirectory)version.txt").Trim()) $(FullVersion.Split('-', 2)[0]) @@ -12,13 +12,5 @@ - - all - runtime; build; native; contentfiles; analyzers - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/global.json b/global.json new file mode 100644 index 000000000..6d6eae917 --- /dev/null +++ b/global.json @@ -0,0 +1,6 @@ +{ + "sdk": { + "version": "10.0.100-preview.5.25277.114", + "rollForward": "disable" + } +} diff --git a/pipeline.yml b/pipeline.yml index 41dc819c5..551c837c2 100644 --- a/pipeline.yml +++ b/pipeline.yml @@ -39,8 +39,8 @@ deployment: - ./pythonnet/runtime/Python.Runtime.dll - type: customized - allow_branches: dynamo_py3 + allow_branches: testnet scripts: - - dotnet pack --no-build --configuration Release --version-suffix preview-%BUILD_DATE% --output "Release-Preview" + - dotnet pack --no-build --configuration Release --version-suffix test-%BUILD_DATE% --output "Release-Preview" - dotnet nuget push --source https://api.nuget.org/v3/index.json --api-key %API_KEY% "Release-Preview/**/*.nupkg" - dotnet nuget push --skip-duplicate --source https://api.nuget.org/v3/index.json --api-key %API_KEY% "Release-Preview/**/*.snupkg" diff --git a/src/embed_tests/Python.EmbeddingTest.csproj b/src/embed_tests/Python.EmbeddingTest.csproj index 4993994d3..ab5e4596e 100644 --- a/src/embed_tests/Python.EmbeddingTest.csproj +++ b/src/embed_tests/Python.EmbeddingTest.csproj @@ -1,7 +1,7 @@ - net472;net6.0 + net472;net10.0 ..\pythonnet.snk true diff --git a/src/module_tests/Python.ModuleTest.csproj b/src/module_tests/Python.ModuleTest.csproj index 7a8aa9ac3..50b05233c 100644 --- a/src/module_tests/Python.ModuleTest.csproj +++ b/src/module_tests/Python.ModuleTest.csproj @@ -1,7 +1,7 @@ - net472;net6.0 + net472;net10.0 ..\pythonnet.snk true