Merge branch 'microsoft:main' into main

.github/policies/resourceManagement.yml

@@ -236,7 +236,7 @@ configuration:
     - if:
       - payloadType: Issue_Comment
       - commentContains:
-          pattern: 'I would [like|love] [to help|helping|to contribute|contributing|to implement|implementing|to fix|fixing]'
+          pattern: "I(( would|'d) (like|love|be happy)| want) (to help|helping|to contribute|contributing|to implement|implementing|to fix|fixing)"
           isRegex: True
       then:
       - addReply:

.vsconfig

@@ -7,7 +7,7 @@
     "Microsoft.VisualStudio.Workload.ManagedDesktop",
     "Microsoft.VisualStudio.Workload.Universal",
     "Microsoft.VisualStudio.Component.Windows10SDK.19041",
-    "Microsoft.VisualStudio.Component.Windows10SDK.20348",
+    "Microsoft.VisualStudio.Component.Windows10SDK.22621",
     "Microsoft.VisualStudio.ComponentGroup.UWP.VC",
     "Microsoft.VisualStudio.Component.UWP.VC.ARM64",
     "Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre",

Cpp.Build.props

@@ -94,17 +94,16 @@
     </Link>
   </ItemDefinitionGroup>
 
-  <!-- Global props -->
-  <PropertyGroup Label="Globals"
-    Condition="'$(OverrideWindowsTargetPlatformVersion)'!='True'">
-    <WindowsTargetPlatformVersion>10.0.20348.0</WindowsTargetPlatformVersion>
-    <TargetPlatformVersion>10.0.20348.0</TargetPlatformVersion>
+  <!-- Global props OverrideWindowsTargetPlatformVersion-->
+  <PropertyGroup Label="Globals">
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
+    <TargetPlatformVersion>10.0.22621.0</TargetPlatformVersion>
     <WindowsTargetPlatformMinVersion>10.0.19041.0</WindowsTargetPlatformMinVersion>
   </PropertyGroup>
 
   <!-- Props that are constant for both Debug and Release configurations -->
   <PropertyGroup Label="Configuration">
-    <PlatformToolset Condition="'$(OverridePlatformToolset)'!='True'">v143</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <DesktopCompatible>true</DesktopCompatible>
     <SpectreMitigation>Spectre</SpectreMitigation>

Directory.Packages.props

@@ -9,14 +9,14 @@
     <PackageVersion Include="Appium.WebDriver" Version="4.4.5" />
     <PackageVersion Include="Azure.AI.OpenAI" Version="1.0.0-beta.12" />
     <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.2" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Animations" Version="8.0.240109" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Collections" Version="8.0.240109" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.0.240109" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.0.240109" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Segmented" Version="8.0.240109" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Sizers" Version="8.0.240109" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Converters" Version="8.0.240109" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Extensions" Version="8.0.240109" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Animations" Version="8.1.240821" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Collections" Version="8.1.240821" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.1.240821" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.1.240821" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Segmented" Version="8.1.240821" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Sizers" Version="8.1.240821" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Converters" Version="8.1.240821" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Extensions" Version="8.1.240821" />
     <PackageVersion Include="CommunityToolkit.WinUI.UI.Controls.DataGrid" Version="7.1.2" />
     <PackageVersion Include="CommunityToolkit.WinUI.UI.Controls.Markdown" Version="7.1.2" />
     <PackageVersion Include="ControlzEx" Version="6.0.0" />

NOTICE.md

@@ -1299,14 +1299,14 @@ EXHIBIT A -Mozilla Public License.
 - Appium.WebDriver 4.4.5
 - Azure.AI.OpenAI 1.0.0-beta.12
 - CommunityToolkit.Mvvm 8.2.2
