[General]Reduce installer size by flattening application paths (#27451)

* Flatten everything and succeed build

* Figure out Settings assets

* Remove UseCommonOutputDirectory tag

* Proper settings app path

* [VCM] Fix assets location

* Fix some runtime paths

* [RegistryPreview]Use MRTCore specific pri file

* [Hosts]Use MRTCore specific pri file

* [Settings]Use MRTCore specific pri file

* [Peek]Use MRTCore specific pri file

* [FileLocksmith]Use MRTCore specific pri file

* [ScreenRuler]Use MRTCore specific pri file

* [PowerRename]Use MRTCore specific pri file

* [Peek]Move assets to own folder

* [FileLocksmith] Use own Assets path

* [Hosts]Use own assets folder

* [PowerRename]Use own assets dir

* [MeasureTool] Use its own assets folder

* [ImageResizer]Use its own assets path

* Fix spellcheck

* Fix tab instead of space in project files

* Normalize target frameworks and platforms

* Remove WINRT_NO_MAKE_DETECTION flag. No longer needed?

* Fix AOT and Hosts locations

* Fix Dll version differences on dependency

* Add Common.UI.csproj as refernce to fix dll versions

* Update ControlzEx to normalize dll versions

* Update System.Management version to 7.0.2

* Add GPOWrapper to Registry Preview to fix dll versions

* [PTRun]Reference Microsoft.Extensions.Hosting to fix dll versions

* Fix remaining output paths / dll version conflicts

* [KeyboardManager]Executables still on their own directories

* Fix Monaco paths

* WinAppSDK apps get to play outside again

* Enable VCM settings again

* Fix KBM Editor path again

* [Monaco]Set to own Assets dir

* Fix installer preamble; Fix publish. remove unneeded publishes

* Remove Hardlink functions

* Installer builds again (still needs work to work)

* Readd Monaco to spellcheck excludes

* Fix spellcheck and call publish.cmd again

* [Installer] Remove components that don't need own dirs

* [Installer] Refactor Power Launcher

* [Installer] Refactor Color Picker

* [Installer] Refactor Monaco assets

* [Installer]Generate File script no longer needs to remove files

* [Installer]Refactor FileLocksmith

* [Installer] Refactor Hosts

* [Installer]Refactor Image Resizer

* [Installer]Refactor MouseUtils

* [Installer]Refactor MWB

* [Installer]Refactor MeasureTool

* [Installer]Refactor Peek

* [Installer]Refactor PowerRename and registry fixes

* [Installer]Refactor RegistryPreview

* [Installer]Refactor ShortcutGuide

* [Installer]Refactor Settings

* [Installer]Clean up some unused stuff

* [Installer]Clean up stuff for user install

* [Installer]Fix WinUi3Apps wxs

* [Installer]Fix misplaced folders

* [Installer]Move x86 VCM dll to right path

* Fix monaco language list location

* [Installer]Fix VCM directory reference

* [CI]Fix signing

* [Installer] Fix resources folder for release CI

* [ci]Looks like we still ship NLog on PowerToys Run

* [Settings]Add dependency to avoid dll collision with Experimentation

* [RegistryPreview]Move XAML files to own path

* [RegistryPreview]Fix app icon

* [Hosts]Move XAML files to their own path

* [FileLocksmith]Move XAML files to their own path

* [Peek]Move XAML files to own path

* [ScreenRuler]Move XAML files to its own path

* [Settings]Move XAML to its own path

* [ColorPicker]Move Resources to Assets

* [ShortcutGuide]Move svgs to own Assets path

* [Awake]Move images to assets path

* [Runner]Remove debug checks for PowerToys Run assets

* [PTRun]Move images to its own assets path

* [ImageResizer]Icon for context menu on own assets path

* [PowerRename]Move ico to its own path

* Remove unneeded intermediary directories

* Remove further int dirs

* Move tests to its own output path

* Fix spellcheck

* spellcheck: remove warnings

* [CppAnalyzers]Ignore rule in a tool

* [CI]Check if all deps.json files reference same versions

* fix spellcheck

* [ci]Fix task identation

* [ci]Add script to guard against asset conflicts

* [ci]Add more deps.json audit steps in the release build

* Add xbf to spellcheck expects

* Fix typo in asset conflict check scripts

* Fix some more dependency conflicts

* Downgrade CsWinRT to have the same dll version as sdk

* [ci]Do a recursive check for every deps.json

* Fix spellcheck error inside comment

* [ci]Fix asset script error

* [ci]Name deps.json verify tasks a bit better

* [ci]Improve deps json verify script output

* [ci]Update WinRT version to the same running in CI

* Also upgrade CsWinRT in NOTICE.MD

* [PowerRename]Move XAML files to own path

* [Common]Fix Settings executable path

* [ci]Verify there's no xbf files in app directories

* [installer]Fix firewall path

* [Monaco]Move new files to their proper assets path

* [Monaco]Fix paths for new files after merge

* [Feedback]Removed unneeded build conditions

* [Feedback]Clear vcxproj direct reference to frameworks

* [Feedback]RunPlugins name to hold PTRun plugins

* [Feedback]Remove unneeded foreach

* [Feedback]Shortcut Guide svgs with ** in project file

* [Feedback]Fix spellcheck

src/modules/peek/Peek.Common/Helpers/ReadableStringHelper.cs

@@ -5,7 +5,6 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using Windows.ApplicationModel.Resources;
 
 namespace Peek.Common.Helpers
 {
@@ -15,7 +14,7 @@ namespace Peek.Common.Helpers
 
         public static string BytesToReadableString(ulong bytes)
         {
-            var resourceLoader = ResourceLoader.GetForViewIndependentUse();
+            var resourceLoader = ResourceLoaderInstance.ResourceLoader;
             List<string> format = new List<string>
             {
                 resourceLoader.GetString("ReadableString_ByteAbbreviationFormat"),     // "B"
@@ -41,7 +40,7 @@ namespace Peek.Common.Helpers
 
         public static string FormatResourceString(string resourceId, object? args)
         {
-            var formatString = ResourceLoader.GetForViewIndependentUse()?.GetString(resourceId);
+            var formatString = ResourceLoaderInstance.ResourceLoader.GetString(resourceId);
             var formattedString = string.IsNullOrEmpty(formatString) ? string.Empty : string.Format(CultureInfo.InvariantCulture, formatString, args);
 
             return formattedString;
@@ -49,7 +48,7 @@ namespace Peek.Common.Helpers
 
         public static string FormatResourceString(string resourceId, object? args0, object? args1)
         {
-            var formatString = ResourceLoader.GetForViewIndependentUse()?.GetString(resourceId);
+            var formatString = ResourceLoaderInstance.ResourceLoader.GetString(resourceId);
             var formattedString = string.IsNullOrEmpty(formatString) ? string.Empty : string.Format(CultureInfo.InvariantCulture, formatString, args0, args1);
 
             return formattedString;

src/modules/peek/Peek.Common/Helpers/ResourceLoaderInstance.cs

@@ -0,0 +1,17 @@
+// 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 Microsoft.Windows.ApplicationModel.Resources;
+
+namespace Peek.Common.Helpers
+{
+    public static class ResourceLoaderInstance
+    {
+        public static ResourceLoader ResourceLoader { get; private set; }
+
+        static ResourceLoaderInstance()
+        {
+            ResourceLoader = new Microsoft.Windows.ApplicationModel.Resources.ResourceLoader("PowerToys.Peek.UI.pri");
+        }
+    }
+}

src/modules/peek/Peek.Common/Peek.Common.csproj

@@ -1,8 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\..\Version.props" />
   <PropertyGroup>
-    <TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
+    <TargetFramework>net7.0-windows10.0.20348.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
+    <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
     <RootNamespace>Peek.Common</RootNamespace>
     <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
     <UseWinUI>true</UseWinUI>

src/modules/peek/Peek.FilePreviewer/FilePreview.xaml.cs

@@ -20,7 +20,6 @@ using Peek.FilePreviewer.Models;
 using Peek.FilePreviewer.Previewers;
 using Peek.FilePreviewer.Previewers.Interfaces;
 using Peek.UI.Telemetry.Events;
-using Windows.ApplicationModel.Resources;
 
 namespace Peek.FilePreviewer
 {
@@ -55,7 +54,7 @@ namespace Peek.FilePreviewer
         private IPreviewer? previewer;
 
         [ObservableProperty]
-        private string imageInfoTooltip = ResourceLoader.GetForViewIndependentUse().GetString("PreviewTooltip_Blank");
+        private string imageInfoTooltip = ResourceLoaderInstance.ResourceLoader.GetString("PreviewTooltip_Blank");
 
         private CancellationTokenSource _cancellationTokenSource = new();
 

src/modules/peek/Peek.FilePreviewer/Peek.FilePreviewer.csproj

@@ -1,8 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\..\Version.props" />
   <PropertyGroup>
-    <TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
+    <TargetFramework>net7.0-windows10.0.20348.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
+    <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
     <RootNamespace>Peek.FilePreviewer</RootNamespace>
     <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
     <UseWinUI>true</UseWinUI>

src/modules/peek/Peek.FilePreviewer/Previewers/Archives/ArchivePreviewer.cs

@@ -23,7 +23,6 @@ using Peek.FilePreviewer.Previewers.Interfaces;
 using SharpCompress.Archives;
 using SharpCompress.Common;
 using SharpCompress.Readers;
-using Windows.ApplicationModel.Resources;
 
 namespace Peek.FilePreviewer.Previewers.Archives
 {
@@ -105,9 +104,9 @@ namespace Peek.FilePreviewer.Previewers.Archives
             }
 
             _size = (ulong)new FileInfo(Item.Path).Length; // archive.TotalSize isn't accurate
-            DirectoryCountText = string.Format(CultureInfo.CurrentCulture, ResourceLoader.GetForViewIndependentUse().GetString("Archive_Directory_Count"), _directoryCount);
-            FileCountText = string.Format(CultureInfo.CurrentCulture, ResourceLoader.GetForViewIndependentUse().GetString("Archive_File_Count"), _fileCount);
-            SizeText = string.Format(CultureInfo.CurrentCulture, ResourceLoader.GetForViewIndependentUse().GetString("Archive_Size"), ReadableStringHelper.BytesToReadableString(_size), ReadableStringHelper.BytesToReadableString(_extractedSize));
+            DirectoryCountText = string.Format(CultureInfo.CurrentCulture, ResourceLoaderInstance.ResourceLoader.GetString("Archive_Directory_Count"), _directoryCount);
+            FileCountText = string.Format(CultureInfo.CurrentCulture, ResourceLoaderInstance.ResourceLoader.GetString("Archive_File_Count"), _fileCount);
+            SizeText = string.Format(CultureInfo.CurrentCulture, ResourceLoaderInstance.ResourceLoader.GetString("Archive_Size"), ReadableStringHelper.BytesToReadableString(_size), ReadableStringHelper.BytesToReadableString(_extractedSize));
 
             State = PreviewState.Loaded;
         }

src/modules/peek/Peek.FilePreviewer/Previewers/UnsupportedFilePreviewer/UnsupportedFilePreviewer.cs

@@ -105,7 +105,7 @@ namespace Peek.FilePreviewer.Previewers
 
                     isIconValid = iconBitmap != null;
 
-                    Preview.IconPreview = iconBitmap ?? new SvgImageSource(new Uri("ms-appx:///Assets/DefaultFileIcon.svg"));
+                    Preview.IconPreview = iconBitmap ?? new SvgImageSource(new Uri("ms-appx:///Assets/Peek/DefaultFileIcon.svg"));
                 });
             });
 

src/modules/peek/Peek.UI/Package.appxmanifest

@@ -14,7 +14,7 @@
   <Properties>
     <DisplayName>Peek.UI</DisplayName>
     <PublisherDisplayName>sachaple</PublisherDisplayName>
-    <Logo>Assets\StoreLogo.png</Logo>
+    <Logo>Assets\Peek\StoreLogo.png</Logo>
   </Properties>
 
   <Dependencies>
@@ -34,10 +34,10 @@
         DisplayName="Peek.UI"
         Description="Peek.UI"
         BackgroundColor="transparent"
-        Square150x150Logo="Assets\Square150x150Logo.png"
-        Square44x44Logo="Assets\Square44x44Logo.png">
-        <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png" />
-        <uap:SplashScreen Image="Assets\SplashScreen.png" />
+        Square150x150Logo="Assets\Peek\Square150x150Logo.png"
+        Square44x44Logo="Assets\Peek\Square44x44Logo.png">
+        <uap:DefaultTile Wide310x150Logo="Assets\Peek\Wide310x150Logo.png" />
+        <uap:SplashScreen Image="Assets\Peek\SplashScreen.png" />
       </uap:VisualElements>
     </Application>
   </Applications>

src/modules/peek/Peek.UI/Peek.UI.csproj

@@ -6,9 +6,10 @@
     <AssemblyDescription>PowerToys Peek UI</AssemblyDescription>
     <RootNamespace>Peek.UI</RootNamespace>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
+    <TargetFramework>net7.0-windows10.0.20348.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
-    <OutputPath>..\..\..\..\$(Platform)\$(Configuration)\modules\Peek\</OutputPath>
+    <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
+    <OutputPath>..\..\..\..\$(Platform)\$(Configuration)\WinUI3Apps</OutputPath>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <Platforms>x86;x64;ARM64</Platforms>
     <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
@@ -21,10 +22,19 @@
     <WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
     <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
     <Nullable>Enable</Nullable>
-    <ApplicationIcon>Assets\Icon.ico</ApplicationIcon>
-	<SelfContained>true</SelfContained>
+    <ApplicationIcon>Assets\Peek\Icon.ico</ApplicationIcon>
+    <!-- MRT from windows app sdk will search for a pri file with the same name of the module before defaulting to resources.pri -->
+    <ProjectPriFileName>PowerToys.Peek.UI.pri</ProjectPriFileName>
+    <SelfContained>true</SelfContained>
   </PropertyGroup>
-	
+
+  <ItemGroup>
+    <Page Remove="PeekXAML\App.xaml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="PeekXAML\App.xaml" />
+  </ItemGroup>
+
   <!-- SelfContained=true requires RuntimeIdentifier to be set -->
   <PropertyGroup Condition="'$(Platform)'=='x64'">
     <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
@@ -41,14 +51,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-      <Content Include="Assets\Icon.ico" />
+      <Content Include="Assets\Peek\Icon.ico" />
   </ItemGroup>
   <ItemGroup>
-    <None Remove="Assets\AppList.scale-100.png" />
-    <None Remove="Assets\AppList.scale-125.png" />
-    <None Remove="Assets\AppList.scale-150.png" />
-    <None Remove="Assets\AppList.scale-200.png" />
-    <None Remove="Assets\AppList.scale-400.png" />
+    <None Remove="Assets\Peek\AppList.scale-100.png" />
+    <None Remove="Assets\Peek\AppList.scale-125.png" />
+    <None Remove="Assets\Peek\AppList.scale-150.png" />
+    <None Remove="Assets\Peek\AppList.scale-200.png" />
+    <None Remove="Assets\Peek\AppList.scale-400.png" />
     <None Remove="Views\TitleBar.xaml" />
     <None Remove="Views\UnsupportedFile.xaml" />
   </ItemGroup>
@@ -103,7 +113,7 @@
     <ProjectReference Include="..\Peek.FilePreviewer\Peek.FilePreviewer.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="Assets\Icon.ico" />
+    <Resource Include="Assets\Peek\Icon.ico" />
   </ItemGroup>
   <ItemGroup>
     <Page Update="Views\UnsupportedFile.xaml">

src/modules/peek/Peek.UI/PeekXAML/Views/TitleBar.xaml

@@ -40,7 +40,7 @@
                 Height="24"
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center"
-                Source="../Assets/AppList.scale-400.png"
+                Source="../../Assets/Peek/AppList.scale-400.png"
                 Stretch="UniformToFill" />
 
             <Grid

src/modules/peek/Peek.UI/PeekXAML/Views/TitleBar.xaml.cs

@@ -13,11 +13,11 @@ using Microsoft.UI;
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
+using Peek.Common.Helpers;
 using Peek.Common.Models;
 using Peek.UI.Extensions;
 using Peek.UI.Helpers;
 using Peek.UI.Telemetry.Events;
-using Windows.ApplicationModel.Resources;
 using Windows.Graphics;
 using Windows.Storage;
 using Windows.System;
@@ -57,10 +57,10 @@ namespace Peek.UI.Views
                new PropertyMetadata(null, null));
 
         [ObservableProperty]
-        private string openWithAppText = ResourceLoader.GetForViewIndependentUse().GetString("LaunchAppButton_OpenWith_Text");
+        private string openWithAppText = ResourceLoaderInstance.ResourceLoader.GetString("LaunchAppButton_OpenWith_Text");
 
         [ObservableProperty]
-        private string openWithAppToolTip = ResourceLoader.GetForViewIndependentUse().GetString("LaunchAppButton_OpenWith_ToolTip");
+        private string openWithAppToolTip = ResourceLoaderInstance.ResourceLoader.GetString("LaunchAppButton_OpenWith_ToolTip");
 
         [ObservableProperty]
         private string? fileCountText;
@@ -120,7 +120,7 @@ namespace Peek.UI.Views
                 // Set window icon
                 WindowId windowId = Win32Interop.GetWindowIdFromWindow(hWnd);
                 AppWindow appWindow = AppWindow.GetFromWindowId(windowId);
-                appWindow.SetIcon("Assets/Icon.ico");
+                appWindow.SetIcon("Assets/Peek/Icon.ico");
             }
         }
 
