From abd3718409666a0fc2133b572ae872ff89f4ba1c Mon Sep 17 00:00:00 2001
From: Kristen Schau <47155823+krschau@users.noreply.github.com>
Date: Wed, 31 Jan 2024 11:09:09 -0800
Subject: [PATCH] Update widget asset locations (#2200)

---
 CoreWidgetProvider/CoreWidgetProvider.csproj  |  10 +-
 .../Assets/{ => icons}/cpu_icon_dark.png      | Bin
 .../Assets/{ => icons}/cpu_icon_light.png     | Bin
 .../Assets/{ => icons}/gpu_icon_dark.png      | Bin
 .../Assets/{ => icons}/gpu_icon_light.png     | Bin
 .../Assets/{ => icons}/mem_icon_dark.png      | Bin
 .../Assets/{ => icons}/mem_icon_light.png     | Bin
 .../Assets/{ => icons}/net_icon_dark.png      | Bin
 .../Assets/{ => icons}/net_icon_light.png     | Bin
 .../{ => icons}/ssh_keychain_icon_dark.png    | Bin
 .../{ => icons}/ssh_keychain_icon_light.png   | Bin
 .../Assets/screenshots}/CPUScreenshotDark.png | Bin
 .../screenshots}/CPUScreenshotLight.png       | Bin
 .../Assets/screenshots}/GPUScreenshotDark.png | Bin
 .../screenshots}/GPUScreenshotLight.png       | Bin
 .../screenshots}/MemoryScreenshotDark.png     | Bin
 .../screenshots}/MemoryScreenshotLight.png    | Bin
 .../screenshots}/NetworkScreenshotDark.png    | Bin
 .../screenshots}/NetworkScreenshotLight.png   | Bin
 .../Assets/screenshots}/SSHScreenshotDark.png | Bin
 .../screenshots}/SSHScreenshotLight.png       | Bin
 src/DevHome.csproj                            | 215 +++++++++---------
 src/Package.appxmanifest                      |  40 ++--
 23 files changed, 126 insertions(+), 139 deletions(-)
 rename CoreWidgetProvider/Widgets/Assets/{ => icons}/cpu_icon_dark.png (100%)
 rename CoreWidgetProvider/Widgets/Assets/{ => icons}/cpu_icon_light.png (100%)
 rename CoreWidgetProvider/Widgets/Assets/{ => icons}/gpu_icon_dark.png (100%)
 rename CoreWidgetProvider/Widgets/Assets/{ => icons}/gpu_icon_light.png (100%)
 rename CoreWidgetProvider/Widgets/Assets/{ => icons}/mem_icon_dark.png (100%)
 rename CoreWidgetProvider/Widgets/Assets/{ => icons}/mem_icon_light.png (100%)
 rename CoreWidgetProvider/Widgets/Assets/{ => icons}/net_icon_dark.png (100%)
 rename CoreWidgetProvider/Widgets/Assets/{ => icons}/net_icon_light.png (100%)
 rename CoreWidgetProvider/Widgets/Assets/{ => icons}/ssh_keychain_icon_dark.png (100%)
 rename CoreWidgetProvider/Widgets/Assets/{ => icons}/ssh_keychain_icon_light.png (100%)
 rename {src/Assets/Preview => CoreWidgetProvider/Widgets/Assets/screenshots}/CPUScreenshotDark.png (100%)
 rename {src/Assets/Preview => CoreWidgetProvider/Widgets/Assets/screenshots}/CPUScreenshotLight.png (100%)
 rename {src/Assets/Preview => CoreWidgetProvider/Widgets/Assets/screenshots}/GPUScreenshotDark.png (100%)
 rename {src/Assets/Preview => CoreWidgetProvider/Widgets/Assets/screenshots}/GPUScreenshotLight.png (100%)
 rename {src/Assets/Preview => CoreWidgetProvider/Widgets/Assets/screenshots}/MemoryScreenshotDark.png (100%)
 rename {src/Assets/Preview => CoreWidgetProvider/Widgets/Assets/screenshots}/MemoryScreenshotLight.png (100%)
 rename {src/Assets/Preview => CoreWidgetProvider/Widgets/Assets/screenshots}/NetworkScreenshotDark.png (100%)
 rename {src/Assets/Preview => CoreWidgetProvider/Widgets/Assets/screenshots}/NetworkScreenshotLight.png (100%)
 rename {src/Assets/Preview => CoreWidgetProvider/Widgets/Assets/screenshots}/SSHScreenshotDark.png (100%)
 rename {src/Assets/Preview => CoreWidgetProvider/Widgets/Assets/screenshots}/SSHScreenshotLight.png (100%)

diff --git a/CoreWidgetProvider/CoreWidgetProvider.csproj b/CoreWidgetProvider/CoreWidgetProvider.csproj
index 023fe7c6e1..b854b02181 100644
--- a/CoreWidgetProvider/CoreWidgetProvider.csproj
+++ b/CoreWidgetProvider/CoreWidgetProvider.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(SolutionDir)ToolingVersions.props"/>
+  <Import Project="$(SolutionDir)ToolingVersions.props" />
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
     <OutputType>Exe</OutputType>
   </PropertyGroup>
@@ -37,11 +37,8 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <Content Include="Widgets\Templates\SSHWalletTemplate.json">
-     <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-  </ItemGroup>
-
-  <ItemGroup>
     <Content Include="Widgets\Templates\SystemMemoryTemplate.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
@@ -57,9 +54,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Update="Widgets\Assets\ssh_wallet_icon.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
     <Content Update="Widgets\Assets\arrow.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
diff --git a/CoreWidgetProvider/Widgets/Assets/cpu_icon_dark.png b/CoreWidgetProvider/Widgets/Assets/icons/cpu_icon_dark.png
similarity index 100%
rename from CoreWidgetProvider/Widgets/Assets/cpu_icon_dark.png
rename to CoreWidgetProvider/Widgets/Assets/icons/cpu_icon_dark.png
diff --git a/CoreWidgetProvider/Widgets/Assets/cpu_icon_light.png b/CoreWidgetProvider/Widgets/Assets/icons/cpu_icon_light.png
similarity index 100%
rename from CoreWidgetProvider/Widgets/Assets/cpu_icon_light.png
rename to CoreWidgetProvider/Widgets/Assets/icons/cpu_icon_light.png
diff --git a/CoreWidgetProvider/Widgets/Assets/gpu_icon_dark.png b/CoreWidgetProvider/Widgets/Assets/icons/gpu_icon_dark.png
similarity index 100%
rename from CoreWidgetProvider/Widgets/Assets/gpu_icon_dark.png
rename to CoreWidgetProvider/Widgets/Assets/icons/gpu_icon_dark.png
diff --git a/CoreWidgetProvider/Widgets/Assets/gpu_icon_light.png b/CoreWidgetProvider/Widgets/Assets/icons/gpu_icon_light.png
similarity index 100%
rename from CoreWidgetProvider/Widgets/Assets/gpu_icon_light.png
rename to CoreWidgetProvider/Widgets/Assets/icons/gpu_icon_light.png
diff --git a/CoreWidgetProvider/Widgets/Assets/mem_icon_dark.png b/CoreWidgetProvider/Widgets/Assets/icons/mem_icon_dark.png
similarity index 100%
rename from CoreWidgetProvider/Widgets/Assets/mem_icon_dark.png
rename to CoreWidgetProvider/Widgets/Assets/icons/mem_icon_dark.png
diff --git a/CoreWidgetProvider/Widgets/Assets/mem_icon_light.png b/CoreWidgetProvider/Widgets/Assets/icons/mem_icon_light.png
similarity index 100%
rename from CoreWidgetProvider/Widgets/Assets/mem_icon_light.png
rename to CoreWidgetProvider/Widgets/Assets/icons/mem_icon_light.png
diff --git a/CoreWidgetProvider/Widgets/Assets/net_icon_dark.png b/CoreWidgetProvider/Widgets/Assets/icons/net_icon_dark.png
similarity index 100%
rename from CoreWidgetProvider/Widgets/Assets/net_icon_dark.png
rename to CoreWidgetProvider/Widgets/Assets/icons/net_icon_dark.png
diff --git a/CoreWidgetProvider/Widgets/Assets/net_icon_light.png b/CoreWidgetProvider/Widgets/Assets/icons/net_icon_light.png
similarity index 100%
rename from CoreWidgetProvider/Widgets/Assets/net_icon_light.png
rename to CoreWidgetProvider/Widgets/Assets/icons/net_icon_light.png
diff --git a/CoreWidgetProvider/Widgets/Assets/ssh_keychain_icon_dark.png b/CoreWidgetProvider/Widgets/Assets/icons/ssh_keychain_icon_dark.png
similarity index 100%
rename from CoreWidgetProvider/Widgets/Assets/ssh_keychain_icon_dark.png
rename to CoreWidgetProvider/Widgets/Assets/icons/ssh_keychain_icon_dark.png
diff --git a/CoreWidgetProvider/Widgets/Assets/ssh_keychain_icon_light.png b/CoreWidgetProvider/Widgets/Assets/icons/ssh_keychain_icon_light.png
similarity index 100%
rename from CoreWidgetProvider/Widgets/Assets/ssh_keychain_icon_light.png
rename to CoreWidgetProvider/Widgets/Assets/icons/ssh_keychain_icon_light.png
diff --git a/src/Assets/Preview/CPUScreenshotDark.png b/CoreWidgetProvider/Widgets/Assets/screenshots/CPUScreenshotDark.png
similarity index 100%
rename from src/Assets/Preview/CPUScreenshotDark.png
rename to CoreWidgetProvider/Widgets/Assets/screenshots/CPUScreenshotDark.png
diff --git a/src/Assets/Preview/CPUScreenshotLight.png b/CoreWidgetProvider/Widgets/Assets/screenshots/CPUScreenshotLight.png
similarity index 100%
rename from src/Assets/Preview/CPUScreenshotLight.png
rename to CoreWidgetProvider/Widgets/Assets/screenshots/CPUScreenshotLight.png
diff --git a/src/Assets/Preview/GPUScreenshotDark.png b/CoreWidgetProvider/Widgets/Assets/screenshots/GPUScreenshotDark.png
similarity index 100%
rename from src/Assets/Preview/GPUScreenshotDark.png
rename to CoreWidgetProvider/Widgets/Assets/screenshots/GPUScreenshotDark.png
diff --git a/src/Assets/Preview/GPUScreenshotLight.png b/CoreWidgetProvider/Widgets/Assets/screenshots/GPUScreenshotLight.png
similarity index 100%
rename from src/Assets/Preview/GPUScreenshotLight.png
rename to CoreWidgetProvider/Widgets/Assets/screenshots/GPUScreenshotLight.png
diff --git a/src/Assets/Preview/MemoryScreenshotDark.png b/CoreWidgetProvider/Widgets/Assets/screenshots/MemoryScreenshotDark.png
similarity index 100%
rename from src/Assets/Preview/MemoryScreenshotDark.png
rename to CoreWidgetProvider/Widgets/Assets/screenshots/MemoryScreenshotDark.png
diff --git a/src/Assets/Preview/MemoryScreenshotLight.png b/CoreWidgetProvider/Widgets/Assets/screenshots/MemoryScreenshotLight.png
similarity index 100%
rename from src/Assets/Preview/MemoryScreenshotLight.png
rename to CoreWidgetProvider/Widgets/Assets/screenshots/MemoryScreenshotLight.png
diff --git a/src/Assets/Preview/NetworkScreenshotDark.png b/CoreWidgetProvider/Widgets/Assets/screenshots/NetworkScreenshotDark.png
similarity index 100%
rename from src/Assets/Preview/NetworkScreenshotDark.png
rename to CoreWidgetProvider/Widgets/Assets/screenshots/NetworkScreenshotDark.png
diff --git a/src/Assets/Preview/NetworkScreenshotLight.png b/CoreWidgetProvider/Widgets/Assets/screenshots/NetworkScreenshotLight.png
similarity index 100%
rename from src/Assets/Preview/NetworkScreenshotLight.png
rename to CoreWidgetProvider/Widgets/Assets/screenshots/NetworkScreenshotLight.png
diff --git a/src/Assets/Preview/SSHScreenshotDark.png b/CoreWidgetProvider/Widgets/Assets/screenshots/SSHScreenshotDark.png
similarity index 100%
rename from src/Assets/Preview/SSHScreenshotDark.png
rename to CoreWidgetProvider/Widgets/Assets/screenshots/SSHScreenshotDark.png
diff --git a/src/Assets/Preview/SSHScreenshotLight.png b/CoreWidgetProvider/Widgets/Assets/screenshots/SSHScreenshotLight.png
similarity index 100%
rename from src/Assets/Preview/SSHScreenshotLight.png
rename to CoreWidgetProvider/Widgets/Assets/screenshots/SSHScreenshotLight.png
diff --git a/src/DevHome.csproj b/src/DevHome.csproj
index 4ffdcf19c2..e7bb7b2d2c 100644
--- a/src/DevHome.csproj
+++ b/src/DevHome.csproj
@@ -2,131 +2,124 @@
 <!-- Licensed under the MIT License. -->
 
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="$(SolutionDir)ToolingVersions.props" />
-    <PropertyGroup>
-        <OutputType>WinExe</OutputType>
-        <RootNamespace>DevHome</RootNamespace>
-        <ApplicationIcon>Assets/DevHome.ico</ApplicationIcon>
-        <ApplicationManifest>app.manifest</ApplicationManifest>
-        <Platforms>x86;x64;arm64</Platforms>
-        <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
-        <PublishProfile Condition="'$(BuildingInsideVisualStudio)' != 'True'">Properties\PublishProfiles\win10-$(Platform).pubxml</PublishProfile>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-        <UseWinUI>true</UseWinUI>
-        <EnableMsixTooling>true</EnableMsixTooling>
-        <PublishReadyToRunEmitSymbols>true</PublishReadyToRunEmitSymbols>
-        <BuildRing Condition="'$(BuildRing)'==''">Dev</BuildRing>
-        <DefineConstants>$(DefineConstants);DISABLE_XAML_GENERATED_MAIN</DefineConstants>
-    </PropertyGroup>
-    <ItemGroup>
-      <None Remove="Assets\Preview\CPUScreenshotDark.png" />
-      <None Remove="Assets\Preview\CPUScreenshotLight.png" />
-      <None Remove="Assets\Preview\GPUScreenshotDark.png" />
-      <None Remove="Assets\Preview\GPUScreenshotLight.png" />
-      <None Remove="Assets\Preview\MemoryScreenshotDark.png" />
-      <None Remove="Assets\Preview\MemoryScreenshotLight.png" />
-      <None Remove="Assets\Preview\NetworkScreenshotDark.png" />
-      <None Remove="Assets\Preview\NetworkScreenshotLight.png" />
-      <None Remove="Assets\Preview\SSHScreenshotDark.png" />
-      <None Remove="Assets\Preview\SSHScreenshotLight.png" />
-      <None Remove="Assets\WhatsNewPage\DarkTheme\Extensions.png" />
-      <None Remove="Assets\WhatsNewPage\DarkTheme\ExtensionsBig.png" />
-      <None Remove="Assets\WhatsNewPage\LightTheme\Extensions.png" />
-      <None Remove="Assets\WhatsNewPage\LightTheme\ExtensionsBig.png" />
-      <None Remove="Styles\WindowTitleBar_ThemeResources.xaml" />
-    </ItemGroup>
+  <Import Project="$(SolutionDir)ToolingVersions.props" />
 
-    <ItemGroup>
-        <Manifest Include="$(ApplicationManifest)" />
-    </ItemGroup>
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <RootNamespace>DevHome</RootNamespace>
+    <ApplicationIcon>Assets/DevHome.ico</ApplicationIcon>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+    <Platforms>x86;x64;arm64</Platforms>
+    <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
+    <PublishProfile Condition="'$(BuildingInsideVisualStudio)' != 'True'">Properties\PublishProfiles\win10-$(Platform).pubxml</PublishProfile>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <UseWinUI>true</UseWinUI>
+    <EnableMsixTooling>true</EnableMsixTooling>
+    <PublishReadyToRunEmitSymbols>true</PublishReadyToRunEmitSymbols>
+    <BuildRing Condition="'$(BuildRing)'==''">Dev</BuildRing>
+    <DefineConstants>$(DefineConstants);DISABLE_XAML_GENERATED_MAIN</DefineConstants>
+  </PropertyGroup>
 
-    <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
-        <PackageReference Include="Microsoft.Management.Infrastructure" Version="3.0.0" />
-        <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.49-beta">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-        </PackageReference>
-        <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
-        <PackageReference Include="WinUIEx" Version="1.8.0" />
-        <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.2.8" GeneratePathProperty="true">
-            <ExcludeAssets>contentFiles</ExcludeAssets>
-        </PackageReference>
-    </ItemGroup>
+  <ItemGroup>
+    <None Remove="Assets\WhatsNewPage\DarkTheme\Extensions.png" />
+    <None Remove="Assets\WhatsNewPage\DarkTheme\ExtensionsBig.png" />
+    <None Remove="Assets\WhatsNewPage\LightTheme\Extensions.png" />
+    <None Remove="Assets\WhatsNewPage\LightTheme\ExtensionsBig.png" />
+    <None Remove="Styles\WindowTitleBar_ThemeResources.xaml" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <ProjectReference Include="..\common\DevHome.Common.csproj" />
-        <ProjectReference Include="..\CoreWidgetProvider\CoreWidgetProvider.csproj" />
-        <ProjectReference Include="..\settings\DevHome.Settings\DevHome.Settings.csproj" />
-        <ProjectReference Include="..\tools\Dashboard\DevHome.Dashboard\DevHome.Dashboard.csproj" />
-        <ProjectReference Include="..\tools\Experiments\src\DevHome.Experiments.csproj" />
-        <ProjectReference Include="..\tools\SetupFlow\DevHome.SetupFlow\DevHome.SetupFlow.csproj" />
-        <ProjectReference Include="..\tools\ExtensionLibrary\DevHome.ExtensionLibrary\DevHome.ExtensionLibrary.csproj" />
-    </ItemGroup>
-    <ItemGroup>
-        <None Update="appsettings.json">
-            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-        </None>
-        <None Update="NavConfig.jsonc">
-            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-        </None>
-        <Page Update="Styles\WindowTitleBar_ThemeResources.xaml">
-          <Generator>MSBuild:Compile</Generator>
-        </Page>
-        <Page Update="Styles\BreadcrumbBar.xaml">
-          <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
-        </Page>
-    </ItemGroup>
+  <ItemGroup>
+    <Manifest Include="$(ApplicationManifest)" />
+  </ItemGroup>
 
