xaml format

Signed-off-by: Shawn Yuan (from Dev Box) <shuaiyuan@microsoft.com>

.github/actions/spell-check/excludes.txt

@@ -105,7 +105,6 @@
 ^src/common/notifications/BackgroundActivatorDLL/cpp\.hint$
 ^src/common/sysinternals/Eula/
 ^src/modules/cmdpal/doc/initial-sdk-spec/list-elements-mock-002\.pdn$
-^src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleMarkdownImagesPage\.cs$
 ^src/modules/colorPicker/ColorPickerUI/Shaders/GridShader\.cso$
 ^src/modules/launcher/Plugins/Microsoft\.PowerToys\.Run\.Plugin\.TimeDate/Properties/
 ^src/modules/MouseUtils/MouseJumpUI/MainForm\.resx$

.github/actions/spell-check/expect.txt

@@ -101,6 +101,7 @@ ATX
 ATRIOX
 aumid
 authenticode
+Authenticode
 AUTOBUDDY
 AUTOCHECKBOX
 AUTOHIDE
@@ -315,6 +316,7 @@ CURSORINFO
 cursorpos
 CURSORSHOWING
 CURSORWRAP
+CursorWrap
 customaction
 CUSTOMACTIONTEST
 CUSTOMFORMATPLACEHOLDER
@@ -430,6 +432,7 @@ DSTINVERT
 DString
 DSVG
 dto
+DTo
 DUMMYUNIONNAME
 dutil
 DVASPECT
@@ -463,6 +466,7 @@ EDITKEYBOARD
 EDITSHORTCUTS
 EDITTEXT
 EFile
+ekus
 eku
 emojis
 ENABLEDELAYEDEXPANSION
@@ -1148,6 +1152,7 @@ NONCLIENTMETRICSW
 NONELEVATED
 nonspace
 nonstd
+nullrefs
 NOOWNERZORDER
 NOPARENTNOTIFY
 NOPREFIX
@@ -1187,8 +1192,8 @@ ntfs
 NTSTATUS
 NTSYSAPI
 NULLCURSOR
-nullonfailure
 nullref
+nullonfailure
 numberbox
 nwc
 ocr

.github/actions/spell-check/patterns.txt

@@ -253,7 +253,7 @@ _SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING
 
 # hit-count: 1 file-count: 1
 # Amazon
