fix(skia): Assets may not be copied properly to the output or publish…

… folder
unoplatform · Sep 7, 2020 · e37c0e8 · e37c0e8
1 parent 414e106
commit e37c0e8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 15 deletions.
diff --git a/build/Uno.WinUI.Skia.Gtk.targets b/build/Uno.WinUI.Skia.Gtk.targets
@@ -4,14 +4,13 @@
   <PropertyGroup>
   </PropertyGroup>
 
-  <Target Name="AfterBuild">
-
-    <!-- Copy Content files to the output folder like APPX packaging does. -->
-	<Copy
-        SourceFiles = "@(ContentWithTargetPath)"
-        DestinationFiles = "@(ContentWithTargetPath->'$(TargetDir)%(TargetPath)')"
-		Condition="'%(ContentWithTargetPath.CopyToOutputDirectory)'=='Never'"/>
+  <Target Name="_UnoBeforeCopyLocal" BeforeTargets="CopyFilesToOutputDirectory;_CopyFilesMarkedCopyLocal">
+	<ItemGroup>
+	  <ContentWithTargetPath
+		Update="@(ContentWithTargetPath)"
+		CopyToOutputDirectory="Always"
+		Condition="'%(ContentWithTargetPath.CopyToOutputDirectory)'==''" />
+	</ItemGroup>
   </Target>
 
-
 </Project>
diff --git a/build/Uno.WinUI.Skia.Wpf.targets b/build/Uno.WinUI.Skia.Wpf.targets
@@ -4,12 +4,15 @@
   <PropertyGroup>
   </PropertyGroup>
 
-    <!-- Copy Content files to the output folder like APPX packaging does. -->
-	<Target Name="AfterBuild">
-        <Copy
-        SourceFiles = "@(ContentWithTargetPath)"
-        DestinationFiles = "@(ContentWithTargetPath->'$(TargetDir)%(TargetPath)')" 
-		Condition="'%(ContentWithTargetPath.CopyToOutputDirectory)'=='Never'"/>
-	</Target>
+  <!-- Copy Content files to the output folder like APPX packaging does. -->
+  <Target Name="_UnoBeforeCopyLocal" BeforeTargets="CopyFilesToOutputDirectory;_CopyFilesMarkedCopyLocal">
+	<ItemGroup>
+	  <ContentWithTargetPath
+		Update="@(ContentWithTargetPath)"
+		CopyToOutputDirectory="Always"
+		Condition="'%(ContentWithTargetPath.CopyToOutputDirectory)'==''" />
+	</ItemGroup>
+  </Target>
+
 
 </Project>