-    <ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
-        <ProjectCapability Include="Msix" />
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Management.Infrastructure" Version="3.0.0" />
+    <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.49-beta">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
+    <PackageReference Include="WinUIEx" Version="1.8.0" />
+    <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.2.8" GeneratePathProperty="true">
+      <ExcludeAssets>contentFiles</ExcludeAssets>
+    </PackageReference>
+  </ItemGroup>
 
-    <PropertyGroup Condition="'$(DisableHasPackageAndPublishMenuAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
-        <HasPackageAndPublishMenu>true</HasPackageAndPublishMenu>
-    </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\common\DevHome.Common.csproj" />
+    <ProjectReference Include="..\CoreWidgetProvider\CoreWidgetProvider.csproj" />
+    <ProjectReference Include="..\settings\DevHome.Settings\DevHome.Settings.csproj" />
+    <ProjectReference Include="..\tools\Dashboard\DevHome.Dashboard\DevHome.Dashboard.csproj" />
+    <ProjectReference Include="..\tools\Experiments\src\DevHome.Experiments.csproj" />
+    <ProjectReference Include="..\tools\SetupFlow\DevHome.SetupFlow\DevHome.SetupFlow.csproj" />
+    <ProjectReference Include="..\tools\ExtensionLibrary\DevHome.ExtensionLibrary\DevHome.ExtensionLibrary.csproj" />
+  </ItemGroup>
 
