From 6acbdb4297dc2553547e140acbd5a083b031d30e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= <jlaban@gmail.com>
Date: Fri, 29 Nov 2024 08:23:52 -0500
Subject: [PATCH 1/3] fix(assets): Adjust project transitive output path

(cherry picked from commit 983b96d7d93d732cc09dda640133be53b0035d35)

# Conflicts:
#	src/Directory.Build.targets
#	src/SamplesApp/SamplesApp.Wasm/SamplesApp.Wasm.csproj
---
 src/Directory.Build.targets                   |  7 +++++
 .../SamplesApp.Wasm/SamplesApp.Wasm.csproj    |  4 +++
 .../uno53AppWithLib/uno53AppWithLib.csproj    | 26 +++++++++----------
 .../Content/uno.ui.tasks.assets.targets       |  2 +-
 4 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index 4a17f1430bd4..412ac0abfcfe 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -75,11 +75,18 @@
 		<PackageReference Update="Uno.Core.Extensions.Disposables" Version="4.0.1" />
 		<PackageReference Update="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
 		<PackageReference Update="Uno.Diagnostics.Eventing" Version="2.0.1" />
+<<<<<<< HEAD
 		<PackageReference Update="Uno.Wasm.Bootstrap" Version="9.0.0-dev.301" />
 		<PackageReference Update="Uno.Wasm.Bootstrap.DevServer" Version="9.0.0-dev.301" />
 		<PackageReference Update="MSTest" Version="3.3.1" />
 		<PackageReference Update="MSTest.TestFramework" Version="3.3.1" />
 		<PackageReference Update="MSTest.TestAdapter" Version="3.3.1" />
+=======
+		<PackageReference Update="Uno.Wasm.Bootstrap" Version="9.0.8" />
+		<PackageReference Update="MSTest" Version="3.6.3" />
+		<PackageReference Update="MSTest.TestFramework" Version="3.6.3" />
+		<PackageReference Update="MSTest.TestAdapter" Version="3.6.3" />
+>>>>>>> 983b96d7d9 (fix(assets): Adjust project transitive output path)
 		<PackageReference Update="MSTest.Analyzers" Version="3.3.1" />
 		<PackageReference Update="Uno.MonoAnalyzers" Version="1.0.0" PrivateAssets="all" />
 		<PackageReference Update="Uno.Wasm.WebSockets" Version="1.1.0" />
diff --git a/src/SamplesApp/SamplesApp.Wasm/SamplesApp.Wasm.csproj b/src/SamplesApp/SamplesApp.Wasm/SamplesApp.Wasm.csproj
index c737cf3c2232..e96403ba4002 100644
--- a/src/SamplesApp/SamplesApp.Wasm/SamplesApp.Wasm.csproj
+++ b/src/SamplesApp/SamplesApp.Wasm/SamplesApp.Wasm.csproj
@@ -97,8 +97,12 @@
 		<PackageReference Include="Uno.BenchmarkDotNet.Annotations" Version="0.11.7-develop" />
 		<PackageReference Include="Uno.Wasm.WebSockets" />
 		<PackageReference Include="Uno.Wasm.Bootstrap" />
+<<<<<<< HEAD
 		<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" />
 		<PackageReference Include="Microsoft.Windows.Compatibility" Version="9.0.0-rc.2.24474.4" />
+=======
+		<PackageReference Include="Microsoft.Windows.Compatibility" Version="9.0.0" />
+>>>>>>> 983b96d7d9 (fix(assets): Adjust project transitive output path)
 		<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.0-dev.7" />
 		<PackageReference Include="Uno.Fonts.Fluent" />
 		<PackageReference Include="Uno.Core.Extensions.Logging" Version="4.0.1" />
diff --git a/src/SolutionTemplate/5.3/uno53AppWithLib/uno53AppWithLib/uno53AppWithLib.csproj b/src/SolutionTemplate/5.3/uno53AppWithLib/uno53AppWithLib/uno53AppWithLib.csproj
index 076633aa5eb1..05c7b1c1e260 100644
--- a/src/SolutionTemplate/5.3/uno53AppWithLib/uno53AppWithLib/uno53AppWithLib.csproj
+++ b/src/SolutionTemplate/5.3/uno53AppWithLib/uno53AppWithLib/uno53AppWithLib.csproj
@@ -138,27 +138,27 @@
 
       <ItemGroup
           Condition="'$(TargetFramework)'=='net9.0-browserwasm'">
