upgrade the boost dependencies for Fuzzing Project

* Update to WinAppSDK 1.7 latest version
* Update UpdateVersions.ps1

Signed-off-by: Shawn Yuan <shuai.yuan.zju@gmail.com>
Co-authored-by: Dustin L. Howett <dustin@howett.net>
Co-authored-by: Shawn Yuan <128874481+shuaiyuanxx@users.noreply.github.com>
Co-authored-by: Shawn Yuan <shuai.yuan.zju@gmail.com>
Co-authored-by: Clint Rutkas <clint@rutkas.com>

.github/actions/spell-check/allow/code.txt

@@ -273,4 +273,4 @@ mengyuanchen
 testhost
 
 #Tools
-OIP
+OIP

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

@@ -8,6 +8,7 @@ Acceleratorkeys
 ACCEPTFILES
 ACCESSDENIED
 ACCESSTOKEN
+acfs
 AClient
 AColumn
 acrt
@@ -518,11 +519,13 @@ FRAMECHANGED
 frm
 Froml
 FROMTOUCH
+fsanitize
 fsmgmt
 FZE
 gacutil
 Gaeilge
 Gaidhlig
+gameid
 GC'ed
 GCLP
 gdi
@@ -629,6 +632,7 @@ HOTKEYF
 hotkeys
 hotlight
 hotspot
+Hostx
 HPAINTBUFFER
 HRAWINPUT
 HREDRAW
@@ -712,6 +716,7 @@ INPUTSINK
 INPUTTYPE
 INSTALLDESKTOPSHORTCUT
 INSTALLDIR
+installdir
 INSTALLFOLDER
 INSTALLFOLDERTOBOOTSTRAPPERINSTALLFOLDER
 INSTALLFOLDERTOPREVIOUSINSTALLFOLDER
@@ -1077,6 +1082,7 @@ NOTRACK
 NOTSRCCOPY
 NOTSRCERASE
 NOTXORPEN
+notwindows
 NOZORDER
 NPH
 npmjs
@@ -1398,6 +1404,7 @@ sacl
 safeprojectname
 SAMEKEYPREVIOUSLYMAPPED
 SAMESHORTCUTPREVIOUSLYMAPPED
+sancov
 SAVEFAILED
 scanled
 schedtasks
@@ -1569,6 +1576,7 @@ stdcpp
 stdcpplatest
 STDMETHODCALLTYPE
 STDMETHODIMP
+steamapps
 STGC
 STGM
 STGMEDIUM
@@ -1932,6 +1940,7 @@ WUX
 Wwanpp
 XAxis
 xclip
+xcopy
 XDocument
 XElement
 xfd
@@ -1969,4 +1978,4 @@ zoomit
 ZOOMITX
 ZXk
 ZXNs
-zzz
+zzz

.pipelines/UpdateVersions.ps1

