From 6b3c4a7770e405ddac4d63592d5628d2617e2a6a Mon Sep 17 00:00:00 2001
From: Zach Teutsch <88554871+zateutsch@users.noreply.github.com>
Date: Wed, 26 Nov 2025 20:48:55 -0500
Subject: [PATCH] Apply xaml styling + add conditional for pruning bug in
 VS2026

---
 Directory.Build.props                         |  1 +
 .../Controls/AppPageInputControl.xaml         | 40 ++++++++-----------
 .../Controls/InputControl.xaml                |  8 +---
 .../Controls/TextPageInputControl.xaml        |  4 +-
 .../Controls/UrlPageInputControl.xaml         |  9 ++---
 .../Pages/Programs.xaml                       |  4 +-
 .../Pages/Remappings.xaml                     | 10 ++---
 .../KeyboardManagerEditorUI/Pages/Text.xaml   |  6 +--
 .../KeyboardManagerEditorUI/Pages/URLs.xaml   |  8 ++--
 9 files changed, 35 insertions(+), 55 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index e7b415cbca..82534f56ba 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -17,6 +17,7 @@
     <NuGetAuditMode>direct</NuGetAuditMode>
     <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>    <!-- Don't add source revision hash to the product version of binaries. -->
     <PlatformTarget>$(Platform)</PlatformTarget>
+	<RestoreEnablePackagePruning Condition=" '$(VisualStudioVersion)' == '17.0'">false </RestoreEnablePackagePruning>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(MSBuildProjectExtension)' == '.csproj'">
diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorUI/Controls/AppPageInputControl.xaml b/src/modules/keyboardmanager/KeyboardManagerEditorUI/Controls/AppPageInputControl.xaml
index 410f9fd672..0bf0d7641f 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEditorUI/Controls/AppPageInputControl.xaml
+++ b/src/modules/keyboardmanager/KeyboardManagerEditorUI/Controls/AppPageInputControl.xaml
@@ -44,39 +44,31 @@
             </ToggleButton.Content>
         </ToggleButton>
 
-        <StackPanel Orientation="Horizontal" 
-                    Spacing="8">
-            <TextBlock Text="{x:Bind helper:ResourceLoaderInstance.GetString('ProgramsPage_ExampleHeader')}"/>
-            <TextBox 
-                x:Name="ProgramPathInput"/>
+        <StackPanel Orientation="Horizontal" Spacing="8">
+            <TextBlock Text="{x:Bind helper:ResourceLoaderInstance.GetString('ProgramsPage_ExampleHeader')}" />
+            <TextBox x:Name="ProgramPathInput" />
             <Button
                 x:Name="ProgramPathSelectButton"
-                Content="Select Program"
-                Click="ProgramPathSelectButton_Click"/>
+                Click="ProgramPathSelectButton_Click"
+                Content="Select Program" />
         </StackPanel>
-        <StackPanel Orientation="Horizontal" 
-            Spacing="8">
-            <TextBlock Text="{x:Bind helper:ResourceLoaderInstance.GetString('ProgramsPage_Arguments')}"/>
-            <TextBox
-                x:Name="ProgramArgsInput"/>
+        <StackPanel Orientation="Horizontal" Spacing="8">
+            <TextBlock Text="{x:Bind helper:ResourceLoaderInstance.GetString('ProgramsPage_Arguments')}" />
+            <TextBox x:Name="ProgramArgsInput" />
         </StackPanel>
-        
-        <StackPanel 
-            Orientation="Horizontal" 
-            Spacing="8">
+
+        <StackPanel Orientation="Horizontal" Spacing="8">
             <TextBlock>
                 Start in
             </TextBlock>
-            <TextBox
-                x:Name="StartInPathInput"/>
+            <TextBox x:Name="StartInPathInput" />
             <Button
                 x:Name="StartInSelectButton"
-                Content="Select Starting Directory"
-                Click="StartInSelectButton_Click"/>
+                Click="StartInSelectButton_Click"
+                Content="Select Starting Directory" />
         </StackPanel>
