From 69cb5222299dcd8dbd5de21e489cd59772d460c9 Mon Sep 17 00:00:00 2001
From: Jeff Kluge <jeffkl@microsoft.com>
Date: Wed, 3 May 2023 12:09:22 -0400
Subject: [PATCH] Adopt Microsoft.Build.Traversal for skipping projects when
 building the solution

---
 Directory.Solution.props   |  3 +++
 Directory.Solution.targets | 26 +++-----------------------
 global.json                |  3 +++
 3 files changed, 9 insertions(+), 23 deletions(-)
 create mode 100644 Directory.Solution.props

diff --git a/Directory.Solution.props b/Directory.Solution.props
new file mode 100644
index 00000000..54f06eb2
--- /dev/null
+++ b/Directory.Solution.props
@@ -0,0 +1,3 @@
+<Project>
+  <Import Project="Sdk.props" Sdk="Microsoft.Build.Traversal" />
+</Project>
\ No newline at end of file
diff --git a/Directory.Solution.targets b/Directory.Solution.targets
index 7e94d7b5..e04ef4b4 100644
--- a/Directory.Solution.targets
+++ b/Directory.Solution.targets
@@ -1,28 +1,8 @@
-<Project InitialTargets="RemoveProjectsToSkip">
-  <!--
-    RemoveProjectsToSkip removes projects from the solution if they can't be built.  It determines
-    this by calling the ShouldSkipProject target for each project so it can indicate if a project
-    cannot be built and why.
-  -->
-  <Target Name="RemoveProjectsToSkip">
-    <MSBuild BuildInParallel="True"
-             Properties="BuildingSolutionFile=true; CurrentSolutionConfigurationContents=$(CurrentSolutionConfigurationContents); SolutionDir=$(SolutionDir); SolutionExt=$(SolutionExt); SolutionFileName=$(SolutionFileName); SolutionName=$(SolutionName); SolutionPath=$(SolutionPath);"
-             SkipNonexistentProjects="%(ProjectReference.SkipNonexistentProjects)"
-             Projects="@(ProjectReference)"
-             Targets="ShouldSkipProject">
-      <Output TaskParameter="TargetOutputs"
-              ItemName="ProjectToSkip" />
-    </MSBuild>
-    <ItemGroup>
-      <ProjectReference Remove="@(ProjectToSkip)" />
-    </ItemGroup>
-    <Message Text="Skipping project &quot;%(ProjectToSkip.Identity)&quot;. %(ProjectToSkip.Message)"
-             Condition="@(ProjectToSkip->Count()) > 0 And '$(MSBuildRestoreSessionId)' == ''"
-             Importance="High" />
-  </Target>
-
+<Project>
   <PropertyGroup>
     <!-- The target framework 'net5.0' is out of support and will not receive security updates in the future. -->
     <CheckEolTargetFramework Condition="'$(TargetFramework)' == 'net5.0'">false</CheckEolTargetFramework>
   </PropertyGroup>
+  
+  <Import Project="Sdk.targets" Sdk="Microsoft.Build.Traversal" />
 </Project>
diff --git a/global.json b/global.json
index 7cd6a1f4..43a878ce 100644
--- a/global.json
+++ b/global.json
@@ -3,5 +3,8 @@
     "version": "7.0.0",
     "rollForward": "latestMajor",
     "allowPrerelease": true
+  },
+  "msbuild-sdks": {
+    "Microsoft.Build.Traversal": "4.0.0"
   }
 }
\ No newline at end of file