Merge pull request #18974 from unoplatform/mergify/bp/release/stable/…

…5.5/pr-18966 fix(assets): Adjust project transitive output path (backport #18966)
unoplatform · Dec 2, 2024 · 582da1a · 582da1a
2 parents 283890f + 9494a6e
commit 582da1a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 17 deletions.
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
@@ -75,8 +75,7 @@
 		<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" />
-		<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" />

diff --git a/src/SamplesApp/SamplesApp.Wasm/SamplesApp.Wasm.csproj b/src/SamplesApp/SamplesApp.Wasm/SamplesApp.Wasm.csproj
@@ -97,7 +97,6 @@
 		<PackageReference Include="Uno.BenchmarkDotNet.Annotations" Version="0.11.7-develop" />
 		<PackageReference Include="Uno.Wasm.WebSockets" />
 		<PackageReference Include="Uno.Wasm.Bootstrap" />
-		<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" />
 		<PackageReference Include="Microsoft.Windows.Compatibility" Version="9.0.0-rc.2.24474.4" />
 		<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.0-dev.7" />
 		<PackageReference Include="Uno.Fonts.Fluent" />

diff --git 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
@@ -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>