From 840a5a79e46d954ed4075a60d9af0527915d3c6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= <jlaban@gmail.com>
Date: Tue, 19 Nov 2024 17:23:12 -0500
Subject: [PATCH 1/3] fix(net9): Allow for builds to happen even if a RID is
 explicitly set

---
 .../run-netcore-mobile-template-tests.ps1       |  3 +++
 src/Uno.Sdk/Sdk/Sdk.targets                     |  4 ++++
 .../targets/Uno.Wasm.UnsupportedRid.targets     | 17 +++++++++++++++++
 3 files changed, 24 insertions(+)
 create mode 100644 src/Uno.Sdk/targets/Uno.Wasm.UnsupportedRid.targets

diff --git a/build/test-scripts/run-netcore-mobile-template-tests.ps1 b/build/test-scripts/run-netcore-mobile-template-tests.ps1
index 0a66bbdc2004..b8618d472991 100644
--- a/build/test-scripts/run-netcore-mobile-template-tests.ps1
+++ b/build/test-scripts/run-netcore-mobile-template-tests.ps1
@@ -347,6 +347,9 @@ $projects =
     # Publishing validation
     @(4, "5.3/uno53net9blank/uno53net9blank/uno53net9blank.csproj", @("-f", "net9.0-desktop", "-p:PackageFormat=app"), @("OnlyMacOS", "NetCore", "Publish"))
 
+    # Ensure that build can happen even if a RID is specified
+    @(4, "5.3/uno53net9blank/uno53net9blank/uno53net9blank.csproj", @("-f", "net9.0-android", "-r", "android-arm64"), @("macOS", "NetCore")),
+
     ## Note for contributors
     ##
     ## When adding new template versions, create them in a separate version named folder
diff --git a/src/Uno.Sdk/Sdk/Sdk.targets b/src/Uno.Sdk/Sdk/Sdk.targets
index 49368c536c52..1c2d36953383 100644
--- a/src/Uno.Sdk/Sdk/Sdk.targets
+++ b/src/Uno.Sdk/Sdk/Sdk.targets
@@ -27,6 +27,10 @@ Copyright (C) Uno Platform Inc. All rights reserved.
 
 	<!-- Microsoft.NET.Sdk should be loaded last. This ensures our targets are evaluated before all others. -->
 	<Import Sdk="$(_DefaultMicrosoftNETSdk)" Project="Sdk.targets" />
+
+	<!-- Replacement for restore targets for Wasm when an explicit RID is specified -->
+	<Import Project="$(_UnoSdkTargetsDirectory)Uno.Wasm.UnsupportedRid.targets"
+			Condition=" $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'browserwasm' AND '$(RuntimeIdentifier)' != 'browser-wasm' "/>
 	
 	<!-- Targets and props to be executed last after the default .NET SDK has been imported -->
 	<Import Project="$(_UnoSdkTargetsDirectory)Uno.Sdk.After.targets" />
diff --git a/src/Uno.Sdk/targets/Uno.Wasm.UnsupportedRid.targets b/src/Uno.Sdk/targets/Uno.Wasm.UnsupportedRid.targets
new file mode 100644
index 000000000000..c9fc7d828618
--- /dev/null
+++ b/src/Uno.Sdk/targets/Uno.Wasm.UnsupportedRid.targets
@@ -0,0 +1,17 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+	<!-- 
+	This file recreates the targets from NuGet.target that are needed when
+	building with `-r` to specify a RID. In this case, inclusion conditions in the
+	WebAssembly SDK do not include any of the nuget targets, causing the restore
+	to fail. Those targets are intentionally empty to keep the restore going.
+	-->
+
+	<Target Name="_GetRestoreSettingsPerFramework" />
+	
+	<Target Name="GetAllRuntimeIdentifiers"
+			Returns="browser-wasm" />
+	
+	<Target Name="_GenerateProjectRestoreGraphPerFramework" />
+
+</Project>
\ No newline at end of file

From 06189fa25ba3d071fbcdd41f247197b4fbd70d6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= <jlaban@gmail.com>
Date: Tue, 19 Nov 2024 21:03:00 -0500
Subject: [PATCH 2/3] chore: Adjust tests

---
 build/test-scripts/run-netcore-mobile-template-tests.ps1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/test-scripts/run-netcore-mobile-template-tests.ps1 b/build/test-scripts/run-netcore-mobile-template-tests.ps1
index b8618d472991..0037cdfd1509 100644
--- a/build/test-scripts/run-netcore-mobile-template-tests.ps1
+++ b/build/test-scripts/run-netcore-mobile-template-tests.ps1
@@ -345,10 +345,10 @@ $projects =
     @(4, "5.2/uno52AppWithLib/uno52AppWithLib/uno52AppWithLib.csproj", @("-p:Platform=x86" , "-p:TargetFramework=net8.0-windows10.0.19041"), @()),
 
     # Publishing validation
-    @(4, "5.3/uno53net9blank/uno53net9blank/uno53net9blank.csproj", @("-f", "net9.0-desktop", "-p:PackageFormat=app"), @("OnlyMacOS", "NetCore", "Publish"))
+    @(4, "5.3/uno53net9blank/uno53net9blank/uno53net9blank.csproj", @("-f", "net9.0-desktop", "-p:PackageFormat=app"), @("OnlyMacOS", "NetCore", "Publish")),
 
     # Ensure that build can happen even if a RID is specified
-    @(4, "5.3/uno53net9blank/uno53net9blank/uno53net9blank.csproj", @("-f", "net9.0-android", "-r", "android-arm64"), @("macOS", "NetCore")),
+    @(4, "5.3/uno53net9blank/uno53net9blank/uno53net9blank.csproj", @("-f", "net9.0-android", "-r", "android-arm64"), @("macOS", "NetCore"))
 
     ## Note for contributors
     ##

From 281bf25c7197976cabfd14b6419204226029b572 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= <jlaban@gmail.com>
Date: Tue, 19 Nov 2024 22:53:48 -0500
Subject: [PATCH 3/3] chore: Adjust TFM target for libraries

---
 src/Uno.Sdk/Sdk/Sdk.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Uno.Sdk/Sdk/Sdk.targets b/src/Uno.Sdk/Sdk/Sdk.targets
index 1c2d36953383..69db765b5486 100644
--- a/src/Uno.Sdk/Sdk/Sdk.targets
+++ b/src/Uno.Sdk/Sdk/Sdk.targets
@@ -30,7 +30,7 @@ Copyright (C) Uno Platform Inc. All rights reserved.
 
 	<!-- Replacement for restore targets for Wasm when an explicit RID is specified -->
 	<Import Project="$(_UnoSdkTargetsDirectory)Uno.Wasm.UnsupportedRid.targets"
-			Condition=" $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'browserwasm' AND '$(RuntimeIdentifier)' != 'browser-wasm' "/>
+			Condition=" $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'browserwasm' AND '$(RuntimeIdentifier)' != '' AND '$(RuntimeIdentifier)' != 'browser-wasm' "/>
 	
 	<!-- Targets and props to be executed last after the default .NET SDK has been imported -->
 	<Import Project="$(_UnoSdkTargetsDirectory)Uno.Sdk.After.targets" />