Merge in 'release/6.0' changes

Author: dotnet-bot

.azure/pipelines/jobs/default-build.yml

@@ -94,7 +94,7 @@ jobs:
     # See https://github.com/dotnet/arcade/blob/master/Documentation/ChoosingAMachinePool.md
     pool:
       ${{ if eq(parameters.agentOs, 'macOS') }}:
-        vmImage: macOS-10.15
+        vmImage: macOS-11
       ${{ if eq(parameters.agentOs, 'Linux') }}:
         ${{ if and(eq(parameters.useHostedUbuntu, true), or(ne(variables['System.TeamProject'], 'internal'), in(variables['Build.Reason'], 'Manual', 'PullRequest', 'Schedule'))) }}:
           vmImage: ubuntu-18.04
@@ -151,8 +151,8 @@ jobs:
       - script: df -h
         displayName: Disk size
     - ${{ if eq(parameters.agentOs, 'macOS') }}:
-      - script: sudo xcode-select -s /Applications/Xcode_12.2.app/Contents/Developer
-        displayName: Use XCode 12.2
+      - script: sudo xcode-select -s /Applications/Xcode_12.5.1.app/Contents/Developer
+        displayName: Use XCode 12.5.1
     - checkout: self
       clean: true
     - ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isTestingJob, true)) }}:

eng/Versions.props

@@ -8,8 +8,8 @@
   <PropertyGroup Label="Version settings">
     <AspNetCoreMajorVersion>6</AspNetCoreMajorVersion>
     <AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
-    <AspNetCorePatchVersion>8</AspNetCorePatchVersion>
-    <ValidateBaseline>true</ValidateBaseline>
+    <AspNetCorePatchVersion>9</AspNetCorePatchVersion>
+    <ValidateBaseline>false</ValidateBaseline>
     <!--
         When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
     -->

src/DefaultBuilder/src/WebApplication.cs

@@ -27,7 +27,7 @@ public sealed class WebApplication : IHost, IApplicationBuilder, IEndpointRouteB
         internal WebApplication(IHost host)
         {
             _host = host;
-            ApplicationBuilder = new ApplicationBuilder(host.Services);
+            ApplicationBuilder = new ApplicationBuilder(host.Services, ServerFeatures);
             Logger = host.Services.GetRequiredService<ILoggerFactory>().CreateLogger(Environment.ApplicationName);
 
             Properties[GlobalEndpointRouteBuilderKey] = this;

src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/WebApplicationTests.cs

@@ -31,6 +31,16 @@ namespace Microsoft.AspNetCore.Tests
 {
     public class WebApplicationTests
     {
+        [Fact]
+        public async Task WebApplicationBuilder_New()
+        {
+            var builder = WebApplication.CreateBuilder(new string[] { "--urls", "http://localhost:5001" });
+
+            await using var app = builder.Build();
+            var newApp = (app as IApplicationBuilder).New();
+            Assert.NotNull(newApp.ServerFeatures);
+        }
+
         [Fact]
         public async Task WebApplicationBuilderConfiguration_IncludesCommandLineArguments()
         {
@@ -1696,13 +1706,13 @@ public void EmptyAppConfiguration()
                 createdDirectory = true;
                 Directory.CreateDirectory(wwwroot);
             }
-    
+
             try
             {
                 var builder = WebApplication.CreateBuilder();
-    
+
                 builder.WebHost.ConfigureAppConfiguration((ctx, config) => { });
-    
+
                 using var app = builder.Build();
                 var hostEnv = app.Services.GetRequiredService<Hosting.IWebHostEnvironment>();
                 Assert.Equal(wwwroot, hostEnv.WebRootPath);

src/HttpClientFactory/Polly/src/PolicyHttpMessageHandler.cs

@@ -167,7 +167,7 @@ protected virtual async Task<HttpResponseMessage> SendCoreAsync(HttpRequestMessa
                 disposable.Dispose();
             }
 
-            var result = await base.SendAsync(request, cancellationToken);
+            var result = await base.SendAsync(request, cancellationToken).ConfigureAwait(false);
 
             request.Properties[PriorResponseKey] = result;