-        <StackPanel Orientation="Horizontal" 
-            Spacing="8">
-            <ComboBox 
+        <StackPanel Orientation="Horizontal" Spacing="8">
+            <ComboBox
                 x:Name="ElevationComboBox"
                 Header="Elevation"
                 SelectedValue="Normal">
@@ -104,7 +96,7 @@
                 <x:String>Maximized</x:String>
             </ComboBox>
         </StackPanel>
-        
+
 
 
 
diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorUI/Controls/InputControl.xaml b/src/modules/keyboardmanager/KeyboardManagerEditorUI/Controls/InputControl.xaml
index b090e9375e..2344847905 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEditorUI/Controls/InputControl.xaml
+++ b/src/modules/keyboardmanager/KeyboardManagerEditorUI/Controls/InputControl.xaml
@@ -23,13 +23,9 @@
                 <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
 
-            <TextBlock
-                x:Uid="InputControlOriginalKeysTextBlock"
-                Margin="0,12,0,0" />
+            <TextBlock x:Uid="InputControlOriginalKeysTextBlock" Margin="0,12,0,0" />
             <Grid Grid.Column="2">
-                <TextBlock 
-                    x:Uid="InputControlNewKeysTextBlock"
-                    Margin="0,12,0,0" />
+                <TextBlock x:Uid="InputControlNewKeysTextBlock" Margin="0,12,0,0" />
             </Grid>
             <Grid Grid.Row="1" Margin="0,8,0,0">
                 <ToggleButton
diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorUI/Controls/TextPageInputControl.xaml b/src/modules/keyboardmanager/KeyboardManagerEditorUI/Controls/TextPageInputControl.xaml
index 0a5c9202e1..41225a7a34 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEditorUI/Controls/TextPageInputControl.xaml
+++ b/src/modules/keyboardmanager/KeyboardManagerEditorUI/Controls/TextPageInputControl.xaml
@@ -19,7 +19,7 @@
         <TextBlock
             x:Uid="TextPageInputControlShortcutKeysTextBlock"
             Margin="0,12,0,8"
-            FontWeight="SemiBold"/>
+            FontWeight="SemiBold" />
 
         <ToggleButton
             x:Name="ShortcutToggleBtn"
@@ -67,6 +67,6 @@
             x:Uid="TextPageInputControlAllAppsTextBox"
             Background="{ThemeResource TextControlBackgroundFocused}"
             BorderBrush="{ThemeResource ControlStrokeColorDefaultBrush}"
-            IsEnabled="{Binding ElementName=AllAppsCheckBox, Path=IsChecked}"/>
+            IsEnabled="{Binding ElementName=AllAppsCheckBox, Path=IsChecked}" />
     </StackPanel>
 </UserControl>
\ No newline at end of file
diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorUI/Controls/UrlPageInputControl.xaml b/src/modules/keyboardmanager/KeyboardManagerEditorUI/Controls/UrlPageInputControl.xaml
index 61dc9afd62..f7fc100d56 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEditorUI/Controls/UrlPageInputControl.xaml
+++ b/src/modules/keyboardmanager/KeyboardManagerEditorUI/Controls/UrlPageInputControl.xaml
@@ -44,12 +44,9 @@
             </ToggleButton.Content>
         </ToggleButton>
 
-        <StackPanel Orientation="Vertical" 
-                    Spacing="8">
-            <TextBlock Text="URL to open"/>
-            <TextBox 
-                x:Name="UrlPathInput"
-                Width="360"/>
+        <StackPanel Orientation="Vertical" Spacing="8">
+            <TextBlock Text="URL to open" />
+            <TextBox x:Name="UrlPathInput" Width="360" />
         </StackPanel>
     </StackPanel>
 </UserControl>
\ No newline at end of file
diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/Programs.xaml b/src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/Programs.xaml
index 2f0df78479..3b471ada8d 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/Programs.xaml
+++ b/src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/Programs.xaml
@@ -157,12 +157,12 @@
             Width="480"
             MinWidth="600"
             MaxWidth="600"
-            PrimaryButtonStyle="{StaticResource AccentButtonStyle}"
             PrimaryButtonClick="KeyDialog_PrimaryButtonClick"