@@ -175,7 +175,7 @@ namespace Peek.UI.Views
 
         public string PinToolTip(bool pinned)
         {
-            return pinned ? ResourceLoader.GetForViewIndependentUse().GetString("UnpinButton_ToolTip") : ResourceLoader.GetForViewIndependentUse().GetString("PinButton_ToolTip");
+            return pinned ? ResourceLoaderInstance.ResourceLoader.GetString("UnpinButton_ToolTip") : ResourceLoaderInstance.ResourceLoader.GetString("PinButton_ToolTip");
         }
 
         [RelayCommand]
@@ -267,7 +267,7 @@ namespace Peek.UI.Views
             // Update file count
             if (NumberOfFiles > 1)
             {
-                string fileCountTextFormat = ResourceLoader.GetForViewIndependentUse().GetString("AppTitle_FileCounts_Text");
+                string fileCountTextFormat = ResourceLoaderInstance.ResourceLoader.GetString("AppTitle_FileCounts_Text");
                 FileCountText = string.Format(CultureInfo.InvariantCulture, fileCountTextFormat, FileIndex + 1, NumberOfFiles);
             }
         }
@@ -277,10 +277,10 @@ namespace Peek.UI.Views
             // Update the name of default app to launch
             DefaultAppName = DefaultAppHelper.TryGetDefaultAppName(Item.Extension);
 
