From 8cb134f56b0c678c80b8a57183f5820cd2f0fba1 Mon Sep 17 00:00:00 2001
From: Arjun Balgovind <32061677+arjunbalgovind@users.noreply.github.com>
Date: Fri, 1 May 2020 13:17:30 -0700
Subject: [PATCH] Add post-build event for publishing SettingsV2  (#2473)

* Added post build script

* Added comments

* Added unset statement

* Added debug checks

* added more debug statements

* Added dir and cat statements to check pipeline output

* revert installer change

* Moved nuget package reference from update to include

* Removed debug cat command

* Removed debugging statements

* Added build script for launcher

* Added launcher scripts

* Removed launcher scripts

* Changed taskkill to throw error

* Added back old config properties
---
 installer/PowerToysSetup/Product.wxs              |  4 ++--
 src/common/interop/interop.h                      |  4 ++--
 .../Microsoft.PowerToys.Settings.UI.Runner.csproj |  8 +++++---
 .../Microsoft.PowerToys.Settings.UI.csproj        | 15 ++++++++-------
 src/modules/launcher/Directory.Build.targets      |  9 +++------
 .../PowerLauncher.UI/PowerLauncher.UI.csproj      |  2 +-
 .../launcher/PowerLauncher/PowerLauncher.csproj   | 13 ++++++-------
 src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj |  4 ++--
 8 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/installer/PowerToysSetup/Product.wxs b/installer/PowerToysSetup/Product.wxs
index 0a2397117a..95c3a8a18d 100644
--- a/installer/PowerToysSetup/Product.wxs
+++ b/installer/PowerToysSetup/Product.wxs
@@ -583,6 +583,7 @@
         <?foreach File in Logo.scale-200.png;SplashScreen.png;StoreLogo.scale-100.png?>
           <File Source="$(var.BinX64Dir)SettingsUIRunner\Assets\$(var.File)" />
         <?endforeach?>
+        <File Id="SettingsV2_StoreLogo" Source="$(var.BinX64Dir)SettingsUIRunner\Assets\StoreLogo.png" />
         <File Id="Square150x150Logo" Source="$(var.BinX64Dir)SettingsUIRunner\Assets\Square150x150Logo.scale-200.png" />
         <File Id="Square44x44Logo_targetsize_24_altform_unplated" Source="$(var.BinX64Dir)SettingsUIRunner\Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
         <File Id="Wide310x150Logo" Source="$(var.BinX64Dir)SettingsUIRunner\Assets\Wide310x150Logo.scale-200.png" />
@@ -718,11 +719,10 @@
   <Fragment>
     <ComponentGroup Id="LauncherComponents">
       <Component Id="launcherInstallComponent" Directory="LauncherInstallFolder" Guid="5E688DB4-C522-4268-BA54-ED1CDFFE9DB6">
-        <?foreach File in App.xbf;clrcompression.dll;ColorCode.Core.dll;ColorCode.UWP.dll;ColorCode.UWP.pri;concrt140_app.dll;ICSharpCode.SharpZipLib.dll;JetBrains.Annotations.dll;LauncherControl.xbf;Mages.Core.dll;Microsoft.CSharp.dll;Microsoft.Graphics.Canvas.dll;Microsoft.Graphics.Canvas.winmd;Microsoft.Search.Interop.dll;Microsoft.Toolkit.dll;Microsoft.Toolkit.Parsers.dll;Microsoft.Toolkit.Uwp.dll;Microsoft.Toolkit.Uwp.pri;Microsoft.Toolkit.Uwp.UI.Animations.dll;Microsoft.Toolkit.Uwp.UI.Animations.pri;Microsoft.Toolkit.Uwp.UI.Controls.dll;Microsoft.Toolkit.Uwp.UI.Controls.pri;Microsoft.Toolkit.Uwp.UI.dll;Microsoft.Toolkit.Uwp.UI.pri;Microsoft.Toolkit.Win32.UI.XamlHost.dll;Microsoft.Toolkit.Win32.UI.XamlHost.Managed.dll;Microsoft.Toolkit.Win32.UI.XamlHost.pri;Microsoft.Toolkit.Win32.UI.XamlHost.winmd;Microsoft.Toolkit.Win32.UI.XamlHost.xml;Microsoft.Toolkit.Wpf.UI.XamlHost.dll;Microsoft.UI.Xaml.dll;Microsoft.UI.Xaml.pri;Microsoft.UI.Xaml.winmd;Microsoft.VisualBasic.dll;Microsoft.Win32.Primitives.dll;Microsoft.Xaml.Interactions.dll;Microsoft.Xaml.Interactions.pri;Microsoft.Xaml.Interactivity.dll;Microsoft.Xaml.Interactivity.pri;Mono.Cecil.dll;Mono.Cecil.Mdb.dll;Mono.Cecil.Pdb.dll;Mono.Cecil.Rocks.dll;mscorlib.dll;msvcp140_1_app.dll;msvcp140_2_app.dll;msvcp140_app.dll;netstandard.dll;Newtonsoft.Json.dll;NHotkey.dll;NHotkey.Wpf.dll;NLog.dll;NLog.Extensions.Logging.dll;NLog.Web.AspNetCore.dll;NoiseAsset_256x256_PNG.png;Pinyin4Net.dll;PowerLauncher.deps.json;PowerLauncher.dll;PowerLauncher.exe;PowerLauncher.runtimeconfig.dev.json;PowerLauncher.runtimeconfig.json;PowerLauncher.UI.exe;PowerLauncher.UI.xr.xml;PropertyChanged.dll;resources.pri;ResultList.xbf;SQLite.Interop.dll;System.AppContext.dll;System.Buffers.dll;System.Collections.Concurrent.dll;System.Collections.dll;System.Collections.Immutable.dll;System.Collections.NonGeneric.dll;System.Collections.Specialized.dll;System.ComponentModel.Annotations.dll;System.ComponentModel.Composition.dll;System.ComponentModel.DataAnnotations.dll;System.ComponentModel.dll;System.ComponentModel.EventBasedAsync.dll;System.ComponentModel.Primitives.dll;System.ComponentModel.TypeConverter.dll;System.Configuration.dll;System.Console.dll;System.Core.dll;System.Data.Common.dll;System.Data.dll;System.Data.OleDb.dll;System.Data.SqlClient.dll;System.Data.SQLite.dll;System.Diagnostics.Contracts.dll;System.Diagnostics.Debug.dll;System.Diagnostics.DiagnosticSource.dll;System.Diagnostics.FileVersionInfo.dll;System.Diagnostics.Process.dll;System.Diagnostics.StackTrace.dll;System.Diagnostics.TextWriterTraceListener.dll;System.Diagnostics.Tools.dll;System.Diagnostics.TraceSource.dll;System.Diagnostics.Tracing.dll;System.dll;System.Drawing.dll;System.Drawing.Primitives.dll;System.Dynamic.Runtime.dll;System.Globalization.Calendars.dll;System.Globalization.dll;System.Globalization.Extensions.dll;System.IO.Compression.dll;System.IO.Compression.FileSystem.dll;System.IO.Compression.ZipFile.dll;System.IO.dll;System.IO.FileSystem.dll;System.IO.FileSystem.DriveInfo.dll;System.IO.FileSystem.Primitives.dll;System.IO.FileSystem.Watcher.dll;System.IO.IsolatedStorage.dll;System.IO.MemoryMappedFiles.dll;System.IO.Pipes.AccessControl.dll;System.IO.Pipes.dll;System.IO.Ports.dll;System.IO.UnmanagedMemoryStream.dll;System.Linq.dll;System.Linq.Expressions.dll;System.Linq.Parallel.dll;System.Linq.Queryable.dll;System.Memory.dll;System.Net.dll;System.Net.Http.dll;System.Net.Http.Rtc.dll;System.Net.HttpListener.dll;System.Net.Mail.dll;System.Net.NameResolution.dll;System.Net.NetworkInformation.dll;System.Net.Ping.dll;System.Net.Primitives.dll;System.Net.Requests.dll;System.Net.Security.dll;System.Net.ServicePoint.dll;System.Net.Sockets.dll;System.Net.WebClient.dll;System.Net.WebHeaderCollection.dll;System.Net.WebProxy.dll;System.Net.WebSockets.Client.dll;System.Net.WebSockets.dll;System.Numerics.dll;System.Numerics.Vectors.dll;System.Numerics.Vectors.WindowsRuntime.dll;System.ObjectModel.dll;System.Private.DataContractSerialization.dll;System.Private.Reflection.Metadata.Ecma335.dll;System.Private.ServiceModel.dll;System.Private.Uri.dll;System.Private.Xml.dll;System.Private.Xml.Linq.dll;System.Reflection.Context.dll;System.Reflection.DispatchProxy.dll;System.Reflection.dll;System.Reflection.Emit.dll;System.Reflection.Emit.ILGeneration.dll;System.Reflection.Emit.Lightweight.dll;System.Reflection.Extensions.dll;System.Reflection.Metadata.dll;System.Reflection.Primitives.dll;System.Reflection.TypeExtensions.dll;System.Resources.Reader.dll;System.Resources.ResourceManager.dll;System.Resources.Writer.dll;System.Runtime.CompilerServices.Unsafe.dll;System.Runtime.CompilerServices.VisualC.dll;System.Runtime.dll;System.Runtime.Extensions.dll;System.Runtime.Handles.dll;System.Runtime.InteropServices.dll;System.Runtime.InteropServices.RuntimeInformation.dll;System.Runtime.InteropServices.WindowsRuntime.dll;System.Runtime.Numerics.dll;System.Runtime.Serialization.dll;System.Runtime.Serialization.Formatters.dll;System.Runtime.Serialization.Json.dll;System.Runtime.Serialization.Primitives.dll;System.Runtime.Serialization.Xml.dll;System.Runtime.WindowsRuntime.dll;System.Runtime.WindowsRuntime.UI.Xaml.dll;System.Security.AccessControl.dll;System.Security.Claims.dll;System.Security.Cryptography.Algorithms.dll;System.Security.Cryptography.Cng.dll;System.Security.Cryptography.Csp.dll;System.Security.Cryptography.Encoding.dll;System.Security.Cryptography.Primitives.dll;System.Security.Cryptography.X509Certificates.dll;System.Security.dll;System.Security.Permissions.dll;System.Security.Principal.dll;System.Security.Principal.Windows.dll;System.Security.SecureString.dll;System.ServiceModel.dll;System.ServiceModel.Duplex.dll;System.ServiceModel.Http.dll;System.ServiceModel.NetTcp.dll;System.ServiceModel.Primitives.dll;System.ServiceModel.Security.dll;System.ServiceModel.Web.dll;System.ServiceProcess.dll;System.Text.Encoding.CodePages.dll;System.Text.Encoding.dll;System.Text.Encoding.Extensions.dll;System.Text.RegularExpressions.dll;System.Threading.dll;System.Threading.Overlapped.dll;System.Threading.Tasks.Dataflow.dll;System.Threading.Tasks.dll;System.Threading.Tasks.Extensions.dll;System.Threading.Tasks.Parallel.dll;System.Threading.Thread.dll;System.Threading.ThreadPool.dll;System.Threading.Timer.dll;System.Transactions.dll;System.Transactions.Local.dll;System.ValueTuple.dll;System.Web.dll;System.Web.HttpUtility.dll;System.Windows.dll;System.Xml.dll;System.Xml.Linq.dll;System.Xml.ReaderWriter.dll;System.Xml.Serialization.dll;System.Xml.XDocument.dll;System.Xml.XmlDocument.dll;System.Xml.XmlSerializer.dll;System.Xml.XPath.dll;System.Xml.XPath.XDocument.dll;vcamp140_app.dll;vccorlib140_app.dll;vcomp140_app.dll;vcruntime140_1_app.dll;vcruntime140_app.dll;WindowsBase.dll;WindowsInput.dll;Wox.Core.deps.json;Wox.Core.dll;Wox.deps.json;Wox.dll;Wox.exe;Wox.Infrastructure.deps.json;Wox.Infrastructure.dll;Wox.Plugin.deps.json;Wox.Plugin.dll;Wox.runtimeconfig.dev.json;Wox.runtimeconfig.json?>
+        <?foreach File in App.xbf;clrcompression.dll;ColorCode.Core.dll;ColorCode.UWP.dll;ColorCode.UWP.pri;concrt140_app.dll;ICSharpCode.SharpZipLib.dll;JetBrains.Annotations.dll;LauncherControl.xbf;Mages.Core.dll;Microsoft.CSharp.dll;Microsoft.Graphics.Canvas.dll;Microsoft.Graphics.Canvas.winmd;Microsoft.Search.Interop.dll;Microsoft.Toolkit.dll;Microsoft.Toolkit.Parsers.dll;Microsoft.Toolkit.Uwp.dll;Microsoft.Toolkit.Uwp.pri;Microsoft.Toolkit.Uwp.UI.Animations.dll;Microsoft.Toolkit.Uwp.UI.Animations.pri;Microsoft.Toolkit.Uwp.UI.Controls.dll;Microsoft.Toolkit.Uwp.UI.Controls.pri;Microsoft.Toolkit.Uwp.UI.dll;Microsoft.Toolkit.Uwp.UI.pri;Microsoft.Toolkit.Win32.UI.XamlHost.dll;Microsoft.Toolkit.Win32.UI.XamlHost.Managed.dll;Microsoft.Toolkit.Win32.UI.XamlHost.pri;Microsoft.Toolkit.Win32.UI.XamlHost.winmd;Microsoft.Toolkit.Win32.UI.XamlHost.xml;Microsoft.Toolkit.Wpf.UI.XamlHost.dll;Microsoft.UI.Xaml.dll;Microsoft.UI.Xaml.pri;Microsoft.UI.Xaml.winmd;Microsoft.VisualBasic.dll;Microsoft.Win32.Primitives.dll;Microsoft.Xaml.Interactions.dll;Microsoft.Xaml.Interactions.pri;Microsoft.Xaml.Interactivity.dll;Microsoft.Xaml.Interactivity.pri;Mono.Cecil.dll;Mono.Cecil.Mdb.dll;Mono.Cecil.Pdb.dll;Mono.Cecil.Rocks.dll;mscorlib.dll;msvcp140_1_app.dll;msvcp140_2_app.dll;msvcp140_app.dll;netstandard.dll;Newtonsoft.Json.dll;NHotkey.dll;NHotkey.Wpf.dll;NLog.dll;NLog.Extensions.Logging.dll;NLog.Web.AspNetCore.dll;NoiseAsset_256x256_PNG.png;Pinyin4Net.dll;PowerLauncher.deps.json;PowerLauncher.dll;PowerLauncher.exe;PowerLauncher.runtimeconfig.dev.json;PowerLauncher.runtimeconfig.json;PowerLauncher.UI.exe;PowerLauncher.UI.xr.xml;PropertyChanged.dll;resources.pri;ResultList.xbf;SQLite.Interop.dll;System.AppContext.dll;System.Buffers.dll;System.Collections.Concurrent.dll;System.Collections.dll;System.Collections.Immutable.dll;System.Collections.NonGeneric.dll;System.Collections.Specialized.dll;System.ComponentModel.Annotations.dll;System.ComponentModel.Composition.dll;System.ComponentModel.DataAnnotations.dll;System.ComponentModel.dll;System.ComponentModel.EventBasedAsync.dll;System.ComponentModel.Primitives.dll;System.ComponentModel.TypeConverter.dll;System.Configuration.dll;System.Console.dll;System.Core.dll;System.Data.Common.dll;System.Data.dll;System.Data.OleDb.dll;System.Data.SqlClient.dll;System.Data.SQLite.dll;System.Diagnostics.Contracts.dll;System.Diagnostics.Debug.dll;System.Diagnostics.DiagnosticSource.dll;System.Diagnostics.FileVersionInfo.dll;System.Diagnostics.Process.dll;System.Diagnostics.StackTrace.dll;System.Diagnostics.TextWriterTraceListener.dll;System.Diagnostics.Tools.dll;System.Diagnostics.TraceSource.dll;System.Diagnostics.Tracing.dll;System.dll;System.Drawing.dll;System.Drawing.Primitives.dll;System.Dynamic.Runtime.dll;System.Globalization.Calendars.dll;System.Globalization.dll;System.Globalization.Extensions.dll;System.IO.Compression.dll;System.IO.Compression.FileSystem.dll;System.IO.Compression.ZipFile.dll;System.IO.dll;System.IO.FileSystem.dll;System.IO.FileSystem.DriveInfo.dll;System.IO.FileSystem.Primitives.dll;System.IO.FileSystem.Watcher.dll;System.IO.IsolatedStorage.dll;System.IO.MemoryMappedFiles.dll;System.IO.Pipes.AccessControl.dll;System.IO.Pipes.dll;System.IO.Ports.dll;System.IO.UnmanagedMemoryStream.dll;System.Linq.dll;System.Linq.Expressions.dll;System.Linq.Parallel.dll;System.Linq.Queryable.dll;System.Memory.dll;System.Net.dll;System.Net.Http.dll;System.Net.Http.Rtc.dll;System.Net.HttpListener.dll;System.Net.Mail.dll;System.Net.NameResolution.dll;System.Net.NetworkInformation.dll;System.Net.Ping.dll;System.Net.Primitives.dll;System.Net.Requests.dll;System.Net.Security.dll;System.Net.ServicePoint.dll;System.Net.Sockets.dll;System.Net.WebClient.dll;System.Net.WebHeaderCollection.dll;System.Net.WebProxy.dll;System.Net.WebSockets.Client.dll;System.Net.WebSockets.dll;System.Numerics.dll;System.Numerics.Vectors.dll;System.Numerics.Vectors.WindowsRuntime.dll;System.ObjectModel.dll;System.Private.DataContractSerialization.dll;System.Private.Reflection.Metadata.Ecma335.dll;System.Private.ServiceModel.dll;System.Private.Uri.dll;System.Private.Xml.dll;System.Private.Xml.Linq.dll;System.Reflection.Context.dll;System.Reflection.DispatchProxy.dll;System.Reflection.dll;System.Reflection.Emit.dll;System.Reflection.Emit.ILGeneration.dll;System.Reflection.Emit.Lightweight.dll;System.Reflection.Extensions.dll;System.Reflection.Metadata.dll;System.Reflection.Primitives.dll;System.Reflection.TypeExtensions.dll;System.Resources.Reader.dll;System.Resources.ResourceManager.dll;System.Resources.Writer.dll;System.Runtime.CompilerServices.Unsafe.dll;System.Runtime.CompilerServices.VisualC.dll;System.Runtime.dll;System.Runtime.Extensions.dll;System.Runtime.Handles.dll;System.Runtime.InteropServices.dll;System.Runtime.InteropServices.RuntimeInformation.dll;System.Runtime.InteropServices.WindowsRuntime.dll;System.Runtime.Numerics.dll;System.Runtime.Serialization.dll;System.Runtime.Serialization.Formatters.dll;System.Runtime.Serialization.Json.dll;System.Runtime.Serialization.Primitives.dll;System.Runtime.Serialization.Xml.dll;System.Runtime.WindowsRuntime.dll;System.Runtime.WindowsRuntime.UI.Xaml.dll;System.Security.AccessControl.dll;System.Security.Claims.dll;System.Security.Cryptography.Algorithms.dll;System.Security.Cryptography.Cng.dll;System.Security.Cryptography.Csp.dll;System.Security.Cryptography.Encoding.dll;System.Security.Cryptography.Primitives.dll;System.Security.Cryptography.X509Certificates.dll;System.Security.dll;System.Security.Permissions.dll;System.Security.Principal.dll;System.Security.Principal.Windows.dll;System.Security.SecureString.dll;System.ServiceModel.dll;System.ServiceModel.Duplex.dll;System.ServiceModel.Http.dll;System.ServiceModel.NetTcp.dll;System.ServiceModel.Primitives.dll;System.ServiceModel.Security.dll;System.ServiceModel.Web.dll;System.ServiceProcess.dll;System.Text.Encoding.CodePages.dll;System.Text.Encoding.dll;System.Text.Encoding.Extensions.dll;System.Text.RegularExpressions.dll;System.Threading.dll;System.Threading.Overlapped.dll;System.Threading.Tasks.Dataflow.dll;System.Threading.Tasks.dll;System.Threading.Tasks.Extensions.dll;System.Threading.Tasks.Parallel.dll;System.Threading.Thread.dll;System.Threading.ThreadPool.dll;System.Threading.Timer.dll;System.Transactions.dll;System.Transactions.Local.dll;System.ValueTuple.dll;System.Web.dll;System.Web.HttpUtility.dll;System.Windows.dll;System.Xml.dll;System.Xml.Linq.dll;System.Xml.ReaderWriter.dll;System.Xml.Serialization.dll;System.Xml.XDocument.dll;System.Xml.XmlDocument.dll;System.Xml.XmlSerializer.dll;System.Xml.XPath.dll;System.Xml.XPath.XDocument.dll;vcamp140_app.dll;vccorlib140_app.dll;vcomp140_app.dll;vcruntime140_1_app.dll;vcruntime140_app.dll;WindowsBase.dll;WindowsInput.dll;Wox.Core.deps.json;Wox.Core.dll;Wox.deps.json;Wox.dll;Wox.exe;Wox.Infrastructure.deps.json;Wox.Infrastructure.dll;Wox.Plugin.deps.json;Wox.Plugin.dll;Wox.runtimeconfig.dev.json;Wox.runtimeconfig.json;PowerToysInterop.dll?>
           <File Id="File_$(var.File)" Source="$(var.BinX64Dir)modules\launcher\$(var.File)" />
         <?endforeach?>
         <File Source="$(var.BinX64Dir)SettingsUIRunner\Microsoft.PowerToys.Settings.UI.Lib.dll" />
-        <File Id="Launcher_PowerToysInterop" Source="$(var.BinX64Dir)PowerToysInterop.dll" />
       </Component>  
       <Component Id="launcherAssetsComponent" Directory="AssetsFolder" Guid="6A86A414-D68B-49F0-A7AD-A342528D7ACD">
         <?foreach File in LockScreenLogo.scale-200.png;SplashScreen.scale-200.png;Square150x150Logo.scale-200.png;Square44x44Logo.scale-200.png;Square44x44Logo.targetsize-24_altform-unplated.png;StoreLogo.png;Wide310x150Logo.scale-200.png?>
diff --git a/src/common/interop/interop.h b/src/common/interop/interop.h
index 9690d50880..07d5ac517f 100644
--- a/src/common/interop/interop.h
+++ b/src/common/interop/interop.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <common\keyboard_layout.h>
-#include <common\two_way_pipe_message_ipc.h>
+#include "..\keyboard_layout.h"
+#include "..\two_way_pipe_message_ipc.h"
 #include <msclr\marshal.h>
 #include <msclr\marshal_cppstd.h>
 #include <functional>
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Runner/Microsoft.PowerToys.Settings.UI.Runner.csproj b/src/core/Microsoft.PowerToys.Settings.UI.Runner/Microsoft.PowerToys.Settings.UI.Runner.csproj
index f47464c1ca..5eea92d8c5 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Runner/Microsoft.PowerToys.Settings.UI.Runner.csproj
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Runner/Microsoft.PowerToys.Settings.UI.Runner.csproj
@@ -18,6 +18,7 @@
     <Platforms>x64</Platforms>
     <ApplicationIcon>icon.ico</ApplicationIcon>
     <Win32Resource />
+    <RuntimeIdentifiers>win-x64</RuntimeIdentifiers>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
     
@@ -63,6 +64,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="Microsoft.VCRTForwarders.140" Version="1.0.6" />
   </ItemGroup>
 
   <ItemGroup>
@@ -70,8 +72,8 @@
     <ProjectReference Include="..\Microsoft.PowerToys.Settings.UI\Microsoft.PowerToys.Settings.UI.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Update="Microsoft.VCRTForwarders.140" Version="1.0.5" />
-  </ItemGroup>
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+    <Exec Command="rem Check required to avoid a recursive loop of building&#xD;&#xA;&#xD;&#xA;IF NOT DEFINED settingsBuildEventCompleted (&#xD;&#xA;setlocal enableDelayedExpansion&#xD;&#xA;SET settingsProfileFolderName=Properties\PublishProfiles\&#xD;&#xA;&#xD;&#xA;rem Create the publish profile folder if it doesn't exist&#xD;&#xA;IF NOT EXIST !settingsProfileFolderName! (mkdir !settingsProfileFolderName!)&#xD;&#xA;SET settingsProfileFileName=SettingsProfile.pubxml&#xD;&#xA;SET settingsPublishProfile=!settingsProfileFolderName!!settingsProfileFileName!&#xD;&#xA;&#xD;&#xA;rem Create the publish profile pubxml&#xD;&#xA;echo ^&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?^&gt; &gt; !settingsPublishProfile!&#xD;&#xA;echo ^&lt;^^!-- &gt;&gt; !settingsPublishProfile!&#xD;&#xA;echo https://go.microsoft.com/fwlink/?LinkID=208121.  &gt;&gt; !settingsPublishProfile!&#xD;&#xA;echo --^&gt; &gt;&gt; !settingsPublishProfile!&#xD;&#xA;echo ^&lt;Project ToolsVersion=&quot;4.0&quot; xmlns=&quot;http://schemas.microsoft.com/developer/msbuild/2003&quot;^&gt; &gt;&gt; !settingsPublishProfile!&#xD;&#xA;echo   ^&lt;PropertyGroup^&gt; &gt;&gt; !settingsPublishProfile!&#xD;&#xA;echo     ^&lt;PublishProtocol^&gt;FileSystem^&lt;/PublishProtocol^&gt; &gt;&gt; !settingsPublishProfile!&#xD;&#xA;echo     ^&lt;Configuration^&gt;$(ConfigurationName)^&lt;/Configuration^&gt; &gt;&gt; !settingsPublishProfile!&#xD;&#xA;echo     ^&lt;Platform^&gt;$(PlatformName)^&lt;/Platform^&gt; &gt;&gt; !settingsPublishProfile!&#xD;&#xA;echo     ^&lt;TargetFramework^&gt;netcoreapp3.1^&lt;/TargetFramework^&gt; &gt;&gt; !settingsPublishProfile!&#xD;&#xA;echo     ^&lt;PublishDir^&gt;..\..\..\$(PlatformName)\$(ConfigurationName)\SettingsUIRunner^&lt;/PublishDir^&gt; &gt;&gt; !settingsPublishProfile!&#xD;&#xA;echo     ^&lt;RuntimeIdentifier^&gt;win-x64^&lt;/RuntimeIdentifier^&gt; &gt;&gt; !settingsPublishProfile!&#xD;&#xA;echo     ^&lt;SelfContained^&gt;false^&lt;/SelfContained^&gt; &gt;&gt; !settingsPublishProfile!&#xD;&#xA;echo     ^&lt;PublishSingleFile^&gt;False^&lt;/PublishSingleFile^&gt; &gt;&gt; !settingsPublishProfile!&#xD;&#xA;echo     ^&lt;PublishReadyToRun^&gt;False^&lt;/PublishReadyToRun^&gt; &gt;&gt; !settingsPublishProfile!&#xD;&#xA;echo   ^&lt;/PropertyGroup^&gt; &gt;&gt; !settingsPublishProfile!&#xD;&#xA;echo ^&lt;/Project^&gt; &gt;&gt; !settingsPublishProfile!&#xD;&#xA;&#xD;&#xA;rem Set a variable to know that the publish event is called to avoid it being called again&#xD;&#xA;SET settingsBuildEventCompleted=1&#xD;&#xA;&#xD;&#xA;rem In case of Release we should not use Debug CRT in VCRT forwarders&#xD;&#xA;IF $(ConfigurationName)==Release (&#xD;&#xA;&quot;$(MSBuildBinPath)\msbuild.exe&quot; Microsoft.PowerToys.Settings.UI.Runner.csproj -t:Build -p:Configuration=&quot;$(ConfigurationName)&quot; -p:Platform=&quot;$(PlatformName)&quot; -p:AppxBundle=Never -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=!settingsProfileFileName!&#xD;&#xA;) ELSE (&#xD;&#xA;&quot;$(MSBuildBinPath)\msbuild.exe&quot; Microsoft.PowerToys.Settings.UI.Runner.csproj -t:Build -p:Configuration=&quot;$(ConfigurationName)&quot; -p:Platform=&quot;$(PlatformName)&quot; -p:AppxBundle=Never -p:PublishProfile=!settingsProfileFileName!&#xD;&#xA;)&#xD;&#xA;SET settingsBuildEventCompleted=&#xD;&#xA;)&#xD;&#xA;" />
+  </Target>
 
 </Project>
\ No newline at end of file
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj b/src/core/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj
index cf6096972f..136f08e92a 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj
+++ b/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)' == 'x64' ">Debug</Configuration>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
     <ProjectGuid>{A7D5099E-F0FD-4BF3-8522-5A682759F915}</ProjectGuid>
     <OutputType>AppContainerExe</OutputType>