+            PrimaryButtonStyle="{StaticResource AccentButtonStyle}"
             PrimaryButtonText="{x:Bind helper:ResourceLoaderInstance.GetString('ProgramsPage_KeyDialogPrimary')}"
             SecondaryButtonText="{x:Bind helper:ResourceLoaderInstance.GetString('ProgramsPage_KeyDialogSecondary')}">
             <Grid>
-                <controls:AppPageInputControl x:Name="AppShortcutControl"/>
+                <controls:AppPageInputControl x:Name="AppShortcutControl" />
             </Grid>
         </ContentDialog>
     </Grid>
diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/Remappings.xaml b/src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/Remappings.xaml
index 2dbc445521..670ea83060 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/Remappings.xaml
+++ b/src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/Remappings.xaml
@@ -23,16 +23,12 @@
                 Height="36"
                 Margin="0,12,0,0"
                 Click="NewRemappingBtn_Click">
-                <StackPanel 
-                    Orientation="Horizontal" 
-                    Spacing="8">
+                <StackPanel Orientation="Horizontal" Spacing="8">
                     <FontIcon
                         FontSize="14"
                         Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}"
                         Glyph="&#xE109;" />
-                    <TextBlock
-                        x:Uid="RemappingsPageNewTextBlock"
-                        VerticalAlignment="Center" />
+                    <TextBlock x:Uid="RemappingsPageNewTextBlock" VerticalAlignment="Center" />
                 </StackPanel>
             </Button>
             <Grid
@@ -78,7 +74,7 @@
                     Margin="12,-2,0,0"
                     HorizontalAlignment="Left"
                     VerticalAlignment="Center"
-                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
+                    Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
 
                 <Rectangle
                     Grid.ColumnSpan="4"
diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/Text.xaml b/src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/Text.xaml
index fcbe3f74fc..238fb66a40 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/Text.xaml
+++ b/src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/Text.xaml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <Page
     x:Class="KeyboardManagerEditorUI.Pages.Text"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
@@ -27,9 +27,7 @@
                         FontSize="14"
                         Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}"
                         Glyph="&#xE109;" />
-                    <TextBlock
-                        x:Uid="TextPageNewTextBlock"
-                        VerticalAlignment="Center" />
+                    <TextBlock x:Uid="TextPageNewTextBlock" VerticalAlignment="Center" />
                 </StackPanel>
             </Button>
             <Grid
diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/URLs.xaml b/src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/URLs.xaml
index 6cf8dae56c..3e1add6ac4 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/URLs.xaml
+++ b/src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/URLs.xaml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <Page
     x:Class="KeyboardManagerEditorUI.Pages.URLs"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
@@ -126,7 +126,7 @@
                                     BorderThickness="0"
                                     Click="DeleteButton_Click"
                                     ToolTipService.ToolTip="{x:Bind helper:ResourceLoaderInstance.GetString('RemappingsPage_DeleteTooltip')}">
-                                        <FontIcon
+                                    <FontIcon
                                         FontFamily="{StaticResource SymbolThemeFontFamily}"
                                         FontSize="16"
                                         Foreground="{ThemeResource TextFillColorSecondaryBrush}"
@@ -145,12 +145,12 @@
             Height="360"
             MinWidth="600"
             MaxWidth="600"
-            PrimaryButtonStyle="{StaticResource AccentButtonStyle}"
             PrimaryButtonClick="KeyDialog_PrimaryButtonClick"
+            PrimaryButtonStyle="{StaticResource AccentButtonStyle}"
             PrimaryButtonText="{x:Bind helper:ResourceLoaderInstance.GetString('UrlPage_KeyDialogPrimary')}"
             SecondaryButtonText="{x:Bind helper:ResourceLoaderInstance.GetString('UrlPage_KeyDialogSecondary')}">
             <Grid>
-                <controls:UrlPageInputControl x:Name="UrlShortcutControl"/>
+                <controls:UrlPageInputControl x:Name="UrlShortcutControl" />
             </Grid>
         </ContentDialog>
     </Grid>