diff --git a/.github/actions/test-setup-dotnet/action.yml b/.github/actions/test-setup-dotnet/action.yml index 667b19cb..8de1e6ed 100644 --- a/.github/actions/test-setup-dotnet/action.yml +++ b/.github/actions/test-setup-dotnet/action.yml @@ -17,6 +17,8 @@ runs: steps: - name: Setup .NET Sdk uses: actions/setup-dotnet@v4 + with: + dotnet-version: '9.0.101' - name: Get .NET Channels uses: ./.github/actions/get-dotnet-channel diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml index 581dd327..e4cdfa47 100644 --- a/.github/workflows/test-build.yml +++ b/.github/workflows/test-build.yml @@ -48,11 +48,13 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 + with: + dotnet-version: '9.0.101' - name: Build run: | if [[ "${{inputs.build_configuration}}" == 'ReleaseRef' ]]; then - dotnet build -c ${{inputs.build_configuration}} Harmony/Harmony.csproj + dotnet build -c Release Lib.Harmony.Ref/Lib.Harmony.Ref.csproj else dotnet build -c ${{inputs.build_configuration}} Harmony.sln fi @@ -64,8 +66,8 @@ jobs: path: HarmonyTests/bin/**/* - name: Upload Harmony zip - if: ${{inputs.publish}} + if: ${{inputs.publish && inputs.build_configuration == 'Release'}} uses: actions/upload-artifact@v4 with: name: Harmony-${{inputs.build_configuration}}-${{inputs.os}} - path: Harmony/bin/*.zip + path: packages/*.zip diff --git a/.github/workflows/test-unix-mono.yml b/.github/workflows/test-unix-mono.yml index 296ca612..eb82a8b8 100644 --- a/.github/workflows/test-unix-mono.yml +++ b/.github/workflows/test-unix-mono.yml @@ -79,7 +79,7 @@ jobs: - name: Setup .NET SDK uses: actions/setup-dotnet@v4 with: - dotnet-version: '9.0.102' + dotnet-version: '9.0.101' env: DOTNET_INSTALL_DIR: ${{ runner.temp }}/.dotnet diff --git a/.github/workflows/test-windows-dotnet.yml b/.github/workflows/test-windows-dotnet.yml index 50081fe7..9b246626 100644 --- a/.github/workflows/test-windows-dotnet.yml +++ b/.github/workflows/test-windows-dotnet.yml @@ -46,7 +46,7 @@ env: jobs: unix-net: name: ${{ inputs.build_configuration }} - runs-on: windows-latest + runs-on: windows-2025 continue-on-error: ${{inputs.experimental}} timeout-minutes: 10 steps: diff --git a/.github/workflows/test-windows-framework.yml b/.github/workflows/test-windows-framework.yml index 6463e003..b2b7b91d 100644 --- a/.github/workflows/test-windows-framework.yml +++ b/.github/workflows/test-windows-framework.yml @@ -56,6 +56,8 @@ jobs: - name: Setup .NET Sdk uses: actions/setup-dotnet@v4 + with: + dotnet-version: '9.0.101' - name: Get Installed .NET Sdk Information run: dotnet --info diff --git a/.github/workflows/test-windows-mono.yml b/.github/workflows/test-windows-mono.yml index c067fda5..f91844ad 100644 --- a/.github/workflows/test-windows-mono.yml +++ b/.github/workflows/test-windows-mono.yml @@ -46,7 +46,7 @@ env: jobs: windows-mono: name: ${{ inputs.build_configuration }} - runs-on: windows-latest + runs-on: windows-2025 continue-on-error: ${{inputs.experimental}} timeout-minutes: 10 steps: @@ -56,6 +56,8 @@ jobs: - name: Setup .NET Sdk uses: actions/setup-dotnet@v4 + with: + dotnet-version: '9.0.101' - name: Get Installed .NET Sdk Information run: dotnet --info diff --git a/HarmonyTests/TestTools.cs b/HarmonyTests/TestTools.cs index 0b7f43fa..01216ddf 100644 --- a/HarmonyTests/TestTools.cs +++ b/HarmonyTests/TestTools.cs @@ -290,7 +290,7 @@ static void SkipExplicitTestIfVSTest() // Indirect ways to determine whether the adapter is used in various ways: // 1) process name starts with "testhost" (e.g. testhost.x86) // 2) process name starts with "vstest" (e.g. vstest.console) - var process = Process.GetCurrentProcess(); + using var process = Process.GetCurrentProcess(); if (process.ProcessName.StartsWith("testhost") || process.ProcessName.StartsWith("vstest")) throw GetExplicitException(test); // 3) process modules include a *VisualStudio* dll