-            string openWithAppTextFormat = ResourceLoader.GetForViewIndependentUse().GetString("LaunchAppButton_OpenWithApp_Text");
+            string openWithAppTextFormat = ResourceLoaderInstance.ResourceLoader.GetString("LaunchAppButton_OpenWithApp_Text");
             OpenWithAppText = string.Format(CultureInfo.InvariantCulture, openWithAppTextFormat, DefaultAppName);
 
-            string openWithAppToolTipFormat = ResourceLoader.GetForViewIndependentUse().GetString("LaunchAppButton_OpenWithApp_ToolTip");
+            string openWithAppToolTipFormat = ResourceLoaderInstance.ResourceLoader.GetString("LaunchAppButton_OpenWithApp_ToolTip");
             OpenWithAppToolTip = string.Format(CultureInfo.InvariantCulture, openWithAppToolTipFormat, DefaultAppName);
         }
     }

src/modules/peek/peek/dllmain.cpp

@@ -283,7 +283,7 @@ private:
             Logger::trace("Starting Peek non elevated from elevated process");
             const auto modulePath = get_module_folderpath();
             std::wstring runExecutablePath = modulePath;
-            runExecutablePath += L"\\modules\\Peek\\PowerToys.Peek.UI.exe";
+            runExecutablePath += L"\\WinUI3Apps\\PowerToys.Peek.UI.exe";
             std::optional<ProcessInfo> processStartedInfo = RunNonElevatedFailsafe(runExecutablePath, executable_args, modulePath, PROCESS_QUERY_INFORMATION | SYNCHRONIZE | PROCESS_TERMINATE);
             if (processStartedInfo.has_value())
             {
@@ -301,7 +301,7 @@ private:
 
             sei.fMask = { SEE_MASK_NOCLOSEPROCESS };
             sei.lpVerb = L"open";
-            sei.lpFile = L"modules\\Peek\\PowerToys.Peek.UI.exe";
+            sei.lpFile = L"WinUI3Apps\\PowerToys.Peek.UI.exe";
             sei.nShow = SW_SHOWNORMAL;
             sei.lpParameters = executable_args.data();
 

src/modules/peek/peek/peek.vcxproj

@@ -6,7 +6,6 @@
     <ProjectGuid>{a1425b53-3d61-4679-8623-e64a0d3d0a48}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>peek</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
     <ProjectName>Peek</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -24,7 +23,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\modules\$(ProjectName)\</OutDir>
+    <OutDir>..\..\..\..\$(Platform)\$(Configuration)\WinUI3Apps\</OutDir>
     <TargetName>PowerToys.Peek</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup>