Integrate Solution SDK into legacy solutions

Nirmal4G · Nirmal4G · commit 78c5c6ed36b4 · 2021-12-02T08:40:12.000+05:30
- This starts small with very specific properties set.

- A little bit improvisation in recognition of
  un-supported projects and eliminating them
  from the Build process.
diff --git a/Directory.Build.rsp b/Directory.Build.rsp
@@ -1,5 +1,4 @@
 -NoLogo
--Restore
 -MaxCPUCount
 -BinaryLogger
 -NodeReuse:False
diff --git a/Directory.Solution.props b/Directory.Solution.props
@@ -6,9 +6,7 @@
 		<RestoreUseStaticGraphEvaluation>True</RestoreUseStaticGraphEvaluation>
 	</PropertyGroup>
 
-	<PropertyGroup Label="Solution">
-		<ImportByWildcardAfterSolution>False</ImportByWildcardAfterSolution>
-		<ImportByWildcardBeforeSolution>False</ImportByWildcardBeforeSolution>
-	</PropertyGroup>
+	<!-- Integrate with the Solution SDK for Legacy Solution files -->
+	<Import Sdk="MSBuild.Solution.Sdk" Project="Sdk.Legacy.props"/>
 
 </Project>
diff --git a/Directory.Solution.targets b/Directory.Solution.targets
@@ -1,6 +1,6 @@
 <Project>
 
-	<!-- Enable Solution-wide Package Restore through our SDK -->
-	<Import Sdk="MSBuild.NET.Legacy.Sdk" Project="NuGet.Restore.targets"/>
+	<!-- Integrate with the Solution SDK for Legacy Solution files -->
+	<Import Sdk="MSBuild.Solution.Sdk" Project="Sdk.Legacy.targets"/>
 
 </Project>
diff --git a/Sources/MSBuild.Solution.Sdk/Sdk/Sdk.Legacy.props b/Sources/MSBuild.Solution.Sdk/Sdk/Sdk.Legacy.props
@@ -0,0 +1,11 @@
+<Project>
+
+	<PropertyGroup Label="Solution">
+		<ImportByWildcardAfterSolution>False</ImportByWildcardAfterSolution>
+		<ImportByWildcardBeforeSolution>False</ImportByWildcardBeforeSolution>
+	</PropertyGroup>
+
+	<!-- Enable Solution-wide Central Package Management through our SDK -->
+	<Import Sdk="NuGet.Build.Sdk" Project="Sdk.Extensions.props"/>
+
+</Project>
diff --git a/Sources/MSBuild.Solution.Sdk/Sdk/Sdk.Legacy.targets b/Sources/MSBuild.Solution.Sdk/Sdk/Sdk.Legacy.targets
@@ -0,0 +1,16 @@
+<Project>
+
+	<Target Name="RemoveUnSupportedProjectsFromRestore"
+			BeforeTargets="Restore;_LoadRestoreGraphEntryPoints;_GenerateProjectRestoreGraphPerFramework;_GenerateRestoreProjectPathItemsPerFramework">
+		<ItemGroup>
+			<UnSupportedProjectReference Include="@(ProjectReference->WithMetadataValue('Extension', '.nuproj'))" />
+			<ProjectReference Remove="@(UnSupportedProjectReference)" />
+		</ItemGroup>
+		<Message Importance="High" Condition="@(UnSupportedProjectReference->Count()) > 0"
+			Text="Restore is not currently supported for NuGet packaging projects (i.e., MSBuild projects with file extension 'nuproj')."/>
+	</Target>
+
+	<!-- Enable Solution-wide Package Restore through our SDK -->
+	<Import Sdk="NuGet.Build.Sdk" Project="Sdk.Restore.targets" />
+
+</Project>
diff --git a/global.json b/global.json
@@ -3,6 +3,7 @@
 	{
 		"MSBuild.Core.Sdk": "1.0.0-dev.*",
 		"MSBuild.Common.Sdk": "1.0.0-dev.*",
+		"MSBuild.Solution.Sdk": "1.0.0-dev.*",
 
 		"MSBuild.NET.Sdk": "1.0.0-dev.*",
 		"MSBuild.NET.Legacy.Sdk": "1.0.0-dev.*",

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`-NoLogo`
`2`		`--Restore`
`3`	`2`	`-MaxCPUCount`
`4`	`3`	`-BinaryLogger`
`5`	`4`	`-NodeReuse:False`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`{`
`4`	`4`	`"MSBuild.Core.Sdk": "1.0.0-dev.*",`
`5`	`5`	`"MSBuild.Common.Sdk": "1.0.0-dev.*",`
	`6`	`+ "MSBuild.Solution.Sdk": "1.0.0-dev.*",`
`6`	`7`
`7`	`8`	`"MSBuild.NET.Sdk": "1.0.0-dev.*",`
`8`	`9`	`"MSBuild.NET.Legacy.Sdk": "1.0.0-dev.*",`