Import Common(s) from Legacy SDK

- Add 'Microsoft.CodeSharing.Common.props' to import common properties from Legacy SDK. - Move 'MSBuild.CodeSharing.Sdk.{props/targets}' to Build folder as other SDKs. - Rename existing 'MSBuild.CodeSharing' files to 'Microsoft.CodeSharing'. Since, those files come from them.
nirin · Nov 30, 2021 · 59584b8 · 59584b8
1 parent 668df3c
commit 59584b8
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 7 deletions.
diff --git a/...haring.Sdk/Core/MSBuild.Sharing.Sdk.props → ...aring.Sdk/Build/MSBuild.Sharing.Sdk.props b/...haring.Sdk/Core/MSBuild.Sharing.Sdk.props → ...aring.Sdk/Build/MSBuild.Sharing.Sdk.props
@@ -1,5 +1,6 @@
 <Project>
 
+	<!-- Apply Project System options based on Project Type -->
 	<Choose>
 		<When Condition="'$(MSBuildProjectExtension)' == '.csproj'">
 			<PropertyGroup>
@@ -38,18 +39,17 @@
 	</Choose>
 
 	<PropertyGroup Label="Globals">
-		<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
-		<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">17.0</VisualStudioVersion>
-	</PropertyGroup>
-
-	<PropertyGroup>
 		<IsSharingProject>true</IsSharingProject>
 		<DefineCommonItemSchemas>true</DefineCommonItemSchemas>
+		<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
+		<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">17.0</VisualStudioVersion>
 	</PropertyGroup>
 
 	<PropertyGroup Label="Legacy">
 		<IsSharedProject>$(IsSharingProject)</IsSharedProject>
 		<IsCodeSharingProject>$(IsSharingProject)</IsCodeSharingProject>
 	</PropertyGroup>
 
+	<Import Project="..\Core\Microsoft.CodeSharing.$(ParentProjectType).props"/>
+
 </Project>
diff --git a/...ring.Sdk/Core/MSBuild.Sharing.Sdk.targets → ...ing.Sdk/Build/MSBuild.Sharing.Sdk.targets b/...ring.Sdk/Core/MSBuild.Sharing.Sdk.targets → ...ing.Sdk/Build/MSBuild.Sharing.Sdk.targets
@@ -5,6 +5,6 @@
 		<TargetPlatformVersion Condition="'$(TargetPlatformVersion)' == ''">8.0</TargetPlatformVersion>
 	</PropertyGroup>
 
-	<Import Project="MSBuild.CodeSharing.$(ParentProjectType).targets"/>
+	<Import Project="..\Core\Microsoft.CodeSharing.$(ParentProjectType).targets"/>
 
 </Project>
diff --git a/Sources/MSBuild.Sharing.Sdk/Core/Microsoft.CodeSharing.Common.props b/Sources/MSBuild.Sharing.Sdk/Core/Microsoft.CodeSharing.Common.props
@@ -0,0 +1,5 @@
+<Project>
+
+	<Import Sdk="MSBuild.NET.Legacy.Sdk" Project="Sdk.Core.props"/>
+
+</Project>
diff --git a/...k/Core/MSBuild.CodeSharing.Common.targets → ...Core/Microsoft.CodeSharing.Common.targets b/...k/Core/MSBuild.CodeSharing.Common.targets → ...Core/Microsoft.CodeSharing.Common.targets
@@ -4,8 +4,8 @@
 		<_XamlLanguageTargets>$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.$(LanguageSourceName).targets</_XamlLanguageTargets>
 	</PropertyGroup>
 
-	<Import Project="$(_XamlLanguageTargets)" Condition="Exists('$(_XamlLanguageTargets)')"/>
 	<Import Sdk="MSBuild.NET.Legacy.Sdk" Project="Sdk.Core.targets" Condition="!Exists('$(_XamlLanguageTargets)')"/>
+	<Import Project="$(_XamlLanguageTargets)" Condition="Exists('$(_XamlLanguageTargets)')"/>
 
 	<ItemGroup>
 		<PropertyPageSchema Include="$(MSBuildToolsPath)\$(LangName)\SubProject.xaml"/>

diff --git a/Sources/MSBuild.Sharing.Sdk/Core/Microsoft.CodeSharing.Managed.props b/Sources/MSBuild.Sharing.Sdk/Core/Microsoft.CodeSharing.Managed.props
@@ -0,0 +1,5 @@
+<Project>
+
+	<Import Project="MSBuild.CodeSharing.Common.props"/>
+
+</Project>
diff --git a/.../Core/MSBuild.CodeSharing.Managed.targets → ...ore/Microsoft.CodeSharing.Managed.targets b/.../Core/MSBuild.CodeSharing.Managed.targets → ...ore/Microsoft.CodeSharing.Managed.targets
diff --git a/Sources/MSBuild.Sharing.Sdk/Core/Microsoft.CodeSharing.Native.props b/Sources/MSBuild.Sharing.Sdk/Core/Microsoft.CodeSharing.Native.props
@@ -0,0 +1,5 @@
+<Project>
+
+	<Import Project="MSBuild.CodeSharing.Common.props"/>
+
+</Project>
diff --git a/...k/Core/MSBuild.CodeSharing.Native.targets → ...Core/Microsoft.CodeSharing.Native.targets b/...k/Core/MSBuild.CodeSharing.Native.targets → ...Core/Microsoft.CodeSharing.Native.targets