@@ -1,16 +1,24 @@
 Param(
-  # Using the default value of 1.6 for winAppSdkVersionNumber and useExperimentalVersion as false
+  # Using the default value of 1.7 for winAppSdkVersionNumber and useExperimentalVersion as false
   [Parameter(Mandatory=$False,Position=1)]
-  [string]$winAppSdkVersionNumber = "1.6",
+  [string]$winAppSdkVersionNumber = "1.7",
 
   # When the pipeline calls the PS1 file, the passed parameters are converted to string type
   [Parameter(Mandatory=$False,Position=2)]
-  [boolean]$useExperimentalVersion = $False
+  [boolean]$useExperimentalVersion = $False,
+
+  # Root folder Path for processing
+  [Parameter(Mandatory=$False,Position=3)]
+  [string]$rootPath = $(Split-Path -Parent (Split-Path -Parent $MyInvocation.MyCommand.Path)),
+
+  # Root folder Path for processing
+  [Parameter(Mandatory=$False,Position=4)]
+  [string]$sourceLink = "https://microsoft.pkgs.visualstudio.com/ProjectReunion/_packaging/Project.Reunion.nuget.internal/nuget/v3/index.json"
 )
 
 function Update-NugetConfig {
     param (
-        [string]$filePath = "nuget.config"
+        [string]$filePath = [System.IO.Path]::Combine($rootPath, "nuget.config")
     )
 
     Write-Host "Updating nuget.config file"
@@ -35,7 +43,33 @@ function Update-NugetConfig {
     $xml.Save($filePath)
 }
 
-$sourceLink = "https://microsoft.pkgs.visualstudio.com/ProjectReunion/_packaging/Project.Reunion.nuget.internal/nuget/v3/index.json"
+function Read-FileWithEncoding {
+    param (
+        [string]$Path
+    )
+
+    $reader = New-Object System.IO.StreamReader($Path, $true)  # auto-detect encoding
+    $content = $reader.ReadToEnd()
+    $encoding = $reader.CurrentEncoding
+    $reader.Close()
+
+    return [PSCustomObject]@{
+        Content  = $content
+        Encoding = $encoding
+    }
+}
+
+function Write-FileWithEncoding {
+    param (
+        [string]$Path,
+        [string]$Content,
+        [System.Text.Encoding]$Encoding
+    )
+
+    $writer = New-Object System.IO.StreamWriter($Path, $false, $Encoding)
+    $writer.Write($Content)
+    $writer.Close()
+}
 
 # Execute nuget list and capture the output
 if ($useExperimentalVersion) {
@@ -79,50 +113,54 @@ if ($latestVersion) {
 }
 
 # Update packages.config files
-Get-ChildItem -Recurse packages.config | ForEach-Object {
-    $content = Get-Content $_.FullName -Raw
+Get-ChildItem -Path $rootPath -Recurse packages.config | ForEach-Object {
+    $file = Read-FileWithEncoding -Path $_.FullName
+    $content = $file.Content
     if ($content -match 'package id="Microsoft.WindowsAppSDK"') {
         $newVersionString = 'package id="Microsoft.WindowsAppSDK" version="' + $WinAppSDKVersion + '"'
         $oldVersionString = 'package id="Microsoft.WindowsAppSDK" version="[-.0-9a-zA-Z]*"'
         $content = $content -replace $oldVersionString, $newVersionString
-        Set-Content -Path $_.FullName -Value $content
+        Write-FileWithEncoding -Path $_.FullName -Content $content -Encoding $file.encoding
         Write-Host "Modified " $_.FullName 
     }
 }
 
 # Update Directory.Packages.props file
-$propsFile = "Directory.Packages.props"
+$propsFile = [System.IO.Path]::Combine($rootPath,"Directory.Packages.props")
 if (Test-Path $propsFile) {
-    $content = Get-Content $propsFile -Raw
+    $file = Read-FileWithEncoding -Path $propsFile
+    $content = $file.Content
     if ($content -match '<PackageVersion Include="Microsoft.WindowsAppSDK"') {
         $newVersionString = '<PackageVersion Include="Microsoft.WindowsAppSDK" Version="' + $WinAppSDKVersion + '" />'
         $oldVersionString = '<PackageVersion Include="Microsoft.WindowsAppSDK" Version="[-.0-9a-zA-Z]*" />'
         $content = $content -replace $oldVersionString, $newVersionString
-        Set-Content -Path $propsFile -Value $content
+        Write-FileWithEncoding -Path $propsFile -Content $content -Encoding $file.encoding
         Write-Host "Modified " $propsFile
     }
 }
 
 # Update .vcxproj files
-Get-ChildItem -Recurse *.vcxproj | ForEach-Object {
-    $content = Get-Content $_.FullName -Raw
+Get-ChildItem -Path $rootPath -Recurse *.vcxproj | ForEach-Object {
+    $file = Read-FileWithEncoding -Path $_.FullName
+    $content = $file.Content
     if ($content -match '\\Microsoft.WindowsAppSDK.') {
         $newVersionString = '\Microsoft.WindowsAppSDK.' + $WinAppSDKVersion + '\'
         $oldVersionString = '\\Microsoft.WindowsAppSDK.[-.0-9a-zA-Z]*\\'
         $content = $content -replace $oldVersionString, $newVersionString
-        Set-Content -Path $_.FullName -Value $content
+        Write-FileWithEncoding -Path $_.FullName -Content $content -Encoding $file.encoding
         Write-Host "Modified " $_.FullName
     }
 }
 
 # Update .csproj files
-Get-ChildItem -Recurse *.csproj | ForEach-Object {
-    $content = Get-Content $_.FullName -Raw
+Get-ChildItem -Path $rootPath -Recurse *.csproj | ForEach-Object {
+    $file = Read-FileWithEncoding -Path $_.FullName
+    $content = $file.Content
     if ($content -match 'PackageReference Include="Microsoft.WindowsAppSDK"') {
         $newVersionString = 'PackageReference Include="Microsoft.WindowsAppSDK" Version="'+ $WinAppSDKVersion + '"'
         $oldVersionString = 'PackageReference Include="Microsoft.WindowsAppSDK" Version="[-.0-9a-zA-Z]*"'
         $content = $content -replace $oldVersionString, $newVersionString
-        Set-Content -Path $_.FullName -Value $content
+        Write-FileWithEncoding -Path $_.FullName -Content $content -Encoding $file.encoding
         Write-Host "Modified " $_.FullName 
     }
 }

.pipelines/v2/ci-using-the-latest-winappsdk.yml

@@ -33,7 +33,7 @@ parameters:
     default: true
   - name: winAppSDKVersionNumber
     type: string
-    default: 1.6
+    default: 1.7
   - name: useExperimentalVersion
     type: boolean
     default: false

.pipelines/v2/templates/steps-update-winappsdk-and-restore-nuget.yml

@@ -17,6 +17,7 @@ steps:
     arguments: >
       -winAppSdkVersionNumber ${{ parameters.versionNumber }}
       -useExperimentalVersion $${{ parameters.useExperimentalVersion }}
+      -rootPath "$(build.sourcesdirectory)"
 
 - script: echo $(WinAppSDKVersion)
   displayName: 'Display WinAppSDK Version Found'

Directory.Packages.props

@@ -45,7 +45,7 @@
     <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2903.40" />
     <!-- Package Microsoft.Win32.SystemEvents added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Drawing.Common but the 8.0.1 version wasn't published to nuget. -->
     <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.WindowsPackageManager.ComInterop" Version="1.10.120-preview" />
+    <PackageVersion Include="Microsoft.WindowsPackageManager.ComInterop" Version="1.10.340" />
     <PackageVersion Include="Microsoft.Windows.Compatibility" Version="9.0.4" />
     <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.2.46-beta" />
     <!-- CsWinRT version needs to be set to have a WinRT.Runtime.dll at the same version contained inside the NET SDK we're currently building on CI. -->
@@ -55,7 +55,7 @@
 	-->
     <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
     <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.6.250205002" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.7.250401001" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
     <PackageVersion Include="ModernWpfUI" Version="0.9.4" />

NOTICE.md

@@ -1472,8 +1472,8 @@ SOFTWARE.
 - Microsoft.Windows.CsWin32 0.2.46-beta
 - Microsoft.Windows.CsWinRT 2.2.0
 - Microsoft.Windows.SDK.BuildTools 10.0.22621.2428
-- Microsoft.WindowsAppSDK 1.6.250205002
-- Microsoft.WindowsPackageManager.ComInterop 1.10.120-preview
+- Microsoft.WindowsAppSDK 1.7.250401001
+- Microsoft.WindowsPackageManager.ComInterop 1.10.340
 - Microsoft.Xaml.Behaviors.WinUI.Managed 2.0.9
 - Microsoft.Xaml.Behaviors.Wpf 1.1.39
 - ModernWpfUI 0.9.4

PowerToys.sln

@@ -708,6 +708,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.System
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CmdPalKeyboardService", "src\modules\cmdpal\CmdPalKeyboardService\CmdPalKeyboardService.vcxproj", "{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerRename.FuzzingTest", "src\modules\powerrename\PowerRename.FuzzingTest\PowerRename.FuzzingTest.vcxproj", "{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM64 = Debug|ARM64
@@ -2588,6 +2590,12 @@ Global
 		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Release|ARM64.Build.0 = Release|ARM64
 		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Release|x64.ActiveCfg = Release|x64
 		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Release|x64.Build.0 = Release|x64
+		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Debug|x64.ActiveCfg = Debug|x64
+		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Debug|x64.Build.0 = Debug|x64
+		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Release|ARM64.ActiveCfg = Release|ARM64
+		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Release|x64.ActiveCfg = Release|x64
+		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2859,6 +2867,7 @@ Global
 		{5702B3CC-8575-48D5-83D8-15BB42269CD3} = {929C1324-22E8-4412-A9A8-80E85F3985A5}
 		{64B88F02-CD88-4ED8-9624-989A800230F9} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
 		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2} = {3846508C-77EB-4034-A702-F8BB263C4F79}
+		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E} = {89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0}

doc/Fuzzing/CppFuzzingGuide.md

@@ -0,0 +1,117 @@
+# 🧪 C++ Project Fuzzing Test Guide
+
+This guide walks you through setting up a **fuzzing test** project for a C++ module using [libFuzzer](https://llvm.org/docs/LibFuzzer.html).
+.
+
+---
+
+## 🏗️ Step-by-Step Setup
+
+### 1. Create a New C++ Project
+
+- Use **Empty Project** template.
+- Name it `<ModuleName>.FuzzingTest`.
+
+---
+
+### 2. Update Build Configuration
+
+- In **Configuration Manager**, Uncheck Build for both Release|ARM64, Debug|ARM64 and Debug|x64 configurations.
+- Note: ARM64 is not supported in this case, so leave ARM64 configurations build disabled.
+---
+
+### 3. Enable ASan and libFuzzer in `.vcxproj`
+
+Edit the project file to enable fuzzing:
+
+```xml
+<PropertyGroup>
+  <EnableASAN>true</EnableASAN>
+  <EnableFuzzer>true</EnableFuzzer>
+</PropertyGroup>
+```
+
+---
+
+### 4. Add Fuzzing Compiler Flags
+
+Add this to `AdditionalOptions` under the `Fuzzing` configuration:
+
+```xml
+/fsanitize=address
+/fsanitize-coverage=inline-8bit-counters
+/fsanitize-coverage=edge
+/fsanitize-coverage=trace-cmp
+/fsanitize-coverage=trace-div
+%(AdditionalOptions)
+```
+
+---
+
+### 5. Link the Sanitizer Coverage Runtime
+
+In `Linker → Input → Additional Dependencies`, add:
+
+```text
+$(VCToolsInstallDir)lib\$(Platform)\libsancov.lib
+```
+
+---
+
+### 6. Copy Required Runtime DLL
+
+Add a `PostBuildEvent` to copy the ASAN DLL:
+
+```xml
+<Command>
+  xcopy /y "$(VCToolsInstallDir)bin\Hostx64\x64\clang_rt.asan_dynamic-x86_64.dll" "$(OutDir)"
+</Command>
+```
+
+---
+
+### 7. Add Preprocessor Definitions
+
+To avoid annotation issues, add these to the `Preprocessor Definitions`:
+
+```text
+_DISABLE_VECTOR_ANNOTATION;_DISABLE_STRING_ANNOTATION
+```
+
+---
+
+## 🧬 Required Code
+
+### `LLVMFuzzerTestOneInput` Entry Point
+
+Every fuzzing project must expose this function:
+
+```cpp
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
+{
+    std::string input(reinterpret_cast<const char*>(data), size);
+
+    try
+    {
+        // Call your module with the input here.
+    }
+    catch (...) {}
+
+    return 0;
+}
+```
+
+---
+
+## ⚙️ [Test run in the cloud](https://eng.ms/docs/cloud-ai-platform/azure-edge-platform-aep/aep-security/epsf-edge-and-platform-security-fundamentals/the-onefuzz-service/onefuzz/faq/notwindows/walkthrough)
+
+To submit a job to the cloud you can run with this command:
+
+```
+oip submit --config .\OneFuzzConfig.json --drop-path <your_submission_directory> --platform windows --do-not-file-bugs --duration 1
+```
+You want to run with --do-not-file-bugs because if there is an issue with running the parser in the cloud (which is very possible), you don't want bugs to be created if there is an issue. The --duration task is the number of hours you want the task to run. I recommend just running for 1 hour to make sure things work initially. If you don't specify this parameter, it will default to 48 hours. You can find more about submitting a test job here. 
+
+OneFuzz will send you an email when the job has started.
+
+---

src/Common.Dotnet.CsWinRT.props

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Some items may be set in Directory.Build.props in root -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project=".\Common.Dotnet.PrepareGeneratedFolder.targets" />
+
   <PropertyGroup>
     <WindowsSdkPackageVersion>10.0.22621.57</WindowsSdkPackageVersion>
     <TargetFramework>net9.0-windows10.0.22621.0</TargetFramework>

src/Common.Dotnet.PrepareGeneratedFolder.targets

@@ -0,0 +1,16 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Target Name="EnsureGeneratedBaseFolder" BeforeTargets="XamlPreCompile">
+    <PropertyGroup>
+      <!-- Only create the base 'generated' folder -->
+      <CompilerGeneratedFilesOutputPath>$(ProjectDir)obj\g</CompilerGeneratedFilesOutputPath>
+    </PropertyGroup>
+
+    <!-- Create 'generated' folder if missing -->
+    <MakeDir Directories="$(CompilerGeneratedFilesOutputPath)" />
+
+    <!-- Optional logging for debugging -->
+    <Message Text="Ensured: $(GeneratedBasePath)" Importance="Low" />
+  </Target>
+
+</Project>

src/common/ManagedCommon/IdRecoveryHelper.cs

@@ -0,0 +1,51 @@
+// 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.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ManagedCommon
+{
+    public static class IdRecoveryHelper
+    {
+        /// <summary>
+        /// Fixes invalid IDs in the given list by assigning unique values.
+        /// It ensures that all IDs are non-empty and unique, correcting any duplicates or empty IDs.
+        /// </summary>
+        /// <param name="items">The list of items that may contain invalid IDs.</param>
+        public static void RecoverInvalidIds<T>(IEnumerable<T> items)
+            where T : class, IHasId
+        {
+            var idSet = new HashSet<int>();
+            int newId = 0;
+            var sortedItems = items.OrderBy(i => i.Id).ToList(); // Sort items by ID for consistent processing
+
+            // Iterate through the list and fix invalid IDs
+            foreach (var item in sortedItems)
+            {
+                // If the ID is invalid or already exists in the set (duplicate), assign a new unique ID
+                if (!idSet.Add(item.Id))
+                {
+                    // Find the next available unique ID
+                    while (idSet.Contains(newId))
+                    {
+                        newId++;
+                    }
+
+                    item.Id = newId;
+                    idSet.Add(newId); // Add the newly assigned ID to the set
+                }
+            }
+        }
+    }
+
+    public interface IHasId
+    {
+        int Id { get; set; }
+    }
+}

src/modules/EnvironmentVariables/EnvironmentVariablesUILib/EnvironmentVariablesUILib.csproj

@@ -15,8 +15,6 @@
     <ProjectPriFileName>PowerToys.EnvironmentVariablesUILib.pri</ProjectPriFileName>
     <GenerateLibraryLayout>true</GenerateLibraryLayout>
     <IsPackable>true</IsPackable>
-    <!-- The default generated file path exceeds the length limit 260 on the build agent. Using a shorter path as a workaround. -->
-    <CompilerGeneratedFilesOutputPath>$(ProjectDir)obj\g</CompilerGeneratedFilesOutputPath>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -56,7 +54,4 @@
     <Manifest Include="$(ApplicationManifest)" />
   </ItemGroup>
 
-  <Target Name="EnsureCompilerGeneratedFilesOutputPathExists" BeforeTargets="XamlPreCompile">
-    <MakeDir Directories="$(CompilerGeneratedFilesOutputPath)" />
-  </Target>
 </Project>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.props')" />
   <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props')" />
   <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
   <PropertyGroup Label="Globals">
@@ -141,7 +141,7 @@
     <Import Project="..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
     <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets')" />
     <Import Project="..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets')" />
-    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -153,7 +153,7 @@
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props'))" />
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets'))" />
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.targets'))" />
   </Target>
 </Project>

src/modules/MeasureTool/MeasureToolCore/packages.config

@@ -4,5 +4,5 @@
   <package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
   <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
   <package id="Microsoft.Windows.SDK.BuildTools" version="10.0.22621.2428" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK" version="1.6.250205002" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK" version="1.7.250401001" targetFramework="native" />
 </packages>

src/modules/Workspaces/WorkspacesLauncher/AppLauncher.cpp

@@ -121,6 +121,22 @@ namespace AppLauncher
         // packaged apps: try launching first by AppUserModel.ID
         // usage example: elevated Terminal
         if (!launched && !app.appUserModelId.empty() && !app.packageFullName.empty())
+        {
+            Logger::trace(L"Launching {} as {} - {app.packageFullName}", app.name, app.appUserModelId, app.packageFullName);
+            auto res = LaunchApp(L"shell:AppsFolder\\" + app.appUserModelId, app.commandLineArgs, app.isElevated);
+            if (res.isOk())
+            {
+                launched = true;
+            }
+            else
+            {
+                launchErrors.push_back({ std::filesystem::path(app.path).filename(), res.error() });
+            }
+        }
+
+        // win32 app with appUserModelId:
+        // usage example: steam games
+        if (!launched && !app.appUserModelId.empty())
         {
             Logger::trace(L"Launching {} as {}", app.name, app.appUserModelId);
             auto res = LaunchApp(L"shell:AppsFolder\\" + app.appUserModelId, app.commandLineArgs, app.isElevated);

src/modules/Workspaces/WorkspacesLib/AppUtils.cpp

@@ -1,5 +1,6 @@
 #include "pch.h"
 #include "AppUtils.h"
+#include "SteamHelper.h"
 
 #include <atlbase.h>
 #include <propvarutil.h>
@@ -34,6 +35,8 @@ namespace Utils
 
             constexpr const wchar_t* EdgeFilename = L"msedge.exe";
             constexpr const wchar_t* ChromeFilename = L"chrome.exe";
+
+            constexpr const wchar_t* SteamUrlProtocol = L"steam:";
         }
 
         AppList IterateAppsFolder()
@@ -138,6 +141,34 @@ namespace Utils
                                 else if (prop == NonLocalizable::PackageInstallPathProp || prop == NonLocalizable::InstallPathProp)
                                 {
                                     data.installPath = propVariantString.m_pData;
+
+                                    if (!data.installPath.empty())
+                                    {
+                                        const bool isSteamProtocol = data.installPath.rfind(NonLocalizable::SteamUrlProtocol, 0) == 0;
+
+                                        if (isSteamProtocol)
+                                        {
+                                            Logger::info(L"Found steam game: protocol path: {}", data.installPath);
+                                            data.protocolPath = data.installPath;
+
+                                            try
+                                            {
+                                                auto gameId = Steam::GetGameIdFromUrlProtocolPath(data.installPath);
+                                                auto gameFolder = Steam::GetSteamGameInfoFromAcfFile(gameId);
+
+                                                if (gameFolder)
+                                                {
+                                                    data.installPath = gameFolder->gameInstallationPath;
+                                                    Logger::info(L"Found steam game: physical path: {}", data.installPath);
+                                                }
+                                            }
+                                            catch (std::exception ex)
+                                            {
+                                                Logger::error(L"Failed to get installPath for game {}", data.installPath);
+                                                Logger::error("Error: {}", ex.what());
+                                            }
+                                        }
+                                    }
                                 }
                             }
 
@@ -397,5 +428,10 @@ namespace Utils
         {
             return installPath.ends_with(NonLocalizable::ChromeFilename);
         }
+
+        bool AppData::IsSteamGame() const
+        {
+            return protocolPath.rfind(NonLocalizable::SteamUrlProtocol, 0) == 0;
+        }
     }
 }

src/modules/Workspaces/WorkspacesLib/AppUtils.h

@@ -13,10 +13,12 @@ namespace Utils
             std::wstring packageFullName;
             std::wstring appUserModelId;
             std::wstring pwaAppId;
+            std::wstring protocolPath;
             bool canLaunchElevated = false;
 
             bool IsEdge() const;
             bool IsChrome() const;
+            bool IsSteamGame() const;
         };
 
         using AppList = std::vector<AppData>;

src/modules/Workspaces/WorkspacesLib/SteamGameHelper.cpp

@@ -0,0 +1,171 @@
+#include "pch.h"
+#include "SteamHelper.h"
+#include <fstream>
+#include <sstream>
+#include <unordered_map>
+#include <filesystem>
+#include <regex>
+#include <string>
+
+namespace Utils
+{
+
+    static std::wstring Utf8ToWide(const std::string& utf8)
+    {
+        if (utf8.empty())
+            return L"";
+
+        int size = MultiByteToWideChar(CP_UTF8, 0, utf8.data(), static_cast<int>(utf8.size()), nullptr, 0);
+        if (size <= 0)
+            return L"";
+
+        std::wstring wide(size, L'\0');
+        MultiByteToWideChar(CP_UTF8, 0, utf8.data(), static_cast<int>(utf8.size()), wide.data(), size);
+        return wide;
+    }
+
+    namespace Steam
+    {
+        using namespace std;
+        namespace fs = std::filesystem;
+
+        static std::optional<std::wstring> GetSteamExePathFromRegistry()
+        {
+            static std::optional<std::wstring> cachedPath;
+            if (cachedPath.has_value())
+            {
+                return cachedPath;
+            }
+
+            const std::vector<HKEY> roots = { HKEY_CLASSES_ROOT, HKEY_LOCAL_MACHINE, HKEY_USERS };
+            const std::vector<std::wstring> subKeys = {
+                L"steam\\shell\\open\\command",
+                L"Software\\Classes\\steam\\shell\\open\\command",
+            };
+
+            for (HKEY root : roots)
+            {
+                for (const auto& subKey : subKeys)
+                {
+                    HKEY hKey;
+                    if (RegOpenKeyExW(root, subKey.c_str(), 0, KEY_READ, &hKey) == ERROR_SUCCESS)
+                    {
+                        wchar_t value[512];
+                        DWORD size = sizeof(value);
+                        DWORD type = 0;
+
+                        if (RegQueryValueExW(hKey, nullptr, nullptr, &type, reinterpret_cast<LPBYTE>(value), &size) == ERROR_SUCCESS &&
+                            (type == REG_SZ || type == REG_EXPAND_SZ))
+                        {
+                            std::wregex exeRegex(LR"delim("([^"]+steam\.exe)")delim");
+                            std::wcmatch match;
+                            if (std::regex_search(value, match, exeRegex) && match.size() > 1)
+                            {
+                                RegCloseKey(hKey);
+                                cachedPath = match[1].str();
+                                return cachedPath;
+                            }
+                        }
+
+                        RegCloseKey(hKey);
+                    }
+                }
+            }
+
+            cachedPath = std::nullopt;
+            return std::nullopt;
+        }
+
+        static fs::path GetSteamBasePath()
+        {
+            auto steamFolderOpt = GetSteamExePathFromRegistry();
+            if (!steamFolderOpt)
+            {
+                return {};
+            }
+
+            return fs::path(*steamFolderOpt).parent_path() / L"steamapps";
+        }
+
+        static fs::path GetAcfFilePath(const std::wstring& gameId)
+        {
+            auto steamFolderOpt = GetSteamExePathFromRegistry();
+            if (!steamFolderOpt)
+            {
+                return {};
+            }
+
+            return GetSteamBasePath() / (L"appmanifest_" + gameId + L".acf");
+        }
+
+        static fs::path GetGameInstallPath(const std::wstring& gameFolderName)
+        {
+            auto steamFolderOpt = GetSteamExePathFromRegistry();
+            if (!steamFolderOpt)
+            {
+                return {};
+            }
+
+            return GetSteamBasePath() / L"common" / gameFolderName;
+        }
+
+        static unordered_map<wstring, wstring> ParseAcfFile(const fs::path& acfPath)
+        {
+            unordered_map<wstring, wstring> result;
+
+            ifstream file(acfPath);
+            if (!file.is_open())
+                return result;
+
+            string line;
+            while (getline(file, line))
+            {
+                smatch matches;
+                static const regex pattern(R"delim("([^"]+)"\s+"([^"]+)")delim");
+
+                if (regex_search(line, matches, pattern) && matches.size() == 3)
+                {
+                    wstring key = Utf8ToWide(matches[1].str());
+                    wstring value = Utf8ToWide(matches[2].str());
+                    result[key] = value;
+                }
+            }
+
+            return result;
+        }
+
+        std::unique_ptr<Steam::SteamGame> GetSteamGameInfoFromAcfFile(const std::wstring& gameId)
+        {
+            fs::path acfPath = Steam::GetAcfFilePath(gameId);
+
+            if (!fs::exists(acfPath))
+                return nullptr;
+
+            auto kv = ParseAcfFile(acfPath);
+            if (kv.empty() || kv.find(L"installdir") == kv.end())
+                return nullptr;
+
+            fs::path gamePath = Steam::GetGameInstallPath(kv[L"installdir"]);
+            if (!fs::exists(gamePath))
+                return nullptr;
+
+            auto game = std::make_unique<Steam::SteamGame>();
+            game->gameId = gameId;
+            game->gameInstallationPath = gamePath.wstring();
+            return game;
+        }
+
+        std::wstring GetGameIdFromUrlProtocolPath(const std::wstring& urlPath)
+        {
+            const std::wstring steamGamePrefix = L"steam://rungameid/";
+
+            if (urlPath.rfind(steamGamePrefix, 0) == 0)
+            {
+                return urlPath.substr(steamGamePrefix.length());
+            }
+
+            return L"";
+        }
+
+    }
+}

src/modules/Workspaces/WorkspacesLib/SteamHelper.h

@@ -0,0 +1,24 @@
+#pragma once
+
+#include "pch.h"
+
+namespace Utils
+{
+    namespace NonLocalizable
+    {
+        const std::wstring AcfFileNameTemplate = L"appmanifest_<gameid>.acfs";
+    }
+
+    namespace Steam
+    {
+        struct SteamGame
+        {
+            std::wstring gameId;
+            std::wstring gameInstallationPath;
+        };
+
+        std::unique_ptr<SteamGame> GetSteamGameInfoFromAcfFile(const std::wstring& gameId);
+
+        std::wstring GetGameIdFromUrlProtocolPath(const std::wstring& urlPath);
+    }
+}

src/modules/Workspaces/WorkspacesLib/WorkspacesLib.vcxproj

@@ -41,6 +41,7 @@
     <ClInclude Include="pch.h" />
     <ClInclude Include="PwaHelper.h" />
     <ClInclude Include="Result.h" />
+    <ClInclude Include="SteamHelper.h" />
     <ClInclude Include="StringUtils.h" />
     <ClInclude Include="utils.h" />
     <ClInclude Include="WbemHelper.h" />
@@ -57,6 +58,7 @@
       <PrecompiledHeader Condition="'$(UsePrecompiledHeaders)' != 'false'">Create</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="PwaHelper.cpp" />
+    <ClCompile Include="SteamGameHelper.cpp" />
     <ClCompile Include="two_way_pipe_message_ipc.cpp" />
     <ClCompile Include="WbemHelper.cpp" />
     <ClCompile Include="WorkspacesData.cpp" />

src/modules/Workspaces/WorkspacesLib/WorkspacesLib.vcxproj.filters

@@ -53,6 +53,9 @@
     <ClInclude Include="StringUtils.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="SteamHelper.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="pch.cpp">
@@ -88,6 +91,9 @@
     <ClCompile Include="WbemHelper.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="SteamGameHelper.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />

src/modules/Workspaces/WorkspacesSnapshotTool/SnapshotUtils.cpp

@@ -71,6 +71,8 @@ namespace SnapshotUtils
                 continue;
             }
 
+            Logger::info("Try to get window app:{}", reinterpret_cast<void*>(window));
+
             DWORD pid{};
             GetWindowThreadProcessId(window, &pid);
 
@@ -118,10 +120,19 @@ namespace SnapshotUtils
             auto data = Utils::Apps::GetApp(processPath, pid, installedApps);
             if (!data.has_value() || data->name.empty())
             {
-                Logger::info(L"Installed app not found: {}", processPath);
+                Logger::info(L"Installed app not found:{},{}", reinterpret_cast<void*>(window), processPath);
                 continue;
             }
 
+            if (!data->IsSteamGame() && !WindowUtils::HasThickFrame(window))
+            {
+                // Only care about steam games if it has no thick frame to remain consistent with
+                // the behavior as before.
+                continue;
+            }
+
+            Logger::info(L"Found app for window:{},{}", reinterpret_cast<void*>(window), processPath);
+
             auto appData = data.value();
 
             bool isEdge = appData.IsEdge();

src/modules/Workspaces/WorkspacesWindowArranger/WindowArranger.cpp

@@ -200,6 +200,14 @@ std::optional<WindowWithDistance> WindowArranger::GetNearestWindow(const Workspa
         }
 
         auto data = Utils::Apps::GetApp(processPath, pid, m_installedApps);
+
+        if (!data->IsSteamGame() && !WindowUtils::HasThickFrame(window))
+        {
+            // Only care about steam games if it has no thick frame to remain consistent with 
+            // the behavior as before.
+            continue;
+        }
+
         if (!data.has_value())
         {
             continue;

src/modules/Workspaces/workspaces-common/WindowFilter.h

@@ -9,10 +9,12 @@ namespace WindowFilter
     {
         auto style = GetWindowLong(window, GWL_STYLE);
         bool isPopup = WindowUtils::HasStyle(style, WS_POPUP);
-        bool hasThickFrame = WindowUtils::HasStyle(style, WS_THICKFRAME);
         bool hasCaption = WindowUtils::HasStyle(style, WS_CAPTION);
         bool hasMinimizeMaximizeButtons = WindowUtils::HasStyle(style, WS_MINIMIZEBOX) || WindowUtils::HasStyle(style, WS_MAXIMIZEBOX);
-        if (isPopup && !(hasThickFrame && (hasCaption || hasMinimizeMaximizeButtons)))
+
+        Logger::info("Style for window: {}, {:#x}", reinterpret_cast<void*>(window), style);
+
+        if (isPopup && !(hasCaption || hasMinimizeMaximizeButtons))
         {
             // popup windows we want to snap: e.g. Calculator, Telegram
             // popup windows we don't want to snap: start menu, notification popup, tray window, etc.

src/modules/Workspaces/workspaces-common/WindowUtils.h

@@ -121,4 +121,11 @@ namespace WindowUtils
 
         return std::wstring(title);
     }
+
+    
+    inline bool HasThickFrame(HWND window)
+    {
+        auto style = GetWindowLong(window, GWL_STYLE);
+        return WindowUtils::HasStyle(style, WS_THICKFRAME);
+    }
 }

src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/Directory.Packages.props

@@ -9,7 +9,7 @@
     <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.2.46-beta" />
     <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
     <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.6.250205002" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.7.250401001" />
     <PackageVersion Include="Shmuelie.WinRTServer" Version="2.1.1" />
     <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
     <PackageVersion Include="System.Text.Json" Version="9.0.3" />

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/CommandBarViewModel.cs

@@ -29,6 +29,8 @@ public partial class CommandBarViewModel : ObservableObject,
 
             field = value;
             SetSelectedItem(value);
+
+            OnPropertyChanged(nameof(SelectedItem));
         }
     }
 
@@ -109,12 +111,16 @@ public partial class CommandBarViewModel : ObservableObject,
         if (SelectedItem.MoreCommands.Count() > 1)
         {
             ShouldShowContextMenu = true;
-            ContextCommands = [.. SelectedItem.AllCommands];
+            ContextCommands = [.. SelectedItem.AllCommands.Where(c => c.ShouldBeVisible)];
         }
         else
         {
             ShouldShowContextMenu = false;
         }
+
+        OnPropertyChanged(nameof(HasSecondaryCommand));
+        OnPropertyChanged(nameof(SecondaryCommand));
+        OnPropertyChanged(nameof(ShouldShowContextMenu));
     }
 
     // InvokeItemCommand is what this will be in Xaml due to source generator

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ContentPageViewModel.cs

@@ -167,7 +167,7 @@ public partial class ContentPageViewModel : PageViewModel, ICommandBarContext
 
                     Commands.ForEach(contextItem =>
                     {
-                        contextItem.InitializeProperties();
+                        contextItem.SlowInitializeProperties();
                     });
                 }
                 else

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ListViewModel.cs