@@ -116,6 +116,7 @@
     <Content Include="Assets\Square150x150Logo.scale-200.png" />
     <Content Include="Assets\Square44x44Logo.scale-200.png" />
     <Content Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
+    <Content Include="Assets\StoreLogo.png" />
     <Content Include="Assets\StoreLogo.scale-100.png" />
     <Content Include="Assets\Wide310x150Logo.scale-200.png" />
     <Content Include="Properties\Default.rd.xml" />
@@ -239,11 +240,11 @@
     <EnableXBindDiagnostics>false</EnableXBindDiagnostics>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
   -->
 </Project>
\ No newline at end of file
diff --git a/src/modules/launcher/Directory.Build.targets b/src/modules/launcher/Directory.Build.targets
index cba92d64e1..3aa2a46b34 100644
--- a/src/modules/launcher/Directory.Build.targets
+++ b/src/modules/launcher/Directory.Build.targets
@@ -1,14 +1,11 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   
    <Target Name="KillPowerLauncher" BeforeTargets="PreBuildEvent;BeforeClean">
-    <Message Text="Killing process 'PowerLauncher.exe'" Importance="normal" ContinueOnError="true" />
-     <Exec Command="taskkill /F /IM PowerLauncher.exe"
-              IgnoreExitCode="true"
-              IgnoreStandardErrorWarningFormat="true">
+    <Message Text="Killing process 'PowerLauncher.exe'" Importance="normal" ContinueOnError="false" />
+     <Exec Command="tasklist /FI &quot;IMAGENAME eq PowerLauncher.exe&quot; 2&gt;NUL | find /I /N &quot;PowerLauncher.exe&quot;&gt;NUL &#xD;&#xA; if %25ERRORLEVEL%25==0 ( taskkill /f /im PowerLauncher.exe )"
+              IgnoreExitCode="true">
        <Output TaskParameter="ExitCode" PropertyName="ErrorCode"/>
      </Exec>