-- CommunityToolkit.WinUI.Animations 8.0.240109
-- CommunityToolkit.WinUI.Collections 8.0.240109
-- CommunityToolkit.WinUI.Controls.Primitives 8.0.240109
-- CommunityToolkit.WinUI.Controls.Segmented 8.0.240109
-- CommunityToolkit.WinUI.Controls.SettingsControls 8.0.240109
-- CommunityToolkit.WinUI.Controls.Sizers 8.0.240109
-- CommunityToolkit.WinUI.Converters 8.0.240109
-- CommunityToolkit.WinUI.Extensions 8.0.240109
+- CommunityToolkit.WinUI.Animations 8.1.240821
+- CommunityToolkit.WinUI.Collections 8.1.240821
+- CommunityToolkit.WinUI.Controls.Primitives 8.1.240821
+- CommunityToolkit.WinUI.Controls.Segmented 8.1.240821
+- CommunityToolkit.WinUI.Controls.SettingsControls 8.1.240821
+- CommunityToolkit.WinUI.Controls.Sizers 8.1.240821
+- CommunityToolkit.WinUI.Converters 8.1.240821
+- CommunityToolkit.WinUI.Extensions 8.1.240821
 - CommunityToolkit.WinUI.UI.Controls.DataGrid 7.1.2
 - CommunityToolkit.WinUI.UI.Controls.Markdown 7.1.2
 - ControlzEx 6.0.0

src/Common.Dotnet.CsWinRT.props

@@ -2,8 +2,8 @@
 <!-- Some items may be set in Directory.Build.props in root -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <WindowsSdkPackageVersion>10.0.20348.38</WindowsSdkPackageVersion>
-    <TargetFramework>net8.0-windows10.0.20348.0</TargetFramework>
+    <WindowsSdkPackageVersion>10.0.22621.38</WindowsSdkPackageVersion>
+    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
     <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
     <RuntimeIdentifiers>win-x64;win-arm64</RuntimeIdentifiers>

src/common/AllExperiments/Experiments.cs

@@ -4,6 +4,7 @@
 
 using System.Globalization;
 using System.Text.Json;
+
 using Microsoft.PowerToys.Settings.UI.Library.Telemetry.Events;
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.VariantAssignment.Client;

src/common/Common.UI/ThemeManager.cs

@@ -5,6 +5,7 @@
 using System;
 using System.Linq;
 using System.Windows;
+
 using ManagedCommon;
 using Microsoft.Win32;
 

src/common/FilePreviewCommon/MarkdownHelper.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.IO;
+
 using Markdig;
 
 namespace Microsoft.PowerToys.FilePreviewCommon

src/common/FilePreviewCommon/MonacoHelper.cs

@@ -8,6 +8,7 @@ using System.Globalization;
 using System.IO;
 using System.Reflection;
 using System.Text.Json;
+
 using Microsoft.PowerToys.FilePreviewCommon.Monaco.Formatters;
 
 namespace Microsoft.PowerToys.FilePreviewCommon

src/common/ManagedCommon/Logger.cs

@@ -7,6 +7,7 @@ using System.Diagnostics;
 using System.Globalization;
 using System.IO.Abstractions;
 using System.Reflection;
+
 using PowerToys.Interop;
 
 namespace ManagedCommon

src/common/ManagedCommon/RunnerHelper.cs

@@ -6,6 +6,7 @@ using System;
 using System.Diagnostics;
 using System.Reflection;
 using System.Threading.Tasks;
+
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.PowerToys.Telemetry.Events;
 

src/common/ManagedCommon/ThemeHelpers.cs

@@ -4,6 +4,7 @@
 
 using System;
 using System.Runtime.InteropServices;
+
 using Microsoft.Win32;
 
 namespace ManagedCommon

src/common/ManagedTelemetry/Telemetry/PowerToysTelemetry.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Diagnostics.Tracing;
+
 using Microsoft.PowerToys.Telemetry.Events;
 
 namespace Microsoft.PowerToys.Telemetry

src/common/interop/interop-tests/InteropTests.cs

@@ -4,6 +4,7 @@
 
 using System;
 using System.Threading;
+
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using PowerToys.Interop;
 

src/dsc/PowerToys.Settings.DSC.Schema.Generator/DSCGeneration.cs