@@ -436,7 +436,7 @@ public partial class ListViewModel : PageViewModel, IDisposable
                 break;
             case nameof(EmptyContent):
                 EmptyContent = new(new(model.EmptyContent), PageContext);
-                EmptyContent.InitializeProperties();
+                EmptyContent.SlowInitializeProperties();
                 break;
             case nameof(IsLoading):
                 UpdateEmptyContent();
@@ -454,6 +454,8 @@ public partial class ListViewModel : PageViewModel, IDisposable
             return;
         }
 
+        UpdateProperty(nameof(EmptyContent));
+
         DoOnUiThread(
            () =>
            {

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/SettingsModel.cs

@@ -40,6 +40,8 @@ public partial class SettingsModel : ObservableObject
 
     public bool ShowSystemTrayIcon { get; set; } = true;
 
+    public bool IgnoreShortcutWhenFullscreen { get; set; } = true;
+
     public Dictionary<string, ProviderSettings> ProviderSettings { get; set; } = [];
 
     public Dictionary<string, CommandAlias> Aliases { get; set; } = [];

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/SettingsViewModel.cs

@@ -108,6 +108,16 @@ public partial class SettingsViewModel : INotifyPropertyChanged
         }
     }
 
+    public bool IgnoreShortcutWhenFullscreen
+    {
+        get => _settings.IgnoreShortcutWhenFullscreen;
+        set
+        {
+            _settings.IgnoreShortcutWhenFullscreen = value;
+            Save();
+        }
+    }
+
     public ObservableCollection<ProviderSettingsViewModel> CommandProviders { get; } = [];
 
     public SettingsViewModel(SettingsModel settings, IServiceProvider serviceProvider, TaskScheduler scheduler)

