From a607d1b7588f5ddd0be960038060acc4f3911ca7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= <jlaban@gmail.com>
Date: Wed, 27 Mar 2024 16:45:16 -0400
Subject: [PATCH] feat: Ensure that uno.sdk winappsdk apps include all Assets
 by default

---
 .../5.2/uno52blank/uno52blank/uno52blank.csproj          | 9 +++++++++
 src/Uno.Sdk/targets/Uno.Common.WinAppSdk.targets         | 7 +++++++
 src/Uno.Sdk/targets/Uno.SingleProject.WinAppSdk.targets  | 4 ++++
 3 files changed, 20 insertions(+)

diff --git a/src/SolutionTemplate/5.2/uno52blank/uno52blank/uno52blank.csproj b/src/SolutionTemplate/5.2/uno52blank/uno52blank/uno52blank.csproj
index bb73e757929b..cc15a115bf1e 100644
--- a/src/SolutionTemplate/5.2/uno52blank/uno52blank/uno52blank.csproj
+++ b/src/SolutionTemplate/5.2/uno52blank/uno52blank/uno52blank.csproj
@@ -28,4 +28,13 @@
     <!-- <WindowsSdkPackageVersion>10.0.22621.28</WindowsSdkPackageVersion> -->
   </PropertyGroup>
 
+  <Target Name="_UnoValidateSelfAssets" 
+          BeforeTargets="AfterBuild" 
+          Condition="'$(TargetFramework)'=='$(DotNetVersion)-windows10.0.19041'">
+
+    <!-- Validates that assets are properly propagated to the output folder, regardless of their "copy to output" value -->
+    <Error Text="Missing asset $(OutputPath)\Assets\SharedAssets.md"
+          Condition="!exists('$(OutputPath)\Assets\SharedAssets.md')" />
+  </Target>
+
 </Project>
diff --git a/src/Uno.Sdk/targets/Uno.Common.WinAppSdk.targets b/src/Uno.Sdk/targets/Uno.Common.WinAppSdk.targets
index 19784bcd9103..f12ffdc5adec 100644
--- a/src/Uno.Sdk/targets/Uno.Common.WinAppSdk.targets
+++ b/src/Uno.Sdk/targets/Uno.Common.WinAppSdk.targets
@@ -46,6 +46,13 @@
 		<Manifest Include="$(ApplicationManifest)" Exclude="@(Manifest)" />
 	</ItemGroup>
 
+	<ItemGroup>
+		<!-- Replicates the original globbing from WinAppSDK (See microsoft.windowsappsdk\1.4.240211001\buildTransitive\Microsoft.WinUI.props)-->
+		<Content Update="Assets/**/*.*" Condition="'$(EnableDefaultAssets)'=='true'">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+	</ItemGroup>
+
 	<!-- Workaround to avoid including Project XBFs in the PRI file: https://github.com/microsoft/microsoft-ui-xaml/issues/8857 -->
 	<Import Project="winappsdk-workaround.targets"
 			Condition=" '$(SingleProject)' != 'true' and '$(DisableWinUI8857_Workaround)' != 'true' "/>
diff --git a/src/Uno.Sdk/targets/Uno.SingleProject.WinAppSdk.targets b/src/Uno.Sdk/targets/Uno.SingleProject.WinAppSdk.targets
index 569550947ca1..b03069c1f4bb 100644
--- a/src/Uno.Sdk/targets/Uno.SingleProject.WinAppSdk.targets
+++ b/src/Uno.Sdk/targets/Uno.SingleProject.WinAppSdk.targets
@@ -30,6 +30,10 @@
 			Condition="Exists('$(ApplicationManifest)')" />
 	</ItemGroup>
 
+	<ItemGroup>
+		<Content Update="" />
+	</ItemGroup>
+
 	<!-- Using .NET MAUI Workaround for AnyCPU https://github.com/dotnet/maui/blob/37ca0c26e39a40f14b4fd60416b90a1a62e28473/src/Workload/Microsoft.Maui.Sdk/Sdk/Microsoft.Maui.Sdk.Before.targets#L12-L22 -->
 	<!-- The Windows App SDK does not support AnyCPU without a RID, so make sure we pick the "best" one we can -->
 	<PropertyGroup>