-\bamazon\.com/[-\w]+/(?:dp/[0-9A-Z]+|)
+\bamazon\.com/[-\w]+/(?:dp/[0-9A-Z]+|)[^"'\s]+
 
 # hit-count: 3 file-count: 3
 # imgur

.pipelines/v2/release.yml

@@ -52,6 +52,8 @@ extends:
       name: SHINE-INT-S
       ${{ if eq(parameters.useVSPreview, true) }}:
         demands: ImageOverride -equals SHINE-VS17-Preview
+      ${{ else }}:
+        image: SHINE-VS17-Latest
       os: windows
     sdl:
       tsa:
@@ -73,6 +75,7 @@ extends:
                 name: SHINE-INT-L
                 demands:
                   # Our INT agents have a large disk mounted at P:\
+                  - WorkFolder -equals P:\_work
                   - ${{ if eq(parameters.useVSPreview, true) }}:
                     - ImageOverride -equals SHINE-VS17-Preview
                 os: windows
@@ -123,6 +126,7 @@ extends:
             parameters:
               pool:
                 name: SHINE-INT-L
+                image: SHINE-VS17-Latest
                 os: windows
               official: true
               codeSign: true

.pipelines/v2/templates/job-build-project.yml

@@ -111,7 +111,6 @@ jobs:
             ${{ else }}:
               OutputBuildPlatform: ${{ platform }}
   variables:
-    NUGET_PACKAGES: 'C:\NuGetPackages' # Some of our build steps cache these here... and it was apparently part of the global environment
     MakeAppxPath: 'C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x86\MakeAppx.exe'
     # Azure DevOps abhors a vacuum
     # If these are blank, expansion will fail later on... which will result in direct substitution of the variable *names*
@@ -140,10 +139,6 @@ jobs:
     - output: pipelineArtifact
       artifactName: $(JobOutputArtifactName)
       targetPath: $(Build.ArtifactStagingDirectory)
-    - output: pipelineArtifact
-      artifactName: $(JobOutputArtifactName)-failure-$(System.JobAttempt)
-      targetPath: $(LogOutputDirectory)
-      condition: or(failed(), canceled())
   steps:
   - checkout: self
     clean: true
@@ -400,7 +395,7 @@ jobs:
   ### HACK: On ARM64 builds, building an app with Windows App SDK copies the x64 WebView2 dll instead of the ARM64 one. This task makes sure the right dll is used.
   - task: CopyFiles@2
     displayName: HACK Copy core WebView2 ARM64 dll to output directory
-    condition: and(succeeded(), eq(variables['BuildPlatform'], 'arm64'))
+    condition: eq(variables['BuildPlatform'],'arm64')
     inputs:
       contents: packages/Microsoft.Web.WebView2.1.0.2903.40/runtimes/win-ARM64/native_uap/Microsoft.Web.WebView2.Core.dll
       targetFolder: $(Build.SourcesDirectory)/ARM64/Release/WinUI3Apps/
@@ -439,11 +434,11 @@ jobs:
       inputs:
         testResultsFormat: VSTest
         testResultsFiles: '**/*.trx'
-      condition: and(succeeded(), ne(variables['BuildPlatform'], 'arm64'))
+      condition: ne(variables['BuildPlatform'],'arm64')
 
     # Native dlls
     - task: VSTest@2
-      condition: and(succeeded(), ne(variables['BuildPlatform'], 'arm64')) # No arm64 agents to run the tests.
+      condition: ne(variables['BuildPlatform'],'arm64') # No arm64 agents to run the tests.
       displayName: 'Native Tests'
       inputs:
         platform: '$(BuildPlatform)'

src/common/UITestAutomation/SettingsConfigHelper.cs

@@ -1,175 +0,0 @@
-// 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.Diagnostics.CodeAnalysis;
-using System.IO;
-using System.Linq;
-using System.Text.Json;
-using Microsoft.PowerToys.Settings.UI.Library;
-using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
-using Microsoft.PowerToys.Settings.UI.Library.Utilities;
-
-namespace Microsoft.PowerToys.UITest
-{
-    /// <summary>
-    /// Helper class for configuring PowerToys settings for UI tests.
-    /// </summary>
-    public class SettingsConfigHelper
-    {
-        private static readonly JsonSerializerOptions IndentedJsonOptions = new() { WriteIndented = true };
-        private static readonly SettingsUtils SettingsUtils = new SettingsUtils();
-
-        /// <summary>
-        /// Configures global PowerToys settings to enable only specified modules and disable all others.
-        /// </summary>
-        /// <param name="modulesToEnable">Array of module names to enable (e.g., "Peek", "FancyZones"). All other modules will be disabled.</param>
-        /// <exception cref="ArgumentNullException">Thrown when modulesToEnable is null.</exception>
-        /// <exception cref="InvalidOperationException">Thrown when settings file operations fail.</exception>
-        [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "This is test code and will not be trimmed")]
-        [UnconditionalSuppressMessage("AOT", "IL3050", Justification = "This is test code and will not be AOT compiled")]
-        public static void ConfigureGlobalModuleSettings(params string[] modulesToEnable)
-        {
-            ArgumentNullException.ThrowIfNull(modulesToEnable);
-
-            try
-            {
-                GeneralSettings settings;
-                try
-                {
-                    settings = SettingsUtils.GetSettingsOrDefault<GeneralSettings>();
-                }
-                catch (Exception ex)
-                {
-                    Debug.WriteLine($"Failed to load settings, creating defaults: {ex.Message}");
-                    settings = new GeneralSettings();
-                }
-
-                string settingsJson = settings.ToJsonString();
-                using (JsonDocument doc = JsonDocument.Parse(settingsJson))
-                {
-                    var options = new JsonSerializerOptions { WriteIndented = true };
-                    var root = doc.RootElement.Clone();
-
-                    if (root.TryGetProperty("enabled", out var enabledElement))
-                    {
-                        var enabledModules = new Dictionary<string, bool>();
-
-                        foreach (var property in enabledElement.EnumerateObject())
-                        {
-                            string moduleName = property.Name;
-
-                            bool shouldEnable = Array.Exists(modulesToEnable, m => string.Equals(m, moduleName, StringComparison.Ordinal));
-                            enabledModules[moduleName] = shouldEnable;
-                        }
-
-                        var settingsDict = JsonSerializer.Deserialize<Dictionary<string, object>>(settingsJson);
-                        if (settingsDict != null)
-                        {
-                            settingsDict["enabled"] = enabledModules;
-                            settingsJson = JsonSerializer.Serialize(settingsDict, IndentedJsonOptions);
-                        }
-                    }
-                }
-
-                SettingsUtils.SaveSettings(settingsJson);
-
-                string enabledList = modulesToEnable.Length > 0 ? string.Join(", ", modulesToEnable) : "none";
-                Debug.WriteLine($"Successfully updated global settings");
-                Debug.WriteLine($"Enabled modules: {enabledList}");
-            }
-            catch (Exception ex)
-            {
-                Debug.WriteLine($"ERROR in ConfigureGlobalModuleSettings: {ex.Message}");
-                throw new InvalidOperationException($"Failed to configure global module settings: {ex.Message}", ex);
-            }
-        }
-
-        /// <summary>
-        /// Updates a module's settings file. If the file doesn't exist, creates it with default content.
-        /// If the file exists, reads it and applies the provided update function to modify the settings.
-        /// </summary>
-        /// <param name="moduleName">The name of the module (e.g., "Peek", "FancyZones").</param>
-        /// <param name="defaultSettingsContent">The default JSON content to use if the settings file doesn't exist.</param>
-        /// <param name="updateSettingsAction">
-        /// A callback function that modifies the settings dictionary. The function receives the deserialized settings
-        /// and should modify it in-place. The function should accept a Dictionary&lt;string, object&gt; and not return a value.
-        /// Example: (settings) => { ((Dictionary&lt;string, object&gt;)settings["properties"])["SomeSetting"] = newValue; }
-        /// </param>
-        /// <exception cref="ArgumentNullException">Thrown when moduleName or updateSettingsAction is null.</exception>
-        /// <exception cref="InvalidOperationException">Thrown when settings file operations fail.</exception>
-        [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "This is test code and will not be trimmed")]
-        [UnconditionalSuppressMessage("AOT", "IL3050", Justification = "This is test code and will not be AOT compiled")]
-        public static void UpdateModuleSettings(
-            string moduleName,
-            string defaultSettingsContent,
-            Action<Dictionary<string, object>> updateSettingsAction)
-        {
-            ArgumentNullException.ThrowIfNull(moduleName);
-            ArgumentNullException.ThrowIfNull(updateSettingsAction);
-
-            try
-            {
-                // Build the path to the module settings file
-                string powerToysSettingsDirectory = Path.Combine(
-                    Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
-                    "Microsoft",
-                    "PowerToys");
-
-                string moduleDirectory = Path.Combine(powerToysSettingsDirectory, moduleName);
-                string settingsPath = Path.Combine(moduleDirectory, "settings.json");
-
-                // Ensure directory exists
-                Directory.CreateDirectory(moduleDirectory);
-
-                // Read existing settings or use default
-                string existingJson = string.Empty;
-                if (File.Exists(settingsPath))
-                {
-                    existingJson = File.ReadAllText(settingsPath);
-                }
-
-                Dictionary<string, object>? settings;
-
-                // If file doesn't exist or is empty, create from defaults
-                if (string.IsNullOrWhiteSpace(existingJson))
-                {
-                    if (string.IsNullOrWhiteSpace(defaultSettingsContent))
-                    {
-                        throw new ArgumentException("Default settings content must be provided when file doesn't exist.", nameof(defaultSettingsContent));
-                    }
-
-                    settings = JsonSerializer.Deserialize<Dictionary<string, object>>(defaultSettingsContent)
-                               ?? throw new InvalidOperationException($"Failed to deserialize default settings for {moduleName}");
-
-                    Debug.WriteLine($"Created default settings for {moduleName} at {settingsPath}");
-                }
-                else
-                {
-                    // Parse existing settings
-                    settings = JsonSerializer.Deserialize<Dictionary<string, object>>(existingJson)
-                               ?? throw new InvalidOperationException($"Failed to deserialize existing settings for {moduleName}");
-
-                    Debug.WriteLine($"Loaded existing settings for {moduleName} from {settingsPath}");
-                }
-
-                // Apply the update action to modify settings
-                updateSettingsAction(settings);
-
-                // Serialize and save the updated settings using SettingsUtils
-                string updatedJson = JsonSerializer.Serialize(settings, IndentedJsonOptions);
-                SettingsUtils.SaveSettings(updatedJson, moduleName);
-
-                Debug.WriteLine($"Successfully updated settings for {moduleName}");
-            }
-            catch (Exception ex)
-            {
-                Debug.WriteLine($"ERROR in UpdateModuleSettings for {moduleName}: {ex.Message}");
-                throw new InvalidOperationException($"Failed to update settings for {moduleName}: {ex.Message}", ex);
-            }
-        }
-    }
-}

src/common/UITestAutomation/UITestAutomation.csproj

@@ -8,7 +8,7 @@
     <Nullable>enable</Nullable>
     <PublishAot>true</PublishAot>
     <InvariantGlobalization>true</InvariantGlobalization>
-    <TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
+    <TargetFramework>net9.0-windows10.0.22621.0</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
     <PublishTrimmed>false</PublishTrimmed>
   </PropertyGroup>
@@ -21,8 +21,4 @@
     <PackageReference Include="CoenM.ImageSharp.ImageHash" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\settings-ui\Settings.UI.Library\Settings.UI.Library.csproj" />
-  </ItemGroup>
-
 </Project>

src/modules/NewPlus/NewShellExtensionContextMenu.win10/NewPlus.ShellExtension.win10.vcxproj

@@ -46,7 +46,7 @@
       <PreprocessorDefinitions>_DEBUG;NEWPLUSSHELLEXTENSIONWIN10_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeader>Use</PrecompiledHeader>