src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/CommandBar.xaml

@@ -71,9 +71,9 @@
         Padding="4"
         ColumnSpacing="8">
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto" />
             <ColumnDefinition Width="Auto" />
             <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="Auto" />
         </Grid.ColumnDefinitions>
 
         <Grid
@@ -133,6 +133,8 @@
             VerticalAlignment="Center"
             Style="{StaticResource CaptionTextBlockStyle}"
             Text="{x:Bind CurrentPageViewModel.Title, Mode=OneWay}"
+            TextTrimming="CharacterEllipsis"
+            TextWrapping="NoWrap"
             Visibility="{x:Bind CurrentPageViewModel.IsNested, Mode=OneWay}" />
         <StackPanel
             Grid.Column="2"

src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ListPage.xaml

@@ -138,14 +138,15 @@
             </controls:Case>
             <controls:Case Value="True">
                 <StackPanel
+                    Margin="24"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     Orientation="Vertical"
                     Spacing="4">
                     <cpcontrols:IconBox
                         x:Name="IconBorder"
-                        Width="56"
-                        Height="56"
+                        Width="48"
+                        Height="48"
                         Margin="8"
                         Foreground="{ThemeResource TextFillColorSecondaryBrush}"
                         SourceKey="{x:Bind ViewModel.EmptyContent.Icon, Mode=OneWay}"
@@ -154,11 +155,15 @@
                         Margin="0,4,0,0"
                         HorizontalAlignment="Center"
                         FontWeight="SemiBold"
-                        Text="{x:Bind ViewModel.EmptyContent.Title, Mode=OneWay}" />
+                        Text="{x:Bind ViewModel.EmptyContent.Title, Mode=OneWay}"
+                        TextAlignment="Center"
+                        TextWrapping="Wrap" />
                     <TextBlock
                         HorizontalAlignment="Center"
                         Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                        Text="{x:Bind ViewModel.EmptyContent.Subtitle, Mode=OneWay}" />
+                        Text="{x:Bind ViewModel.EmptyContent.Subtitle, Mode=OneWay}"
+                        TextAlignment="Center"
+                        TextWrapping="Wrap" />
                 </StackPanel>
             </controls:Case>
         </controls:SwitchPresenter>

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

@@ -0,0 +1,26 @@
+// 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.Runtime.InteropServices;
+using System.Security;
+
+namespace Microsoft.CmdPal.UI.Helpers;
+
+[SuppressUnmanagedCodeSecurity]
+internal static class NativeMethods
+{
+    [DllImport("shell32.dll")]
+    public static extern int SHQueryUserNotificationState(out UserNotificationState state);
+}
+
+internal enum UserNotificationState : int
+{
+    QUNS_NOT_PRESENT = 1,
+    QUNS_BUSY,
+    QUNS_RUNNING_D3D_FULL_SCREEN,
+    QUNS_PRESENTATION_MODE,
+    QUNS_ACCEPTS_NOTIFICATIONS,
+    QUNS_QUIET_TIME,
+    QUNS_APP,
+}

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

@@ -0,0 +1,28 @@
+// 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.Runtime.InteropServices;
+
+namespace Microsoft.CmdPal.UI.Helpers;
+
+internal sealed partial class WindowHelper
+{
+    public static bool IsWindowFullscreen()
+    {
+        UserNotificationState state;
+
+        // https://learn.microsoft.com/en-us/windows/win32/api/shellapi/ne-shellapi-query_user_notification_state
+        if (Marshal.GetExceptionForHR(NativeMethods.SHQueryUserNotificationState(out state)) == null)
+        {
+            if (state == UserNotificationState.QUNS_RUNNING_D3D_FULL_SCREEN ||
+                state == UserNotificationState.QUNS_BUSY ||
+                state == UserNotificationState.QUNS_PRESENTATION_MODE)
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+}

src/modules/cmdpal/Microsoft.CmdPal.UI/MainWindow.xaml.cs

@@ -43,6 +43,7 @@ public sealed partial class MainWindow : Window,
     private readonly WNDPROC? _hotkeyWndProc;
     private readonly WNDPROC? _originalWndProc;
     private readonly List<TopLevelHotkey> _hotkeys = [];
+    private bool _ignoreHotKeyWhenFullScreen = true;
 
     // Stylistically, window messages are WM_*
 #pragma warning disable SA1310 // Field names should not contain underscore
@@ -157,6 +158,8 @@ public sealed partial class MainWindow : Window,
         SetupHotkey(settings);
         SetupTrayIcon(settings.ShowSystemTrayIcon);
 
+        _ignoreHotKeyWhenFullScreen = settings.IgnoreShortcutWhenFullscreen;
+
         // This will prevent our window from appearing in alt+tab or the taskbar.
         // You'll _need_ to use the hotkey to summon it.
         AppWindow.IsShownInSwitchers = System.Diagnostics.Debugger.IsAttached;
@@ -504,6 +507,15 @@ public sealed partial class MainWindow : Window,
                     var hotkeyIndex = (int)wParam.Value;
                     if (hotkeyIndex < _hotkeys.Count)
                     {
+                        if (_ignoreHotKeyWhenFullScreen)
+                        {
+                            // If we're in full screen mode, ignore the hotkey
+                            if (WindowHelper.IsWindowFullscreen())
+                            {
+                                return (LRESULT)IntPtr.Zero;
+                            }
+                        }
+
                         var hotkey = _hotkeys[hotkeyIndex];
                         HandleSummon(hotkey.CommandId);
 

src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml

@@ -356,9 +356,8 @@
 
                         <cpcontrols:IconBox
                             x:Name="HeroImageBorder"
-                            MinWidth="64"
-                            MinHeight="64"
-                            MaxHeight="96"
+                            Width="64"
+                            Margin="16,8,16,16"
                             HorizontalAlignment="Center"
                             AutomationProperties.AccessibilityView="Raw"
                             SourceKey="{x:Bind ViewModel.Details.HeroImage, Mode=OneWay}"
@@ -368,8 +367,10 @@
                         <TextBlock
                             Grid.Row="1"
                             HorizontalAlignment="Center"
-                            Style="{StaticResource SubtitleTextBlockStyle}"
+                            FontSize="18"
+                            FontWeight="SemiBold"
                             Text="{x:Bind ViewModel.Details.Title, Mode=OneWay}"
+                            TextAlignment="Center"
                             TextWrapping="WrapWholeWords"
                             Visibility="{x:Bind ViewModel.Details.Title, Converter={StaticResource StringNotEmptyToVisibilityConverter}, Mode=OneWay}" />
 

src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/GeneralPage.xaml

@@ -48,6 +48,9 @@
                             </controls:SettingsCard>
                         </controls:SettingsExpander.Items>
                     </controls:SettingsExpander>
+                    <controls:SettingsCard x:Uid="Settings_GeneralPage_IgnoreShortcutWhenFullscreen_SettingsCard" HeaderIcon="{ui:FontIcon Glyph=&#xE7FC;}">
+                        <ToggleSwitch IsOn="{x:Bind viewModel.IgnoreShortcutWhenFullscreen, Mode=TwoWay}" />
+                    </controls:SettingsCard>
                     <controls:SettingsCard x:Uid="Settings_GeneralPage_GoHome_SettingsCard" HeaderIcon="{ui:FontIcon Glyph=&#xE80F;}">
                         <ToggleSwitch IsOn="{x:Bind viewModel.HotkeyGoesHome, Mode=TwoWay}" />
                     </controls:SettingsCard>

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

@@ -328,6 +328,12 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
   <data name="Settings_GeneralPage_LowLevelHook_SettingsCard.Description" xml:space="preserve">
     <value>Try this if there are issues with the shortcut (Command Palette might not get focus when triggered from an elevated window)</value>
   </data>
+  <data name="Settings_GeneralPage_IgnoreShortcutWhenFullscreen_SettingsCard.Header" xml:space="preserve">
+    <value>Ignore shortcut in fullscreen mode</value>
+  </data>
+  <data name="Settings_GeneralPage_IgnoreShortcutWhenFullscreen_SettingsCard.Description" xml:space="preserve">
+    <value>Preventing disruption of the program running in fullscreen by unintentional activation of shortcut</value>
+  </data>
   <data name="Settings_GeneralPage_GoHome_SettingsCard.Header" xml:space="preserve">
     <value>Go home when activated</value>
   </data>

src/modules/cmdpal/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj

@@ -3,7 +3,7 @@
   <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
   <PropertyGroup>
     <PathToRoot>..\..\..\..\</PathToRoot>
-    <WasdkNuget>$(PathToRoot)packages\Microsoft.WindowsAppSDK.1.6.250205002</WasdkNuget>
+    <WasdkNuget>$(PathToRoot)packages\Microsoft.WindowsAppSDK.1.7.250401001</WasdkNuget>
   </PropertyGroup>
   <Import Project="$(WasdkNuget)\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('$(WasdkNuget)\build\native\Microsoft.WindowsAppSDK.props')" />
   <PropertyGroup Label="Globals">

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/Pages/InstallPackageCommand.cs

@@ -22,10 +22,12 @@ public partial class InstallPackageCommand : InvokableCommand
     private IAsyncOperationWithProgress<UninstallResult, UninstallProgress>? _unInstallAction;
     private Task? _installTask;
 
-    public bool IsInstalled { get; private set; }
+    public PackageInstallCommandState InstallCommandState { get; private set; }
 
     public static IconInfo CompletedIcon { get; } = new("\uE930"); // Completed
 
+    public static IconInfo UpdateIcon { get; } = new("\uE74A"); // Up
+
     public static IconInfo DownloadIcon { get; } = new("\uE896"); // Download
 
     public static IconInfo DeleteIcon { get; } = new("\uE74D"); // Delete
@@ -44,23 +46,41 @@ public partial class InstallPackageCommand : InvokableCommand
 
     internal bool SkipDependencies { get; set; }
 
-    public InstallPackageCommand(CatalogPackage package, bool isInstalled)
+    public InstallPackageCommand(CatalogPackage package, PackageInstallCommandState isInstalled)
     {
         _package = package;
-        IsInstalled = isInstalled;
+        InstallCommandState = isInstalled;
         UpdateAppearance();
     }
 
     internal void FakeChangeStatus()
     {
-        IsInstalled = !IsInstalled;
+        InstallCommandState = InstallCommandState switch
+        {
+            PackageInstallCommandState.Install => PackageInstallCommandState.Uninstall,
+            PackageInstallCommandState.Update => PackageInstallCommandState.Uninstall,
+            PackageInstallCommandState.Uninstall => PackageInstallCommandState.Install,
+            _ => throw new NotImplementedException(),
+        };
         UpdateAppearance();
     }
 
     private void UpdateAppearance()
     {
-        Icon = IsInstalled ? CompletedIcon : DownloadIcon;
-        Name = IsInstalled ? Properties.Resources.winget_uninstall_name : Properties.Resources.winget_install_name;
+        Icon = InstallCommandState switch
+        {
+            PackageInstallCommandState.Install => DownloadIcon,
+            PackageInstallCommandState.Update => UpdateIcon,
+            PackageInstallCommandState.Uninstall => CompletedIcon,
+            _ => throw new NotImplementedException(),
+        };
+        Name = InstallCommandState switch
+        {
+            PackageInstallCommandState.Install => Properties.Resources.winget_install_name,
+            PackageInstallCommandState.Update => Properties.Resources.winget_update_name,
+            PackageInstallCommandState.Uninstall => Properties.Resources.winget_uninstall_name,
+            _ => throw new NotImplementedException(),
+        };
     }
 
     public override ICommandResult Invoke()
@@ -72,7 +92,7 @@ public partial class InstallPackageCommand : InvokableCommand
             return CommandResult.KeepOpen();
         }
 
-        if (IsInstalled)
+        if (InstallCommandState == PackageInstallCommandState.Uninstall)
         {
             // Uninstall
             _installBanner.State = MessageState.Info;
@@ -88,7 +108,8 @@ public partial class InstallPackageCommand : InvokableCommand
 
             _installTask = Task.Run(() => TryDoInstallOperation(_unInstallAction));
         }
-        else
+        else if (InstallCommandState is PackageInstallCommandState.Install or
+                 PackageInstallCommandState.Update)
         {
             // Install
             _installBanner.State = MessageState.Info;
@@ -117,7 +138,8 @@ public partial class InstallPackageCommand : InvokableCommand
         try
         {
             await action.AsTask();
-            _installBanner.Message = IsInstalled ?
+
+            _installBanner.Message = InstallCommandState == PackageInstallCommandState.Uninstall ?
                 string.Format(CultureInfo.CurrentCulture, UninstallPackageFinished, _package.Name) :
                 string.Format(CultureInfo.CurrentCulture, InstallPackageFinished, _package.Name);
 
@@ -125,9 +147,10 @@ public partial class InstallPackageCommand : InvokableCommand
             _installBanner.State = MessageState.Success;
             _installTask = null;
 
-            _ = Task.Run(() =>
+            _ = Task.Run(async () =>
             {
-                Thread.Sleep(2500);
+                await Task.Delay(2500).ConfigureAwait(false);
+
                 if (_installTask == null)
                 {
                     WinGetExtensionHost.Instance.HideStatus(_installBanner);
@@ -228,3 +251,10 @@ public partial class InstallPackageCommand : InvokableCommand
         }
     }
 }
+
+public enum PackageInstallCommandState
+{
+    Uninstall = 0,
+    Update = 1,
+    Install = 2,
+}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/Pages/InstallPackageListItem.cs

@@ -6,6 +6,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using ManagedCommon;
 using Microsoft.CommandPalette.Extensions;
@@ -31,7 +32,7 @@ public partial class InstallPackageListItem : ListItem
     {
         _package = package;
 
-        var version = _package.DefaultInstallVersion;
+        var version = _package.DefaultInstallVersion ?? _package.InstalledVersion;
         var versionTagText = "Unknown";
         if (version != null)
         {
@@ -49,7 +50,16 @@ public partial class InstallPackageListItem : ListItem
 
     private Details? BuildDetails(PackageVersionInfo? version)
     {
-        var metadata = version?.GetCatalogPackageMetadata();
+        CatalogPackageMetadata? metadata = null;
+        try
+        {
+            metadata = version?.GetCatalogPackageMetadata();
+        }
+        catch (COMException ex)
+        {
+            Logger.LogWarning($"{ex.ErrorCode}");
+        }
+
         if (metadata != null)
         {
             if (metadata.Tags.Where(t => t.Equals(WinGetExtensionPage.ExtensionsTag, StringComparison.OrdinalIgnoreCase)).Any())
@@ -149,12 +159,17 @@ public partial class InstallPackageListItem : ListItem
         var status = await _package.CheckInstalledStatusAsync();
         var isInstalled = _package.InstalledVersion != null;
 
+        var installedState = isInstalled ?
+            (_package.IsUpdateAvailable ?
+                PackageInstallCommandState.Update : PackageInstallCommandState.Uninstall) :
+            PackageInstallCommandState.Install;
+
         // might be an uninstall command
-        InstallPackageCommand installCommand = new(_package, isInstalled);
+        InstallPackageCommand installCommand = new(_package, installedState);
 
         if (isInstalled)
         {
-            this.Icon = InstallPackageCommand.CompletedIcon;
+            this.Icon = installCommand.Icon;
             this.Command = new NoOpCommand();
             List<IContextItem> contextMenu = [];
             CommandContextItem uninstallContextItem = new(installCommand)
@@ -180,7 +195,7 @@ public partial class InstallPackageListItem : ListItem
         }
 
         // didn't find the app
-        _installCommand = new InstallPackageCommand(_package, isInstalled);
+        _installCommand = new InstallPackageCommand(_package, installedState);
         this.Command = _installCommand;
 
         Icon = _installCommand.Icon;

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/Properties/Resources.Designer.cs

@@ -330,6 +330,15 @@ namespace Microsoft.CmdPal.Ext.WinGet.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Update.
+        /// </summary>
+        public static string winget_update_name {
+            get {
+                return ResourceManager.GetString("winget_update_name", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to View online.
         /// </summary>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/Properties/Resources.resx

@@ -154,6 +154,10 @@
   <value>Install</value>
   <comment></comment>
 </data>
+<data name="winget_update_name" xml:space="preserve">
+  <value>Update</value>
+  <comment></comment>
+</data>
 <data name="winget_uninstalling_package" xml:space="preserve">
   <value>Uninstalling {0}...</value>
   <comment>{0} will be replaced by the name of an app package</comment>

src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/Microsoft.CommandPalette.Extensions.vcxproj

@@ -2,7 +2,7 @@
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PathToRoot>..\..\..\..\..\</PathToRoot>
-    <WasdkNuget>$(PathToRoot)packages\Microsoft.WindowsAppSDK.1.6.250205002</WasdkNuget>
+    <WasdkNuget>$(PathToRoot)packages\Microsoft.WindowsAppSDK.1.7.250401001</WasdkNuget>
     <CppWinRTNuget>$(PathToRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5</CppWinRTNuget>
     <WindowsSdkBuildToolsNuget>$(PathToRoot)packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428</WindowsSdkBuildToolsNuget>
     <WebView2Nuget>$(PathToRoot)packages\Microsoft.Web.WebView2.1.0.2903.40</WebView2Nuget>

src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/packages.config

@@ -3,5 +3,5 @@
   <package id="Microsoft.Web.WebView2" version="1.0.2903.40" targetFramework="native" />
   <package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
   <package id="Microsoft.Windows.SDK.BuildTools" version="10.0.22621.2428" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK" version="1.6.250205002" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK" version="1.7.250401001" targetFramework="native" />
 </packages>

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

@@ -11,10 +11,11 @@ using System.Text.Json.Serialization;
 
 using ImageResizer.Helpers;
 using ImageResizer.Properties;
+using ManagedCommon;
 
 namespace ImageResizer.Models
 {
-    public class ResizeSize : Observable
+    public class ResizeSize : Observable, IHasId
     {
         private static readonly Dictionary<string, string> _tokens = new Dictionary<string, string>
         {
@@ -24,6 +25,7 @@ namespace ImageResizer.Models
             ["$phone$"] = Resources.Phone,
         };
 
+        private int _id;
         private string _name;
         private ResizeFit _fit = ResizeFit.Fit;
         private double _width;
@@ -31,8 +33,9 @@ namespace ImageResizer.Models
         private bool _showHeight = true;
         private ResizeUnit _unit = ResizeUnit.Pixel;
 
-        public ResizeSize(string name, ResizeFit fit, double width, double height, ResizeUnit unit)
+        public ResizeSize(int id, string name, ResizeFit fit, double width, double height, ResizeUnit unit)
         {
+            Id = id;
             Name = name;
             Fit = fit;
             Width = width;
@@ -44,6 +47,13 @@ namespace ImageResizer.Models
         {
         }
 
+        [JsonPropertyName("Id")]
+        public int Id
+        {
+            get => _id;
+            set => Set(ref _id, value);
+        }
+
         [JsonPropertyName("name")]
         public virtual string Name
         {

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

@@ -19,6 +19,7 @@ using System.Threading;
 using System.Windows.Media.Imaging;
 
 using ImageResizer.Models;
+using ManagedCommon;
 
 namespace ImageResizer.Properties
 {
@@ -63,10 +64,10 @@ namespace ImageResizer.Properties
             FileName = "%1 (%2)";
             Sizes = new ObservableCollection<ResizeSize>
             {
-                new ResizeSize("$small$", ResizeFit.Fit, 854, 480, ResizeUnit.Pixel),
-                new ResizeSize("$medium$", ResizeFit.Fit, 1366, 768, ResizeUnit.Pixel),
-                new ResizeSize("$large$", ResizeFit.Fit, 1920, 1080, ResizeUnit.Pixel),
-                new ResizeSize("$phone$", ResizeFit.Fit, 320, 568, ResizeUnit.Pixel),
+                new ResizeSize(0, "$small$", ResizeFit.Fit, 854, 480, ResizeUnit.Pixel),
+                new ResizeSize(1, "$medium$", ResizeFit.Fit, 1366, 768, ResizeUnit.Pixel),
+                new ResizeSize(2, "$large$", ResizeFit.Fit, 1920, 1080, ResizeUnit.Pixel),
+                new ResizeSize(3, "$phone$", ResizeFit.Fit, 320, 568, ResizeUnit.Pixel),
             };
             KeepDateModified = false;
             FallbackEncoder = new System.Guid("19e4a5aa-5662-4fc5-a0c0-1758028e1057");
@@ -480,6 +481,9 @@ namespace ImageResizer.Properties
                 {
                     Sizes.Clear();
                     Sizes.AddRange(jsonSettings.Sizes);
+
+                    // Ensure Ids are unique and handle missing Ids
+                    IdRecoveryHelper.RecoverInvalidIds(Sizes);
                 }
             });
 

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

@@ -62,11 +62,11 @@ public partial class PowerAccent : IDisposable
 
     private void SetEvents()
     {
-        _keyboardListener.SetShowToolbarEvent(new PowerToys.PowerAccentKeyboardService.ShowToolbar((LetterKey letterKey) =>
+        _keyboardListener.SetShowToolbarEvent(new PowerToys.PowerAccentKeyboardService.ShowToolbar((LetterKey letterKey, TriggerKey trigger ) =>
         {
             System.Windows.Application.Current.Dispatcher.Invoke(() =>
             {
-                ShowToolbar(letterKey);
+                ShowToolbar(letterKey, trigger);
             });
         }));
 
@@ -92,23 +92,15 @@ public partial class PowerAccent : IDisposable
         }));
     }
 
-    private void ShowToolbar(LetterKey letterKey)
+    private void ShowToolbar(LetterKey letterKey, TriggerKey trigger)
     {
         _visible = true;
 
         _characters = GetCharacters(letterKey);
         _characterDescriptions = GetCharacterDescriptions(_characters);
         _showUnicodeDescription = _settingService.ShowUnicodeDescription;
-
-        Task.Delay(_settingService.InputTime).ContinueWith(
-        t =>
-        {
-            if (_visible)
-            {
-                OnChangeDisplay?.Invoke(true, _characters);
-            }
-        },
-        TaskScheduler.FromCurrentSynchronizationContext());
+        OnChangeDisplay?.Invoke(true, _characters);
+        ProcessNextChar(trigger, false);
     }
 
     private string[] GetCharacters(LetterKey letterKey)

src/modules/poweraccent/PowerAccentKeyboardService/KeyboardListener.cpp

@@ -13,7 +13,7 @@
 namespace winrt::PowerToys::PowerAccentKeyboardService::implementation
 {
     KeyboardListener::KeyboardListener() :
-        m_toolbarVisible(false), m_triggeredWithSpace(false), m_leftShiftPressed(false), m_rightShiftPressed(false), m_triggeredWithLeftArrow(false), m_triggeredWithRightArrow(false)
+           m_toolbarVisible(false), m_activationKeyHold(false), m_triggeredWithSpace(false), m_leftShiftPressed(false), m_rightShiftPressed(false), m_triggeredWithLeftArrow(false), m_triggeredWithRightArrow(false)
     {
         s_instance = this;
         LoggerHelpers::init_logger(L"PowerAccent", L"PowerAccentKeyboardService", "PowerAccent");
@@ -53,8 +53,8 @@ namespace winrt::PowerToys::PowerAccentKeyboardService::implementation
 
     void KeyboardListener::SetShowToolbarEvent(ShowToolbar showToolbarEvent)
     {
-        m_showToolbarCb = [trigger = std::move(showToolbarEvent)](LetterKey key) {
-            trigger(key);
+        m_showToolbarCb = [trigger = std::move(showToolbarEvent)](LetterKey key, TriggerKey triggerKey) {
+            trigger(key, triggerKey);
         };
     }
 
@@ -152,6 +152,17 @@ namespace winrt::PowerToys::PowerAccentKeyboardService::implementation
         return false;
     }
 
+    void KeyboardListener::BeginShowToolbar(std::chrono::milliseconds delay, LetterKey key, TriggerKey trigger)
+    {
+        std::unique_lock<std::mutex> lock(toolbarMutex);
+        auto result = toolbarCV.wait_for(lock, delay);
+        if (result == std::cv_status::timeout)
+        {
+            m_toolbarVisible = true;
+            m_showToolbarCb(key, trigger);
+        }
+    }
+
     bool KeyboardListener::OnKeyDown(KBDLLHOOKSTRUCT info) noexcept
     {
         auto letterKey = static_cast<LetterKey>(info.vkCode);
@@ -199,7 +210,7 @@ namespace winrt::PowerToys::PowerAccentKeyboardService::implementation
             }
         }
 
-        if (!m_toolbarVisible && letterPressed != LetterKey::None && triggerPressed && !IsSuppressedByGameMode() && !IsForegroundAppExcluded())
+        if (!m_toolbarVisible && !m_activationKeyHold && letterPressed != LetterKey::None && triggerPressed && !IsSuppressedByGameMode() && !IsForegroundAppExcluded())
         {
             Logger::debug(L"Show toolbar. Letter: {}, Trigger: {}", letterPressed, triggerPressed);
 
@@ -207,11 +218,21 @@ namespace winrt::PowerToys::PowerAccentKeyboardService::implementation
             m_triggeredWithSpace = triggerPressed == VK_SPACE;
             m_triggeredWithLeftArrow = triggerPressed == VK_LEFT;
             m_triggeredWithRightArrow = triggerPressed == VK_RIGHT;
-            m_toolbarVisible = true;
-            m_showToolbarCb(letterPressed);
+            m_activationKeyHold = true;
+            m_bothKeysPressed = true;
+            if (toolbarThread != nullptr)
+            {
+                toolbarCV.notify_all();
+                toolbarThread->join();
+            }
+            toolbarThread = std::make_unique<std::thread>(std::bind(&KeyboardListener::BeginShowToolbar, this, m_settings.inputTime, letterPressed,static_cast<TriggerKey>(triggerPressed)));
         }
 
-        if (m_toolbarVisible && triggerPressed)
+        if (m_activationKeyHold && triggerPressed && !m_toolbarVisible)
+        {
+            return true;
+        }
+        else if (m_toolbarVisible && triggerPressed)
         {
             if (triggerPressed == VK_LEFT)
             {
@@ -251,8 +272,9 @@ namespace winrt::PowerToys::PowerAccentKeyboardService::implementation
         {
             letterPressed = LetterKey::None;
 
-            if (m_toolbarVisible)
+            if (m_toolbarVisible || m_bothKeysPressed)
             {
+                m_bothKeysPressed = false;
                 if (m_stopwatch.elapsed() < m_settings.inputTime)
                 {
                     Logger::debug(L"Activation too fast. Do nothing.");
@@ -280,11 +302,18 @@ namespace winrt::PowerToys::PowerAccentKeyboardService::implementation
                 Logger::debug(L"Hide toolbar event and input char");
 
                 m_hideToolbarCb(InputType::Char);
-
                 m_toolbarVisible = false;
             }
         }
 
+        auto triggerPressed = info.vkCode;
+
+        if (m_activationKeyHold && (letterPressed == LetterKey::None || (triggerPressed == VK_SPACE || triggerPressed == VK_LEFT || triggerPressed == VK_RIGHT)))
+        {
+            m_activationKeyHold = false;
+            toolbarCV.notify_all();
+        }
+
         return false;
     }
 

src/modules/poweraccent/PowerAccentKeyboardService/KeyboardListener.h

@@ -2,6 +2,7 @@
 
 #include "KeyboardListener.g.h"
 #include <mutex>
+#include <thread>
 #include <spdlog/stopwatch.h>
 
 namespace winrt::PowerToys::PowerAccentKeyboardService::implementation
@@ -44,6 +45,7 @@ namespace winrt::PowerToys::PowerAccentKeyboardService::implementation
         static LRESULT CALLBACK LowLevelKeyboardProc(int nCode, WPARAM wParam, LPARAM lParam);
 
     private:
+        void BeginShowToolbar(std::chrono::milliseconds delay, LetterKey key, TriggerKey trigger);
         bool OnKeyDown(KBDLLHOOKSTRUCT info) noexcept;
         bool OnKeyUp(KBDLLHOOKSTRUCT info) noexcept;
         bool IsSuppressedByGameMode();
@@ -51,9 +53,14 @@ namespace winrt::PowerToys::PowerAccentKeyboardService::implementation
 
         static inline KeyboardListener* s_instance;
         HHOOK s_llKeyboardHook = nullptr;
-        bool m_toolbarVisible;
+        std::atomic<bool> m_toolbarVisible;
+        bool m_activationKeyHold;
+        bool m_bothKeysPressed = false;
+        std::unique_ptr<std::thread> toolbarThread;
+        std::mutex toolbarMutex;
+        std::condition_variable toolbarCV;
         PowerAccentSettings m_settings;
-        std::function<void(LetterKey)> m_showToolbarCb;
+        std::function<void(LetterKey, TriggerKey)> m_showToolbarCb;
         std::function<void(InputType)> m_hideToolbarCb;
         std::function<void(TriggerKey, bool)> m_nextCharCb;
         std::function<bool(LetterKey)> m_isLanguageLetterCb;

src/modules/poweraccent/PowerAccentKeyboardService/KeyboardListener.idl

@@ -67,7 +67,7 @@ namespace PowerToys
             Char
         };
 
-        [version(1.0), uuid(37197089-5438-4479-af57-30ab3f3c8be4)] delegate void ShowToolbar(LetterKey key);
+        [version(1.0), uuid(37197089-5438-4479-af57-30ab3f3c8be4)] delegate void ShowToolbar(LetterKey key, TriggerKey trigger);
         [version(1.0), uuid(8eb79d6b-1826-424f-9fbc-af21ae19725e)] delegate void HideToolbar(InputType inputType);
         [version(1.0), uuid(db72d45c-a5a2-446f-bdc1-506e9121764a)] delegate void NextChar(TriggerKey inputSpace, boolean shiftPressed);
         [version(1.0), uuid(20be2919-2b91-4313-b6e0-4c3484fe91ef)] delegate void IsLanguageLetter(LetterKey key, [out] boolean* result);

src/modules/powerrename/PowerRename.FuzzingTest/OneFuzzConfig.json

@@ -0,0 +1,40 @@
+{
+  "configVersion": 3,
+  "entries": [
+    {
+      "Fuzzer": {
+        "$type": "libfuzzer",
+        "FuzzingHarnessExecutableName": "PowerRename.FuzzingTest.exe"
+      },
+      "adoTemplate": {
+        // supply the values appropriate to your
+        // project, where bugs will be filed 
+        "org": "microsoft",
+        "project": "OS",
+        "AssignedTo": "leilzh@microsoft.com",
+        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DEEP-Developer Experience, Ecosystem and Partnerships\\DIVE\\SALT",
+        "IterationPath": "OS\\Future"
+      },
+      "jobNotificationEmail": "PowerToys@microsoft.com",
+      "skip": false,
+      "rebootAfterSetup": false,
+      "oneFuzzJobs": [
+        // at least one job is required
+        {
+          "projectName": "PowerToys.PowerRename",
+          "targetName": "PowerRename_Fuzzer"
+        }
+      ],
+      "jobDependencies": [
+        // this should contain, at minimum,
+        // the DLL and PDB files
+        // you will need to add any other files required
+        // (globs are supported)
+        "PowerRename.FuzzingTest.exe",
+        "PowerRename.FuzzingTest.pdb",
+        "PowerRename.FuzzingTest.lib",
+        "clang_rt.asan_dynamic-x86_64.dll"
+      ]
+    }
+  ]
+}

src/modules/powerrename/PowerRename.FuzzingTest/PowerRename.FuzzingTest.cpp

@@ -0,0 +1,67 @@
+// Test.cpp : This file contains the 'main' function. Program execution begins and ends there.
+//
+
+#include <iostream>
+#include <fstream>
+#include <PowerRenameRegEx.h>
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
+{
+    if (size < 6)
+        return 0;
+
+    size_t offset = 0;
+
+    size_t input_len = size / 3;
+    size_t find_len = size / 3;
+    size_t replace_len = size - input_len - find_len;
+
+    auto read_wstring = [&](size_t len) -> std::wstring {
+        std::wstring result;
+        if (offset + len > size)
+            len = size - offset;
+
+        result.assign(reinterpret_cast<const wchar_t*>(data + offset), len / sizeof(wchar_t));
+        offset += len;
+        return result;
+    };
+
+    std::wstring input = read_wstring(input_len);
+    std::wstring find = read_wstring(find_len);
+    std::wstring replace = read_wstring(replace_len);
+
+    if (find.empty() || replace.empty())
+        return 0;
+
+    CComPtr<IPowerRenameRegEx> renamer;
+    CPowerRenameRegEx::s_CreateInstance(&renamer);
+
+    renamer->PutFlags(UseRegularExpressions | CaseSensitive);
+
+    renamer->PutSearchTerm(find.c_str());
+    renamer->PutReplaceTerm(replace.c_str());
+
+    PWSTR result = nullptr;
+    unsigned long index = 0;
+    HRESULT hr = renamer->Replace(input.c_str(), &result, index);
+    if (SUCCEEDED(hr) && result != nullptr)
+    {
+        CoTaskMemFree(result);
+    }
+
+    return 0;
+}
+
+#ifndef DISABLE_FOR_FUZZING
+
+int main(int argc, char** argv)
+{
+    const char8_t raw[] = u8"test_string";
+
+    std::vector<uint8_t> data(reinterpret_cast<const uint8_t*>(raw), reinterpret_cast<const uint8_t*>(raw) + sizeof(raw) - 1);
+
+    LLVMFuzzerTestOneInput(data.data(), data.size());
+    return 0;
+}
+
+#endif

src/modules/powerrename/PowerRename.FuzzingTest/PowerRename.FuzzingTest.filters

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="PowerRename.FuzzingTest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <CopyFileToFolders Include="OneFuzzConfig.json" />
+  </ItemGroup>
+</Project>

src/modules/powerrename/PowerRename.FuzzingTest/PowerRename.FuzzingTest.vcxproj

@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{2694e2fb-dcd5-4bff-a418-b6c3c7ce3b8e}</ProjectGuid>
+    <RootNamespace>Test</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
+    <ProjectName>PowerRename.FuzzingTest</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <EnableASAN>true</EnableASAN>
+    <EnableFuzzer>true</EnableFuzzer>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(VCToolsInstallDir)\lib\$(Platform)</LibraryPath>
+    <OutDir>..\..\..\..\$(Platform)\$(Configuration)\tests\PowerRename.FuzzTests\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;DISABLE_FOR_FUZZING;%(PreprocessorDefinitions);_DISABLE_VECTOR_ANNOTATION;_DISABLE_STRING_ANNOTATION</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <AdditionalOptions>/fsanitize=address /fsanitize-coverage=inline-8bit-counters /fsanitize-coverage=edge /fsanitize-coverage=trace-cmp /fsanitize-coverage=trace-div %(AdditionalOptions)</AdditionalOptions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
+      <AdditionalIncludeDirectories>..\;..\lib\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>legacy_stdio_definitions.lib;$(VCToolsInstallDir)lib\$(Platform)\libsancov.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <PostBuildEvent>
+      <Command>xcopy /y "$(VCToolsInstallDir)bin\Hostx64\x64\clang_rt.asan_dynamic-x86_64.dll" "$(OutDir)"</Command>
+      <Message>Copy the required ASan runtime DLL to the output directory.</Message>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <AdditionalIncludeDirectories>..\;..\lib\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <AdditionalDependencies>$(OutDir)\..\..\WinUI3Apps\PowerRenameLib.lib;comctl32.lib;pathcch.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Pathcch.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="PowerRename.FuzzingTest.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <CopyFileToFolders Include="OneFuzzConfig.json" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\lib\PowerRenameLib.vcxproj" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+      <Project>{51920f1f-c28c-4adf-8660-4238766796c2}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\common\SettingsAPI\SettingsAPI.vcxproj" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+      <Project>{6955446d-23f7-4023-9bb3-8657f904af99}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
+    <Import Project="..\..\..\..\packages\boost.1.87.0\build\boost.targets" Condition="Exists('..\..\..\..\packages\boost.1.87.0\build\boost.targets')" />
+    <Import Project="..\..\..\..\packages\boost_regex-vc143.1.87.0\build\boost_regex-vc143.targets" Condition="Exists('..\..\..\..\packages\boost_regex-vc143.1.87.0\build\boost_regex-vc143.targets')" />
+  </ImportGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\boost.1.87.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\boost.1.87.0\build\boost.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\boost_regex-vc143.1.87.0\build\boost_regex-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\boost_regex-vc143.1.87.0\build\boost_regex-vc143.targets'))" />
+  </Target>
+</Project>

src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.props')" />
   <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props')" />
   <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
   <PropertyGroup Label="Globals">
@@ -207,7 +207,7 @@
     <Import Project="..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
     <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets')" />
     <Import Project="..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets')" />
-    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.targets')" />
     <Import Project="..\..\..\..\packages\boost.1.87.0\build\boost.targets" Condition="Exists('..\..\..\..\packages\boost.1.87.0\build\boost.targets')" />
     <Import Project="..\..\..\..\packages\boost_regex-vc143.1.87.0\build\boost_regex-vc143.targets" Condition="Exists('..\..\..\..\packages\boost_regex-vc143.1.87.0\build\boost_regex-vc143.targets')" />
   </ImportGroup>
@@ -221,8 +221,8 @@
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props'))" />
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets'))" />
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.6.250205002\build\native\Microsoft.WindowsAppSDK.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.targets'))" />
     <Error Condition="!Exists('..\..\..\..\packages\boost.1.87.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\boost.1.87.0\build\boost.targets'))" />
     <Error Condition="!Exists('..\..\..\..\packages\boost_regex-vc143.1.87.0\build\boost_regex-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\boost_regex-vc143.1.87.0\build\boost_regex-vc143.targets'))" />
   </Target>

src/modules/powerrename/PowerRenameUILib/packages.config

@@ -6,5 +6,5 @@
   <package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
   <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
   <package id="Microsoft.Windows.SDK.BuildTools" version="10.0.22621.2428" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK" version="1.6.250205002" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK" version="1.7.250401001" targetFramework="native" />
 </packages>

src/settings-ui/Settings.UI.Library/ImageSize.cs

@@ -8,11 +8,12 @@ using System.ComponentModel;
 using System.Runtime.CompilerServices;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using ManagedCommon;
 using Settings.UI.Library.Resources;
 
 namespace Microsoft.PowerToys.Settings.UI.Library;
 
-public partial class ImageSize : INotifyPropertyChanged
+public partial class ImageSize : INotifyPropertyChanged, IHasId
 {
     public event PropertyChangedEventHandler PropertyChanged;
 

src/settings-ui/Settings.UI/ViewModels/ImageResizerViewModel.cs

@@ -67,6 +67,7 @@ public partial class ImageResizerViewModel : Observable
         try
         {
             Settings = _settingsUtils.GetSettings<ImageResizerSettings>(ModuleName);
+            IdRecoveryHelper.RecoverInvalidIds(Settings.Properties.ImageresizerSizes.Value);
         }
         catch (Exception e)
         {