-        <_AssetsToValidate Include="$(PublishDir)wwwroot\Assets\SharedAssets.md" />
-        <_AssetsToValidate Include="$(PublishDir)wwwroot\Assets\json_file_asset.json" />
-        <_AssetsToValidate Include="$(PublishDir)wwwroot\Assets\Icons\icon_foreground.png" />
-        <_AssetsToValidate Include="$(PublishDir)wwwroot\Assets\Icons\icon_foreground.scale-100.png" />
-        <_AssetsToValidate Include="$(PublishDir)wwwroot\Assets\Icons\icon_foreground.scale-125.png" />
-        <_AssetsToValidate Include="$(PublishDir)wwwroot\Assets\Icons\icon_foreground.scale-150.png" />
-        <_AssetsToValidate Include="$(PublishDir)wwwroot\Assets\Icons\icon_foreground.scale-200.png" />
-        <_AssetsToValidate Include="$(PublishDir)wwwroot\Assets\Icons\icon_foreground.scale-300.png" />
-        <_AssetsToValidate Include="$(PublishDir)wwwroot\Assets\Icons\icon_foreground.scale-400.png" />
+        <_AssetsToValidate Include="$(PublishDir)wwwroot\$(WasmShellOutputPackagePath)/\Assets\SharedAssets.md" />
+        <_AssetsToValidate Include="$(PublishDir)wwwroot\$(WasmShellOutputPackagePath)/\Assets\json_file_asset.json" />
+        <_AssetsToValidate Include="$(PublishDir)wwwroot\$(WasmShellOutputPackagePath)/\Assets\Icons\icon_foreground.png" />
+        <_AssetsToValidate Include="$(PublishDir)wwwroot\$(WasmShellOutputPackagePath)/\Assets\Icons\icon_foreground.scale-100.png" />
+        <_AssetsToValidate Include="$(PublishDir)wwwroot\$(WasmShellOutputPackagePath)/\Assets\Icons\icon_foreground.scale-125.png" />
+        <_AssetsToValidate Include="$(PublishDir)wwwroot\$(WasmShellOutputPackagePath)/\Assets\Icons\icon_foreground.scale-150.png" />
+        <_AssetsToValidate Include="$(PublishDir)wwwroot\$(WasmShellOutputPackagePath)/\Assets\Icons\icon_foreground.scale-200.png" />
+        <_AssetsToValidate Include="$(PublishDir)wwwroot\$(WasmShellOutputPackagePath)/\Assets\Icons\icon_foreground.scale-300.png" />
+        <_AssetsToValidate Include="$(PublishDir)wwwroot\$(WasmShellOutputPackagePath)/\Assets\Icons\icon_foreground.scale-400.png" />
 
         <!-- wwwroot -->
         <_AssetsToValidate Include="$(PublishDir)wwwroot\staticwebapp.config.json" />
         <_AssetsToValidate Include="$(OutputPath)wwwroot\web.config" />
 
         <!-- Validate json files handling -->
-        <_AssetsToValidate Include="$(PublishDir)wwwroot\test_root_asset.json" />
-        <_AssetsToValidate Include="$(PublishDir)wwwroot\test_root_asset_not_included.json" MustNotExist="true" />
+        <_AssetsToValidate Include="$(PublishDir)wwwroot\$(WasmShellOutputPackagePath)\test_root_asset.json" />
+        <_AssetsToValidate Include="$(PublishDir)wwwroot\$(WasmShellOutputPackagePath)\test_root_asset_not_included.json" MustNotExist="true" />
 
         <!-- Transitive library asset -->
-        <_AssetsToValidate Include="$(PublishDir)wwwroot\uno53lib\Assets\uno53lib-test.xml" />
-        <_AssetsToValidate Include="$(PublishDir)wwwroot\uno53lib\Assets\uno53lib_icon_lib.png" />
+        <_AssetsToValidate Include="$(PublishDir)wwwroot\$(WasmShellOutputPackagePath)\uno53lib\Assets\uno53lib-test.xml" />
+        <_AssetsToValidate Include="$(PublishDir)wwwroot\$(WasmShellOutputPackagePath)\uno53lib\Assets\uno53lib_icon_lib.png" />
       </ItemGroup>
 
     <Error Text="Missing asset %(_AssetsToValidate.Identity)"
