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

…5.2/pr-16373 Hot Restart fixes (backport #16373)
unoplatform · Apr 19, 2024 · 78c2012 · 78c2012
2 parents 80d2ae6 + 52f5c65
commit 78c2012
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
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
@@ -150,7 +150,7 @@
 							TargetPlatform="$(XamarinProjectType)"
 							DefaultLanguage="$(DefaultLanguage)"
 							IntermediateOutputPath="$(IntermediateOutputPath)"
-							ContentItems="@(Content);@(_SourceItemsToCopyToOutputDirectory)"
+							ContentItems="@(ContentWithTargetPath);@(_SourceItemsToCopyToOutputDirectory)"
 							AndroidAssetsPrefix="$(MonoAndroidAssetsPrefix)"
 							IosAppManifest="$(_UnoIosAppManifest)"
 							Condition="'$(XamarinProjectType)'!=''">

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
@@ -134,12 +134,14 @@
 		<ItemGroup Condition="'$(ProjectTypeGuids)'!=''">
 			<!-- Xamarin-based targets which don't set RuntimeCopyLocalItems must use  -->
 			<_UnoPriFiles Include="@(Reference->'%(RootDir)%(Directory)%(Filename).uprimarker')"
-						  Condition="$([System.IO.File]::Exists('%(RootDir)%(Directory)%(Filename).uprimarker'))"/>
+						  Condition="$([System.IO.File]::Exists('%(RootDir)%(Directory)%(Filename).uprimarker'))"
+						  PublishFolderType="None" />
 		</ItemGroup>
 
 		<ItemGroup Condition="'$(ProjectTypeGuids)'==''">
 			<_UnoPriFiles Include="@(RuntimeCopyLocalItems->'%(RootDir)%(Directory)%(Filename).uprimarker')"
-						  Condition="$([System.IO.File]::Exists('%(RootDir)%(Directory)%(Filename).uprimarker'))"/>
+						  Condition="$([System.IO.File]::Exists('%(RootDir)%(Directory)%(Filename).uprimarker'))"
+						  PublishFolderType="None" />
 		</ItemGroup>
 
 		<ItemGroup>