diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 644e6679c..b31b01580 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.visualstudio.slngen.tool": { - "version": "12.0.13", + "version": "12.0.32", "commands": [ "slngen" ] diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 89b26fb58..8cc03e477 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -65,7 +65,7 @@ jobs: # Build both Uno.UI/WinUI2/UWP and Uno.WinUI/WinUI3/WindowsAppSDK versions of our packages using a matrix build: needs: [Xaml-Style-Check] - runs-on: windows-2022 + runs-on: windows-2025-large # See https://docs.github.com/actions/using-jobs/using-a-matrix-for-your-jobs strategy: @@ -174,7 +174,7 @@ jobs: --skip vswinworkloads --skip vswin --verbose - + - name: Add msbuild to PATH uses: microsoft/setup-msbuild@v2 if: ${{ env.HAS_BUILDABLE_COMPONENTS == 'true' }} @@ -260,7 +260,7 @@ jobs: dotnet-dump analyze ${{ steps.filter.outputs.dump_files }} -c "clrstack" -c "pe -lines" -c "exit" package: - runs-on: windows-2022 + runs-on: windows-2025-large needs: [build] strategy: fail-fast: false # prevent one matrix pipeline from being cancelled if one fails, we want them all to run to completion. @@ -310,10 +310,6 @@ jobs: --skip vswin --verbose - - name: Install Windows SDKs - shell: pwsh - run: ./tooling/Install-WindowsSdk.ps1 - - name: Add msbuild to PATH uses: microsoft/setup-msbuild@v2 with: @@ -391,7 +387,7 @@ jobs: sign: needs: [package] if: ${{ startsWith(github.ref, 'refs/heads/rel/') || startsWith(github.ref, 'refs/tags/') }} - runs-on: windows-2022 + runs-on: windows-2025 permissions: id-token: write # Required for requesting the JWT diff --git a/global.json b/global.json index 338ca727d..5dc068767 100644 --- a/global.json +++ b/global.json @@ -1,10 +1,10 @@ -{ - "sdk": { - "version": "9.0.310", - "rollForward": "latestFeature" - }, - "msbuild-sdks": - { - "MSBuild.Sdk.Extras":"3.0.23" - } -} +{ + "sdk": { + "version": "10.0.401", + "rollForward": "latestFeature" + }, + "msbuild-sdks": + { + "MSBuild.Sdk.Extras":"3.0.23" + } +} diff --git a/tooling b/tooling index 5ebeaabec..0b619e9e9 160000 --- a/tooling +++ b/tooling @@ -1 +1 @@ -Subproject commit 5ebeaabeccc7a1d157ab40b784686a8758d15766 +Subproject commit 0b619e9e9f10222b5857dc3a0bedb3870ee901de