-    <PropertyGroup>
-        <DefineConstants Condition="'$(BuildRing)'=='Canary'">$(DefineConstants);CANARY_BUILD</DefineConstants>
-        <DefineConstants Condition="'$(BuildRing)'=='Stable'">$(DefineConstants);STABLE_BUILD</DefineConstants>
-    </PropertyGroup>
+  <ItemGroup>
+    <None Update="appsettings.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="NavConfig.jsonc">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <Page Update="Styles\WindowTitleBar_ThemeResources.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Update="Styles\BreadcrumbBar.xaml">
+      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+    </Page>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
+    <ProjectCapability Include="Msix" />
+  </ItemGroup>
 
-    <!-- PowerShell requires the content files from their nuget package to be next to System.Management.Automation.dll
+  <PropertyGroup Condition="'$(DisableHasPackageAndPublishMenuAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
+    <HasPackageAndPublishMenu>true</HasPackageAndPublishMenu>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <DefineConstants Condition="'$(BuildRing)'=='Canary'">$(DefineConstants);CANARY_BUILD</DefineConstants>
+    <DefineConstants Condition="'$(BuildRing)'=='Stable'">$(DefineConstants);STABLE_BUILD</DefineConstants>
+  </PropertyGroup>
+
+  <!-- PowerShell requires the content files from their nuget package to be next to System.Management.Automation.dll
          This won't happen automatically for 'dotnet publish -r <RID>'
          Here we explicitly exclude the content files, copy them manually to the output directory
          and then add them as payload to the package to the right location.
          https://github.com/PowerShell/PowerShell/issues/15274#issuecomment-984028028
     -->
