From 241f2dbacfdc68bf612a7e12b4d7abd9f00034bc Mon Sep 17 00:00:00 2001
From: Jerome Laban <jerome@platform.uno>
Date: Wed, 25 Sep 2024 16:47:02 -0400
Subject: [PATCH 1/2] fix: Ensure wwwroot assets are copied properly

(cherry picked from commit b2062476a3420bd08673f896025c15597ba30a16)

# Conflicts:
#	src/SolutionTemplate/5.3/uno53net9blank/uno53net9blank/uno53net9blank.csproj
#	src/Uno.Sdk/targets/Uno.Common.Wasm.targets
---
 .../uno52AppWithLib/uno52AppWithLib.csproj    |  4 +
 .../uno53net9blank/uno53net9blank.csproj      | 91 +++++++++++++++++++
 src/Uno.Sdk/targets/Uno.Common.Wasm.targets   | 30 +++++-
 3 files changed, 123 insertions(+), 2 deletions(-)
 create mode 100644 src/SolutionTemplate/5.3/uno53net9blank/uno53net9blank/uno53net9blank.csproj

diff --git a/src/SolutionTemplate/5.2/uno52AppWithLib/uno52AppWithLib/uno52AppWithLib.csproj b/src/SolutionTemplate/5.2/uno52AppWithLib/uno52AppWithLib/uno52AppWithLib.csproj
index 13b98c98c5ba..95821a360f7c 100644
--- a/src/SolutionTemplate/5.2/uno52AppWithLib/uno52AppWithLib/uno52AppWithLib.csproj
+++ b/src/SolutionTemplate/5.2/uno52AppWithLib/uno52AppWithLib/uno52AppWithLib.csproj
@@ -80,6 +80,10 @@
         <_AssetsToValidate Include="$(WasmShellOutputPackagePath)\Assets\Icons\icon_foreground.scale-300.png" />
         <_AssetsToValidate Include="$(WasmShellOutputPackagePath)\Assets\Icons\icon_foreground.scale-400.png" />
 
+        <!-- wwwroot -->
+        <_AssetsToValidate Include="$(WasmShellOutputPackagePath)\..\staticwebapp.config.json" />
+        <_AssetsToValidate Include="$(WasmShellOutputPackagePath)\..\web.config" />
+
         <!-- Validate json files handling -->
         <_AssetsToValidate Include="$(WasmShellOutputPackagePath)\test_root_asset.json" />
         <_AssetsToValidate Include="$(WasmShellOutputPackagePath)\test_root_asset_not_included.json" MustNotExist="true" />
