From d37f6884a6376e16ad553b36cb40a4c60ec1e647 Mon Sep 17 00:00:00 2001 From: Arlo Date: Thu, 25 Sep 2025 16:36:32 -0500 Subject: [PATCH 1/2] 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 ------ tooling | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 271790294..def10bf66 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 520aa7dca..2643283c7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,12 +34,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: diff --git a/tooling b/tooling index 786cf7bea..5a5611479 160000 --- a/tooling +++ b/tooling @@ -1 +1 @@ -Subproject commit 786cf7bea168a37dbdeea2cf9acabf9d1cd35793 +Subproject commit 5a5611479772f108799f14e9760d532fe755d00f From 388331a231d0e8a420ee02050be465f7231b38ba Mon Sep 17 00:00:00 2001 From: Arlo Date: Thu, 25 Sep 2025 17:37:22 -0500 Subject: [PATCH 2/2] Bump tooling to latest main --- tooling | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling b/tooling index 5a5611479..e7eb23621 160000 --- a/tooling +++ b/tooling @@ -1 +1 @@ -Subproject commit 5a5611479772f108799f14e9760d532fe755d00f +Subproject commit e7eb23621735ea8d4a3191ac399848acc918f1ec