Merge pull request unoplatform#15228 from unoplatform/dev/ds/import-c…

…apabilities import Project Capabilities
ramezgerges · Jan 26, 2024 · 304d2e2 · 304d2e2
2 parents 7e3deec + 858421a
commit 304d2e2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/Uno.Sdk/Sdk/Sdk.props b/src/Uno.Sdk/Sdk/Sdk.props
@@ -24,8 +24,9 @@ Copyright (C) Uno Platform Inc. All rights reserved.
 		<UsingUnoSdk>true</UsingUnoSdk>
 		<UnoVersion>DefaultUnoVersion</UnoVersion>
 
-		<CustomAfterDirectoryBuildProps>$(CustomAfterDirectoryBuildProps);$([MSBuild]::GetPathOfFileAbove('Uno.Import.SolutionConfig.props', '$(MSBuildThisFileDirectory)..\targets'))</CustomAfterDirectoryBuildProps>
-		<CustomAfterDirectoryBuildProps>$(CustomAfterDirectoryBuildProps);$([MSBuild]::GetPathOfFileAbove('Uno.IsPlatform.props', '$(MSBuildThisFileDirectory)..\targets'))</CustomAfterDirectoryBuildProps>
+		<_UnoSdkTargetsDirectory>$([MSBuild]::EnsureTrailingSlash($([MSBuild]::NormalizePath('$(MSBuildThisFileDirectory)..\targets'))))</_UnoSdkTargetsDirectory>
+		<CustomAfterDirectoryBuildProps>$(CustomAfterDirectoryBuildProps);$(_UnoSdkTargetsDirectory)Uno.Import.SolutionConfig.props</CustomAfterDirectoryBuildProps>
+		<CustomAfterDirectoryBuildProps>$(CustomAfterDirectoryBuildProps);$(_UnoSdkTargetsDirectory)Uno.IsPlatform.props</CustomAfterDirectoryBuildProps>
 	</PropertyGroup>
 
 	<Import Sdk="$(_DefaultMicrosoftNETSdk)" Project="Sdk.props" />

diff --git a/src/Uno.Sdk/Sdk/Sdk.targets b/src/Uno.Sdk/Sdk/Sdk.targets
@@ -11,17 +11,20 @@ Copyright (C) Uno Platform Inc. All rights reserved.
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
 	<PropertyGroup>
-		<AfterMicrosoftNETSdkTargets>$(AfterMicrosoftNETSdkTargets);$(MSBuildThisFileDirectory)..\targets\Uno.Sdk.After.targets</AfterMicrosoftNETSdkTargets>
+		<AfterMicrosoftNETSdkTargets>$(AfterMicrosoftNETSdkTargets);$(_UnoSdkTargetsDirectory)Uno.Sdk.After.targets</AfterMicrosoftNETSdkTargets>
 	</PropertyGroup>
 
 	<!-- Common Includes -->
-	<Import Project="$(MSBuildThisFileDirectory)../targets/Uno.Common.targets" />
+	<Import Project="$(_UnoSdkTargetsDirectory)Uno.Common.targets" />
 
 	<!-- Default Includes -->
-	<Import Project="$(MSBuildThisFileDirectory)../targets/Uno.DefaultItems.targets" Condition=" $(EnableDefaultUnoItems) == 'true' " />
+	<Import Project="$(_UnoSdkTargetsDirectory)Uno.DefaultItems.targets" Condition=" $(EnableDefaultUnoItems) == 'true' " />
+
+	<!-- Project Capabilities -->
+	<Import Project="$(_UnoSdkTargetsDirectory)Uno.ProjectCapabilities.targets" />
 
 	<!-- Build Targets -->
-	<Import Project="$(MSBuildThisFileDirectory)../targets/Uno.Build.targets" />
+	<Import Project="$(_UnoSdkTargetsDirectory)Uno.Build.targets" />
 
 	<!-- Microsoft.NET.Sdk should be loaded last. This ensures our targets are evaluated before all others. -->
 	<Import Sdk="$(_DefaultMicrosoftNETSdk)" Project="Sdk.targets" />