-      <AdditionalIncludeDirectories>..\..\..\common\Telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories);..\NewShellExtensionContextMenu;$(MSBuildThisFileDirectory)Generated Files</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\common\Telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories);..\NewShellExtensionContextMenu</AdditionalIncludeDirectories>
       <CompileAsWinRT>false</CompileAsWinRT>
       <LanguageStandard>stdcpplatest</LanguageStandard>
     </ClCompile>
@@ -67,7 +67,7 @@
       <PreprocessorDefinitions>NDEBUG;NEWPLUSSHELLEXTENSIONWIN10_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeader>Use</PrecompiledHeader>
-      <AdditionalIncludeDirectories>..\..\..\common\Telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories);..\NewShellExtensionContextMenu;$(MSBuildThisFileDirectory)Generated Files</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\common\Telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories);..\NewShellExtensionContextMenu</AdditionalIncludeDirectories>
       <CompileAsWinRT>false</CompileAsWinRT>
       <LanguageStandard>stdcpplatest</LanguageStandard>
     </ClCompile>

src/modules/awake/Awake/Core/Native/Bridge.cs

@@ -88,6 +88,9 @@ namespace Awake.Core.Native
         [return: MarshalAs(UnmanagedType.Bool)]
         internal static extern bool GetCursorPos(out Point lpPoint);
 
+        [DllImport("user32.dll", SetLastError = true)]
+        internal static extern bool ScreenToClient(IntPtr hWnd, ref Point lpPoint);
+
         [DllImport("user32.dll", SetLastError = true)]
         internal static extern bool GetMessage(out Msg lpMsg, IntPtr hWnd, uint wMsgFilterMin, uint wMsgFilterMax);
 

src/modules/awake/Awake/Core/TrayHelper.cs

@@ -61,8 +61,9 @@ namespace Awake.Core
 
             Bridge.SetForegroundWindow(hWnd);
 
-            // Get cursor position in screen coordinates
+            // Get cursor position and convert it to client coordinates
             Bridge.GetCursorPos(out Models.Point cursorPos);
+            Bridge.ScreenToClient(hWnd, ref cursorPos);
 
             // Set menu information
             MenuInfo menuInfo = new()

src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/GlobalErrorHandler.cs

@@ -51,10 +51,10 @@ internal sealed partial class GlobalErrorHandler
         // without its exception being observed. It is NOT raised immediately
         // when the Task faults; timing depends on GC finalization.
         e.SetObserved();
-        HandleException(e.Exception, Context.UnobservedTaskException);
+        HandleException(e.Exception, Context.UnobservedTaskException, isRecoverable: true);
     }
 
-    private static void HandleException(Exception ex, Context context)
+    private void HandleException(Exception ex, Context context, bool isRecoverable = false)
     {
         Logger.LogError($"Unhandled exception detected ({context})", ex);
 
@@ -70,25 +70,10 @@ internal sealed partial class GlobalErrorHandler
 
             StoreReport(report, storeOnDesktop: false);
 
-            string message;
-            string caption;
-            try
-            {
-                message = ResourceLoaderInstance.GetString("GlobalErrorHandler_CrashMessageBox_Message");
-                caption = ResourceLoaderInstance.GetString("GlobalErrorHandler_CrashMessageBox_Caption");
-            }
-            catch
-            {
-                // The resource loader may not be available if the exception occurred during startup.
-                // Fall back to hardcoded strings in that case.
-                message = "Command Palette has encountered a fatal error and must close.";
-                caption = "Command Palette - Fatal error";
-            }
-
             PInvoke.MessageBox(
                 HWND.Null,
-                message,
-                caption,
+                "Command Palette has encountered a fatal error and must close.\n\nAn error report has been saved to your desktop.",
+                "Unhandled Error",
                 MESSAGEBOX_STYLE.MB_ICONERROR);
         }
     }

src/modules/cmdpal/Microsoft.CmdPal.UI/Strings/en-us/Resources.resw

@@ -431,8 +431,8 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
   <data name="Run_Radio_Position_LastPosition.Content" xml:space="preserve">
     <value>Last Position</value>
     <comment>Reopen the window where it was last closed</comment>
-  </data>
-  <data name="TrayMenu_Settings" xml:space="preserve">
+  </data> 
+  <data name="TrayMenu_Settings" xml:space="preserve">  
     <value>Settings</value>
   </data>
   <data name="TrayMenu_Close" xml:space="preserve">
@@ -493,34 +493,28 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
   <data name="Settings_ExtensionsPage_Reloading_Text.Text" xml:space="preserve">
     <value>Reloading extensions..</value>
   </data>
-  <data name="Settings_ExtensionsPage_Banner_Header.Text" xml:space="preserve">
+	<data name="Settings_ExtensionsPage_Banner_Header.Text" xml:space="preserve">
     <value>Discover more extensions</value>
   </data>
-  <data name="Settings_ExtensionsPage_Banner_Description.Text" xml:space="preserve">
+	<data name="Settings_ExtensionsPage_Banner_Description.Text" xml:space="preserve">
     <value>Find more extensions on the Microsoft Store or WinGet.</value>
   </data>
-  <data name="Settings_ExtensionsPage_Banner_Hyperlink.Content" xml:space="preserve">
+	<data name="Settings_ExtensionsPage_Banner_Hyperlink.Content" xml:space="preserve">
     <value>Learn how to create your own extensions</value>
   </data>
-  <data name="Settings_ExtensionsPage_FindExtensions_MicrosoftStore.[using:Microsoft.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+	<data name="Settings_ExtensionsPage_FindExtensions_MicrosoftStore.[using:Microsoft.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>Find extensions on the Microsoft Store</value>
   </data>
-  <data name="Settings_ExtensionsPage_FindExtensions_MicrosoftStore.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+	<data name="Settings_ExtensionsPage_FindExtensions_MicrosoftStore.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Microsoft Store</value>
   </data>
-  <data name="Settings_ExtensionsPage_FindExtensions_WinGet.[using:Microsoft.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+	<data name="Settings_ExtensionsPage_FindExtensions_WinGet.[using:Microsoft.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>Find extensions on WinGet</value>
   </data>
-  <data name="Settings_ExtensionsPage_FindExtensions_WinGet.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+	<data name="Settings_ExtensionsPage_FindExtensions_WinGet.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Microsoft Store</value>
   </data>
-  <data name="Settings_ExtensionsPage_SearchBox_Placeholder.PlaceholderText" xml:space="preserve">
+	<data name="Settings_ExtensionsPage_SearchBox_Placeholder.PlaceholderText" xml:space="preserve">
     <value>Search extensions</value>
   </data>
-  <data name="GlobalErrorHandler_CrashMessageBox_Message" xml:space="preserve">
-    <value>Command Palette has encountered a fatal error and must close.</value>
-  </data>
-  <data name="GlobalErrorHandler_CrashMessageBox_Caption" xml:space="preserve">
-    <value>Command Palette - Fatal error</value>
-  </data>
 </root>

src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleListPageWithDetails.cs

@@ -63,7 +63,7 @@ internal sealed partial class SampleListPageWithDetails : ListPage
                 Details = new Details()
                 {
                     Title = "Hero Image Example",
-                    HeroImage = new IconInfo("https://m.media-amazon.com/images/M/MV5BNDBkMzVmNGQtYTM2OC00OWRjLTk5OWMtNzNkMDI4NjFjNTZmXkEyXkFqcGdeQXZ3ZXNsZXk@._V1_QL75_UX500_CR0,0,500,281_.jpg"), /* #no-spell-check-line */
+                    HeroImage = new IconInfo("https://m.media-amazon.com/images/M/MV5BNDBkMzVmNGQtYTM2OC00OWRjLTk5OWMtNzNkMDI4NjFjNTZmXkEyXkFqcGdeQXZ3ZXNsZXk@._V1_QL75_UX500_CR0,0,500,281_.jpg"),
                     Body = "It is literally an image of a hero",
                 },
             },

src/modules/imageresizer/tests/Models/ResizeBatchTests.cs

@@ -10,7 +10,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading;
-using ImageResizer.Properties;
+
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using Moq.Protected;
@@ -101,9 +101,7 @@ namespace ImageResizer.Models
         private static ResizeBatch CreateBatch(Action<string> executeAction)
         {
             var mock = new Mock<ResizeBatch> { CallBase = true };
-            mock.Protected()
-                .Setup("Execute", ItExpr.IsAny<string>(), ItExpr.IsAny<Settings>())
-                .Callback((string file, Settings settings) => executeAction(file));
+            mock.Protected().Setup("Execute", ItExpr.IsAny<string>()).Callback(executeAction);
 
             return mock.Object;
         }

src/modules/imageresizer/ui/Models/ResizeBatch.cs

@@ -87,14 +87,9 @@ namespace ImageResizer.Models
         public IEnumerable<ResizeError> Process(Action<int, double> reportProgress, CancellationToken cancellationToken)
         {
             double total = Files.Count;
-            int completed = 0;
+            var completed = 0;
             var errors = new ConcurrentBag<ResizeError>();
 
-            // NOTE: Settings.Default is captured once before parallel processing.
-            // Any changes to settings on disk during this batch will NOT be reflected until the next batch.
-            // This improves performance and predictability by avoiding repeated mutex acquisition and behaviour change results in a batch.
-            var settings = Settings.Default;
-
             // TODO: If we ever switch to Windows.Graphics.Imaging, we can get a lot more throughput by using the async
             //       APIs and a custom SynchronizationContext
             Parallel.ForEach(
@@ -102,12 +97,13 @@ namespace ImageResizer.Models
                 new ParallelOptions
                 {
                     CancellationToken = cancellationToken,
+                    MaxDegreeOfParallelism = Environment.ProcessorCount,
                 },
                 (file, state, i) =>
                 {
                     try
                     {
-                        Execute(file, settings);
+                        Execute(file);
                     }
                     catch (Exception ex)
                     {
@@ -115,13 +111,14 @@ namespace ImageResizer.Models
                     }
 
                     Interlocked.Increment(ref completed);
+
                     reportProgress(completed, total);
                 });
 
             return errors;
         }
 
-        protected virtual void Execute(string file, Settings settings)
-            => new ResizeOperation(file, DestinationDirectory, settings).Execute();
+        protected virtual void Execute(string file)
+            => new ResizeOperation(file, DestinationDirectory, Settings.Default).Execute();
     }
 }

src/modules/imageresizer/ui/Properties/Settings.cs

@@ -461,42 +461,33 @@ namespace ImageResizer.Properties
             {
             }
 
-            if (App.Current?.Dispatcher != null)
+            // Needs to be called on the App UI thread as the properties are bound to the UI.
+            App.Current.Dispatcher.Invoke(() =>
             {
-                // Needs to be called on the App UI thread as the properties are bound to the UI.
-                App.Current.Dispatcher.Invoke(() => ReloadCore(jsonSettings));
-            }
-            else
-            {
-                ReloadCore(jsonSettings);
-            }
+                ShrinkOnly = jsonSettings.ShrinkOnly;
+                Replace = jsonSettings.Replace;
+                IgnoreOrientation = jsonSettings.IgnoreOrientation;
+                RemoveMetadata = jsonSettings.RemoveMetadata;
+                JpegQualityLevel = jsonSettings.JpegQualityLevel;
+                PngInterlaceOption = jsonSettings.PngInterlaceOption;
+                TiffCompressOption = jsonSettings.TiffCompressOption;
+                FileName = jsonSettings.FileName;
+                KeepDateModified = jsonSettings.KeepDateModified;
+                FallbackEncoder = jsonSettings.FallbackEncoder;
+                CustomSize = jsonSettings.CustomSize;
+                SelectedSizeIndex = jsonSettings.SelectedSizeIndex;
+
+                if (jsonSettings.Sizes.Count > 0)
+                {
+                    Sizes.Clear();
+                    Sizes.AddRange(jsonSettings.Sizes);
+
+                    // Ensure Ids are unique and handle missing Ids
+                    IdRecoveryHelper.RecoverInvalidIds(Sizes);
+                }
+            });
 
             _jsonMutex.ReleaseMutex();
         }
-
-        private void ReloadCore(Settings jsonSettings)
-        {
-            ShrinkOnly = jsonSettings.ShrinkOnly;
-            Replace = jsonSettings.Replace;
-            IgnoreOrientation = jsonSettings.IgnoreOrientation;
-            RemoveMetadata = jsonSettings.RemoveMetadata;
-            JpegQualityLevel = jsonSettings.JpegQualityLevel;
-            PngInterlaceOption = jsonSettings.PngInterlaceOption;
-            TiffCompressOption = jsonSettings.TiffCompressOption;
-            FileName = jsonSettings.FileName;
-            KeepDateModified = jsonSettings.KeepDateModified;
-            FallbackEncoder = jsonSettings.FallbackEncoder;
-            CustomSize = jsonSettings.CustomSize;
-            SelectedSizeIndex = jsonSettings.SelectedSizeIndex;
-
-            if (jsonSettings.Sizes.Count > 0)
-            {
-                Sizes.Clear();
-                Sizes.AddRange(jsonSettings.Sizes);
-
-                // Ensure Ids are unique and handle missing Ids
-                IdRecoveryHelper.RecoverInvalidIds(Sizes);
-            }
-        }
     }
 }

src/modules/peek/Peek.FilePreviewer/Previewers/MediaPreviewer/AudioPreviewer.cs

@@ -24,15 +24,13 @@ using Windows.Storage;
 
 namespace Peek.FilePreviewer.Previewers.MediaPreviewer
 {
-    public partial class AudioPreviewer : ObservableObject, IDisposable, IAudioPreviewer
+    public partial class AudioPreviewer : ObservableObject, IAudioPreviewer
     {
-        private MediaSource? _mediaSource;
-
         [ObservableProperty]
         private PreviewState _state;
 
         [ObservableProperty]
-        private AudioPreviewData? _preview;
+        private AudioPreviewData _preview;
 
         private IFileSystemItem Item { get; }
 
@@ -42,6 +40,7 @@ namespace Peek.FilePreviewer.Previewers.MediaPreviewer
         {
             Item = file;
             Dispatcher = DispatcherQueue.GetForCurrentThread();
+            Preview = new AudioPreviewData();
         }
 
         public async Task CopyAsync()
@@ -64,23 +63,19 @@ namespace Peek.FilePreviewer.Previewers.MediaPreviewer
         {
             State = PreviewState.Loading;
 
-            Preview = new AudioPreviewData();
-
             var thumbnailTask = LoadThumbnailAsync(cancellationToken);
             var sourceTask = LoadSourceAsync(cancellationToken);
             var metadataTask = LoadMetadataAsync(cancellationToken);
 
             await Task.WhenAll(thumbnailTask, sourceTask, metadataTask);
 
-            if (sourceTask.Result && metadataTask.Result)
+            if (!thumbnailTask.Result || !sourceTask.Result || !metadataTask.Result)
             {
-                State = PreviewState.Loaded;
+                State = PreviewState.Error;
             }
             else
             {
-                // Release all resources on error.
-                Unload();
-                State = PreviewState.Error;
+                State = PreviewState.Loaded;
             }
         }
 
@@ -93,15 +88,12 @@ namespace Peek.FilePreviewer.Previewers.MediaPreviewer
                 {
                     cancellationToken.ThrowIfCancellationRequested();
 
-                    if (Preview != null)
-                    {
-                        var thumbnail = await ThumbnailHelper.GetThumbnailAsync(Item.Path, cancellationToken)
-                            ?? await ThumbnailHelper.GetIconAsync(Item.Path, cancellationToken);
+                    var thumbnail = await ThumbnailHelper.GetThumbnailAsync(Item.Path, cancellationToken)
+                        ?? await ThumbnailHelper.GetIconAsync(Item.Path, cancellationToken);
 
-                        cancellationToken.ThrowIfCancellationRequested();
+                    cancellationToken.ThrowIfCancellationRequested();
 
-                        Preview.Thumbnail = thumbnail ?? new SvgImageSource(new Uri("ms-appx:///Assets/Peek/DefaultFileIcon.svg"));
-                    }
+                    Preview.Thumbnail = thumbnail ?? new SvgImageSource(new Uri("ms-appx:///Assets/Peek/DefaultFileIcon.svg"));
                 });
             });
         }
@@ -118,11 +110,7 @@ namespace Peek.FilePreviewer.Previewers.MediaPreviewer
                 {
                     cancellationToken.ThrowIfCancellationRequested();
 
-                    if (Preview != null)
-                    {
-                        _mediaSource = MediaSource.CreateFromStorageFile(storageFile);
-                        Preview.MediaSource = _mediaSource;
-                    }
+                    Preview.MediaSource = MediaSource.CreateFromStorageFile(storageFile);
                 });
             });
         }
@@ -135,11 +123,6 @@ namespace Peek.FilePreviewer.Previewers.MediaPreviewer
 
                 await Dispatcher.RunOnUiThread(() =>
                 {
-                    if (Preview == null)
-                    {
-                        return;
-                    }
-
                     cancellationToken.ThrowIfCancellationRequested();
                     Preview.Title = PropertyStoreHelper.TryGetStringProperty(Item.Path, PropertyKey.MusicTitle)
                         ?? Item.Name[..^Item.Extension.Length];
@@ -177,22 +160,6 @@ namespace Peek.FilePreviewer.Previewers.MediaPreviewer
             return _supportedFileTypes.Contains(item.Extension);
         }
 
-        public void Dispose()
-        {
-            Unload();
-            GC.SuppressFinalize(this);
-        }
-
-        /// <summary>
-        /// Explicitly unloads the preview and releases file resources.
-        /// </summary>
-        public void Unload()
-        {
-            _mediaSource?.Dispose();
-            _mediaSource = null;
-            Preview = null;
-        }
-
         private static readonly HashSet<string> _supportedFileTypes = new()
         {
             ".aac",

src/modules/peek/Peek.FilePreviewer/Previewers/MediaPreviewer/VideoPreviewer.cs

@@ -25,8 +25,6 @@ namespace Peek.FilePreviewer.Previewers
 {
     public partial class VideoPreviewer : ObservableObject, IVideoPreviewer, IDisposable
     {
-        private MediaSource? _mediaSource;
-
         [ObservableProperty]
         private MediaSource? preview;
 
@@ -58,7 +56,6 @@ namespace Peek.FilePreviewer.Previewers
 
         public void Dispose()
         {
-            Unload();
             GC.SuppressFinalize(this);
         }
 
@@ -148,8 +145,7 @@ namespace Peek.FilePreviewer.Previewers
                         MissingCodecName = missingCodecName;
                     }
 
-                    _mediaSource = MediaSource.CreateFromStorageFile(storageFile);
-                    Preview = _mediaSource;
+                    Preview = MediaSource.CreateFromStorageFile(storageFile);
                 });
             });
         }
@@ -159,16 +155,6 @@ namespace Peek.FilePreviewer.Previewers
             return !(VideoTask?.Result ?? true);
         }
 
-        /// <summary>
-        /// Explicitly unloads the preview and releases file resources.
-        /// </summary>
-        public void Unload()
-        {
-            _mediaSource?.Dispose();
-            _mediaSource = null;
-            Preview = null;
-        }
-
         private static readonly HashSet<string> _supportedFileTypes = new()
         {
             ".mp4", ".3g2", ".3gp", ".3gp2", ".3gpp", ".asf", ".avi", ".m2t", ".m2ts",

src/modules/peek/Peek.UITests/PeekFilePreviewTests.cs

@@ -9,7 +9,6 @@ using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.PowerToys.UITest;
@@ -36,105 +35,6 @@ public class PeekFilePreviewTests : UITestBase
     {
     }
 
-    static PeekFilePreviewTests()
-    {
-        FixSettingsFileBeforeTests();
-    }
-
-    private static readonly JsonSerializerOptions IndentedJsonOptions = new() { WriteIndented = true };
-
-    private static void FixSettingsFileBeforeTests()
-    {
-        try
-        {
-            // Default Peek settings
-            string peekSettingsContent = @"{
-                  ""name"": ""Peek"",
-                  ""version"": ""1.0"",
-                  ""properties"": {
-                    ""ActivationShortcut"": {
-                      ""win"": false,
-                      ""ctrl"": true,
-                      ""alt"": false,
-                      ""shift"": false,
-                      ""code"": 32,
-                      ""key"": ""Space""
-                    },
-                    ""AlwaysRunNotElevated"": {
-                      ""value"": true
-                    },
-                    ""CloseAfterLosingFocus"": {
-                      ""value"": false
-                    },
-                    ""ConfirmFileDelete"": {
-                      ""value"": true
-                    },
-                    ""EnableSpaceToActivate"": {
-                      ""value"": false
-                    }
-                  }
-                }";
-
-            // Update Peek module settings
-            SettingsConfigHelper.UpdateModuleSettings(
-                "Peek",
-                peekSettingsContent,
-                (settings) =>
-                {
-                    // Get or ensure properties section exists
-                    Dictionary<string, object> properties;
-
-                    if (settings.TryGetValue("properties", out var propertiesObj))
-                    {
-                        if (propertiesObj is Dictionary<string, object> dict)
-                        {
-                            properties = dict;
-                        }
-                        else if (propertiesObj is JsonElement jsonElem)
-                        {
-                            properties = JsonSerializer.Deserialize<Dictionary<string, object>>(jsonElem.GetRawText())
-                                        ?? throw new InvalidOperationException("Failed to deserialize properties");
-                        }
-                        else
-                        {
-                            properties = new Dictionary<string, object>();
-                        }
-                    }
-                    else
-                    {
-                        properties = new Dictionary<string, object>();
-                    }
-
-                    // Update the required properties
-                    properties["ActivationShortcut"] = new Dictionary<string, object>
-                    {
-                        { "win", false },
-                        { "ctrl", true },
-                        { "alt", false },
-                        { "shift", false },
-                        { "code", 32 },
-                        { "key", "Space" },
-                    };
-
-                    properties["EnableSpaceToActivate"] = new Dictionary<string, object>
-                    {
-                        { "value", false },
-                    };
-
-                    settings["properties"] = properties;
-                });
-
-            // Disable all modules except Peek in global settings
-            SettingsConfigHelper.ConfigureGlobalModuleSettings("Peek");
-
-            Debug.WriteLine("Successfully updated all settings - Peek shortcut configured and all modules except Peek disabled");
-        }
-        catch (Exception ex)
-        {
-            Assert.Fail($"ERROR in FixSettingsFileBeforeTests: {ex.Message}");
-        }
-    }
-
     [TestInitialize]
     public void TestInitialize()
     {

src/modules/poweraccent/PowerAccent.Core/Languages.cs

@@ -212,7 +212,7 @@ namespace PowerAccent.Core
                 LetterKey.VK_L => new[] { "ļ", "₺" }, // ₺ is in VK_T for other languages, but not VK_L, so we add it here.
                 LetterKey.VK_M => new[] { "ṁ" },
                 LetterKey.VK_N => new[] { "ņ", "ṅ", "ⁿ", "ℕ", "№" },
-                LetterKey.VK_O => new[] { "ȯ", "∅", "⌀" },
+                LetterKey.VK_O => new[] { "ȯ", "∅" },
                 LetterKey.VK_P => new[] { "ṗ", "℗", "∏", "¶" },
                 LetterKey.VK_Q => new[] { "ℚ" },
                 LetterKey.VK_R => new[] { "ṙ", "®", "ℝ" },

src/runner/runner.vcxproj

@@ -28,7 +28,6 @@
     <PlatformToolset>v143</PlatformToolset>
     <WindowsPackageType>None</WindowsPackageType>
     <WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
-    <WindowsAppSdkUndockedRegFreeWinRTInitialize>true</WindowsAppSdkUndockedRegFreeWinRTInitialize>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

src/settings-ui/Settings.UI/SettingsXAML/Controls/Dashboard/ShortcutConflictControl.xaml

@@ -9,10 +9,7 @@
     mc:Ignorable="d">
 
     <Grid>
-        <Button
-            x:Uid="ShortcutConflictControl_Automation"
-            Click="ShortcutConflictBtn_Click"
-            Style="{StaticResource SubtleButtonStyle}">
+        <Button Click="ShortcutConflictBtn_Click" Style="{StaticResource SubtleButtonStyle}">
             <Grid ColumnSpacing="16">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto" />

src/settings-ui/Settings.UI/SettingsXAML/Flyout/LaunchPage.xaml

@@ -111,8 +111,7 @@
                 x:Uid="UpdateAvailableInfoBar"
                 IsClosable="False"
                 IsOpen="{x:Bind ViewModel.IsUpdateAvailable, Mode=OneWay}"
-                Severity="Success"
-                Tapped="UpdateInfoBar_Tapped" />
+                Severity="Success" />
 
             <StackPanel
                 Grid.Row="1"
@@ -145,6 +144,7 @@
                 <Button
                     x:Name="SettingsBtn"
                     x:Uid="SettingsBtn"
+                    Padding="8"
                     Click="SettingsBtn_Click"
                     Style="{StaticResource FlyoutButtonStyle}">
                     <ToolTipService.ToolTip>

src/settings-ui/Settings.UI/SettingsXAML/Flyout/LaunchPage.xaml.cs

@@ -10,7 +10,6 @@ using Microsoft.PowerToys.Settings.UI.Controls;
 using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.PowerToys.Settings.UI.Library.Telemetry.Events;
 using Microsoft.PowerToys.Settings.UI.ViewModels;
-using Microsoft.PowerToys.Settings.UI.Views;
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
@@ -184,14 +183,5 @@ namespace Microsoft.PowerToys.Settings.UI.Flyout
             // Closing manually the flyout since no window will steal the focus
             App.GetFlyoutWindow()?.Hide();
         }
-
-        private void UpdateInfoBar_Tapped(object sender, Microsoft.UI.Xaml.Input.TappedRoutedEventArgs e)
-        {
-            // Hide the flyout before opening settings window
-            App.GetFlyoutWindow()?.Hide();
-
-            // Open Settings window directly to General page where update controls are located
-            App.OpenSettingsWindow(typeof(GeneralPage));
-        }
     }
 }

src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml

@@ -240,7 +240,6 @@
                         <ComboBox
                             x:Name="Languages_ComboBox"
                             MinWidth="{StaticResource SettingActionControlMinWidth}"
-                            AutomationProperties.Name="{Binding ElementName=LanguageHeader, Path=Header}"
                             DisplayMemberPath="Language"
                             ItemsSource="{Binding Languages, Mode=TwoWay}"
                             SelectedIndex="{Binding LanguagesIndex, Mode=TwoWay}" />
@@ -263,10 +262,7 @@
                         <tkcontrols:SettingsCard.Description>
                             <HyperlinkButton x:Uid="Windows_Color_Settings" Click="OpenColorsSettings_Click" />
                         </tkcontrols:SettingsCard.Description>
-                        <ComboBox
-                            MinWidth="{StaticResource SettingActionControlMinWidth}"
-                            AutomationProperties.Name="{Binding ElementName=ColorModeHeader, Path=Header}"
-                            SelectedIndex="{x:Bind ViewModel.ThemeIndex, Mode=TwoWay}">
+                        <ComboBox MinWidth="{StaticResource SettingActionControlMinWidth}" SelectedIndex="{x:Bind ViewModel.ThemeIndex, Mode=TwoWay}">
                             <ComboBoxItem x:Uid="Radio_Theme_Dark" />
                             <ComboBoxItem x:Uid="Radio_Theme_Light" />
                             <ComboBoxItem x:Uid="Radio_Theme_Default" />
@@ -277,16 +273,12 @@
                         Name="GeneralPageRunAtStartUp"
                         x:Uid="GeneralPage_RunAtStartUp"
                         IsEnabled="{x:Bind ViewModel.IsRunAtStartupGPOManaged, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
-                        <ToggleSwitch
-                            x:Uid="ToggleSwitch"
-                            AutomationProperties.Name="{Binding ElementName=GeneralPageRunAtStartUp, Path=Header}"
-                            IsOn="{x:Bind ViewModel.Startup, Mode=TwoWay}" />
+                        <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.Startup, Mode=TwoWay}" />
                     </tkcontrols:SettingsCard>
                     <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsRunAtStartupGPOManaged, Mode=OneWay}">
-                        <tkcontrols:SettingsCard x:Name="ShowSystemTrayIconCard" x:Uid="ShowSystemTrayIcon">
+                        <tkcontrols:SettingsCard x:Uid="ShowSystemTrayIcon">
                             <ToggleSwitch
                                 x:Uid="ShowSystemTrayIcon_ToggleSwitch"
-                                AutomationProperties.Name="{Binding ElementName=ShowSystemTrayIconCard, Path=Header}"
                                 IsOn="{x:Bind ViewModel.ShowSysTrayIcon, Mode=TwoWay}"
                                 Toggled="ShowSystemTrayIcon_Toggled" />
                         </tkcontrols:SettingsCard>
@@ -406,16 +398,12 @@
                             <tkcontrols:SettingsCard.HeaderIcon>
                                 <PathIcon Data="M1859 1758q14 23 21 47t7 51q0 40-15 75t-41 61-61 41-75 15H354q-40 0-75-15t-61-41-41-61-15-75q0-27 6-51t21-47l569-992q10-14 10-34V128H640V0h768v128h-128v604q0 19 10 35l569 991zM896 732q0 53-27 99l-331 577h972l-331-577q-27-46-27-99V128H896v604zm799 1188q26 0 44-19t19-45q0-10-2-17t-8-16l-164-287H464l-165 287q-9 15-9 33 0 26 18 45t46 19h1341z" />
                             </tkcontrols:SettingsCard.HeaderIcon>
-                            <ToggleSwitch
-                                x:Uid="ToggleSwitch"
-                                AutomationProperties.Name="{Binding ElementName=GeneralPageEnableExperimentation, Path=Header}"
-                                IsOn="{x:Bind ViewModel.EnableExperimentation, Mode=TwoWay}" />
+                            <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.EnableExperimentation, Mode=TwoWay}" />
                         </tkcontrols:SettingsCard>
                     </controls:GPOInfoControl>
                 </controls:SettingsGroup>
                 <controls:SettingsGroup x:Uid="General_DiagnosticsAndFeedback">
                     <tkcontrols:SettingsExpander
-                        x:Name="GeneralPageEnableDataDiagnostics"
                         x:Uid="GeneralPage_EnableDataDiagnostics"
                         HeaderIcon="{ui:FontIcon Glyph=&#xE9D9;}"
                         IsEnabled="{x:Bind ViewModel.IsDataDiagnosticsGPOManaged, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}"
@@ -433,19 +421,10 @@
                                     NavigateUri="https://aka.ms/powertoys-data-and-privacy-documentation" />
                             </StackPanel>
                         </tkcontrols:SettingsExpander.Description>
-                        <ToggleSwitch
-                            x:Uid="ToggleSwitch"
-                            AutomationProperties.Name="{Binding ElementName=GeneralPageEnableDataDiagnostics, Path=Header}"
-                            IsOn="{x:Bind ViewModel.EnableDataDiagnostics, Mode=TwoWay}" />
+                        <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.EnableDataDiagnostics, Mode=TwoWay}" />
                         <tkcontrols:SettingsExpander.Items>
-                            <tkcontrols:SettingsCard
-                                x:Name="GeneralPageEnableViewDiagnosticData"
-                                x:Uid="GeneralPage_EnableViewDiagnosticData"
-                                IsEnabled="{x:Bind ViewModel.EnableDataDiagnostics, Mode=TwoWay}">
-                                <ToggleSwitch
-                                    x:Uid="ToggleSwitch"
-                                    AutomationProperties.Name="{Binding ElementName=GeneralPageEnableViewDiagnosticData, Path=Header}"
-                                    IsOn="{x:Bind ViewModel.EnableViewDataDiagnostics, Mode=TwoWay}" />
+                            <tkcontrols:SettingsCard x:Uid="GeneralPage_EnableViewDiagnosticData" IsEnabled="{x:Bind ViewModel.EnableDataDiagnostics, Mode=TwoWay}">
+                                <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.EnableViewDataDiagnostics, Mode=TwoWay}" />
                                 <tkcontrols:SettingsCard.Description>
                                     <StackPanel Orientation="Vertical">
                                         <TextBlock

src/settings-ui/Settings.UI/SettingsXAML/Views/NewPlusPage.xaml

@@ -23,10 +23,7 @@
                         Name="NewPlusEnableToggle"
                         x:Uid="NewPlus_Enable_Toggle"
                         HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/NewPlus.png}">
-                        <ToggleSwitch
-                            x:Uid="ToggleSwitch"
-                            AutomationProperties.Name="{Binding ElementName=NewPlusEnableToggle, Path=Header}"
-                            IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
+                        <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
                     </tkcontrols:SettingsCard>
                 </controls:GPOInfoControl>
                 <controls:SettingsGroup x:Uid="NewPlus_Templates" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
@@ -63,18 +60,12 @@
                             Name="NewPlusHideFileExtensionToggle"
                             x:Uid="NewPlus_Hide_File_Extension_Toggle"
                             IsEnabled="{x:Bind ViewModel.IsHideFileExtSettingsCardEnabled, Mode=OneWay}">
-                            <ToggleSwitch
-                                x:Uid="HideFileExtensionToggle"
-                                AutomationProperties.Name="{Binding ElementName=NewPlusHideFileExtensionToggle, Path=Header}"
-                                IsOn="{x:Bind ViewModel.HideFileExtension, Mode=TwoWay}" />
+                            <ToggleSwitch x:Uid="HideFileExtensionToggle" IsOn="{x:Bind ViewModel.HideFileExtension, Mode=TwoWay}" />
                         </tkcontrols:SettingsCard>
                     </controls:GPOInfoControl>
                     <tkcontrols:SettingsCard Name="NewPlusHideStartingDigitsToggle" x:Uid="NewPlus_Hide_Starting_Digits_Toggle">
 
-                        <ToggleSwitch
-                            x:Uid="HideStartingDigitsToggle"
-                            AutomationProperties.Name="{Binding ElementName=NewPlusHideStartingDigitsToggle, Path=Header}"
-                            IsOn="{x:Bind ViewModel.HideStartingDigits, Mode=TwoWay}" />
+                        <ToggleSwitch x:Uid="HideStartingDigitsToggle" IsOn="{x:Bind ViewModel.HideStartingDigits, Mode=TwoWay}" />
                         <tkcontrols:SettingsCard.Description>
                             <TextBlock x:Uid="NewPlus_Hide_Starting_Digits_Description" />
                         </tkcontrols:SettingsCard.Description>
@@ -88,10 +79,7 @@
                             x:Uid="NewPlus_Behaviour_Replace_Variables_Toggle"
                             IsEnabled="{x:Bind ViewModel.IsReplaceVariablesSettingsCardEnabled, Mode=OneWay}">
                             <StackPanel Orientation="Horizontal" Spacing="4">
-                                <ToggleSwitch
-                                    x:Uid="ReplaceVariablesToggle"
-                                    AutomationProperties.Name="{Binding ElementName=NewPlusBehaviourReplaceVariablesToggle, Path=Header}"
-                                    IsOn="{x:Bind ViewModel.ReplaceVariables, Mode=TwoWay}" />
+                                <ToggleSwitch x:Uid="ReplaceVariablesToggle" IsOn="{x:Bind ViewModel.ReplaceVariables, Mode=TwoWay}" />
                                 <Button
                                     x:Uid="FileCreationButton"
                                     Width="28"

src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml

@@ -67,7 +67,6 @@
                     Header="{x:Bind Path=DisplayLabel}">
                     <ComboBox
                         MinWidth="{StaticResource SettingActionControlMinWidth}"
-                        AutomationProperties.Name="{x:Bind Path=DisplayLabel}"
                         DisplayMemberPath="Key"
                         ItemsSource="{x:Bind Path=ComboBoxItems}"
                         SelectedValue="{x:Bind ComboBoxValue, Mode=TwoWay}"
@@ -111,7 +110,6 @@
                     Header="{x:Bind Path=DisplayLabel}">
                     <NumberBox
                         MinWidth="{StaticResource SettingActionControlMinWidth}"
-                        AutomationProperties.Name="{x:Bind Path=DisplayLabel}"
                         LargeChange="{x:Bind NumberBoxLargeChange, Mode=OneWay}"
                         Maximum="{x:Bind NumberBoxMax, Mode=OneWay}"
                         Minimum="{x:Bind NumberBoxMin, Mode=OneWay}"
@@ -177,7 +175,6 @@
                     IsEnabled="{x:Bind SecondSettingIsEnabled, Mode=OneWay}">
                     <ComboBox
                         MinWidth="{StaticResource SettingActionControlMinWidth}"
-                        AutomationProperties.Name="{x:Bind Path=SecondDisplayLabel}"
                         DisplayMemberPath="Key"
                         ItemsSource="{x:Bind Path=ComboBoxItems}"
                         SelectedValue="{x:Bind ComboBoxValue, Mode=TwoWay}"
@@ -293,7 +290,6 @@
                     IsEnabled="{x:Bind SecondSettingIsEnabled, Mode=OneWay}">
                     <NumberBox
                         MinWidth="{StaticResource SettingActionControlMinWidth}"
-                        AutomationProperties.Name="{x:Bind Path=SecondDisplayLabel}"
                         LargeChange="{x:Bind NumberBoxLargeChange, Mode=OneWay}"
                         Maximum="{x:Bind NumberBoxMax, Mode=OneWay}"
                         Minimum="{x:Bind NumberBoxMin, Mode=OneWay}"

src/settings-ui/Settings.UI/SettingsXAML/Views/PowerRenamePage.xaml

@@ -22,10 +22,7 @@
                         Name="PowerRenameToggleEnable"
                         x:Uid="PowerRename_Toggle_Enable"
                         HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/PowerRename.png}">
-                        <ToggleSwitch
-                            x:Uid="ToggleSwitch"
-                            AutomationProperties.Name="{Binding ElementName=PowerRenameToggleEnable, Path=Header}"
-                            IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
+                        <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
                     </tkcontrols:SettingsCard>
                 </controls:GPOInfoControl>
                 <controls:SettingsGroup x:Uid="PowerRename_ShellIntegration" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
@@ -33,10 +30,7 @@
                         Name="PowerRenameToggleContextMenu"
                         x:Uid="PowerRename_Toggle_ContextMenu"
                         IsExpanded="False">
-                        <ComboBox
-                            MinWidth="{StaticResource SettingActionControlMinWidth}"
-                            AutomationProperties.Name="{Binding ElementName=PowerRenameToggleContextMenu, Path=Header}"
-                            SelectedIndex="{x:Bind ViewModel.EnabledOnContextExtendedMenu, Mode=TwoWay, Converter={StaticResource BoolToComboBoxIndexConverter}}">
+                        <ComboBox MinWidth="{StaticResource SettingActionControlMinWidth}" SelectedIndex="{x:Bind ViewModel.EnabledOnContextExtendedMenu, Mode=TwoWay, Converter={StaticResource BoolToComboBoxIndexConverter}}">
                             <ComboBoxItem x:Uid="PowerRename_Toggle_StandardContextMenu" />
                             <ComboBoxItem x:Uid="PowerRename_Toggle_ExtendedContextMenu" />
                         </ComboBox>
@@ -59,10 +53,7 @@
                         Name="PowerRenameToggleAutoComplete"
                         x:Uid="PowerRename_Toggle_AutoComplete"
                         IsExpanded="True">
-                        <ToggleSwitch
-                            x:Uid="ToggleSwitch"
-                            AutomationProperties.Name="{Binding ElementName=PowerRenameToggleAutoComplete, Path=Header}"
-                            IsOn="{x:Bind ViewModel.MRUEnabled, Mode=TwoWay}" />
+                        <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.MRUEnabled, Mode=TwoWay}" />
                         <tkcontrols:SettingsExpander.Items>
                             <tkcontrols:SettingsCard
                                 Name="PowerRenameToggleMaxDispListNum"
@@ -70,7 +61,6 @@
                                 IsEnabled="{x:Bind ViewModel.GlobalAndMruEnabled, Mode=OneWay}">
                                 <NumberBox
                                     MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                    AutomationProperties.Name="{Binding ElementName=PowerRenameToggleMaxDispListNum, Path=Header}"
                                     Maximum="20"
                                     Minimum="0"
                                     SpinButtonPlacementMode="Compact"
@@ -83,18 +73,12 @@
                         Name="PowerRenameToggleRestoreFlagsOnLaunch"
                         x:Uid="PowerRename_Toggle_RestoreFlagsOnLaunch"
                         HeaderIcon="{ui:FontIcon Glyph=&#xe81c;}">
-                        <ToggleSwitch
-                            x:Uid="ToggleSwitch"
-                            AutomationProperties.Name="{Binding ElementName=PowerRenameToggleRestoreFlagsOnLaunch, Path=Header}"
-                            IsOn="{x:Bind ViewModel.RestoreFlagsOnLaunch, Mode=TwoWay}" />
+                        <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.RestoreFlagsOnLaunch, Mode=TwoWay}" />
                     </tkcontrols:SettingsCard>
                 </controls:SettingsGroup>
                 <controls:SettingsGroup x:Uid="PowerRename_BehaviorHeader" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
                     <tkcontrols:SettingsCard Name="PowerRenameToggleUseBoostLib" x:Uid="PowerRename_Toggle_UseBoostLib">
-                        <ToggleSwitch
-                            x:Uid="ToggleSwitch"
-                            AutomationProperties.Name="{Binding ElementName=PowerRenameToggleUseBoostLib, Path=Header}"
-                            IsOn="{x:Bind ViewModel.UseBoostLib, Mode=TwoWay}" />
+                        <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.UseBoostLib, Mode=TwoWay}" />
                     </tkcontrols:SettingsCard>
                 </controls:SettingsGroup>
             </StackPanel>

src/settings-ui/Settings.UI/Strings/en-us/Resources.resw

@@ -5580,9 +5580,6 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m
   <data name="ShortcutConflictControl_Title.Text" xml:space="preserve">
     <value>Shortcut conflicts</value>
   </data>
-  <data name="ShortcutConflictControl_Automation.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Shortcut conflicts</value>
-  </data>	
   <data name="ShortcutConflictControl_NoConflictsFound" xml:space="preserve">
     <value>No conflicts found</value>
   </data>