-    <Target Name="PwshFiles" AfterTargets="BeforeBuild">
-        <ItemGroup>
-            <RefFiles Include="$(PkgMicrosoft_PowerShell_SDK)\contentFiles\any\any\ref\*.*" />
-            <WinModuleFiles Include="$(PkgMicrosoft_PowerShell_SDK)\contentFiles\any\any\runtimes\win\lib\net6.0\Modules\**\*.*" />
-        </ItemGroup>
-        <Copy SourceFiles="@(RefFiles)" DestinationFolder="$(TargetDir)\ref\" />
-        <Copy SourceFiles="@(WinModuleFiles)" DestinationFolder="$(TargetDir)\Modules\%(RecursiveDir)\" />
-    </Target>
+  <Target Name="PwshFiles" AfterTargets="BeforeBuild">
+    <ItemGroup>
+      <RefFiles Include="$(PkgMicrosoft_PowerShell_SDK)\contentFiles\any\any\ref\*.*" />
+      <WinModuleFiles Include="$(PkgMicrosoft_PowerShell_SDK)\contentFiles\any\any\runtimes\win\lib\net6.0\Modules\**\*.*" />
+    </ItemGroup>
+    <Copy SourceFiles="@(RefFiles)" DestinationFolder="$(TargetDir)\ref\" />
+    <Copy SourceFiles="@(WinModuleFiles)" DestinationFolder="$(TargetDir)\Modules\%(RecursiveDir)\" />
+  </Target>
 
-    <Target Name="ExtraAppxFilesInPackage" AfterTargets="_ComputeAppxPackagePayload">
+  <Target Name="ExtraAppxFilesInPackage" AfterTargets="_ComputeAppxPackagePayload">
 
-        <!-- If the binary is not here, then it was a 'dotnet publish' or 'dotnet build' -->
-        <PropertyGroup Condition="!Exists('$(TargetDir)\System.Management.Automation.dll')">
-            <ModulePath>runtimes\win\lib\net6.0\</ModulePath>
-        </PropertyGroup>
+    <!-- If the binary is not here, then it was a 'dotnet publish' or 'dotnet build' -->
+    <PropertyGroup Condition="!Exists('$(TargetDir)\System.Management.Automation.dll')">
+      <ModulePath>runtimes\win\lib\net6.0\</ModulePath>
+    </PropertyGroup>
 
