Merge branch 'microsoft:main' into launch-apps-3350

jefflord · Feb 28, 2024 · 36e43f6 · 36e43f6
2 parents e523562 + 725c8e8
commit 36e43f6
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 18 deletions.
diff --git a/.pipelines/applyXamlStyling.ps1 b/.pipelines/applyXamlStyling.ps1
@@ -107,7 +107,7 @@ if (-not $Passive)
 else 
 {
     Write-Output "Checking all files (passively)"
-    $files = Get-ChildItem -Path "$PSScriptRoot\..\src\*.xaml" -Recurse | Select-Object -ExpandProperty FullName | Where-Object { $_ -notmatch "(\\obj\\)|(\\bin\\)|(\\x64\\)|(\\Generated Files\\PowerRenameXAML\\)|(\\colorPicker\\ColorPickerUI\\)" }
+    $files = Get-ChildItem -Path "$PSScriptRoot\..\src\*.xaml" -Recurse | Select-Object -ExpandProperty FullName | Where-Object { $_ -notmatch "(\\obj\\)|(\\bin\\)|(\\x64\\)|(\\Generated Files\\PowerRenameXAML\\)" }
 
     if ($files.count -gt 0)
     {

diff --git a/src/modules/colorPicker/ColorPickerUI/ZoomWindow.xaml b/src/modules/colorPicker/ColorPickerUI/ZoomWindow.xaml
@@ -1,20 +1,21 @@
-<Window x:Class="ColorPicker.ZoomWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        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:e="http://schemas.microsoft.com/xaml/behaviors"
-        xmlns:behaviors="clr-namespace:ColorPicker.Behaviors"
-        mc:Ignorable="d"
-        Title="Zoom window"
-        WindowStyle="None"
-        Topmost="True"
-        AllowsTransparency="True"
-        Background="Transparent"
-        ShowInTaskbar="False"
-        ResizeMode="NoResize"
-        Focusable="False">
+<Window
+    x:Class="ColorPicker.ZoomWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:behaviors="clr-namespace:ColorPicker.Behaviors"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:e="http://schemas.microsoft.com/xaml/behaviors"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Title="Zoom window"
+    AllowsTransparency="True"
+    Background="Transparent"
+    Focusable="False"
+    ResizeMode="NoResize"
+    ShowInTaskbar="False"
+    Topmost="True"
+    WindowStyle="None"
+    mc:Ignorable="d">
     <e:Interaction.Behaviors>
-        <behaviors:CloseZoomWindowBehavior/>
+        <behaviors:CloseZoomWindowBehavior />
     </e:Interaction.Behaviors>
 </Window>