diff --git a/src/SourceGenerators/Uno.UI.Tasks/Content/uno.ui.tasks.assets.targets b/src/SourceGenerators/Uno.UI.Tasks/Content/uno.ui.tasks.assets.targets
index 5eeaceb05597..7d0ee1156d01 100644
--- a/src/SourceGenerators/Uno.UI.Tasks/Content/uno.ui.tasks.assets.targets
+++ b/src/SourceGenerators/Uno.UI.Tasks/Content/uno.ui.tasks.assets.targets
@@ -293,7 +293,7 @@
 			<_UnoTransitiveItems Include="@(UnoAllCopyToOutputItems)">
 				<!-- set the ContentRoot using GetDirectoryName -->
 				<ContentRoot>$([System.IO.Path]::GetDirectoryName('%(FullPath)'))</ContentRoot>
-				<Link>wwwroot/%(TargetPath)</Link>
+				<Link>wwwroot/$(WasmShellOutputPackagePath)/%(TargetPath)</Link>
 				<TargetPath></TargetPath>
 			</_UnoTransitiveItems>
 

From 6e14d329303e7798cb6197e4b07bb1f52b18b8d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= <jlaban@gmail.com>
Date: Fri, 29 Nov 2024 21:39:16 -0500
Subject: [PATCH 2/3] chore: Adjust template tests

(cherry picked from commit 4ae23d89c12c8974dcd6195f7b1c50388ea418ea)
---
 .../uno53AppWithLib/uno53AppWithLib.csproj     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/SolutionTemplate/5.3/uno53AppWithLib/uno53AppWithLib/uno53AppWithLib.csproj b/src/SolutionTemplate/5.3/uno53AppWithLib/uno53AppWithLib/uno53AppWithLib.csproj
index 05c7b1c1e260..553e45a5c202 100644
--- a/src/SolutionTemplate/5.3/uno53AppWithLib/uno53AppWithLib/uno53AppWithLib.csproj
+++ b/src/SolutionTemplate/5.3/uno53AppWithLib/uno53AppWithLib/uno53AppWithLib.csproj
@@ -138,15 +138,15 @@
 
       <ItemGroup
           Condition="'$(TargetFramework)'=='net9.0-browserwasm'">
-        <_AssetsToValidate Include="$(PublishDir)wwwroot\$(WasmShellOutputPackagePath)/\Assets\SharedAssets.md" />
-        <_AssetsToValidate Include="$(PublishDir)wwwroot\$(WasmShellOutputPackagePath)/\Assets\json_file_asset.json" />
-        <_AssetsToValidate Include="$(PublishDir)wwwroot\$(WasmShellOutputPackagePath)/\Assets\Icons\icon_foreground.png" />
-        <_AssetsToValidate Include="$(PublishDir)wwwroot\$(WasmShellOutputPackagePath)/\Assets\Icons\icon_foreground.scale-100.png" />
-        <_AssetsToValidate Include="$(PublishDir)wwwroot\$(WasmShellOutputPackagePath)/\Assets\Icons\icon_foreground.scale-125.png" />
-        <_AssetsToValidate Include="$(PublishDir)wwwroot\$(WasmShellOutputPackagePath)/\Assets\Icons\icon_foreground.scale-150.png" />
-        <_AssetsToValidate Include="$(PublishDir)wwwroot\$(WasmShellOutputPackagePath)/\Assets\Icons\icon_foreground.scale-200.png" />
-        <_AssetsToValidate Include="$(PublishDir)wwwroot\$(WasmShellOutputPackagePath)/\Assets\Icons\icon_foreground.scale-300.png" />
-        <_AssetsToValidate Include="$(PublishDir)wwwroot\$(WasmShellOutputPackagePath)/\Assets\Icons\icon_foreground.scale-400.png" />
+        <_AssetsToValidate Include="$(PublishDir)wwwroot\$(WasmShellOutputPackagePath)\Assets\SharedAssets.md" />
+        <_AssetsToValidate Include="$(PublishDir)wwwroot\$(WasmShellOutputPackagePath)\Assets\json_file_asset.json" />
+        <_AssetsToValidate Include="$(PublishDir)wwwroot\$(WasmShellOutputPackagePath)\Assets\Icons\icon_foreground.png" />
+        <_AssetsToValidate Include="$(PublishDir)wwwroot\$(WasmShellOutputPackagePath)\Assets\Icons\icon_foreground.scale-100.png" />
+        <_AssetsToValidate Include="$(PublishDir)wwwroot\$(WasmShellOutputPackagePath)\Assets\Icons\icon_foreground.scale-125.png" />
+        <_AssetsToValidate Include="$(PublishDir)wwwroot\$(WasmShellOutputPackagePath)\Assets\Icons\icon_foreground.scale-150.png" />
+        <_AssetsToValidate Include="$(PublishDir)wwwroot\$(WasmShellOutputPackagePath)\Assets\Icons\icon_foreground.scale-200.png" />
+        <_AssetsToValidate Include="$(PublishDir)wwwroot\$(WasmShellOutputPackagePath)\Assets\Icons\icon_foreground.scale-300.png" />
+        <_AssetsToValidate Include="$(PublishDir)wwwroot\$(WasmShellOutputPackagePath)\Assets\Icons\icon_foreground.scale-400.png" />
 
         <!-- wwwroot -->
         <_AssetsToValidate Include="$(PublishDir)wwwroot\staticwebapp.config.json" />