@@ -6,6 +6,7 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+
 using static PowerToys.Settings.DSC.Schema.Introspection;
 
 namespace PowerToys.Settings.DSC.Schema;

src/dsc/PowerToys.Settings.DSC.Schema.Generator/DocumentationGeneration.cs

@@ -4,6 +4,7 @@
 
 using System;
 using System.Linq;
+
 using static PowerToys.Settings.DSC.Schema.Introspection;
 
 namespace PowerToys.Settings.DSC.Schema;

src/dsc/PowerToys.Settings.DSC.Schema.Generator/Introspection.cs

@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Text.Json.Serialization;
+
 using Settings.UI.Library.Attributes;
 
 namespace PowerToys.Settings.DSC.Schema;

src/dsc/PowerToys.Settings.DSC.Schema.Generator/SampleGeneration.cs

@@ -5,6 +5,7 @@
 using System;
 using System.Globalization;
 using System.Linq;
+
 using static PowerToys.Settings.DSC.Schema.Introspection;
 
 namespace PowerToys.Settings.DSC.Schema;

src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/App.xaml.cs

@@ -7,6 +7,7 @@ using System.Globalization;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+
 using AdvancedPaste.Helpers;
 using AdvancedPaste.Settings;
 using AdvancedPaste.ViewModels;
@@ -17,7 +18,9 @@ using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
 using Windows.Graphics;
 using WinUIEx;
+
 using static AdvancedPaste.Helpers.NativeMethods;
+
 using DispatcherQueue = Microsoft.UI.Dispatching.DispatcherQueue;
 
 // To learn more about WinUI, the WinUI project structure,

src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/AnimatedContentControl/AnimatedBorderBrush.cs

@@ -4,6 +4,7 @@
 
 using System;
 using System.Numerics;
+
 using Microsoft.UI.Composition;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;

src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/PromptBox.xaml.cs

@@ -5,6 +5,7 @@
 using System;
 using System.Net;
 using System.Threading.Tasks;
+
 using AdvancedPaste.Helpers;
 using AdvancedPaste.Settings;
 using AdvancedPaste.ViewModels;

src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Converters/CountToDoubleConverter.cs

@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections;
+
 using Microsoft.UI.Xaml.Data;
 
 namespace AdvancedPaste.Converters;

src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Converters/CountToVisibilityConverter.cs

@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections;
+
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Data;
 

src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/MainWindow.xaml.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+
 using AdvancedPaste.Helpers;
 using AdvancedPaste.Settings;
 using ManagedCommon;

src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Pages/MainPage.xaml.cs

@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Threading.Tasks;
+
 using AdvancedPaste.Helpers;
 using AdvancedPaste.Models;
 using AdvancedPaste.ViewModels;

src/modules/AdvancedPaste/AdvancedPaste/Helpers/AICompletionsHelper.cs

@@ -6,6 +6,7 @@ using System;
 using System.Globalization;
 using System.IO;
 using System.Net;
+
 using Azure;
 using Azure.AI.OpenAI;
 using ManagedCommon;

src/modules/AdvancedPaste/AdvancedPaste/Helpers/ClipboardHelper.cs

@@ -5,6 +5,7 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+
 using ManagedCommon;
 using Microsoft.UI.Xaml.Media.Imaging;
 using Windows.ApplicationModel.DataTransfer;

src/modules/AdvancedPaste/AdvancedPaste/Helpers/IUserSettings.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Collections.ObjectModel;
+
 using Microsoft.PowerToys.Settings.UI.Library;
 
 namespace AdvancedPaste.Settings

src/modules/AdvancedPaste/AdvancedPaste/Helpers/JsonHelper.cs

@@ -8,6 +8,7 @@ using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Xml;
+
 using ManagedCommon;
 using Newtonsoft.Json;
 using Windows.ApplicationModel.DataTransfer;

src/modules/AdvancedPaste/AdvancedPaste/Helpers/MarkdownHelper.cs

