From 8eaa98ed4ecc771a1b145afe96049370c98c8aee Mon Sep 17 00:00:00 2001
From: Dan Siegel <me@dansiegel.net>
Date: Mon, 12 Aug 2024 10:22:15 -0600
Subject: [PATCH] fix: project capabilities should always be present for
 SingleProject

(cherry picked from commit f988eb0674d4b6069a91fa1d439af1d0af8d3924)
---
 .../targets/Uno.ProjectCapabilities.SingleProject.targets | 5 -----
 src/Uno.Sdk/targets/Uno.ProjectCapabilities.targets       | 8 ++++++++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/Uno.Sdk/targets/Uno.ProjectCapabilities.SingleProject.targets b/src/Uno.Sdk/targets/Uno.ProjectCapabilities.SingleProject.targets
index 16b9c92872a9..373036d2876b 100644
--- a/src/Uno.Sdk/targets/Uno.ProjectCapabilities.SingleProject.targets
+++ b/src/Uno.Sdk/targets/Uno.ProjectCapabilities.SingleProject.targets
@@ -14,11 +14,6 @@
 		<!-- Otherwise define LaunchProfilesGroupByPlatformFilters by default -->
 		<ProjectCapability Include="LaunchProfilesGroupByPlatformFilters" Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &gt;= '17.0' " Exclude="@(ProjectCapability)" />
 		<ProjectCapability Include="SingleTargetBuildForStartupProjects" Condition=" '$(EnableSingleTargetBuildForStartupProjects)' != 'false' " Exclude="@(ProjectCapability)" />
-
-		<!-- Required since VS 2022 17.4 Preview 1 -->
-		<ProjectCapability Include="MauiCore" Exclude="@(ProjectCapability)" />
-		<ProjectCapability Include="Maui" Exclude="@(ProjectCapability)" />
-		<ProjectCapability Include="UseMauiCore" Exclude="@(ProjectCapability)" />
 	</ItemGroup>
 
 	<PropertyGroup Condition="$(IsWinAppSdk)">
diff --git a/src/Uno.Sdk/targets/Uno.ProjectCapabilities.targets b/src/Uno.Sdk/targets/Uno.ProjectCapabilities.targets
index 110052b8731f..b8295c3ac851 100644
--- a/src/Uno.Sdk/targets/Uno.ProjectCapabilities.targets
+++ b/src/Uno.Sdk/targets/Uno.ProjectCapabilities.targets
@@ -29,6 +29,14 @@
 		<ProjectCapability Include="WindowsUniversalMultiViews"/>
 	</ItemGroup>
 
+	<ItemGroup>
+		<!-- Required since VS 2022 17.4 Preview 1 -->
+		<!-- Moved to root capabilities as Visual Studio doesn't like it in the SingleProject specific capabilities -->
+		<ProjectCapability Include="MauiCore" Exclude="@(ProjectCapability)" />
+		<ProjectCapability Include="Maui" Exclude="@(ProjectCapability)" />
+		<ProjectCapability Include="UseMauiCore" Exclude="@(ProjectCapability)" />
+	</ItemGroup>
+
 	<Import Project="Uno.ProjectCapabilities.WinAppSdk.targets" Condition="$(IsWinAppSdk)" />
 
 	<Import Project="Uno.ProjectCapabilities.Wasm.targets" Condition="$(IsBrowserWasm)" />