fix(assets): Always generate a valid BundleResource LogicalName

jeromelaban · Apr 19, 2024 · 6891d30 · 6891d30
1 parent c62fed4
commit 6891d30
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/SolutionTemplate/5.2/uno52blank/uno52blank/uno52blank.csproj b/src/SolutionTemplate/5.2/uno52blank/uno52blank/uno52blank.csproj
@@ -43,4 +43,11 @@
           Condition="!exists('$(OutputPath)\Assets\SharedAssets.md')" />
   </Target>
 
+  <!-- fail the build if a BundleResource.LogicalName contains a rooted path -->
+  <Target Name="ValidateBundleResourceLogicalName" AfterTargets="AfterBuild">
+    <Error 
+      Condition="'%(BundleResource.LogicalName)' != '' And $([System.IO.Path]::IsPathRooted('%(BundleResource.LogicalName)'))" 
+      Text="BundleResource.LogicalName must not contain a rooted path" />
+  </Target>
+
 </Project>
diff --git a/src/SourceGenerators/Uno.UI.Tasks/Content/Uno.UI.Tasks.targets b/src/SourceGenerators/Uno.UI.Tasks/Content/Uno.UI.Tasks.targets
@@ -152,7 +152,7 @@
 							TargetPlatform="$(XamarinProjectType)"
 							DefaultLanguage="$(DefaultLanguage)"
 							IntermediateOutputPath="$(IntermediateOutputPath)"
-							ContentItems="@(Content);@(_SourceItemsToCopyToOutputDirectory)"
+							ContentItems="@(ContentWithTargetPath);@(_SourceItemsToCopyToOutputDirectory)"
 							AndroidAssetsPrefix="$(MonoAndroidAssetsPrefix)"
 							IosAppManifest="$(_UnoIosAppManifest)"
 							Condition="'$(XamarinProjectType)'!=''">