@@ -6,6 +6,7 @@ using System;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+
 using HtmlAgilityPack;
 using ManagedCommon;
 using Windows.ApplicationModel.DataTransfer;

src/modules/AdvancedPaste/AdvancedPaste/Helpers/UserSettings.cs

@@ -7,6 +7,7 @@ using System.Collections.ObjectModel;
 using System.IO.Abstractions;
 using System.Threading;
 using System.Threading.Tasks;
+
 using ManagedCommon;
 using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.PowerToys.Settings.UI.Library.Utilities;

src/modules/AdvancedPaste/AdvancedPaste/Models/CustomQuery.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Text.Json;
+
 using AdvancedPaste.Helpers;
 using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
 

src/modules/AdvancedPaste/AdvancedPaste/Program.cs

@@ -4,6 +4,7 @@
 
 using System;
 using System.Threading;
+
 using ManagedCommon;
 using Microsoft.UI.Dispatching;
 using Microsoft.Windows.AppLifecycle;

src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteClipboardItemClicked.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Diagnostics.Tracing;
+
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.PowerToys.Telemetry.Events;
 

src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteClipboardItemDeletedEvent.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Diagnostics.Tracing;
+
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.PowerToys.Telemetry.Events;
 

src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteCustomFormatOutputThumbUpDownEvent.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Diagnostics.Tracing;
+
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.PowerToys.Telemetry.Events;
 

src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteFormatClickedEvent.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Diagnostics.Tracing;
+
 using AdvancedPaste.Models;
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.PowerToys.Telemetry.Events;

src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteGenerateCustomErrorEvent.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Diagnostics.Tracing;
+
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.PowerToys.Telemetry.Events;
 

src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteGenerateCustomFormatEvent.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Diagnostics.Tracing;
+
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.PowerToys.Telemetry.Events;
 

src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteInAppKeyboardShortcutEvent.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Diagnostics.Tracing;
+
 using AdvancedPaste.Models;
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.PowerToys.Telemetry.Events;

src/modules/AdvancedPaste/AdvancedPaste/ViewModels/OptionsViewModel.cs

@@ -8,6 +8,7 @@ using System.Globalization;
 using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
+
 using AdvancedPaste.Helpers;
 using AdvancedPaste.Models;
 using AdvancedPaste.Settings;
@@ -22,6 +23,7 @@ using Microsoft.Win32;
 using Windows.ApplicationModel.DataTransfer;
 using Windows.System;
 using WinUIEx;
+
 using DispatcherQueue = Microsoft.UI.Dispatching.DispatcherQueue;
 
 namespace AdvancedPaste.ViewModels

src/modules/AdvancedPaste/AdvancedPasteModuleInterface/dllmain.cpp

@@ -749,8 +749,6 @@ public:
             {
                 Logger::trace(L"Launching new process");
                 launch_process_and_named_pipe();
-
-                Trace::AdvancedPaste_Invoked(L"AdvancedPasteUI");
             }
 
             // hotkeyId in same order as set by get_hotkeys
@@ -774,18 +772,21 @@ public:
 
                 bring_process_to_front();
                 send_named_pipe_message(CommonSharedConstants::ADVANCED_PASTE_SHOW_UI_MESSAGE);
+                Trace::AdvancedPaste_Invoked(L"AdvancedPasteUI");
                 return true;
             }
             if (hotkeyId == 2)
             { // m_paste_as_markdown_hotkey
                 Logger::trace(L"Starting paste as markdown directly");
                 send_named_pipe_message(CommonSharedConstants::ADVANCED_PASTE_MARKDOWN_MESSAGE);
+                Trace::AdvancedPaste_Invoked(L"MarkdownDirect");
                 return true;
             }
             if (hotkeyId == 3)
             { // m_paste_as_json_hotkey
                 Logger::trace(L"Starting paste as json directly");
                 send_named_pipe_message(CommonSharedConstants::ADVANCED_PASTE_JSON_MESSAGE);
+                Trace::AdvancedPaste_Invoked(L"JsonDirect");
                 return true;
             }
 
