From 59584b8391b48db990a95f529b7545bf061f835a Mon Sep 17 00:00:00 2001
From: Nirmal Guru <Nirmal4G@gmail.com>
Date: Tue, 30 Nov 2021 07:23:27 +0530
Subject: [PATCH] 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.
---
 .../{Core => Build}/MSBuild.Sharing.Sdk.props          | 10 +++++-----
 .../{Core => Build}/MSBuild.Sharing.Sdk.targets        |  2 +-
 .../Core/Microsoft.CodeSharing.Common.props            |  5 +++++
 ...on.targets => Microsoft.CodeSharing.Common.targets} |  2 +-
 .../Core/Microsoft.CodeSharing.Managed.props           |  5 +++++
 ...d.targets => Microsoft.CodeSharing.Managed.targets} |  0
 .../Core/Microsoft.CodeSharing.Native.props            |  5 +++++
 ...ve.targets => Microsoft.CodeSharing.Native.targets} |  0
 8 files changed, 22 insertions(+), 7 deletions(-)
 rename Sources/MSBuild.Sharing.Sdk/{Core => Build}/MSBuild.Sharing.Sdk.props (91%)
 rename Sources/MSBuild.Sharing.Sdk/{Core => Build}/MSBuild.Sharing.Sdk.targets (75%)
 create mode 100644 Sources/MSBuild.Sharing.Sdk/Core/Microsoft.CodeSharing.Common.props
 rename Sources/MSBuild.Sharing.Sdk/Core/{MSBuild.CodeSharing.Common.targets => Microsoft.CodeSharing.Common.targets} (100%)
 create mode 100644 Sources/MSBuild.Sharing.Sdk/Core/Microsoft.CodeSharing.Managed.props
 rename Sources/MSBuild.Sharing.Sdk/Core/{MSBuild.CodeSharing.Managed.targets => Microsoft.CodeSharing.Managed.targets} (100%)
 create mode 100644 Sources/MSBuild.Sharing.Sdk/Core/Microsoft.CodeSharing.Native.props
 rename Sources/MSBuild.Sharing.Sdk/Core/{MSBuild.CodeSharing.Native.targets => Microsoft.CodeSharing.Native.targets} (100%)

diff --git a/Sources/MSBuild.Sharing.Sdk/Core/MSBuild.Sharing.Sdk.props b/Sources/MSBuild.Sharing.Sdk/Build/MSBuild.Sharing.Sdk.props
similarity index 91%
rename from Sources/MSBuild.Sharing.Sdk/Core/MSBuild.Sharing.Sdk.props
rename to Sources/MSBuild.Sharing.Sdk/Build/MSBuild.Sharing.Sdk.props
index b8166a6e..02a1954d 100644
--- a/Sources/MSBuild.Sharing.Sdk/Core/MSBuild.Sharing.Sdk.props
+++ b/Sources/MSBuild.Sharing.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,13 +39,10 @@
 	</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">
@@ -52,4 +50,6 @@
 		<IsCodeSharingProject>$(IsSharingProject)</IsCodeSharingProject>
 	</PropertyGroup>
 
+	<Import Project="..\Core\Microsoft.CodeSharing.$(ParentProjectType).props"/>
+
 </Project>
\ No newline at end of file
diff --git a/Sources/MSBuild.Sharing.Sdk/Core/MSBuild.Sharing.Sdk.targets b/Sources/MSBuild.Sharing.Sdk/Build/MSBuild.Sharing.Sdk.targets
similarity index 75%
rename from Sources/MSBuild.Sharing.Sdk/Core/MSBuild.Sharing.Sdk.targets
rename to Sources/MSBuild.Sharing.Sdk/Build/MSBuild.Sharing.Sdk.targets
index 54f7af46..7a0ad712 100644
--- a/Sources/MSBuild.Sharing.Sdk/Core/MSBuild.Sharing.Sdk.targets
+++ b/Sources/MSBuild.Sharing.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>
\ No newline at end of file
diff --git a/Sources/MSBuild.Sharing.Sdk/Core/Microsoft.CodeSharing.Common.props b/Sources/MSBuild.Sharing.Sdk/Core/Microsoft.CodeSharing.Common.props
new file mode 100644
index 00000000..a20d12c4
--- /dev/null
+++ 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>
\ No newline at end of file
diff --git a/Sources/MSBuild.Sharing.Sdk/Core/MSBuild.CodeSharing.Common.targets b/Sources/MSBuild.Sharing.Sdk/Core/Microsoft.CodeSharing.Common.targets
similarity index 100%
rename from Sources/MSBuild.Sharing.Sdk/Core/MSBuild.CodeSharing.Common.targets
rename to Sources/MSBuild.Sharing.Sdk/Core/Microsoft.CodeSharing.Common.targets
index 1925ede8..80b2ce44 100644
--- a/Sources/MSBuild.Sharing.Sdk/Core/MSBuild.CodeSharing.Common.targets
+++ b/Sources/MSBuild.Sharing.Sdk/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
new file mode 100644
index 00000000..3859a57d
--- /dev/null
+++ b/Sources/MSBuild.Sharing.Sdk/Core/Microsoft.CodeSharing.Managed.props
@@ -0,0 +1,5 @@
+<Project>
+
+	<Import Project="MSBuild.CodeSharing.Common.props"/>
+
+</Project>
\ No newline at end of file
diff --git a/Sources/MSBuild.Sharing.Sdk/Core/MSBuild.CodeSharing.Managed.targets b/Sources/MSBuild.Sharing.Sdk/Core/Microsoft.CodeSharing.Managed.targets
similarity index 100%
rename from Sources/MSBuild.Sharing.Sdk/Core/MSBuild.CodeSharing.Managed.targets
rename to Sources/MSBuild.Sharing.Sdk/Core/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
new file mode 100644
index 00000000..3859a57d
--- /dev/null
+++ b/Sources/MSBuild.Sharing.Sdk/Core/Microsoft.CodeSharing.Native.props
@@ -0,0 +1,5 @@
+<Project>
+
+	<Import Project="MSBuild.CodeSharing.Common.props"/>
+
+</Project>
\ No newline at end of file
diff --git a/Sources/MSBuild.Sharing.Sdk/Core/MSBuild.CodeSharing.Native.targets b/Sources/MSBuild.Sharing.Sdk/Core/Microsoft.CodeSharing.Native.targets
similarity index 100%
rename from Sources/MSBuild.Sharing.Sdk/Core/MSBuild.CodeSharing.Native.targets
rename to Sources/MSBuild.Sharing.Sdk/Core/Microsoft.CodeSharing.Native.targets