Merge branch 'release/6.0.4xx' into release/8.0.1xx

Author: Jason Zhai

src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildWithGlobalJson.cs

@@ -35,10 +35,8 @@ public void It_fails_build_on_failed_sdk_resolution(bool runningInVS)
                 var result = buildCommand.Execute($"/p:BuildingInsideVisualStudio={runningInVS}", $"/bl:binlog{runningInVS}.binlog")
                     .Should()
                     .Fail();
-                var warningString = runningInVS
-                    ? "warning : Unable to locate the .NET SDK version '9.9.999' as specified by global.json, please check that the specified version is installed."
-                    : "warning : Unable to locate the .NET SDK as specified by global.json, please check that the specified version is installed.";
-                var errorString = "Unable to locate the .NET SDK. Check that it is installed, your PATH is configured for the correct architecture, and that the version specified in global.json (if any) matches the installed version.";
+                var warningString = "warning : Unable to locate the .NET SDK";
+                var errorString = "Unable to locate the .NET SDK. Check that it is installed";
                 if (runningInVS)
                 {
                     result.And