@@ -798,6 +799,7 @@ public:
                 Logger::trace(L"Starting custom action id={}", id);
 
                 send_named_pipe_message(CommonSharedConstants::ADVANCED_PASTE_CUSTOM_ACTION_MESSAGE, std::to_wstring(id));
+                Trace::AdvancedPaste_Invoked(L"CustomActionDirect");
                 return true;
             }
         }

src/modules/CropAndLock/CropAndLock/CropAndLock.vcxproj

@@ -10,7 +10,7 @@
     <ProjectGuid>{f5e1146e-b7b3-4e11-85fd-270a500bd78c}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>CropAndLock</RootNamespace>
-    <WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.20348.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.22621.0</WindowsTargetPlatformVersion>
     <WindowsTargetPlatformMinVersion>10.0.19041.0</WindowsTargetPlatformMinVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/App.xaml.cs

@@ -4,6 +4,7 @@
 
 using System;
 using System.IO.Abstractions;
+
 using EnvironmentVariables.Telemetry;
 using EnvironmentVariablesUILib;
 using EnvironmentVariablesUILib.Helpers;

src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/MainWindow.xaml.cs

@@ -4,6 +4,7 @@
 
 using System;
 using System.Runtime.InteropServices;
+
 using EnvironmentVariables.Win32;
 using EnvironmentVariablesUILib;
 using EnvironmentVariablesUILib.Helpers;

src/modules/EnvironmentVariables/EnvironmentVariables/Helpers/LoggerWrapper.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+
 using EnvironmentVariablesUILib.Helpers;
 using ManagedCommon;
 

src/modules/EnvironmentVariables/EnvironmentVariables/Program.cs

@@ -4,6 +4,7 @@
 
 using System;
 using System.Threading;
+
 using ManagedCommon;
 using Microsoft.UI.Dispatching;
 using Microsoft.Windows.AppLifecycle;

src/modules/EnvironmentVariables/EnvironmentVariables/Telemetry/EnvironmentVariablesOpenedEvent.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Diagnostics.Tracing;
+
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.PowerToys.Telemetry.Events;
 

src/modules/EnvironmentVariables/EnvironmentVariables/Telemetry/EnvironmentVariablesProfileEnabledEvent.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Diagnostics.Tracing;
+
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.PowerToys.Telemetry.Events;
 

src/modules/EnvironmentVariables/EnvironmentVariables/Telemetry/EnvironmentVariablesVariableChangedEvent.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Diagnostics.Tracing;
+
 using EnvironmentVariablesUILib.Models;
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.PowerToys.Telemetry.Events;

src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/EnvironmentStateToBoolConverter.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+
 using EnvironmentVariablesUILib.Models;
 using Microsoft.UI.Xaml.Data;
 

src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/EnvironmentStateToMessageConverter.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+
 using EnvironmentVariablesUILib.Helpers;
 using EnvironmentVariablesUILib.Models;
 using Microsoft.UI.Xaml.Data;

src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/EnvironmentStateToTitleConverter.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+
 using EnvironmentVariablesUILib.Helpers;
 using EnvironmentVariablesUILib.Models;
 using Microsoft.UI.Xaml.Data;

src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/EnvironmentStateToVisibilityConverter.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+
 using EnvironmentVariablesUILib.Models;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Data;

src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/VariableTypeToGlyphConverter.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+
 using EnvironmentVariablesUILib.Models;
 using Microsoft.UI.Xaml.Data;
 

src/modules/EnvironmentVariables/EnvironmentVariablesUILib/EnvironmentVariablesMainPage.xaml.cs

@@ -6,6 +6,7 @@ using System;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows.Input;
+
 using CommunityToolkit.Mvvm.Input;
 using EnvironmentVariablesUILib.Models;
 using EnvironmentVariablesUILib.ViewModels;

src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Helpers/EnvironmentVariablesHelper.cs

@@ -5,6 +5,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+
 using EnvironmentVariablesUILib.Helpers.Win32;
 using EnvironmentVariablesUILib.Models;
 using Microsoft.Win32;

