Use upstream MSBuilderLocator

Author: aromaa

.gitmodules

@@ -6,6 +6,7 @@
     <RootNamespace>TestMyCode.CSharp.Bootstrap</RootNamespace>
     <Nullable>enable</Nullable>
     <AssemblyName>TestMyCode.CSharp.Bootstrap</AssemblyName>
+    <RollForward>LatestMajor</RollForward>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -17,12 +18,12 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Build.Locator" Version="1.4.1" />
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20574.7" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Core\Core.csproj" />
-    <ProjectReference Include="..\MSBuildLocator\src\MSBuildLocator\Microsoft.Build.Locator.csproj" />
   </ItemGroup>
 
 </Project>

Bootstrap/Bootstrap.csproj

@@ -3,10 +3,6 @@
 using System.CommandLine;
 using System.CommandLine.Invocation;
 using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.Loader;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Microsoft.Build.Locator;
@@ -20,12 +16,7 @@ public static class Program
     {
         public static async Task Main(string[] args)
         {
-            if (!Program.FindMsBuild())
-            {
-                return;
-            }
-
-            Program.SetMsBuildDepsResolver();
+            MSBuildLocator.RegisterDefaults();
 
             RootCommand rootCommand = Program.GenerateCommands();
             rootCommand.Handler = CommandHandler.Create(async (bool generatePointsFile, bool runTests, DirectoryInfo? projectDir, FileInfo? outputFile) =>
@@ -129,47 +120,5 @@ private static RootCommand GenerateCommands()
                 }, description: "The output file used to write results.")
             };
         }
-
-        private static bool FindMsBuild()
-        {
-            string? msbuildPath = Environment.GetEnvironmentVariable("MSBUILD_EXE_PATH");
-            if (msbuildPath is not null)
-            {
-                return true;
-            }
-
-            VisualStudioInstance? vsInstance = MSBuildLocator.QueryVisualStudioInstances(VisualStudioInstanceQueryOptions.Default)
-                                                             .FirstOrDefault(i => i.Version.Major == Environment.Version.Major && i.Version.Minor == Environment.Version.Minor);
-            if (vsInstance is not null)
-            {
-                MSBuildLocator.RegisterInstance(vsInstance);
-
-                return true;
-            }
-
-            Console.WriteLine($"No environment variable MSBUILD_EXE_PATH has been set and we were unable to locate it automatically! You need to install SDK for {Environment.Version.ToString(2)}");
-
-            return false;
-        }
-
-        private static void SetMsBuildDepsResolver()
-        {
-            string msbuildDir = Path.GetDirectoryName(Environment.GetEnvironmentVariable("MSBUILD_EXE_PATH"))!;
-
-            AppDomain.CurrentDomain.AssemblyResolve += (sender, args) =>
-            {
-                AssemblyName name = new AssemblyName(args.Name);
-
-                string assemblyName = $"{name.Name}.dll";
-                string sdkFileName = Path.Combine(msbuildDir, assemblyName);
-
-                if (File.Exists(sdkFileName))
-                {
-                    return Assembly.LoadFile(sdkFileName);
-                }
-
-                return null;
-            };
-        }
     }
 }

Bootstrap/Program.cs

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30001.183
+# Visual Studio Version 17
+VisualStudioVersion = 17.2.32422.2
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "Core\Core.csproj", "{07DC521B-E707-4814-B2CA-1335B7F00C09}"
 EndProject
@@ -13,8 +13,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests", "Tests\Tests.csproj
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestAssembly", "TestAssembly\TestAssembly.csproj", "{A350F515-23AB-4288-8972-800E05261642}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Build.Locator", "MSBuildLocator\src\MSBuildLocator\Microsoft.Build.Locator.csproj", "{342FF612-37EC-41B4-BB5F-CD6A52D5C32E}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -41,10 +39,6 @@ Global
 		{A350F515-23AB-4288-8972-800E05261642}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A350F515-23AB-4288-8972-800E05261642}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A350F515-23AB-4288-8972-800E05261642}.Release|Any CPU.Build.0 = Release|Any CPU
-		{342FF612-37EC-41B4-BB5F-CD6A52D5C32E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{342FF612-37EC-41B4-BB5F-CD6A52D5C32E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{342FF612-37EC-41B4-BB5F-CD6A52D5C32E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{342FF612-37EC-41B4-BB5F-CD6A52D5C32E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE