From 1be4130638473c621a69418dfab7db7e64d8185f Mon Sep 17 00:00:00 2001
From: Dan Siegel <me@dansiegel.net>
Date: Mon, 19 Aug 2024 06:29:54 -0600
Subject: [PATCH 1/3] fix: desktop will always build as WinEXE

(cherry picked from commit 30437b81180b2fc12c6c0ea017df7718dff7ec47)
---
 src/Uno.Sdk/targets/Uno.SingleProject.Desktop.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Uno.Sdk/targets/Uno.SingleProject.Desktop.targets b/src/Uno.Sdk/targets/Uno.SingleProject.Desktop.targets
index 7ae35763655a..25b41a6dfef2 100644
--- a/src/Uno.Sdk/targets/Uno.SingleProject.Desktop.targets
+++ b/src/Uno.Sdk/targets/Uno.SingleProject.Desktop.targets
@@ -10,7 +10,7 @@
 		<ApplicationDisplayVersion Condition=" '$(ApplicationDisplayVersion)' == '' ">$(Version)</ApplicationDisplayVersion>
 	</PropertyGroup>
 	
-	<PropertyGroup Condition=" '$(IsUnoHead)' == 'true' AND $(Optimize) == 'true' ">
+	<PropertyGroup Condition=" '$(IsUnoHead)' == 'true' ">
 		<OutputType>WinExe</OutputType>
 	</PropertyGroup>
 

From ab93ba063822073f0682ea0fa2b3969217f97f03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= <jlaban@gmail.com>
Date: Tue, 1 Oct 2024 23:11:41 -0400
Subject: [PATCH 2/3] chore: Adjust devserver inclusion when WinExe is selected

(cherry picked from commit c60484fb9bd248404dc9227791b651002ad18780)
---
 src/Uno.Sdk/targets/Uno.Common.targets                          | 2 +-
 src/Uno.Sdk/targets/Uno.Implicit.Packages.ProjectSystem.targets | 2 +-
 src/Uno.Sdk/targets/Uno.SingleProject.Desktop.targets           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Uno.Sdk/targets/Uno.Common.targets b/src/Uno.Sdk/targets/Uno.Common.targets
index e69928d7c1db..17d9b77295d3 100644
--- a/src/Uno.Sdk/targets/Uno.Common.targets
+++ b/src/Uno.Sdk/targets/Uno.Common.targets
@@ -8,7 +8,7 @@
 		<_IsUnoSingleProjectAndLegacy Condition=" $(SingleProject) == 'true' OR $(UnoSingleProject) == 'true' ">true</_IsUnoSingleProjectAndLegacy>
 
 		<_ImplicitRestoreOutputType>$([MSBuild]::ValueOrDefault('$(OutputType)', 'Library'))</_ImplicitRestoreOutputType>
-		<IsUnoHead Condition="$(_ImplicitRestoreOutputType) == 'Exe'">true</IsUnoHead>
+		<IsUnoHead Condition=" '$(_InitialOutputType)' == 'WinExe' OR '$(_InitialOutputType)' == 'Exe' ">true</IsUnoHead>
 		<_InitialOutputType>$([MSBuild]::ValueOrDefault('$(OutputType)', 'Library'))</_InitialOutputType>
 		<_InitialOutputType Condition="$(TargetFramework) == '' OR $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == '' ">Library</_InitialOutputType>
 		<_IsStandaloneWasmHead>false</_IsStandaloneWasmHead>
diff --git a/src/Uno.Sdk/targets/Uno.Implicit.Packages.ProjectSystem.targets b/src/Uno.Sdk/targets/Uno.Implicit.Packages.ProjectSystem.targets
index d1fefec6c5a3..39ec3a579f41 100644
--- a/src/Uno.Sdk/targets/Uno.Implicit.Packages.ProjectSystem.targets
+++ b/src/Uno.Sdk/targets/Uno.Implicit.Packages.ProjectSystem.targets
@@ -9,7 +9,7 @@
 		<_UnoProjectSystemPackageReference Include="Uno.Resizetizer" ProjectSystem="true" PrivateAssets="all" />
 	</ItemGroup>
 
-	<ItemGroup Condition="$(_ImplicitRestoreOutputType) == 'Exe'">
+	<ItemGroup Condition=" '$(_InitialOutputType)' == 'WinExe' OR '$(_InitialOutputType)' == 'Exe' ">
 		<_UnoProjectSystemPackageReference Include="Uno.WinUI.DevServer" ProjectSystem="true" Condition="$(Optimize) != 'true'" />
 		<_UnoProjectSystemPackageReference Include="Uno.WinUI.DevServer" ProjectSystem="true" Exclude="all" Condition="$(Optimize) == 'true'" />
 	</ItemGroup>