From 9494a6e6396c991707c5a761b4751f22b2063a18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= <jlaban@gmail.com>
Date: Sat, 30 Nov 2024 15:48:32 -0500
Subject: [PATCH 3/3] chore: Adjust for backport

---
 src/Directory.Build.targets                           | 10 +---------
 src/SamplesApp/SamplesApp.Wasm/SamplesApp.Wasm.csproj |  5 -----
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index 412ac0abfcfe..2cf2d40c5d2d 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -75,18 +75,10 @@
 		<PackageReference Update="Uno.Core.Extensions.Disposables" Version="4.0.1" />
 		<PackageReference Update="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
 		<PackageReference Update="Uno.Diagnostics.Eventing" Version="2.0.1" />
-<<<<<<< HEAD
-		<PackageReference Update="Uno.Wasm.Bootstrap" Version="9.0.0-dev.301" />
-		<PackageReference Update="Uno.Wasm.Bootstrap.DevServer" Version="9.0.0-dev.301" />
+		<PackageReference Update="Uno.Wasm.Bootstrap" Version="9.0.8" />
 		<PackageReference Update="MSTest" Version="3.3.1" />
 		<PackageReference Update="MSTest.TestFramework" Version="3.3.1" />
 		<PackageReference Update="MSTest.TestAdapter" Version="3.3.1" />
-=======
-		<PackageReference Update="Uno.Wasm.Bootstrap" Version="9.0.8" />
-		<PackageReference Update="MSTest" Version="3.6.3" />
-		<PackageReference Update="MSTest.TestFramework" Version="3.6.3" />
-		<PackageReference Update="MSTest.TestAdapter" Version="3.6.3" />
->>>>>>> 983b96d7d9 (fix(assets): Adjust project transitive output path)
 		<PackageReference Update="MSTest.Analyzers" Version="3.3.1" />
 		<PackageReference Update="Uno.MonoAnalyzers" Version="1.0.0" PrivateAssets="all" />
 		<PackageReference Update="Uno.Wasm.WebSockets" Version="1.1.0" />
diff --git a/src/SamplesApp/SamplesApp.Wasm/SamplesApp.Wasm.csproj b/src/SamplesApp/SamplesApp.Wasm/SamplesApp.Wasm.csproj
index e96403ba4002..48eb8e69fd59 100644
--- a/src/SamplesApp/SamplesApp.Wasm/SamplesApp.Wasm.csproj
+++ b/src/SamplesApp/SamplesApp.Wasm/SamplesApp.Wasm.csproj
@@ -97,12 +97,7 @@
 		<PackageReference Include="Uno.BenchmarkDotNet.Annotations" Version="0.11.7-develop" />
 		<PackageReference Include="Uno.Wasm.WebSockets" />
 		<PackageReference Include="Uno.Wasm.Bootstrap" />
-<<<<<<< HEAD
-		<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" />
 		<PackageReference Include="Microsoft.Windows.Compatibility" Version="9.0.0-rc.2.24474.4" />
-=======
-		<PackageReference Include="Microsoft.Windows.Compatibility" Version="9.0.0" />
->>>>>>> 983b96d7d9 (fix(assets): Adjust project transitive output path)
 		<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.0-dev.7" />
 		<PackageReference Include="Uno.Fonts.Fluent" />
 		<PackageReference Include="Uno.Core.Extensions.Logging" Version="4.0.1" />