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

Author: Jason Zhai

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

@@ -45,8 +45,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 = "warning : Unable to locate the .NET SDK";
-               var errorString = "Unable to locate the .NET SDK. Check that it is installed";
+                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