From de00e1d87c35dd7c3568ea004d6e5eec95bb8129 Mon Sep 17 00:00:00 2001
From: Seraphima Zykova <zykovas91@gmail.com>
Date: Thu, 5 Sep 2024 20:50:17 +0300
Subject: [PATCH 01/12] [Workspaces]Discord and Steam fixes - follow up
 (#34640)

---
 .../Workspaces/WorkspacesSnapshotTool/SnapshotUtils.cpp       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/modules/Workspaces/WorkspacesSnapshotTool/SnapshotUtils.cpp b/src/modules/Workspaces/WorkspacesSnapshotTool/SnapshotUtils.cpp
index 6140cc37480..54f603dbc89 100644
--- a/src/modules/Workspaces/WorkspacesSnapshotTool/SnapshotUtils.cpp
+++ b/src/modules/Workspaces/WorkspacesSnapshotTool/SnapshotUtils.cpp
@@ -281,6 +281,8 @@ namespace SnapshotUtils
                         Logger::info(L"Installed parent app not found: {}", processPath);
                         continue;
                     }
+
+                    processPath = parentProcessPath;
                 }
                 else
                 {
@@ -292,7 +294,7 @@ namespace SnapshotUtils
             WorkspacesData::WorkspacesProject::Application app{
                 .name = data.value().name,
                 .title = title,
-                .path = data.value().installPath,
+                .path = processPath,
                 .packageFullName = data.value().packageFullName,
                 .appUserModelId = data.value().appUserModelId,
                 .commandLineArgs = L"", // GetCommandLineArgs(pid, wbemHelper),

From 9591d75d4fd9c1e7db1187bdb4eab4948f23505b Mon Sep 17 00:00:00 2001
From: Laszlo Nemeth <57342539+donlaci@users.noreply.github.com>
Date: Thu, 5 Sep 2024 20:26:46 +0200
Subject: [PATCH 02/12] [Workspaces]Fix button borders (#34553)

* [Workspaces] fix button borders

* xaml formatting

* Fix Border brush invisible on Dark theme

---------

Co-authored-by: Stefan Markovic <stefan@janeasystems.com>
Co-authored-by: Jaime Bernardo <jaime@janeasystems.com>
---
 src/modules/Workspaces/WorkspacesEditor/MainPage.xaml     | 3 ++-
 .../Workspaces/WorkspacesEditor/WorkspacesEditorPage.xaml | 8 ++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/modules/Workspaces/WorkspacesEditor/MainPage.xaml b/src/modules/Workspaces/WorkspacesEditor/MainPage.xaml
index 8ea28b9edfc..aa2ec3f6d18 100644
--- a/src/modules/Workspaces/WorkspacesEditor/MainPage.xaml
+++ b/src/modules/Workspaces/WorkspacesEditor/MainPage.xaml
@@ -150,6 +150,7 @@
                 Width="140"
                 Background="{DynamicResource SecondaryBackgroundBrush}"
                 BorderBrush="{DynamicResource PrimaryBorderBrush}"
+                BorderThickness="2"
                 SelectedIndex="{Binding OrderByIndex, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
                 <ComboBoxItem Content="{x:Static props:Resources.LastLaunched}" />
                 <ComboBoxItem Content="{x:Static props:Resources.Created}" />
@@ -307,7 +308,7 @@
                                             AutomationProperties.Name="{x:Static props:Resources.Launch}"
                                             Background="{DynamicResource TertiaryBackgroundBrush}"
                                             BorderBrush="{DynamicResource SecondaryBorderBrush}"
-                                            BorderThickness="1"
+                                            BorderThickness="2"
                                             Click="LaunchButton_Click"
                                             Content="{x:Static props:Resources.Launch}" />
                                     </StackPanel>
diff --git a/src/modules/Workspaces/WorkspacesEditor/WorkspacesEditorPage.xaml b/src/modules/Workspaces/WorkspacesEditor/WorkspacesEditorPage.xaml
index a9f352b29e0..bb8c373f507 100644
--- a/src/modules/Workspaces/WorkspacesEditor/WorkspacesEditorPage.xaml
+++ b/src/modules/Workspaces/WorkspacesEditor/WorkspacesEditorPage.xaml
@@ -109,6 +109,8 @@
                                     Padding="24,6"
                                     AutomationProperties.Name="{x:Static props:Resources.Delete}"
                                     Background="{DynamicResource TertiaryBackgroundBrush}"
+                                    BorderBrush="{DynamicResource SecondaryBorderBrush}"
+                                    BorderThickness="2"
                                     Click="DeleteButtonClicked"
                                     Content="{Binding DeleteButtonContent, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
                                     IsEnabled="True" />
@@ -338,6 +340,8 @@
                     HorizontalAlignment="Right"
                     AutomationProperties.Name="{x:Static props:Resources.Revert}"
                     Background="{DynamicResource SecondaryBackgroundBrush}"
+                    BorderBrush="{DynamicResource PrimaryBorderBrush}"
+                    BorderThickness="2"
                     Click="RevertButtonClicked"
                     Content="{x:Static props:Resources.Revert}"
                     DockPanel.Dock="Right"
@@ -350,6 +354,8 @@
                     HorizontalAlignment="Right"
                     AutomationProperties.Name="{x:Static props:Resources.LaunchEdit}"
                     Background="{DynamicResource SecondaryBackgroundBrush}"
+                    BorderBrush="{DynamicResource PrimaryBorderBrush}"
+                    BorderThickness="2"
                     Click="LaunchEditButtonClicked"
                     Content="{x:Static props:Resources.LaunchEdit}"
                     DockPanel.Dock="Right" />
@@ -402,6 +408,8 @@
                     Padding="24,0,24,0"
                     AutomationProperties.Name="{x:Static props:Resources.Cancel}"
                     Background="{DynamicResource SecondaryBackgroundBrush}"
+                    BorderBrush="{DynamicResource PrimaryBorderBrush}"
+                    BorderThickness="2"
                     Click="CancelButtonClicked"
                     Content="{x:Static props:Resources.Cancel}" />
                 <Button

From 749aa418a3cb31d71357520d4e84227b45c400b2 Mon Sep 17 00:00:00 2001
From: Ethan Fang <117125208+ethanfangg@users.noreply.github.com>
Date: Tue, 10 Sep 2024 10:44:19 -0700
Subject: [PATCH 03/12] Update README.md to include 0.84.1 hashes (#34753)

* Update README.md to include 0.84.1 hashes

* Update README.md

correcting download links

---------

Co-authored-by: Clint Rutkas <clint@rutkas.com>
---
 README.md | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index ec4fb1ed89d..7bdc0becf09 100644
--- a/README.md
+++ b/README.md
@@ -43,17 +43,17 @@ Go to the [Microsoft PowerToys GitHub releases page][github-release-link] and cl
 <!-- items that need to be updated release to release -->
 [github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.85%22
 [github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.84%22
-[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.84.0/PowerToysUserSetup-0.84.0-x64.exe
-[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.84.0/PowerToysUserSetup-0.84.0-arm64.exe
-[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.84.0/PowerToysSetup-0.84.0-x64.exe
-[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.84.0/PowerToysSetup-0.84.0-arm64.exe
+[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.84.1/PowerToysUserSetup-0.84.1-x64.exe
+[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.84.1/PowerToysUserSetup-0.84.1-arm64.exe
+[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.84.1/PowerToysSetup-0.84.1-x64.exe
+[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.84.1/PowerToysSetup-0.84.1-arm64.exe
  
 |  Description   | Filename | sha256 hash |
 |----------------|----------|-------------|
-| Per user - x64       | [PowerToysUserSetup-0.84.0-x64.exe][ptUserX64] | 6792180D697ED9FDF9AA7B3F0AB92767CF4C79B526715C802F545E2DCB201BE3 |
-| Per user - ARM64     | [PowerToysUserSetup-0.84.0-arm64.exe][ptUserArm64] | 3D071F009B5E3DBAD21D7450ADB53CBC85CAFB21016E44F414E2A03C188D2FAF |
-| Machine wide - x64   | [PowerToysSetup-0.84.0-x64.exe][ptMachineX64] | 67B7E685AAF635803A87D8EE96CA1AF5024910B0BF00A9277CD77C810D049446 |
-| Machine wide - ARM64 | [PowerToysSetup-0.84.0-arm64.exe][ptMachineArm64] | 259DA1EFB33A616CF64840B8D8AB84F86A43F61687578B43849D5DE11F77AF82 |
+| Per user - x64       | [PowerToysUserSetup-0.84.1-x64.exe][ptUserX64] | 1CDAF3482B031D84DAE15188DE292FB44C5D211698089921040D94B256EBD3CA |
+| Per user - ARM64     | [PowerToysUserSetup-0.84.1-arm64.exe][ptUserArm64] | E0207EF5147EE281D4F438E87A30586D8CAA24DE948950FF1B12E05454622CD9 |
+| Machine wide - x64   | [PowerToysSetup-0.84.1-x64.exe][ptMachineX64] | 10DF9774DE1857051E135B9790A18A92C5C7F42587C733DEE991186E67231EE0 |
+| Machine wide - ARM64 | [PowerToysSetup-0.84.1-arm64.exe][ptMachineArm64] | EB5DDA5EFBA17E813DBF24AFF668DDF5424ED3659234ABBC15441D478D812699 |
 
 This is our preferred method.
 

From 883bd00132f5a2d09ccd9c56b9adebdd31cca3ee Mon Sep 17 00:00:00 2001
From: Clint Rutkas <clint@rutkas.com>
Date: Wed, 11 Sep 2024 08:36:34 -0700
Subject: [PATCH 04/12] WinAppSDK upgrade time! (after .84 is verified stable)
 (#34622)

* upgrade time!

* looks like two got orphaned :/

* Fix Measure Tool window style to remove title bar and borders

* Fix spellchecker

* was tab :(

* Update src/modules/MeasureTool/MeasureToolUI/MeasureToolXAML/MainWindow.xaml.cs

Co-authored-by: Dustin L. Howett <duhowett@microsoft.com>

* added comment about CsWinRT upgrade to verify on next upgrade

---------

Co-authored-by: Jaime Bernardo <jaime@janeasystems.com>
Co-authored-by: Dustin L. Howett <duhowett@microsoft.com>
---
 .github/actions/spell-check/expect.txt                 |  1 +
 Directory.Packages.props                               | 10 +++++++---
 NOTICE.md                                              |  6 +++---
 src/Common.Dotnet.CsWinRT.props                        |  8 ++++++++
 .../AnimatedContentControl/AnimatedContentControl.cs   |  2 +-
 .../Converters/CountToDoubleConverter.cs               |  2 +-
 .../Converters/CountToVisibilityConverter.cs           |  2 +-
 .../Converters/EnvironmentStateToBoolConverter.cs      |  2 +-
 .../Converters/EnvironmentStateToMessageConverter.cs   |  2 +-
 .../Converters/EnvironmentStateToTitleConverter.cs     |  2 +-
 .../EnvironmentStateToVisibilityConverter.cs           |  2 +-
 .../Converters/VariableTypeToGlyphConverter.cs         |  2 +-
 .../FileLocksmithUI/Converters/FileCountConverter.cs   |  3 +--
 .../Converters/FileListToDescriptionConverter.cs       |  3 +--
 .../FileLocksmithUI/Converters/PidToIconConverter.cs   |  3 +--
 .../UserToSystemWarningVisibilityConverter.cs          |  4 +---
 .../MeasureToolCore/PowerToys.MeasureToolCore.vcxproj  | 10 ++++++----
 .../MeasureTool/MeasureToolCore/packages.config        |  3 ++-
 .../MeasureToolUI/MeasureToolXAML/MainWindow.xaml.cs   |  5 +++++
 src/modules/MeasureTool/MeasureToolUI/NativeMethods.cs |  9 +++++++++
 .../KeyboardManagerEditor.vcxproj                      |  4 ++--
 .../KeyboardManagerEditor/packages.config              |  2 +-
 .../KeyboardManagerEditorLibrary.vcxproj               |  4 ++--
 .../KeyboardManagerEditorLibrary/packages.config       |  2 +-
 .../Peek.Common/Converters/BytesToStringConverter.cs   |  2 +-
 .../Archives/Models/ArchiveItemTemplateSelector.cs     |  2 +-
 .../powerrename/PowerRenameUILib/PowerRenameUI.vcxproj | 10 ++++++----
 .../powerrename/PowerRenameUILib/packages.config       |  3 ++-
 .../UnitTests-MarkdownPreviewHandler.csproj            |  1 +
 .../UnitTests-SvgPreviewHandler.csproj                 |  1 +
 .../Settings.UI/Converters/AwakeModeToIntConverter.cs  |  2 +-
 .../Settings.UI/Converters/ColorFormatConverter.cs     |  3 +--
 .../Converters/ImageResizerFitToIntConverter.cs        |  2 +-
 .../Converters/ImageResizerFitToStringConverter.cs     |  2 +-
 .../Converters/ImageResizerUnitToIntConverter.cs       |  2 +-
 .../Converters/ImageResizerUnitToStringConverter.cs    |  2 +-
 .../Converters/IndexBitFieldToVisibilityConverter.cs   |  2 +-
 .../Converters/KeyVisualTemplateSelector.cs            |  2 +-
 .../Converters/ModuleItemTemplateSelector.cs           |  2 +-
 .../Converters/RunOptionTemplateSelector.cs            |  2 +-
 .../Converters/StringToInfoBarSeverityConverter.cs     |  4 +---
 .../Converters/UpdateStateToBoolConverter.cs           |  2 +-
 .../Controls/CheckBoxWithDescriptionControl.cs         |  2 +-
 .../Controls/IsEnabledTextBlock/IsEnabledTextBlock.cs  |  2 +-
 .../SettingsXAML/Controls/KeyVisual/KeyVisual.cs       |  2 +-
 .../SettingsGroup/SettingsGroupAutomationPeer.cs       |  2 +-
 46 files changed, 87 insertions(+), 60 deletions(-)

diff --git a/.github/actions/spell-check/expect.txt b/.github/actions/spell-check/expect.txt
index f5bc0156f8d..458e3087b20 100644
--- a/.github/actions/spell-check/expect.txt
+++ b/.github/actions/spell-check/expect.txt
@@ -266,6 +266,7 @@ CSettings
 cso
 CSRW
 CStyle
+cswinrt
 CSY
 CTest
 currentculture
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 97d46edbfe6..0967532dc32 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -32,15 +32,19 @@
     <PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" />
-    <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2365.46" />
+    <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2739.15" />
     <!-- Package Microsoft.Win32.SystemEvents added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Drawing.Common but the 8.0.1 version wasn't published to nuget. -->
     <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Windows.Compatibility" Version="8.0.7" />
     <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.2.46-beta" />
     <!-- CsWinRT version needs to be set to have a WinRT.Runtime.dll at the same version contained inside the NET SDK we're currently building on CI. -->
-    <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.0.8" />
+    <!-- 
+      TODO: in Common.Dotnet.CsWinRT.props, on upgrade, verify RemoveCsWinRTPackageAnalyzer is no longer needed.  
+      This is present due to a bug in CsWinRT where WPF projects cause the analyzer to fail.
+	-->
+    <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.1.1" />
     <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.5.240428000" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.6.240829007" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
     <PackageVersion Include="ModernWpfUI" Version="0.9.4" />
diff --git a/NOTICE.md b/NOTICE.md
index b7f8df1dfda..d4328bbfc40 100644
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -1325,13 +1325,13 @@ EXHIBIT A -Mozilla Public License.
 - Microsoft.Extensions.Logging 8.0.0
 - Microsoft.Extensions.Logging.Abstractions 8.0.0
 - Microsoft.Toolkit.Uwp.Notifications 7.1.2
-- Microsoft.Web.WebView2 1.0.2365.46
+- Microsoft.Web.WebView2 1.0.2739.15
 - Microsoft.Win32.SystemEvents 8.0.0
 - Microsoft.Windows.Compatibility 8.0.7
 - Microsoft.Windows.CsWin32 0.2.46-beta
-- Microsoft.Windows.CsWinRT 2.0.8
+- Microsoft.Windows.CsWinRT 2.1.1
 - Microsoft.Windows.SDK.BuildTools 10.0.22621.2428
-- Microsoft.WindowsAppSDK 1.5.240428000
+- Microsoft.WindowsAppSDK 1.6.240829007
 - Microsoft.Xaml.Behaviors.WinUI.Managed 2.0.9
 - Microsoft.Xaml.Behaviors.Wpf 1.1.39
 - ModernWpfUI 0.9.4
diff --git a/src/Common.Dotnet.CsWinRT.props b/src/Common.Dotnet.CsWinRT.props
index a9cd70ffa33..610219427c0 100644
--- a/src/Common.Dotnet.CsWinRT.props
+++ b/src/Common.Dotnet.CsWinRT.props
@@ -2,6 +2,7 @@
 <!-- Some items may be set in Directory.Build.props in root -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
+    <WindowsSdkPackageVersion>10.0.20348.38</WindowsSdkPackageVersion>
     <TargetFramework>net8.0-windows10.0.20348.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
     <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
@@ -33,4 +34,11 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Windows.CsWinRT" />
   </ItemGroup>
+
+  <!-- this may need to be removed on future CsWinRT upgrades-->
+  <Target Name="RemoveCsWinRTPackageAnalyzer" BeforeTargets="CoreCompile">
+    <ItemGroup>
+      <Analyzer Remove="@(Analyzer)" Condition="%(Analyzer.NuGetPackageId) == 'Microsoft.Windows.CsWinRT'" />	  
+    </ItemGroup>
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/AnimatedContentControl/AnimatedContentControl.cs b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/AnimatedContentControl/AnimatedContentControl.cs
index eda04a5d537..3a5cb8c602e 100644
--- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/AnimatedContentControl/AnimatedContentControl.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/AnimatedContentControl/AnimatedContentControl.cs
@@ -9,7 +9,7 @@ namespace AdvancedPaste.Controls
 {
     [TemplatePart(Name = LoadingGrid, Type = typeof(Grid))]
     [TemplatePart(Name = LoadingBrush, Type = typeof(AnimatedBorderBrush))]
-    public class AnimatedContentControl : ContentControl
+    public partial class AnimatedContentControl : ContentControl
     {
         internal const string LoadingGrid = "PART_LoadingGrid";
         internal const string LoadingBrush = "PART_LoadingBrush";
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Converters/CountToDoubleConverter.cs b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Converters/CountToDoubleConverter.cs
index 5226bf320dc..0577c019f73 100644
--- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Converters/CountToDoubleConverter.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Converters/CountToDoubleConverter.cs
@@ -8,7 +8,7 @@
 
 namespace AdvancedPaste.Converters;
 
-public sealed class CountToDoubleConverter : IValueConverter
+public sealed partial class CountToDoubleConverter : IValueConverter
 {
     public double ValueIfZero { get; set; }
 
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Converters/CountToVisibilityConverter.cs b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Converters/CountToVisibilityConverter.cs
index 41b3968e03d..67889d3af98 100644
--- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Converters/CountToVisibilityConverter.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Converters/CountToVisibilityConverter.cs
@@ -9,7 +9,7 @@
 
 namespace AdvancedPaste.Converters;
 
-public sealed class CountToVisibilityConverter : IValueConverter
+public sealed partial class CountToVisibilityConverter : IValueConverter
 {
     public object Convert(object value, Type targetType, object parameter, string language)
     {
diff --git a/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/EnvironmentStateToBoolConverter.cs b/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/EnvironmentStateToBoolConverter.cs
index 95aae3e8744..41a6b31fd7a 100644
--- a/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/EnvironmentStateToBoolConverter.cs
+++ b/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/EnvironmentStateToBoolConverter.cs
@@ -8,7 +8,7 @@
 
 namespace EnvironmentVariablesUILib.Converters;
 
-public class EnvironmentStateToBoolConverter : IValueConverter
+public partial class EnvironmentStateToBoolConverter : IValueConverter
 {
     public object Convert(object value, Type targetType, object parameter, string language)
     {
diff --git a/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/EnvironmentStateToMessageConverter.cs b/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/EnvironmentStateToMessageConverter.cs
index 5f1103fe21f..d505a29d78a 100644
--- a/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/EnvironmentStateToMessageConverter.cs
+++ b/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/EnvironmentStateToMessageConverter.cs
@@ -9,7 +9,7 @@
 
 namespace EnvironmentVariablesUILib.Converters;
 
-public class EnvironmentStateToMessageConverter : IValueConverter
+public partial class EnvironmentStateToMessageConverter : IValueConverter
 {
     public object Convert(object value, Type targetType, object parameter, string language)
     {
diff --git a/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/EnvironmentStateToTitleConverter.cs b/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/EnvironmentStateToTitleConverter.cs
index dbe2843919d..be2f03175e8 100644
--- a/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/EnvironmentStateToTitleConverter.cs
+++ b/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/EnvironmentStateToTitleConverter.cs
@@ -9,7 +9,7 @@
 
 namespace EnvironmentVariablesUILib.Converters;
 
-public class EnvironmentStateToTitleConverter : IValueConverter
+public partial class EnvironmentStateToTitleConverter : IValueConverter
 {
     public object Convert(object value, Type targetType, object parameter, string language)
     {
diff --git a/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/EnvironmentStateToVisibilityConverter.cs b/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/EnvironmentStateToVisibilityConverter.cs
index 4c2d2b42dab..5fb1313ad22 100644
--- a/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/EnvironmentStateToVisibilityConverter.cs
+++ b/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/EnvironmentStateToVisibilityConverter.cs
@@ -9,7 +9,7 @@
 
 namespace EnvironmentVariablesUILib.Converters;
 
-public class EnvironmentStateToVisibilityConverter : IValueConverter
+public partial class EnvironmentStateToVisibilityConverter : IValueConverter
 {
     public object Convert(object value, Type targetType, object parameter, string language)
     {
diff --git a/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/VariableTypeToGlyphConverter.cs b/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/VariableTypeToGlyphConverter.cs
index 41cf4124cb7..216a914bea5 100644
--- a/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/VariableTypeToGlyphConverter.cs
+++ b/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/VariableTypeToGlyphConverter.cs
@@ -8,7 +8,7 @@
 
 namespace EnvironmentVariablesUILib.Converters;
 
-public class VariableTypeToGlyphConverter : IValueConverter
+public partial class VariableTypeToGlyphConverter : IValueConverter
 {
     public object Convert(object value, Type targetType, object parameter, string language)
     {
diff --git a/src/modules/FileLocksmith/FileLocksmithUI/Converters/FileCountConverter.cs b/src/modules/FileLocksmith/FileLocksmithUI/Converters/FileCountConverter.cs
index 43bf8c9a590..423c4f04b0d 100644
--- a/src/modules/FileLocksmith/FileLocksmithUI/Converters/FileCountConverter.cs
+++ b/src/modules/FileLocksmith/FileLocksmithUI/Converters/FileCountConverter.cs
@@ -4,11 +4,10 @@
 
 using System;
 using Microsoft.UI.Xaml.Data;
-using PowerToys.FileLocksmithLib.Interop;
 
 namespace PowerToys.FileLocksmithUI.Converters
 {
-    public sealed class FileCountConverter : IValueConverter
+    public sealed partial class FileCountConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, string language)
         {
diff --git a/src/modules/FileLocksmith/FileLocksmithUI/Converters/FileListToDescriptionConverter.cs b/src/modules/FileLocksmith/FileLocksmithUI/Converters/FileListToDescriptionConverter.cs
index fcde399f4ae..a81a03fb52d 100644
--- a/src/modules/FileLocksmith/FileLocksmithUI/Converters/FileListToDescriptionConverter.cs
+++ b/src/modules/FileLocksmith/FileLocksmithUI/Converters/FileListToDescriptionConverter.cs
@@ -5,11 +5,10 @@
 using System;
 using System.IO;
 using Microsoft.UI.Xaml.Data;
-using PowerToys.FileLocksmithLib.Interop;
 
 namespace PowerToys.FileLocksmithUI.Converters
 {
-    public sealed class FileListToDescriptionConverter : IValueConverter
+    public sealed partial class FileListToDescriptionConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, string language)
         {
diff --git a/src/modules/FileLocksmith/FileLocksmithUI/Converters/PidToIconConverter.cs b/src/modules/FileLocksmith/FileLocksmithUI/Converters/PidToIconConverter.cs
index c5b03a7d2b8..deec381fcb2 100644
--- a/src/modules/FileLocksmith/FileLocksmithUI/Converters/PidToIconConverter.cs
+++ b/src/modules/FileLocksmith/FileLocksmithUI/Converters/PidToIconConverter.cs
@@ -7,11 +7,10 @@
 using System.IO;
 using Microsoft.UI.Xaml.Data;
 using Microsoft.UI.Xaml.Media.Imaging;
-using Windows.Storage;
 
 namespace PowerToys.FileLocksmithUI.Converters
 {
-    public sealed class PidToIconConverter : IValueConverter
+    public sealed partial class PidToIconConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, string language)
         {
diff --git a/src/modules/FileLocksmith/FileLocksmithUI/Converters/UserToSystemWarningVisibilityConverter.cs b/src/modules/FileLocksmith/FileLocksmithUI/Converters/UserToSystemWarningVisibilityConverter.cs
index 85b988dbe34..10e071563ae 100644
--- a/src/modules/FileLocksmith/FileLocksmithUI/Converters/UserToSystemWarningVisibilityConverter.cs
+++ b/src/modules/FileLocksmith/FileLocksmithUI/Converters/UserToSystemWarningVisibilityConverter.cs
@@ -3,14 +3,12 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Globalization;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Data;
-using PowerToys.FileLocksmithLib.Interop;
 
 namespace PowerToys.FileLocksmithUI.Converters
 {
-    public sealed class UserToSystemWarningVisibilityConverter : IValueConverter
+    public sealed partial class UserToSystemWarningVisibilityConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, string language)
         {
diff --git a/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj b/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj
index 1189b7c08cc..96ffb5f91a3 100644
--- a/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj
+++ b/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.240829007\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.240829007\build\native\Microsoft.WindowsAppSDK.props')" />
   <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props')" />
   <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
   <PropertyGroup Label="Globals">
@@ -141,7 +141,8 @@
     <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
     <Import Project="..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
     <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets')" />
-    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.240829007\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.240829007\build\native\Microsoft.WindowsAppSDK.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2739.15\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2739.15\build\native\Microsoft.Web.WebView2.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -152,7 +153,8 @@
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props'))" />
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.240829007\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.240829007\build\native\Microsoft.WindowsAppSDK.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.240829007\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.240829007\build\native\Microsoft.WindowsAppSDK.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2739.15\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2739.15\build\native\Microsoft.Web.WebView2.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/src/modules/MeasureTool/MeasureToolCore/packages.config b/src/modules/MeasureTool/MeasureToolCore/packages.config
index 2b320c8c166..7043c92ee0f 100644
--- a/src/modules/MeasureTool/MeasureToolCore/packages.config
+++ b/src/modules/MeasureTool/MeasureToolCore/packages.config
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Microsoft.Web.WebView2" version="1.0.2739.15" targetFramework="native" />
   <package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
   <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
   <package id="Microsoft.Windows.SDK.BuildTools" version="10.0.22621.2428" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK" version="1.5.240428000" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK" version="1.6.240829007" targetFramework="native" />
 </packages>
\ No newline at end of file
diff --git a/src/modules/MeasureTool/MeasureToolUI/MeasureToolXAML/MainWindow.xaml.cs b/src/modules/MeasureTool/MeasureToolUI/MeasureToolXAML/MainWindow.xaml.cs
index 3c229743957..1212dd81949 100644
--- a/src/modules/MeasureTool/MeasureToolUI/MeasureToolXAML/MainWindow.xaml.cs
+++ b/src/modules/MeasureTool/MeasureToolUI/MeasureToolXAML/MainWindow.xaml.cs
@@ -56,6 +56,11 @@ public MainWindow(PowerToys.MeasureToolCore.Core core)
             this.SetIsMaximizable(false);
             IsTitleBarVisible = false;
 
+            // Remove the caption style from the window style. Windows App SDK 1.6 added it, which made the title bar and borders appear for Measure Tool. This code removes it.
+            var windowStyle = GetWindowLong(hwnd, GWL_STYLE);
+            windowStyle = windowStyle & (~WS_CAPTION);
+            _ = SetWindowLong(hwnd, GWL_STYLE, windowStyle);
+
             _coreLogic = core;
             Closed += MainWindow_Closed;
             DisplayArea displayArea = DisplayArea.GetFromWindowId(windowId, DisplayAreaFallback.Nearest);
diff --git a/src/modules/MeasureTool/MeasureToolUI/NativeMethods.cs b/src/modules/MeasureTool/MeasureToolUI/NativeMethods.cs
index 877adf54e1b..92c061a6cc2 100644
--- a/src/modules/MeasureTool/MeasureToolUI/NativeMethods.cs
+++ b/src/modules/MeasureTool/MeasureToolUI/NativeMethods.cs
@@ -15,4 +15,13 @@ internal static class NativeMethods
     internal const uint SWP_NOMOVE = 0x0002;
     internal const uint SWP_NOACTIVATE = 0x0010;
     internal const uint SWP_SHOWWINDOW = 0x0040;
+
+    [DllImport("user32.dll", SetLastError = true)]
+    internal static extern int GetWindowLong(IntPtr hWnd, int nIndex);
+
+    [DllImport("user32.dll")]
+    internal static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);
+
+    internal const int GWL_STYLE = -16;
+    internal const int WS_CAPTION = 0x00C00000;
 }
diff --git a/src/modules/keyboardmanager/KeyboardManagerEditor/KeyboardManagerEditor.vcxproj b/src/modules/keyboardmanager/KeyboardManagerEditor/KeyboardManagerEditor.vcxproj
index 28a265401ad..149ec0201ab 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEditor/KeyboardManagerEditor.vcxproj
+++ b/src/modules/keyboardmanager/KeyboardManagerEditor/KeyboardManagerEditor.vcxproj
@@ -162,7 +162,7 @@
     <Import Project="..\..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets')" />
     <Import Project="..\..\..\..\packages\Microsoft.VCRTForwarders.140.1.0.7\build\native\Microsoft.VCRTForwarders.140.targets" Condition="Exists('..\..\..\..\packages\Microsoft.VCRTForwarders.140.1.0.7\build\native\Microsoft.VCRTForwarders.140.targets')" />
     <Import Project="..\..\..\..\packages\Microsoft.UI.Xaml.2.8.2-prerelease.220830001\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\..\packages\Microsoft.UI.Xaml.2.8.2-prerelease.220830001\build\native\Microsoft.UI.Xaml.targets')" />
-    <Import Project="..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2365.46\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2365.46\build\native\Microsoft.Web.WebView2.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2739.15\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2739.15\build\native\Microsoft.Web.WebView2.targets')" />
   </ImportGroup>
   <Import Project="..\..\..\..\deps\spdlog.props" />
   <Target Name="GenerateResourceFiles" BeforeTargets="PrepareForBuild">
@@ -179,7 +179,7 @@
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.VCRTForwarders.140.1.0.7\build\native\Microsoft.VCRTForwarders.140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.VCRTForwarders.140.1.0.7\build\native\Microsoft.VCRTForwarders.140.targets'))" />
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.UI.Xaml.2.8.2-prerelease.220830001\build\native\Microsoft.UI.Xaml.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.UI.Xaml.2.8.2-prerelease.220830001\build\native\Microsoft.UI.Xaml.props'))" />
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.UI.Xaml.2.8.2-prerelease.220830001\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.UI.Xaml.2.8.2-prerelease.220830001\build\native\Microsoft.UI.Xaml.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2365.46\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2365.46\build\native\Microsoft.Web.WebView2.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2739.15\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2739.15\build\native\Microsoft.Web.WebView2.targets'))" />
   </Target>
   <Target Name="FakeResourcesPriMerge" BeforeTargets="FinalizeBuildStatus" DependsOnTargets="CopyFilesToOutputDirectory">
     <Message Text="Renaming Microsoft.UI.Xaml.pri to resources.pri" />
diff --git a/src/modules/keyboardmanager/KeyboardManagerEditor/packages.config b/src/modules/keyboardmanager/KeyboardManagerEditor/packages.config
index 58a96b0a2ed..05802ce755e 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEditor/packages.config
+++ b/src/modules/keyboardmanager/KeyboardManagerEditor/packages.config
@@ -3,6 +3,6 @@
   <package id="Microsoft.Toolkit.Win32.UI.XamlApplication" version="6.1.3" targetFramework="native" />
   <package id="Microsoft.UI.Xaml" version="2.8.2-prerelease.220830001" targetFramework="native" />
   <package id="Microsoft.VCRTForwarders.140" version="1.0.7" targetFramework="native" />
-  <package id="Microsoft.Web.WebView2" version="1.0.2365.46" targetFramework="native" />
+  <package id="Microsoft.Web.WebView2" version="1.0.2739.15" targetFramework="native" />
   <package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
 </packages>
\ No newline at end of file
diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/KeyboardManagerEditorLibrary.vcxproj b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/KeyboardManagerEditorLibrary.vcxproj
index 22fd5467a3b..a36cd6b1bd8 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/KeyboardManagerEditorLibrary.vcxproj
+++ b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/KeyboardManagerEditorLibrary.vcxproj
@@ -101,7 +101,7 @@
     <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
     <Import Project="..\..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets')" />
     <Import Project="..\..\..\..\packages\Microsoft.UI.Xaml.2.8.2-prerelease.220830001\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\..\packages\Microsoft.UI.Xaml.2.8.2-prerelease.220830001\build\native\Microsoft.UI.Xaml.targets')" />
-    <Import Project="..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2365.46\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2365.46\build\native\Microsoft.Web.WebView2.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2739.15\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2739.15\build\native\Microsoft.Web.WebView2.targets')" />
   </ImportGroup>
   <Import Project="..\..\..\..\deps\spdlog.props" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -114,7 +114,7 @@
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets'))" />
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.UI.Xaml.2.8.2-prerelease.220830001\build\native\Microsoft.UI.Xaml.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.UI.Xaml.2.8.2-prerelease.220830001\build\native\Microsoft.UI.Xaml.props'))" />
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.UI.Xaml.2.8.2-prerelease.220830001\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.UI.Xaml.2.8.2-prerelease.220830001\build\native\Microsoft.UI.Xaml.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2365.46\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2365.46\build\native\Microsoft.Web.WebView2.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2739.15\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2739.15\build\native\Microsoft.Web.WebView2.targets'))" />
   </Target>
   <Target Name="GenerateResourceFiles" BeforeTargets="PrepareForBuild">
     <Exec Command="powershell -NonInteractive -executionpolicy Unrestricted $(SolutionDir)tools\build\convert-resx-to-rc.ps1 $(MSBuildThisFileDirectory)\..\KeyboardManagerEditor\ resource.base.h resource.h KeyboardManagerEditor.base.rc KeyboardManagerEditor.rc" />
diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/packages.config b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/packages.config
index 4808f0f3afa..7ce9b7c3f3a 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/packages.config
+++ b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/packages.config
@@ -2,6 +2,6 @@
 <packages>
   <package id="Microsoft.Toolkit.Win32.UI.XamlApplication" version="6.1.3" targetFramework="native" />
   <package id="Microsoft.UI.Xaml" version="2.8.2-prerelease.220830001" targetFramework="native" />
-  <package id="Microsoft.Web.WebView2" version="1.0.2365.46" targetFramework="native" />
+  <package id="Microsoft.Web.WebView2" version="1.0.2739.15" targetFramework="native" />
   <package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
 </packages>
\ No newline at end of file
diff --git a/src/modules/peek/Peek.Common/Converters/BytesToStringConverter.cs b/src/modules/peek/Peek.Common/Converters/BytesToStringConverter.cs
index fa40547daf5..8f6f64144fd 100644
--- a/src/modules/peek/Peek.Common/Converters/BytesToStringConverter.cs
+++ b/src/modules/peek/Peek.Common/Converters/BytesToStringConverter.cs
@@ -8,7 +8,7 @@
 
 namespace Peek.Common.Converters
 {
-    public class BytesToStringConverter : IValueConverter
+    public partial class BytesToStringConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, string language)
         {
diff --git a/src/modules/peek/Peek.FilePreviewer/Previewers/Archives/Models/ArchiveItemTemplateSelector.cs b/src/modules/peek/Peek.FilePreviewer/Previewers/Archives/Models/ArchiveItemTemplateSelector.cs
index 38bd9766c04..56a637b84c2 100644
--- a/src/modules/peek/Peek.FilePreviewer/Previewers/Archives/Models/ArchiveItemTemplateSelector.cs
+++ b/src/modules/peek/Peek.FilePreviewer/Previewers/Archives/Models/ArchiveItemTemplateSelector.cs
@@ -8,7 +8,7 @@
 
 namespace Peek.FilePreviewer.Previewers.Archives.Models
 {
-    public class ArchiveItemTemplateSelector : DataTemplateSelector
+    public partial class ArchiveItemTemplateSelector : DataTemplateSelector
     {
         public DataTemplate? DirectoryTemplate { get; set; }
 
diff --git a/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj b/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj
index aabed1cff82..fc9bd9b1f65 100644
--- a/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj
+++ b/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.240829007\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.240829007\build\native\Microsoft.WindowsAppSDK.props')" />
   <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props')" />
   <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
   <PropertyGroup Label="Globals">
@@ -205,7 +205,8 @@
     <Import Project="..\..\..\..\packages\boost_regex-vc143.1.84.0\build\boost_regex-vc143.targets" Condition="Exists('..\..\..\..\packages\boost_regex-vc143.1.84.0\build\boost_regex-vc143.targets')" />
     <Import Project="..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
     <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets')" />
-    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.240829007\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.240829007\build\native\Microsoft.WindowsAppSDK.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2739.15\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2739.15\build\native\Microsoft.Web.WebView2.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -218,8 +219,9 @@
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props'))" />
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.240829007\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.240829007\build\native\Microsoft.WindowsAppSDK.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.240829007\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.240829007\build\native\Microsoft.WindowsAppSDK.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2739.15\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2739.15\build\native\Microsoft.Web.WebView2.targets'))" />
   </Target>
   <Target Name="AddWildCardItems" AfterTargets="BuildGenerateSources">
     <ItemGroup>
diff --git a/src/modules/powerrename/PowerRenameUILib/packages.config b/src/modules/powerrename/PowerRenameUILib/packages.config
index 329104b361f..360805a64dc 100644
--- a/src/modules/powerrename/PowerRenameUILib/packages.config
+++ b/src/modules/powerrename/PowerRenameUILib/packages.config
@@ -2,8 +2,9 @@
 <packages>
   <package id="boost" version="1.84.0" targetFramework="native" />
   <package id="boost_regex-vc143" version="1.84.0" targetFramework="native" />
+  <package id="Microsoft.Web.WebView2" version="1.0.2739.15" targetFramework="native" />
   <package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
   <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
   <package id="Microsoft.Windows.SDK.BuildTools" version="10.0.22621.2428" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK" version="1.5.240428000" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK" version="1.6.240829007" targetFramework="native" />
 </packages>
\ No newline at end of file
diff --git a/src/modules/previewpane/UnitTests-MarkdownPreviewHandler/UnitTests-MarkdownPreviewHandler.csproj b/src/modules/previewpane/UnitTests-MarkdownPreviewHandler/UnitTests-MarkdownPreviewHandler.csproj
index a9eca4f5f0b..e5779985fe3 100644
--- a/src/modules/previewpane/UnitTests-MarkdownPreviewHandler/UnitTests-MarkdownPreviewHandler.csproj
+++ b/src/modules/previewpane/UnitTests-MarkdownPreviewHandler/UnitTests-MarkdownPreviewHandler.csproj
@@ -18,6 +18,7 @@
 
   <ItemGroup>
     <PackageReference Include="MSTest" />
+    <PackageReference Include="Microsoft.Web.WebView2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\PreviewHandlerCommon.csproj" />
diff --git a/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj b/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj
index 5f56ba8a718..e47dad27996 100644
--- a/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj
+++ b/src/modules/previewpane/UnitTests-SvgPreviewHandler/UnitTests-SvgPreviewHandler.csproj
@@ -24,6 +24,7 @@
   <ItemGroup>
     <PackageReference Include="Moq" />
     <PackageReference Include="MSTest" />
+    <PackageReference Include="Microsoft.Web.WebView2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\PreviewHandlerCommon.csproj" />
diff --git a/src/settings-ui/Settings.UI/Converters/AwakeModeToIntConverter.cs b/src/settings-ui/Settings.UI/Converters/AwakeModeToIntConverter.cs
index 9746c62fc29..1bbae1f8c2e 100644
--- a/src/settings-ui/Settings.UI/Converters/AwakeModeToIntConverter.cs
+++ b/src/settings-ui/Settings.UI/Converters/AwakeModeToIntConverter.cs
@@ -8,7 +8,7 @@
 
 namespace Microsoft.PowerToys.Settings.UI.Converters
 {
-    public sealed class AwakeModeToIntConverter : IValueConverter
+    public sealed partial class AwakeModeToIntConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, string language)
         {
diff --git a/src/settings-ui/Settings.UI/Converters/ColorFormatConverter.cs b/src/settings-ui/Settings.UI/Converters/ColorFormatConverter.cs
index 7f8559f66aa..8b81200d640 100644
--- a/src/settings-ui/Settings.UI/Converters/ColorFormatConverter.cs
+++ b/src/settings-ui/Settings.UI/Converters/ColorFormatConverter.cs
@@ -4,12 +4,11 @@
 
 using System;
 using ManagedCommon;
-using Microsoft.PowerToys.Settings.UI.Library.Helpers;
 using Microsoft.UI.Xaml.Data;
 
 namespace Microsoft.PowerToys.Settings.UI.Converters
 {
-    public sealed class ColorFormatConverter : IValueConverter
+    public sealed partial class ColorFormatConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, string language)
         {
diff --git a/src/settings-ui/Settings.UI/Converters/ImageResizerFitToIntConverter.cs b/src/settings-ui/Settings.UI/Converters/ImageResizerFitToIntConverter.cs
index 675ad8a13f1..8a680251974 100644
--- a/src/settings-ui/Settings.UI/Converters/ImageResizerFitToIntConverter.cs
+++ b/src/settings-ui/Settings.UI/Converters/ImageResizerFitToIntConverter.cs
@@ -8,7 +8,7 @@
 
 namespace Microsoft.PowerToys.Settings.UI.Converters;
 
-public sealed class ImageResizerFitToIntConverter : IValueConverter
+public sealed partial class ImageResizerFitToIntConverter : IValueConverter
 {
     public object Convert(object value, Type targetType, object parameter, string language)
     {
diff --git a/src/settings-ui/Settings.UI/Converters/ImageResizerFitToStringConverter.cs b/src/settings-ui/Settings.UI/Converters/ImageResizerFitToStringConverter.cs
index b3ead132cd8..d9a740db951 100644
--- a/src/settings-ui/Settings.UI/Converters/ImageResizerFitToStringConverter.cs
+++ b/src/settings-ui/Settings.UI/Converters/ImageResizerFitToStringConverter.cs
@@ -8,7 +8,7 @@
 
 namespace Microsoft.PowerToys.Settings.UI.Converters
 {
-    public sealed class ImageResizerFitToStringConverter : IValueConverter
+    public sealed partial class ImageResizerFitToStringConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, string language)
         {
diff --git a/src/settings-ui/Settings.UI/Converters/ImageResizerUnitToIntConverter.cs b/src/settings-ui/Settings.UI/Converters/ImageResizerUnitToIntConverter.cs
index 682b03dafcd..0132b862417 100644
--- a/src/settings-ui/Settings.UI/Converters/ImageResizerUnitToIntConverter.cs
+++ b/src/settings-ui/Settings.UI/Converters/ImageResizerUnitToIntConverter.cs
@@ -8,7 +8,7 @@
 
 namespace Microsoft.PowerToys.Settings.UI.Converters;
 
-public sealed class ImageResizerUnitToIntConverter : IValueConverter
+public sealed partial class ImageResizerUnitToIntConverter : IValueConverter
 {
     public object Convert(object value, Type targetType, object parameter, string language)
     {
diff --git a/src/settings-ui/Settings.UI/Converters/ImageResizerUnitToStringConverter.cs b/src/settings-ui/Settings.UI/Converters/ImageResizerUnitToStringConverter.cs
index bdba70c0b14..6dc89e65fb8 100644
--- a/src/settings-ui/Settings.UI/Converters/ImageResizerUnitToStringConverter.cs
+++ b/src/settings-ui/Settings.UI/Converters/ImageResizerUnitToStringConverter.cs
@@ -8,7 +8,7 @@
 
 namespace Microsoft.PowerToys.Settings.UI.Converters
 {
-    public sealed class ImageResizerUnitToStringConverter : IValueConverter
+    public sealed partial class ImageResizerUnitToStringConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, string language)
         {
diff --git a/src/settings-ui/Settings.UI/Converters/IndexBitFieldToVisibilityConverter.cs b/src/settings-ui/Settings.UI/Converters/IndexBitFieldToVisibilityConverter.cs
index 9d6950af832..3295294550e 100644
--- a/src/settings-ui/Settings.UI/Converters/IndexBitFieldToVisibilityConverter.cs
+++ b/src/settings-ui/Settings.UI/Converters/IndexBitFieldToVisibilityConverter.cs
@@ -8,7 +8,7 @@
 
 namespace Microsoft.PowerToys.Settings.UI.Converters
 {
-    public sealed class IndexBitFieldToVisibilityConverter : IValueConverter
+    public sealed partial class IndexBitFieldToVisibilityConverter : IValueConverter
     {
         // Receives a hexadecimal bit mask as a parameter. Will check the value against that bitmask.
         public object Convert(object value, Type targetType, object parameter, string language)
diff --git a/src/settings-ui/Settings.UI/Converters/KeyVisualTemplateSelector.cs b/src/settings-ui/Settings.UI/Converters/KeyVisualTemplateSelector.cs
index 3593a3c1003..43e993912a7 100644
--- a/src/settings-ui/Settings.UI/Converters/KeyVisualTemplateSelector.cs
+++ b/src/settings-ui/Settings.UI/Converters/KeyVisualTemplateSelector.cs
@@ -8,7 +8,7 @@
 
 namespace Microsoft.PowerToys.Settings.UI.Converters
 {
-    internal sealed class KeyVisualTemplateSelector : DataTemplateSelector
+    internal sealed partial class KeyVisualTemplateSelector : DataTemplateSelector
     {
         public DataTemplate KeyVisualTemplate { get; set; }
 
diff --git a/src/settings-ui/Settings.UI/Converters/ModuleItemTemplateSelector.cs b/src/settings-ui/Settings.UI/Converters/ModuleItemTemplateSelector.cs
index b34331a0e7a..1374c164826 100644
--- a/src/settings-ui/Settings.UI/Converters/ModuleItemTemplateSelector.cs
+++ b/src/settings-ui/Settings.UI/Converters/ModuleItemTemplateSelector.cs
@@ -8,7 +8,7 @@
 
 namespace Microsoft.PowerToys.Settings.UI.Converters
 {
-    public class ModuleItemTemplateSelector : DataTemplateSelector
+    public partial class ModuleItemTemplateSelector : DataTemplateSelector
     {
         public DataTemplate TextTemplate { get; set; }
 
diff --git a/src/settings-ui/Settings.UI/Converters/RunOptionTemplateSelector.cs b/src/settings-ui/Settings.UI/Converters/RunOptionTemplateSelector.cs
index 575562da5d4..0e742e855a9 100644
--- a/src/settings-ui/Settings.UI/Converters/RunOptionTemplateSelector.cs
+++ b/src/settings-ui/Settings.UI/Converters/RunOptionTemplateSelector.cs
@@ -10,7 +10,7 @@
 
 namespace Microsoft.PowerToys.Settings.UI.Converters
 {
-    public sealed class RunOptionTemplateSelector : DataTemplateSelector
+    public sealed partial class RunOptionTemplateSelector : DataTemplateSelector
     {
         public DataTemplate CheckBoxTemplate { get; set; }
 
diff --git a/src/settings-ui/Settings.UI/Converters/StringToInfoBarSeverityConverter.cs b/src/settings-ui/Settings.UI/Converters/StringToInfoBarSeverityConverter.cs
index 6b3f6ed3ebb..548b68889b7 100644
--- a/src/settings-ui/Settings.UI/Converters/StringToInfoBarSeverityConverter.cs
+++ b/src/settings-ui/Settings.UI/Converters/StringToInfoBarSeverityConverter.cs
@@ -3,13 +3,11 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using Microsoft.UI;
-using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Data;
 
 namespace Microsoft.PowerToys.Settings.UI.Converters
 {
-    public sealed class StringToInfoBarSeverityConverter : IValueConverter
+    public sealed partial class StringToInfoBarSeverityConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, string language)
         {
diff --git a/src/settings-ui/Settings.UI/Converters/UpdateStateToBoolConverter.cs b/src/settings-ui/Settings.UI/Converters/UpdateStateToBoolConverter.cs
index 610736752e4..ecc19dbd7c8 100644
--- a/src/settings-ui/Settings.UI/Converters/UpdateStateToBoolConverter.cs
+++ b/src/settings-ui/Settings.UI/Converters/UpdateStateToBoolConverter.cs
@@ -7,7 +7,7 @@
 
 namespace Microsoft.PowerToys.Settings.UI.Converters
 {
-    public sealed class UpdateStateToBoolConverter : IValueConverter
+    public sealed partial class UpdateStateToBoolConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, string language)
         {
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/CheckBoxWithDescriptionControl.cs b/src/settings-ui/Settings.UI/SettingsXAML/Controls/CheckBoxWithDescriptionControl.cs
index 84b1a3a0756..9345f442f2a 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/CheckBoxWithDescriptionControl.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/CheckBoxWithDescriptionControl.cs
@@ -9,7 +9,7 @@
 
 namespace Microsoft.PowerToys.Settings.UI.Controls
 {
-    public class CheckBoxWithDescriptionControl : CheckBox
+    public partial class CheckBoxWithDescriptionControl : CheckBox
     {
         private CheckBoxWithDescriptionControl _checkBoxSubTextControl;
 
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/IsEnabledTextBlock/IsEnabledTextBlock.cs b/src/settings-ui/Settings.UI/SettingsXAML/Controls/IsEnabledTextBlock/IsEnabledTextBlock.cs
index f7f7050f36d..c013a87f40e 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/IsEnabledTextBlock/IsEnabledTextBlock.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/IsEnabledTextBlock/IsEnabledTextBlock.cs
@@ -10,7 +10,7 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
 {
     [TemplateVisualState(Name = "Normal", GroupName = "CommonStates")]
     [TemplateVisualState(Name = "Disabled", GroupName = "CommonStates")]
-    public class IsEnabledTextBlock : Control
+    public partial class IsEnabledTextBlock : Control
     {
         public IsEnabledTextBlock()
         {
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/KeyVisual/KeyVisual.cs b/src/settings-ui/Settings.UI/SettingsXAML/Controls/KeyVisual/KeyVisual.cs
index 8b368319842..9d323c636d1 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/KeyVisual/KeyVisual.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/KeyVisual/KeyVisual.cs
@@ -14,7 +14,7 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
     [TemplateVisualState(Name = "Disabled", GroupName = "CommonStates")]
     [TemplateVisualState(Name = "Default", GroupName = "StateStates")]
     [TemplateVisualState(Name = "Error", GroupName = "StateStates")]
-    public sealed class KeyVisual : Control
+    public sealed partial class KeyVisual : Control
     {
         private const string KeyPresenter = "KeyPresenter";
         private KeyVisual _keyVisual;
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsGroup/SettingsGroupAutomationPeer.cs b/src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsGroup/SettingsGroupAutomationPeer.cs
index 56f85b1bdeb..32df364c75d 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsGroup/SettingsGroupAutomationPeer.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsGroup/SettingsGroupAutomationPeer.cs
@@ -6,7 +6,7 @@
 
 namespace Microsoft.PowerToys.Settings.UI.Controls
 {
-    public class SettingsGroupAutomationPeer : FrameworkElementAutomationPeer
+    public partial class SettingsGroupAutomationPeer : FrameworkElementAutomationPeer
     {
         public SettingsGroupAutomationPeer(SettingsGroup owner)
             : base(owner)

From 7e99389b6a5d224b33ca4b5dbf39b98ef8723ff2 Mon Sep 17 00:00:00 2001
From: Connor Plante <150482134+plante-msft@users.noreply.github.com>
Date: Wed, 11 Sep 2024 19:02:10 -0400
Subject: [PATCH 05/12] Added bot trigger to add Product-Workspaces label to
 new issues-bugs (#34819)

---
 .github/policies/resourceManagement.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.github/policies/resourceManagement.yml b/.github/policies/resourceManagement.yml
index f41817bbf60..4692cf6ee6b 100644
--- a/.github/policies/resourceManagement.yml
+++ b/.github/policies/resourceManagement.yml
@@ -241,6 +241,17 @@ configuration:
       then:
       - addReply:
           reply: Hi! Your last comment indicates to our system, that you might want to contribute to this feature/fix this bug. Thank you! Please make us aware on our ["Would you like to contribute to PowerToys?" thread](https://github.com/microsoft/PowerToys/issues/28769), as we don't see all the comments. <br /><br />_I'm a bot (beep!) so please excuse any mistakes I may make_
+      description:
+    - if:
+      - payloadType: Issues
+      - isAction:
+          action: Opened
+      - bodyContains:
+          pattern: 'Area\(s\) with issue\?\s*\nWorkspaces'
+          isRegex: True
+      then:
+      - addLabel:
+          label: Product-Workspaces
       description: 
 onFailure: 
 onSuccess: 

From 5b0f3f64d45cb66e05df5087b2fc9ef98ad44e03 Mon Sep 17 00:00:00 2001
From: Clint Rutkas <clint@rutkas.com>
Date: Thu, 12 Sep 2024 09:30:44 -0700
Subject: [PATCH 06/12] Community Toolkit upgrade to 8.1.240821  (after .84 is
 verified stable) (#34419)

* getting stuff to compile again

* correcting install publish folder

* fixing notice

* Update NOTICE.md

Co-authored-by: Michael Hawker MSFT (XAML Llama) <24302614+michael-hawker@users.noreply.github.com>

* getting it so it compiles again

---------

Co-authored-by: Michael Hawker MSFT (XAML Llama) <24302614+michael-hawker@users.noreply.github.com>
---
 .vsconfig                                        |  2 +-
 Cpp.Build.props                                  | 11 +++++------
 Directory.Packages.props                         | 16 ++++++++--------
 NOTICE.md                                        | 16 ++++++++--------
 src/Common.Dotnet.CsWinRT.props                  |  4 ++--
 .../CropAndLock/CropAndLock/CropAndLock.vcxproj  |  2 +-
 .../FileLocksmithLibInterop.vcxproj              |  2 +-
 .../InstallationPublishProfile.pubxml            |  2 +-
 .../PowerToys.MeasureToolCore.vcxproj            |  4 ----
 .../WorkspacesLib/WorkspacesLib.vcxproj          | 14 +++++++++++++-
 .../WorkspacesLib/WorkspacesLib.vcxproj.filters  |  3 +++
 .../Workspaces/WorkspacesLib/packages.config     |  4 ++++
 .../AlwaysOnTop/WindowCornersUtil.cpp            | 15 ---------------
 .../fancyzones/FancyZonesLib/WindowUtils.cpp     | 16 ----------------
 .../KeyboardManagerEngineLibrary.vcxproj         |  1 +
 .../InstallationPublishProfile.pubxml            |  2 +-
 .../InstallationPublishProfile.pubxml            |  2 +-
 .../InstallationPublishProfile.pubxml            |  2 +-
 .../InstallationPublishProfile.pubxml            |  2 +-
 .../InstallationPublishProfile.pubxml            |  2 +-
 .../InstallationPublishProfile.pubxml            |  2 +-
 21 files changed, 54 insertions(+), 70 deletions(-)
 create mode 100644 src/modules/Workspaces/WorkspacesLib/packages.config

diff --git a/.vsconfig b/.vsconfig
index 5d2ef574531..bc5f1200fc1 100644
--- a/.vsconfig
+++ b/.vsconfig
@@ -7,7 +7,7 @@
     "Microsoft.VisualStudio.Workload.ManagedDesktop",
     "Microsoft.VisualStudio.Workload.Universal",
     "Microsoft.VisualStudio.Component.Windows10SDK.19041",
-    "Microsoft.VisualStudio.Component.Windows10SDK.20348",
+    "Microsoft.VisualStudio.Component.Windows10SDK.22621",
     "Microsoft.VisualStudio.ComponentGroup.UWP.VC",
     "Microsoft.VisualStudio.Component.UWP.VC.ARM64",
     "Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre",
diff --git a/Cpp.Build.props b/Cpp.Build.props
index 4f920f036f8..06c22b45bf8 100644
--- a/Cpp.Build.props
+++ b/Cpp.Build.props
@@ -94,17 +94,16 @@
     </Link>
   </ItemDefinitionGroup>
 
-  <!-- Global props -->
-  <PropertyGroup Label="Globals"
-    Condition="'$(OverrideWindowsTargetPlatformVersion)'!='True'">
-    <WindowsTargetPlatformVersion>10.0.20348.0</WindowsTargetPlatformVersion>
-    <TargetPlatformVersion>10.0.20348.0</TargetPlatformVersion>
+  <!-- Global props OverrideWindowsTargetPlatformVersion-->
+  <PropertyGroup Label="Globals">
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
+    <TargetPlatformVersion>10.0.22621.0</TargetPlatformVersion>
     <WindowsTargetPlatformMinVersion>10.0.19041.0</WindowsTargetPlatformMinVersion>
   </PropertyGroup>
 
   <!-- Props that are constant for both Debug and Release configurations -->
   <PropertyGroup Label="Configuration">
-    <PlatformToolset Condition="'$(OverridePlatformToolset)'!='True'">v143</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <DesktopCompatible>true</DesktopCompatible>
     <SpectreMitigation>Spectre</SpectreMitigation>
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 0967532dc32..9ec1d03bd9b 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -6,14 +6,14 @@
     <PackageVersion Include="Appium.WebDriver" Version="4.4.5" />
     <PackageVersion Include="Azure.AI.OpenAI" Version="1.0.0-beta.12" />
     <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.2" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Animations" Version="8.0.240109" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Collections" Version="8.0.240109" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.0.240109" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.0.240109" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Segmented" Version="8.0.240109" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Sizers" Version="8.0.240109" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Converters" Version="8.0.240109" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Extensions" Version="8.0.240109" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Animations" Version="8.1.240821" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Collections" Version="8.1.240821" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.1.240821" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.1.240821" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Segmented" Version="8.1.240821" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Sizers" Version="8.1.240821" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Converters" Version="8.1.240821" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Extensions" Version="8.1.240821" />
     <PackageVersion Include="CommunityToolkit.WinUI.UI.Controls.DataGrid" Version="7.1.2" />
     <PackageVersion Include="CommunityToolkit.WinUI.UI.Controls.Markdown" Version="7.1.2" />
     <PackageVersion Include="ControlzEx" Version="6.0.0" />
diff --git a/NOTICE.md b/NOTICE.md
index d4328bbfc40..ca957e45ecd 100644
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -1299,14 +1299,14 @@ EXHIBIT A -Mozilla Public License.
 - Appium.WebDriver 4.4.5
 - Azure.AI.OpenAI 1.0.0-beta.12
 - CommunityToolkit.Mvvm 8.2.2
-- CommunityToolkit.WinUI.Animations 8.0.240109
-- CommunityToolkit.WinUI.Collections 8.0.240109
-- CommunityToolkit.WinUI.Controls.Primitives 8.0.240109
-- CommunityToolkit.WinUI.Controls.Segmented 8.0.240109
-- CommunityToolkit.WinUI.Controls.SettingsControls 8.0.240109
-- CommunityToolkit.WinUI.Controls.Sizers 8.0.240109
-- CommunityToolkit.WinUI.Converters 8.0.240109
-- CommunityToolkit.WinUI.Extensions 8.0.240109
+- CommunityToolkit.WinUI.Animations 8.1.240821
+- CommunityToolkit.WinUI.Collections 8.1.240821
+- CommunityToolkit.WinUI.Controls.Primitives 8.1.240821
+- CommunityToolkit.WinUI.Controls.Segmented 8.1.240821
+- CommunityToolkit.WinUI.Controls.SettingsControls 8.1.240821
+- CommunityToolkit.WinUI.Controls.Sizers 8.1.240821
+- CommunityToolkit.WinUI.Converters 8.1.240821
+- CommunityToolkit.WinUI.Extensions 8.1.240821
 - CommunityToolkit.WinUI.UI.Controls.DataGrid 7.1.2
 - CommunityToolkit.WinUI.UI.Controls.Markdown 7.1.2
 - ControlzEx 6.0.0
diff --git a/src/Common.Dotnet.CsWinRT.props b/src/Common.Dotnet.CsWinRT.props
index 610219427c0..514997e71bf 100644
--- a/src/Common.Dotnet.CsWinRT.props
+++ b/src/Common.Dotnet.CsWinRT.props
@@ -2,8 +2,8 @@
 <!-- Some items may be set in Directory.Build.props in root -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <WindowsSdkPackageVersion>10.0.20348.38</WindowsSdkPackageVersion>
-    <TargetFramework>net8.0-windows10.0.20348.0</TargetFramework>
+    <WindowsSdkPackageVersion>10.0.22621.38</WindowsSdkPackageVersion>
+    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
     <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
     <RuntimeIdentifiers>win-x64;win-arm64</RuntimeIdentifiers>
diff --git a/src/modules/CropAndLock/CropAndLock/CropAndLock.vcxproj b/src/modules/CropAndLock/CropAndLock/CropAndLock.vcxproj
index e9a10fb07b0..0f6c2bb1d1e 100644
--- a/src/modules/CropAndLock/CropAndLock/CropAndLock.vcxproj
+++ b/src/modules/CropAndLock/CropAndLock/CropAndLock.vcxproj
@@ -10,7 +10,7 @@
     <ProjectGuid>{f5e1146e-b7b3-4e11-85fd-270a500bd78c}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>CropAndLock</RootNamespace>
-    <WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.20348.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.22621.0</WindowsTargetPlatformVersion>
     <WindowsTargetPlatformMinVersion>10.0.19041.0</WindowsTargetPlatformMinVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
diff --git a/src/modules/FileLocksmith/FileLocksmithLibInterop/FileLocksmithLibInterop.vcxproj b/src/modules/FileLocksmith/FileLocksmithLibInterop/FileLocksmithLibInterop.vcxproj
index 8d33e3f543f..c4489cdad88 100644
--- a/src/modules/FileLocksmith/FileLocksmithLibInterop/FileLocksmithLibInterop.vcxproj
+++ b/src/modules/FileLocksmith/FileLocksmithLibInterop/FileLocksmithLibInterop.vcxproj
@@ -25,7 +25,7 @@
     <ProjectGuid>{c604b37e-9d0e-4484-8778-e8b31b0e1b3a}</ProjectGuid>
     <ProjectName>PowerToys.FileLocksmithLib.Interop</ProjectName>
     <RootNamespace>PowerToys.FileLocksmithLib.Interop</RootNamespace>
-    <TargetFramework>net8.0-windows10.0.20348.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
     <OutDir>..\..\..\..\$(Platform)\$(Configuration)\WinUI3Apps\</OutDir>
     <TargetName>PowerToys.FileLocksmithLib.Interop</TargetName>
   </PropertyGroup>
diff --git a/src/modules/FileLocksmith/FileLocksmithUI/Properties/PublishProfiles/InstallationPublishProfile.pubxml b/src/modules/FileLocksmith/FileLocksmithUI/Properties/PublishProfiles/InstallationPublishProfile.pubxml
index 800c6473ca7..dc3af21ceae 100644
--- a/src/modules/FileLocksmith/FileLocksmithUI/Properties/PublishProfiles/InstallationPublishProfile.pubxml
+++ b/src/modules/FileLocksmith/FileLocksmithUI/Properties/PublishProfiles/InstallationPublishProfile.pubxml
@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net8.0-windows10.0.20348.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
     <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
     <PublishDir>$(PowerToysRoot)\$(Platform)\$(Configuration)\WinUI3Apps</PublishDir>
diff --git a/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj b/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj
index 96ffb5f91a3..444657646e3 100644
--- a/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj
+++ b/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj
@@ -21,10 +21,6 @@
     <AppxPackage>false</AppxPackage>
     <ApplicationType>Windows Store</ApplicationType>
     <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
-    <OverrideWindowsTargetPlatformVersion>true</OverrideWindowsTargetPlatformVersion>
-    <!-- Even though these are defined in Cpp.Build.props some of the other props referred here override these vales, so we need to specify them. -->
-    <WindowsTargetPlatformVersion>10.0.20348.0</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformMinVersion>10.0.19041.0</WindowsTargetPlatformMinVersion>
     <UseWinUI>true</UseWinUI>
     <WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
     <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
diff --git a/src/modules/Workspaces/WorkspacesLib/WorkspacesLib.vcxproj b/src/modules/Workspaces/WorkspacesLib/WorkspacesLib.vcxproj
index 275933b861a..4ef6d283ecd 100644
--- a/src/modules/Workspaces/WorkspacesLib/WorkspacesLib.vcxproj
+++ b/src/modules/Workspaces/WorkspacesLib/WorkspacesLib.vcxproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
     <ProjectGuid>{b31fcc55-b5a4-4ea7-b414-2dceae6af332}</ProjectGuid>
@@ -49,8 +50,19 @@
       <Project>{d9b8fc84-322a-4f9f-bbb9-20915c47ddfd}</Project>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <Import Project="..\..\..\..\deps\spdlog.props" />
   <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
   </ImportGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/src/modules/Workspaces/WorkspacesLib/WorkspacesLib.vcxproj.filters b/src/modules/Workspaces/WorkspacesLib/WorkspacesLib.vcxproj.filters
index 4f78294c492..f30fd536239 100644
--- a/src/modules/Workspaces/WorkspacesLib/WorkspacesLib.vcxproj.filters
+++ b/src/modules/Workspaces/WorkspacesLib/WorkspacesLib.vcxproj.filters
@@ -38,4 +38,7 @@
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/modules/Workspaces/WorkspacesLib/packages.config b/src/modules/Workspaces/WorkspacesLib/packages.config
new file mode 100644
index 00000000000..09bfc449e21
--- /dev/null
+++ b/src/modules/Workspaces/WorkspacesLib/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
+</packages>
\ No newline at end of file
diff --git a/src/modules/alwaysontop/AlwaysOnTop/WindowCornersUtil.cpp b/src/modules/alwaysontop/AlwaysOnTop/WindowCornersUtil.cpp
index e64ed0fd753..441c01a6dce 100644
--- a/src/modules/alwaysontop/AlwaysOnTop/WindowCornersUtil.cpp
+++ b/src/modules/alwaysontop/AlwaysOnTop/WindowCornersUtil.cpp
@@ -5,21 +5,6 @@
 
 #include <dwmapi.h>
 
-// Placeholder enums since dwmapi.h doesn't have these until SDK 22000.
-// TODO: Remove once SDK targets 22000 or above.
-enum DWMWINDOWATTRIBUTE_CUSTOM
-{
-    DWMWA_WINDOW_CORNER_PREFERENCE = 33
-};
-
-enum DWM_WINDOW_CORNER_PREFERENCE
-{
-    DWMWCP_DEFAULT = 0,
-    DWMWCP_DONOTROUND = 1,
-    DWMWCP_ROUND = 2,
-    DWMWCP_ROUNDSMALL = 3
-};
-
 int WindowCornerUtils::CornerPreference(HWND window) noexcept
 {
     int cornerPreference = -1;
diff --git a/src/modules/fancyzones/FancyZonesLib/WindowUtils.cpp b/src/modules/fancyzones/FancyZonesLib/WindowUtils.cpp
index 76d83569e5d..230eb10be4b 100644
--- a/src/modules/fancyzones/FancyZonesLib/WindowUtils.cpp
+++ b/src/modules/fancyzones/FancyZonesLib/WindowUtils.cpp
@@ -22,22 +22,6 @@ namespace NonLocalizable
     const wchar_t SystemAppsFolder[] = L"SYSTEMAPPS";
 }
 
-// Placeholder enums since dwmapi.h doesn't have these until SDK 22000.
-// TODO: Remove once SDK targets 22000 or above.
-enum DWMWINDOWATTRIBUTE_CUSTOM
-{
-    DWMWA_WINDOW_CORNER_PREFERENCE = 33
-
-};
-
-enum DWM_WINDOW_CORNER_PREFERENCE
-{
-    DWMWCP_DEFAULT = 0,
-    DWMWCP_DONOTROUND = 1,
-    DWMWCP_ROUND = 2,
-    DWMWCP_ROUNDSMALL = 3
-};
-
 namespace
 {
     BOOL CALLBACK saveDisplayToVector(HMONITOR monitor, HDC /*hdc*/, LPRECT /*rect*/, LPARAM data)
diff --git a/src/modules/keyboardmanager/KeyboardManagerEngineLibrary/KeyboardManagerEngineLibrary.vcxproj b/src/modules/keyboardmanager/KeyboardManagerEngineLibrary/KeyboardManagerEngineLibrary.vcxproj
index 21cf6729f20..ede1eb2eef5 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEngineLibrary/KeyboardManagerEngineLibrary.vcxproj
+++ b/src/modules/keyboardmanager/KeyboardManagerEngineLibrary/KeyboardManagerEngineLibrary.vcxproj
@@ -67,6 +67,7 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/src/modules/launcher/PowerLauncher/Properties/PublishProfiles/InstallationPublishProfile.pubxml b/src/modules/launcher/PowerLauncher/Properties/PublishProfiles/InstallationPublishProfile.pubxml
index 74eeb2f9485..0f90e724bff 100644
--- a/src/modules/launcher/PowerLauncher/Properties/PublishProfiles/InstallationPublishProfile.pubxml
+++ b/src/modules/launcher/PowerLauncher/Properties/PublishProfiles/InstallationPublishProfile.pubxml
@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net8.0-windows10.0.20348.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
     <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
     <PublishDir>$(PowerToysRoot)\$(Platform)\$(Configuration)</PublishDir>
diff --git a/src/modules/previewpane/MarkdownPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml b/src/modules/previewpane/MarkdownPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml
index 74eeb2f9485..0f90e724bff 100644
--- a/src/modules/previewpane/MarkdownPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml
+++ b/src/modules/previewpane/MarkdownPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml
@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net8.0-windows10.0.20348.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
     <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
     <PublishDir>$(PowerToysRoot)\$(Platform)\$(Configuration)</PublishDir>
diff --git a/src/modules/previewpane/MonacoPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml b/src/modules/previewpane/MonacoPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml
index 74eeb2f9485..0f90e724bff 100644
--- a/src/modules/previewpane/MonacoPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml
+++ b/src/modules/previewpane/MonacoPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml
@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net8.0-windows10.0.20348.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
     <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
     <PublishDir>$(PowerToysRoot)\$(Platform)\$(Configuration)</PublishDir>
diff --git a/src/modules/previewpane/SvgPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml b/src/modules/previewpane/SvgPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml
index 74eeb2f9485..0f90e724bff 100644
--- a/src/modules/previewpane/SvgPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml
+++ b/src/modules/previewpane/SvgPreviewHandler/Properties/PublishProfiles/InstallationPublishProfile.pubxml
@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net8.0-windows10.0.20348.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
     <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
     <PublishDir>$(PowerToysRoot)\$(Platform)\$(Configuration)</PublishDir>
diff --git a/src/modules/previewpane/SvgThumbnailProvider/Properties/PublishProfiles/InstallationPublishProfile.pubxml b/src/modules/previewpane/SvgThumbnailProvider/Properties/PublishProfiles/InstallationPublishProfile.pubxml
index 74eeb2f9485..0f90e724bff 100644
--- a/src/modules/previewpane/SvgThumbnailProvider/Properties/PublishProfiles/InstallationPublishProfile.pubxml
+++ b/src/modules/previewpane/SvgThumbnailProvider/Properties/PublishProfiles/InstallationPublishProfile.pubxml
@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net8.0-windows10.0.20348.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
     <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
     <PublishDir>$(PowerToysRoot)\$(Platform)\$(Configuration)</PublishDir>
diff --git a/src/settings-ui/Settings.UI/Properties/PublishProfiles/InstallationPublishProfile.pubxml b/src/settings-ui/Settings.UI/Properties/PublishProfiles/InstallationPublishProfile.pubxml
index 800c6473ca7..dc3af21ceae 100644
--- a/src/settings-ui/Settings.UI/Properties/PublishProfiles/InstallationPublishProfile.pubxml
+++ b/src/settings-ui/Settings.UI/Properties/PublishProfiles/InstallationPublishProfile.pubxml
@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net8.0-windows10.0.20348.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
     <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
     <PublishDir>$(PowerToysRoot)\$(Platform)\$(Configuration)\WinUI3Apps</PublishDir>

From 7640258c10e266b10e4d2e71c0120bc0a2a9882a Mon Sep 17 00:00:00 2001
From: Davide Giacometti <25966642+davidegiacometti@users.noreply.github.com>
Date: Thu, 12 Sep 2024 18:31:06 +0200
Subject: [PATCH 07/12] [Settings]WinAppSDK 1.6 Flyout Fix (#34821)

Fixed titlebar and reverted W10 border hack
---
 .../Settings.UI/Helpers/NativeMethods.cs      |  3 ++-
 .../SettingsXAML/FlyoutWindow.xaml            | 13 ---------
 .../SettingsXAML/FlyoutWindow.xaml.cs         |  7 +++++
 .../ViewModels/Flyout/FlyoutViewModel.cs      | 27 -------------------
 4 files changed, 9 insertions(+), 41 deletions(-)

diff --git a/src/settings-ui/Settings.UI/Helpers/NativeMethods.cs b/src/settings-ui/Settings.UI/Helpers/NativeMethods.cs
index 4bb0b1a7f97..c895866c1eb 100644
--- a/src/settings-ui/Settings.UI/Helpers/NativeMethods.cs
+++ b/src/settings-ui/Settings.UI/Helpers/NativeMethods.cs
@@ -10,8 +10,9 @@ namespace Microsoft.PowerToys.Settings.UI.Helpers
 {
     public static class NativeMethods
     {
-        private const int GWL_STYLE = -16;
         private const int WS_POPUP = 1 << 31; // 0x80000000
+        internal const int GWL_STYLE = -16;
+        internal const int WS_CAPTION = 0x00C00000;
         internal const int SPI_GETDESKWALLPAPER = 0x0073;
         internal const int SW_SHOWNORMAL = 1;
         internal const int SW_SHOWMAXIMIZED = 3;
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/FlyoutWindow.xaml b/src/settings-ui/Settings.UI/SettingsXAML/FlyoutWindow.xaml
index 7f9b221bcf6..d6a6f6f2f81 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/FlyoutWindow.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/FlyoutWindow.xaml
@@ -4,8 +4,6 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:flyout="using:Microsoft.PowerToys.Settings.UI.Flyout"
-    xmlns:i="using:Microsoft.Xaml.Interactivity"
-    xmlns:ic="using:Microsoft.Xaml.Interactions.Core"
     xmlns:local="using:Microsoft.PowerToys.Settings.UI"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:winuiex="using:WinUIEx"
@@ -29,17 +27,6 @@
             LightTintOpacity="0" />
     </winuiex:WindowEx.Backdrop>
     <Grid>
-        <!--  HACK: https://github.com/microsoft/microsoft-ui-xaml/issues/7629  -->
-        <!--  W11 grey border, W10: no border  -->
-        <i:Interaction.Behaviors>
-            <ic:DataTriggerBehavior
-                Binding="{x:Bind ViewModel.Windows10}"
-                ComparisonCondition="Equal"
-                Value="True">
-                <ic:ChangePropertyAction PropertyName="BorderThickness" Value="1" />
-                <ic:ChangePropertyAction PropertyName="BorderBrush" Value="{ThemeResource SurfaceStrokeColorDefaultBrush}" />
-            </ic:DataTriggerBehavior>
-        </i:Interaction.Behaviors>
         <flyout:ShellPage x:Name="FlyoutShellPage" />
     </Grid>
 </winuiex:WindowEx>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/FlyoutWindow.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/FlyoutWindow.xaml.cs
index 1835f474a1d..27a20540c9b 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/FlyoutWindow.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/FlyoutWindow.xaml.cs
@@ -28,6 +28,13 @@ public sealed partial class FlyoutWindow : WindowEx
         public FlyoutWindow(POINT? initialPosition)
         {
             this.InitializeComponent();
+
+            // Remove the caption style from the window style. Windows App SDK 1.6 added it, which made the title bar and borders appear for the Flyout. This code removes it.
+            var hwnd = WinRT.Interop.WindowNative.GetWindowHandle(this);
+            var windowStyle = NativeMethods.GetWindowLong(hwnd, NativeMethods.GWL_STYLE);
+            windowStyle &= ~NativeMethods.WS_CAPTION;
+            _ = NativeMethods.SetWindowLong(hwnd, NativeMethods.GWL_STYLE, windowStyle);
+
             this.Activated += FlyoutWindow_Activated;
             FlyoutAppearPosition = initialPosition;
             ViewModel = new FlyoutViewModel();
diff --git a/src/settings-ui/Settings.UI/ViewModels/Flyout/FlyoutViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/Flyout/FlyoutViewModel.cs
index 4b77b1dce64..a8cb2474aa9 100644
--- a/src/settings-ui/Settings.UI/ViewModels/Flyout/FlyoutViewModel.cs
+++ b/src/settings-ui/Settings.UI/ViewModels/Flyout/FlyoutViewModel.cs
@@ -3,11 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.ComponentModel;
-using System.Runtime.CompilerServices;
 using System.Timers;
-using Common.UI;
-using Microsoft.PowerToys.Settings.UI.Library.Utilities;
 
 namespace Microsoft.PowerToys.Settings.UI.ViewModels.Flyout
 {
@@ -18,21 +14,6 @@ public class FlyoutViewModel : IDisposable
 
         public bool CanHide { get; set; }
 
-        private bool _windows10;
-
-        public bool Windows10
-        {
-            get => _windows10;
-            set
-            {
-                if (_windows10 != value)
-                {
-                    _windows10 = value;
-                    OnPropertyChanged();
-                }
-            }
-        }
-
         public FlyoutViewModel()
         {
             CanHide = true;
@@ -40,7 +21,6 @@ public FlyoutViewModel()
             _hideTimer.Elapsed += HideTimer_Elapsed;
             _hideTimer.Interval = 1000;
             _hideTimer.Enabled = false;
-            _windows10 = !OSVersionHelper.IsWindows11();
         }
 
         private void HideTimer_Elapsed(object sender, ElapsedEventArgs e)
@@ -56,13 +36,6 @@ internal void DisableHiding()
             _hideTimer.Start();
         }
 
-        public event PropertyChangedEventHandler PropertyChanged;
-
-        private void OnPropertyChanged([CallerMemberName] string propertyName = null)
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-        }
-
         public void Dispose()
         {
             Dispose(true);

From a536ec6e0ba2289cd6a7639a1045baa37aacf248 Mon Sep 17 00:00:00 2001
From: PesBandi <127593627+PesBandi@users.noreply.github.com>
Date: Thu, 12 Sep 2024 20:38:53 +0200
Subject: [PATCH 08/12] Fix RegEx in I would like to contribute bot (#34844)

* Update resourceManagement.yml

* Update resourceManagement.yml
---
 .github/policies/resourceManagement.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/policies/resourceManagement.yml b/.github/policies/resourceManagement.yml
index 4692cf6ee6b..4a914c64657 100644
--- a/.github/policies/resourceManagement.yml
+++ b/.github/policies/resourceManagement.yml
@@ -236,7 +236,7 @@ configuration:
     - if:
       - payloadType: Issue_Comment
       - commentContains:
-          pattern: 'I would [like|love] [to help|helping|to contribute|contributing|to implement|implementing|to fix|fixing]'
+          pattern: "I(( would|'d) (like|love|be happy)| want) (to help|helping|to contribute|contributing|to implement|implementing|to fix|fixing)"
           isRegex: True
       then:
       - addReply:

From ffd6cdf84f54b8971889a07f7630fad889666b79 Mon Sep 17 00:00:00 2001
From: Stefan Markovic <stefan@janeasystems.com>
Date: Mon, 16 Sep 2024 10:57:41 +0200
Subject: [PATCH 09/12] Add EtwTracer default ctr Add ETLConverter Fix
 AlwaysOnTop

---
 src/common/Telemetry/EtwTrace/EtwTrace.cpp    | 47 +++++++++
 src/common/Telemetry/EtwTrace/EtwTrace.h      |  3 +
 src/modules/alwaysontop/AlwaysOnTop/main.cpp  |  8 +-
 .../AlwaysOnTopModuleInterface/dllmain.cpp    |  4 +
 .../Settings.UI/Helpers/ETLConverter.cs       | 97 +++++++++++++++++++
 .../SettingsXAML/Views/GeneralPage.xaml       |  1 +
 .../SettingsXAML/Views/GeneralPage.xaml.cs    |  5 +
 .../ViewModels/GeneralViewModel.cs            | 46 +++++++++
 8 files changed, 206 insertions(+), 5 deletions(-)
 create mode 100644 src/settings-ui/Settings.UI/Helpers/ETLConverter.cs

diff --git a/src/common/Telemetry/EtwTrace/EtwTrace.cpp b/src/common/Telemetry/EtwTrace/EtwTrace.cpp
index ef50fff9af8..dfe91b980ad 100644
--- a/src/common/Telemetry/EtwTrace/EtwTrace.cpp
+++ b/src/common/Telemetry/EtwTrace/EtwTrace.cpp
@@ -14,6 +14,9 @@ namespace fs = std::filesystem;
 
 namespace
 {
+    constexpr inline const wchar_t* DataDiagnosticsRegKey = L"Software\\Classes\\PowerToys";
+    constexpr inline const wchar_t* ViewDataDiagnosticsRegValueName = L"DataDiagnosticsViewEnabled";
+
     inline std::wstring get_root_save_folder_location()
     {
         PWSTR local_app_path;
@@ -29,12 +32,51 @@ namespace
         }
         return result;
     }
+
+    bool isViewDataDiagnosticEnabled()
+    {
+        HKEY key{};
+        if (RegOpenKeyExW(HKEY_CURRENT_USER,
+                          DataDiagnosticsRegKey,
+                          0,
+                          KEY_READ,
+                          &key) != ERROR_SUCCESS)
+        {
+            return false;
+        }
+
+        DWORD isDataDiagnosticsEnabled = 0;
+        DWORD size = sizeof(isDataDiagnosticsEnabled);
+
+        if (RegGetValueW(
+                HKEY_CURRENT_USER,
+                DataDiagnosticsRegKey,
+                ViewDataDiagnosticsRegValueName,
+                RRF_RT_REG_DWORD,
+                nullptr,
+                &isDataDiagnosticsEnabled,
+                &size) != ERROR_SUCCESS)
+        {
+            RegCloseKey(key);
+            return false;
+        }
+        RegCloseKey(key);
+
+        return isDataDiagnosticsEnabled;
+    }
+
 }
 
 namespace Shared
 {
     namespace Trace
     {
+        ETWTrace::ETWTrace() :
+            ETWTrace(PowerToysProviderGUID)
+        {
+
+        }
+
         ETWTrace::ETWTrace(const std::wstring& providerGUIDstr)
         {
             GUID id;
@@ -161,6 +203,11 @@ namespace Shared
                 return;
             }
 
+            if (!isViewDataDiagnosticEnabled())
+            {
+                return;
+            }
+
             CreateEtwFolderIfNeeded();
             InitEventTraceProperties();
 
diff --git a/src/common/Telemetry/EtwTrace/EtwTrace.h b/src/common/Telemetry/EtwTrace/EtwTrace.h
index bbc61dbfa8a..69c08acec85 100644
--- a/src/common/Telemetry/EtwTrace/EtwTrace.h
+++ b/src/common/Telemetry/EtwTrace/EtwTrace.h
@@ -15,6 +15,9 @@ namespace Shared
         class ETWTrace
         {
         public:
+            static inline const wchar_t* PowerToysProviderGUID = L"{38e8889b-9731-53f5-e901-e8a7c1753074}";
+
+            ETWTrace();
             ETWTrace(const std::wstring& providerGUID);
             ETWTrace(const GUID& providerGUID);
             ~ETWTrace();
diff --git a/src/modules/alwaysontop/AlwaysOnTop/main.cpp b/src/modules/alwaysontop/AlwaysOnTop/main.cpp
index 608205652d2..13e84a9711f 100644
--- a/src/modules/alwaysontop/AlwaysOnTop/main.cpp
+++ b/src/modules/alwaysontop/AlwaysOnTop/main.cpp
@@ -18,7 +18,7 @@ const std::wstring instanceMutexName = L"Local\\PowerToys_AlwaysOnTop_InstanceMu
 
 int WINAPI wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _In_ PWSTR lpCmdLine, _In_ int nCmdShow)
 {
-    Shared::Trace::ETWTrace trace{ L"{38e8889b-9731-53f5-e901-e8a7c1753074}" };
+    Shared::Trace::ETWTrace trace;
     trace.UpdateState(true);
 
     winrt::init_apartment();
@@ -47,7 +47,7 @@ int WINAPI wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance,
     if (!pid.empty())
     {
         auto mainThreadId = GetCurrentThreadId();
-        ProcessWaiter::OnProcessTerminate(pid, [mainThreadId, &trace](int err) {
+        ProcessWaiter::OnProcessTerminate(pid, [mainThreadId](int err) {
             if (err != ERROR_SUCCESS)
             {
                 Logger::error(L"Failed to wait for parent process exit. {}", get_last_error_or_default(err));
@@ -56,8 +56,6 @@ int WINAPI wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance,
             {
                 Logger::trace(L"PowerToys runner exited.");
             }
-            trace.UpdateState(false);
-            trace.Flush();
 
             Logger::trace(L"Exiting AlwaysOnTop");
             PostThreadMessage(mainThreadId, WM_QUIT, 0, 0);
@@ -72,8 +70,8 @@ int WINAPI wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance,
 
     Trace::AlwaysOnTop::UnregisterProvider();
 
-    trace.UpdateState(false);
     trace.Flush();
+    trace.UpdateState(false);
 
     return 0;
 }
diff --git a/src/modules/alwaysontop/AlwaysOnTopModuleInterface/dllmain.cpp b/src/modules/alwaysontop/AlwaysOnTopModuleInterface/dllmain.cpp
index ec8bd1470db..ec540fd6d6a 100644
--- a/src/modules/alwaysontop/AlwaysOnTopModuleInterface/dllmain.cpp
+++ b/src/modules/alwaysontop/AlwaysOnTopModuleInterface/dllmain.cpp
@@ -221,6 +221,10 @@ class AlwaysOnTopModuleInterface : public PowertoyModuleIface
             Trace::AlwaysOnTop::Enable(false);
         }
 
+        // Wait for 1.5 seconds for the process to end process correctly and stop etw tracer
+        WaitForSingleObject(m_hProcess, 1500);
+
+        // If process is still running, terminate it
         if (m_hProcess)
         {
             TerminateProcess(m_hProcess, 0);
diff --git a/src/settings-ui/Settings.UI/Helpers/ETLConverter.cs b/src/settings-ui/Settings.UI/Helpers/ETLConverter.cs
new file mode 100644
index 00000000000..1eb923b1178
--- /dev/null
+++ b/src/settings-ui/Settings.UI/Helpers/ETLConverter.cs
@@ -0,0 +1,97 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using ManagedCommon;
+
+namespace Microsoft.PowerToys.Settings.UI.Helpers
+{
+    public class ETLConverter
+    {
+        private const int TracerptConversionTimeout = 60000; // 60 seconds in milliseconds
+        private const string ETLConversionOutputFormat = "xml"; // Assuming XML output format
+
+        private readonly string etwDirPath;
+
+        private readonly string tracerptPath;
+
+        public ETLConverter(string etwDirPath, string tracerptPath)
+        {
+            this.etwDirPath = etwDirPath;
+            this.tracerptPath = tracerptPath;
+        }
+
+        private bool ETLConversionsFailed { get; set; }
+
+        public async Task ConvertDiagnosticsETLsAsync(CancellationToken cancellationToken = default)
+        {
+            var etlConversionTasks = new List<Task>();
+            var directoryInfo = new DirectoryInfo(etwDirPath);
+
+            foreach (var fileInfo in directoryInfo.GetFiles("*.etl", SearchOption.AllDirectories))
+            {
+                var task = Task.Run(() => ConvertETLAsync(fileInfo.FullName, cancellationToken), cancellationToken);
+                etlConversionTasks.Add(task);
+            }
+
+            try
+            {
+                await Task.WhenAll(etlConversionTasks);
+            }
+            catch (Exception)
+            {
+                ETLConversionsFailed = true;
+            }
+
+            if (ETLConversionsFailed)
+            {
+                throw new InvalidOperationException("One or more ETL conversions failed.");
+            }
+        }
+
+        private void ConvertETLAsync(string etlFilePathToConvert, CancellationToken cancellationToken)
+        {
+            var outputFilePath = Path.ChangeExtension(etlFilePathToConvert, $".{ETLConversionOutputFormat}");
+
+            var tracerPtArguments = $"\"{etlFilePathToConvert}\" -o \"{outputFilePath}\" -lr -y -of {ETLConversionOutputFormat}";
+
+            var startInfo = new ProcessStartInfo
+            {
+                FileName = tracerptPath + "\\tracerpt.exe",
+                Arguments = tracerPtArguments,
+                RedirectStandardOutput = true,
+                RedirectStandardError = true,
+                UseShellExecute = false,
+                CreateNoWindow = true,
+            };
+
+            using (var process = Process.Start(startInfo))
+            {
+                if (process == null)
+                {
+                    Logger.LogError("Failed to start tracerpt process.");
+                }
+
+                var processExited = process.WaitForExit(TracerptConversionTimeout);
+
+                if (!processExited)
+                {
+                    process.Kill();
+                    Logger.LogError("ETL conversion process timed out.");
+                }
+
+                var exitCode = process.ExitCode;
+                if (exitCode != 0)
+                {
+                    Logger.LogError($"ETL conversion failed with exit code {exitCode}.");
+                }
+            }
+        }
+    }
+}
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml
index aa111cbaf14..8c385ae9382 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml
@@ -386,6 +386,7 @@
                                 <tkcontrols:SettingsCard
                                     x:Uid="GeneralPage_ViewDiagnosticDataViewer"
                                     ActionIcon="{ui:FontIcon Glyph=&#xE8A7;}"
+                                    Click="ViewDiagnosticData_Click"
                                     IsClickEnabled="True"
                                     IsEnabled="{x:Bind ViewModel.EnableViewDataDiagnostics, Mode=TwoWay}" />
                             </tkcontrols:SettingsExpander.Items>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml.cs
index a09f1ae51ad..93dff81c29b 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml.cs
@@ -147,5 +147,10 @@ public void RefreshEnabledState()
         {
             ViewModel.RefreshSettingsOnExternalChange();
         }
+
+        private void ViewDiagnosticData_Click(object sender, RoutedEventArgs e)
+        {
+            ViewModel.ViewDiagnosticData();
+        }
     }
 }
diff --git a/src/settings-ui/Settings.UI/ViewModels/GeneralViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/GeneralViewModel.cs
index aa361805b7a..15bc5ea8ea9 100644
--- a/src/settings-ui/Settings.UI/ViewModels/GeneralViewModel.cs
+++ b/src/settings-ui/Settings.UI/ViewModels/GeneralViewModel.cs
@@ -13,6 +13,7 @@
 using System.Threading.Tasks;
 using global::PowerToys.GPOWrapper;
 using ManagedCommon;
+using Microsoft.PowerToys.Settings.UI.Helpers;
 using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.PowerToys.Settings.UI.Library.Helpers;
 using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
@@ -1061,5 +1062,50 @@ internal void RefreshSettingsOnExternalChange()
 
             NotifyPropertyChanged(nameof(EnableDataDiagnostics));
         }
+
+        // Per retention policy
+        private void DeleteDiagnosticDataOlderThan28Days(string etwDirPath)
+        {
+            if (!Directory.Exists(etwDirPath))
+            {
+                return;
+            }
+
+            var directoryInfo = new DirectoryInfo(etwDirPath);
+            var cutoffDate = DateTime.Now.AddDays(-28);
+
+            foreach (var file in directoryInfo.GetFiles())
+            {
+                if (file.LastWriteTime < cutoffDate)
+                {
+                    try
+                    {
+                        file.Delete();
+                    }
+                    catch (Exception ex)
+                    {
+                        Logger.LogError($"Failed to delete file: {file.FullName}. Error: {ex.Message}");
+                    }
+                }
+            }
+        }
+
+        internal void ViewDiagnosticData()
+        {
+            string etwDirPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Microsoft\\PowerToys\\etw");
+            string tracerptPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Windows), "system32");
+
+            // Retention policy
+            DeleteDiagnosticDataOlderThan28Days(etwDirPath);
+
+            ETLConverter converter = new ETLConverter(etwDirPath, tracerptPath);
+            Task.Run(() => converter.ConvertDiagnosticsETLsAsync()).Wait();
+
+            if (Directory.Exists(etwDirPath))
+            {
+                // Open etw dir in FileExplorer
+                Process.Start("explorer.exe", etwDirPath);
+            }
+        }
     }
 }

From e22b09fc7ed4322fb2a4aed3970441c6f0fa0a2e Mon Sep 17 00:00:00 2001
From: Stefan Markovic <stefan@janeasystems.com>
Date: Mon, 16 Sep 2024 12:27:48 +0200
Subject: [PATCH 10/12] WIP

---
 .../ManagedTelemetry/Telemetry/EtwTrace.cs    |  4 +--
 src/modules/CropAndLock/CropAndLock/main.cpp  | 11 ++++---
 .../Settings.UI/SettingsXAML/App.xaml.cs      |  1 -
 .../SettingsXAML/MainWindow.xaml.cs           | 30 ++++++++++++++++---
 4 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/src/common/ManagedTelemetry/Telemetry/EtwTrace.cs b/src/common/ManagedTelemetry/Telemetry/EtwTrace.cs
index 6225ad36b38..0ef11233dc8 100644
--- a/src/common/ManagedTelemetry/Telemetry/EtwTrace.cs
+++ b/src/common/ManagedTelemetry/Telemetry/EtwTrace.cs
@@ -10,11 +10,11 @@
 using Microsoft.Diagnostics.Tracing.Session;
 using Microsoft.PowerToys.Telemetry;
 
-namespace WSACrashHelper
+namespace Microsoft.PowerToys.Telemetry
 {
     /// <summary>
     ///  This class is based loosely on the C++ ETWTrace class in Win32client/Framework project.
-    ///  It is intended to record telemetry events generated by the WSACrashUploader so that end users
+    ///  It is intended to record telemetry events generated by the PowerToys processes so that end users
     ///  can view them if they want.
     /// </summary>
     public class ETWTrace : IDisposable
diff --git a/src/modules/CropAndLock/CropAndLock/main.cpp b/src/modules/CropAndLock/CropAndLock/main.cpp
index d90b75eaef5..3fd18cdaa8c 100644
--- a/src/modules/CropAndLock/CropAndLock/main.cpp
+++ b/src/modules/CropAndLock/CropAndLock/main.cpp
@@ -37,9 +37,6 @@ bool m_running = true;
 
 int WINAPI wWinMain(_In_ HINSTANCE, _In_opt_ HINSTANCE, _In_ PWSTR lpCmdLine, _In_ int)
 {
-    Shared::Trace::ETWTrace trace{ L"{38e8889b-9731-53f5-e901-e8a7c1753074}" };
-    trace.UpdateState(true);
-
     // Initialize COM
     winrt::init_apartment(winrt::apartment_type::single_threaded);
 
@@ -202,6 +199,9 @@ int WINAPI wWinMain(_In_ HINSTANCE, _In_opt_ HINSTANCE, _In_ PWSTR lpCmdLine, _I
     }
 
     m_event_triggers_thread = std::thread([&]() {
+        Shared::Trace::ETWTrace trace;
+        trace.UpdateState(true);
+
         MSG msg;
         HANDLE event_handles[3] = {m_reparent_event_handle, m_thumbnail_event_handle, m_exit_event_handle};
         while (m_running)
@@ -255,6 +255,8 @@ int WINAPI wWinMain(_In_ HINSTANCE, _In_opt_ HINSTANCE, _In_ PWSTR lpCmdLine, _I
                 break;
             }
         }
+        trace.Flush();
+        trace.UpdateState(false);
     });
 
     // Message pump
@@ -273,8 +275,5 @@ int WINAPI wWinMain(_In_ HINSTANCE, _In_opt_ HINSTANCE, _In_ PWSTR lpCmdLine, _I
     CloseHandle(m_exit_event_handle);
     m_event_triggers_thread.join();
 
-    trace.UpdateState(false);
-    trace.Flush();
-
     return util::ShutdownDispatcherQueueControllerAndWait(controller, static_cast<int>(msg.wParam));
 }
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/App.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/App.xaml.cs
index ed841d6a9e7..f624ff1bbaa 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/App.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/App.xaml.cs
@@ -21,7 +21,6 @@
 using Windows.UI.Popups;
 using WinRT.Interop;
 using WinUIEx;
-using WSACrashHelper;
 
 namespace Microsoft.PowerToys.Settings.UI
 {
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/MainWindow.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/MainWindow.xaml.cs
index a27e4337806..0ad4a938ed7 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/MainWindow.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/MainWindow.xaml.cs
@@ -14,16 +14,17 @@
 using Microsoft.UI.Xaml;
 using Windows.Data.Json;
 using WinUIEx;
-using WSACrashHelper;
 
 namespace Microsoft.PowerToys.Settings.UI
 {
     /// <summary>
     /// An empty window that can be used on its own or navigated to within a Frame.
     /// </summary>
-    public sealed partial class MainWindow : WindowEx
+    public sealed partial class MainWindow : WindowEx, IDisposable
     {
-        private static ETWTrace etwTrace = new ETWTrace();
+        private ETWTrace etwTrace = new ETWTrace();
+
+        private bool _disposed;
 
         public MainWindow(bool createHidden = false)
         {
@@ -213,6 +214,7 @@ private void Window_Closed(object sender, WindowEventArgs args)
             if (App.GetOobeWindow() == null)
             {
                 App.ClearSettingsWindow();
+                Dispose();
             }
             else
             {
@@ -220,7 +222,6 @@ private void Window_Closed(object sender, WindowEventArgs args)
                 NativeMethods.ShowWindow(hWnd, NativeMethods.SW_HIDE);
             }
 
-            etwTrace.Dispose();
             App.ThemeService.ThemeChanged -= OnThemeChanged;
         }
 
@@ -244,5 +245,26 @@ internal void EnsurePageIsSelected()
         {
             ShellPage.EnsurePageIsSelected();
         }
+
+        public void Dispose(bool disposing)
+        {
+            if (_disposed)
+            {
+                return;
+            }
+
+            if (disposing)
+            {
+                etwTrace?.Dispose();
+            }
+
+            _disposed = true;
+        }
+
+        public void Dispose()
+        {
+            Dispose(disposing: true);
+            GC.SuppressFinalize(this);
+        }
     }
 }

From c9c9b7b638489cf6ebfe33e00f5c8bebc6c6cb6e Mon Sep 17 00:00:00 2001
From: Stefan Markovic <stefan@janeasystems.com>
Date: Mon, 16 Sep 2024 13:00:53 +0200
Subject: [PATCH 11/12] ColorPickerUI

---
 src/modules/colorPicker/ColorPickerUI/App.xaml.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/modules/colorPicker/ColorPickerUI/App.xaml.cs b/src/modules/colorPicker/ColorPickerUI/App.xaml.cs
index ee74c35199a..ca1809c8037 100644
--- a/src/modules/colorPicker/ColorPickerUI/App.xaml.cs
+++ b/src/modules/colorPicker/ColorPickerUI/App.xaml.cs
@@ -8,6 +8,7 @@
 using System.Windows;
 using ColorPicker.Mouse;
 using ManagedCommon;
+using Microsoft.PowerToys.Telemetry;
 
 namespace ColorPickerUI
 {
@@ -16,6 +17,7 @@ namespace ColorPickerUI
     /// </summary>
     public partial class App : Application, IDisposable
     {
+        private ETWTrace etwTrace = new ETWTrace();
         private Mutex _instanceMutex;
         private static string[] _args;
         private int _powerToysRunnerPid;
@@ -28,6 +30,7 @@ public partial class App : Application, IDisposable
 
         protected override void OnStartup(StartupEventArgs e)
         {
+            etwTrace.Start();
             NativeThreadCTS = new CancellationTokenSource();
             ExitToken = NativeThreadCTS.Token;
 
@@ -81,6 +84,7 @@ protected virtual void Dispose(bool disposing)
                 if (disposing)
                 {
                     _instanceMutex?.Dispose();
+                    etwTrace?.Dispose();
                 }
 
                 disposedValue = true;

From 2d5faa7af06ff4664b3f947b45375927d3b71612 Mon Sep 17 00:00:00 2001
From: Stefan Markovic <stefan@janeasystems.com>
Date: Mon, 16 Sep 2024 13:31:47 +0200
Subject: [PATCH 12/12] move files cleanup

---
 src/settings-ui/Settings.UI/ViewModels/GeneralViewModel.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/settings-ui/Settings.UI/ViewModels/GeneralViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/GeneralViewModel.cs
index 15bc5ea8ea9..27c9a970db3 100644
--- a/src/settings-ui/Settings.UI/ViewModels/GeneralViewModel.cs
+++ b/src/settings-ui/Settings.UI/ViewModels/GeneralViewModel.cs
@@ -159,6 +159,10 @@ public GeneralViewModel(ISettingsRepository<GeneralSettings> settingsRepository,
             {
                 _fileWatcher = Helper.GetFileWatcher(string.Empty, UpdatingSettings.SettingsFile, dispatcherAction);
             }
+
+            // Diagnostic data retention policy
+            string etwDirPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Microsoft\\PowerToys\\etw");
+            DeleteDiagnosticDataOlderThan28Days(etwDirPath);
         }
 
         private static bool _isDevBuild;
@@ -1095,9 +1099,6 @@ internal void ViewDiagnosticData()
             string etwDirPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Microsoft\\PowerToys\\etw");
             string tracerptPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Windows), "system32");
 
-            // Retention policy
-            DeleteDiagnosticDataOlderThan28Days(etwDirPath);
-
             ETLConverter converter = new ETLConverter(etwDirPath, tracerptPath);
             Task.Run(() => converter.ConvertDiagnosticsETLsAsync()).Wait();