diff --git a/src/SolutionTemplate/5.3/uno53net9blank/uno53net9blank/uno53net9blank.csproj b/src/SolutionTemplate/5.3/uno53net9blank/uno53net9blank/uno53net9blank.csproj
new file mode 100644
index 000000000000..9ee7dfcea859
--- /dev/null
+++ b/src/SolutionTemplate/5.3/uno53net9blank/uno53net9blank/uno53net9blank.csproj
@@ -0,0 +1,91 @@
+<Project Sdk="Uno.Sdk.Private">
+  <PropertyGroup>
+    <TargetFrameworks>net9.0-browserwasm;net9.0-desktop;net9.0</TargetFrameworks>
+    <TargetFrameworks Condition="!$([MSBuild]::IsOSPlatform('linux'))">$(TargetFrameworks);net9.0-android;net9.0-ios;net9.0-maccatalyst;net9.0-desktop</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041</TargetFrameworks>
+
+    <!-- Disable android on msbuild .NET Framework until android 35 is supported -->
+    <TargetFrameworks Condition="'$(MSBuildRuntimeType)' == 'Full'">$(TargetFrameworks.Replace('net9.0-android',''))</TargetFrameworks>
+    <TargetFrameworks Condition="'$(MSBuildRuntimeType)' == 'Full'">$(TargetFrameworks.Replace('net9.0-ios',''))</TargetFrameworks>
+    <TargetFrameworks Condition="'$(MSBuildRuntimeType)' == 'Full'">$(TargetFrameworks.Replace('net9.0-maccatalyst',''))</TargetFrameworks>
+
+    <OutputType>Exe</OutputType>
+    <UnoSingleProject>true</UnoSingleProject>
+
+    <!-- Display name -->
+    <ApplicationTitle>uno53net9blank</ApplicationTitle>
+    <!-- App Identifier -->
+    <ApplicationId>com.companyname.uno53net9blank</ApplicationId>
+    <!-- Versions -->
+    <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
+    <ApplicationVersion>1</ApplicationVersion>
+    <!-- Package Publisher -->
+    <ApplicationPublisher>uno53net9blank</ApplicationPublisher>
+    <!-- Package Description -->
+    <Description>uno53net9blank powered by Uno Platform.</Description>
+    <!--
+      If you encounter this error message:
+
+        error NETSDK1148: A referenced assembly was compiled using a newer version of Microsoft.Windows.SDK.NET.dll.
+        Please update to a newer .NET SDK in order to reference this assembly.
+
+      This means that the two packages below must be aligned with the "build" version number of
+      the "Microsoft.Windows.SDK.BuildTools" package above, and the "revision" version number
+      must be the highest found in https://www.nuget.org/packages/Microsoft.Windows.SDK.NET.Ref.
+    -->
+    <!-- <WindowsSdkPackageVersion>10.0.22621.28</WindowsSdkPackageVersion> -->
+
+    <!--
+      UnoFeatures let's you quickly add and manage implicit package references based on the features you want to use.
+      https://aka.platform.uno/singleproject-features
+    -->
+    <UnoFeatures>
+    </UnoFeatures>
+  </PropertyGroup>
+
+	<Target Name="_ValidateNetSdkWasm" BeforeTargets="BeforeBuild" Condition=" '$(TargetFramework)' == 'net9.0-browserwasm' ">
+		<Error Text="The Wasm SDK is not enabled" Condition=" '$(_UnoUseMicrosoftNETSdkWebAssembly)' != 'true' OR '$(UsingMicrosoftNETSdkWebAssembly)' != 'true' " />
+	</Target>
+
+  <Target Name="_UnoValidateSelfAssets"
+        BeforeTargets="AfterBuild">
+
+    <ItemGroup
+        Condition=" '$(TargetFramework)' == 'net9.0-windows10.0.19041' OR '$(TargetFramework)' == 'net9.0-desktop' ">
+      <!-- Validates that assets are properly propagated to the output folder, regardless of their "copy to output" value -->
+      <_AssetsToValidate Include="$(OutputPath)Assets\SharedAssets.md" />
+      <_AssetsToValidate Include="$(OutputPath)Assets\Icons\icon_foreground.png" />
+      <_AssetsToValidate Include="$(OutputPath)Assets\Icons\icon_foreground.scale-100.png" />
+      <_AssetsToValidate Include="$(OutputPath)Assets\Icons\icon_foreground.scale-125.png" />
+      <_AssetsToValidate Include="$(OutputPath)Assets\Icons\icon_foreground.scale-150.png" />
+      <_AssetsToValidate Include="$(OutputPath)Assets\Icons\icon_foreground.scale-200.png" />
+      <_AssetsToValidate Include="$(OutputPath)Assets\Icons\icon_foreground.scale-300.png" />
+      <_AssetsToValidate Include="$(OutputPath)Assets\Icons\icon_foreground.scale-400.png" />
+    </ItemGroup>
+
+    <ItemGroup
+        Condition="'$(TargetFramework)'=='net9.0-browserwasm'">
+
+      <_AssetsToValidate Include="$(OutputPath)wwwroot\Assets\SharedAssets.md" />
+      <_AssetsToValidate Include="$(OutputPath)wwwroot\Assets\Icons\icon_foreground.png" />
+      <_AssetsToValidate Include="$(OutputPath)wwwroot\Assets\Icons\icon_foreground.scale-100.png" />
+      <_AssetsToValidate Include="$(OutputPath)wwwroot\Assets\Icons\icon_foreground.scale-125.png" />
+      <_AssetsToValidate Include="$(OutputPath)wwwroot\Assets\Icons\icon_foreground.scale-150.png" />
+      <_AssetsToValidate Include="$(OutputPath)wwwroot\Assets\Icons\icon_foreground.scale-200.png" />
+      <_AssetsToValidate Include="$(OutputPath)wwwroot\Assets\Icons\icon_foreground.scale-300.png" />
+      <_AssetsToValidate Include="$(OutputPath)wwwroot\Assets\Icons\icon_foreground.scale-400.png" />
+
+      <!-- wwwroot -->
+      <_AssetsToValidate Include="$(OutputPath)\wwwroot\staticwebapp.config.json" />
+      <_AssetsToValidate Include="$(OutputPath)\wwwroot\web.config" />
+    </ItemGroup>
+
+    <Error Text="Missing asset %(_AssetsToValidate.Identity)"
+          Condition="'@(_AssetsToValidate)'!='' AND '%(_AssetsToValidate.MustNotExist)'!='true' AND !exists('%(_AssetsToValidate.Identity)')" />
+
+    <Error Text="Invalid existing asset %(_AssetsToValidate.Identity)"
+          Condition="'@(_AssetsToValidate)'!='' AND '%(_AssetsToValidate.MustNotExist)'=='true'  AND exists('%(_AssetsToValidate.Identity)')" />
+
+  </Target>
+
+</Project>
diff --git a/src/Uno.Sdk/targets/Uno.Common.Wasm.targets b/src/Uno.Sdk/targets/Uno.Common.Wasm.targets
index 8ff446d7082e..4b4307db7258 100644
--- a/src/Uno.Sdk/targets/Uno.Common.Wasm.targets
+++ b/src/Uno.Sdk/targets/Uno.Common.Wasm.targets
@@ -26,6 +26,12 @@
 	<ItemGroup>
 		<SupportedPlatform Remove="@(SupportedPlatform)" />
 		<SupportedPlatform Include="browserwasm" />
+<<<<<<< HEAD
+=======
+
+		<!-- net9.0 validation of CA1418 is case sensitive -->
+		<SupportedPlatform Include="BrowserWasm" />
+>>>>>>> b2062476a3 (fix: Ensure wwwroot assets are copied properly)
 		<SdkSupportedTargetPlatformVersion Include="$(TargetPlatformVersion)" />
 	</ItemGroup>
 
@@ -44,7 +50,7 @@
 
 			See https://github.com/dotnet/sdk/blob/e3c62139dd25af2b7593a2cde702261f20822e47/src/StaticWebAssetsSdk/Sdk/Sdk.StaticWebAssets.StaticAssets.ProjectSystem.props#L36
 				-->
-			
+
 			<!-- Get all files included by the Web Sdk, except ones from the Assets folder -->
 			<_ContentToUpdate
 				Include="@(Content)"
@@ -61,13 +67,33 @@
 			<!-- Remove the files Web SDK included files. This will also remove duplicates, regardless of the metadata -->
 			<Content Remove="@(_ContentToUpdate)"
 					 Condition="'%(_ContentToUpdate.IsWebSdk)'=='true' AND '%(_ContentToUpdate.IsDefaultItem)'!='true'" />
-			
+
 			<!-- Add back the non-websdk content -->
 			<Content Include="@(_NonWebSdkContent)" KeepDuplicates="false" />
 
 			<!-- Cleanup -->
 			<_ContentToUpdate Remove="@(_ContentToUpdate)"/>
 			<_NonWebSdkContent Remove="@(_NonWebSdkContent)"/>
+
+		</ItemGroup>
+	</Target>
+
+	<Target Name="_UnoAdjustWwwrootContent"
+			BeforeTargets="AssignTargetPaths">
+
+		<ItemGroup>
+			<_wwwRootContentToUpdate Include="$(MSBuildProjectDirectory)/$(WasmProjectFolder)/wwwroot/**" />
+
+			<Content Remove="@(_wwwRootContentToUpdate)" />
+
+			<Content Include="@(_wwwRootContentToUpdate)">
+				<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
+				<UnoDeploy>Root</UnoDeploy>
+				<!-- net9+ compatibility -->
+				<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+			</Content>
+
+			<_wwwRootContentToUpdate Remove="@(_wwwRootContentToUpdate)" />
 		</ItemGroup>
 	</Target>
 

From ff2629aa614894ddad9e59ac37a69ab576c9357b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= <jlaban@gmail.com>
Date: Thu, 26 Sep 2024 11:37:48 -0400
Subject: [PATCH 2/2] chore: Adjust for backport

