spell checker

polished workspaces utility

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

@@ -28,7 +28,7 @@ videoconference
 
 # USERS
 
-LWXpg  # (number eight)LWXpg is actual user name but spell checker throws error with a numeric leading value ... which is kinda odd
+8LWXpg
 Adoumie
 Advaith
 alekhyareddy
@@ -62,7 +62,6 @@ DHowett
 ductdo
 Essey
 ethanfangg
-ferraridavide
 frankychen
 gabime
 Galaxi

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

@@ -117,7 +117,6 @@
 ^\Qsrc/modules/previewpane/UnitTests-StlThumbnailProvider/HelperFiles/sample.stl\E$
 ^\Qtools/project_template/ModuleTemplate/resource.h\E$
 ^doc/devdocs/akaLinks\.md$
-^src/modules/launcher/Plugins/Microsoft\.PowerToys\.Run\.Plugin\.TimeDate/Properties/
 ^src/modules/MouseWithoutBorders/App/.*/NativeMethods\.cs$
 ^src/modules/MouseWithoutBorders/App/Form/.*\.Designer\.cs$
 ^src/modules/MouseWithoutBorders/App/Form/.*\.resx$

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

@@ -192,6 +192,7 @@ CLIPBOARDUPDATE
 CLIPCHILDREN
 CLIPSIBLINGS
 closesocket
+clrcall
 CLSCTX
 Clusion
 cmder
@@ -202,8 +203,8 @@ CMINVOKECOMMANDINFO
 CMINVOKECOMMANDINFOEX
 CMock
 CMONITORS
-cmpgt
 cmph
+cmpgt
 cne
 CNF
 coclass
@@ -250,7 +251,10 @@ countof
 cph
 CPower
 cppblog
+cppruntime
+cppstd
 cppwinrt
+CProj
 createdump
 CREATESCHEDULEDTASK
 CREATESTRUCT
@@ -266,7 +270,6 @@ CSettings
 cso
 CSRW
 CStyle
-cswinrt
 CSY
 CTest
 currentculture
@@ -606,6 +609,7 @@ hmenu
 hmodule
 hmonitor
 homljgmgpmcbpjbnjpfijnhipfkiclkd
+HOOKPROC
 Hostbackdropbrush
 hotkeycontrol
 hotkeys
@@ -673,6 +677,7 @@ imageresizerinput
 imageresizersettings
 imagingdevices
 ime
+imperialounce
 inetcpl
 Infobar
 INFOEXAMPLE
@@ -934,6 +939,7 @@ MRT
 mru
 mrw
 msc
+msclr
 mscorlib
 msdata
 msedge
@@ -1113,7 +1119,6 @@ PATINVERT
 PATPAINT
 PAUDIO
 pbc
-pbi
 PBlob
 pcb
 pcch
@@ -1127,7 +1132,6 @@ pdo
 pdto
 pdtobj
 pdw
-Peb
 pef
 PElems
 Pels
@@ -1510,6 +1514,7 @@ STATICEDGE
 STATSTG
 stdafx
 STDAPI
+stdcpp
 stdcpplatest
 STDMETHODCALLTYPE
 STDMETHODIMP
@@ -1681,6 +1686,7 @@ Userenv
 USESHOWWINDOW
 USESIZE
 USESTDHANDLES
+usounce
 USRDLL
 UType
 uuidv
@@ -1717,7 +1723,6 @@ VIDEOINFOHEADER
 viewmodel
 vih
 VIRTUALDESK
-VISEGRADRELAY
 visiblecolorformats
 Visibletrue
 visualeffects

.github/policies/resourceManagement.yml

@@ -236,22 +236,11 @@ configuration:
     - if:
       - payloadType: Issue_Comment
       - commentContains:
