Merge remote-tracking branch 'upstream/release/8.0.1xx' into nagilson-skip-illinkfail

Author: nagilson

NuGet.config

@@ -21,7 +21,7 @@
     <add key="darc-int-dotnet-runtime-087e153" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-087e1532/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-pub-dotnet-templating-1d6c3b1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-1d6c3b13/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-841d061" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-841d0615/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-dda23bb" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-dda23bbe/nuget/v3/index.json" />

eng/Version.Details.xml

@@ -3,15 +3,15 @@
   <ProductDependencies>
     <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.106">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>1d6c3b138de47ff542dbbdad569c7b4fca07fd1a</Sha>
+      <Sha>841d0615f28197ca18a1d695233998a7885b3ead</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.106-servicing.24258.3">
+    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.106-servicing.24263.1">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>1d6c3b138de47ff542dbbdad569c7b4fca07fd1a</Sha>
+      <Sha>841d0615f28197ca18a1d695233998a7885b3ead</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.106-servicing.24258.3">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.106-servicing.24263.1">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>1d6c3b138de47ff542dbbdad569c7b4fca07fd1a</Sha>
+      <Sha>841d0615f28197ca18a1d695233998a7885b3ead</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.5">

eng/Versions.props

@@ -11,7 +11,7 @@
   </PropertyGroup>
   <!-- Repo Version Information -->
   <PropertyGroup>
-    <VersionPrefix>8.0.106</VersionPrefix>
+    <VersionPrefix>8.0.107</VersionPrefix>
     <!-- Enable to remove prerelease label. -->
     <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
     <DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
@@ -140,7 +140,7 @@
     <MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
     <MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
     <!-- test dependencies -->
-    <MicrosoftTemplateEngineMocksPackageVersion>8.0.106-servicing.24258.3</MicrosoftTemplateEngineMocksPackageVersion>
+    <MicrosoftTemplateEngineMocksPackageVersion>8.0.106-servicing.24263.1</MicrosoftTemplateEngineMocksPackageVersion>
     <MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
     <MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
     <MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>

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