fix: Find the relative path of the appicon

Use AssignLinkMetadata to do that
unoplatform · Sep 21, 2023 · f2b34e2 · f2b34e2
1 parent 6e8739b
commit f2b34e2
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/.nuspec/Uno.Resizetizer.targets b/src/.nuspec/Uno.Resizetizer.targets
@@ -262,7 +262,7 @@
 	<ItemGroup>
 		<_WindowIconExtension Include="$(_UnoResizetizerIntermediateOutputRoot)Uno.Resizetizer.WindowIconExtensions.g.cs"/>
 	</ItemGroup>
-
+		
 	<!-- Finds absolute paths to any UnoImage in this project -->
 	<!-- App head projects will invoke this target on their project references to collect images -->
 	<Target Name="GetUnoItems" Outputs="@(ExportedUnoItem)">
@@ -317,7 +317,7 @@
 
 		<!-- Map @(UnoIcon) to @(UnoImage IsAppIcon=true) -->
 		<ItemGroup>
-			<UnoImage Include="@(UnoIcon)" IsAppIcon="True" Link="" ProjectDirectory="%(UnoIcon.ProjectDirectory)"/>
+			<UnoImage Include="@(UnoIcon)" IsAppIcon="True" Link="%(UnoIcon.Link)" />
 		</ItemGroup>
 
 		<!-- Write out item spec and metadata to a file we can use as an inputs for the resize target -->

diff --git a/src/.nuspec/Uno.Resizetizer.windows.skia.targets b/src/.nuspec/Uno.Resizetizer.windows.skia.targets
@@ -1,5 +1,20 @@
 <Project>
 
+	<Target 
+		Name="UpdatePathOfUnoIcon"
+		BeforeTargets="UnoResizetizeCollectItems"
+		Condition="'$(_UnoResizetizerIsWindowsAppSdk)' == 'True'">
+
+		<AssignLinkMetadata Items="@(UnoIcon)">
+			<Output TaskParameter="OutputItems" ItemName="_UnoIconLinked"/>
+		</AssignLinkMetadata>
+
+		<ItemGroup>
+			<UnoIcon Remove="@(UnoIcon)"/>
+			<UnoIcon Include="@(_UnoIconLinked)"/>
+		</ItemGroup>
+	</Target>
+
 	<Target
 			Name="GenerateUnoSplashWindowsSkia"
 			AfterTargets="GenerateUnoSplashScreens"