From 89f99b0767171cc003fea1741851ca16c9a2425b Mon Sep 17 00:00:00 2001 From: Arlo Date: Fri, 19 Sep 2025 09:29:43 -0500 Subject: [PATCH 1/4] Install .NET 6 SDK to enable XAML Styler after removal from `windows-latest` Actions CI image. See also https://github.com/actions/runner-images/issues/12241 --- .github/workflows/build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8c646d8b..d6558439 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,6 +36,12 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: + # .NET 6 SDK is required for xamlstyler.console to run. + - name: Install .NET SDK v6 + uses: actions/setup-dotnet@v4 + with: + dotnet-version: 6.0.x + - name: Install .NET SDK v${{ env.DOTNET_VERSION }} uses: actions/setup-dotnet@v4 with: From 4aec5389e4e33277d395f562c97f84e9352bbd9b Mon Sep 17 00:00:00 2001 From: Arlo Date: Fri, 19 Sep 2025 10:23:31 -0500 Subject: [PATCH 2/4] Update runner to windows-latest-large for build and package jobs to fix "out of disk space" errors --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d6558439..f8e513b2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -63,7 +63,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-latest + runs-on: windows-latest-large # See https://docs.github.com/actions/using-jobs/using-a-matrix-for-your-jobs strategy: @@ -208,7 +208,7 @@ jobs: dotnet-dump analyze ${{ steps.detect-dump.outputs.DUMP_FILE }} -c "clrstack" -c "pe -lines" -c "exit" package: - runs-on: windows-latest + runs-on: windows-latest-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. From e01b267bf4359479c450c57764df5c1d51270df9 Mon Sep 17 00:00:00 2001 From: Arlo Date: Thu, 25 Sep 2025 16:37:07 -0500 Subject: [PATCH 3/4] Update xamlstyler.console to 3.2501.8 and remove .NET 6 workarounds - Bump xamlstyler.console from 3.2206.4 to 3.2501.8 in both root and tooling - Remove .NET 6 SDK installation step from build workflow - Fixes .NET 6 compatibility issues --- .config/dotnet-tools.json | 2 +- .github/workflows/build.yml | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 27179029..def10bf6 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -9,7 +9,7 @@ ] }, "xamlstyler.console": { - "version": "3.2206.4", + "version": "3.2501.8", "commands": [ "xstyler" ] diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f8e513b2..7fc32396 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,12 +36,6 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: - # .NET 6 SDK is required for xamlstyler.console to run. - - name: Install .NET SDK v6 - uses: actions/setup-dotnet@v4 - with: - dotnet-version: 6.0.x - - name: Install .NET SDK v${{ env.DOTNET_VERSION }} uses: actions/setup-dotnet@v4 with: From 17102b85770d5ba9afd1351a87e2715c9f4194fc Mon Sep 17 00:00:00 2001 From: Arlo Date: Thu, 25 Sep 2025 17:37:11 -0500 Subject: [PATCH 4/4] Bump tooling to latest main --- tooling | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling b/tooling index b9200002..e7eb2362 160000 --- a/tooling +++ b/tooling @@ -1 +1 @@ -Subproject commit b9200002f4c6f4c479785bf014f928a4506b79a9 +Subproject commit e7eb23621735ea8d4a3191ac399848acc918f1ec