From dca8ebbe48d24f298b7cafd33cf69831c2c26005 Mon Sep 17 00:00:00 2001
From: Darshak Bhatti <dabhatti@micorsoft.com>
Date: Tue, 16 Apr 2024 12:27:25 -0700
Subject: [PATCH] cp

---
 src/modules/Hosts/Hosts/Hosts.csproj            |   8 ++++++--
 .../AppList.scale-100.png                       | Bin
 .../AppList.scale-125.png                       | Bin
 .../AppList.scale-150.png                       | Bin
 .../AppList.scale-200.png                       | Bin
 .../AppList.scale-400.png                       | Bin
 .../Hosts => PowerToys.Hosts.Assets}/Hosts.ico  | Bin
 .../RegistryPreview.ico                         | Bin
 .../data32.png                                  | Bin
 .../deleted-folder32.png                        | Bin
 .../deleted-value32.png                         | Bin
 .../error32.png                                 | Bin
 .../folder32.png                                | Bin
 .../string32.png                                | Bin
 .../RegistryPreviewUILib.csproj                 |  16 +++++-----------
 .../RegistryPreviewUILib/RegistryValue.xaml.cs  |   8 ++++----
 16 files changed, 15 insertions(+), 17 deletions(-)
 rename src/modules/Hosts/Hosts/{Assets/Hosts => PowerToys.Hosts.Assets}/AppList.scale-100.png (100%)
 rename src/modules/Hosts/Hosts/{Assets/Hosts => PowerToys.Hosts.Assets}/AppList.scale-125.png (100%)
 rename src/modules/Hosts/Hosts/{Assets/Hosts => PowerToys.Hosts.Assets}/AppList.scale-150.png (100%)
 rename src/modules/Hosts/Hosts/{Assets/Hosts => PowerToys.Hosts.Assets}/AppList.scale-200.png (100%)
 rename src/modules/Hosts/Hosts/{Assets/Hosts => PowerToys.Hosts.Assets}/AppList.scale-400.png (100%)
 rename src/modules/Hosts/Hosts/{Assets/Hosts => PowerToys.Hosts.Assets}/Hosts.ico (100%)
 rename src/modules/registrypreview/RegistryPreviewUILib/{Assets/RegistryPreviewUILib => RegistryPreviewUI.Assets}/RegistryPreview.ico (100%)
 rename src/modules/registrypreview/RegistryPreviewUILib/{Assets/RegistryPreviewUILib => RegistryPreviewUI.Assets}/data32.png (100%)
 rename src/modules/registrypreview/RegistryPreviewUILib/{Assets/RegistryPreviewUILib => RegistryPreviewUI.Assets}/deleted-folder32.png (100%)
 rename src/modules/registrypreview/RegistryPreviewUILib/{Assets/RegistryPreviewUILib => RegistryPreviewUI.Assets}/deleted-value32.png (100%)
 rename src/modules/registrypreview/RegistryPreviewUILib/{Assets/RegistryPreviewUILib => RegistryPreviewUI.Assets}/error32.png (100%)
 rename src/modules/registrypreview/RegistryPreviewUILib/{Assets/RegistryPreviewUILib => RegistryPreviewUI.Assets}/folder32.png (100%)
 rename src/modules/registrypreview/RegistryPreviewUILib/{Assets/RegistryPreviewUILib => RegistryPreviewUI.Assets}/string32.png (100%)

diff --git a/src/modules/Hosts/Hosts/Hosts.csproj b/src/modules/Hosts/Hosts/Hosts.csproj
index 2b2077ccab..2e58ba1466 100644
--- a/src/modules/Hosts/Hosts/Hosts.csproj
+++ b/src/modules/Hosts/Hosts/Hosts.csproj
@@ -16,12 +16,15 @@
 
     <GenerateLibraryLayout>true</GenerateLibraryLayout>
     <IsPackable>true</IsPackable>
+    <Version>4.0.1</Version>
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="$(OutDir)\PowerToys.Hosts.pri" Pack="True" PackageCopyToOutput="true" />
-    <None Include="$(OutDir)\PowerToys.Hosts.pri" Pack="True" PackageCopyToOutput="true" PackagePath="lib/$(TargetFramework)" />
+    <None Include="$(OutDir)\PowerToys.Hosts.pri" Pack="True" PackageCopyToOutput="True" PackagePath="contentFiles\any\$(TargetFramework)" />
+    <XBFFile Include="$(OutDir)**\*.xbf" />
+    <None Include="@(XBFFile)" Pack="True" PackageCopyToOutput="True" PackagePath="contentFiles\any\$(TargetFramework)" />
     <None Include="$(OutDir)\PowerToys.Hosts.pdb" Pack="True" PackageCopyToOutput="true" PackagePath="lib/$(TargetFramework)" />
+    <None Include="PowerToys.Hosts.Assets\*" Pack="True" PackageCopyToOutput="True" PackagePath="contentFiles\any\$(TargetFramework)\PowerToys.Hosts.Assets"/>
   </ItemGroup>
 
   <PropertyGroup Condition="'$(Configuration)'=='Debug'">
@@ -47,6 +50,7 @@
     <PackageReference Include="CommunityToolkit.WinUI.Converters" />
     <PackageReference Include="CommunityToolkit.WinUI.Collections" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" />
     <PackageReference Include="System.IO.Abstractions" />
     <Manifest Include="$(ApplicationManifest)" />
diff --git a/src/modules/Hosts/Hosts/Assets/Hosts/AppList.scale-100.png b/src/modules/Hosts/Hosts/PowerToys.Hosts.Assets/AppList.scale-100.png
similarity index 100%
rename from src/modules/Hosts/Hosts/Assets/Hosts/AppList.scale-100.png
rename to src/modules/Hosts/Hosts/PowerToys.Hosts.Assets/AppList.scale-100.png
diff --git a/src/modules/Hosts/Hosts/Assets/Hosts/AppList.scale-125.png b/src/modules/Hosts/Hosts/PowerToys.Hosts.Assets/AppList.scale-125.png
similarity index 100%
rename from src/modules/Hosts/Hosts/Assets/Hosts/AppList.scale-125.png
rename to src/modules/Hosts/Hosts/PowerToys.Hosts.Assets/AppList.scale-125.png
diff --git a/src/modules/Hosts/Hosts/Assets/Hosts/AppList.scale-150.png b/src/modules/Hosts/Hosts/PowerToys.Hosts.Assets/AppList.scale-150.png
similarity index 100%
rename from src/modules/Hosts/Hosts/Assets/Hosts/AppList.scale-150.png
rename to src/modules/Hosts/Hosts/PowerToys.Hosts.Assets/AppList.scale-150.png
diff --git a/src/modules/Hosts/Hosts/Assets/Hosts/AppList.scale-200.png b/src/modules/Hosts/Hosts/PowerToys.Hosts.Assets/AppList.scale-200.png
similarity index 100%
rename from src/modules/Hosts/Hosts/Assets/Hosts/AppList.scale-200.png
rename to src/modules/Hosts/Hosts/PowerToys.Hosts.Assets/AppList.scale-200.png
diff --git a/src/modules/Hosts/Hosts/Assets/Hosts/AppList.scale-400.png b/src/modules/Hosts/Hosts/PowerToys.Hosts.Assets/AppList.scale-400.png
similarity index 100%
rename from src/modules/Hosts/Hosts/Assets/Hosts/AppList.scale-400.png
rename to src/modules/Hosts/Hosts/PowerToys.Hosts.Assets/AppList.scale-400.png
diff --git a/src/modules/Hosts/Hosts/Assets/Hosts/Hosts.ico b/src/modules/Hosts/Hosts/PowerToys.Hosts.Assets/Hosts.ico
similarity index 100%
rename from src/modules/Hosts/Hosts/Assets/Hosts/Hosts.ico
rename to src/modules/Hosts/Hosts/PowerToys.Hosts.Assets/Hosts.ico
diff --git a/src/modules/registrypreview/RegistryPreviewUILib/Assets/RegistryPreviewUILib/RegistryPreview.ico b/src/modules/registrypreview/RegistryPreviewUILib/RegistryPreviewUI.Assets/RegistryPreview.ico
similarity index 100%
rename from src/modules/registrypreview/RegistryPreviewUILib/Assets/RegistryPreviewUILib/RegistryPreview.ico
rename to src/modules/registrypreview/RegistryPreviewUILib/RegistryPreviewUI.Assets/RegistryPreview.ico
diff --git a/src/modules/registrypreview/RegistryPreviewUILib/Assets/RegistryPreviewUILib/data32.png b/src/modules/registrypreview/RegistryPreviewUILib/RegistryPreviewUI.Assets/data32.png
similarity index 100%
rename from src/modules/registrypreview/RegistryPreviewUILib/Assets/RegistryPreviewUILib/data32.png
rename to src/modules/registrypreview/RegistryPreviewUILib/RegistryPreviewUI.Assets/data32.png
diff --git a/src/modules/registrypreview/RegistryPreviewUILib/Assets/RegistryPreviewUILib/deleted-folder32.png b/src/modules/registrypreview/RegistryPreviewUILib/RegistryPreviewUI.Assets/deleted-folder32.png
similarity index 100%
rename from src/modules/registrypreview/RegistryPreviewUILib/Assets/RegistryPreviewUILib/deleted-folder32.png
rename to src/modules/registrypreview/RegistryPreviewUILib/RegistryPreviewUI.Assets/deleted-folder32.png
diff --git a/src/modules/registrypreview/RegistryPreviewUILib/Assets/RegistryPreviewUILib/deleted-value32.png b/src/modules/registrypreview/RegistryPreviewUILib/RegistryPreviewUI.Assets/deleted-value32.png
similarity index 100%
rename from src/modules/registrypreview/RegistryPreviewUILib/Assets/RegistryPreviewUILib/deleted-value32.png
rename to src/modules/registrypreview/RegistryPreviewUILib/RegistryPreviewUI.Assets/deleted-value32.png
diff --git a/src/modules/registrypreview/RegistryPreviewUILib/Assets/RegistryPreviewUILib/error32.png b/src/modules/registrypreview/RegistryPreviewUILib/RegistryPreviewUI.Assets/error32.png
similarity index 100%
rename from src/modules/registrypreview/RegistryPreviewUILib/Assets/RegistryPreviewUILib/error32.png
rename to src/modules/registrypreview/RegistryPreviewUILib/RegistryPreviewUI.Assets/error32.png
diff --git a/src/modules/registrypreview/RegistryPreviewUILib/Assets/RegistryPreviewUILib/folder32.png b/src/modules/registrypreview/RegistryPreviewUILib/RegistryPreviewUI.Assets/folder32.png
similarity index 100%
rename from src/modules/registrypreview/RegistryPreviewUILib/Assets/RegistryPreviewUILib/folder32.png
rename to src/modules/registrypreview/RegistryPreviewUILib/RegistryPreviewUI.Assets/folder32.png
diff --git a/src/modules/registrypreview/RegistryPreviewUILib/Assets/RegistryPreviewUILib/string32.png b/src/modules/registrypreview/RegistryPreviewUILib/RegistryPreviewUI.Assets/string32.png
similarity index 100%
rename from src/modules/registrypreview/RegistryPreviewUILib/Assets/RegistryPreviewUILib/string32.png
rename to src/modules/registrypreview/RegistryPreviewUILib/RegistryPreviewUI.Assets/string32.png
diff --git a/src/modules/registrypreview/RegistryPreviewUILib/RegistryPreviewUILib.csproj b/src/modules/registrypreview/RegistryPreviewUILib/RegistryPreviewUILib.csproj
index 97cf5d1f4b..486b7bb822 100644
--- a/src/modules/registrypreview/RegistryPreviewUILib/RegistryPreviewUILib.csproj
+++ b/src/modules/registrypreview/RegistryPreviewUILib/RegistryPreviewUILib.csproj
@@ -15,12 +15,15 @@
 
     <GenerateLibraryLayout>true</GenerateLibraryLayout>
     <IsPackable>true</IsPackable>
+    <Version>2.0.1</Version>
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="$(OutDir)\PowerToys.RegistryPreviewUILib.pri" Pack="True" PackageCopyToOutput="true" />
-    <None Include="$(OutDir)\PowerToys.RegistryPreviewUILib.pri" Pack="True" PackageCopyToOutput="true" PackagePath="lib/$(TargetFramework)" />
+    <None Include="$(OutDir)\PowerToys.RegistryPreviewUILib.pri" Pack="True" PackageCopyToOutput="True" PackagePath="contentFiles\any\$(TargetFramework)" />
+    <XBFFile Include="$(OutDir)**\*.xbf" />
+    <None Include="@(XBFFile)" Pack="True" PackageCopyToOutput="True" PackagePath="contentFiles\any\$(TargetFramework)" />
     <None Include="$(OutDir)\PowerToys.RegistryPreviewUILib.pdb" Pack="True" PackageCopyToOutput="true" PackagePath="lib/$(TargetFramework)" />
+    <None Include="RegistryPreviewUI.Assets\*" Pack="True" PackageCopyToOutput="True" PackagePath="contentFiles\any\$(TargetFramework)\RegistryPreviewUI.Assets" />
   </ItemGroup>
 
   <PropertyGroup Condition="'$(Configuration)'=='Debug'">
@@ -50,14 +53,5 @@
 		<PackageReference Include="WinUIEx" />
 		<Manifest Include="$(ApplicationManifest)" />
 	</ItemGroup>
-
-	<ItemGroup>
-		<Content Update="Assets\RegistryPreviewUILib\data32.png">
-			<CopyToOutputDirectory>Never</CopyToOutputDirectory>
-		</Content>
-		<Content Update="Assets\RegistryPreviewUILib\string32.png">
-			<CopyToOutputDirectory>Never</CopyToOutputDirectory>
-		</Content>
-	</ItemGroup>
 </Project>
 <!--TargetFramework>net6.0-windows10.0.19041.0</TargetFramework-->
diff --git a/src/modules/registrypreview/RegistryPreviewUILib/RegistryValue.xaml.cs b/src/modules/registrypreview/RegistryPreviewUILib/RegistryValue.xaml.cs
index 58b12466dc..6605e0b142 100644
--- a/src/modules/registrypreview/RegistryPreviewUILib/RegistryValue.xaml.cs
+++ b/src/modules/registrypreview/RegistryPreviewUILib/RegistryValue.xaml.cs
@@ -12,10 +12,10 @@ namespace RegistryPreviewUILib
     public class RegistryValue
     {
         // Static members
-        private static Uri uriStringValue = new Uri("ms-appx:///Assets/RegistryPreviewUILib/string32.png");
-        private static Uri uriBinaryValue = new Uri("ms-appx:///Assets/RegistryPreviewUILib/data32.png");
-        private static Uri uriDeleteValue = new Uri("ms-appx:///Assets/RegistryPreviewUILib/deleted-value32.png");
-        private static Uri uriErrorValue = new Uri("ms-appx:///Assets/RegistryPreviewUILib/error32.png");
+        private static Uri uriStringValue = new Uri("ms-appx:///RegistryPreviewUI.Assets/string32.png");
+        private static Uri uriBinaryValue = new Uri("ms-appx:///RegistryPreviewUI.Assets/data32.png");
+        private static Uri uriDeleteValue = new Uri("ms-appx:///RegistryPreviewUI.Assets/deleted-value32.png");
+        private static Uri uriErrorValue = new Uri("ms-appx:///RegistryPreviewUI.Assets/error32.png");
 
         public string Name { get; set; }