src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Helpers/EnvironmentVariablesService.cs

@@ -8,6 +8,7 @@ using System.IO;
 using System.IO.Abstractions;
 using System.Text.Json;
 using System.Threading.Tasks;
+
 using EnvironmentVariablesUILib.Models;
 
 namespace EnvironmentVariablesUILib.Helpers

src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Helpers/IEnvironmentVariablesService.cs

@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+
 using EnvironmentVariablesUILib.Models;
 
 namespace EnvironmentVariablesUILib.Helpers

src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Models/ProfileVariablesSet.cs

@@ -5,6 +5,7 @@
 using System;
 using System.Collections.ObjectModel;
 using System.Threading.Tasks;
+
 using CommunityToolkit.Mvvm.ComponentModel;
 using EnvironmentVariablesUILib.Helpers;
 

src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Models/Variable.cs

@@ -9,6 +9,7 @@ using System.Collections.Specialized;
 using System.Linq;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
+
 using CommunityToolkit.Mvvm.ComponentModel;
 using EnvironmentVariablesUILib.Helpers;
 

src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Models/VariablesSet.cs

@@ -6,6 +6,7 @@ using System;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text.Json.Serialization;
+
 using CommunityToolkit.Mvvm.ComponentModel;
 using EnvironmentVariablesUILib.ViewModels;
 

src/modules/EnvironmentVariables/EnvironmentVariablesUILib/ViewModels/MainViewModel.cs

@@ -9,6 +9,7 @@ using System.ComponentModel;
 using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
+
 using CommunityToolkit.Mvvm.ComponentModel;
 using EnvironmentVariablesUILib.Helpers;
 using EnvironmentVariablesUILib.Models;

src/modules/FileLocksmith/FileLocksmithLibInterop/FileLocksmithLibInterop.vcxproj

@@ -25,7 +25,7 @@
     <ProjectGuid>{c604b37e-9d0e-4484-8778-e8b31b0e1b3a}</ProjectGuid>
     <ProjectName>PowerToys.FileLocksmithLib.Interop</ProjectName>
     <RootNamespace>PowerToys.FileLocksmithLib.Interop</RootNamespace>
-    <TargetFramework>net8.0-windows10.0.20348.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
     <OutDir>..\..\..\..\$(Platform)\$(Configuration)\WinUI3Apps\</OutDir>
     <TargetName>PowerToys.FileLocksmithLib.Interop</TargetName>
   </PropertyGroup>

src/modules/FileLocksmith/FileLocksmithUI/Converters/FileCountConverter.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+
 using Microsoft.UI.Xaml.Data;
 
 namespace PowerToys.FileLocksmithUI.Converters

src/modules/FileLocksmith/FileLocksmithUI/Converters/FileListToDescriptionConverter.cs

@@ -4,6 +4,7 @@
 
 using System;
 using System.IO;
+
 using Microsoft.UI.Xaml.Data;
 
 namespace PowerToys.FileLocksmithUI.Converters

src/modules/FileLocksmith/FileLocksmithUI/Converters/PidToIconConverter.cs

@@ -5,6 +5,7 @@
 using System;
 using System.Drawing;
 using System.IO;
+
 using Microsoft.UI.Xaml.Data;
 using Microsoft.UI.Xaml.Media.Imaging;
 

src/modules/FileLocksmith/FileLocksmithUI/Converters/UserToSystemWarningVisibilityConverter.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Data;
 

src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/App.xaml.cs

@@ -4,6 +4,7 @@
 
 using System;
 using System.Linq;
+
 using ManagedCommon;
 using Microsoft.UI.Dispatching;
 using Microsoft.UI.Xaml;

src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/MainWindow.xaml.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;

src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/Views/MainPage.xaml.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using PowerToys.FileLocksmithLib.Interop;

src/modules/FileLocksmith/FileLocksmithUI/Properties/PublishProfiles/InstallationPublishProfile.pubxml

