[settings-ui] Settings WinUI3 (#17797)

* Add Settings.WinUI3 project * New namespace * Activation and Services * Assets and Behaviors * Converters and Helpers * Controls * View and ViewModels * Styles and Themes * OOBE * Strings * Small App moves * [check] Project files - publish profiles and launchSettings.json * [using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name workaround * [WIP] Workarounds to make it work * Fix suppressed warnings - naming * Add code analysis * Fix KBMPage and App dispatcher Fix MessageBox - replace with MessageDialog * Fix ImageResizerPage & mark ColorPickerButton with TODO * Add icon to windows Cleanup MainWindow.xaml.cs and OobeWindow.xaml.cs MainWindows and OobeWindow management * App Icon No framework and runtime subdirs * Remove PowerToys.Settings and Settings.UI from solution Update output paths * Installer work & publish.cmd * Fix dispatcher crashes * Fix crashes * Add all dlls to installer Cleanup installer Add OpenOOBE and OpenScoobe logic Fix minor issues Fix update scenario - REINSTALLMODE * Rename back namespaces, project name and project dir * [wip] move to winappsdk 1.1 * Fix propagating isElevated & installer runtimes dlls * Remove obsolete dir/file * PowerToys.Interop to netstandard2.0 * Move everything to .Net6 * [Settings] Always launch settings process non-elevated (#17791) * Move back to WinAppSdk 1.0.1 * Add Settings.WinUI3 project * New namespace * Activation and Services * Assets and Behaviors * Converters and Helpers * Controls * View and ViewModels * Styles and Themes * OOBE * Strings * Small App moves * [check] Project files - publish profiles and launchSettings.json * [using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name workaround * [WIP] Workarounds to make it work * Fix suppressed warnings - naming * Add code analysis * Fix KBMPage and App dispatcher Fix MessageBox - replace with MessageDialog * Fix ImageResizerPage & mark ColorPickerButton with TODO * Add icon to windows Cleanup MainWindow.xaml.cs and OobeWindow.xaml.cs MainWindows and OobeWindow management * App Icon No framework and runtime subdirs * Remove PowerToys.Settings and Settings.UI from solution Update output paths * Installer work & publish.cmd * Fix dispatcher crashes * Fix crashes * Add all dlls to installer Cleanup installer Add OpenOOBE and OpenScoobe logic Fix minor issues Fix update scenario - REINSTALLMODE * Rename back namespaces, project name and project dir * [wip] move to winappsdk 1.1 * Fix propagating isElevated & installer runtimes dlls * Remove obsolete dir/file * PowerToys.Interop to netstandard2.0 * Move everything to .Net6 * [Settings] Always launch settings process non-elevated (#17791) * Move back to WinAppSdk 1.0.1 * Revert merge conflict ARM64 removal * Fix KBM Browse overlay image button * Bring back settings publish profile * Update release.yml * Change target frameworkd windows version * [Setup] Add Windows Application Runtime SDK (#17809) * Update requirements doc * Update compiling docs * Fix signing * Fix Settings exe and dll versions * Add exception for dlls that have version 1.0.0.0 * Fix powershell condition Co-authored-by: Andrey Nekrasov <yuyoyuppe@users.noreply.github.com>
2026-04-06 19:26:39 +02:00 · 2022-04-19 22:00:28 +02:00
parent 42afc4f4fc
commit 27c4b1be0e
160 changed files with 1179 additions and 2120 deletions
--- a/src/settings-ui/Settings.UI/Views/AlwaysOnTopPage.xaml
+++ b/src/settings-ui/Settings.UI/Views/AlwaysOnTopPage.xaml
@@ -5,7 +5,7 @@
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
-    xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"     
+    xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters"     
    mc:Ignorable="d"
    AutomationProperties.LandmarkType="Main">

--- a/src/settings-ui/Settings.UI/Views/AlwaysOnTopPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/Views/AlwaysOnTopPage.xaml.cs
@@ -4,7 +4,7 @@

 using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.PowerToys.Settings.UI.Library.ViewModels;
-using Windows.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls;

 namespace Microsoft.PowerToys.Settings.UI.Views
 {
--- a/src/settings-ui/Settings.UI/Views/AwakePage.xaml.cs
+++ b/src/settings-ui/Settings.UI/Views/AwakePage.xaml.cs
@@ -4,7 +4,7 @@

 using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.PowerToys.Settings.UI.Library.ViewModels;
-using Windows.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls;

 namespace Microsoft.PowerToys.Settings.UI.Views
 {
--- a/src/settings-ui/Settings.UI/Views/ColorPickerPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/Views/ColorPickerPage.xaml.cs
@@ -4,7 +4,7 @@

 using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.PowerToys.Settings.UI.Library.ViewModels;
-using Windows.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls;

 namespace Microsoft.PowerToys.Settings.UI.Views
 {
@@ -25,7 +25,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
        /// </summary>
        /// <param name="sender">The sender of this event</param>
        /// <param name="e">The arguments of this event</param>
-        private void ColorPicker_ComboBox_Loaded(object sender, Windows.UI.Xaml.RoutedEventArgs e)
+        private void ColorPicker_ComboBox_Loaded(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
        {
           /**
            * UWP hack
@@ -48,7 +48,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
            ColorPicker_ComboBox.SelectedIndex = index;
        }

-        private void ReorderButtonUp_Click(object sender, Windows.UI.Xaml.RoutedEventArgs e)
+        private void ReorderButtonUp_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
        {
            ColorFormatModel color = ((MenuFlyoutItem)sender).DataContext as ColorFormatModel;
            if (color == null)
@@ -63,7 +63,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
            }
        }

-        private void ReorderButtonDown_Click(object sender, Windows.UI.Xaml.RoutedEventArgs e)
+        private void ReorderButtonDown_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
        {
            ColorFormatModel color = ((MenuFlyoutItem)sender).DataContext as ColorFormatModel;
            if (color == null)
--- a/src/settings-ui/Settings.UI/Views/FancyZonesPage.xaml
+++ b/src/settings-ui/Settings.UI/Views/FancyZonesPage.xaml
@@ -6,7 +6,7 @@
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
-    xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"     
+    xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters"     
    mc:Ignorable="d"
    AutomationProperties.LandmarkType="Main">

--- a/src/settings-ui/Settings.UI/Views/FancyZonesPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/Views/FancyZonesPage.xaml.cs
@@ -4,7 +4,7 @@

 using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.PowerToys.Settings.UI.Library.ViewModels;
-using Windows.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls;

 namespace Microsoft.PowerToys.Settings.UI.Views
 {
@@ -20,7 +20,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
            DataContext = ViewModel;
        }

-        private void OpenColorsSettings_Click(object sender, Windows.UI.Xaml.RoutedEventArgs e)
+        private void OpenColorsSettings_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
        {
            Helpers.StartProcessHelper.Start(Helpers.StartProcessHelper.ColorsSettings);
        }
--- a/src/settings-ui/Settings.UI/Views/GeneralPage.xaml
+++ b/src/settings-ui/Settings.UI/Views/GeneralPage.xaml
@@ -5,7 +5,7 @@
    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"
+    xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters"
    xmlns:localConverters="using:Microsoft.PowerToys.Settings.UI.Converters"
    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
    mc:Ignorable="d"
--- a/src/settings-ui/Settings.UI/Views/GeneralPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/Views/GeneralPage.xaml.cs
@@ -4,15 +4,13 @@

 using System;
 using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
 using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.PowerToys.Settings.UI.Library.Utilities;
 using Microsoft.PowerToys.Settings.UI.Library.ViewModels;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
 using Windows.ApplicationModel.Resources;
-using Windows.Data.Json;
 using Windows.UI.Core;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;

 namespace Microsoft.PowerToys.Settings.UI.Views
 {
@@ -39,9 +37,12 @@ namespace Microsoft.PowerToys.Settings.UI.Views
            ResourceLoader loader = ResourceLoader.GetForViewIndependentUse();
            var settingsUtils = new SettingsUtils();

-            Action stateUpdatingAction = async () =>
+            Action stateUpdatingAction = () =>
            {
-                await Dispatcher.RunAsync(CoreDispatcherPriority.Normal, ViewModel.RefreshUpdatingState);
+                this.DispatcherQueue.TryEnqueue(() =>
+                {
+                    ViewModel.RefreshUpdatingState();
+                });
            };

            ViewModel = new GeneralViewModel(
--- a/src/settings-ui/Settings.UI/Views/ImageResizerPage.xaml
+++ b/src/settings-ui/Settings.UI/Views/ImageResizerPage.xaml
@@ -8,7 +8,7 @@
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
    xmlns:converters="using:Microsoft.PowerToys.Settings.UI.Converters"
-    xmlns:toolkitconverters="using:Microsoft.Toolkit.Uwp.UI.Converters"
+    xmlns:toolkitconverters="using:CommunityToolkit.WinUI.UI.Converters"
    mc:Ignorable="d"
    AutomationProperties.LandmarkType="Main" x:Name="RootPage">
    <Page.Resources>
--- a/src/settings-ui/Settings.UI/Views/ImageResizerPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/Views/ImageResizerPage.xaml.cs
@@ -5,14 +5,12 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
-using System.Linq;
 using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.PowerToys.Settings.UI.Library.Utilities;
 using Microsoft.PowerToys.Settings.UI.Library.ViewModels;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
 using Windows.ApplicationModel.Resources;
-using Windows.UI.Popups;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;

 namespace Microsoft.PowerToys.Settings.UI.Views
 {
@@ -24,7 +22,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
        {
            InitializeComponent();
            var settingsUtils = new SettingsUtils();
-            var resourceLoader = Windows.ApplicationModel.Resources.ResourceLoader.GetForCurrentView();
+            var resourceLoader = ResourceLoader.GetForViewIndependentUse();
            Func<string, string> loader = (string name) =>
            {
                return resourceLoader.GetString(name);
@@ -41,7 +39,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
            if (deleteRowButton != null)
            {
                ImageSize x = (ImageSize)deleteRowButton.DataContext;
-                ResourceLoader resourceLoader = ResourceLoader.GetForCurrentView();
+                ResourceLoader resourceLoader = ResourceLoader.GetForViewIndependentUse();

                ContentDialog dialog = new ContentDialog();
                dialog.XamlRoot = RootPage.XamlRoot;
@@ -72,7 +70,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
        {
            try
            {
-                ViewModel.AddRow(ResourceLoader.GetForCurrentView().GetString("ImageResizer_DefaultSize_NewSizePrefix"));
+                ViewModel.AddRow(ResourceLoader.GetForViewIndependentUse().GetString("ImageResizer_DefaultSize_NewSizePrefix"));
            }
            catch (Exception ex)
            {
--- a/src/settings-ui/Settings.UI/Views/KeyboardManagerPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/Views/KeyboardManagerPage.xaml.cs
@@ -2,17 +2,14 @@
 // 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.Globalization;
 using System.IO.Abstractions;
 using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.PowerToys.Settings.UI.Library.Utilities;
 using Microsoft.PowerToys.Settings.UI.Library.ViewModels;
+using Microsoft.UI.Xaml.Controls;
 using Windows.System;
-using Windows.UI.Core;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;

 namespace Microsoft.PowerToys.Settings.UI.Views
 {
@@ -23,15 +20,12 @@ namespace Microsoft.PowerToys.Settings.UI.Views
    {
        private const string PowerToyName = "Keyboard Manager";

-        private readonly CoreDispatcher dispatcher;
        private readonly IFileSystemWatcher watcher;

        public KeyboardManagerViewModel ViewModel { get; }

        public KeyboardManagerPage()
        {
-            dispatcher = Window.Current.Dispatcher;
-
            var settingsUtils = new SettingsUtils();
            ViewModel = new KeyboardManagerViewModel(settingsUtils, SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), ShellPage.SendDefaultIPCMessage, FilterRemapKeysList);

@@ -44,13 +38,13 @@ namespace Microsoft.PowerToys.Settings.UI.Views
            DataContext = ViewModel;
        }

-        private async void OnConfigFileUpdate()
+        private void OnConfigFileUpdate()
        {
            // Note: FileSystemWatcher raise notification multiple times for single update operation.
            // Todo: Handle duplicate events either by somehow suppress them or re-read the configuration everytime since we will be updating the UI only if something is changed.
            if (ViewModel.LoadProfile())
            {
-                await dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
+                this.DispatcherQueue.TryEnqueue(() =>
                {
                    ViewModel.NotifyFileChanged();
                });
--- a/src/settings-ui/Settings.UI/Views/MouseUtilsPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/Views/MouseUtilsPage.xaml.cs
@@ -4,7 +4,7 @@

 using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.PowerToys.Settings.UI.Library.ViewModels;
-using Windows.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls;

 namespace Microsoft.PowerToys.Settings.UI.Views
 {
--- a/src/settings-ui/Settings.UI/Views/PowerLauncherPage.xaml
+++ b/src/settings-ui/Settings.UI/Views/PowerLauncherPage.xaml
@@ -9,7 +9,7 @@
    xmlns:i="using:Microsoft.Xaml.Interactivity"
    x:Class="Microsoft.PowerToys.Settings.UI.Views.PowerLauncherPage"
    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
-    xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"
+    xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters"
    mc:Ignorable="d"
    AutomationProperties.LandmarkType="Main">
    
@@ -202,9 +202,11 @@
                                                <controls:Setting.ActionContent>
                                                    <StackPanel Orientation="Horizontal" Spacing="16">

+                                                        <!-- todo(Stefan): InfoBadge not available
                                                        <muxc:InfoBadge AutomationProperties.AccessibilityView="Raw"
                                                                        Visibility="{x:Bind ShowNotAccessibleWarning}"
                                                                        Style="{StaticResource CriticalIconInfoBadgeStyle}" />
+                                                        -->

                                                        <ToggleSwitch x:Uid="PowerLauncher_EnablePluginToggle"
                                                                      IsOn="{x:Bind Path=Disabled, Converter={StaticResource BoolNegationConverter}, Mode=TwoWay}"/>
--- a/src/settings-ui/Settings.UI/Views/PowerLauncherPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/Views/PowerLauncherPage.xaml.cs
@@ -8,7 +8,9 @@ using System.IO;
 using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.PowerToys.Settings.UI.Library.Utilities;
 using Microsoft.PowerToys.Settings.UI.Library.ViewModels;
-using Windows.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls;
+using Windows.ApplicationModel.Resources;
+using Windows.UI.Core;

 namespace Microsoft.PowerToys.Settings.UI.Views
 {
@@ -56,7 +58,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views

                if (powerLauncherSettings != null && !ViewModel.IsUpToDate(powerLauncherSettings))
                {
-                    _ = Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.Normal, () =>
+                    this.DispatcherQueue.TryEnqueue(() =>
                    {
                        DataContext = ViewModel = new PowerLauncherViewModel(powerLauncherSettings, SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), ShellPage.SendDefaultIPCMessage, App.IsDarkTheme);
                        this.Bindings.Update();
@@ -64,7 +66,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
                }
            });

-            var loader = Windows.ApplicationModel.Resources.ResourceLoader.GetForCurrentView();
+            var loader = ResourceLoader.GetForViewIndependentUse();

            searchResultPreferencesOptions = new ObservableCollection<Tuple<string, string>>();
            searchResultPreferencesOptions.Add(Tuple.Create(loader.GetString("PowerLauncher_SearchResultPreference_AlphabeticalOrder"), "alphabetical_order"));
@@ -77,7 +79,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
            searchTypePreferencesOptions.Add(Tuple.Create(loader.GetString("PowerLauncher_SearchTypePreference_ExecutableName"), "executable_name"));
        }

-        private void OpenColorsSettings_Click(object sender, Windows.UI.Xaml.RoutedEventArgs e)
+        private void OpenColorsSettings_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
        {
            Helpers.StartProcessHelper.Start(Helpers.StartProcessHelper.ColorsSettings);
        }
--- a/src/settings-ui/Settings.UI/Views/PowerPreviewPage.xaml
+++ b/src/settings-ui/Settings.UI/Views/PowerPreviewPage.xaml
@@ -4,7 +4,7 @@
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"
+    xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters"
    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
    mc:Ignorable="d"
--- a/src/settings-ui/Settings.UI/Views/PowerPreviewPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/Views/PowerPreviewPage.xaml.cs
@@ -3,9 +3,8 @@
 // See the LICENSE file in the project root for more information.

 using Microsoft.PowerToys.Settings.UI.Library;
-using Microsoft.PowerToys.Settings.UI.Library.Utilities;
 using Microsoft.PowerToys.Settings.UI.Library.ViewModels;
-using Windows.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls;

 namespace Microsoft.PowerToys.Settings.UI.Views
 {
--- a/src/settings-ui/Settings.UI/Views/PowerRenamePage.xaml
+++ b/src/settings-ui/Settings.UI/Views/PowerRenamePage.xaml
@@ -5,7 +5,8 @@
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
-    xmlns:muxc="using:Microsoft.UI.Xaml.Controls" xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"
+    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
+    xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters"
    mc:Ignorable="d"
    AutomationProperties.LandmarkType="Main">
    <Page.Resources>
--- a/src/settings-ui/Settings.UI/Views/PowerRenamePage.xaml.cs
+++ b/src/settings-ui/Settings.UI/Views/PowerRenamePage.xaml.cs
@@ -3,9 +3,8 @@
 // See the LICENSE file in the project root for more information.

 using Microsoft.PowerToys.Settings.UI.Library;
-using Microsoft.PowerToys.Settings.UI.Library.Utilities;
 using Microsoft.PowerToys.Settings.UI.Library.ViewModels;
-using Windows.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls;

 namespace Microsoft.PowerToys.Settings.UI.Views
 {
--- a/src/settings-ui/Settings.UI/Views/ShellPage.xaml
+++ b/src/settings-ui/Settings.UI/Views/ShellPage.xaml
@@ -10,8 +10,9 @@
    xmlns:ic="using:Microsoft.Xaml.Interactions.Core"
    xmlns:i="using:Microsoft.Xaml.Interactivity"
    HighContrastAdjustment="None"
-    muxc:BackdropMaterial.ApplyToRootOrPageBackground="True"
    mc:Ignorable="d">
+    <!--TODO(stefan): Bring back Should be available in v1.1
+    BackdropMaterial.ApplyToRootOrPageBackground="True"-->

    <i:Interaction.Behaviors>
        <ic:EventTriggerBehavior EventName="Loaded">
--- a/src/settings-ui/Settings.UI/Views/ShellPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/Views/ShellPage.xaml.cs
@@ -7,11 +7,12 @@ using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.PowerToys.Settings.UI.Services;
 using Microsoft.PowerToys.Settings.UI.ViewModels;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Automation.Peers;
+using Microsoft.UI.Xaml.Controls;
+using Windows.ApplicationModel.Resources;
 using Windows.Data.Json;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Automation.Peers;
-using Windows.UI.Xaml.Controls;
-using WinUI = Microsoft.UI.Xaml.Controls;
+using Windows.System;

 namespace Microsoft.PowerToys.Settings.UI.Views
 {
@@ -184,7 +185,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views

            if (AutomationPeer.ListenerExists(AutomationEvents.MenuOpened))
            {
-                var loader = Windows.ApplicationModel.Resources.ResourceLoader.GetForCurrentView();
+                var loader = ResourceLoader.GetForViewIndependentUse();
                peer.RaiseNotificationEvent(
                    AutomationNotificationKind.ActionCompleted,
                    AutomationNotificationProcessing.ImportantMostRecent,
@@ -210,7 +211,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views

            if (AutomationPeer.ListenerExists(AutomationEvents.MenuClosed))
            {
-                var loader = Windows.ApplicationModel.Resources.ResourceLoader.GetForCurrentView();
+                var loader = ResourceLoader.GetForViewIndependentUse();
                peer.RaiseNotificationEvent(
                    AutomationNotificationKind.ActionCompleted,
                    AutomationNotificationProcessing.ImportantMostRecent,
@@ -219,14 +220,14 @@ namespace Microsoft.PowerToys.Settings.UI.Views
            }
        }

-        private void OOBEItem_Tapped(object sender, Windows.UI.Xaml.Input.TappedRoutedEventArgs e)
+        private void OOBEItem_Tapped(object sender, Microsoft.UI.Xaml.Input.TappedRoutedEventArgs e)
        {
            OpenOobeWindowCallback();
        }

-        private async void FeedbackItem_Tapped(object sender, Windows.UI.Xaml.Input.TappedRoutedEventArgs e)
+        private async void FeedbackItem_Tapped(object sender, Microsoft.UI.Xaml.Input.TappedRoutedEventArgs e)
        {
-            await Windows.System.Launcher.LaunchUriAsync(new Uri("https://aka.ms/powerToysGiveFeedback"));
+            await Launcher.LaunchUriAsync(new Uri("https://aka.ms/powerToysGiveFeedback"));
        }
    }
 }
--- a/src/settings-ui/Settings.UI/Views/ShortcutGuidePage.xaml
+++ b/src/settings-ui/Settings.UI/Views/ShortcutGuidePage.xaml
@@ -6,7 +6,7 @@
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-    xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"
+    xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters"
    mc:Ignorable="d"
    AutomationProperties.LandmarkType="Main">

--- a/src/settings-ui/Settings.UI/Views/ShortcutGuidePage.xaml.cs
+++ b/src/settings-ui/Settings.UI/Views/ShortcutGuidePage.xaml.cs
@@ -3,9 +3,8 @@
 // See the LICENSE file in the project root for more information.

 using Microsoft.PowerToys.Settings.UI.Library;
-using Microsoft.PowerToys.Settings.UI.Library.Utilities;
 using Microsoft.PowerToys.Settings.UI.Library.ViewModels;
-using Windows.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls;

 namespace Microsoft.PowerToys.Settings.UI.Views
 {
@@ -22,7 +21,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
            DataContext = ViewModel;
        }

-        private void OpenColorsSettings_Click(object sender, Windows.UI.Xaml.RoutedEventArgs e)
+        private void OpenColorsSettings_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
        {
            Helpers.StartProcessHelper.Start(Helpers.StartProcessHelper.ColorsSettings);
        }
--- a/src/settings-ui/Settings.UI/Views/VideoConference.xaml
+++ b/src/settings-ui/Settings.UI/Views/VideoConference.xaml
@@ -5,7 +5,7 @@
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
-    xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters" 
+    xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters" 
    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
    mc:Ignorable="d">

--- a/src/settings-ui/Settings.UI/Views/VideoConference.xaml.cs
+++ b/src/settings-ui/Settings.UI/Views/VideoConference.xaml.cs
@@ -6,9 +6,9 @@ using System;
 using System.Threading.Tasks;
 using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.PowerToys.Settings.UI.ViewModels;
+using Microsoft.UI.Xaml.Controls;
 using Windows.Storage;
 using Windows.Storage.Pickers;
-using Windows.UI.Xaml.Controls;

 namespace Microsoft.PowerToys.Settings.UI.Views
 {
@@ -24,7 +24,8 @@ namespace Microsoft.PowerToys.Settings.UI.Views
            openPicker.FileTypeFilter.Add(".jpg");
            openPicker.FileTypeFilter.Add(".jpeg");
            openPicker.FileTypeFilter.Add(".png");
-            ((IInitializeWithWindow)(object)openPicker).Initialize(System.Diagnostics.Process.GetCurrentProcess().MainWindowHandle);
+            var hwnd = WinRT.Interop.WindowNative.GetWindowHandle(App.GetSettingsWindow());
+            WinRT.Interop.InitializeWithWindow.Initialize(openPicker, hwnd);

            StorageFile file = await openPicker.PickSingleFileAsync();
            return file?.Path;
--- a/src/settings-ui/Settings.UI/Views/VisibleIfNotEmpty.cs
+++ b/src/settings-ui/Settings.UI/Views/VisibleIfNotEmpty.cs
@@ -4,8 +4,8 @@

 using System;
 using System.Collections;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Data;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Data;

 namespace Microsoft.PowerToys.Settings.UI.Views
 {