Merge pull request #17923 from unoplatform/dev/ds/sdk-project-capabil…

…ities Project capabilities should always be present for SingleProject
unoplatform · Aug 12, 2024 · ec38914 · ec38914
2 parents 951b222 + f988eb0
commit ec38914
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
@@ -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)" />