MSI update for SettingsV2 and KBM (#2351)

* Removed SettingsV2 deployment

* Adjusted project output directory

* Added all Settingsv2 and KBM files

* Added all Settingsv2 and KBM files

* Updated configuration and nuget packages

* Removed Interop.TwoWayIPCLib from MSI

PowerToys.sln

@@ -374,7 +374,6 @@ Global
 		{A7D5099E-F0FD-4BF3-8522-5A682759F915}.Debug|x64.Build.0 = Debug|x64
 		{A7D5099E-F0FD-4BF3-8522-5A682759F915}.Release|x64.ActiveCfg = Release|x64
 		{A7D5099E-F0FD-4BF3-8522-5A682759F915}.Release|x64.Build.0 = Release|x64
-		{A7D5099E-F0FD-4BF3-8522-5A682759F915}.Release|x64.Deploy.0 = Release|x64
 		{B1BCC8C6-46B5-4BFA-8F22-20F32D99EC6A}.Debug|x64.ActiveCfg = Debug|x64
 		{B1BCC8C6-46B5-4BFA-8F22-20F32D99EC6A}.Debug|x64.Build.0 = Debug|x64
 		{B1BCC8C6-46B5-4BFA-8F22-20F32D99EC6A}.Release|x64.ActiveCfg = Release|x64

installer/PowerToysSetup/Product.wxs

@@ -212,6 +212,16 @@
               <?undef IdSafeLanguage?>
             <?endforeach?>
           </Directory>
+          <Directory Id="SettingsV2InstallFolder" Name="SettingsUIRunner">
+            <Directory Id="SettingsV2ViewsInstallFolder" Name="Views"/>
+            <Directory Id="SettingsV2StylesInstallFolder" Name="Styles"/>
+            <Directory Id="SettingsV2PropertiesInstallFolder" Name="Properties"/>
+            <Directory Id="SettingsV2AssetsInstallFolder" Name="Assets"/>
+            <Directory Id="SettingsV2ControlsInstallFolder" Name="Controls"/>
+            <Directory Id="SettingsV2XamlInstallFolder" Name="Microsoft.UI.Xaml">
+              <Directory Id="SettingsV2XamlAssetsInstallFolder" Name="Assets" />
+            </Directory>
+          </Directory>
           <Directory Id="SettingsHtmlInstallFolder" Name="settings-html">
             <Directory Id="SettingsHtmlDistInstallFolder" Name="dist"/>
           </Directory>
@@ -271,6 +281,9 @@
       <Component Id="License_rtf" Guid="3E5AE43B-CFB4-449B-A346-94CAAFF3312E" Win64="yes">
         <File Source="$(var.RepoDir)\installer\License.rtf" Id="License.rtf" KeyPath="yes" />
       </Component>
+      <Component Id="powertoysinterop_dll" Guid="B7DD2DF4-C8F2-46FA-9571-D6EF1588ADF3" Win64="yes">
+        <File Id="PowerToysInterop.dll" KeyPath="yes" Checksum="yes" />
+      </Component>
     </DirectoryRef>
     <DirectoryRef Id="SvgsInstallFolder" FileSource="$(var.BinX64Dir)\svgs\">
       <Component Id="PowerToysSvgs" Guid="7C4D4EED-9338-423D-992C-DCE02F3E2D35" Win64="yes">
@@ -331,6 +344,10 @@
         <File Source="$(var.BinX64Dir)\modules\MaterialDesignThemes.Wpf.dll" />
       </Component>
 
+      <Component Id="Module_KeyboardManager" Guid="9279BD82-786F-4F0B-8E49-DB484EE34C9B" Win64="yes">
+        <File Source="$(var.BinX64Dir)\modules\KeyboardManager.dll" />
+      </Component>
+
       <Component Id="Module_ImageResizer" Guid="96E63289-759C-4A73-A56B-EE7429932F72" Win64="yes">
         <File Source="$(var.BinX64Dir)\modules\ImageResizer.exe">
           <netfx:NativeImage Id="ImageResizer.exe" Platform="all" Priority="0" />
@@ -484,6 +501,79 @@
         </RegistryKey>
       </Component>
     </DirectoryRef>
+
+    <!-- SettingsV2 components -->
+    <DirectoryRef Id="SettingsV2InstallFolder" FileSource="$(var.BinX64Dir)\SettingsUIRunner\">
+      <Component Id="SettingsV2" Guid="4B108DC0-4B2C-4AC4-AAA9-1B2DC8399F7C" Win64="yes">
+        <!-- exe -->
+        <File Source="$(var.BinX64Dir)\SettingsUIRunner\Microsoft.PowerToys.Settings.UI.Runner.exe"/>
+        <File Source="$(var.BinX64Dir)\SettingsUIRunner\Microsoft.PowerToys.Settings.UI.exe"/>
+        <!-- dll -->
+        <?foreach File in concrt140_app.dll;Microsoft.Bcl.AsyncInterfaces.dll;Microsoft.PowerToys.Settings.UI.Lib.dll;Microsoft.PowerToys.Settings.UI.Runner.dll;Microsoft.Toolkit.dll;Microsoft.Toolkit.Uwp.dll;Microsoft.Toolkit.Uwp.UI.dll;Microsoft.Toolkit.Win32.UI.XamlHost.dll;Microsoft.Toolkit.Win32.UI.XamlHost.Managed.dll;Microsoft.Toolkit.Wpf.UI.Controls.dll;Microsoft.Toolkit.Wpf.UI.XamlHost.dll;Microsoft.UI.Xaml.dll;Microsoft.Xaml.Interactions.dll;Microsoft.Xaml.Interactivity.dll;msvcp140_1_app.dll;msvcp140_2_app.dll;msvcp140_app.dll;Newtonsoft.Json.dll;PowerToysInterop.dll;System.Runtime.CompilerServices.Unsafe.dll;System.Runtime.dll;System.Text.Encodings.Web.dll;System.Text.Json.dll;vcamp140_app.dll;vccorlib140_app.dll;vcomp140_app.dll;vcruntime140_1_app.dll;vcruntime140_app.dll?>
+          <File Id="SettingsV2_$(var.File)" Source="$(var.BinX64Dir)\SettingsUIRunner\$(var.File)" />
+        <?endforeach?>
+        <!-- json -->
+        <File Source="$(var.BinX64Dir)\SettingsUIRunner\Microsoft.PowerToys.Settings.UI.Runner.deps.json"/>
+        <File Source="$(var.BinX64Dir)\SettingsUIRunner\Microsoft.PowerToys.Settings.UI.Runner.runtimeconfig.json"/>
+        <!-- png -->
+        <File Id="SettingsV2_NoiseAsset_256x256_PNG.png" Source="$(var.BinX64Dir)\SettingsUIRunner\NoiseAsset_256x256_PNG.png"/>
+        <!-- pri -->
+        <?foreach File in Microsoft.Toolkit.Uwp.pri;Microsoft.Toolkit.Uwp.UI.pri;Microsoft.Toolkit.Win32.UI.XamlHost.pri;Microsoft.UI.Xaml.pri;Microsoft.Xaml.Interactions.pri;Microsoft.Xaml.Interactivity.pri;resources.pri?>
+          <File Id="SettingsV2_$(var.File)" Source="$(var.BinX64Dir)\SettingsUIRunner\$(var.File)" />
+        <?endforeach?>
+        <!-- winmd -->
+        <File Id="SettingsV2_Microsoft.Toolkit.Win32.UI.XamlHost.winmd" Source="$(var.BinX64Dir)\SettingsUIRunner\Microsoft.Toolkit.Win32.UI.XamlHost.winmd"/>
+        <File Id="SettingsV2_Microsoft.UI.Xaml.winmd" Source="$(var.BinX64Dir)\SettingsUIRunner\Microsoft.UI.Xaml.winmd"/>
+        <!-- xbf -->
+        <File Id="SettingsV2_App.xbf" Source="$(var.BinX64Dir)\SettingsUIRunner\App.xbf"/>
+        <!-- xml -->
+        <File Id="SettingsV2_Microsoft.PowerToys.Settings.UI.xr.xml" Source="$(var.BinX64Dir)\SettingsUIRunner\Microsoft.PowerToys.Settings.UI.xr.xml"/>
+        <File Id="SettingsV2_Microsoft.Toolkit.Win32.UI.XamlHost.xml" Source="$(var.BinX64Dir)\SettingsUIRunner\Microsoft.Toolkit.Win32.UI.XamlHost.xml"/>
+      </Component>
+    </DirectoryRef>
+    <DirectoryRef Id="SettingsV2AssetsInstallFolder" FileSource="$(var.BinX64Dir)\SettingsUIRunner\Assets">
+      <Component Id="SettingsV2Assets" Guid="705B863B-D813-49B9-BAA1-210DA913F765" Win64="yes">
+        <?foreach File in Logo.scale-200.png;SplashScreen.png;Square150x150Logo.scale-200.png;Square44x44Logo.scale-200.png;Square44x44Logo.targetsize-24_altform-unplated.png;StoreLogo.scale-100.png;Wide310x150Logo.scale-200.png?>
+          <File Source="$(var.BinX64Dir)\SettingsUIRunner\Assets\$(var.File)" />
+        <?endforeach?>
+      </Component>
+    </DirectoryRef>
+    <DirectoryRef Id="SettingsV2ControlsInstallFolder" FileSource="$(var.BinX64Dir)\SettingsUIRunner\Controls">
+      <Component Id="SettingsV2Controls" Guid="05C55C88-B59A-4450-A07C-EB7626E0781A" Win64="yes">
+        <?foreach File in HotkeySettingsControl.xbf?>
+          <File Id="SettingsV2_Controls_$(var.File)" Source="$(var.BinX64Dir)\SettingsUIRunner\Controls\$(var.File)" />
+        <?endforeach?>
+      </Component>
+    </DirectoryRef>
+    <DirectoryRef Id="SettingsV2PropertiesInstallFolder" FileSource="$(var.BinX64Dir)\SettingsUIRunner\Properties">
+      <Component Id="SettingsV2Properties" Guid="8F910A41-B27B-4289-8FAC-9AB34F070CF6" Win64="yes">
+        <?foreach File in Default.rd.xml?>
+          <File Id="SettingsV2_Properties_$(var.File)" Source="$(var.BinX64Dir)\SettingsUIRunner\Properties\$(var.File)" />
+        <?endforeach?>
+      </Component>
+    </DirectoryRef>
+    <DirectoryRef Id="SettingsV2StylesInstallFolder" FileSource="$(var.BinX64Dir)\SettingsUIRunner\Styles">
+      <Component Id="SettingsV2Styles" Guid="44B5C0E0-76DA-4604-BB86-FCD27A00EB71" Win64="yes">
+        <?foreach File in Page.xbf;TextBlock.xbf;_Colors.xbf;_FontSizes.xbf;_Sizes.xbf;_Thickness.xbf?>
+          <File Id="SettingsV2_Styles_$(var.File)" Source="$(var.BinX64Dir)\SettingsUIRunner\Styles\$(var.File)" />
+        <?endforeach?>
+      </Component>
+    </DirectoryRef>
+    <DirectoryRef Id="SettingsV2ViewsInstallFolder" FileSource="$(var.BinX64Dir)\SettingsUIRunner\Views">
+      <Component Id="SettingsV2Views" Guid="C140BFBA-6370-4F67-862C-5B42660385CD" Win64="yes">
+        <?foreach File in FancyZonesPage.xbf;GeneralPage.xbf;ImageResizerPage.xbf;KeyboardManagerPage.xbf;PowerLauncherPage.xbf;PowerPreviewPage.xbf;PowerRenamePage.xbf;ShellPage.xbf;ShortcutGuidePage.xbf?>
+          <File Id="SettingsV2_Views_$(var.File)" Source="$(var.BinX64Dir)\SettingsUIRunner\Views\$(var.File)" />
+        <?endforeach?>
+      </Component>
+    </DirectoryRef>
+    <DirectoryRef Id="SettingsV2XamlAssetsInstallFolder" FileSource="$(var.BinX64Dir)\SettingsUIRunner\Microsoft.UI.Xaml\Assets">
+      <Component Id="SettingsV2XamlAssets" Guid="98A136DB-C1BD-42B1-9AB4-0E16F0ECE86A" Win64="yes">
+        <?foreach File in NoiseAsset_256X256_PNG.png?>
+          <File Id="SettingsV2_XamlAssets_$(var.File)" Source="$(var.BinX64Dir)\SettingsUIRunner\Microsoft.UI.Xaml\Assets\$(var.File)" />
+        <?endforeach?>
+      </Component>
+    </DirectoryRef>
+
     <DirectoryRef Id="SettingsHtmlInstallFolder" FileSource="$(var.RepoDir)\settings\settings-html\">
       <Component Id="settings_html" Guid="87881A99-E917-4B0D-B1D8-5C6EB9709F96" Win64="yes">
         <File Source="$(var.RepoDir)\src\settings\settings-html\index.html" KeyPath="yes" />
@@ -525,6 +615,7 @@
       <ComponentRef Id="action_runner_exe" />
       <ComponentRef Id="powertoys_toast_clsid" />
       <ComponentRef Id="License_rtf" />
+      <ComponentRef Id="powertoysinterop_dll" />
       <ComponentRef Id="PowerToysSvgs" />
       <ComponentRef Id="Module_ShortcutGuide" />
       <ComponentRef Id="Module_FancyZones" />
@@ -535,6 +626,14 @@
       <ComponentRef Id="Module_PowerPreview" />
       <ComponentRef Id="Module_PowerPreview_PerUserRegistry" />
       <ComponentRef Id="Module_WindowWalker" />
+      <ComponentRef Id="Module_KeyboardManager" />
+      <ComponentRef Id="SettingsV2" />
+      <ComponentRef Id="SettingsV2Assets" />
+      <ComponentRef Id="SettingsV2Controls" />
+      <ComponentRef Id="SettingsV2Properties" />
+      <ComponentRef Id="SettingsV2Styles" />
+      <ComponentRef Id="SettingsV2Views" />
+      <ComponentRef Id="SettingsV2XamlAssets" />
       <ComponentRef Id="settings_exe" />
       <ComponentRef Id="settings_html" />
       <ComponentRef Id="settings_dark_html" />

src/core/Microsoft.PowerToys.Settings.UI.Runner/Microsoft.PowerToys.Settings.UI.Runner.csproj

@@ -18,17 +18,21 @@
     <Platforms>x64</Platforms>
     <ApplicationIcon>icon.ico</ApplicationIcon>
     <Win32Resource />
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
     
     <!-- crutkas TODO: added for fallback, may need to be removed for WinUI3 -->
     <AssetTargetFallback>uap10.0.18362</AssetTargetFallback>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutputPath>..\..\..\$(Platform)\$(Configuration)\</OutputPath>
+    <OutputPath>..\..\..\$(Platform)\$(Configuration)\SettingsUIRunner</OutputPath>
+    <Optimize>false</Optimize>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutputPath>..\..\..\$(Platform)\$(Configuration)\</OutputPath>
+    <OutputPath>..\..\..\$(Platform)\$(Configuration)\SettingsUIRunner</OutputPath>
+    <Optimize>true</Optimize>
   </PropertyGroup>
 
   <ItemGroup>
@@ -62,8 +66,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Toolkit.Wpf.UI.Controls" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Toolkit.UI.XamlHost" Version="6.0.1" />
-    <PackageReference Include="Microsoft.Toolkit.Wpf.UI.XamlHost" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Toolkit.Uwp.UI" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Toolkit.Wpf.UI.Controls" Version="6.0.1" />
+    <PackageReference Include="Microsoft.Toolkit.Wpf.UI.XamlHost" Version="6.0.1" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

src/core/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj

@@ -2,7 +2,7 @@
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Configuration Condition=" '$(Configuration)' == 'x64' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
     <ProjectGuid>{A7D5099E-F0FD-4BF3-8522-5A682759F915}</ProjectGuid>
     <OutputType>AppContainerExe</OutputType>

src/runner/settings_window.cpp

@@ -222,7 +222,7 @@ void run_settings_window()
 
     // Arg 1: executable path.
     std::wstring executable_path = get_module_folderpath();
-    executable_path.append(L"\\netcoreapp3.1\\Microsoft.PowerToys.Settings.UI.Runner.exe");
+    executable_path.append(L"\\SettingsUIRunner\\Microsoft.PowerToys.Settings.UI.Runner.exe");
 
     // Arg 2: pipe server. Generate unique names for the pipes, if getting a UUID is possible.
     std::wstring powertoys_pipe_name(L"\\\\.\\pipe\\powertoys_runner_");