Merge pull request #17925 from unoplatform/mergify/bp/release/stable/…

…5.2/pr-17923 Project capabilities should always be present for SingleProject (backport #17923)
unoplatform · Aug 26, 2024 · 72f6052 · 72f6052
2 parents 60b8125 + 8eaa98e
commit 72f6052
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git 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
@@ -32,6 +32,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)" />