Merge pull request #83325 from raulsntos/dotnet/find-latest-sdk

C#: Fallback to the latest SDK
godotengine · Oct 24, 2023 · 398b254 · 398b254
2 parents 4ec07ff + a186343
commit 398b254
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/ProjectUtils.cs b/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/ProjectUtils.cs
@@ -1,5 +1,7 @@
 using System;
+using System.Linq;
 using Microsoft.Build.Construction;
+using Microsoft.Build.Locator;
 
 namespace GodotTools.ProjectEditor
 {
@@ -19,15 +21,18 @@ public MSBuildProject(ProjectRootElement root)
 
     public static class ProjectUtils
     {
-        public static void MSBuildLocatorRegisterDefaults(out Version version, out string path)
+        public static void MSBuildLocatorRegisterLatest(out Version version, out string path)
         {
-            var instance = Microsoft.Build.Locator.MSBuildLocator.RegisterDefaults();
+            var instance = MSBuildLocator.QueryVisualStudioInstances()
+                .OrderByDescending(x => x.Version)
+                .First();
+            MSBuildLocator.RegisterInstance(instance);
             version = instance.Version;
             path = instance.MSBuildPath;
         }
 
         public static void MSBuildLocatorRegisterMSBuildPath(string msbuildPath)
-            => Microsoft.Build.Locator.MSBuildLocator.RegisterMSBuildPath(msbuildPath);
+            => MSBuildLocator.RegisterMSBuildPath(msbuildPath);
 
         public static MSBuildProject Open(string path)
         {

diff --git a/modules/mono/editor/GodotTools/GodotTools/GodotSharpEditor.cs b/modules/mono/editor/GodotTools/GodotTools/GodotSharpEditor.cs
@@ -456,7 +456,7 @@ public override void _EnablePlugin()
             var dotNetSdkSearchVersion = Environment.Version;
 
             // First we try to find the .NET Sdk ourselves to make sure we get the
-            // correct version first (`RegisterDefaults` always picks the latest).
+            // correct version first, otherwise pick the latest.
             if (DotNetFinder.TryFindDotNetSdk(dotNetSdkSearchVersion, out var sdkVersion, out string sdkPath))
             {
                 if (Godot.OS.IsStdOutVerbose())
@@ -468,7 +468,7 @@ public override void _EnablePlugin()
             {
                 try
                 {
-                    ProjectUtils.MSBuildLocatorRegisterDefaults(out sdkVersion, out sdkPath);
+                    ProjectUtils.MSBuildLocatorRegisterLatest(out sdkVersion, out sdkPath);
                     if (Godot.OS.IsStdOutVerbose())
                         Console.WriteLine($"Found .NET Sdk version '{sdkVersion}': {sdkPath}");
                 }