diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 18e2f357b..81ff65cb0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ on: merge_group: env: - DOTNET_VERSION: '9.0.310' # Only used by jobs that cannot access global.json (no checkout/artifact-only jobs) + DOTNET_VERSION: '10.0.402' # Only used by jobs that cannot access global.json (no checkout/artifact-only jobs) ENABLE_DIAGNOSTICS: true #COREHOST_TRACE: 1 @@ -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: @@ -103,6 +103,11 @@ jobs: exit 1 } + - name: Enable Windows long paths + shell: pwsh + run: | + Set-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\FileSystem' -Name LongPathsEnabled -Value 1 -ErrorAction Stop + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - name: Checkout Repository uses: actions/checkout@v4 @@ -174,12 +179,13 @@ jobs: --skip vswinworkloads --skip vswin --verbose - + - name: Add msbuild to PATH uses: microsoft/setup-msbuild@v2 if: ${{ env.HAS_BUILDABLE_COMPONENTS == 'true' }} with: vs-version: '[17.9,)' + msbuild-architecture: x64 # Generate full solution with all projects (sample gallery heads, components, tests) - name: Generate solution with ${{ matrix.multitarget }} gallery, components and tests @@ -249,7 +255,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. @@ -260,6 +266,11 @@ jobs: VERSION_PROPERTY: ${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/rel/') || startsWith(github.ref, 'refs/tags/release/')) && format('build.{0}', github.run_number) || format('pull-{0}.{1}', github.event.number, github.run_number) }} steps: + - name: Enable Windows long paths + shell: pwsh + run: | + Set-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\FileSystem' -Name LongPathsEnabled -Value 1 -ErrorAction Stop + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - name: Checkout Repository uses: actions/checkout@v4 @@ -299,14 +310,11 @@ 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: vs-version: '[17.9,)' + msbuild-architecture: x64 - name: Determine scheduled release commit range if: ${{ startsWith(github.ref, 'refs/tags/') }} @@ -380,7 +388,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/Directory.Build.targets b/Directory.Build.targets index 77e29d5d4..730da9b8c 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -5,7 +5,6 @@ - diff --git a/components/AppServices/src/CommunityToolkit.AppServices.csproj b/components/AppServices/src/CommunityToolkit.AppServices.csproj index b30639268..94f9a1b11 100644 --- a/components/AppServices/src/CommunityToolkit.AppServices.csproj +++ b/components/AppServices/src/CommunityToolkit.AppServices.csproj @@ -18,6 +18,11 @@ + + + sdk + + diff --git a/components/DependencyPropertyGenerator/src/CommunityToolkit.WinUI.DependencyPropertyGenerator.csproj b/components/DependencyPropertyGenerator/src/CommunityToolkit.WinUI.DependencyPropertyGenerator.csproj index de4d74d91..fab91268f 100644 --- a/components/DependencyPropertyGenerator/src/CommunityToolkit.WinUI.DependencyPropertyGenerator.csproj +++ b/components/DependencyPropertyGenerator/src/CommunityToolkit.WinUI.DependencyPropertyGenerator.csproj @@ -24,6 +24,11 @@ + + + sdk + + diff --git a/components/Notifications/src/CommunityToolkit.Notifications.csproj b/components/Notifications/src/CommunityToolkit.Notifications.csproj index 208bb3c6e..e9ecb2cc0 100644 --- a/components/Notifications/src/CommunityToolkit.Notifications.csproj +++ b/components/Notifications/src/CommunityToolkit.Notifications.csproj @@ -24,4 +24,9 @@ + + + + sdk + diff --git a/global.json b/global.json index 338ca727d..37457398e 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.402", + "rollForward": "latestFeature" + }, + "msbuild-sdks": + { + "MSBuild.Sdk.Extras":"3.0.23" + } +} diff --git a/tooling b/tooling index 5ebeaabec..f02adf9e2 160000 --- a/tooling +++ b/tooling @@ -1 +1 @@ -Subproject commit 5ebeaabeccc7a1d157ab40b784686a8758d15766 +Subproject commit f02adf9e2d1ec1fd4865116bc786e217298985af