-          pattern: "I(( would|'d) (like|love|be happy)| want) (to help|helping|to contribute|contributing|to implement|implementing|to fix|fixing)"
+          pattern: 'I would [like|love] [to help|helping|to contribute|contributing|to implement|implementing|to fix|fixing]'
           isRegex: True
       then:
       - addReply:
           reply: Hi! Your last comment indicates to our system, that you might want to contribute to this feature/fix this bug. Thank you! Please make us aware on our ["Would you like to contribute to PowerToys?" thread](https://github.com/microsoft/PowerToys/issues/28769), as we don't see all the comments. <br /><br />_I'm a bot (beep!) so please excuse any mistakes I may make_
-      description:
-    - if:
-      - payloadType: Issues
-      - isAction:
-          action: Opened
-      - bodyContains:
-          pattern: 'Area\(s\) with issue\?\s*\nWorkspaces'
-          isRegex: True
-      then:
-      - addLabel:
-          label: Product-Workspaces
       description: 
 onFailure: 
 onSuccess: 

.pipelines/installer-steps.yml

@@ -1,4 +1,7 @@
 parameters:
+  - name: versionNumber
+    type: string
+    default: "0.0.1"
   - name: perUserArg
     type: string
     default: "false"
@@ -50,7 +53,7 @@ steps:
     displayName: "Extracting MSI to verify contents"
     inputs:
       script: |
-        "C:\Program Files (x86)\WiX Toolset v3.14\bin\dark.exe" -x $(build.sourcesdirectory)\extractedMsi installer\PowerToysSetup\$(BuildPlatform)\$(BuildConfiguration)\${{parameters.buildSubDir}}\${{parameters.installerPrefix}}-$(XES_BINARYVERSION)-$(BuildPlatform).msi
+        "C:\Program Files (x86)\WiX Toolset v3.14\bin\dark.exe" -x $(build.sourcesdirectory)\extractedMsi installer\PowerToysSetup\$(BuildPlatform)\$(BuildConfiguration)\${{parameters.buildSubDir}}\${{parameters.installerPrefix}}-${{ parameters.versionNumber }}-$(BuildPlatform).msi
         dir $(build.sourcesdirectory)\extractedMsi
 
   # Check if deps.json files don't reference different dll versions.
@@ -99,7 +102,7 @@ steps:
   - task: CmdLine@2
     displayName: "Insignia: Extract Engine from Bundle"
     inputs:
-      script: '"C:\Program Files (x86)\WiX Toolset v3.14\bin\insignia.exe" -ib installer\PowerToysSetup\$(BuildPlatform)\$(BuildConfiguration)\${{parameters.buildSubDir}}\${{parameters.installerPrefix}}-$(XES_BINARYVERSION)-$(BuildPlatform).exe -o installer\engine.exe'
+      script: '"C:\Program Files (x86)\WiX Toolset v3.14\bin\insignia.exe" -ib installer\PowerToysSetup\$(BuildPlatform)\$(BuildConfiguration)\${{parameters.buildSubDir}}\${{parameters.installerPrefix}}-${{ parameters.versionNumber }}-$(BuildPlatform).exe -o installer\engine.exe'
 
   - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
     displayName: "ESRP CodeSigning (Engine)"
@@ -135,7 +138,7 @@ steps:
   - task: CmdLine@2
     displayName: "Insignia: Merge Engine into Bundle"
     inputs:
-      script: '"C:\Program Files (x86)\WiX Toolset v3.14\bin\insignia.exe" -ab installer\engine.exe installer\PowerToysSetup\$(BuildPlatform)\$(BuildConfiguration)\${{parameters.buildSubDir}}\${{parameters.installerPrefix}}-$(XES_BINARYVERSION)-$(BuildPlatform).exe -o installer\PowerToysSetup\$(BuildPlatform)\$(BuildConfiguration)\${{parameters.buildSubDir}}\${{parameters.installerPrefix}}-$(XES_BINARYVERSION)-$(BuildPlatform).exe'
+      script: '"C:\Program Files (x86)\WiX Toolset v3.14\bin\insignia.exe" -ab installer\engine.exe installer\PowerToysSetup\$(BuildPlatform)\$(BuildConfiguration)\${{parameters.buildSubDir}}\${{parameters.installerPrefix}}-${{ parameters.versionNumber }}-$(BuildPlatform).exe -o installer\PowerToysSetup\$(BuildPlatform)\$(BuildConfiguration)\${{parameters.buildSubDir}}\${{parameters.installerPrefix}}-${{ parameters.versionNumber }}-$(BuildPlatform).exe'
 
   - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
     displayName: Sign Bootstrapper

.pipelines/release.yml

@@ -20,6 +20,9 @@ parameters:
     default:
       - x64
       - arm64
+  - name: versionNumber
+    type: string
+    default: '0.0.1'
   - name: signingParameters
     type: object
     default:
@@ -80,6 +83,13 @@ extends:
           submodules: true
           persistCredentials: True
 
+      # Sets versions for all PowerToy created DLLs
+        - task: PowerShell@1
+          displayName: Set Versions.Prop
+          inputs:
+            scriptName: .pipelines/versionSetting.ps1
+            arguments: -versionNumber '${{ parameters.versionNumber }}' -DevEnvironment ''
+
       # ESRP needs 'Microsoft.NETCore.App', version '6.0.0' (x64)
         - task: UseDotNet@2
           displayName: 'Use .NET 6 SDK'
@@ -110,13 +120,6 @@ extends:
       # - Webcam report tool
       # - Installer
       # - Bootstrapper Installer
-
-        - pwsh: |-
-            nuget install -configFile .pipelines/release-nuget.config Microsoft.Windows.Terminal.Versioning -OutputDirectory _versioning
-            $VersionRoot = (Get-Item _versioning\Microsoft.Windows.*).FullName
-            & "$VersionRoot\build\Setup.ps1" -ProjectDirectory "$(Build.SourcesDirectory)" -Verbose
-          displayName: Set up versioning via M.W.T.V
-
         - task: PowerShell@2
           displayName: Download and install WiX 3.14 development build
           inputs:
@@ -484,6 +487,7 @@ extends:
         - template: .pipelines/installer-steps.yml@self
           parameters:
             signingParameters: ${{ parameters.signingParameters }}
+            versionNumber: ${{ parameters.versionNumber }}
             perUserArg: "false"
             buildSubDir: "MachineSetup"
             installerPrefix: "PowerToysSetup"
@@ -498,6 +502,7 @@ extends:
         - template: .pipelines/installer-steps.yml@self
           parameters:
             signingParameters: ${{ parameters.signingParameters }}
+            versionNumber: ${{ parameters.versionNumber }}
             perUserArg: "true"
             buildSubDir: "UserSetup"
             installerPrefix: "PowerToysUserSetup"

.vsconfig

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

Cpp.Build.props

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

Directory.Build.props

@@ -1,3 +1,133 @@
 <Project>
-  <Import Project="$(MSBuildThisFileDirectory)\custom.props" />
+  <Import Project="src\Version.props" />
+  <PropertyGroup>
+    <Copyright>Copyright (C) Microsoft Corporation. All rights reserved.</Copyright>
+    <AssemblyCopyright>Copyright (C) Microsoft Corporation. All rights reserved.</AssemblyCopyright>
+    <AssemblyProduct>PowerToys</AssemblyProduct>
+    <AssemblyCompany>Microsoft Corp.</AssemblyCompany>
+    <Company>Microsoft Corporation</Company>
+    <Authors>Microsoft Corporation</Authors>
+    <Product>PowerToys</Product>
+    <NeutralLanguage>en-US</NeutralLanguage>
+    <Platforms>x64;ARM64</Platforms>
+    <PackageTags>PowerToys</PackageTags>
+    <EnableNETAnalyzers>true</EnableNETAnalyzers>
+    <AnalysisMode>Recommended</AnalysisMode>
+    <_SkipUpgradeNetAnalyzersNuGetWarning>true</_SkipUpgradeNetAnalyzersNuGetWarning>
+    <NuGetAuditMode>direct</NuGetAuditMode>
+    <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>    <!-- Don't add source revision hash to the product version of binaries. -->
+    <PlatformTarget>$(Platform)</PlatformTarget>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(MSBuildProjectExtension)' == '.csproj'">
+    <Version>$(Version).0</Version>
+    <RepositoryUrl>https://github.com/microsoft/PowerToys</RepositoryUrl>
+    <RepositoryType>GitHub</RepositoryType>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <_PropertySheetDisplayName>PowerToys.Root.Props</_PropertySheetDisplayName>
+    <ForceImportBeforeCppProps>$(MsbuildThisFileDirectory)\Cpp.Build.props</ForceImportBeforeCppProps>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(MSBuildProjectExtension)' == '.csproj'">
+    <PackageReference Include="StyleCop.Analyzers">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <Compile Include="$(MSBuildThisFileDirectory)\src\codeAnalysis\GlobalSuppressions.cs" Link="GlobalSuppressions.cs" />
+    <AdditionalFiles Include="$(MSBuildThisFileDirectory)\src\codeAnalysis\StyleCop.json" Link="StyleCop.json" />
+
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <!-- Add ability to run tests via "msbuild /t:Test" -->
+  <!--
+    Workaround an MSBuild bug where Microsoft.Common.Test.targets is missing from the Arm64 installation.
+    See: https://github.com/dotnet/msbuild/pull/9984
+    NB 1: This means that using "/t:Test" is not supported for Arm64 builds and tests will need to be run in an alternate way,
+          eg running tests in VS or invoking vstest.console directly.
+    NB 2: <Sdk> elements do not support conditions, so this is also being worked around.
+          Once the change referenced above is fixed, the ImportGroup below can be replaced with:
+            <Sdk Name="Microsoft.Build.RunVSTest" Version="1.0.319" />
+  -->
+  <ImportGroup Condition="'$(PROCESSOR_ARCHITECTURE)' != 'ARM64'">
+    <Import Project="Sdk.props" Sdk="Microsoft.Build.RunVSTest" Version="1.0.319" />
+    <Import Project="Sdk.targets" Sdk="Microsoft.Build.RunVSTest" Version="1.0.319" />
+  </ImportGroup>
+  <PropertyGroup>
+    <VSTestLogger>trx</VSTestLogger>
+    <!--
+      RunVSTest by default uses %VSINSTALLDIR%\Common7\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe,
+      but some of the CI scenarios don't define %VSINSTALLDIR%, so be explicit about where to look for vstest.
+      Note: $(VsInstallRoot) is a built-in MSBuild property, so should always be defined.
+    -->
+    <VSTestToolPath>$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\TestWindow</VSTestToolPath>
+    <!-- No arm64 agents to run the tests. -->
+    <RunVSTest Condition="'$(Platform)' == 'ARM64'">false</RunVSTest>
+  </PropertyGroup>
+
+  <!-- MSBuildCache -->
+  <PropertyGroup>
+    <!-- Off by default -->
+    <MSBuildCacheEnabled Condition="'$(MSBuildCacheEnabled)' == ''">false</MSBuildCacheEnabled>
+
+    <!-- In Azure pipelines, use Pipeline Caching as the cache storage backend. Otherwise, use the local cache. -->
+    <MSBuildCachePackageName Condition="'$(TF_BUILD)' != ''">Microsoft.MSBuildCache.AzurePipelines</MSBuildCachePackageName>
+    <MSBuildCachePackageName Condition="'$(MSBuildCachePackageName)' == ''">Microsoft.MSBuildCache.Local</MSBuildCachePackageName>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(MSBuildCacheEnabled)' == 'true'">
+    <!-- Disable when running in a pipeline as the time to upload or download the massive .pch/.pchast to the cache is greater than the savings they provide. -->
+    <UsePrecompiledHeaders Condition="'$(TF_BUILD)' != ''">false</UsePrecompiledHeaders>
+
+    <!-- Change this to bust the cache -->
+    <MSBuildCacheCacheUniverse Condition="'$(MSBuildCacheCacheUniverse)' == ''">202408150737</MSBuildCacheCacheUniverse>
+
+    <!--
+      Visual Studio telemetry reads various ApplicationInsights.config files and other files after the project is finished, likely in a detached process.
+      This is acceptable and should not impact cache correctness.
+    -->
+    <MSBuildCacheAllowFileAccessAfterProjectFinishFilePatterns>
+      $(MSBuildCacheAllowFileAccessAfterProjectFinishFilePatterns);
+      \**\ApplicationInsights.config;
+      $(LocalAppData)\Microsoft\VSApplicationInsights\**;
+      $(LocalAppData)\Microsoft\Windows\INetCache\**;
+      A:\;
+      E:\;
+      $(windir)\**;
+    </MSBuildCacheAllowFileAccessAfterProjectFinishFilePatterns>
+
+    <!-- Unit tests of low-priv processes, eg the preview handler tests, may log to this location. -->
+    <MSBuildCacheAllowFileAccessAfterProjectFinishFilePatterns>
+      $(MSBuildCacheAllowFileAccessAfterProjectFinishFilePatterns);
+      $(USERPROFILE)\AppData\LocalLow\Microsoft\PowerToys\**;
+    </MSBuildCacheAllowFileAccessAfterProjectFinishFilePatterns>
+
+    <!-- 
+      This repo uses a common output directory with many projects writing duplicate outputs. Allow everything, but note this costs some performance in the form of requiring
+      the cache to use copies instead of hardlinks when pulling from cache.
+    -->
+    <MSBuildCacheIdenticalDuplicateOutputPatterns>$(MSBuildCacheIdenticalDuplicateOutputPatterns);**</MSBuildCacheIdenticalDuplicateOutputPatterns>
+
+    <!-- version of MSBuildCache is not part of the cache key -->
+    <PackagesConfigFile>$(MSBuildThisFileDirectory)packages.config</PackagesConfigFile>
+    <MSBuildCacheIgnoredInputPatterns>$(MSBuildCacheIgnoredInputPatterns);$(PackagesConfigFile)</MSBuildCacheIgnoredInputPatterns>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(MSBuildCacheEnabled)' == 'true' and '$(MSBuildCachePackageRoot)' == ''">
+    <PackagesConfigContents>$([System.IO.File]::ReadAllText("$(PackagesConfigFile)"))</PackagesConfigContents>
+    <MSBuildCachePackageVersion>$([System.Text.RegularExpressions.Regex]::Match($(PackagesConfigContents), 'Microsoft.MSBuildCache.*?version="(.*?)"').Groups[1].Value)</MSBuildCachePackageVersion>
+    <MSBuildCachePackageRoot>$(MSBuildThisFileDirectory)packages\$(MSBuildCachePackageName).$(MSBuildCachePackageVersion)</MSBuildCachePackageRoot>
+    <MSBuildCacheSharedCompilationPackageRoot>$(MSBuildThisFileDirectory)packages\Microsoft.MSBuildCache.SharedCompilation.$(MSBuildCachePackageVersion)</MSBuildCacheSharedCompilationPackageRoot>
+  </PropertyGroup>
+
+  <ImportGroup Condition="'$(MSBuildCacheEnabled)' == 'true'">
+    <Import Project="$(MSBuildCachePackageRoot)\build\$(MSBuildCachePackageName).props" />
+    <Import Project="$(MSBuildCacheSharedCompilationPackageRoot)\build\Microsoft.MSBuildCache.SharedCompilation.props" />
+  </ImportGroup>
 </Project>

Directory.Build.targets

@@ -1,3 +1,6 @@
 <Project>
-  <Import Project="$(MSBuildThisFileDirectory)\custom.targets" />
+  <Sdk Name="Microsoft.Build.CopyOnWrite" Version="1.0.282" />
-</Project>
+
+  <Import Project="$(MSBuildCachePackageRoot)\build\$(MSBuildCachePackageName).targets" Condition="'$(MSBuildCacheEnabled)' == 'true'" />
+  <Import Project="$(MSBuildCacheSharedCompilationPackageRoot)\build\Microsoft.MSBuildCache.SharedCompilation.targets" Condition="'$(MSBuildCacheEnabled)' == 'true'" />
+</Project>

Directory.Packages.props

@@ -6,14 +6,14 @@
     <PackageVersion Include="Appium.WebDriver" Version="4.4.5" />
     <PackageVersion Include="Azure.AI.OpenAI" Version="1.0.0-beta.12" />
     <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.2" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Animations" Version="8.1.240821" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Animations" Version="8.0.240109" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Collections" Version="8.1.240821" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Collections" Version="8.0.240109" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.1.240821" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.0.240109" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.1.240821" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.0.240109" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Segmented" Version="8.1.240821" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Segmented" Version="8.0.240109" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Sizers" Version="8.1.240821" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Sizers" Version="8.0.240109" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Converters" Version="8.1.240821" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Converters" Version="8.0.240109" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Extensions" Version="8.1.240821" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Extensions" Version="8.0.240109" />
     <PackageVersion Include="CommunityToolkit.WinUI.UI.Controls.DataGrid" Version="7.1.2" />
     <PackageVersion Include="CommunityToolkit.WinUI.UI.Controls.Markdown" Version="7.1.2" />
     <PackageVersion Include="ControlzEx" Version="6.0.0" />
@@ -32,19 +32,15 @@
     <PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" />
-    <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2739.15" />
+    <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2365.46" />
     <!-- 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="8.0.0" />
     <PackageVersion Include="Microsoft.Windows.Compatibility" Version="8.0.7" />
     <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. -->
-    <!-- 
+    <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.0.8" />
-      TODO: in Common.Dotnet.CsWinRT.props, on upgrade, verify RemoveCsWinRTPackageAnalyzer is no longer needed.  
-      This is present due to a bug in CsWinRT where WPF projects cause the analyzer to fail.
-	-->
-    <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.1.1" />
     <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.6.240829007" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.5.240428000" />
     <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" />
@@ -83,7 +79,7 @@
     <PackageVersion Include="System.Text.Encoding.CodePages" Version="8.0.0" />
     <PackageVersion Include="System.Text.Json" Version="8.0.4" />
     <PackageVersion Include="UnicodeInformation" Version="2.6.0" />
-    <PackageVersion Include="UnitsNet" Version="5.56.0" />
+    <PackageVersion Include="UnitsNet" Version="5.50.0" />
     <PackageVersion Include="UTF.Unknown" Version="2.5.1" />
     <PackageVersion Include="WinUIEx" Version="2.2.0" />
     <PackageVersion Include="WPF-UI" Version="3.0.0" />

NOTICE.md

@@ -1299,14 +1299,14 @@ EXHIBIT A -Mozilla Public License.
 - Appium.WebDriver 4.4.5
 - Azure.AI.OpenAI 1.0.0-beta.12
 - CommunityToolkit.Mvvm 8.2.2
-- CommunityToolkit.WinUI.Animations 8.1.240821
+- CommunityToolkit.WinUI.Animations 8.0.240109
-- CommunityToolkit.WinUI.Collections 8.1.240821
+- CommunityToolkit.WinUI.Collections 8.0.240109
-- CommunityToolkit.WinUI.Controls.Primitives 8.1.240821
+- CommunityToolkit.WinUI.Controls.Primitives 8.0.240109
-- CommunityToolkit.WinUI.Controls.Segmented 8.1.240821
+- CommunityToolkit.WinUI.Controls.Segmented 8.0.240109
-- CommunityToolkit.WinUI.Controls.SettingsControls 8.1.240821
+- CommunityToolkit.WinUI.Controls.SettingsControls 8.0.240109
-- CommunityToolkit.WinUI.Controls.Sizers 8.1.240821
+- CommunityToolkit.WinUI.Controls.Sizers 8.0.240109
-- CommunityToolkit.WinUI.Converters 8.1.240821
+- CommunityToolkit.WinUI.Converters 8.0.240109
-- CommunityToolkit.WinUI.Extensions 8.1.240821
+- CommunityToolkit.WinUI.Extensions 8.0.240109
 - CommunityToolkit.WinUI.UI.Controls.DataGrid 7.1.2
 - CommunityToolkit.WinUI.UI.Controls.Markdown 7.1.2
 - ControlzEx 6.0.0
@@ -1325,13 +1325,13 @@ EXHIBIT A -Mozilla Public License.
 - Microsoft.Extensions.Logging 8.0.0
 - Microsoft.Extensions.Logging.Abstractions 8.0.0
 - Microsoft.Toolkit.Uwp.Notifications 7.1.2
-- Microsoft.Web.WebView2 1.0.2739.15
+- Microsoft.Web.WebView2 1.0.2365.46
 - Microsoft.Win32.SystemEvents 8.0.0
 - Microsoft.Windows.Compatibility 8.0.7
 - Microsoft.Windows.CsWin32 0.2.46-beta
-- Microsoft.Windows.CsWinRT 2.1.1
+- Microsoft.Windows.CsWinRT 2.0.8
 - Microsoft.Windows.SDK.BuildTools 10.0.22621.2428
-- Microsoft.WindowsAppSDK 1.6.240829007
+- Microsoft.WindowsAppSDK 1.5.240428000
 - Microsoft.Xaml.Behaviors.WinUI.Managed 2.0.9
 - Microsoft.Xaml.Behaviors.Wpf 1.1.39
 - ModernWpfUI 0.9.4
@@ -1363,7 +1363,7 @@ EXHIBIT A -Mozilla Public License.
 - System.Text.Encoding.CodePages 8.0.0
 - System.Text.Json 8.0.4
 - UnicodeInformation 2.6.0
-- UnitsNet 5.56.0
+- UnitsNet 5.50.0
 - UTF.Unknown 2.5.1
 - WinUIEx 2.2.0
 - WPF-UI 3.0.0

PowerToys.sln

@@ -178,6 +178,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Directory.Build.targets = Directory.Build.targets
 		Directory.Packages.props = Directory.Packages.props
 		Solution.props = Solution.props
+		src\Version.props = src\Version.props
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Settings.UI.Library", "src\settings-ui\Settings.UI.Library\Settings.UI.Library.csproj", "{B1BCC8C6-46B5-4BFA-8F22-20F32D99EC6A}"

README.md

@@ -25,7 +25,7 @@ Microsoft PowerToys is a set of utilities for power users to tune and streamline
 | [Peek](https://aka.ms/PowerToysOverview_Peek) | [Paste as Plain Text](https://aka.ms/PowerToysOverview_PastePlain) | [PowerRename](https://aka.ms/PowerToysOverview_PowerRename) |
 | [PowerToys Run](https://aka.ms/PowerToysOverview_PowerToysRun) | [Quick Accent](https://aka.ms/PowerToysOverview_QuickAccent) | [Registry Preview](https://aka.ms/PowerToysOverview_RegistryPreview) |
 | [Screen Ruler](https://aka.ms/PowerToysOverview_ScreenRuler) | [Shortcut Guide](https://aka.ms/PowerToysOverview_ShortcutGuide) | [Text Extractor](https://aka.ms/PowerToysOverview_TextExtractor) |
-| [Video Conference Mute](https://aka.ms/PowerToysOverview_VideoConference) | [Workspaces](https://aka.ms/PowerToysOverview_Workspaces) |
+| [Video Conference Mute](https://aka.ms/PowerToysOverview_VideoConference) |
 
 ## Installing and running Microsoft PowerToys
 
@@ -41,19 +41,19 @@ Microsoft PowerToys is a set of utilities for power users to tune and streamline
 Go to the [Microsoft PowerToys GitHub releases page][github-release-link] and click on `Assets` at the bottom to show the files available in the release. Please use the appropriate PowerToys installer that matches your machine's architecture and install scope. For most, it is `x64` and per-user.
 
 <!-- items that need to be updated release to release -->
-[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.85%22
+[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.84%22
-[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.84%22
+[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.83%22
-[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.84.1/PowerToysUserSetup-0.84.1-x64.exe
+[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.83.0/PowerToysUserSetup-0.83.0-x64.exe 
-[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.84.1/PowerToysUserSetup-0.84.1-arm64.exe
+[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.83.0/PowerToysUserSetup-0.83.0-arm64.exe 
-[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.84.1/PowerToysSetup-0.84.1-x64.exe
+[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.83.0/PowerToysSetup-0.83.0-x64.exe 
-[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.84.1/PowerToysSetup-0.84.1-arm64.exe
+[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.83.0/PowerToysSetup-0.83.0-arm64.exe
  
 |  Description   | Filename | sha256 hash |
 |----------------|----------|-------------|
-| Per user - x64       | [PowerToysUserSetup-0.84.1-x64.exe][ptUserX64] | 1CDAF3482B031D84DAE15188DE292FB44C5D211698089921040D94B256EBD3CA |
+| Per user - x64       | [PowerToysUserSetup-0.83.0-x64.exe][ptUserX64] | C78E24F21C611F2BD774D8460ADD4B9AC8519085CA1253941CB46129331AB8C8 |
-| Per user - ARM64     | [PowerToysUserSetup-0.84.1-arm64.exe][ptUserArm64] | E0207EF5147EE281D4F438E87A30586D8CAA24DE948950FF1B12E05454622CD9 |
+| Per user - ARM64     | [PowerToysUserSetup-0.83.0-arm64.exe][ptUserArm64] | BA1C16003D55587D523A41B960D4A03718123CA37577D5F2A75E151D7653E6D3 |
-| Machine wide - x64   | [PowerToysSetup-0.84.1-x64.exe][ptMachineX64] | 10DF9774DE1857051E135B9790A18A92C5C7F42587C733DEE991186E67231EE0 |
+| Machine wide - x64   | [PowerToysSetup-0.83.0-x64.exe][ptMachineX64] | 7EC435A10849187D21A383E56A69213C1FF110B7FECA65900D9319D2F8162F35 |
-| Machine wide - ARM64 | [PowerToysSetup-0.84.1-arm64.exe][ptMachineArm64] | EB5DDA5EFBA17E813DBF24AFF668DDF5424ED3659234ABBC15441D478D812699 |
+| Machine wide - ARM64 | [PowerToysSetup-0.83.0-arm64.exe][ptMachineArm64] | 5E147424D1D12DFCA88DC4AA0657B7CC1F3B02812F1EBA3E564FAF691908D840 |
 
 This is our preferred method.
 
@@ -99,98 +99,117 @@ For guidance on developing for PowerToys, please read the [developer docs](/doc/
 
 Our [prioritized roadmap][roadmap] of features and utilities that the core team is focusing on.
 
-### 0.84 - August 2024 Update
+### 0.83 - July 2024 Update
 
-In this release, we focused on adding a new utility (PowerToys Workspaces), Advanced paste custom actions feature, stability, and improvements.
+In this release, we focused on stability and improvements.
 
 **Highlights**
 
- - New utility: PowerToys Workspaces - this utility can launch a set of applications to a custom layout and configuration on the desktop. App arrangements can be saved as a workspace and then relaunched with one click from the Workspaces Editor or from a desktop shortcut. In the editor, app configuration can be customized using CLI arguments and "launch as admin" modifiers, and app window sizes and positions can be updated as desired. This is our first public version of Workspaces and we are excited for you to try it out for yourself! Make sure to file issues you encounter on our GitHub so the team can continue to improve the utility.
+ - Awake Quality of Life changes, including changing the tray icon to reflect the current mode. Thanks [@dend](https://github.com/dend)!
-    - Known issues - the team is actively working on fixing these:
+ - Changes to general GPO policies and new policies for Mouse Without Borders. The names for some intune policy configuration sets might need to be updated as seen in https://github.com/MicrosoftDocs/windows-dev-docs/pull/5045/files . Thanks [@htcfreek](https://github.com/htcfreek)!
-       - Apps that launch as admin are unable to be repositioned to the desired layout.
-       - Border of "Remove" / "Add Back" app button in editor is not clearly visible on light themes.
- - Added Awake --use-parent-pid CLI argument to attach to parent process. Thanks [@dend](https://github.com/dend)!
- - Added custom actions - user-specified pre-defined prompts for the AI model. Additionally, actions (both standard and custom) are now searchable from prompt box and Ctrl + number in-app shortcuts are now applicable for first 9 search results.
- - Ported all C++/CX code to C++/WinRT as part of a refactor and upgrade series aimed at enabling AOT (Ahead of Time) compilation for enhanced performance and reduced disk footprint.
 
 ### General
+ - Reordered GPO policies, making it easier to find some policies. Thanks [@htcfreek](https://github.com/htcfreek)!
 
- - Added DSC support for ImageResizer resize sizes property.
- 
 ### Advanced Paste
 
- - Added custom actions - user-specified pre-defined prompts for the AI model. Additionally, actions (both standard and custom) are now searchable from prompt box and Ctrl + number in-app shortcuts are now applicable for first 9 search results.
+ - Fixed CSV parser to support double quotes and escape delimiters when pasting as JSON. Thanks [@GhostVaibhav](https://github.com/GhostVaibhav)!
+ - Improved double quote handling in the CSV parser when pasting as JSON. Thanks [@htcfreek](https://github.com/htcfreek)!
 
 ### Awake
 
- - Added --use-parent-pid CLI argument to attach to parent process and fixed issue causing tray icon to disappear. Thanks [@dend](https://github.com/dend)!
+ - Different modes will now show different icons in the system tray. Thanks [@dend](https://github.com/dend), and [@niels9001](https://github.com/niels9001) for the icon design!
+ - Removed the dependency on Windows Forms and used native Win32 APIs instead for the tray icon. Thanks [@dend](https://github.com/dend) and [@BrianPeek](https://github.com/BrianPeek)!
+ - Fixed an issue where the UI would become non-responsive after selecting no time for the timed mode. Thanks [@dend](https://github.com/dend)!
+ - Refactored code for easier maintenance. Thanks [@dend](https://github.com/dend)!
+ - The tray icon will now be shown when running Awake standalone to signal mode. Thanks [@dend](https://github.com/dend)!
+ - The tray icon tooltip shows how much time is left on the timer. Thanks [@dend](https://github.com/dend)!
+ - Added DPI awareness to the tray icon context menu. Thanks [@dend](https://github.com/dend)!
 
-### Hosts File Editor
+### Color Picker
 
- -  Fixed save failure when the hosts file is hidden. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Added support to using the mouse wheel to scroll through the color history. Thanks [@Fefedu973](https://github.com/Fefedu973)!
 
 ### File Explorer add-ons
 
- - Fixed multiple preview form positioning issues causing floating, detached windows, CoreWebView2 related exception and process leak. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Allow copying from the right-click menu in Monaco and Markdown previewers.
 
-### Keyboard Manager
+### File Locksmith
 
- - Convert RemapBufferRow to a struct with descriptive field names. Thanks [@masaru-iritani](https://github.com/masaru-iritani)!
+ - Fixed a crash when there were a big number of entries being shown by moving the opened files of a process to another dialog.
- - Fixed issue causing stuck Ctrl key when shortcuts contain AltGr key.
+
+### Installer
+
+ - Fixed the path where DSC module files were installed for the user-scope installer. (This was a hotfix for 0.82)
+
+### Mouse Without Borders
+
+ - Disabled non supported options in the old Mouse Without Borders UI. Thanks [@htcfreek](https://github.com/htcfreek)!
+ - Added new GPO policies to control the use of some features. Thanks [@htcfreek](https://github.com/htcfreek)!
 
 ### Peek
 
- - Added long paths support. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Allow copying from the right-click menu in Dev files and Markdown previews.
-
-### Quick Accent
-
- - Moved number superscripts and subscripts from Portuguese to all languages definition. Thanks [@octastylos-pseudodipteros](https://github.com/octastylos-pseudodipteros)!
-
-### PowerRename
-
- - Updated the tooltip text of the replace box info button. Thanks [@Agnibaan](https://github.com/Agnibaan)!
 
 ### PowerToys Run
 
- - Fixed window positioning on start-up introduced in 0.83.
+ - Fixed a crash on Windows 11 build 22000. (This was a hotfix for 0.82)
- - Improved default web browser detection. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Blocked a transparency fix code from running on Windows 10, since it was causing graphical glitches. (This was a hotfix for 0.82)
- - Fixed volume ounces conversion to support both imperial and metric. Thanks [@GhostVaibhav](https://github.com/GhostVaibhav)!
+ - Accept speed abbreviations like kilometers per hour (kmph) in the Unit Converter plugin. Thanks [@GhostVaibhav](https://github.com/GhostVaibhav)!
- - Fixed thread-safety issue causing results not to be shown on first launch.
+ - Added settings to configure behavior of the "First week of year" and "First day of week" calculations in the DateTime plugin. Thanks [@htcfreek](https://github.com/htcfreek)!
+ - Fixed wrong initial position of the PowerToys Run when switching between monitors with different dpi values.
+ - Started allowing interchangeable use of / and \ in the registry plugin paths.
+ - Added support to automatic sign-in after rebooting with the System plugin. Thanks [@htcfreek](https://github.com/htcfreek)!
+ - Added suggested use example results to the Value Generator plugin. Thanks [@azlkiniue](https://github.com/azlkiniue)!
 
-### Screen Ruler
+### Quick Accent
 
- - Added multiple measurements support for all measuring tools.
+ - Added support for the Bulgarian character set. Thanks [@octastylos-pseudodipteros](https://github.com/octastylos-pseudodipteros)!
+
+### Runner
+
+ - Add code to handle release tags with an upper V when trying to detect new updates. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
 
 ### Settings
 
- - Improved disabled animations InfoBar in Find My Mouse page. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Fixed the UI spacing in the "update available" card. Thanks [@Agnibaan](https://github.com/Agnibaan)!
-
+ - Fixed the information bars in the Mouse Without Borders settings page to hide when the module is disabled. Thanks [@htcfreek](https://github.com/htcfreek)!
-### Workspaces
+ - Improved consistency of the icons used in the Mouse Without Borders settings page. Thanks [@htcfreek](https://github.com/htcfreek)!
-
+ - Improved action keyword information bar padding in the PowerToys Run plugins section. Thanks [@htcfreek](https://github.com/htcfreek)!
- - New utility: PowerToys Workspaces - this utility can launch a set of applications to a custom layout and configuration on the desktop. App arrangements can be saved as a workspace and then relaunched with one click from the Workspaces Editor or from a desktop shortcut. In the editor, app configuration can be customized using CLI arguments and "launch as admin" modifiers, and app window sizes and positions can be updated as desired. This is our first public version of Workspaces and we are excited for you to try it out for yourself! Make sure to file issues you encounter on our GitHub so the team can continue to improve the utility.
+ - Fixed a crash in the dashboard when Keyboard Manager Editor settings file became locked.
 
 ### Documentation
 
- - Added ChatGPTPowerToys plugin mention to thirdPartyRunPlugins.md. Thanks [@ferraridavide](https://github.com/ferraridavide)!
+ - Added the RDP plugin to PowerToys Run thirdPartyRunPlugins.md docs. Thanks [@anthony81799](https://github.com/anthony81799)!
+ - Added the GitHubRepo and ProcessKiller plugins to PowerToys Run thirdPartyRunPlugins.md docs. Thanks [@8LWXpg](https://github.com/8LWXpg)!
+ - Fixed a typo in the 0.82.0 release notes in README. Thanks [@walex999](https://github.com/walex999)!
 
 ### Development
 
- - Ported all C++/CX code to C++/WinRT.
+ - Disabled FancyZone UI tests, to unblock PRs. We plan to bring them back in the future. (This was a hotfix for 0.82)
- - Extracted self-containment related .csproj properties to src/Common.SelfContained.props.
+ - Fixed an issue where flakiness in CI was causing the installer custom actions DLL from being signed. (This was a hotfix for 0.82)
- - Unused and obsolete dependencies cleanup. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Upgraded the Microsoft.Windows.Compatibility dependency to 8.0.7.
- - Extracted CSWinRT related .csproj properties to src/Common.Dotnet.CsWinRT.props.
+ - Upgraded the System.Text.Json dependency to 8.0.4.
- - Upgraded Microsoft.Windows.CsWinRT to 2.0.8 and updated verifyDepsJsonLibraryVersions.ps1 to unblock PRs.
+ - Upgraded the Microsoft.Data.Sqlite dependency to 8.0.7.
- - Explicitly Set NuGet Audit Mode to Direct in Directory.Build.props to revert changes made with VS 17.12 update. Thanks [@snickler](https://github.com/snickler)!
+ - Upgraded the MSBuildCache dependency to 0.1.283-preview. Thanks [@dfederm](https://github.com/dfederm)!
- - Upgraded UnitsNet to 5.56.0.
+ - Removed an unneeded /Zm compiler flag from Keyboard Manager Editor common build flags.
+ - Fixed the winget publish action to handle upper case V in the tag name. Thanks [@mdanish-kh](https://github.com/mdanish-kh)!
+ - Removed wildcard items from vcxproj files. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Removed the similar issues bot GitHub actions. Thanks [@craigloewen-msft](https://github.com/craigloewen-msft)!
+ - Fixed CODEOWNERS to better protect changes in some files.
+ - Switched machines being used in CI and pointed status badges in README to the new machines.
+ - Fixed NU1503 build warnings when building PowerToys. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Use the MSTest meta dependency for running the tests instead of the individual testing packages. Thanks [@stan-sz](https://github.com/stan-sz)!
+ - Added missing CppWinRT references.
 
 #### What is being planned for version 0.84
 
-For [v0.85][github-next-release-work], we'll work on the items below:
+For [v0.84][github-next-release-work], we'll work on the items below:
 
  - Stability / bug fixes
+ - New utility: Dev Projects
  - Language selection
  - New module: File Actions Menu
- - New module: New+
 
 ## PowerToys Community
 

custom.props

@@ -1,136 +0,0 @@
-<Project>
-  <PropertyGroup Label="Version">
-    <VersionMajor>0</VersionMajor>
-    <VersionMinor>86</VersionMinor>
-    <VersionInfoProductName>PowerToys</VersionInfoProductName>
-  </PropertyGroup>
-  <PropertyGroup>
-    <Copyright>Copyright (C) Microsoft Corporation. All rights reserved.</Copyright>
-    <AssemblyCopyright>Copyright (C) Microsoft Corporation. All rights reserved.</AssemblyCopyright>
-    <AssemblyProduct>PowerToys</AssemblyProduct>
-    <AssemblyCompany>Microsoft Corp.</AssemblyCompany>
-    <Company>Microsoft Corporation</Company>
-    <Authors>Microsoft Corporation</Authors>
-    <Product>PowerToys</Product>
-    <NeutralLanguage>en-US</NeutralLanguage>
-    <Platforms>x64;ARM64</Platforms>
-    <PackageTags>PowerToys</PackageTags>
-    <EnableNETAnalyzers>true</EnableNETAnalyzers>
-    <AnalysisMode>Recommended</AnalysisMode>
-    <_SkipUpgradeNetAnalyzersNuGetWarning>true</_SkipUpgradeNetAnalyzersNuGetWarning>
-    <NuGetAuditMode>direct</NuGetAuditMode>
-    <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>    <!-- Don't add source revision hash to the product version of binaries. -->
-    <PlatformTarget>$(Platform)</PlatformTarget>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(MSBuildProjectExtension)' == '.csproj'">
-    <RepositoryUrl>https://github.com/microsoft/PowerToys</RepositoryUrl>
-    <RepositoryType>GitHub</RepositoryType>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>PowerToys.Root.Props</_PropertySheetDisplayName>
-    <ForceImportBeforeCppProps>$(MsbuildThisFileDirectory)\Cpp.Build.props</ForceImportBeforeCppProps>
-  </PropertyGroup>
-
-  <ItemGroup Condition="'$(MSBuildProjectExtension)' == '.csproj'">
-    <PackageReference Include="StyleCop.Analyzers">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <Compile Include="$(MSBuildThisFileDirectory)\src\codeAnalysis\GlobalSuppressions.cs" Link="GlobalSuppressions.cs" />
-    <AdditionalFiles Include="$(MSBuildThisFileDirectory)\src\codeAnalysis\StyleCop.json" Link="StyleCop.json" />
-
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
-  <!-- Add ability to run tests via "msbuild /t:Test" -->
-  <!--
-    Workaround an MSBuild bug where Microsoft.Common.Test.targets is missing from the Arm64 installation.
-    See: https://github.com/dotnet/msbuild/pull/9984
-    NB 1: This means that using "/t:Test" is not supported for Arm64 builds and tests will need to be run in an alternate way,
-          eg running tests in VS or invoking vstest.console directly.
-    NB 2: <Sdk> elements do not support conditions, so this is also being worked around.
-          Once the change referenced above is fixed, the ImportGroup below can be replaced with:
-            <Sdk Name="Microsoft.Build.RunVSTest" Version="1.0.319" />
-  -->
-  <ImportGroup Condition="'$(PROCESSOR_ARCHITECTURE)' != 'ARM64'">
-    <Import Project="Sdk.props" Sdk="Microsoft.Build.RunVSTest" Version="1.0.319" />
-    <Import Project="Sdk.targets" Sdk="Microsoft.Build.RunVSTest" Version="1.0.319" />
-  </ImportGroup>
-  <PropertyGroup>
-    <VSTestLogger>trx</VSTestLogger>
-    <!--
-      RunVSTest by default uses %VSINSTALLDIR%\Common7\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe,
-      but some of the CI scenarios don't define %VSINSTALLDIR%, so be explicit about where to look for vstest.
-      Note: $(VsInstallRoot) is a built-in MSBuild property, so should always be defined.
-    -->
-    <VSTestToolPath>$(VsInstallRoot)\Common7\IDE\CommonExtensions\Microsoft\TestWindow</VSTestToolPath>
-    <!-- No arm64 agents to run the tests. -->
-    <RunVSTest Condition="'$(Platform)' == 'ARM64'">false</RunVSTest>
-  </PropertyGroup>
-
-  <!-- MSBuildCache -->
-  <PropertyGroup>
-    <!-- Off by default -->
-    <MSBuildCacheEnabled Condition="'$(MSBuildCacheEnabled)' == ''">false</MSBuildCacheEnabled>
-
-    <!-- In Azure pipelines, use Pipeline Caching as the cache storage backend. Otherwise, use the local cache. -->
-    <MSBuildCachePackageName Condition="'$(TF_BUILD)' != ''">Microsoft.MSBuildCache.AzurePipelines</MSBuildCachePackageName>
-    <MSBuildCachePackageName Condition="'$(MSBuildCachePackageName)' == ''">Microsoft.MSBuildCache.Local</MSBuildCachePackageName>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(MSBuildCacheEnabled)' == 'true'">
-    <!-- Disable when running in a pipeline as the time to upload or download the massive .pch/.pchast to the cache is greater than the savings they provide. -->
-    <UsePrecompiledHeaders Condition="'$(TF_BUILD)' != ''">false</UsePrecompiledHeaders>
-
-    <!-- Change this to bust the cache -->
-    <MSBuildCacheCacheUniverse Condition="'$(MSBuildCacheCacheUniverse)' == ''">202408150737</MSBuildCacheCacheUniverse>
-
-    <!--
-      Visual Studio telemetry reads various ApplicationInsights.config files and other files after the project is finished, likely in a detached process.
-      This is acceptable and should not impact cache correctness.
-    -->
-    <MSBuildCacheAllowFileAccessAfterProjectFinishFilePatterns>
-      $(MSBuildCacheAllowFileAccessAfterProjectFinishFilePatterns);
-      \**\ApplicationInsights.config;
-      $(LocalAppData)\Microsoft\VSApplicationInsights\**;
-      $(LocalAppData)\Microsoft\Windows\INetCache\**;
-      A:\;
-      E:\;
-      $(windir)\**;
-    </MSBuildCacheAllowFileAccessAfterProjectFinishFilePatterns>
-
-    <!-- Unit tests of low-priv processes, eg the preview handler tests, may log to this location. -->
-    <MSBuildCacheAllowFileAccessAfterProjectFinishFilePatterns>
-      $(MSBuildCacheAllowFileAccessAfterProjectFinishFilePatterns);
-      $(USERPROFILE)\AppData\LocalLow\Microsoft\PowerToys\**;
-    </MSBuildCacheAllowFileAccessAfterProjectFinishFilePatterns>
-
-    <!-- 
-      This repo uses a common output directory with many projects writing duplicate outputs. Allow everything, but note this costs some performance in the form of requiring
-      the cache to use copies instead of hardlinks when pulling from cache.
-    -->
-    <MSBuildCacheIdenticalDuplicateOutputPatterns>$(MSBuildCacheIdenticalDuplicateOutputPatterns);**</MSBuildCacheIdenticalDuplicateOutputPatterns>
-
-    <!-- version of MSBuildCache is not part of the cache key -->
-    <PackagesConfigFile>$(MSBuildThisFileDirectory)packages.config</PackagesConfigFile>
-    <MSBuildCacheIgnoredInputPatterns>$(MSBuildCacheIgnoredInputPatterns);$(PackagesConfigFile)</MSBuildCacheIgnoredInputPatterns>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(MSBuildCacheEnabled)' == 'true' and '$(MSBuildCachePackageRoot)' == ''">
-    <PackagesConfigContents>$([System.IO.File]::ReadAllText("$(PackagesConfigFile)"))</PackagesConfigContents>
-    <MSBuildCachePackageVersion>$([System.Text.RegularExpressions.Regex]::Match($(PackagesConfigContents), 'Microsoft.MSBuildCache.*?version="(.*?)"').Groups[1].Value)</MSBuildCachePackageVersion>
-    <MSBuildCachePackageRoot>$(MSBuildThisFileDirectory)packages\$(MSBuildCachePackageName).$(MSBuildCachePackageVersion)</MSBuildCachePackageRoot>
-    <MSBuildCacheSharedCompilationPackageRoot>$(MSBuildThisFileDirectory)packages\Microsoft.MSBuildCache.SharedCompilation.$(MSBuildCachePackageVersion)</MSBuildCacheSharedCompilationPackageRoot>
-  </PropertyGroup>
-
-  <ImportGroup Condition="'$(MSBuildCacheEnabled)' == 'true'">
-    <Import Project="$(MSBuildCachePackageRoot)\build\$(MSBuildCachePackageName).props" />
-    <Import Project="$(MSBuildCacheSharedCompilationPackageRoot)\build\Microsoft.MSBuildCache.SharedCompilation.props" />
-  </ImportGroup>
-</Project>

custom.targets

@@ -1,6 +0,0 @@
-<Project>
-  <Sdk Name="Microsoft.Build.CopyOnWrite" Version="1.0.282" />
-
-  <Import Project="$(MSBuildCachePackageRoot)\build\$(MSBuildCachePackageName).targets" Condition="'$(MSBuildCacheEnabled)' == 'true'" />
-  <Import Project="$(MSBuildCacheSharedCompilationPackageRoot)\build\Microsoft.MSBuildCache.SharedCompilation.targets" Condition="'$(MSBuildCacheEnabled)' == 'true'" />
-</Project>

doc/planning/awake.md

@@ -10,23 +10,12 @@ The build ID can be found in `Core\Constants.cs` in the `BuildId` variable - it
 
 The build ID moniker is made up of two components - a reference to a [Halo](https://en.wikipedia.org/wiki/Halo_(franchise)) character, and the date when the work on the specific build started in the format of `MMDDYYYY`.
 
-| Build ID                                                           | Build Date      |
+| Build ID                                                  | Build Date       |
-|:-------------------------------------------------------------------|:----------------|
+|:----------------------------------------------------------|:-----------------|
-| [`VISEGRADRELAY_08152024`](#VISEGRADRELAY_08152024-august-15-2024) | August 15, 2024 |
+| [`DAISY023_04102024`](#DAISY023_04102024-april-10-2024)   | April 10, 2024   |
-| [`DAISY023_04102024`](#DAISY023_04102024-april-10-2024)            | April 10, 2024  |
+| [`ATRIOX_04132023`](#ATRIOX_04132023-april-13-2023)       | April 13, 2023   |
-| [`ATRIOX_04132023`](#ATRIOX_04132023-april-13-2023)                | April 13, 2023  |
+| [`LIBRARIAN_03202022`](#librarian_03202022-march-20-2022) | March 20, 2022   |
-| [`LIBRARIAN_03202022`](#librarian_03202022-march-20-2022)          | March 20, 2022  |
+| `ARBITER_01312022`                                        | January 31, 2022 |
-| `ARBITER_01312022`                                                 | January 31, 2022 |
-
-### `VISEGRADRELAY_08152024` (August 15, 2024)
-
->[!NOTE]
->See pull request: [Awake - `VISEGRADRELAY_08152024`](https://github.com/microsoft/PowerToys/pull/34316)
-
-- [#34148](https://github.com/microsoft/PowerToys/issues/34148) Fixes the issue where the Awake icon is not displayed.
-- [#17969](https://github.com/microsoft/PowerToys/issues/17969) Add the ability to bind the process target to the parent of the Awake launcher.
-- PID binding now correctly ignores irrelevant parameters (e.g., expiration, interval) and only works for indefinite periods.
-- Amending the native API surface to make sure that the Win32 error is set correctly.
 
 ### `DAISY023_04102024` (April 10, 2024)
 

doc/thirdPartyRunPlugins.md

@@ -38,7 +38,6 @@ Contact the developers of a plugin directly for assistance with a specific plugi
 | [PowerHexInspector](https://github.com/NaroZeol/PowerHexInspector) | [NaroZeol](https://github.com/NaroZeol) | Peek other forms of an input number |
 | [GitHubRepo](https://github.com/8LWXpg/PowerToysRun-GitHubRepo) | [8LWXpg](https://github.com/8LWXpg) | Search and open GitHub repositories |
 | [ProcessKiller](https://github.com/8LWXpg/PowerToysRun-ProcessKiller) | [8LWXpg](https://github.com/8LWXpg) | Search and kill processes |
-| [ChatGPT](https://github.com/ferraridavide/ChatGPTPowerToys) | [ferraridavide](https://github.com/ferraridavide) | Ask a question to ChatGPT |
 
 ## Extending software plugins
 
@@ -50,7 +49,7 @@ Below are community created plugins that target a website or software.  They are
 | [Edge Workspaces](https://github.com/quachpas/PowerToys-Run-EdgeWorkspaces) | [quachpas](https://github.com/quachpas) | Open Microsoft Edge workspaces|
 | [Everything](https://github.com/lin-ycv/EverythingPowerToys) | [Yu Chieh (Victor) Lin](https://github.com/Lin-ycv) | Get search results from Everything |
 | [GitKraken](https://github.com/davidegiacometti/PowerToys-Run-GitKraken) | [davidegiacometti](https://github.com/davidegiacometti) | Open GitKraken repositories |
-| [RDP](https://github.com/anthony81799/PowerToysRun-RDP) | [anthony81799](https://github.com/anthony81799) | Open Remote Desktop connections |
+| [RDP](https://github.com/anthony81799/PowerToysRun-RDP)) | [anthony81799](https://github.com/anthony81799) | Open Remote Desktop connections |
 | [Visual Studio Recents](https://github.com/davidegiacometti/PowerToys-Run-VisualStudio) | [davidegiacometti](https://github.com/davidegiacometti) | Open Visual Studio recents |
 | [WinGet](https://github.com/bostrot/PowerToysRunPluginWinget) | [bostrot](https://github.com/bostrot) | Search and install packages from WinGet |
 | [Scoop](https://github.com/Quriz/PowerToysRunScoop) | [Quriz](https://github.com/Quriz) | Search and install packages from Scoop |

installer/PowerToysSetup/PowerToysBootstrapper.wixproj

@@ -3,11 +3,11 @@
   DefaultTargets="Build"
   InitialTargets="EnsureNuGetPackageBuildImports"
   xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\custom.props" />
+  <Import Project="..\..\src\Version.props" Condition="Exists('..\..\src\Version.props')" />
   <Import Project="..\wix.props" Condition="Exists('..\wix.props')" />
 
   <PropertyGroup>
-    <DefineConstants>Version=$(VersionMajor).$(VersionMinor)</DefineConstants>
+    <DefineConstants>Version=$(Version)</DefineConstants>
     <Name>PowerToysBootstrapper</Name>
     <ProjectGuid>{31d72625-43c1-41b1-b784-bce4a8dc5543}</ProjectGuid>
   </PropertyGroup>
@@ -84,4 +84,4 @@
     </ItemGroup>
   </Target>
   <Target Name="Restore" />
-</Project>
+</Project>

installer/PowerToysSetup/PowerToysInstaller.wixproj

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureNuGetPackageBuildImports"
   xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\custom.props" />
+  <Import Project="..\..\src\Version.props" Condition="Exists('..\..\src\Version.props')" />
   <Import Project="..\wix.props" Condition="Exists('..\wix.props')" />
 
   <PropertyGroup Condition="'$(Platform)' == 'x64'">
-    <DefineConstants>Version=$(VersionMajor).$(VersionMinor);MonacoSRCHarvestPath=$(ProjectDir)..\..\x64\$(Configuration)\Assets\Monaco\monacoSRC</DefineConstants>
+    <DefineConstants>Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\x64\$(Configuration)\Assets\Monaco\monacoSRC</DefineConstants>
     <!-- THIS IS AN INNER LOOP OPTIMIZATION
     The build pipeline builds the Settings and Launcher projects for Publication
     using a specific profile. If you're doing local installer builds, this will
@@ -194,4 +194,4 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
     </ItemGroup>
   </Target>
   <Target Name="Restore" />
-</Project>
+</Project>

installer/PowerToysSetupCustomActions/Resource.rc

@@ -2,6 +2,7 @@
 //
 #include <windows.h>
 #include "resource.h"
+#include "../../src/common/version/version.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -13,6 +14,39 @@
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
 
+1 VERSIONINFO
+FILEVERSION FILE_VERSION
+PRODUCTVERSION PRODUCT_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+FILEFLAGS VS_FF_DEBUG
+#else
+FILEFLAGS 0x0L
+#endif
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE VFT2_UNKNOWN
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0" // US English (0x0409), Unicode (0x04B0) charset
+        BEGIN
+            VALUE "CompanyName", COMPANY_NAME
+            VALUE "FileDescription", FILE_DESCRIPTION
+            VALUE "FileVersion", FILE_VERSION_STRING
+            VALUE "InternalName", INTERNAL_NAME
+            VALUE "LegalCopyright", COPYRIGHT_NOTE
+            VALUE "OriginalFilename", ORIGINAL_FILENAME
+            VALUE "ProductName", PRODUCT_NAME
+            VALUE "ProductVersion", PRODUCT_VERSION_STRING
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200 // US English (0x0409), Unicode (1200) charset
+    END
+END
+
 /////////////////////////////////////////////////////////////////////////////
 // English (United States) resources
 

src/ActionRunner/actionRunner.base.rc

@@ -1,3 +1,36 @@
 #include <windows.h>
 #include "resource.h"
+#include "../common/version/version.h"
 
+1 VERSIONINFO
+FILEVERSION FILE_VERSION
+PRODUCTVERSION PRODUCT_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+FILEFLAGS VS_FF_DEBUG
+#else
+FILEFLAGS 0x0L
+#endif
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE VFT2_UNKNOWN 
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0" // US English (0x0409), Unicode (0x04B0) charset
+        BEGIN
+            VALUE "CompanyName", COMPANY_NAME
+            VALUE "FileDescription", FILE_DESCRIPTION
+            VALUE "FileVersion", FILE_VERSION_STRING
+            VALUE "InternalName", INTERNAL_NAME
+            VALUE "LegalCopyright", COPYRIGHT_NOTE
+            VALUE "OriginalFilename", ORIGINAL_FILENAME
+            VALUE "ProductName", PRODUCT_NAME
+            VALUE "ProductVersion", PRODUCT_VERSION_STRING
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200 // US English (0x0409), Unicode (1200) charset
+    END
+END

src/Common.Dotnet.CsWinRT.props

@@ -2,8 +2,7 @@
 <!-- Some items may be set in Directory.Build.props in root -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <WindowsSdkPackageVersion>10.0.22621.38</WindowsSdkPackageVersion>
+    <TargetFramework>net8.0-windows10.0.20348.0</TargetFramework>
-    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
     <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
     <RuntimeIdentifiers>win-x64;win-arm64</RuntimeIdentifiers>
@@ -34,11 +33,4 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Windows.CsWinRT" />
   </ItemGroup>
-
-  <!-- this may need to be removed on future CsWinRT upgrades-->
-  <Target Name="RemoveCsWinRTPackageAnalyzer" BeforeTargets="CoreCompile">
-    <ItemGroup>
-      <Analyzer Remove="@(Analyzer)" Condition="%(Analyzer.NuGetPackageId) == 'Microsoft.Windows.CsWinRT'" />	  
-    </ItemGroup>
-  </Target>
 </Project>

src/Update/PowerToys.Update.base.rc

@@ -1,3 +1,36 @@
 #include <windows.h>
 #include "resource.h"
+#include "../common/version/version.h"
 
+1 VERSIONINFO
+FILEVERSION FILE_VERSION
+PRODUCTVERSION PRODUCT_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+FILEFLAGS VS_FF_DEBUG
+#else
+FILEFLAGS 0x0L
+#endif
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE VFT2_UNKNOWN 
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0" // US English (0x0409), Unicode (0x04B0) charset
+        BEGIN
+            VALUE "CompanyName", COMPANY_NAME
+            VALUE "FileDescription", FILE_DESCRIPTION
+            VALUE "FileVersion", FILE_VERSION_STRING
+            VALUE "InternalName", INTERNAL_NAME
+            VALUE "LegalCopyright", COPYRIGHT_NOTE
+            VALUE "OriginalFilename", ORIGINAL_FILENAME
+            VALUE "ProductName", PRODUCT_NAME
+            VALUE "ProductVersion", PRODUCT_VERSION_STRING
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200 // US English (0x0409), Unicode (1200) charset
+    END
+END

src/common/AllExperiments/Experiments.cs

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

src/common/Common.UI/ThemeManager.cs

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

src/common/FilePreviewCommon/MarkdownHelper.cs

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

src/common/FilePreviewCommon/MonacoHelper.cs

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

src/common/GPOWrapper/GPOWrapper.rc

@@ -1,7 +1,40 @@
 #include <windows.h>
 #include "resource.h"
+#include "../../../common/version/version.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 #include "winres.h"
 #undef APSTUDIO_READONLY_SYMBOLS
 
+1 VERSIONINFO
+FILEVERSION FILE_VERSION
+PRODUCTVERSION PRODUCT_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+FILEFLAGS VS_FF_DEBUG
+#else
+FILEFLAGS 0x0L
+#endif
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE VFT2_UNKNOWN
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0" // US English (0x0409), Unicode (0x04B0) charset
+        BEGIN
+            VALUE "CompanyName", COMPANY_NAME
+            VALUE "FileDescription", FILE_DESCRIPTION
+            VALUE "FileVersion", FILE_VERSION_STRING
+            VALUE "InternalName", INTERNAL_NAME
+            VALUE "LegalCopyright", COPYRIGHT_NOTE
+            VALUE "OriginalFilename", ORIGINAL_FILENAME
+            VALUE "ProductName", PRODUCT_NAME
+            VALUE "ProductVersion", PRODUCT_VERSION_STRING
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200 // US English (0x0409), Unicode (1200) charset
+    END
+END

src/common/ManagedCommon/Logger.cs

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

src/common/ManagedCommon/RunnerHelper.cs

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

src/common/ManagedCommon/ThemeHelpers.cs

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

src/common/ManagedTelemetry/Telemetry/PowerToysTelemetry.cs

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

src/common/UnitTests-CommonLib/UnitTests-CommonLib.rc

@@ -1,3 +1,36 @@
 #include <windows.h>
 #include "resource.h"
+#include "../version/version.h"
 
+1 VERSIONINFO
+FILEVERSION FILE_VERSION
+PRODUCTVERSION PRODUCT_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+FILEFLAGS VS_FF_DEBUG
+#else
+FILEFLAGS 0x0L
+#endif
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE VFT2_UNKNOWN 
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0" // US English (0x0409), Unicode (0x04B0) charset
+        BEGIN
+            VALUE "CompanyName", COMPANY_NAME
+            VALUE "FileDescription", FILE_DESCRIPTION
+            VALUE "FileVersion", FILE_VERSION_STRING
+            VALUE "InternalName", INTERNAL_NAME
+            VALUE "LegalCopyright", COPYRIGHT_NOTE
+            VALUE "OriginalFilename", ORIGINAL_FILENAME
+            VALUE "ProductName", PRODUCT_NAME
+            VALUE "ProductVersion", PRODUCT_VERSION_STRING
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200 // US English (0x0409), Unicode (1200) charset
+    END
+END

src/common/interop/Constants.cpp

@@ -51,21 +51,17 @@ namespace winrt::PowerToys::Interop::implementation
     {
         return CommonSharedConstants::SHOW_COLOR_PICKER_SHARED_EVENT;
     }
-    hstring Constants::AdvancedPasteShowUIMessage()
+    hstring Constants::ShowAdvancedPasteSharedEvent()
     {
-        return CommonSharedConstants::ADVANCED_PASTE_SHOW_UI_MESSAGE;
+        return CommonSharedConstants::SHOW_ADVANCED_PASTE_SHARED_EVENT;
     }
-    hstring Constants::AdvancedPasteMarkdownMessage()
+    hstring Constants::AdvancedPasteMarkdownEvent()
     {
-        return CommonSharedConstants::ADVANCED_PASTE_MARKDOWN_MESSAGE;
+        return CommonSharedConstants::ADVANCED_PASTE_MARKDOWN_EVENT;
     }
-    hstring Constants::AdvancedPasteJsonMessage()
+    hstring Constants::AdvancedPasteJsonEvent()
     {
-        return CommonSharedConstants::ADVANCED_PASTE_JSON_MESSAGE;
+        return CommonSharedConstants::ADVANCED_PASTE_JSON_EVENT;
-    }
-    hstring Constants::AdvancedPasteCustomActionMessage()
-    {
-        return CommonSharedConstants::ADVANCED_PASTE_CUSTOM_ACTION_MESSAGE;
     }
     hstring Constants::ShowPowerOCRSharedEvent()
     {
@@ -151,8 +147,4 @@ namespace winrt::PowerToys::Interop::implementation
     {
         return CommonSharedConstants::WORKSPACES_LAUNCH_EDITOR_EVENT;
     }
-    hstring Constants::WorkspacesHotkeyEvent()
-    {
-        return CommonSharedConstants::WORKSPACES_HOTKEY_EVENT;
-    }
 }

src/common/interop/Constants.h

@@ -16,10 +16,9 @@ namespace winrt::PowerToys::Interop::implementation
         static hstring FZEToggleEvent();
         static hstring ColorPickerSendSettingsTelemetryEvent();
         static hstring ShowColorPickerSharedEvent();
-        static hstring AdvancedPasteShowUIMessage();
+        static hstring ShowAdvancedPasteSharedEvent();
-        static hstring AdvancedPasteMarkdownMessage();
+        static hstring AdvancedPasteMarkdownEvent();
-        static hstring AdvancedPasteJsonMessage();
+        static hstring AdvancedPasteJsonEvent();
-        static hstring AdvancedPasteCustomActionMessage();
         static hstring ShowPowerOCRSharedEvent();
         static hstring MouseJumpShowPreviewEvent();
         static hstring AwakeExitEvent();
@@ -41,7 +40,6 @@ namespace winrt::PowerToys::Interop::implementation
         static hstring ShowEnvironmentVariablesSharedEvent();
         static hstring ShowEnvironmentVariablesAdminSharedEvent();
         static hstring WorkspacesLaunchEditorEvent();
-        static hstring WorkspacesHotkeyEvent();
     };
 }
 

src/common/interop/Constants.idl

@@ -13,10 +13,9 @@ namespace PowerToys
             static String FZEToggleEvent();
             static String ColorPickerSendSettingsTelemetryEvent();
             static String ShowColorPickerSharedEvent();
-            static String AdvancedPasteShowUIMessage();
+            static String ShowAdvancedPasteSharedEvent();
-            static String AdvancedPasteMarkdownMessage();
+            static String AdvancedPasteMarkdownEvent();
-            static String AdvancedPasteJsonMessage();
+            static String AdvancedPasteJsonEvent();
-            static String AdvancedPasteCustomActionMessage();
             static String ShowPowerOCRSharedEvent();
             static String MouseJumpShowPreviewEvent();
             static String AwakeExitEvent();
@@ -38,7 +37,6 @@ namespace PowerToys
             static String ShowEnvironmentVariablesSharedEvent();
             static String ShowEnvironmentVariablesAdminSharedEvent();
             static String WorkspacesLaunchEditorEvent();
-            static String WorkspacesHotkeyEvent();
         }
     }
 }

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

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

src/common/interop/shared_constants.h

@@ -25,14 +25,12 @@ namespace CommonSharedConstants
 
     const wchar_t COLOR_PICKER_SEND_SETTINGS_TELEMETRY_EVENT[] = L"Local\\ColorPickerSettingsTelemetryEvent-6c7071d8-4014-46ec-b687-913bd8a422f1";
 
-    // IPC Messages used in Advanced Paste
+    // Path to the event used to show Advanced Paste UI
-    const wchar_t ADVANCED_PASTE_SHOW_UI_MESSAGE[] = L"ShowUI";
+    const wchar_t SHOW_ADVANCED_PASTE_SHARED_EVENT[] = L"Local\\ShowAdvancedPasteEvent-9a46be2a-3e05-4186-b56b-4ae986ef2526";
 
-    const wchar_t ADVANCED_PASTE_MARKDOWN_MESSAGE[] = L"PasteMarkdown";
+    const wchar_t ADVANCED_PASTE_MARKDOWN_EVENT[] = L"Local\\AdvancedPasteJsonEvent-a18c0798-3ee6-4fc5-bb9f-114c57ac0d47";
 
-    const wchar_t ADVANCED_PASTE_JSON_MESSAGE[] = L"PasteJson";
+    const wchar_t ADVANCED_PASTE_JSON_EVENT[] = L"Local\\AdvancedPasteJsonEvent-9ed021ab-b711-4cf3-9f33-135a698a9d21";
-
-    const wchar_t ADVANCED_PASTE_CUSTOM_ACTION_MESSAGE[] = L"CustomAction";
 
     // Path to the event used to show Color Picker
     const wchar_t SHOW_COLOR_PICKER_SHARED_EVENT[] = L"Local\\ShowColorPickerEvent-8c46be2a-3e05-4186-b56b-4ae986ef2525";
@@ -43,9 +41,7 @@ namespace CommonSharedConstants
 
     const wchar_t FANCY_ZONES_EDITOR_TOGGLE_EVENT[] = L"Local\\FancyZones-ToggleEditorEvent-1e174338-06a3-472b-874d-073b21c62f14";
 
-    // Path to the event used by Workspaces
     const wchar_t WORKSPACES_LAUNCH_EDITOR_EVENT[] = L"Local\\Workspaces-LaunchEditorEvent-a55ff427-cf62-4994-a2cd-9f72139296bf";
-    const wchar_t WORKSPACES_HOTKEY_EVENT[] = L"Local\\PowerToys-Workspaces-HotkeyEvent-2625C3C8-BAC9-4DB3-BCD6-3B4391A26FD0";
 
     const wchar_t SHOW_HOSTS_EVENT[] = L"Local\\Hosts-ShowHostsEvent-5a0c0aae-5ff5-40f5-95c2-20e37ed671f0";
 
@@ -102,6 +98,8 @@ namespace CommonSharedConstants
     const wchar_t SHOW_ENVIRONMENT_VARIABLES_EVENT[] = L"Local\\PowerToysEnvironmentVariables-ShowEnvironmentVariablesEvent-1021f616-e951-4d64-b231-a8f972159978";
     const wchar_t SHOW_ENVIRONMENT_VARIABLES_ADMIN_EVENT[] = L"Local\\PowerToysEnvironmentVariables-EnvironmentVariablesAdminEvent-8c95d2ad-047c-49a2-9e8b-b4656326cfb2";
 
+    const wchar_t WORKSPACES_EXIT_EVENT[] = L"Local\\PowerToys-Workspaces-ExitEvent-29a1566f-f4f8-4d56-9435-d2a437f727c6";
+
     // Max DWORD for key code to disable keys.
     const DWORD VK_DISABLED = 0x100;
 }

src/common/notifications/BackgroundActivatorDLL/BackgroundActivator.rc

@@ -1,3 +1,36 @@
 #include <windows.h>
 #include "resource.h"
+#include "../../version/version.h"
 
+1 VERSIONINFO
+FILEVERSION FILE_VERSION
+PRODUCTVERSION PRODUCT_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+FILEFLAGS VS_FF_DEBUG
+#else
+FILEFLAGS 0x0L
+#endif
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE VFT2_UNKNOWN 
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0" // US English (0x0409), Unicode (0x04B0) charset
+        BEGIN
+            VALUE "CompanyName", COMPANY_NAME
+            VALUE "FileDescription", FILE_DESCRIPTION
+            VALUE "FileVersion", FILE_VERSION_STRING
+            VALUE "InternalName", INTERNAL_NAME
+            VALUE "LegalCopyright", COPYRIGHT_NOTE
+            VALUE "OriginalFilename", ORIGINAL_FILENAME
+            VALUE "ProductName", PRODUCT_NAME
+            VALUE "ProductVersion", PRODUCT_VERSION_STRING
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200 // US English (0x0409), Unicode (1200) charset
+    END
+END

src/common/version/version.h

@@ -1,7 +1,21 @@
 #pragma once
 
+#define STRINGIZE2(s) #s
+#define STRINGIZE(s) STRINGIZE2(s)
+
 #include "Generated Files\version_gen.h"
 
+#define FILE_VERSION VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION, 0
+#define FILE_VERSION_STRING  \
+    STRINGIZE(VERSION_MAJOR) \
+    "." STRINGIZE(VERSION_MINOR) "." STRINGIZE(VERSION_REVISION) ".0"
+#define PRODUCT_VERSION FILE_VERSION
+#define PRODUCT_VERSION_STRING FILE_VERSION_STRING
+
+#define COMPANY_NAME "Microsoft Corporation"
+#define COPYRIGHT_NOTE "Copyright (C) Microsoft Corporation. All rights reserved."
+#define PRODUCT_NAME "PowerToys"
+
 #include <string>
 
 enum class version_architecture

src/common/version/version.vcxproj

@@ -1,21 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <PtEmbeddedMajor>$(VersionProductMajor)</PtEmbeddedMajor>
-    <PtEmbeddedMinor>$(VersionProductMinor)</PtEmbeddedMinor>
-    <PtEmbeddedRevision>$(VersionProductBuildRevision)</PtEmbeddedRevision>
-    <PtEmbeddedMajor Condition="'$(PtEmbeddedMajor)'==''">0</PtEmbeddedMajor>
-    <PtEmbeddedMinor Condition="'$(PtEmbeddedMinor)'==''">0</PtEmbeddedMinor>
-    <PtEmbeddedRevision Condition="'$(PtEmbeddedRevision)'==''">0</PtEmbeddedRevision>
-  </PropertyGroup>
   
   <Target Name="GenerateVersionData" BeforeTargets="PrepareForBuild">
     <ItemGroup>
       <HeaderLines Include="#pragma once" />
-      <HeaderLines Include="#define VERSION_MAJOR $(PtEmbeddedMajor)" />
+      <HeaderLines Include="#define VERSION_MAJOR $(Version.Split('.')[0])" />
-      <HeaderLines Include="#define VERSION_MINOR $(PtEmbeddedMinor)" />
+      <HeaderLines Include="#define VERSION_MINOR $(Version.Split('.')[1])" />
-      <HeaderLines Include="#define VERSION_REVISION $(PtEmbeddedRevision)" />
+      <HeaderLines Include="#define VERSION_REVISION $(Version.Split('.')[2])" />
     </ItemGroup>
     <WriteLinesToFile File="Generated Files\version_gen.h" Lines="@(HeaderLines)" Overwrite="true" Encoding="Unicode" WriteOnlyWhenDifferent="true" />
   </Target>
@@ -80,4 +71,4 @@
     <ClCompile Include="helper.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
+</Project>

src/dsc/Microsoft.PowerToys.Configure/examples/installAndConfiguration.dsc.yaml

@@ -24,17 +24,4 @@ properties:
           FancyzonesEditorHotkey: "Shift+Ctrl+Alt+F"
         FileLocksmith:
           Enabled: false
-        ImageResizer:
-          ImageResizerSizes:
-            - Name: Square2x
-              Width: 200
-              Height: 200
-              Unit: "Percent"
-              Fit: "Stretch"
-            - Name: MyInchSize
-              Width: 1024
-              Height: 1024
-              Unit: "Inch"
-              Fit: "Fit"
-
   configurationVersion: 0.2.0

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

@@ -6,7 +6,6 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-
 using static PowerToys.Settings.DSC.Schema.Introspection;
 
 namespace PowerToys.Settings.DSC.Schema;
@@ -22,7 +21,7 @@ internal sealed class DSCGeneration
         public string Type;
     }
 
-    private static readonly Dictionary<string, AdditionalPropertiesInfo> AdditionalPropertiesInfoPerModule = new Dictionary<string, AdditionalPropertiesInfo> { { "PowerLauncher", new AdditionalPropertiesInfo { Name = "Plugins", Type = "Hashtable[]" } }, { "ImageResizer", new AdditionalPropertiesInfo { Name = "ImageresizerSizes", Type = "Hashtable[]" } } };
+    private static readonly Dictionary<string, AdditionalPropertiesInfo> AdditionalPropertiesInfoPerModule = new Dictionary<string, AdditionalPropertiesInfo> { { "PowerLauncher", new AdditionalPropertiesInfo { Name = "Plugins", Type = "Hashtable[]" } } };
 
     private static string EmitEnumDefinition(Type type)
     {

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

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

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

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

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

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

src/gpo/assets/en-US/PowerToys.adml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation.
      Licensed under the MIT License. -->
-<policyDefinitionResources xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" revision="1.12" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions">
+<policyDefinitionResources xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" revision="1.11" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions">
   <displayName>PowerToys</displayName>
   <description>PowerToys</description>
   <resources>
@@ -10,6 +10,7 @@
       <string id="InstallerUpdates">Installer and Updates</string>
       <string id="PowerToysRun">PowerToys Run</string>
       <string id="AdvancedPaste">Advanced Paste</string>
+      <string id="Workspaces">Workspaces</string>
       <string id="MouseWithoutBorders">Mouse Without Borders</string>
       <string id="GeneralSettings">General settings</string>
 
@@ -111,6 +112,12 @@ If you don't configure this setting, users are able to enable or disable the plu
 You can override this policy for individual plugins using the policy "Configure enabled state for individual plugins".
 
 Note: Changes require a restart of PowerToys Run.
+</string>
+      <string id="ConfigureEnabledUtilityWorkspaces">This policy configures the enabled disable state for the Workspaces utility.
+
+If you enable or don't configure this policy, the user takes control over the enabled state of the Workspaces utility.
+
+If you disable this policy, the user won't be able to enable Enable and use the Workspaces utility.
 </string>
       <string id="PowerToysRunIndividualPluginEnabledStateDescription">With this policy you can configure an individual enabled state for each PowerToys Run plugin that you add to the list.
 

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

@@ -3,11 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Globalization;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
 using AdvancedPaste.Helpers;
 using AdvancedPaste.Settings;
 using AdvancedPaste.ViewModels;
@@ -18,11 +13,8 @@ using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
 using Windows.Graphics;
 using WinUIEx;
-
 using static AdvancedPaste.Helpers.NativeMethods;
 
-using DispatcherQueue = Microsoft.UI.Dispatching.DispatcherQueue;
-
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
 namespace AdvancedPaste
@@ -34,13 +26,12 @@ namespace AdvancedPaste
     {
         public IHost Host { get; private set; }
 
-        private readonly DispatcherQueue _dispatcherQueue = DispatcherQueue.GetForCurrentThread();
-        private readonly OptionsViewModel viewModel;
-
         private MainWindow window;
 
         private nint windowHwnd;
 
+        private OptionsViewModel viewModel;
+
         private bool disposedValue;
 
         /// <summary>
@@ -83,7 +74,7 @@ namespace AdvancedPaste
         /// Invoked when the application is launched.
         /// </summary>
         /// <param name="args">Details about the launch request and process.</param>
-        protected override void OnLaunched(LaunchActivatedEventArgs args)
+        protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs args)
         {
             var cmdArgs = Environment.GetCommandLineArgs();
             if (cmdArgs?.Length > 1)
@@ -97,44 +88,9 @@ namespace AdvancedPaste
                 }
             }
 
-            if (cmdArgs?.Length > 2)
+            NativeEventWaiter.WaitForEventLoop(PowerToys.Interop.Constants.ShowAdvancedPasteSharedEvent(), OnAdvancedPasteHotkey);
-            {
+            NativeEventWaiter.WaitForEventLoop(PowerToys.Interop.Constants.AdvancedPasteMarkdownEvent(), OnAdvancedPasteMarkdownHotkey);
-                ProcessNamedPipe(cmdArgs[2]);
+            NativeEventWaiter.WaitForEventLoop(PowerToys.Interop.Constants.AdvancedPasteJsonEvent(), OnAdvancedPasteJsonHotkey);
-            }
-        }
-
-        private void ProcessNamedPipe(string pipeName)
-        {
-            void OnMessage(string message) => _dispatcherQueue.TryEnqueue(() => OnNamedPipeMessage(message));
-
-            Task.Run(async () =>
-            {
-                var connectTimeout = TimeSpan.FromSeconds(10);
-                await NamedPipeProcessor.ProcessNamedPipeAsync(pipeName, connectTimeout, OnMessage, CancellationToken.None);
-            });
-        }
-
-        private void OnNamedPipeMessage(string message)
-        {
-            var messageParts = message.Split();
-            var messageType = messageParts.First();
-
-            if (messageType == PowerToys.Interop.Constants.AdvancedPasteShowUIMessage())
-            {
-                OnAdvancedPasteHotkey();
-            }
-            else if (messageType == PowerToys.Interop.Constants.AdvancedPasteMarkdownMessage())
-            {
-                OnAdvancedPasteMarkdownHotkey();
-            }
-            else if (messageType == PowerToys.Interop.Constants.AdvancedPasteJsonMessage())
-            {
-                OnAdvancedPasteJsonHotkey();
-            }
-            else if (messageType == PowerToys.Interop.Constants.AdvancedPasteCustomActionMessage())
-            {
-                OnAdvancedPasteCustomActionHotkey(messageParts);
-            }
         }
 
         private void App_UnhandledException(object sender, Microsoft.UI.Xaml.UnhandledExceptionEventArgs e)
@@ -144,43 +100,17 @@ namespace AdvancedPaste
 
         private void OnAdvancedPasteJsonHotkey()
         {
-            viewModel.ReadClipboard();
+            viewModel.GetClipboardData();
             viewModel.ToJsonFunction(true);
         }
 
         private void OnAdvancedPasteMarkdownHotkey()
         {
-            viewModel.ReadClipboard();
+            viewModel.GetClipboardData();
             viewModel.ToMarkdownFunction(true);
         }
 
         private void OnAdvancedPasteHotkey()
-        {
-            ShowWindow();
-        }
-
-        private void OnAdvancedPasteCustomActionHotkey(string[] messageParts)
-        {
-            if (messageParts.Length != 2)
-            {
-                Logger.LogWarning("Unexpected custom action message");
-            }
-            else
-            {
-                if (!int.TryParse(messageParts[1], CultureInfo.InvariantCulture, out int customActionId))
-                {
-                    Logger.LogWarning($"Unexpected custom action message id {messageParts[1]}");
-                }
-                else
-                {
-                    ShowWindow();
-                    viewModel.ReadClipboard();
-                    viewModel.ExecuteCustomActionWithPaste(customActionId);
-                }
-            }
-        }
-
-        private void ShowWindow()
         {
             viewModel.OnShow();
 

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

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

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

@@ -9,7 +9,7 @@ namespace AdvancedPaste.Controls
 {
     [TemplatePart(Name = LoadingGrid, Type = typeof(Grid))]
     [TemplatePart(Name = LoadingBrush, Type = typeof(AnimatedBorderBrush))]
-    public partial class AnimatedContentControl : ContentControl
+    public class AnimatedContentControl : ContentControl
     {
         internal const string LoadingGrid = "PART_LoadingGrid";
         internal const string LoadingBrush = "PART_LoadingBrush";

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

@@ -3,11 +3,10 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:animations="using:CommunityToolkit.WinUI.Animations"
-    xmlns:converters="using:AdvancedPaste.Converters"
+    xmlns:converters="using:CommunityToolkit.WinUI.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="using:AdvancedPaste.Controls"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:tkconverters="using:CommunityToolkit.WinUI.Converters"
     xmlns:ui="using:CommunityToolkit.WinUI"
     mc:Ignorable="d">
     <UserControl.Resources>
@@ -324,12 +323,7 @@
                     </Setter.Value>
                 </Setter>
             </Style>
-            <tkconverters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
+            <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
-            <tkconverters:BoolToVisibilityConverter
-                x:Key="BoolToInvertedVisibilityConverter"
-                FalseValue="Visible"
-                TrueValue="Collapsed" />
-            <converters:CountToVisibilityConverter x:Key="CountToVisibilityConverter" />
         </ResourceDictionary>
     </UserControl.Resources>
     <Grid x:Name="PromptBoxGrid" Loaded="Grid_Loaded">
@@ -346,12 +340,13 @@
                     x:Name="InputTxtBox"
                     HorizontalAlignment="Stretch"
                     x:FieldModifier="public"
-                    IsEnabled="{x:Bind ViewModel.IsClipboardDataText, Mode=OneWay}"
+                    IsEnabled="{x:Bind ViewModel.IsCustomAIEnabled, Mode=OneWay}"
                     KeyDown="InputTxtBox_KeyDown"
                     PlaceholderText="{x:Bind ViewModel.InputTxtBoxPlaceholderText, Mode=OneWay}"
                     Style="{StaticResource CustomTextBoxStyle}"
                     TabIndex="0"
-                    Text="{x:Bind ViewModel.Query, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+                    Text="{x:Bind Prompt, Mode=TwoWay}"
+                    TextChanging="InputTxtBox_TextChanging">
                     <ToolTipService.ToolTip>
                         <TextBlock x:Uid="InputTxtBoxTooltip" />
                     </ToolTipService.ToolTip>
@@ -536,63 +531,48 @@
                             <animations:OffsetAnimation Duration="0:0:1" />
                         </animations:Implicit.Animations>
                     </Button>-->
-                <Grid
+                <Button
+                    x:Name="SendBtn"
+                    x:Uid="SendButtonAutomation"
                     Width="32"
                     Height="32"
                     Margin="0,0,4,0"
+                    Padding="0"
                     HorizontalAlignment="Right"
-                    VerticalAlignment="Stretch">
+                    VerticalAlignment="Stretch"
-                    <Button
+                    ui:VisualExtensions.NormalizedCenterPoint="0.5,0.5"
-                        x:Name="SendBtn"
+                    Command="{x:Bind GenerateCustomCommand}"
-                        x:Uid="SendButtonAutomation"
+                    Content="{ui:FontIcon Glyph=&#xE724;,
-                        Padding="0"
+                                          FontSize=16}"
-                        HorizontalAlignment="Stretch"
+                    Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}"
-                        VerticalAlignment="Stretch"
+                    Style="{StaticResource SubtleButtonStyle}"
-                        ui:VisualExtensions.NormalizedCenterPoint="0.5,0.5"
+                    TabIndex="1"
-                        Command="{x:Bind GenerateCustomCommand}"
+                    Visibility="Collapsed">
-                        Content="{ui:FontIcon Glyph=&#xE724;,
+                    <ToolTipService.ToolTip>
-                                              FontSize=16}"
+                        <TextBlock x:Uid="SendBtnToolTip" TextWrapping="WrapWholeWords" />
-                        Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}"
+                    </ToolTipService.ToolTip>
-                        IsEnabled="{x:Bind ViewModel.IsCustomAIEnabled, Mode=OneWay}"
+                    <animations:Implicit.ShowAnimations>
-                        Style="{StaticResource SubtleButtonStyle}"
+                        <animations:ScaleAnimation
-                        TabIndex="1"
+                            From="0.4"
-                        Visibility="{x:Bind ViewModel.Query.Length, Mode=OneWay, Converter={StaticResource CountToVisibilityConverter}}">
+                            To="1"
-                        <ToolTipService.ToolTip>
+                            Duration="0:0:0.167" />
-                            <TextBlock x:Uid="SendBtnToolTip" TextWrapping="WrapWholeWords" />
+                        <animations:OpacityAnimation
-                        </ToolTipService.ToolTip>
+                            From="0.0"
-                        <animations:Implicit.ShowAnimations>
+                            To="1.0"
-                            <animations:ScaleAnimation
+                            Duration="0:0:0.167" />
-                                From="0.4"
+                    </animations:Implicit.ShowAnimations>
-                                To="1"
+                    <animations:Implicit.HideAnimations>
-                                Duration="0:0:0.167" />
+                        <animations:ScaleAnimation
-                            <animations:OpacityAnimation
+                            From="1"
-                                From="0.0"
+                            To="0.4"
-                                To="1.0"
+                            Duration="0:0:0.167" />
-                                Duration="0:0:0.167" />
+                        <animations:OpacityAnimation
-                        </animations:Implicit.ShowAnimations>
+                            From="1.0"
-                        <animations:Implicit.HideAnimations>
+                            To="0.0"
-                            <animations:ScaleAnimation
+                            Duration="0:0:0.167" />
-                                From="1"
+                    </animations:Implicit.HideAnimations>
-                                To="0.4"
+                </Button>
-                                Duration="0:0:0.167" />
+                <!--</StackPanel>-->
-                            <animations:OpacityAnimation
-                                From="1.0"
-                                To="0.0"
-                                Duration="0:0:0.167" />
-                        </animations:Implicit.HideAnimations>
-                    </Button>
-                    <!--  Transparent overlay to show tooltip  -->
-                    <Grid
-                        x:Name="SendBtnOverlay"
-                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="Stretch"
-                        Background="Transparent"
-                        Visibility="{x:Bind ViewModel.IsCustomAIEnabled, Mode=OneWay, Converter={StaticResource BoolToInvertedVisibilityConverter}}">
-                        <ToolTipService.ToolTip>
-                            <ToolTip Content="{x:Bind ViewModel.GeneralErrorText}" />
-                        </ToolTipService.ToolTip>
-                    </Grid>
-                </Grid>
             </Grid>
         </local:AnimatedContentControl>
         <ContentPresenter
@@ -638,7 +618,7 @@
                 FontWeight="SemiBold"
                 Foreground="{ThemeResource SystemFillColorCriticalBrush}"
                 Style="{StaticResource CaptionTextBlockStyle}"
-                Text="{x:Bind ViewModel.ApiErrorText, Mode=OneWay}" />
+                Text="{x:Bind ViewModel.InputTxtBoxErrorText, Mode=OneWay}" />
             <HyperlinkButton
                 x:Uid="SettingsBtn"
                 Grid.Column="1"
@@ -655,6 +635,7 @@
                 <animations:OpacityAnimation To="0.0" Duration="0:0:0.167" />
             </animations:Implicit.HideAnimations>
         </Grid>
+
         <VisualStateManager.VisualStateGroups>
             <VisualStateGroup x:Name="CommonStates">
                 <VisualState x:Name="DefaultState" />

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

@@ -2,10 +2,8 @@
 // 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.Net;
 using System.Threading.Tasks;
-
 using AdvancedPaste.Helpers;
 using AdvancedPaste.Settings;
 using AdvancedPaste.ViewModels;
@@ -20,14 +18,23 @@ namespace AdvancedPaste.Controls
 {
     public sealed partial class PromptBox : Microsoft.UI.Xaml.Controls.UserControl
     {
-        // Minimum time to show spinner when generating custom format using forcePasteCustom
-        private static readonly TimeSpan MinTaskTime = TimeSpan.FromSeconds(2);
-
         private readonly DispatcherQueue _dispatcherQueue = DispatcherQueue.GetForCurrentThread();
         private readonly IUserSettings _userSettings;
 
+        public static readonly DependencyProperty PromptProperty = DependencyProperty.Register(
+            nameof(Prompt),
+            typeof(string),
+            typeof(PromptBox),
+            new PropertyMetadata(defaultValue: string.Empty));
+
         public OptionsViewModel ViewModel { get; private set; }
 
+        public string Prompt
+        {
+            get => (string)GetValue(PromptProperty);
+            set => SetValue(PromptProperty, value);
+        }
+
         public static readonly DependencyProperty PlaceholderTextProperty = DependencyProperty.Register(
             nameof(PlaceholderText),
             typeof(string),
@@ -59,7 +66,6 @@ namespace AdvancedPaste.Controls
             _userSettings = App.GetService<IUserSettings>();
 
             ViewModel = App.GetService<OptionsViewModel>();
-            ViewModel.CustomActionActivated += (_, e) => GenerateCustom(e.ForcePasteCustom);
         }
 
         private void Grid_Loaded(object sender, RoutedEventArgs e)
@@ -68,30 +74,27 @@ namespace AdvancedPaste.Controls
         }
 
         [RelayCommand]
-        private void GenerateCustom() => GenerateCustom(false);
+        private void GenerateCustom()
-
-        private void GenerateCustom(bool forcePasteCustom)
         {
             Logger.LogTrace();
 
             VisualStateManager.GoToState(this, "LoadingState", true);
-            string inputInstructions = ViewModel.Query;
+            string inputInstructions = InputTxtBox.Text;
             ViewModel.SaveQuery(inputInstructions);
 
             var customFormatTask = ViewModel.GenerateCustomFunction(inputInstructions);
-            var delayTask = forcePasteCustom ? Task.Delay(MinTaskTime) : Task.CompletedTask;
+
-            Task.WhenAll(customFormatTask, delayTask)
+            customFormatTask.ContinueWith(
-                .ContinueWith(
+                t =>
-                _ =>
                 {
                     _dispatcherQueue.TryEnqueue(() =>
                     {
-                        ViewModel.CustomFormatResult = customFormatTask.Result;
+                        ViewModel.CustomFormatResult = t.Result;
 
                         if (ViewModel.ApiRequestStatus == (int)HttpStatusCode.OK)
                         {
                             VisualStateManager.GoToState(this, "DefaultState", true);
-                            if (_userSettings.ShowCustomPreview && !forcePasteCustom)
+                            if (_userSettings.ShowCustomPreview)
                             {
                                 PreviewGrid.Width = InputTxtBox.ActualWidth;
                                 PreviewFlyout.ShowAt(InputTxtBox);
@@ -127,9 +130,14 @@ namespace AdvancedPaste.Controls
             ClipboardHelper.SetClipboardTextContent(lastQuery.ClipboardData);
         }
 
+        private void InputTxtBox_TextChanging(Microsoft.UI.Xaml.Controls.TextBox sender, TextBoxTextChangingEventArgs args)
+        {
+            SendBtn.Visibility = InputTxtBox.Text.Length > 0 ? Visibility.Visible : Visibility.Collapsed;
+        }
+
         private void InputTxtBox_KeyDown(object sender, Microsoft.UI.Xaml.Input.KeyRoutedEventArgs e)
         {
-            if (e.Key == Windows.System.VirtualKey.Enter && InputTxtBox.Text.Length > 0 && ViewModel.IsCustomAIEnabled)
+            if (e.Key == Windows.System.VirtualKey.Enter && InputTxtBox.Text.Length > 0)
             {
                 GenerateCustom();
             }

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

@@ -1,26 +0,0 @@
-// 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;
-
-using Microsoft.UI.Xaml.Data;
-
-namespace AdvancedPaste.Converters;
-
-public sealed partial class CountToDoubleConverter : IValueConverter
-{
-    public double ValueIfZero { get; set; }
-
-    public double ValueIfNonZero { get; set; }
-
-    public object Convert(object value, Type targetType, object parameter, string language)
-    {
-        bool hasCount = ((value is int intValue) && intValue > 0) || (value is IEnumerable collection && collection.GetEnumerator().MoveNext());
-
-        return hasCount ? ValueIfNonZero : ValueIfZero;
-    }
-
-    public object ConvertBack(object value, Type targetType, object parameter, string language) => throw new NotImplementedException();
-}

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

@@ -1,34 +0,0 @@
-// 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;
-
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Data;
-
-namespace AdvancedPaste.Converters;
-
-public sealed partial class CountToVisibilityConverter : IValueConverter
-{
-    public object Convert(object value, Type targetType, object parameter, string language)
-    {
-        bool hasCount = ((value is int intValue) && intValue > 0) || (value is IEnumerable collection && collection.GetEnumerator().MoveNext());
-
-        if (targetType == typeof(Visibility))
-        {
-            return hasCount ? Visibility.Visible : Visibility.Collapsed;
-        }
-        else if (targetType == typeof(bool))
-        {
-            return hasCount;
-        }
-        else
-        {
-            throw new ArgumentOutOfRangeException(nameof(targetType));
-        }
-    }
-
-    public object ConvertBack(object value, Type targetType, object parameter, string language) => throw new NotImplementedException();
-}

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

@@ -0,0 +1,32 @@
+// 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 Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Media;
+
+namespace AdvancedPaste.Converters
+{
+    public sealed class ListViewIndexConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            var presenter = value as ListViewItemPresenter;
+            var item = VisualTreeHelper.GetParent(presenter) as ListViewItem;
+
+            var listView = ItemsControl.ItemsControlFromItemContainer(item);
+            int index = listView.IndexFromContainer(item) + 1;
+#pragma warning disable CA1305 // Specify IFormatProvider
+            return index.ToString();
+#pragma warning restore CA1305 // Specify IFormatProvider
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

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

@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-
 using AdvancedPaste.Helpers;
 using AdvancedPaste.Settings;
 using ManagedCommon;
@@ -27,18 +26,6 @@ namespace AdvancedPaste
 
             _userSettings = App.GetService<IUserSettings>();
 
-            var baseHeight = MinHeight;
-
-            void UpdateHeight()
-            {
-                var trimmedCustomActionCount = Math.Min(_userSettings.CustomActions.Count, 5);
-                Height = MinHeight = baseHeight + (trimmedCustomActionCount * 40);
-            }
-
-            UpdateHeight();
-
-            _userSettings.CustomActions.CollectionChanged += (_, _) => UpdateHeight();
-
             AppWindow.SetIcon("Assets/AdvancedPaste/AdvancedPaste.ico");
             this.ExtendsContentIntoTitleBar = true;
             this.SetTitleBar(titleBar);

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

@@ -5,21 +5,14 @@
     xmlns:controls="using:AdvancedPaste.Controls"
     xmlns:converters="using:AdvancedPaste.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:library="using:Microsoft.PowerToys.Settings.UI.Library"
     xmlns:local="using:AdvancedPaste.Models"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:tkconverters="using:CommunityToolkit.WinUI.Converters"
     xmlns:ui="using:CommunityToolkit.WinUI"
     KeyDown="Page_KeyDown"
     KeyboardAcceleratorPlacementMode="Hidden"
     mc:Ignorable="d">
     <Page.Resources>
-        <tkconverters:BoolToVisibilityConverter x:Name="BoolToVisibilityConverter" />
+        <converters:ListViewIndexConverter x:Name="listViewIndexConverter" />
-        <converters:CountToVisibilityConverter x:Name="countToVisibilityConverter" />
-        <converters:CountToDoubleConverter
-            x:Name="customActionsCountToMinHeightConverter"
-            ValueIfNonZero="40"
-            ValueIfZero="0" />
         <Style
             x:Key="PaddingLessFlyoutPresenterStyle"
             BasedOn="{StaticResource DefaultFlyoutPresenterStyle}"
@@ -28,38 +21,6 @@
                 <Setter Property="Padding" Value="0" />
             </Style.Setters>
         </Style>
-        <DataTemplate x:Key="PasteFormatTemplate" x:DataType="local:PasteFormat">
-            <Grid>
-                <ToolTipService.ToolTip>
-                    <TextBlock Text="{x:Bind ToolTip}" />
-                </ToolTipService.ToolTip>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="26" />
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-                <FontIcon
-                    Margin="0,0,0,0"
-                    VerticalAlignment="Center"
-                    AutomationProperties.AccessibilityView="Raw"
-                    FontSize="16"
-                    Glyph="{x:Bind IconGlyph}" />
-                <TextBlock
-                    Grid.Column="1"
-                    VerticalAlignment="Center"
-                    x:Phase="1"
-                    Text="{x:Bind Name}" />
-                <TextBlock
-                    Grid.Column="2"
-                    Margin="0,0,8,0"
-                    HorizontalAlignment="Right"
-                    VerticalAlignment="Center"
-                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                    Style="{StaticResource CaptionTextBlockStyle}"
-                    Text="{x:Bind ShortcutText, Mode=OneWay}"
-                    Visibility="{x:Bind ShortcutText.Length, Mode=OneWay, Converter={StaticResource countToVisibilityConverter}}" />
-            </Grid>
-        </DataTemplate>
     </Page.Resources>
     <Page.KeyboardAccelerators>
         <KeyboardAccelerator Key="Escape" Invoked="KeyboardAccelerator_Invoked" />
@@ -75,30 +36,6 @@
             Key="Number3"
             Invoked="KeyboardAccelerator_Invoked"
             Modifiers="Control" />
-        <KeyboardAccelerator
-            Key="Number4"
-            Invoked="KeyboardAccelerator_Invoked"
-            Modifiers="Control" />
-        <KeyboardAccelerator
-            Key="Number5"
-            Invoked="KeyboardAccelerator_Invoked"
-            Modifiers="Control" />
-        <KeyboardAccelerator
-            Key="Number6"
-            Invoked="KeyboardAccelerator_Invoked"
-            Modifiers="Control" />
-        <KeyboardAccelerator
-            Key="Number7"
-            Invoked="KeyboardAccelerator_Invoked"
-            Modifiers="Control" />
-        <KeyboardAccelerator
-            Key="Number8"
-            Invoked="KeyboardAccelerator_Invoked"
-            Modifiers="Control" />
-        <KeyboardAccelerator
-            Key="Number9"
-            Invoked="KeyboardAccelerator_Invoked"
-            Modifiers="Control" />
     </Page.KeyboardAccelerators>
     <Grid>
         <Grid.RowDefinitions>
@@ -166,55 +103,73 @@
             BorderThickness="0,1,0,0"
             RowSpacing="4">
             <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="*" MinHeight="{x:Bind ViewModel.CustomActionPasteFormats.Count, Mode=OneWay, Converter={StaticResource customActionsCountToMinHeightConverter}}" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
+
             <ListView
                 x:Name="PasteOptionsListView"
-                Grid.Row="0"
                 VerticalAlignment="Bottom"
-                IsEnabled="{x:Bind ViewModel.IsClipboardDataText, Mode=OneWay}"
                 IsItemClickEnabled="True"
-                ItemClick="ListView_Click"
+                ItemClick="PasteOptionsListView_ItemClick"
                 ItemContainerTransitions="{x:Null}"
-                ItemTemplate="{StaticResource PasteFormatTemplate}"
+                ItemsSource="{x:Bind pasteFormats, Mode=OneWay}"
-                ItemsSource="{x:Bind ViewModel.StandardPasteFormats, Mode=OneWay}"
                 SelectionMode="None"
-                TabIndex="1" />
+                TabIndex="1">
+                <ListView.ItemTemplate>
+                    <DataTemplate x:DataType="local:PasteFormat">
+                        <Grid>
+                            <ToolTipService.ToolTip>
+                                <TextBlock>
+                                    <Run Text="{x:Bind Name}" />
+                                    <Run Text="(" /><Run Text="Ctrl" /><Run Text="+" /><Run Text="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={StaticResource listViewIndexConverter}}" /><Run Text=")" />
+                                </TextBlock>
+                            </ToolTipService.ToolTip>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="26" />
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <Viewbox
+                                x:Name="IconHolderBox"
+                                MaxWidth="16"
+                                MaxHeight="16"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center">
+                                <ContentPresenter
+                                    x:Name="IconHolder"
+                                    x:Phase="2"
+                                    Content="{x:Bind Icon}" />
+                            </Viewbox>
+                            <TextBlock
+                                Grid.Column="1"
+                                VerticalAlignment="Center"
+                                x:Phase="1"
+                                Text="{x:Bind Name}" />
+
+                            <TextBlock
+                                Grid.Column="2"
+                                Margin="0,0,8,0"
+                                HorizontalAlignment="Right"
+                                VerticalAlignment="Center"
+                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                Style="{StaticResource CaptionTextBlockStyle}">
+                                <Run Text="Ctrl" /><Run Text="+" /><Run Text="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={StaticResource listViewIndexConverter}}" />
+                            </TextBlock>
+                        </Grid>
+                    </DataTemplate>
+                </ListView.ItemTemplate>
+            </ListView>
 
             <Rectangle
                 Grid.Row="1"
                 Height="1"
                 HorizontalAlignment="Stretch"
-                Fill="{ThemeResource DividerStrokeColorDefaultBrush}"
-                Visibility="{x:Bind ViewModel.CustomActionPasteFormats.Count, Mode=OneWay, Converter={StaticResource countToVisibilityConverter}}" />
-
-            <ListView
-                x:Name="CustomActionsListView"
-                Grid.Row="2"
-                VerticalAlignment="Top"
-                IsEnabled="{x:Bind ViewModel.IsCustomAIEnabled, Mode=OneWay}"
-                IsItemClickEnabled="True"
-                ItemClick="ListView_Click"
-                ItemContainerTransitions="{x:Null}"
-                ItemTemplate="{StaticResource PasteFormatTemplate}"
-                ItemsSource="{x:Bind ViewModel.CustomActionPasteFormats, Mode=OneWay}"
-                ScrollViewer.VerticalScrollBarVisibility="Visible"
-                ScrollViewer.VerticalScrollMode="Auto"
-                SelectionMode="None"
-                TabIndex="2" />
-
-            <Rectangle
-                Grid.Row="3"
-                Height="1"
-                HorizontalAlignment="Stretch"
                 Fill="{ThemeResource DividerStrokeColorDefaultBrush}" />
             <!--  x:Uid="ClipboardHistoryButton"  -->
             <Button
-                Grid.Row="4"
+                Grid.Row="2"
                 Height="32"
                 Margin="4,0,4,4"
                 Padding="{StaticResource ButtonPadding}"

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

@@ -6,8 +6,8 @@ using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
-
 using AdvancedPaste.Helpers;
 using AdvancedPaste.Models;
 using AdvancedPaste.ViewModels;
@@ -25,8 +25,8 @@ namespace AdvancedPaste.Pages
     public sealed partial class MainPage : Page
     {
         private readonly ObservableCollection<ClipboardItem> clipboardHistory;
+        private readonly ObservableCollection<PasteFormat> pasteFormats;
         private readonly Microsoft.UI.Dispatching.DispatcherQueue _dispatcherQueue = Microsoft.UI.Dispatching.DispatcherQueue.GetForCurrentThread();
-        private (VirtualKey Key, DateTime Timestamp) _lastKeyEvent = (VirtualKey.None, DateTime.MinValue);
 
         public OptionsViewModel ViewModel { get; private set; }
 
@@ -34,6 +34,13 @@ namespace AdvancedPaste.Pages
         {
             this.InitializeComponent();
 
+            pasteFormats =
+            [
+                new PasteFormat { Icon = new FontIcon() { Glyph = "\uE8E9" }, Name = ResourceLoaderInstance.ResourceLoader.GetString("PasteAsPlainText"), Format = PasteFormats.PlainText },
+                new PasteFormat { Icon = new FontIcon() { Glyph = "\ue8a5" }, Name = ResourceLoaderInstance.ResourceLoader.GetString("PasteAsMarkdown"), Format = PasteFormats.Markdown },
+                new PasteFormat { Icon = new FontIcon() { Glyph = "\uE943" }, Name = ResourceLoaderInstance.ResourceLoader.GetString("PasteAsJson"), Format = PasteFormats.Json },
+            ];
+
             ViewModel = App.GetService<OptionsViewModel>();
 
             clipboardHistory = new ObservableCollection<ClipboardItem>();
@@ -114,8 +121,6 @@ namespace AdvancedPaste.Pages
             }
         }
 
-        private static MainWindow GetMainWindow() => (App.Current as App)?.GetMainWindow();
-
         private void ClipboardHistoryItemDeleteButton_Click(object sender, RoutedEventArgs e)
         {
             Logger.LogTrace();
@@ -130,49 +135,83 @@ namespace AdvancedPaste.Pages
             }
         }
 
-        private void ListView_Click(object sender, ItemClickEventArgs e)
+        private void PasteAsPlain()
+        {
+            ViewModel.ToPlainTextFunction();
+        }
+
+        private void PasteAsMarkdown()
+        {
+            ViewModel.ToMarkdownFunction();
+        }
+
+        private void PasteAsJson()
+        {
+            ViewModel.ToJsonFunction();
+        }
+
+        private void PasteOptionsListView_ItemClick(object sender, ItemClickEventArgs e)
         {
             if (e.ClickedItem is PasteFormat format)
             {
-                ViewModel.ExecutePasteFormat(format);
+                switch (format.Format)
+                {
+                    case PasteFormats.PlainText:
+                        {
+                            PasteAsPlain();
+                            PowerToysTelemetry.Log.WriteEvent(new Telemetry.AdvancedPasteFormatClickedEvent(PasteFormats.PlainText));
+                            break;
+                        }
+
+                    case PasteFormats.Markdown:
+                        {
+                            PasteAsMarkdown();
+                            PowerToysTelemetry.Log.WriteEvent(new Telemetry.AdvancedPasteFormatClickedEvent(PasteFormats.Markdown));
+                            break;
+                        }
+
+                    case PasteFormats.Json:
+                        {
+                            PasteAsJson();
+                            PowerToysTelemetry.Log.WriteEvent(new Telemetry.AdvancedPasteFormatClickedEvent(PasteFormats.Json));
+                            break;
+                        }
+                }
             }
         }
 
         private void KeyboardAccelerator_Invoked(Microsoft.UI.Xaml.Input.KeyboardAccelerator sender, Microsoft.UI.Xaml.Input.KeyboardAcceleratorInvokedEventArgs args)
         {
-            if (GetMainWindow()?.Visible is false)
-            {
-                return;
-            }
-
             Logger.LogTrace();
 
-            var thisKeyEvent = (sender.Key, Timestamp: DateTime.Now);
-            if (thisKeyEvent.Key == _lastKeyEvent.Key && (thisKeyEvent.Timestamp - _lastKeyEvent.Timestamp) < TimeSpan.FromMilliseconds(200))
-            {
-                // Sometimes, multiple keyboard accelerator events are raised for a single Ctrl + VirtualKey press.
-                return;
-            }
-
-            _lastKeyEvent = thisKeyEvent;
-
             switch (sender.Key)
             {
                 case VirtualKey.Escape:
-                    GetMainWindow()?.Close();
+                    {
-                    break;
+                        (App.Current as App).GetMainWindow().Close();
+                        break;
+                    }
 
                 case VirtualKey.Number1:
+                    {
+                        PasteAsPlain();
+                        PowerToysTelemetry.Log.WriteEvent(new Telemetry.AdvancedPasteInAppKeyboardShortcutEvent(PasteFormats.PlainText));
+                        break;
+                    }
+
                 case VirtualKey.Number2:
+                    {
+                        PasteAsMarkdown();
+                        PowerToysTelemetry.Log.WriteEvent(new Telemetry.AdvancedPasteInAppKeyboardShortcutEvent(PasteFormats.Markdown));
+                        break;
+                    }
+
                 case VirtualKey.Number3:
-                case VirtualKey.Number4:
+                    {
-                case VirtualKey.Number5:
+                        PasteAsJson();
-                case VirtualKey.Number6:
+                        PowerToysTelemetry.Log.WriteEvent(new Telemetry.AdvancedPasteInAppKeyboardShortcutEvent(PasteFormats.Json));
-                case VirtualKey.Number7:
+                        break;
-                case VirtualKey.Number8:
+                    }
-                case VirtualKey.Number9:
-                    ViewModel.ExecutePasteFormat(sender.Key);
-                    break;
 
                 default:
                     break;
@@ -183,7 +222,7 @@ namespace AdvancedPaste.Pages
         {
             if (e.Key == VirtualKey.Escape)
             {
-                GetMainWindow()?.Close();
+                (App.Current as App).GetMainWindow().Close();
             }
         }
 

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

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

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

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

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

@@ -2,10 +2,6 @@
 // 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.Collections.ObjectModel;
-
-using Microsoft.PowerToys.Settings.UI.Library;
-
 namespace AdvancedPaste.Settings
 {
     public interface IUserSettings
@@ -15,7 +11,5 @@ namespace AdvancedPaste.Settings
         public bool SendPasteKeyCombination { get; }
 
         public bool CloseAfterLosingFocus { get; }
-
-        public ObservableCollection<AdvancedPasteCustomAction> CustomActions { get; }
     }
 }

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

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

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

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

src/modules/AdvancedPaste/AdvancedPaste/Helpers/NamedPipeProcessor.cs

@@ -1,37 +0,0 @@
-// 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.IO;
-using System.IO.Pipes;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace AdvancedPaste.Helpers;
-
-public static class NamedPipeProcessor
-{
-    public static async Task ProcessNamedPipeAsync(string pipeName, TimeSpan connectTimeout, Action<string> messageHandler, CancellationToken cancellationToken)
-    {
-        using NamedPipeClientStream pipeClient = new(".", pipeName, PipeDirection.In);
-
-        await pipeClient.ConnectAsync(connectTimeout, cancellationToken);
-
-        using StreamReader streamReader = new(pipeClient, Encoding.Unicode);
-
-        while (true)
-        {
-            var message = await streamReader.ReadLineAsync(cancellationToken);
-
-            if (message != null)
-            {
-                messageHandler(message);
-            }
-
-            var intraMessageDelay = TimeSpan.FromMilliseconds(10);
-            await Task.Delay(intraMessageDelay, cancellationToken);
-        }
-    }
-}

src/modules/AdvancedPaste/AdvancedPaste/Helpers/NativeEventWaiter.cs

@@ -0,0 +1,29 @@
+// 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.Threading;
+using Microsoft.UI.Dispatching;
+
+namespace AdvancedPaste.Helpers
+{
+    public static class NativeEventWaiter
+    {
+        public static void WaitForEventLoop(string eventName, Action callback)
+        {
+            var dispatcherQueue = DispatcherQueue.GetForCurrentThread();
+            new Thread(() =>
+            {
+                var eventHandle = new EventWaitHandle(false, EventResetMode.AutoReset, eventName);
+                while (true)
+                {
+                    if (eventHandle.WaitOne())
+                    {
+                        dispatcherQueue.TryEnqueue(() => callback());
+                    }
+                }
+            }).Start();
+        }
+    }
+}

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

@@ -3,38 +3,29 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Collections.ObjectModel;
 using System.IO.Abstractions;
 using System.Threading;
-using System.Threading.Tasks;
-
 using ManagedCommon;
 using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.PowerToys.Settings.UI.Library.Utilities;
 
 namespace AdvancedPaste.Settings
 {
-    internal sealed class UserSettings : IUserSettings, IDisposable
+    internal sealed class UserSettings : IUserSettings
     {
         private readonly SettingsUtils _settingsUtils;
-        private readonly TaskScheduler _taskScheduler;
         private readonly IFileSystemWatcher _watcher;
-        private readonly object _loadingSettingsLock = new();
+        private readonly object _loadingSettingsLock = new object();
 
         private const string AdvancedPasteModuleName = "AdvancedPaste";
         private const int MaxNumberOfRetry = 5;
 
-        private bool _disposedValue;
-        private CancellationTokenSource _cancellationTokenSource;
-
         public bool ShowCustomPreview { get; private set; }
 
         public bool SendPasteKeyCombination { get; private set; }
 
         public bool CloseAfterLosingFocus { get; private set; }
 
-        public ObservableCollection<AdvancedPasteCustomAction> CustomActions { get; private set; }
-
         public UserSettings()
         {
             _settingsUtils = new SettingsUtils();
@@ -42,25 +33,10 @@ namespace AdvancedPaste.Settings
             ShowCustomPreview = true;
             SendPasteKeyCombination = true;
             CloseAfterLosingFocus = false;
-            CustomActions = [];
-
-            _taskScheduler = TaskScheduler.FromCurrentSynchronizationContext();
 
             LoadSettingsFromJson();
 
-            _watcher = Helper.GetFileWatcher(AdvancedPasteModuleName, "settings.json", OnSettingsFileChanged);
+            _watcher = Helper.GetFileWatcher(AdvancedPasteModuleName, "settings.json", () => LoadSettingsFromJson());
-        }
-
-        private void OnSettingsFileChanged()
-        {
-            lock (_loadingSettingsLock)
-            {
-                _cancellationTokenSource?.Cancel();
-                _cancellationTokenSource = new CancellationTokenSource();
-
-                Task.Delay(TimeSpan.FromMilliseconds(500))
-                    .ContinueWith(_ => LoadSettingsFromJson(), _cancellationTokenSource.Token, TaskContinuationOptions.NotOnCanceled, TaskScheduler.Default);
-            }
         }
 
         private void LoadSettingsFromJson()
@@ -86,25 +62,9 @@ namespace AdvancedPaste.Settings
                         var settings = _settingsUtils.GetSettingsOrDefault<AdvancedPasteSettings>(AdvancedPasteModuleName);
                         if (settings != null)
                         {
-                            void UpdateSettings()
+                            ShowCustomPreview = settings.Properties.ShowCustomPreview;
-                            {
+                            SendPasteKeyCombination = settings.Properties.SendPasteKeyCombination;
-                                ShowCustomPreview = settings.Properties.ShowCustomPreview;
+                            CloseAfterLosingFocus = settings.Properties.CloseAfterLosingFocus;
-                                SendPasteKeyCombination = settings.Properties.SendPasteKeyCombination;
-                                CloseAfterLosingFocus = settings.Properties.CloseAfterLosingFocus;
-
-                                CustomActions.Clear();
-                                foreach (var customAction in settings.Properties.CustomActions.Value)
-                                {
-                                    if (customAction.IsShown && customAction.IsValid)
-                                    {
-                                        CustomActions.Add(customAction);
-                                    }
-                                }
-                            }
-
-                            Task.Factory
-                                .StartNew(UpdateSettings, CancellationToken.None, TaskCreationOptions.None, _taskScheduler)
-                                .Wait();
                         }
 
                         retry = false;
@@ -122,30 +82,5 @@ namespace AdvancedPaste.Settings
                 }
             }
         }
-
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        private void Dispose(bool disposing)
-        {
-            if (!_disposedValue)
-            {
-                if (disposing)
-                {
-                    _cancellationTokenSource.Dispose();
-                    _watcher.Dispose();
-                }
-
-                _disposedValue = true;
-            }
-        }
-
-        ~UserSettings()
-        {
-            Dispose(false);
-        }
     }
 }

src/modules/AdvancedPaste/AdvancedPaste/Models/CustomActionActivatedEventArgs.cs

@@ -1,14 +0,0 @@
-// 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;
-
-namespace AdvancedPaste.Models;
-
-public sealed class CustomActionActivatedEventArgs(string text, bool forcePasteCustom) : EventArgs
-{
-    public string Text { get; private set; } = text;
-
-    public bool ForcePasteCustom { get; private set; } = forcePasteCustom;
-}

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

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

src/modules/AdvancedPaste/AdvancedPaste/Models/PasteFormat.cs

@@ -2,38 +2,16 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using CommunityToolkit.Mvvm.ComponentModel;
+using Microsoft.UI.Xaml.Controls;
-using Microsoft.PowerToys.Settings.UI.Library;
 
-namespace AdvancedPaste.Models;
+namespace AdvancedPaste.Models
-
-public partial class PasteFormat : ObservableObject
 {
-    [ObservableProperty]
+    public class PasteFormat
-    private string _shortcutText = string.Empty;
-
-    [ObservableProperty]
-    private string _toolTip = string.Empty;
-
-    public PasteFormat()
     {
+        public IconElement Icon { get; set; }
+
+        public string Name { get; set; }
+
+        public PasteFormats Format { get; set; }
     }
-
-    public PasteFormat(AdvancedPasteCustomAction customAction, string shortcutText)
-    {
-        IconGlyph = "\uE945";
-        Name = customAction.Name;
-        Prompt = customAction.Prompt;
-        Format = PasteFormats.Custom;
-        ShortcutText = shortcutText;
-        ToolTip = customAction.Prompt;
-    }
-
-    public string IconGlyph { get; init; }
-
-    public string Name { get; init; }
-
-    public PasteFormats Format { get; init; }
-
-    public string Prompt { get; init; } = string.Empty;
 }

src/modules/AdvancedPaste/AdvancedPaste/Program.cs

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

src/modules/AdvancedPaste/AdvancedPaste/Strings/en-us/Resources.resw

@@ -59,7 +59,10 @@
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+  <xsd:schema id="root"
+    xmlns=""
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
@@ -225,7 +228,4 @@
   <data name="OpenAIGpoDisabled" xml:space="preserve">
     <value>To custom with AI is disabled by your organization</value>
   </data>
-  <data name="CtrlKey" xml:space="preserve">
+</root>
-    <value>Ctrl</value>
-  </data>
-</root>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -5,10 +5,8 @@
 using System;
 using System.Collections.ObjectModel;
 using System.Globalization;
-using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
-
 using AdvancedPaste.Helpers;
 using AdvancedPaste.Models;
 using AdvancedPaste.Settings;
@@ -17,73 +15,48 @@ using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using ManagedCommon;
 using Microsoft.PowerToys.Settings.UI.Library;
-using Microsoft.PowerToys.Telemetry;
+using Microsoft.UI.Dispatching;
-using Microsoft.UI.Xaml;
 using Microsoft.Win32;
 using Windows.ApplicationModel.DataTransfer;
-using Windows.System;
 using WinUIEx;
 
-using DispatcherQueue = Microsoft.UI.Dispatching.DispatcherQueue;
-
 namespace AdvancedPaste.ViewModels
 {
-    public partial class OptionsViewModel : ObservableObject, IDisposable
+    public partial class OptionsViewModel : ObservableObject
     {
         private readonly DispatcherQueue _dispatcherQueue = DispatcherQueue.GetForCurrentThread();
-        private readonly DispatcherTimer _clipboardTimer;
         private readonly IUserSettings _userSettings;
-        private readonly AICompletionsHelper aiHelper;
+
-        private readonly App app = App.Current as App;
+        private App app = App.Current as App;
-        private readonly PasteFormat[] _allStandardPasteFormats;
+
+        private AICompletionsHelper aiHelper;
 
         public DataPackageView ClipboardData { get; set; }
 
         [ObservableProperty]
         [NotifyPropertyChangedFor(nameof(InputTxtBoxPlaceholderText))]
-        [NotifyPropertyChangedFor(nameof(GeneralErrorText))]
         [NotifyPropertyChangedFor(nameof(IsCustomAIEnabled))]
         private bool _isClipboardDataText;
 
+        [ObservableProperty]
+        [NotifyPropertyChangedFor(nameof(InputTxtBoxPlaceholderText))]
+        private bool _isCustomAIEnabled;
+
         [ObservableProperty]
         private bool _clipboardHistoryEnabled;
 
         [ObservableProperty]
-        [NotifyPropertyChangedFor(nameof(InputTxtBoxPlaceholderText))]
+        [NotifyPropertyChangedFor(nameof(InputTxtBoxErrorText))]
-        [NotifyPropertyChangedFor(nameof(GeneralErrorText))]
-        [NotifyPropertyChangedFor(nameof(IsCustomAIEnabled))]
-        private bool _isAllowedByGPO;
-
-        [ObservableProperty]
-        [NotifyPropertyChangedFor(nameof(ApiErrorText))]
         private int _apiRequestStatus;
 
-        [ObservableProperty]
-        private string _query = string.Empty;
-
-        private bool _pasteFormatsDirty;
-
-        public ObservableCollection<PasteFormat> StandardPasteFormats { get; } = [];
-
-        public ObservableCollection<PasteFormat> CustomActionPasteFormats { get; } = [];
-
-        public bool IsCustomAIEnabled => IsAllowedByGPO && IsClipboardDataText && aiHelper.IsAIEnabled;
-
-        public event EventHandler<CustomActionActivatedEventArgs> CustomActionActivated;
-
         public OptionsViewModel(IUserSettings userSettings)
         {
             aiHelper = new AICompletionsHelper();
             _userSettings = userSettings;
 
-            ApiRequestStatus = (int)HttpStatusCode.OK;
+            IsCustomAIEnabled = IsClipboardDataText && aiHelper.IsAIEnabled;
 
-            _allStandardPasteFormats =
+            ApiRequestStatus = (int)HttpStatusCode.OK;
-            [
-                new PasteFormat { IconGlyph = "\uE8E9", Name = ResourceLoaderInstance.ResourceLoader.GetString("PasteAsPlainText"), Format = PasteFormats.PlainText },
-                new PasteFormat { IconGlyph = "\ue8a5", Name = ResourceLoaderInstance.ResourceLoader.GetString("PasteAsMarkdown"), Format = PasteFormats.Markdown },
-                new PasteFormat { IconGlyph = "\uE943", Name = ResourceLoaderInstance.ResourceLoader.GetString("PasteAsJson"), Format = PasteFormats.Json },
-            ];
 
             GeneratedResponses = new ObservableCollection<string>();
             GeneratedResponses.CollectionChanged += (s, e) =>
@@ -93,87 +66,10 @@ namespace AdvancedPaste.ViewModels
             };
 
             ClipboardHistoryEnabled = IsClipboardHistoryEnabled();
-            ReadClipboard();
+            GetClipboardData();
-            _clipboardTimer = new() { Interval = TimeSpan.FromSeconds(1) };
-            _clipboardTimer.Tick += ClipboardTimer_Tick;
-            _clipboardTimer.Start();
-
-            RefreshPasteFormats();
-            _userSettings.CustomActions.CollectionChanged += (_, _) => EnqueueRefreshPasteFormats();
-            PropertyChanged += (_, e) =>
-            {
-                if (e.PropertyName == nameof(Query))
-                {
-                    EnqueueRefreshPasteFormats();
-                }
-            };
         }
 
-        private void ClipboardTimer_Tick(object sender, object e)
+        public void GetClipboardData()
-        {
-            if (app.GetMainWindow()?.Visible is true)
-            {
-                ReadClipboard();
-                UpdateAllowedByGPO();
-            }
-        }
-
-        private void EnqueueRefreshPasteFormats()
-        {
-            if (_pasteFormatsDirty)
-            {
-                return;
-            }
-
-            _pasteFormatsDirty = true;
-            _dispatcherQueue.TryEnqueue(() =>
-            {
-                RefreshPasteFormats();
-                _pasteFormatsDirty = false;
-            });
-        }
-
-        private void RefreshPasteFormats()
-        {
-            bool Filter(string text) => text.Contains(Query, StringComparison.CurrentCultureIgnoreCase);
-
-            var ctrlString = ResourceLoaderInstance.ResourceLoader.GetString("CtrlKey");
-            int shortcutNum = 0;
-
-            string GetNextShortcutText()
-            {
-                shortcutNum++;
-                return shortcutNum <= 9 ? $"{ctrlString}+{shortcutNum}" : string.Empty;
-            }
-
-            StandardPasteFormats.Clear();
-            foreach (var format in _allStandardPasteFormats)
-            {
-                if (Filter(format.Name))
-                {
-                    format.ShortcutText = GetNextShortcutText();
-                    format.ToolTip = $"{format.Name} ({format.ShortcutText})";
-                    StandardPasteFormats.Add(format);
-                }
-            }
-
-            CustomActionPasteFormats.Clear();
-            foreach (var customAction in _userSettings.CustomActions)
-            {
-                if (Filter(customAction.Name) || Filter(customAction.Prompt))
-                {
-                    CustomActionPasteFormats.Add(new PasteFormat(customAction, GetNextShortcutText()));
-                }
-            }
-        }
-
-        public void Dispose()
-        {
-            _clipboardTimer.Stop();
-            GC.SuppressFinalize(this);
-        }
-
-        public void ReadClipboard()
         {
             ClipboardData = Clipboard.GetContent();
             IsClipboardDataText = ClipboardData.Contains(StandardDataFormats.Text);
@@ -181,10 +77,14 @@ namespace AdvancedPaste.ViewModels
 
         public void OnShow()
         {
-            ReadClipboard();
+            GetClipboardData();
-            UpdateAllowedByGPO();
 
-            if (IsAllowedByGPO)
+            if (PowerToys.GPOWrapper.GPOWrapper.GetAllowedAdvancedPasteOnlineAIModelsValue() == PowerToys.GPOWrapper.GpoRuleConfigured.Disabled)
+            {
+                IsCustomAIEnabled = false;
+                OnPropertyChanged(nameof(InputTxtBoxPlaceholderText));
+            }
+            else
             {
                 var openAIKey = AICompletionsHelper.LoadOpenAIKey();
                 var currentKey = aiHelper.GetKey();
@@ -204,12 +104,15 @@ namespace AdvancedPaste.ViewModels
                             {
                                 app.GetMainWindow().FinishLoading(aiHelper.IsAIEnabled);
                                 OnPropertyChanged(nameof(InputTxtBoxPlaceholderText));
-                                OnPropertyChanged(nameof(GeneralErrorText));
+                                IsCustomAIEnabled = IsClipboardDataText && aiHelper.IsAIEnabled;
-                                OnPropertyChanged(nameof(IsCustomAIEnabled));
                             });
                         },
                         TaskScheduler.Default);
                 }
+                else
+                {
+                    IsCustomAIEnabled = IsClipboardDataText && aiHelper.IsAIEnabled;
+                }
             }
 
             ClipboardHistoryEnabled = IsClipboardHistoryEnabled();
@@ -249,44 +152,47 @@ namespace AdvancedPaste.ViewModels
             {
                 app.GetMainWindow().ClearInputText();
 
-                return IsClipboardDataText ? ResourceLoaderInstance.ResourceLoader.GetString("CustomFormatTextBox/PlaceholderText") : GeneralErrorText;
+                if (PowerToys.GPOWrapper.GPOWrapper.GetAllowedAdvancedPasteOnlineAIModelsValue() == PowerToys.GPOWrapper.GpoRuleConfigured.Disabled)
-            }
-        }
-
-        public string GeneralErrorText
-        {
-            get
-            {
-                if (!IsClipboardDataText)
-                {
-                    return ResourceLoaderInstance.ResourceLoader.GetString("ClipboardDataTypeMismatchWarning");
-                }
-
-                if (!IsAllowedByGPO)
                 {
                     return ResourceLoaderInstance.ResourceLoader.GetString("OpenAIGpoDisabled");
                 }
-
+                else if (!aiHelper.IsAIEnabled)
-                if (!aiHelper.IsAIEnabled)
                 {
                     return ResourceLoaderInstance.ResourceLoader.GetString("OpenAINotConfigured");
                 }
+                else if (!IsClipboardDataText)
+                {
+                    return ResourceLoaderInstance.ResourceLoader.GetString("ClipboardDataTypeMismatchWarning");
+                }
                 else
                 {
-                    return string.Empty;
+                    return ResourceLoaderInstance.ResourceLoader.GetString("CustomFormatTextBox/PlaceholderText");
                 }
             }
         }
 
-        public string ApiErrorText
+        public string InputTxtBoxErrorText
         {
-            get => (HttpStatusCode)ApiRequestStatus switch
+            get
             {
-                HttpStatusCode.TooManyRequests => ResourceLoaderInstance.ResourceLoader.GetString("OpenAIApiKeyTooManyRequests"),
+                if (ApiRequestStatus != (int)HttpStatusCode.OK)
-                HttpStatusCode.Unauthorized => ResourceLoaderInstance.ResourceLoader.GetString("OpenAIApiKeyUnauthorized"),
+                {
-                HttpStatusCode.OK => string.Empty,
+                    if (ApiRequestStatus == (int)HttpStatusCode.TooManyRequests)
-                _ => ResourceLoaderInstance.ResourceLoader.GetString("OpenAIApiKeyError") + ApiRequestStatus.ToString(CultureInfo.InvariantCulture),
+                    {
-            };
+                        return ResourceLoaderInstance.ResourceLoader.GetString("OpenAIApiKeyTooManyRequests");
+                    }
+                    else if (ApiRequestStatus == (int)HttpStatusCode.Unauthorized)
+                    {
+                        return ResourceLoaderInstance.ResourceLoader.GetString("OpenAIApiKeyUnauthorized");
+                    }
+                    else
+                    {
+                        return ResourceLoaderInstance.ResourceLoader.GetString("OpenAIApiKeyError") + ApiRequestStatus.ToString(CultureInfo.InvariantCulture);
+                    }
+                }
+
+                return string.Empty;
+            }
         }
 
         [ObservableProperty]
@@ -295,12 +201,7 @@ namespace AdvancedPaste.ViewModels
         [RelayCommand]
         public void PasteCustom()
         {
-            var text = GeneratedResponses.ElementAtOrDefault(CurrentResponseIndex);
+            PasteCustomFunction(GeneratedResponses[CurrentResponseIndex]);
-
-            if (text != null)
-            {
-                PasteCustomFunction(text);
-            }
         }
 
         // Command to select the previous custom format
@@ -405,59 +306,6 @@ namespace AdvancedPaste.ViewModels
             }
         }
 
-        internal void ExecutePasteFormat(VirtualKey key)
-        {
-            var index = key - VirtualKey.Number1;
-            var pasteFormat = StandardPasteFormats.ElementAtOrDefault(index) ?? CustomActionPasteFormats.ElementAtOrDefault(index - StandardPasteFormats.Count);
-
-            if (pasteFormat != null)
-            {
-                ExecutePasteFormat(pasteFormat);
-                PowerToysTelemetry.Log.WriteEvent(new Telemetry.AdvancedPasteInAppKeyboardShortcutEvent(pasteFormat.Format));
-            }
-        }
-
-        internal void ExecutePasteFormat(PasteFormat pasteFormat)
-        {
-            if (!IsClipboardDataText || (pasteFormat.Format == PasteFormats.Custom && !IsCustomAIEnabled))
-            {
-                return;
-            }
-
-            switch (pasteFormat.Format)
-            {
-                case PasteFormats.PlainText:
-                    ToPlainTextFunction();
-                    break;
-
-                case PasteFormats.Markdown:
-                    ToMarkdownFunction();
-                    break;
-
-                case PasteFormats.Json:
-                    ToJsonFunction();
-                    break;
-
-                case PasteFormats.Custom:
-                    Query = pasteFormat.Prompt;
-                    CustomActionActivated?.Invoke(this, new CustomActionActivatedEventArgs(pasteFormat.Prompt, false));
-                    break;
-            }
-        }
-
-        internal void ExecuteCustomActionWithPaste(int customActionId)
-        {
-            Logger.LogTrace();
-
-            var customAction = _userSettings.CustomActions.FirstOrDefault(customAction => customAction.Id == customActionId);
-
-            if (customAction != null)
-            {
-                Query = customAction.Prompt;
-                CustomActionActivated?.Invoke(this, new CustomActionActivatedEventArgs(customAction.Prompt, true));
-            }
-        }
-
         internal async Task<string> GenerateCustomFunction(string inputInstructions)
         {
             Logger.LogTrace();
@@ -467,7 +315,7 @@ namespace AdvancedPaste.ViewModels
                 return string.Empty;
             }
 
-            if (!IsClipboardDataText)
+            if (ClipboardData == null || !ClipboardData.Contains(StandardDataFormats.Text))
             {
                 Logger.LogWarning("Clipboard does not contain text data");
                 return string.Empty;
@@ -568,10 +416,5 @@ namespace AdvancedPaste.ViewModels
                 return false;
             }
         }
-
-        private void UpdateAllowedByGPO()
-        {
-            IsAllowedByGPO = PowerToys.GPOWrapper.GPOWrapper.GetAllowedAdvancedPasteOnlineAIModelsValue() != PowerToys.GPOWrapper.GpoRuleConfigured.Disabled;
-        }
     }
 }

src/modules/AdvancedPaste/AdvancedPasteModuleInterface/AdvancedPaste.base.rc

@@ -1,7 +1,40 @@
 #include <windows.h>
 #include "resource.h"
+#include "../../../../common/version/version.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 #include "winres.h"
 #undef APSTUDIO_READONLY_SYMBOLS
 
+1 VERSIONINFO
+FILEVERSION FILE_VERSION
+PRODUCTVERSION PRODUCT_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+FILEFLAGS VS_FF_DEBUG
+#else
+FILEFLAGS 0x0L
+#endif
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE VFT2_UNKNOWN 
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0" // US English (0x0409), Unicode (0x04B0) charset
+        BEGIN
+            VALUE "CompanyName", COMPANY_NAME
+            VALUE "FileDescription", FILE_DESCRIPTION
+            VALUE "FileVersion", FILE_VERSION_STRING
+            VALUE "InternalName", INTERNAL_NAME
+            VALUE "LegalCopyright", COPYRIGHT_NOTE
+            VALUE "OriginalFilename", ORIGINAL_FILENAME
+            VALUE "ProductName", PRODUCT_NAME
+            VALUE "ProductVersion", PRODUCT_VERSION_STRING
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200 // US English (0x0409), Unicode (1200) charset
+    END
+END

src/modules/AdvancedPaste/AdvancedPasteModuleInterface/dllmain.cpp

@@ -14,10 +14,6 @@
 #include <common/utils/logger_helper.h>
 #include <common/utils/winapi_error.h>
 
-#include <atlfile.h>
-#include <atlstr.h>
-#include <vector>
-
 BOOL APIENTRY DllMain(HMODULE /*hModule*/, DWORD ul_reason_for_call, LPVOID /*lpReserved*/)
 {
     switch (ul_reason_for_call)
@@ -39,10 +35,6 @@ BOOL APIENTRY DllMain(HMODULE /*hModule*/, DWORD ul_reason_for_call, LPVOID /*lp
 namespace
 {
     const wchar_t JSON_KEY_PROPERTIES[] = L"properties";
-    const wchar_t JSON_KEY_CUSTOM_ACTIONS[] = L"custom-actions";
-    const wchar_t JSON_KEY_SHORTCUT[] = L"shortcut";
-    const wchar_t JSON_KEY_IS_SHOWN[] = L"isShown";
-    const wchar_t JSON_KEY_ID[] = L"id";
     const wchar_t JSON_KEY_WIN[] = L"win";
     const wchar_t JSON_KEY_ALT[] = L"alt";
     const wchar_t JSON_KEY_CTRL[] = L"ctrl";
@@ -68,30 +60,33 @@ private:
 
     HANDLE m_hProcess;
 
-    std::thread create_pipe_thread;
-    std::unique_ptr<CAtlFile> m_write_pipe;
-
     // Time to wait for process to close after sending WM_CLOSE signal
-    static const constexpr int MAX_WAIT_MILLISEC = 10000;
+    static const int MAX_WAIT_MILLISEC = 10000;
-
-    static const constexpr int NUM_DEFAULT_HOTKEYS = 4;
 
     Hotkey m_paste_as_plain_hotkey = { .win = true, .ctrl = true, .shift = false, .alt = true, .key = 'V' };
     Hotkey m_advanced_paste_ui_hotkey = { .win = true, .ctrl = false, .shift = true, .alt = false, .key = 'V' };
     Hotkey m_paste_as_markdown_hotkey{};
     Hotkey m_paste_as_json_hotkey{};
 
-    std::vector<Hotkey> m_custom_action_hotkeys;
-    std::vector<int> m_custom_action_ids;
-
     bool m_preview_custom_format_output = true;
 
-    Hotkey parse_single_hotkey(const wchar_t* keyName, const winrt::Windows::Data::Json::JsonObject& settingsObject)
+    // Handle to event used to invoke AdvancedPaste
+    HANDLE m_hShowUIEvent;
+    HANDLE m_hPasteMarkdownEvent;
+    HANDLE m_hPasteJsonEvent;
+
+    Hotkey parse_single_hotkey(const wchar_t* hotkey, const winrt::Windows::Data::Json::JsonObject& settingsObject)
     {
         try
         {
-            const auto jsonHotkeyObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(keyName);
+            Hotkey _temp_paste_as_plain;
-            return parse_single_hotkey(jsonHotkeyObject);
+            auto jsonHotkeyObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(hotkey);
+            _temp_paste_as_plain.win = jsonHotkeyObject.GetNamedBoolean(JSON_KEY_WIN);
+            _temp_paste_as_plain.alt = jsonHotkeyObject.GetNamedBoolean(JSON_KEY_ALT);
+            _temp_paste_as_plain.shift = jsonHotkeyObject.GetNamedBoolean(JSON_KEY_SHIFT);
+            _temp_paste_as_plain.ctrl = jsonHotkeyObject.GetNamedBoolean(JSON_KEY_CTRL);
+            _temp_paste_as_plain.key = static_cast<unsigned char>(jsonHotkeyObject.GetNamedNumber(JSON_KEY_CODE));
+            return _temp_paste_as_plain;
         }
         catch (...)
         {
@@ -101,38 +96,6 @@ private:
         return {};
     }
 
-    static Hotkey parse_single_hotkey(const winrt::Windows::Data::Json::JsonObject& jsonHotkeyObject)
-    {
-        try
-        {
-            Hotkey hotkey;
-            hotkey.win = jsonHotkeyObject.GetNamedBoolean(JSON_KEY_WIN);
-            hotkey.alt = jsonHotkeyObject.GetNamedBoolean(JSON_KEY_ALT);
-            hotkey.shift = jsonHotkeyObject.GetNamedBoolean(JSON_KEY_SHIFT);
-            hotkey.ctrl = jsonHotkeyObject.GetNamedBoolean(JSON_KEY_CTRL);
-            hotkey.key = static_cast<unsigned char>(jsonHotkeyObject.GetNamedNumber(JSON_KEY_CODE));
-            return hotkey;
-        }
-        catch (...)
-        {
-            Logger::error("Failed to initialize AdvancedPaste shortcut from settings. Value will keep unchanged.");
-        }
-
-        return {};
-    }
-
-    static json::JsonObject to_json_object(const Hotkey& hotkey)
-    {
-        json::JsonObject jsonObject;
-        jsonObject.SetNamedValue(JSON_KEY_WIN, json::value(hotkey.win));
-        jsonObject.SetNamedValue(JSON_KEY_ALT, json::value(hotkey.alt));
-        jsonObject.SetNamedValue(JSON_KEY_SHIFT, json::value(hotkey.shift));
-        jsonObject.SetNamedValue(JSON_KEY_CTRL, json::value(hotkey.ctrl));
-        jsonObject.SetNamedValue(JSON_KEY_CODE, json::value(hotkey.key));
-
-        return jsonObject;
-    }
-
     bool migrate_data_and_remove_data_file(Hotkey& old_paste_as_plain_hotkey)
     {
         const wchar_t OLD_JSON_KEY_ACTIVATION_SHORTCUT[] = L"ActivationShortcut";
@@ -168,7 +131,7 @@ private:
     {
         auto settingsObject = settings.get_raw_json();
 
-        // Migrate Paste As Plain text shortcut
+        // Migrate Paste As PLain text shortcut
         Hotkey old_paste_as_plain_hotkey;
         bool old_data_migrated = migrate_data_and_remove_data_file(old_paste_as_plain_hotkey);
         if (old_data_migrated)
@@ -176,7 +139,12 @@ private:
             m_paste_as_plain_hotkey = old_paste_as_plain_hotkey;
 
             // override settings file
-            const auto new_hotkey_value = to_json_object(old_paste_as_plain_hotkey);
+            json::JsonObject new_hotkey_value;
+            new_hotkey_value.SetNamedValue(JSON_KEY_WIN, json::value(old_paste_as_plain_hotkey.win));
+            new_hotkey_value.SetNamedValue(JSON_KEY_ALT, json::value(old_paste_as_plain_hotkey.alt));
+            new_hotkey_value.SetNamedValue(JSON_KEY_SHIFT, json::value(old_paste_as_plain_hotkey.shift));
+            new_hotkey_value.SetNamedValue(JSON_KEY_CTRL, json::value(old_paste_as_plain_hotkey.ctrl));
+            new_hotkey_value.SetNamedValue(JSON_KEY_CODE, json::value(old_paste_as_plain_hotkey.key));
 
             if (!settingsObject.HasKey(JSON_KEY_PROPERTIES))
             {
@@ -185,7 +153,13 @@ private:
 
             settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).SetNamedValue(JSON_KEY_PASTE_AS_PLAIN_HOTKEY, new_hotkey_value);
 
-            const auto ui_hotkey = to_json_object(m_advanced_paste_ui_hotkey);
+
+            json::JsonObject ui_hotkey;
+            ui_hotkey.SetNamedValue(JSON_KEY_WIN, json::value(m_advanced_paste_ui_hotkey.win));
+            ui_hotkey.SetNamedValue(JSON_KEY_ALT, json::value(m_advanced_paste_ui_hotkey.alt));
+            ui_hotkey.SetNamedValue(JSON_KEY_SHIFT, json::value(m_advanced_paste_ui_hotkey.shift));
+            ui_hotkey.SetNamedValue(JSON_KEY_CTRL, json::value(m_advanced_paste_ui_hotkey.ctrl));
+            ui_hotkey.SetNamedValue(JSON_KEY_CODE, json::value(m_advanced_paste_ui_hotkey.key));
             settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).SetNamedValue(JSON_KEY_ADVANCED_PASTE_UI_HOTKEY, ui_hotkey);
 
             settings.save_to_settings_file();
@@ -194,56 +168,40 @@ private:
         {
             if (settingsObject.GetView().Size())
             {
-                const std::array<std::pair<Hotkey*, LPCWSTR>, NUM_DEFAULT_HOTKEYS> defaultHotkeys{
+                if (settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).HasKey(JSON_KEY_PASTE_AS_PLAIN_HOTKEY))
-                    { { &m_paste_as_plain_hotkey, JSON_KEY_PASTE_AS_PLAIN_HOTKEY },
-                      { &m_advanced_paste_ui_hotkey, JSON_KEY_ADVANCED_PASTE_UI_HOTKEY },
-                      { &m_paste_as_markdown_hotkey, JSON_KEY_PASTE_AS_MARKDOWN_HOTKEY },
-                      { &m_paste_as_json_hotkey, JSON_KEY_PASTE_AS_JSON_HOTKEY } }
-                };
-
-                for (auto& [hotkey, keyName] : defaultHotkeys)
                 {
-                    *hotkey = parse_single_hotkey(keyName, settingsObject);
+                    m_paste_as_plain_hotkey = parse_single_hotkey(JSON_KEY_PASTE_AS_PLAIN_HOTKEY, settingsObject);
                 }
-
+                if (settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).HasKey(JSON_KEY_ADVANCED_PASTE_UI_HOTKEY))
-                m_custom_action_hotkeys.clear();
-                m_custom_action_ids.clear();
-
-                if (settingsObject.HasKey(JSON_KEY_PROPERTIES))
                 {
-                    const auto propertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES);
+                    m_advanced_paste_ui_hotkey = parse_single_hotkey(JSON_KEY_ADVANCED_PASTE_UI_HOTKEY, settingsObject);
-
+                }
-                    if (propertiesObject.HasKey(JSON_KEY_CUSTOM_ACTIONS))
+                if (settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).HasKey(JSON_KEY_PASTE_AS_MARKDOWN_HOTKEY))
-                    {
+                {
-                        const auto customActions = propertiesObject.GetNamedObject(JSON_KEY_CUSTOM_ACTIONS).GetNamedArray(JSON_KEY_VALUE);
+                    m_paste_as_markdown_hotkey = parse_single_hotkey(JSON_KEY_PASTE_AS_MARKDOWN_HOTKEY, settingsObject);
-
+                }
-                        for (const auto& customAction : customActions)
+                if (settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).HasKey(JSON_KEY_PASTE_AS_JSON_HOTKEY))
-                        {
+                {
-                            const auto object = customAction.GetObjectW();
+                    m_paste_as_json_hotkey = parse_single_hotkey(JSON_KEY_PASTE_AS_JSON_HOTKEY, settingsObject);
-
-                            if (object.GetNamedBoolean(JSON_KEY_IS_SHOWN, false))
-                            {
-                                m_custom_action_hotkeys.push_back(parse_single_hotkey(object.GetNamedObject(JSON_KEY_SHORTCUT)));
-                                m_custom_action_ids.push_back(static_cast<int>(object.GetNamedNumber(JSON_KEY_ID)));
-                            }
-                        }
-                    }
                 }
             }
         }
     }
 
-    bool is_process_running() const
+    bool is_process_running()
     {
         return WaitForSingleObject(m_hProcess, 0) == WAIT_TIMEOUT;
     }
 
-    void launch_process(const std::wstring& pipe_name)
+    void launch_process(const std::wstring& arg = L"")
     {
         Logger::trace(L"Starting AdvancedPaste process");
-        const unsigned long powertoys_pid = GetCurrentProcessId();
+        unsigned long powertoys_pid = GetCurrentProcessId();
 
-        const auto executable_args = std::format(L"{} {}", std::to_wstring(powertoys_pid), pipe_name);
+        std::wstring executable_args = L"";
+        executable_args.append(std::to_wstring(powertoys_pid));
+
+        executable_args += L" " + arg;
 
         SHELLEXECUTEINFOW sei{ sizeof(sei) };
         sei.fMask = { SEE_MASK_NOCLOSEPROCESS | SEE_MASK_FLAG_NO_UI };
@@ -263,55 +221,6 @@ private:
         m_hProcess = sei.hProcess;
     }
 
-
-    std::optional<std::wstring> get_pipe_name(const std::wstring& prefix) const
-    {
-        UUID temp_uuid;
-        wchar_t* uuid_chars = nullptr;
-        if (UuidCreate(&temp_uuid) == RPC_S_UUID_NO_ADDRESS)
-        {
-            const auto val = get_last_error_message(GetLastError());
-            Logger::error(L"UuidCreate cannot create guid. {}", val.has_value() ? val.value() : L"");
-            return std::nullopt;
-        }
-        else if (UuidToString(&temp_uuid, reinterpret_cast<RPC_WSTR*>(&uuid_chars)) != RPC_S_OK)
-        {
-            const auto val = get_last_error_message(GetLastError());
-            Logger::error(L"UuidToString cannot convert to string. {}", val.has_value() ? val.value() : L"");
-            return std::nullopt;
-        }
-
-        const auto pipe_name = std::format(L"{}{}", prefix, std::wstring(uuid_chars));
-        RpcStringFree(reinterpret_cast<RPC_WSTR*>(&uuid_chars));
-
-        return pipe_name;
-    }
-
-    void launch_process_and_named_pipe()
-    {
-        const auto pipe_name = get_pipe_name(L"powertoys_advanced_paste_");
-
-        if (!pipe_name)
-        {
-            return;
-        }
-
-        create_pipe_thread = std::thread([&] { start_named_pipe_server(pipe_name.value()); });
-        launch_process(pipe_name.value());
-        create_pipe_thread.join();
-    }
-
-    void send_named_pipe_message(const std::wstring& message_type, const std::wstring& message_arg = L"")
-    {
-        if (m_write_pipe)
-        {
-            const auto message = message_arg.empty() ? std::format(L"{}\r\n", message_type) : std::format(L"{} {}\r\n", message_type, message_arg);
-
-            const CString file_name(message.c_str());
-            m_write_pipe->Write(file_name, file_name.GetLength() * sizeof(TCHAR));
-        }
-    }
-
     // Load the settings file.
     void init_settings()
     {
@@ -349,7 +258,7 @@ private:
         }
     }
 
-    void try_inject_modifier_key_restore(std::vector<INPUT>& inputs, short modifier)
+    void try_inject_modifier_key_restore(std::vector<INPUT> &inputs, short modifier)
     {
         // Most significant bit is set if key is down
         if ((GetAsyncKeyState(static_cast<int>(modifier)) & 0x8000) != 0)
@@ -578,54 +487,15 @@ private:
         EnumWindows(enum_windows, (LPARAM)m_hProcess);
     }
 
-    HRESULT start_named_pipe_server(const std::wstring& pipe_name)
-    {
-        const constexpr DWORD BUFSIZE = 4096 * 4;
-
-        const auto full_pipe_name = std::format(L"\\\\.\\pipe\\{}", pipe_name);
-
-        const auto hPipe = CreateNamedPipe(
-                full_pipe_name.c_str(),     // pipe name
-                PIPE_ACCESS_OUTBOUND,       // write access
-                PIPE_TYPE_MESSAGE |         // message type pipe
-                    PIPE_READMODE_MESSAGE | // message-read mode
-                    PIPE_WAIT,              // blocking mode
-                1,                          // max. instances
-                BUFSIZE,                    // output buffer size
-                0,                          // input buffer size
-                0,                          // client time-out
-                NULL);                      // default security attribute
-
-        if (hPipe == NULL || hPipe == INVALID_HANDLE_VALUE)
-        {
-            return E_FAIL;
-        }
-
-        // This call blocks until a client process connects to the pipe
-        BOOL connected = ConnectNamedPipe(hPipe, NULL);
-        if (!connected)
-        {
-            if (GetLastError() == ERROR_PIPE_CONNECTED)
-            {
-                return S_OK;
-            }
-            else
-            {
-                CloseHandle(hPipe);
-            }
-            return E_FAIL;
-        }
-
-        m_write_pipe = std::make_unique<CAtlFile>(hPipe);
-        return S_OK;
-    }
-
 public:
     AdvancedPaste()
     {
         app_name = GET_RESOURCE_STRING(IDS_ADVANCED_PASTE_NAME);
         app_key = AdvancedPasteConstants::ModuleKey;
         LoggerHelpers::init_logger(app_key, L"ModuleInterface", "AdvancedPaste");
+        m_hShowUIEvent = CreateDefaultEvent(CommonSharedConstants::SHOW_ADVANCED_PASTE_SHARED_EVENT);
+        m_hPasteMarkdownEvent = CreateDefaultEvent(CommonSharedConstants::ADVANCED_PASTE_MARKDOWN_EVENT);
+        m_hPasteJsonEvent = CreateDefaultEvent(CommonSharedConstants::ADVANCED_PASTE_JSON_EVENT);
         init_settings();
     }
 
@@ -689,7 +559,7 @@ public:
 
             parse_hotkeys(values);
 
-            const auto settingsObject = values.get_raw_json();
+            auto settingsObject = values.get_raw_json();
             if (settingsObject.GetView().Size() && settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).HasKey(JSON_KEY_SHOW_CUSTOM_PREVIEW))
             {
                 m_preview_custom_format_output = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_SHOW_CUSTOM_PREVIEW).GetNamedBoolean(JSON_KEY_VALUE);
@@ -697,10 +567,10 @@ public:
 
             // order of args matter
             Trace::AdvancedPaste_SettingsTelemetry(m_paste_as_plain_hotkey,
-                                                   m_advanced_paste_ui_hotkey,
+                                     m_advanced_paste_ui_hotkey,
-                                                   m_paste_as_markdown_hotkey,
+                                     m_paste_as_markdown_hotkey,
-                                                   m_paste_as_json_hotkey,
+                                     m_paste_as_json_hotkey,
-                                                   m_preview_custom_format_output);
+                                     m_preview_custom_format_output);
 
             // If you don't need to do any custom processing of the settings, proceed
             // to persists the values calling:
@@ -718,9 +588,12 @@ public:
     {
         Logger::trace("AdvancedPaste::enable()");
         Trace::AdvancedPaste_Enable(true);
+        ResetEvent(m_hShowUIEvent);
+        ResetEvent(m_hPasteMarkdownEvent);
+        ResetEvent(m_hPasteJsonEvent);
         m_enabled = true;
 
-        launch_process_and_named_pipe();
+        launch_process();
     };
 
     virtual void disable()
@@ -728,8 +601,9 @@ public:
         Logger::trace("AdvancedPaste::disable()");
         if (m_enabled)
         {
-            m_write_pipe = nullptr;
+            ResetEvent(m_hShowUIEvent);
-
+            ResetEvent(m_hPasteMarkdownEvent);
+            ResetEvent(m_hPasteJsonEvent);
             TerminateProcess(m_hProcess, 1);
             Trace::AdvancedPaste_Enable(false);
 
@@ -748,12 +622,13 @@ public:
             if (!is_process_running())
             {
                 Logger::trace(L"Launching new process");
-                launch_process_and_named_pipe();
+                launch_process();
+
+                Trace::AdvancedPaste_Invoked(L"AdvancedPasteUI");
             }
 
             // hotkeyId in same order as set by get_hotkeys
-            if (hotkeyId == 0)
+            if (hotkeyId == 0) { // m_paste_as_plain_hotkey
-            { // m_paste_as_plain_hotkey
                 Logger::trace(L"Paste as plain text hotkey pressed");
 
                 std::thread([=]() {
@@ -766,40 +641,21 @@ public:
                 return true;
             }
 
-            if (hotkeyId == 1)
+            if (hotkeyId == 1) { // m_advanced_paste_ui_hotkey
-            { // m_advanced_paste_ui_hotkey
                 Logger::trace(L"Setting start up event");
 
                 bring_process_to_front();
-                send_named_pipe_message(CommonSharedConstants::ADVANCED_PASTE_SHOW_UI_MESSAGE);
+                SetEvent(m_hShowUIEvent);
-                Trace::AdvancedPaste_Invoked(L"AdvancedPasteUI");
                 return true;
             }
-            if (hotkeyId == 2)
+            if (hotkeyId == 2) { // m_paste_as_markdown_hotkey
-            { // m_paste_as_markdown_hotkey
                 Logger::trace(L"Starting paste as markdown directly");
-                send_named_pipe_message(CommonSharedConstants::ADVANCED_PASTE_MARKDOWN_MESSAGE);
+                SetEvent(m_hPasteMarkdownEvent);
-                Trace::AdvancedPaste_Invoked(L"MarkdownDirect");
                 return true;
             }
-            if (hotkeyId == 3)
+            if (hotkeyId == 3) { // m_paste_as_json_hotkey
-            { // m_paste_as_json_hotkey
                 Logger::trace(L"Starting paste as json directly");
-                send_named_pipe_message(CommonSharedConstants::ADVANCED_PASTE_JSON_MESSAGE);
+                SetEvent(m_hPasteJsonEvent);
-                Trace::AdvancedPaste_Invoked(L"JsonDirect");
-                return true;
-            }
-
-            const auto custom_action_index = hotkeyId - NUM_DEFAULT_HOTKEYS;
-
-            if (custom_action_index < m_custom_action_ids.size())
-            {
-                const auto id = m_custom_action_ids.at(custom_action_index);
-
-                Logger::trace(L"Starting custom action id={}", id);
-
-                send_named_pipe_message(CommonSharedConstants::ADVANCED_PASTE_CUSTOM_ACTION_MESSAGE, std::to_wstring(id));
-                Trace::AdvancedPaste_Invoked(L"CustomActionDirect");
                 return true;
             }
         }
@@ -809,20 +665,14 @@ public:
 
     virtual size_t get_hotkeys(Hotkey* hotkeys, size_t buffer_size) override
     {
-        const size_t num_hotkeys = NUM_DEFAULT_HOTKEYS + m_custom_action_hotkeys.size();
+        if (hotkeys && buffer_size >= 4)
-
-        if (hotkeys && buffer_size >= num_hotkeys)
         {
-            const std::array default_hotkeys = { m_paste_as_plain_hotkey,
+            hotkeys[0] = m_paste_as_plain_hotkey;
-                                                 m_advanced_paste_ui_hotkey,
+            hotkeys[1] = m_advanced_paste_ui_hotkey;
-                                                 m_paste_as_markdown_hotkey,
+            hotkeys[2] = m_paste_as_markdown_hotkey;
-                                                 m_paste_as_json_hotkey };
+            hotkeys[3] = m_paste_as_json_hotkey;
-
-            std::copy(default_hotkeys.begin(), default_hotkeys.end(), hotkeys);
-            std::copy(m_custom_action_hotkeys.begin(), m_custom_action_hotkeys.end(), hotkeys + NUM_DEFAULT_HOTKEYS);
         }
-
+        return 4;
-        return num_hotkeys;
     }
 
     virtual bool is_enabled() override

src/modules/CropAndLock/CropAndLock/CropAndLock.rc

@@ -1,6 +1,7 @@
 // Microsoft Visual C++ generated resource script.
 //
 #include "resource.h"
+#include "../../../common/version/version.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -12,6 +13,39 @@
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
 
+1 VERSIONINFO
+FILEVERSION FILE_VERSION
+PRODUCTVERSION PRODUCT_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+FILEFLAGS VS_FF_DEBUG
+#else
+FILEFLAGS 0x0L
+#endif
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE VFT2_UNKNOWN
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0" // US English (0x0409), Unicode (0x04B0) charset
+        BEGIN
+            VALUE "CompanyName", COMPANY_NAME
+            VALUE "FileDescription", FILE_DESCRIPTION
+            VALUE "FileVersion", FILE_VERSION_STRING
+            VALUE "InternalName", INTERNAL_NAME
+            VALUE "LegalCopyright", COPYRIGHT_NOTE
+            VALUE "OriginalFilename", ORIGINAL_FILENAME
+            VALUE "ProductName", PRODUCT_NAME
+            VALUE "ProductVersion", PRODUCT_VERSION_STRING
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200 // US English (0x0409), Unicode (1200) charset
+    END
+END
+
 /////////////////////////////////////////////////////////////////////////////
 // English (United States) resources
 

src/modules/CropAndLock/CropAndLock/CropAndLock.vcxproj

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

src/modules/CropAndLock/CropAndLockModuleInterface/CropAndLockModuleInterface.rc

@@ -1,7 +1,40 @@
 #include <windows.h>
 #include "resource.h"
+#include "../../../common/version/version.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 #include "winres.h"
 #undef APSTUDIO_READONLY_SYMBOLS
 
+1 VERSIONINFO
+FILEVERSION FILE_VERSION
+PRODUCTVERSION PRODUCT_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+FILEFLAGS VS_FF_DEBUG
+#else
+FILEFLAGS 0x0L
+#endif
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE VFT2_UNKNOWN
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0" // US English (0x0409), Unicode (0x04B0) charset
+        BEGIN
+            VALUE "CompanyName", COMPANY_NAME
+            VALUE "FileDescription", FILE_DESCRIPTION
+            VALUE "FileVersion", FILE_VERSION_STRING
+            VALUE "InternalName", INTERNAL_NAME
+            VALUE "LegalCopyright", COPYRIGHT_NOTE
+            VALUE "OriginalFilename", ORIGINAL_FILENAME
+            VALUE "ProductName", PRODUCT_NAME
+            VALUE "ProductVersion", PRODUCT_VERSION_STRING
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200 // US English (0x0409), Unicode (1200) charset
+    END
+END

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

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

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

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

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

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

src/modules/EnvironmentVariables/EnvironmentVariables/Program.cs

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

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

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

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

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

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

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

src/modules/EnvironmentVariables/EnvironmentVariablesModuleInterface/EnvironmentVariablesModuleInterface.base.rc

@@ -1,7 +1,40 @@
 #include <windows.h>
 #include "resource.h"
+#include "../../../common/version/version.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 #include "winres.h"
 #undef APSTUDIO_READONLY_SYMBOLS
 
+1 VERSIONINFO
+FILEVERSION FILE_VERSION
+PRODUCTVERSION PRODUCT_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+FILEFLAGS VS_FF_DEBUG
+#else
+FILEFLAGS 0x0L
+#endif
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE VFT2_UNKNOWN
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0" // US English (0x0409), Unicode (0x04B0) charset
+        BEGIN
+            VALUE "CompanyName", COMPANY_NAME
+            VALUE "FileDescription", FILE_DESCRIPTION
+            VALUE "FileVersion", FILE_VERSION_STRING
+            VALUE "InternalName", INTERNAL_NAME
+            VALUE "LegalCopyright", COPYRIGHT_NOTE
+            VALUE "OriginalFilename", ORIGINAL_FILENAME
+            VALUE "ProductName", PRODUCT_NAME
+            VALUE "ProductVersion", PRODUCT_VERSION_STRING
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200 // US English (0x0409), Unicode (1200) charset
+    END
+END

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

@@ -3,13 +3,12 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-
 using EnvironmentVariablesUILib.Models;
 using Microsoft.UI.Xaml.Data;
 
 namespace EnvironmentVariablesUILib.Converters;
 
-public partial class EnvironmentStateToBoolConverter : IValueConverter
+public class EnvironmentStateToBoolConverter : IValueConverter
 {
     public object Convert(object value, Type targetType, object parameter, string language)
     {

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

@@ -3,14 +3,13 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-
 using EnvironmentVariablesUILib.Helpers;
 using EnvironmentVariablesUILib.Models;
 using Microsoft.UI.Xaml.Data;
 
 namespace EnvironmentVariablesUILib.Converters;
 
-public partial class EnvironmentStateToMessageConverter : IValueConverter
+public class EnvironmentStateToMessageConverter : IValueConverter
 {
     public object Convert(object value, Type targetType, object parameter, string language)
     {

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

@@ -3,14 +3,13 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-
 using EnvironmentVariablesUILib.Helpers;
 using EnvironmentVariablesUILib.Models;
 using Microsoft.UI.Xaml.Data;
 
 namespace EnvironmentVariablesUILib.Converters;
 
-public partial class EnvironmentStateToTitleConverter : IValueConverter
+public class EnvironmentStateToTitleConverter : IValueConverter
 {
     public object Convert(object value, Type targetType, object parameter, string language)
     {

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

@@ -3,14 +3,13 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-
 using EnvironmentVariablesUILib.Models;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Data;
 
 namespace EnvironmentVariablesUILib.Converters;
 
-public partial class EnvironmentStateToVisibilityConverter : IValueConverter
+public class EnvironmentStateToVisibilityConverter : IValueConverter
 {
     public object Convert(object value, Type targetType, object parameter, string language)
     {

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

@@ -3,13 +3,12 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-
 using EnvironmentVariablesUILib.Models;
 using Microsoft.UI.Xaml.Data;
 
 namespace EnvironmentVariablesUILib.Converters;
 
-public partial class VariableTypeToGlyphConverter : IValueConverter
+public class VariableTypeToGlyphConverter : IValueConverter
 {
     public object Convert(object value, Type targetType, object parameter, string language)
     {

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

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