Only consider sdks from before the runtime

src/MSBuildLocator/DotNetSdkLocationHelper.cs

@@ -35,17 +35,15 @@ public static VisualStudioInstance GetInstance(string dotNetSdkPath)
                 return null;
             }
 
-            string versionContent = File.ReadAllText(versionPath);
-            Match versionMatch = VersionRegex.Match(versionContent);
+            // Preview versions contain a hyphen after the numeric part of the version. Version.TryParse doesn't accept that.
+            Match versionMatch = VersionRegex.Match(File.ReadAllText(versionPath));
 
-            if (!versionMatch.Success)
-            {
-                return null;
-            }
-
-            if (!int.TryParse(versionMatch.Groups[1].Value, out int major) ||
+            if (!versionMatch.Success ||
+                !int.TryParse(versionMatch.Groups[1].Value, out int major) ||
                 !int.TryParse(versionMatch.Groups[2].Value, out int minor) ||
-                !int.TryParse(versionMatch.Groups[3].Value, out int patch))
+                !int.TryParse(versionMatch.Groups[3].Value, out int patch) ||
+                major > Environment.Version.Major ||
+                (major == Environment.Version.Major && minor > Environment.Version.Minor))
             {
                 return null;
             }
@@ -127,6 +125,7 @@ private static IEnumerable<string> GetDotNetBasePaths(string workingDirectory)
 
             var lineSdkIndex = lines.FindIndex(line => line.Contains("SDKs installed"));
 
+            List<string> paths = new List<string>();
             if (lineSdkIndex != -1)
             {
                 lineSdkIndex++;
@@ -144,11 +143,20 @@ private static IEnumerable<string> GetDotNetBasePaths(string workingDirectory)
                     path = Path.Combine(path, version) + Path.DirectorySeparatorChar;
 
                     if (!path.Equals(basePath))
-                        yield return path; 
+                        paths.Add(path); 
 
                     lineSdkIndex++;
                 }
             }
+
+            // The paths are sorted in increasing order. We want to return the newest SDKs first, however,
+            // so iterate over the list in reverse order. If basePath is disqualified because it was later
+            // than the runtime version, this ensures that RegisterDefaults will return the latest valid
+            // SDK instead of the earliest installed.
+            for (int i = paths.Count - 1; i >= 0; i--)
+            {
+                yield return paths[i];
+            }
         }
     }
 }

src/MSBuildLocator/MSBuildLocator.cs

@@ -93,7 +93,7 @@ internal static IEnumerable<VisualStudioInstance> QueryVisualStudioInstances(
         /// <returns>Instance of Visual Studio found and registered.</returns>
         public static VisualStudioInstance RegisterDefaults()
         {
-            var instance = GetInstances(VisualStudioInstanceQueryOptions.Default).FirstOrDefault();
+            VisualStudioInstance instance = GetInstances(VisualStudioInstanceQueryOptions.Default).FirstOrDefault();
             if (instance == null)
             {
                 var error = "No instances of MSBuild could be detected." +