---
 .../uno53net9blank/uno53net9blank.csproj      | 91 -------------------
 src/Uno.Sdk/targets/Uno.Common.Wasm.targets   |  6 --
 2 files changed, 97 deletions(-)
 delete mode 100644 src/SolutionTemplate/5.3/uno53net9blank/uno53net9blank/uno53net9blank.csproj

diff --git a/src/SolutionTemplate/5.3/uno53net9blank/uno53net9blank/uno53net9blank.csproj b/src/SolutionTemplate/5.3/uno53net9blank/uno53net9blank/uno53net9blank.csproj
deleted file mode 100644
index 9ee7dfcea859..000000000000
--- a/src/SolutionTemplate/5.3/uno53net9blank/uno53net9blank/uno53net9blank.csproj
+++ /dev/null
@@ -1,91 +0,0 @@
-<Project Sdk="Uno.Sdk.Private">
-  <PropertyGroup>
-    <TargetFrameworks>net9.0-browserwasm;net9.0-desktop;net9.0</TargetFrameworks>
-    <TargetFrameworks Condition="!$([MSBuild]::IsOSPlatform('linux'))">$(TargetFrameworks);net9.0-android;net9.0-ios;net9.0-maccatalyst;net9.0-desktop</TargetFrameworks>
-    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041</TargetFrameworks>
-
-    <!-- Disable android on msbuild .NET Framework until android 35 is supported -->
-    <TargetFrameworks Condition="'$(MSBuildRuntimeType)' == 'Full'">$(TargetFrameworks.Replace('net9.0-android',''))</TargetFrameworks>
-    <TargetFrameworks Condition="'$(MSBuildRuntimeType)' == 'Full'">$(TargetFrameworks.Replace('net9.0-ios',''))</TargetFrameworks>
-    <TargetFrameworks Condition="'$(MSBuildRuntimeType)' == 'Full'">$(TargetFrameworks.Replace('net9.0-maccatalyst',''))</TargetFrameworks>
-
-    <OutputType>Exe</OutputType>
-    <UnoSingleProject>true</UnoSingleProject>
-
-    <!-- Display name -->
-    <ApplicationTitle>uno53net9blank</ApplicationTitle>
-    <!-- App Identifier -->
-    <ApplicationId>com.companyname.uno53net9blank</ApplicationId>
-    <!-- Versions -->
-    <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
-    <ApplicationVersion>1</ApplicationVersion>
-    <!-- Package Publisher -->
-    <ApplicationPublisher>uno53net9blank</ApplicationPublisher>
-    <!-- Package Description -->
-    <Description>uno53net9blank powered by Uno Platform.</Description>
-    <!--
-      If you encounter this error message:
-
-        error NETSDK1148: A referenced assembly was compiled using a newer version of Microsoft.Windows.SDK.NET.dll.
-        Please update to a newer .NET SDK in order to reference this assembly.
-
-      This means that the two packages below must be aligned with the "build" version number of
-      the "Microsoft.Windows.SDK.BuildTools" package above, and the "revision" version number
-      must be the highest found in https://www.nuget.org/packages/Microsoft.Windows.SDK.NET.Ref.
-    -->
-    <!-- <WindowsSdkPackageVersion>10.0.22621.28</WindowsSdkPackageVersion> -->
-
-    <!--
-      UnoFeatures let's you quickly add and manage implicit package references based on the features you want to use.
-      https://aka.platform.uno/singleproject-features
-    -->
-    <UnoFeatures>
-    </UnoFeatures>
-  </PropertyGroup>
-
-	<Target Name="_ValidateNetSdkWasm" BeforeTargets="BeforeBuild" Condition=" '$(TargetFramework)' == 'net9.0-browserwasm' ">
-		<Error Text="The Wasm SDK is not enabled" Condition=" '$(_UnoUseMicrosoftNETSdkWebAssembly)' != 'true' OR '$(UsingMicrosoftNETSdkWebAssembly)' != 'true' " />
-	</Target>
-
-  <Target Name="_UnoValidateSelfAssets"
-        BeforeTargets="AfterBuild">
-
-    <ItemGroup
-        Condition=" '$(TargetFramework)' == 'net9.0-windows10.0.19041' OR '$(TargetFramework)' == 'net9.0-desktop' ">
-      <!-- Validates that assets are properly propagated to the output folder, regardless of their "copy to output" value -->
-      <_AssetsToValidate Include="$(OutputPath)Assets\SharedAssets.md" />
-      <_AssetsToValidate Include="$(OutputPath)Assets\Icons\icon_foreground.png" />
-      <_AssetsToValidate Include="$(OutputPath)Assets\Icons\icon_foreground.scale-100.png" />
-      <_AssetsToValidate Include="$(OutputPath)Assets\Icons\icon_foreground.scale-125.png" />
-      <_AssetsToValidate Include="$(OutputPath)Assets\Icons\icon_foreground.scale-150.png" />
-      <_AssetsToValidate Include="$(OutputPath)Assets\Icons\icon_foreground.scale-200.png" />
-      <_AssetsToValidate Include="$(OutputPath)Assets\Icons\icon_foreground.scale-300.png" />
-      <_AssetsToValidate Include="$(OutputPath)Assets\Icons\icon_foreground.scale-400.png" />
-    </ItemGroup>
-
-    <ItemGroup
-        Condition="'$(TargetFramework)'=='net9.0-browserwasm'">
-
-      <_AssetsToValidate Include="$(OutputPath)wwwroot\Assets\SharedAssets.md" />
-      <_AssetsToValidate Include="$(OutputPath)wwwroot\Assets\Icons\icon_foreground.png" />
-      <_AssetsToValidate Include="$(OutputPath)wwwroot\Assets\Icons\icon_foreground.scale-100.png" />
-      <_AssetsToValidate Include="$(OutputPath)wwwroot\Assets\Icons\icon_foreground.scale-125.png" />
-      <_AssetsToValidate Include="$(OutputPath)wwwroot\Assets\Icons\icon_foreground.scale-150.png" />
-      <_AssetsToValidate Include="$(OutputPath)wwwroot\Assets\Icons\icon_foreground.scale-200.png" />
-      <_AssetsToValidate Include="$(OutputPath)wwwroot\Assets\Icons\icon_foreground.scale-300.png" />
-      <_AssetsToValidate Include="$(OutputPath)wwwroot\Assets\Icons\icon_foreground.scale-400.png" />
-
-      <!-- wwwroot -->
-      <_AssetsToValidate Include="$(OutputPath)\wwwroot\staticwebapp.config.json" />
-      <_AssetsToValidate Include="$(OutputPath)\wwwroot\web.config" />
-    </ItemGroup>
-
-    <Error Text="Missing asset %(_AssetsToValidate.Identity)"
-          Condition="'@(_AssetsToValidate)'!='' AND '%(_AssetsToValidate.MustNotExist)'!='true' AND !exists('%(_AssetsToValidate.Identity)')" />
-
-    <Error Text="Invalid existing asset %(_AssetsToValidate.Identity)"
-          Condition="'@(_AssetsToValidate)'!='' AND '%(_AssetsToValidate.MustNotExist)'=='true'  AND exists('%(_AssetsToValidate.Identity)')" />
-
-  </Target>
-
-</Project>
diff --git a/src/Uno.Sdk/targets/Uno.Common.Wasm.targets b/src/Uno.Sdk/targets/Uno.Common.Wasm.targets
index 4b4307db7258..4148141ba898 100644
--- a/src/Uno.Sdk/targets/Uno.Common.Wasm.targets
+++ b/src/Uno.Sdk/targets/Uno.Common.Wasm.targets
@@ -26,12 +26,6 @@
 	<ItemGroup>
 		<SupportedPlatform Remove="@(SupportedPlatform)" />
 		<SupportedPlatform Include="browserwasm" />
-<<<<<<< HEAD
-=======
-
-		<!-- net9.0 validation of CA1418 is case sensitive -->
-		<SupportedPlatform Include="BrowserWasm" />
->>>>>>> b2062476a3 (fix: Ensure wwwroot assets are copied properly)
 		<SdkSupportedTargetPlatformVersion Include="$(TargetPlatformVersion)" />
 	</ItemGroup>