Use the same SDK version as the runtime

Author: aromaa

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "MSBuildLocator"]
+	path = MSBuildLocator
+	url = https://github.com/TMC-C/MSBuildLocator
+	branch = get-all-installed-dotnetsdk-instances

Bootstrap/Bootstrap.csproj

@@ -8,12 +8,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Build.Locator" Version="1.2.6" />
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20253.1" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Core\Core.csproj" />
+    <ProjectReference Include="..\MSBuildLocator\src\MSBuildLocator\Microsoft.Build.Locator.csproj" />
   </ItemGroup>
 
 </Project>

Bootstrap/Program.cs

@@ -138,13 +138,16 @@ private static bool FindMsBuild()
                 return true;
             }
 
-            VisualStudioInstance? vsInstance = MSBuildLocator.RegisterDefaults();
+            VisualStudioInstance? vsInstance = MSBuildLocator.QueryVisualStudioInstances(VisualStudioInstanceQueryOptions.Default)
+                                                             .FirstOrDefault(i => i.Version.Major == Environment.Version.Major && i.Version.Minor == Environment.Version.Minor);
             if (!(vsInstance is 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!");
+            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;
         }

MSBuildLocator

@@ -9,9 +9,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bootstrap", "Bootstrap\Boot
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "API", "API\API.csproj", "{43B2D155-CBE9-407E-9EE6-60170BFCB33D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{F4199101-8840-4616-A25D-869E5F0C2B27}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests", "Tests\Tests.csproj", "{F4199101-8840-4616-A25D-869E5F0C2B27}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestAssembly", "TestAssembly\TestAssembly.csproj", "{A350F515-23AB-4288-8972-800E05261642}"
+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
@@ -39,6 +41,10 @@ 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