From a129f0655d64046a9ca8bea87946f3cc9bbe8c1d Mon Sep 17 00:00:00 2001
From: Elie Bariche <33458222+ebariche@users.noreply.github.com>
Date: Mon, 15 Jul 2024 13:47:17 -0400
Subject: [PATCH] fix: Override WasmPWAManifestFile properly

(cherry picked from commit 096058683afb65c671758a6fcb685ee42789f585)
---
 src/.nuspec/Uno.Resizetizer.targets      |  9 +++++----
 src/.nuspec/Uno.Resizetizer.wasm.targets | 13 ++++---------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/.nuspec/Uno.Resizetizer.targets b/src/.nuspec/Uno.Resizetizer.targets
index d1281497..9cd40b93 100644
--- a/src/.nuspec/Uno.Resizetizer.targets
+++ b/src/.nuspec/Uno.Resizetizer.targets
@@ -507,15 +507,16 @@
 			<_UnoResizetizerCollectedImages Condition="'@(CopiedResources)' == ''" Include="$(_UnoIntermediateImages)**\*"/>
 			<_UnoResizetizerCollectedAppIcons Include="$(_UnoIntermediateAppIcon)**\*"/>
 
-			<!-- If the PWA manifest is empty we can try to find it on the disk -->
-			<_UnoUnoResizetizerPwaManifestItemGroup Condition="'$(UnoResizetizerPwaManifest)' ==''" Include="$(_UnoIntermediateAppIcon)**\*.json"/>
 			<!-- If the AppIcon property is empty we can try to find it on the disk -->
 			<_AppIconItemGroup Condition="'$(AppIconPath)' == ''" Include="$(_UnoResizetizerIntermediateOutputRoot)**\*.ico"/>
 		</ItemGroup>
 
 		<PropertyGroup>
-			<!-- If the PWA manifest is empty we can try to find it on the disk -->
-			<UnoResizetizerPwaManifest Condition="'$(UnoResizetizerPwaManifest)' ==''">%(_UnoUnoResizetizerPwaManifestItemGroup.FullPath)</UnoResizetizerPwaManifest>
+			<!-- If the PWA manifest is empty we can try to find it on disk -->
+			<_UnoResizetizerPwaManifest>$(_UnoIntermediateAppIcon)..\$([System.IO.Path]::GetFileName($(WasmPWAManifestFile)))</_UnoResizetizerPwaManifest>
+			<UnoResizetizerPwaManifest Condition="
+				'$(UnoResizetizerPwaManifest)'=='' and
+				Exists('$(_UnoResizetizerPwaManifest)')">$(_UnoResizetizerPwaManifest)</UnoResizetizerPwaManifest>
 			<!-- If the AppIcon property is empty we can try to find it on the disk -->
 			<AppIconPath Condition="'$(AppIconPath)' == ''">%(_AppIconItemGroup.Identity)</AppIconPath>
 		</PropertyGroup>
diff --git a/src/.nuspec/Uno.Resizetizer.wasm.targets b/src/.nuspec/Uno.Resizetizer.wasm.targets
index f2700576..f9574676 100644
--- a/src/.nuspec/Uno.Resizetizer.wasm.targets
+++ b/src/.nuspec/Uno.Resizetizer.wasm.targets
@@ -48,6 +48,10 @@
 			Condition="'$(DesignTimeBuild)' != 'true'">
 
 		<!-- Wasm -->
+		<PropertyGroup>
+			<WasmPWAManifestFile Condition="'$(UnoResizetizerPwaManifest)'!=''">$(UnoResizetizerPwaManifest)</WasmPWAManifestFile>
+		</PropertyGroup>
+
 		<ItemGroup>
 			<Content Include="@(_UnoResizetizerCollectedImages->FullPath())"
 					 Link="%(_UnoResizetizerCollectedImages.RecursiveDir)%(_UnoResizetizerCollectedImages.Filename)%(_UnoResizetizerCollectedImages.Extension)">
@@ -64,14 +68,5 @@
 
 			<FileWrites Include="@(_UnoResizetizerCollectedImages)"/>
 		</ItemGroup>
-
-		<ItemGroup Condition="'$(UnoResizetizerPwaManifest)' != ''">
-			<Content Remove="$(WasmPWAManifestFile)"/>
-			<Content Include="$(UnoResizetizerPwaManifest)"
-					 CopyToOutputDirectory="PreserveNewest"
-					 ExcludeFromSingleFile="True"
-					 CopyToPublishDirectory="PreserveNewest"
-					 Link="$(WasmPWAManifestFile)"/>
-		</ItemGroup>
 	</Target>
 </Project>
\ No newline at end of file