From 03ba66fc97a7ba2d7785d123dd3bc868d9d7a173 Mon Sep 17 00:00:00 2001
From: Davide Giacometti <davide.giacometti@outlook.it>
Date: Sat, 22 Feb 2025 12:27:00 +0100
Subject: [PATCH 1/4] Bump XamlStyler and remove .NET6 CI dep

---
 .config/dotnet-tools.json                     | 2 +-
 .pipelines/v2/templates/job-build-project.yml | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 00e1290bb124..9579a557df3c 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -9,7 +9,7 @@
             ]
         },
         "xamlstyler.console": {
-            "version": "3.2404.2",
+            "version": "3.2501.8",
             "commands": [
               "xstyler"
             ]
diff --git a/.pipelines/v2/templates/job-build-project.yml b/.pipelines/v2/templates/job-build-project.yml
index f55d9f71a9fc..481534b6874f 100644
--- a/.pipelines/v2/templates/job-build-project.yml
+++ b/.pipelines/v2/templates/job-build-project.yml
@@ -142,11 +142,6 @@ jobs:
         Write-Host "##vso[task.setvariable variable=MSBuildCacheParameters]$MSBuildCacheParameters"
       displayName: Prepare MSBuildCache variables
 
-  - template: steps-ensure-dotnet-version.yml
-    parameters:
-      sdk: true
-      version: '6.0'
-
   - template: steps-ensure-dotnet-version.yml
     parameters:
       sdk: true

From 3039a1d67901d7f9033d82da44ae15188687e449 Mon Sep 17 00:00:00 2001
From: Davide Giacometti <davide.giacometti@outlook.it>
Date: Sat, 22 Feb 2025 12:28:26 +0100
Subject: [PATCH 2/4] XamlStyler failure test

---
 src/modules/colorPicker/ColorPickerUI/ColorEditorWindow.xaml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/modules/colorPicker/ColorPickerUI/ColorEditorWindow.xaml b/src/modules/colorPicker/ColorPickerUI/ColorEditorWindow.xaml
index e8ec0a0a7a56..238e9969d577 100644
--- a/src/modules/colorPicker/ColorPickerUI/ColorEditorWindow.xaml
+++ b/src/modules/colorPicker/ColorPickerUI/ColorEditorWindow.xaml
@@ -39,9 +39,6 @@
                 <ui:ImageIcon Source="pack://application:,,,/Assets/ColorPicker/icon.ico" />
             </ui:TitleBar.Icon>
         </ui:TitleBar>
-        <ContentPresenter
-            x:Name="contentPresenter"
-            Grid.Row="1"
-            Content="{Binding Content}" />
+        <ContentPresenter x:Name="contentPresenter" Grid.Row="1" Content="{Binding Content}" />
     </Grid>
 </ui:FluentWindow>

From 9bc32628b7ff96ddb47ed956c34237c0e6b86120 Mon Sep 17 00:00:00 2001
From: Davide Giacometti <davide.giacometti@outlook.it>
Date: Sat, 22 Feb 2025 12:38:43 +0100
Subject: [PATCH 3/4] fix xaml formatting

---
 src/modules/colorPicker/ColorPickerUI/ColorEditorWindow.xaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/modules/colorPicker/ColorPickerUI/ColorEditorWindow.xaml b/src/modules/colorPicker/ColorPickerUI/ColorEditorWindow.xaml
index 238e9969d577..e8ec0a0a7a56 100644
--- a/src/modules/colorPicker/ColorPickerUI/ColorEditorWindow.xaml
+++ b/src/modules/colorPicker/ColorPickerUI/ColorEditorWindow.xaml
@@ -39,6 +39,9 @@
                 <ui:ImageIcon Source="pack://application:,,,/Assets/ColorPicker/icon.ico" />
             </ui:TitleBar.Icon>
         </ui:TitleBar>
-        <ContentPresenter x:Name="contentPresenter" Grid.Row="1" Content="{Binding Content}" />
+        <ContentPresenter
+            x:Name="contentPresenter"
+            Grid.Row="1"
+            Content="{Binding Content}" />
     </Grid>
 </ui:FluentWindow>

From cddfada26700d21a03b39419f8bee43d33c95155 Mon Sep 17 00:00:00 2001
From: Davide Giacometti <davide.giacometti@outlook.it>
Date: Sat, 22 Feb 2025 12:58:37 +0100
Subject: [PATCH 4/4] Bump dotnet-consolidate

---
 .config/dotnet-tools.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 9579a557df3c..f1e36c981f69 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
     "isRoot": true,
     "tools": {
         "dotnet-consolidate": {
-            "version": "2.0.0",
+            "version": "4.2.0",
             "commands": [
                 "dotnet-consolidate"
             ]