diff --git a/src/Uno.Sdk/targets/Uno.SingleProject.Desktop.targets b/src/Uno.Sdk/targets/Uno.SingleProject.Desktop.targets
index 25b41a6dfef2..7ae35763655a 100644
--- a/src/Uno.Sdk/targets/Uno.SingleProject.Desktop.targets
+++ b/src/Uno.Sdk/targets/Uno.SingleProject.Desktop.targets
@@ -10,7 +10,7 @@
 		<ApplicationDisplayVersion Condition=" '$(ApplicationDisplayVersion)' == '' ">$(Version)</ApplicationDisplayVersion>
 	</PropertyGroup>
 	
-	<PropertyGroup Condition=" '$(IsUnoHead)' == 'true' ">
+	<PropertyGroup Condition=" '$(IsUnoHead)' == 'true' AND $(Optimize) == 'true' ">
 		<OutputType>WinExe</OutputType>
 	</PropertyGroup>
 

From 022bc72756f7524d7f95fc3425bf92c44fc94e4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= <jlaban@gmail.com>
Date: Wed, 2 Oct 2024 07:48:19 -0400
Subject: [PATCH 3/3] chore: Adjust condition

(cherry picked from commit c03c88b490c8af51e7e4af993a61da1f6db06d91)
---
 src/Uno.Sdk/targets/Uno.Common.targets                          | 2 +-
 src/Uno.Sdk/targets/Uno.Implicit.Packages.ProjectSystem.targets | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Uno.Sdk/targets/Uno.Common.targets b/src/Uno.Sdk/targets/Uno.Common.targets
index 17d9b77295d3..cccb233ae988 100644
--- a/src/Uno.Sdk/targets/Uno.Common.targets
+++ b/src/Uno.Sdk/targets/Uno.Common.targets
@@ -8,7 +8,7 @@
 		<_IsUnoSingleProjectAndLegacy Condition=" $(SingleProject) == 'true' OR $(UnoSingleProject) == 'true' ">true</_IsUnoSingleProjectAndLegacy>
 
 		<_ImplicitRestoreOutputType>$([MSBuild]::ValueOrDefault('$(OutputType)', 'Library'))</_ImplicitRestoreOutputType>
-		<IsUnoHead Condition=" '$(_InitialOutputType)' == 'WinExe' OR '$(_InitialOutputType)' == 'Exe' ">true</IsUnoHead>
+		<IsUnoHead Condition=" '$(_ImplicitRestoreOutputType)' == 'WinExe' OR '$(_ImplicitRestoreOutputType)' == 'Exe' ">true</IsUnoHead>
 		<_InitialOutputType>$([MSBuild]::ValueOrDefault('$(OutputType)', 'Library'))</_InitialOutputType>
 		<_InitialOutputType Condition="$(TargetFramework) == '' OR $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == '' ">Library</_InitialOutputType>
 		<_IsStandaloneWasmHead>false</_IsStandaloneWasmHead>
diff --git a/src/Uno.Sdk/targets/Uno.Implicit.Packages.ProjectSystem.targets b/src/Uno.Sdk/targets/Uno.Implicit.Packages.ProjectSystem.targets
index 39ec3a579f41..aeeee213a0ae 100644
--- a/src/Uno.Sdk/targets/Uno.Implicit.Packages.ProjectSystem.targets
+++ b/src/Uno.Sdk/targets/Uno.Implicit.Packages.ProjectSystem.targets
@@ -9,7 +9,7 @@
 		<_UnoProjectSystemPackageReference Include="Uno.Resizetizer" ProjectSystem="true" PrivateAssets="all" />
 	</ItemGroup>
 
-	<ItemGroup Condition=" '$(_InitialOutputType)' == 'WinExe' OR '$(_InitialOutputType)' == 'Exe' ">
+	<ItemGroup Condition=" '$(_ImplicitRestoreOutputType)' == 'WinExe' OR '$(_ImplicitRestoreOutputType)' == 'Exe' ">
 		<_UnoProjectSystemPackageReference Include="Uno.WinUI.DevServer" ProjectSystem="true" Condition="$(Optimize) != 'true'" />
 		<_UnoProjectSystemPackageReference Include="Uno.WinUI.DevServer" ProjectSystem="true" Exclude="all" Condition="$(Optimize) == 'true'" />
 	</ItemGroup>