From d7f3733888e3ec48583284f92e36a31ac6d88d8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= <jlaban@gmail.com>
Date: Fri, 18 Oct 2024 20:56:31 -0400
Subject: [PATCH 1/2] fix: Adjust tf reordering for VS 17.12 or later

Disables TFM order rewriting for 17.12 where WinAppSDK and desktop support has been updated for supporting any position in the TFMs list.
---
 src/Uno.Sdk/targets/Uno.Sdk.After.targets | 47 +++++++++++++++++++----
 1 file changed, 39 insertions(+), 8 deletions(-)

diff --git a/src/Uno.Sdk/targets/Uno.Sdk.After.targets b/src/Uno.Sdk/targets/Uno.Sdk.After.targets
index 643b98a3e6b9..9fd54bffa063 100644
--- a/src/Uno.Sdk/targets/Uno.Sdk.After.targets
+++ b/src/Uno.Sdk/targets/Uno.Sdk.After.targets
@@ -41,10 +41,23 @@
 		<When Condition="
 				'$(BuildingInsideVisualStudio)' == 'true'
 				AND '$(UnoDisableFirstTargetFrameworkRewrite)' != 'true'
-				AND (
-					$([MSBuild]::GetTargetPlatformIdentifier($(_UnoSelectedTargetFramework))) == 'browserwasm'
-					OR $([MSBuild]::GetTargetPlatformIdentifier($(_UnoSelectedTargetFramework))) == 'desktop'
-					OR $([MSBuild]::GetTargetPlatformIdentifier($(_UnoSelectedTargetFramework))) == 'windows'
+				AND 
+				(
+					(
+						$([MSBuild]::VersionLessThan($(MSBuildVersion), 17.12.0))
+						AND (
+							$([MSBuild]::GetTargetPlatformIdentifier($(_UnoSelectedTargetFramework))) == 'browserwasm'
+							OR $([MSBuild]::GetTargetPlatformIdentifier($(_UnoSelectedTargetFramework))) == 'desktop'
+							OR $([MSBuild]::GetTargetPlatformIdentifier($(_UnoSelectedTargetFramework))) == 'windows'
+						)
+					)
+					OR
+					(
+						$([MSBuild]::VersionGreaterThanOrEquals($(MSBuildVersion), 17.12.0))
+						AND (
+							$([MSBuild]::GetTargetPlatformIdentifier($(_UnoSelectedTargetFramework))) == 'browserwasm'
+						)
+					)
 				)
 				AND '$(TargetFrameworks)' != ''
 				AND '$(_UnoFirstOriginalTargetFramework)' != '$(_UnoSelectedTargetFramework)'
@@ -76,12 +89,13 @@
 	</Choose>
 
 	<Target Name="_UnoVSWarnBrowserIsFirst"
-			BeforeTargets="_SetBuildInnerTarget;_ComputeTargetFrameworkItems"
+			BeforeTargets="_SetBuildInnerTarget;_ComputeTargetFrameworkItems;ResolveFrameworkReferences"
 			Condition=" 
 			'$(UnoDisableVSWarnBrowserIsFirst)' != 'true'
 			AND '$(BuildingInsideVisualStudio)' == 'true'
 			AND '$(_UnoTargetFrameworkCount)' != ''
 			AND $(_UnoTargetFrameworkCount) &gt; 1
+			AND $(TargetFrameworks.Contains('-browserwasm'))
 			AND $([MSBuild]::GetTargetPlatformIdentifier($(_UnoFirstOriginalTargetFramework))) == 'browserwasm'">
 
 		<Warning Code="UNOB0010"
@@ -89,9 +103,10 @@
 	</Target>
 
 	<Target Name="_UnoVSWarnDesktopIsFirst"
-				BeforeTargets="_SetBuildInnerTarget;_ComputeTargetFrameworkItems"
+				BeforeTargets="_SetBuildInnerTarget;_ComputeTargetFrameworkItems;ResolveFrameworkReferences"
 				Condition="
 				'$(UnoDisableVSWarnDesktopIsFirst)' != 'true'
+				AND $([MSBuild]::VersionLessThan($(MSBuildVersion), 17.12.0))
 				AND '$(BuildingInsideVisualStudio)' == 'true'
 				AND '$(_UnoTargetFrameworkCount)' != ''
 				AND $(_UnoTargetFrameworkCount) &gt; 1
@@ -101,13 +116,29 @@
 					Text="The desktop TargetFramework must not be placed first in the TargetFrameworks property in order for other platforms debugging to work. (See https://aka.platform.uno/UNOB0011)" />
 	</Target>
 
+	<Target Name="_UnoVSWarnDesktopIsNotFirst"
+				BeforeTargets="_SetBuildInnerTarget;_ComputeTargetFrameworkItems;ResolveFrameworkReferences"
+				Condition="
+				'$(UnoDisableVSWarnDesktopIsNotFirst)' != 'true'
+				AND $([MSBuild]::VersionGreaterThanOrEquals($(MSBuildVersion), 17.12.0))
+				AND '$(BuildingInsideVisualStudio)' == 'true'
+				AND '$(_UnoTargetFrameworkCount)' != ''
+				AND $(_UnoTargetFrameworkCount) &gt; 1
+				AND $(TargetFrameworks.Contains('-desktop'))
+				AND $([MSBuild]::GetTargetPlatformIdentifier($(_UnoFirstOriginalTargetFramework))) != 'desktop'">
+
+		<Warning Code="UNOB0014"
+					Text="The desktop TargetFramework must be placed first in the TargetFrameworks property in order for WSL debugging to work. (See https://aka.platform.uno/UNOB0014)" />
+	</Target>
+
 	<Target Name="_UnoVSWarnWindowsIsFirst"
-				BeforeTargets="_SetBuildInnerTarget;_ComputeTargetFrameworkItems"
+				BeforeTargets="_SetBuildInnerTarget;_ComputeTargetFrameworkItems;ResolveFrameworkReferences"
 				Condition="
 				'$(UnoDisableVSWarnWindowsIsFirst)' != 'true'
 				AND '$(BuildingInsideVisualStudio)' == 'true'
 				AND '$(_UnoTargetFrameworkCount)' != ''
 				AND $(_UnoTargetFrameworkCount) &gt; 1
+				AND $(TargetFrameworks.Contains('-windows'))
 				AND $([MSBuild]::GetTargetPlatformIdentifier($(_UnoFirstOriginalTargetFramework))) == 'windows'">
 
 		<Warning Code="UNOB0012"
@@ -115,7 +146,7 @@
 	</Target>
 
 	<Target Name="_UnoVSWarnNetIsFirst"
-			BeforeTargets="_SetBuildInnerTarget;_ComputeTargetFrameworkItems"
+			BeforeTargets="_SetBuildInnerTarget;_ComputeTargetFrameworkItems;ResolveFrameworkReferences"
 			Condition=" 
 			'$(UnoDisableVSWarnNetIsFirst)' != 'true'
 			AND '$(BuildingInsideVisualStudio)' == 'true'

From a005e8bb02cd611086d4bf6ea5d59a0b6aec99cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= <jlaban@gmail.com>
Date: Fri, 18 Oct 2024 22:03:50 -0400
Subject: [PATCH 2/2] chore: Adjust to restrict the message only to
 desktop+mobile targets

---
 doc/articles/uno-build-error-codes.md     | 12 ++++++++++++
 src/Uno.Sdk/targets/Uno.Sdk.After.targets | 11 ++++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/doc/articles/uno-build-error-codes.md b/doc/articles/uno-build-error-codes.md
index 96c4f85a513e..ac67e0358a7e 100644
--- a/doc/articles/uno-build-error-codes.md
+++ b/doc/articles/uno-build-error-codes.md
@@ -129,6 +129,18 @@ When building with Rider on Linux or macOS, unsupported target frameworks are [n
 
 See how to [make platforms conditional](xref:Uno.GettingStarted.CreateAnApp.Rider#considerations-for-macos-and-linux) for Rider.
 
+### UNOB0015: The desktop TargetFramework must be placed first
+
+In Visual Studio 17.12 or later, when both mobile (`-ios`, `-android`, `-maccatalyst`) and `desktop` target frameworks are used, the `-desktop` target framework must be placed first in order for WSL debugging to work.
+
+If `-desktop` is not first, the following message will appear:
+
+```text
+The project doesn't know how to run the profile with name 'MyApp (Desktop WSL2)' and command 'WSL2'.
+```
+
+To fix the issue, reorder the items in your `.csproj` so that `TargetFrameworks` contains `netX.0-desktop` as the first target framework.
+
 ## Compiler Errors
 
 ### UNO0001
diff --git a/src/Uno.Sdk/targets/Uno.Sdk.After.targets b/src/Uno.Sdk/targets/Uno.Sdk.After.targets
index 9fd54bffa063..6c1290103c71 100644
--- a/src/Uno.Sdk/targets/Uno.Sdk.After.targets
+++ b/src/Uno.Sdk/targets/Uno.Sdk.After.targets
@@ -106,8 +106,8 @@
 				BeforeTargets="_SetBuildInnerTarget;_ComputeTargetFrameworkItems;ResolveFrameworkReferences"
 				Condition="
 				'$(UnoDisableVSWarnDesktopIsFirst)' != 'true'
-				AND $([MSBuild]::VersionLessThan($(MSBuildVersion), 17.12.0))
 				AND '$(BuildingInsideVisualStudio)' == 'true'
+				AND $([MSBuild]::VersionLessThan($(MSBuildVersion), 17.12.0))
 				AND '$(_UnoTargetFrameworkCount)' != ''
 				AND $(_UnoTargetFrameworkCount) &gt; 1
 				AND $([MSBuild]::GetTargetPlatformIdentifier($(_UnoFirstOriginalTargetFramework))) == 'desktop'">
@@ -120,15 +120,20 @@
 				BeforeTargets="_SetBuildInnerTarget;_ComputeTargetFrameworkItems;ResolveFrameworkReferences"
 				Condition="
 				'$(UnoDisableVSWarnDesktopIsNotFirst)' != 'true'
-				AND $([MSBuild]::VersionGreaterThanOrEquals($(MSBuildVersion), 17.12.0))
 				AND '$(BuildingInsideVisualStudio)' == 'true'
+				AND $([MSBuild]::VersionGreaterThanOrEquals($(MSBuildVersion), 17.12.0))
 				AND '$(_UnoTargetFrameworkCount)' != ''
 				AND $(_UnoTargetFrameworkCount) &gt; 1
 				AND $(TargetFrameworks.Contains('-desktop'))
+				AND (
+					$(TargetFrameworks.Contains('-ios'))
+					OR $(TargetFrameworks.Contains('-android'))
+					OR $(TargetFrameworks.Contains('-maccatalyst'))
+				)
 				AND $([MSBuild]::GetTargetPlatformIdentifier($(_UnoFirstOriginalTargetFramework))) != 'desktop'">
 
 		<Warning Code="UNOB0014"
-					Text="The desktop TargetFramework must be placed first in the TargetFrameworks property in order for WSL debugging to work. (See https://aka.platform.uno/UNOB0014)" />
+					Text="The desktop TargetFramework must be placed first in the TargetFrameworks property in order for WSL debugging to work, when mobile targets are also used. (See https://aka.platform.uno/UNOB0014)" />
 	</Target>
 
 	<Target Name="_UnoVSWarnWindowsIsFirst"