Merge pull request #201 from unoplatform/pj/fix-appxmanifest-generati…

…on-on-skia Fix the appxmanifest generation
unoplatform · Dec 1, 2023 · 7ad1199 · 7ad1199
2 parents 6461423 + 701b3ed
commit 7ad1199
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 17 deletions.
diff --git a/...late/Resizetizer.Extensions.Sample.Skia.Gtk/Resizetizer.Extensions.Sample.Skia.Gtk.csproj b/...late/Resizetizer.Extensions.Sample.Skia.Gtk/Resizetizer.Extensions.Sample.Skia.Gtk.csproj
@@ -29,7 +29,7 @@
 			<_ResizetizerManifestPath>$(_UnoIntermediateManifest)Package.appxmanifest</_ResizetizerManifestPath>
 			<_ResizetizerSplashScreenPath>$(_UnoIntermediateImages)splash_screen.scale-125.png</_ResizetizerSplashScreenPath>
 			<_ResizetizerAppIconPath>$(_UnoIntermediateImages)iconapp.ico</_ResizetizerAppIconPath>
-			<_ResizetizerAppIconImagesPath>$(_UnoIntermediateImages)iconapp.png</_ResizetizerAppIconImagesPath>
+			<_ResizetizerAppIconImagesPath>$(_UnoIntermediateImages)Icons\iconappLogo.scale-100.png</_ResizetizerAppIconImagesPath>
 		</PropertyGroup>
 		<Message Text="Validating local assets at '$(_ResizetizerIntermediateOutputRoot)'" Importance="high" />
 		<Error Condition="!Exists('$(_ResizetizerManifestPath)')" Text="Manifest file wasn't created." />

diff --git a/...late/Resizetizer.Extensions.Sample.Skia.WPF/Resizetizer.Extensions.Sample.Skia.WPF.csproj b/...late/Resizetizer.Extensions.Sample.Skia.WPF/Resizetizer.Extensions.Sample.Skia.WPF.csproj
@@ -43,7 +43,7 @@
 		<PropertyGroup>
 			<_ResizetizerSplashScreenPath>$(_UnoIntermediateImages)splash_screen.scale-125.png</_ResizetizerSplashScreenPath>
 			<_ResizetizerAppIconPath>$(_UnoIntermediateImages)iconapp.ico</_ResizetizerAppIconPath>
-			<_ResizetizerAppIconImagesPath>$(_UnoIntermediateImages)iconapp.png</_ResizetizerAppIconImagesPath>
+			<_ResizetizerAppIconImagesPath>$(_UnoIntermediateImages)Icons\iconappLogo.scale-100.png</_ResizetizerAppIconImagesPath>
 		</PropertyGroup>
 		<Message Text="Validating local assets at '$(_ResizetizerIntermediateOutputRoot)'" Importance="high" />
 		<Error Condition="!Exists('$(_ResizetizerSplashScreenPath)')" Text="SplashScreen file wasn't created." />

diff --git a/src/.nuspec/Uno.Resizetizer.windows.skia.targets b/src/.nuspec/Uno.Resizetizer.windows.skia.targets
@@ -3,8 +3,7 @@
 	<Target 
 		Name="UpdatePathOfUnoIcon"
 		BeforeTargets="UnoResizetizeCollectItems"
-		DependsOnTargets="ValidateAvailableItems"
-		Condition="'$(_UnoResizetizerIsWindowsAppSdk)' == 'True'">
+		DependsOnTargets="ValidateAvailableItems">
 
 		<AssignLinkMetadata Items="@(UnoIcon)">
 			<Output TaskParameter="OutputItems" ItemName="_UnoIconLinked"/>

diff --git a/src/Resizetizer/src/DpiPath.cs b/src/Resizetizer/src/DpiPath.cs
@@ -230,16 +230,6 @@ public static DpiPath[] Badge
 				LargeTile).ToArray();
 		}
 
-		public static class Wpf
-		{
-			public static DpiPath[] AppIcon
-				=> new[]
-				{
-					new DpiPath("", 4.0m),
-				};
-		}
-
-
 		public static class Wasm
 		{
 			public static DpiPath[] AppIcon => new[]
@@ -276,10 +266,8 @@ public static DpiPath[] GetAppIconDpis(string platform, string appIconName)
 					break;
 				case "uwp":
 				case "windows":
-					result = DpiPath.Windows.AppIcon;
-					break;
 				case "wpf":
-					result = DpiPath.Wpf.AppIcon;
+					result = DpiPath.Windows.AppIcon;
 					break;
 				case "wasm":
 					result = DpiPath.Wasm.AppIcon;