-        <ItemGroup>
-            <AdditionalPackageFile Include="$(TargetDir)\ref\*.*">
-                <PackagePath>ref</PackagePath>
-            </AdditionalPackageFile>
-            <AdditionalPackageFile Include="$(TargetDir)\Modules\**\*.*">
-              <PackagePath>$(ModulePath)Modules</PackagePath>
-            </AdditionalPackageFile>
-        </ItemGroup>
+    <ItemGroup>
+      <AdditionalPackageFile Include="$(TargetDir)\ref\*.*">
+        <PackagePath>ref</PackagePath>
+      </AdditionalPackageFile>
+      <AdditionalPackageFile Include="$(TargetDir)\Modules\**\*.*">
+        <PackagePath>$(ModulePath)Modules</PackagePath>
+      </AdditionalPackageFile>
+    </ItemGroup>
 
-        <ItemGroup>
-            <AppxPackagePayload Include="%(AdditionalPackageFile.Identity)" KeepDuplicates="false">
-                <TargetPath>%(AdditionalPackageFile.PackagePath)\%(AdditionalPackageFile.RecursiveDir)%(AdditionalPackageFile.Filename)%(AdditionalPackageFile.Extension)</TargetPath>
-            </AppxPackagePayload>
-        </ItemGroup>
-    </Target>
+    <ItemGroup>
+      <AppxPackagePayload Include="%(AdditionalPackageFile.Identity)" KeepDuplicates="false">
+        <TargetPath>%(AdditionalPackageFile.PackagePath)\%(AdditionalPackageFile.RecursiveDir)%(AdditionalPackageFile.Filename)%(AdditionalPackageFile.Extension)</TargetPath>
+      </AppxPackagePayload>
+    </ItemGroup>
+  </Target>
 </Project>
diff --git a/src/Package.appxmanifest b/src/Package.appxmanifest
index 100954e882..a3722553ce 100644
--- a/src/Package.appxmanifest
+++ b/src/Package.appxmanifest
@@ -99,17 +99,17 @@
                     </Capabilities>
                     <ThemeResources>
                       <Icons>
-                        <Icon Path="Widgets\Assets\ssh_keychain_icon_light.png" />
+                        <Icon Path="Widgets\Assets\icons\ssh_keychain_icon_light.png" />
                       </Icons>
                       <Screenshots>
-                        <Screenshot Path="Assets\Preview\SSHScreenshotLight.png" DisplayAltText="Dev Home icon" />
+                        <Screenshot Path="Widgets\Assets\screenshots\SSHScreenshotLight.png" DisplayAltText="SSH Keychain widget preview image" />
                       </Screenshots>
                       <DarkMode>
                         <Icons>
-                          <Icon Path="Widgets\Assets\ssh_keychain_icon_dark.png" />
+                          <Icon Path="Widgets\Assets\icons\ssh_keychain_icon_dark.png" />
                         </Icons>
                         <Screenshots>
-                          <Screenshot Path="Assets\Preview\SSHScreenshotDark.png" DisplayAltText="Dev Home icon" />
+                          <Screenshot Path="Widgets\Assets\screenshots\SSHScreenshotDark.png" DisplayAltText="SSH Keychain widget preview image" />
                         </Screenshots>
                       </DarkMode>
                       <LightMode />
@@ -129,17 +129,17 @@
                     </Capabilities>
                     <ThemeResources>
                       <Icons>
-                        <Icon Path="Widgets\Assets\mem_icon_light.png" />
+                        <Icon Path="Widgets\Assets\icons\mem_icon_light.png" />
                       </Icons>
                       <Screenshots>
-                        <Screenshot Path="Assets\Preview\MemoryScreenshotLight.png" DisplayAltText="Dev Home icon" />
+                        <Screenshot Path="Widgets\Assets\screenshots\MemoryScreenshotLight.png" DisplayAltText="Memory widget preview image" />
                       </Screenshots>
                       <DarkMode>
                         <Icons>
-                          <Icon Path="Widgets\Assets\mem_icon_dark.png" />
+                          <Icon Path="Widgets\Assets\icons\mem_icon_dark.png" />
                         </Icons>
                         <Screenshots>
-                          <Screenshot Path="Assets\Preview\MemoryScreenshotDark.png" DisplayAltText="Dev Home icon" />
+                          <Screenshot Path="Widgets\Assets\screenshots\MemoryScreenshotDark.png" DisplayAltText="Memory widget preview image" />
                         </Screenshots>
                       </DarkMode>
                       <LightMode />
@@ -159,17 +159,17 @@
                     </Capabilities>
                     <ThemeResources>
                       <Icons>
-                        <Icon Path="Widgets\Assets\net_icon_light.png" />
+                        <Icon Path="Widgets\Assets\icons\net_icon_light.png" />
                       </Icons>
                       <Screenshots>
-                        <Screenshot Path="Assets\Preview\NetworkScreenshotLight.png" DisplayAltText="Dev Home icon" />
+                        <Screenshot Path="Widgets\Assets\screenshots\NetworkScreenshotLight.png" DisplayAltText="Network widget preview image" />
                       </Screenshots>
                       <DarkMode>
                         <Icons>
-                          <Icon Path="Widgets\Assets\net_icon_dark.png" />
+                          <Icon Path="Widgets\Assets\icons\net_icon_dark.png" />
                         </Icons>
                         <Screenshots>
-                          <Screenshot Path="Assets\Preview\NetworkScreenshotDark.png" DisplayAltText="Dev Home icon" />
+                          <Screenshot Path="Widgets\Assets\screenshots\NetworkScreenshotDark.png" DisplayAltText="Network widget preview image" />
                         </Screenshots>
                       </DarkMode>
                       <LightMode />
@@ -189,17 +189,17 @@
                     </Capabilities>
                     <ThemeResources>
                       <Icons>
-                        <Icon Path="Widgets\Assets\gpu_icon_light.png" />
+                        <Icon Path="Widgets\Assets\icons\gpu_icon_light.png" />
                       </Icons>
                       <Screenshots>
-                        <Screenshot Path="Assets\Preview\GPUScreenshotLight.png" DisplayAltText="Dev Home icon" />
+                        <Screenshot Path="Widgets\Assets\screenshots\GPUScreenshotLight.png" DisplayAltText="GPU widget preview image" />
                       </Screenshots>
                       <DarkMode>
                         <Icons>
-                          <Icon Path="Widgets\Assets\gpu_icon_dark.png" />
+                          <Icon Path="Widgets\Assets\icons\gpu_icon_dark.png" />
                         </Icons>
                         <Screenshots>
-                          <Screenshot Path="Assets\Preview\GPUScreenshotDark.png" DisplayAltText="Dev Home icon" />
+                          <Screenshot Path="Widgets\Assets\screenshots\GPUScreenshotDark.png" DisplayAltText="GPU widget preview image" />
                         </Screenshots>
                       </DarkMode>
                       <LightMode />
@@ -219,17 +219,17 @@
                     </Capabilities>
                     <ThemeResources>
                       <Icons>
-                        <Icon Path="Widgets\Assets\cpu_icon_light.png" />
+                        <Icon Path="Widgets\Assets\icons\cpu_icon_light.png" />
                       </Icons>
                       <Screenshots>
-                        <Screenshot Path="Assets\Preview\CPUScreenshotLight.png" DisplayAltText="Dev Home icon" />
+                        <Screenshot Path="Widgets\Assets\screenshots\CPUScreenshotLight.png" DisplayAltText="CPU widget preview image" />
                       </Screenshots>
                       <DarkMode>
                         <Icons>
-                          <Icon Path="Widgets\Assets\cpu_icon_dark.png" />
+                          <Icon Path="Widgets\Assets\icons\cpu_icon_dark.png" />
                         </Icons>
                         <Screenshots>
-                          <Screenshot Path="Assets\Preview\CPUScreenshotDark.png" DisplayAltText="Dev Home icon" />
+                          <Screenshot Path="Widgets\Assets\screenshots\CPUScreenshotDark.png" DisplayAltText="CPU widget preview image" />
                         </Screenshots>
                       </DarkMode>
                       <LightMode />