@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net8.0-windows10.0.20348.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
     <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
     <PublishDir>$(PowerToysRoot)\$(Platform)\$(Configuration)\WinUI3Apps</PublishDir>

src/modules/FileLocksmith/FileLocksmithUI/ViewModels/MainViewModel.cs

@@ -9,6 +9,7 @@ using System.Diagnostics;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using ManagedCommon;

src/modules/Hosts/Hosts.Tests/HostsServiceTest.cs

@@ -6,6 +6,7 @@ using System.IO;
 using System.IO.Abstractions.TestingHelpers;
 using System.Linq;
 using System.Threading.Tasks;
+
 using Hosts.Tests.Mocks;
 using HostsUILib.Exceptions;
 using HostsUILib.Helpers;

src/modules/Hosts/Hosts/Helpers/Host.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+
 using Microsoft.Extensions.Hosting;
 
 namespace Hosts.Helpers

src/modules/Hosts/Hosts/Helpers/LoggerWrapper.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+
 using HostsUILib.Helpers;
 using ManagedCommon;
 

src/modules/Hosts/Hosts/HostsXAML/App.xaml.cs

@@ -5,6 +5,7 @@
 using System;
 using System.IO.Abstractions;
 using System.Threading;
+
 using Common.UI;
 using HostsUILib.Helpers;
 using HostsUILib.Settings;
@@ -16,7 +17,9 @@ using Microsoft.Extensions.Hosting;
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.UI.Dispatching;
 using Microsoft.UI.Xaml;
+
 using static HostsUILib.Settings.IUserSettings;
+
 using Host = Hosts.Helpers.Host;
 
 // To learn more about WinUI, the WinUI project structure,

src/modules/Hosts/Hosts/Program.cs

@@ -4,6 +4,7 @@
 
 using System;
 using System.Threading;
+
 using ManagedCommon;
 using Microsoft.UI.Dispatching;
 using Microsoft.Windows.AppLifecycle;

src/modules/Hosts/Hosts/Settings/UserSettings.cs

@@ -5,6 +5,7 @@
 using System;
 using System.IO.Abstractions;
 using System.Threading;
+
 using HostsUILib.Settings;
 using ManagedCommon;
 using Microsoft.PowerToys.Settings.UI.Library;

src/modules/Hosts/Hosts/Telemetry/HostsFileEditorOpenedEvent.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Diagnostics.Tracing;
+
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.PowerToys.Telemetry.Events;
 

src/modules/Hosts/HostsUILib/Helpers/DuplicateService.cs

@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Threading;
+
 using HostsUILib.Models;
 using HostsUILib.Settings;
 using Microsoft.UI.Dispatching;

src/modules/Hosts/HostsUILib/Helpers/HostsService.cs

@@ -13,6 +13,7 @@ using System.Net.NetworkInformation;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+
 using HostsUILib.Exceptions;
 using HostsUILib.Models;
 using HostsUILib.Settings;

src/modules/Hosts/HostsUILib/Helpers/IDuplicateService.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Collections.Generic;
+
 using HostsUILib.Models;
 
 namespace HostsUILib.Helpers

src/modules/Hosts/HostsUILib/Helpers/IHostsService.cs

@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+
 using HostsUILib.Models;
 
 namespace HostsUILib.Helpers

src/modules/Hosts/HostsUILib/HostsMainPage.xaml.cs

@@ -5,6 +5,7 @@
 using System;
 using System.Threading.Tasks;
 using System.Windows.Input;
+
 using CommunityToolkit.Mvvm.Input;
 using HostsUILib.Helpers;
 using HostsUILib.Models;

src/modules/Hosts/HostsUILib/Models/Entry.cs

@@ -5,6 +5,7 @@
 using System;
 using System.Net;
 using System.Text;
+
 using CommunityToolkit.Mvvm.ComponentModel;
 using HostsUILib.Helpers;
 

src/modules/Hosts/HostsUILib/ViewModels/MainViewModel.cs

@@ -9,6 +9,7 @@ using System.IO;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Threading.Tasks;
+
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.WinUI;
@@ -18,6 +19,7 @@ using HostsUILib.Helpers;
 using HostsUILib.Models;
 using HostsUILib.Settings;
 using Microsoft.UI.Dispatching;
+
 using static HostsUILib.Settings.IUserSettings;
 
 namespace HostsUILib.ViewModels

src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj

@@ -21,10 +21,6 @@
     <AppxPackage>false</AppxPackage>
     <ApplicationType>Windows Store</ApplicationType>
     <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
-    <OverrideWindowsTargetPlatformVersion>true</OverrideWindowsTargetPlatformVersion>
-    <!-- Even though these are defined in Cpp.Build.props some of the other props referred here override these vales, so we need to specify them. -->
-    <WindowsTargetPlatformVersion>10.0.20348.0</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformMinVersion>10.0.19041.0</WindowsTargetPlatformMinVersion>
     <UseWinUI>true</UseWinUI>
     <WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
     <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>

src/modules/MeasureTool/MeasureToolUI/MeasureToolXAML/App.xaml.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+
 using ManagedCommon;
 using Microsoft.UI.Dispatching;
 using Microsoft.UI.Xaml;

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

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+
 using Microsoft.UI;
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
@@ -14,6 +15,7 @@ using Microsoft.UI.Xaml.Input;
 using Settings.UI.Library.Enumerations;
 using Windows.Graphics;
 using WinUIEx;
+
 using static NativeMethods;
 
 namespace MeasureToolUI

src/modules/MeasureTool/MeasureToolUI/Settings.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.IO;
+
 using Microsoft.PowerToys.Settings.UI.Library;
 using Settings.UI.Library.Enumerations;
 

src/modules/MouseUtils/MouseJumpUI.UnitTests/Common/Helpers/DrawingHelperTests.cs

@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using System.Reflection;
+
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using MouseJumpUI.Common.Helpers;
 using MouseJumpUI.Common.Imaging;

src/modules/MouseUtils/MouseJumpUI.UnitTests/Common/Helpers/LayoutHelperTests.cs

@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Text.Json;
+
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using MouseJumpUI.Common.Helpers;
 using MouseJumpUI.Common.Models.Drawing;

src/modules/MouseUtils/MouseJumpUI.UnitTests/Common/Helpers/MouseHelperTests.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Collections.Generic;
+
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using MouseJumpUI.Common.Helpers;
 using MouseJumpUI.Common.Models.Drawing;

src/modules/MouseUtils/MouseJumpUI.UnitTests/Common/Models/Drawing/RectangleInfoTests.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Collections.Generic;
+
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using MouseJumpUI.Common.Models.Drawing;
 

src/modules/MouseUtils/MouseJumpUI.UnitTests/Common/Models/Drawing/SizeInfoTests.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Collections.Generic;
+
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using MouseJumpUI.Common.Models.Drawing;
 

src/modules/MouseUtils/MouseJumpUI/Common/Helpers/DrawingHelper.cs

@@ -9,6 +9,7 @@ using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Drawing.Imaging;
 using System.Linq;
+
 using MouseJumpUI.Common.Imaging;
 using MouseJumpUI.Common.Models.Drawing;
 using MouseJumpUI.Common.Models.Layout;

src/modules/MouseUtils/MouseJumpUI/Common/Helpers/LayoutHelper.cs

@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+
 using MouseJumpUI.Common.Models.Drawing;
 using MouseJumpUI.Common.Models.Layout;
 using MouseJumpUI.Common.Models.Styles;

src/modules/MouseUtils/MouseJumpUI/Common/Helpers/MouseHelper.cs

@@ -4,8 +4,10 @@
 
 using System.ComponentModel;
 using System.Runtime.InteropServices;
+
 using MouseJumpUI.Common.Models.Drawing;
 using MouseJumpUI.Common.NativeMethods;
+
 using static MouseJumpUI.Common.NativeMethods.Core;
 using static MouseJumpUI.Common.NativeMethods.User32;