-     <Error Text="Cannot kill PowerLauncher.exe process." Condition="$(ErrorCode) == 1"/>
-     <Message Text="Process PowerLauncher.exe does not exist." Condition="$(ErrorCode) == 128"/>
   </Target>
 
 </Project>
\ No newline at end of file
diff --git a/src/modules/launcher/PowerLauncher.UI/PowerLauncher.UI.csproj b/src/modules/launcher/PowerLauncher.UI/PowerLauncher.UI.csproj
index 1cebeb6ee4..298ae7cc07 100644
--- a/src/modules/launcher/PowerLauncher.UI/PowerLauncher.UI.csproj
+++ b/src/modules/launcher/PowerLauncher.UI/PowerLauncher.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)' == 'x64' ">Debug</Configuration>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
     <ProjectGuid>{4A3DE70C-684C-410D-B851-C23B6DAEDF16}</ProjectGuid>
     <OutputType>AppContainerExe</OutputType>
diff --git a/src/modules/launcher/PowerLauncher/PowerLauncher.csproj b/src/modules/launcher/PowerLauncher/PowerLauncher.csproj
index f80d2a7e79..7397c7f1d7 100644
--- a/src/modules/launcher/PowerLauncher/PowerLauncher.csproj
+++ b/src/modules/launcher/PowerLauncher/PowerLauncher.csproj
@@ -7,7 +7,8 @@
     <UseWindowsForms>true</UseWindowsForms>
     <StartupObject>PowerLauncher.App</StartupObject>
     <ApplicationIcon>Resources\placeholderLauncher.ico</ApplicationIcon>
-    <ApplicationManifest>app.manifest</ApplicationManifest>
+    <ApplicationManifest>app.manifest</ApplicationManifest>    
+    <RuntimeIdentifiers>win-x64</RuntimeIdentifiers>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
     <Platforms>x64</Platforms>
@@ -16,7 +17,7 @@
 
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutputPath>..\..\..\..\x64\Debug\modules\launcher\</OutputPath>
+    <OutputPath>..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
@@ -29,7 +30,7 @@
 
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutputPath>..\..\..\..\x64\Release\modules\launcher\</OutputPath>
+    <OutputPath>..\..\..\..\$(Platform)\$(Configuration)\modules\launcher\</OutputPath>
     <DefineConstants>TRACE;RELEASE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -73,7 +74,8 @@
     <PackageReference Include="PropertyChanged.Fody" Version="3.2.8" />
     <PackageReference Include="System.Data.SQLite" Version="1.0.112" />
     <PackageReference Include="System.Data.SQLite.Core" Version="1.0.112.1" />
-    <PackageReference Include="System.Runtime" Version="4.3.1" />
+    <PackageReference Include="System.Runtime" Version="4.3.1" />    
+    <PackageReference Include="Microsoft.VCRTForwarders.140" Version="1.0.6" />
   </ItemGroup>
 
   <ItemGroup>
@@ -191,7 +193,4 @@
     </None>
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Update="Microsoft.VCRTForwarders.140" Version="1.0.6" />
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj b/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj
index db5af81b55..9a32103df9 100644
--- a/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj
+++ b/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj
@@ -64,8 +64,8 @@
     <PackageReference Include="System.Runtime" Version="4.3.1" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\core\Microsoft.PowerToys.Settings.UI.Lib\Microsoft.PowerToys.Settings.UI.Lib.csproj" />
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\core\Microsoft.PowerToys.Settings.UI.Lib\Microsoft.PowerToys.Settings.UI.Lib.csproj" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file