Merge in 'release/6.0' changes

dotnet-bot · dotnet-bot · commit 6a1f3e3ef10f · 2022-10-04T20:17:21.000Z
diff --git a/.azure/pipelines/components-e2e-tests.yml b/.azure/pipelines/components-e2e-tests.yml
@@ -75,4 +75,5 @@ jobs:
     artifacts:
     - name: Components_E2E_Test_Logs
       path: '$(Build.SourcesDirectory)/artifacts/TestResults/$(BuildConfiguration)'
+      includeForks: true
       publishOnError: true
diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml
@@ -101,10 +101,10 @@ jobs:
         ${{ if or(eq(parameters.useHostedUbuntu, false), and(eq(variables['System.TeamProject'], 'internal'), notin(variables['Build.Reason'], 'Manual', 'PullRequest', 'Schedule'))) }}:
           ${{ if eq(variables['System.TeamProject'], 'public') }}:
             name: NetCore-Svc-Public
-            demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
+            demands: ImageOverride -equals Build.Ubuntu.2004.Amd64.Open
           ${{ if eq(variables['System.TeamProject'], 'internal') }}:
             name: NetCore1ESPool-Svc-Internal
-            demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
+            demands: ImageOverride -equals Build.Ubuntu.2004.Amd64
       ${{ if eq(parameters.agentOs, 'Windows') }}:
         ${{ if eq(variables['System.TeamProject'], 'public') }}:
           name: NetCore-Svc-Public
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,7 +1,6 @@
 # Users referenced in this file will automatically be requested as reviewers for PRs that modify the given paths.
 # See https://help.github.com/articles/about-code-owners/
 
-*                                                                                 @Pilchie
 /global.json                                                                      @dotnet/aspnet-build
 /.azure/                                                                          @dotnet/aspnet-build
 /.config/                                                                         @dotnet/aspnet-build
diff --git a/src/Components/Web.JS/dist/Release/blazor.server.js b/src/Components/Web.JS/dist/Release/blazor.server.js
diff --git a/src/Components/Web.JS/dist/Release/blazor.webview.js b/src/Components/Web.JS/dist/Release/blazor.webview.js
diff --git a/src/Components/Web.JS/src/PageTitle.ts b/src/Components/Web.JS/src/PageTitle.ts
@@ -5,7 +5,8 @@ export const PageTitle = {
 };
 
 function getAndRemoveExistingTitle(): string | null {
-  const titleElements = document.getElementsByTagName('title');
+  // Other <title> elements may exist outside <head> (e.g., inside <svg> elements) but they aren't page titles
+  const titleElements = document.head ? document.head.getElementsByTagName('title') : [];
 
   if (titleElements.length === 0) {
     return null;
diff --git a/src/Components/test/E2ETest/ServerExecutionTests/CircuitGracefulTerminationTests.cs b/src/Components/test/E2ETest/ServerExecutionTests/CircuitGracefulTerminationTests.cs
@@ -7,8 +7,8 @@
 using BasicTestApp;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
-using Microsoft.AspNetCore.Testing;
 using Microsoft.AspNetCore.E2ETesting;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Testing;
 using OpenQA.Selenium;
@@ -66,6 +66,7 @@ public async Task ReloadingThePage_GracefullyDisconnects_TheCurrentCircuit()
         }
 
         [Fact]
+        [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/44185")]
         public async Task ClosingTheBrowserWindow_GracefullyDisconnects_TheCurrentCircuit()
         {
             // Arrange & Act
diff --git a/src/Components/test/E2ETest/ServerExecutionTests/HeadModificationPrerenderingTest.cs b/src/Components/test/E2ETest/ServerExecutionTests/HeadModificationPrerenderingTest.cs
@@ -36,6 +36,10 @@ public void CanModifyHeadDuringAndAfterPrerendering()
             Browser.Equal("Title 1", () => Browser.Title);
             Browser.Exists(By.Id("meta-description"));
 
+            // Check that unrelated <title> elements were left alone
+            Browser.Equal("This element is used to test that PageTitle prerendering doesn't interfere with non-head title elements.",
+                () => Browser.Exists(By.CssSelector("#svg-for-title-prerendering-test title")).Text);
+
             var titleText1 = Browser.FindElement(By.Id("title-text-1"));
             titleText1.Clear();
             titleText1.SendKeys("Updated title 1\n");
diff --git a/src/Components/test/testassets/TestServer/Pages/DeferredComponentContentLayout.cshtml b/src/Components/test/testassets/TestServer/Pages/DeferredComponentContentLayout.cshtml
@@ -34,5 +34,11 @@
             });
         }
     </script>
+
+    <svg id="svg-for-title-prerendering-test" viewBox="0 0 20 10" xmlns="http://www.w3.org/2000/svg" style="width: 1px; height: 1px;">
+        <rect x="11" y="1" width="8" height="8">
+            <title>This element is used to test that PageTitle prerendering doesn't interfere with non-head title elements.</title>
+        </rect>
+    </svg>
 </body>
 </html>
diff --git a/src/Hosting/TestHost/src/ResponseBodyReaderStream.cs b/src/Hosting/TestHost/src/ResponseBodyReaderStream.cs
@@ -70,7 +70,7 @@ public override int Read(byte[] buffer, int offset, int count)
 
         public override async Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
         {
-            VerifyBuffer(buffer, offset, count);
+            ValidateBufferArguments(buffer, offset, count);
             CheckAborted();
 
             if (_readerComplete)
@@ -101,22 +101,6 @@ public override async Task<int> ReadAsync(byte[] buffer, int offset, int count,
             return (int)actual;
         }
 
-        private static void VerifyBuffer(byte[] buffer, int offset, int count)
-        {
-            if (buffer == null)
-            {
-                throw new ArgumentNullException(nameof(buffer));
-            }
-            if (offset < 0 || offset > buffer.Length)
-            {
-                throw new ArgumentOutOfRangeException(nameof(offset), offset, string.Empty);
-            }
-            if (count <= 0 || count > buffer.Length - offset)
-            {
-                throw new ArgumentOutOfRangeException(nameof(count), count, string.Empty);
-            }
-        }
-
         internal void Cancel()
         {
             Abort(new OperationCanceledException());
diff --git a/src/Hosting/TestHost/test/ResponseBodyTests.cs b/src/Hosting/TestHost/test/ResponseBodyTests.cs
@@ -122,6 +122,40 @@ public async Task BodyStream_SyncEnabled_FlushSucceeds()
             Assert.Equal(contentBytes, responseBytes);
         }
 
+        [Fact]
+        public async Task BodyStream_ZeroByteRead_Success()
+        {
+            var emptyReadStarted = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+
+            var contentBytes = new byte[] { 32 };
+            using var host = await CreateHost(async httpContext =>
+            {
+                await httpContext.Response.Body.WriteAsync(contentBytes);
+                await emptyReadStarted.Task;
+                await httpContext.Response.Body.WriteAsync(contentBytes);
+            });
+
+            var client = host.GetTestServer().CreateClient();
+            var response = await client.GetAsync("/", HttpCompletionOption.ResponseHeadersRead);
+            var stream = await response.Content.ReadAsStreamAsync();
+            var bytes = new byte[5];
+            var read = await stream.ReadAsync(bytes);
+            Assert.Equal(1, read);
+            Assert.Equal(contentBytes[0], bytes[0]);
+
+            // This will chain to the Memory overload, but that does less restrictive validation on the input.
+            // https://github.com/dotnet/aspnetcore/issues/41692#issuecomment-1248714684
+            var zeroByteRead = stream.ReadAsync(Array.Empty<byte>(), 0, 0);
+            Assert.False(zeroByteRead.IsCompleted);
+            emptyReadStarted.SetResult();
+            read = await zeroByteRead;
+            Assert.Equal(0, read);
+
+            read = await stream.ReadAsync(bytes);
+            Assert.Equal(1, read);
+            Assert.Equal(contentBytes[0], bytes[0]);
+        }
+
         private Task<IHost> CreateHost(RequestDelegate appDelegate)
         {
             return new HostBuilder()
diff --git a/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj b/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj
@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <!-- Included primarily to ensure dotnet-getdocument and GetDocument.Insider can be referenced. -->
-    <TargetFrameworks>netcoreapp2.1;$(DefaultNetFxTargetFramework)</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;$(DefaultNetCoreTargetFramework);$(DefaultNetFxTargetFramework)</TargetFrameworks>
 
     <Description>MSBuild tasks and targets for build-time Swagger and OpenApi document generation</Description>
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
@@ -19,12 +19,16 @@
       because publish output matches what was built.
     -->
     <Reference Include="dotnet-getdocument"
-        Targets="Publish"
-        ReferenceOutputAssembly="false"
-        SkipGetTargetFrameworkProperties="true"
-        UndefineProperties="TargetFramework;TargetFrameworks;RuntimeIdentifier;PublishDir" />
-    <Reference Include="GetDocument.Insider" ReferenceOutputAssembly="false">
-      <Targets Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">Publish</Targets>
+      Condition=" '$(TargetFramework)' != '$(DefaultNetFxTargetFramework)' "
+      Targets="Publish"
+      Private="false"
+      ReferenceOutputAssembly="false"
+      SkipGetTargetFrameworkProperties="true" />
+    <Reference Include="GetDocument.Insider"
+      Private="false"
+      ReferenceOutputAssembly="false"
+      SkipGetTargetFrameworkProperties="true">
+        <Targets Condition=" '$(TargetFramework)' != '$(DefaultNetFxTargetFramework)' ">Publish</Targets>
     </Reference>
   </ItemGroup>
 
diff --git a/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec b/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec
@@ -12,5 +12,6 @@
     <file src="$artifactsBinDir$\GetDocument.Insider\$configuration$\net461\*.*" target="tools\net461" />
     <file src="$artifactsBinDir$\GetDocument.Insider\x86\$configuration$\net461\*.*" target="tools\net461-x86" />
     <file src="$artifactsBinDir$\GetDocument.Insider\$configuration$\netcoreapp2.1\publish\*.*" target="tools\netcoreapp2.1" />
+    <file src="$artifactsBinDir$\GetDocument.Insider\$configuration$\net6.0\publish\*.*" target="tools\net6.0" />
   </files>
 </package>
diff --git a/src/Tools/GetDocumentInsider/src/Commands/GetDocumentCommand.cs b/src/Tools/GetDocumentInsider/src/Commands/GetDocumentCommand.cs
@@ -5,7 +5,7 @@
 using System.IO;
 using System.Linq;
 using System.Reflection;
-#if NETCOREAPP2_1
+#if NETCOREAPP
 using System.Runtime.Loader;
 #endif
 using Microsoft.Extensions.CommandLineUtils;
@@ -69,7 +69,7 @@ protected override int Execute()
                 }
             }
 
-#if NETCOREAPP2_1
+#if NETCOREAPP
             AssemblyLoadContext.Default.Resolving += (loadContext, assemblyName) =>
             {
                 var name = assemblyName.Name;
diff --git a/src/Tools/GetDocumentInsider/src/Commands/GetDocumentCommandWorker.cs b/src/Tools/GetDocumentInsider/src/Commands/GetDocumentCommandWorker.cs
@@ -2,13 +2,20 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Tools.Internal;
+#if NET6_0_OR_GREATER
+using Microsoft.AspNetCore.Hosting.Server;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.AspNetCore.Http.Features;
+#endif
 
 namespace Microsoft.Extensions.ApiDescription.Tool.Commands
 {
@@ -53,6 +60,88 @@ public int Process()
                 return 3;
             }
 
+    #if NET6_0_OR_GREATER
+            // Register no-op implementations of IServer and IHostLifetime
+            // to prevent the application server from actually launching after build.
+            void ConfigureHostBuilder(object hostBuilder)
+            {
+                ((IHostBuilder)hostBuilder).ConfigureServices((context, services) =>
+                {
+                    services.AddSingleton<IServer, NoopServer>();
+                    services.AddSingleton<IHostLifetime, NoopHostLifetime>();
+                });
+            }
+
+            // Register a TCS to be invoked when the entrypoint (aka Program.Main)
+            // has finished running. For minimal APIs, this means that all app.X
+            // calls about the host has been built have been executed.
+            var waitForStartTcs = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
+            void OnEntryPointExit(Exception exception)
+            {
+                // If the entry point exited, we'll try to complete the wait
+                if (exception != null)
+                {
+                    waitForStartTcs.TrySetException(exception);
+                }
+                else
+                {
+                    waitForStartTcs.TrySetResult(null);
+                }
+            }
+
+            // Resolve the host factory, ensuring that we don't stop the
+            // application after the host has been built.
+            var factory = HostFactoryResolver.ResolveHostFactory(assembly,
+                stopApplication: false,
+                configureHostBuilder: ConfigureHostBuilder,
+                entrypointCompleted: OnEntryPointExit);
+
+            if (factory == null)
+            {
+                _reporter.WriteError(Resources.FormatMethodsNotFound(
+                    HostFactoryResolver.BuildWebHost,
+                    HostFactoryResolver.CreateHostBuilder,
+                    HostFactoryResolver.CreateWebHostBuilder,
+                    entryPointType));
+
+                return 8;
+            }
+
+            try
+            {
+                // Retrieve the service provider from the target host.
+                var services = ((IHost)factory(new[] { $"--{HostDefaults.ApplicationKey}={assemblyName}" })).Services;
+                if (services == null)
+                {
+                    _reporter.WriteError(Resources.FormatServiceProviderNotFound(
+                        typeof(IServiceProvider),
+                        HostFactoryResolver.BuildWebHost,
+                        HostFactoryResolver.CreateHostBuilder,
+                        HostFactoryResolver.CreateWebHostBuilder,
+                        entryPointType));
+
+                    return 9;
+                }
+
+                // Wait for the application to start to ensure that all configurations
+                // on the WebApplicationBuilder have been processed.
+                var applicationLifetime = services.GetRequiredService<IHostApplicationLifetime>();
+                using (var registration = applicationLifetime.ApplicationStarted.Register(() => waitForStartTcs.TrySetResult(null)))
+                {
+                    waitForStartTcs.Task.Wait();
+                    var success = GetDocuments(services);
+                    if (!success)
+                    {
+                        return 10;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                _reporter.WriteError(ex.ToString());
+                return 11;
+            }
+    #else
             try
             {
                 var serviceFactory = HostFactoryResolver.ResolveServiceProviderFactory(assembly);
@@ -91,6 +180,7 @@ public int Process()
                 _reporter.WriteError(ex.ToString());
                 return 7;
             }
+    #endif
 
             return 0;
         }
@@ -303,5 +393,22 @@ private object InvokeMethod(MethodInfo method, object instance, object[] argumen
 
             return result;
         }
+
+    #if NET6_0_OR_GREATER
+            private sealed class NoopHostLifetime : IHostLifetime
+            {
+                public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+                public Task WaitForStartAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+            }
+
+            private sealed class NoopServer : IServer
+            {
+                public IFeatureCollection Features { get; } = new FeatureCollection();
+                public void Dispose() { }
+                public Task StartAsync<TContext>(IHttpApplication<TContext> application, CancellationToken cancellationToken) => Task.CompletedTask;
+                public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+
+            }
+    #endif
     }
 }
diff --git a/src/Tools/GetDocumentInsider/src/GetDocument.Insider.csproj b/src/Tools/GetDocumentInsider/src/GetDocument.Insider.csproj
@@ -5,14 +5,19 @@
     <IsPackable>false</IsPackable>
     <OutputType>Exe</OutputType>
     <RootNamespace>Microsoft.Extensions.ApiDescription.Tool</RootNamespace>
-    <TargetFrameworks>netcoreapp2.1;$(DefaultNetFxTargetFramework)</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;$(DefaultNetCoreTargetFramework);$(DefaultNetFxTargetFramework)</TargetFrameworks>
     <IsShippingPackage>false</IsShippingPackage>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetFxTargetFramework)'">
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
+    <Reference Include="Microsoft.AspNetCore.Hosting.Server.Abstractions" />
+    <Reference Include="Microsoft.Extensions.Hosting.Abstractions" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="4.6.0">
       <AllowExplicitReference>true</AllowExplicitReference>
diff --git a/src/Tools/dotnet-getdocument/src/Commands/InvokeCommand.cs b/src/Tools/dotnet-getdocument/src/Commands/InvokeCommand.cs
@@ -79,9 +79,16 @@ protected override int Execute()
                                 projectName,
                                 targetFramework.Version));
                         }
+                        else if (targetFramework.Version >= new Version(6, 0))
+                        {
+                            toolsDirectory = Path.Combine(thisPath, $"net{targetFramework.Version}");
+                        }
+                        else
+                        {
+                            toolsDirectory = Path.Combine(thisPath, "netcoreapp2.1");
+                        }
 
                         executable = DotNetMuxer.MuxerPathOrDefault();
-                        toolsDirectory = Path.Combine(thisPath, "netcoreapp2.1");
 
                         args.Add("exec");
                         args.Add("--depsFile");
diff --git a/src/Tools/dotnet-getdocument/src/dotnet-getdocument.csproj b/src/Tools/dotnet-getdocument/src/dotnet-getdocument.csproj
@@ -5,7 +5,7 @@
     <IsPackable>false</IsPackable>
     <OutputType>Exe</OutputType>
     <RootNamespace>Microsoft.Extensions.ApiDescription.Tool</RootNamespace>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFrameworks>netcoreapp2.1;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <UseAppHost>false</UseAppHost>
     <IsShippingPackage>false</IsShippingPackage>
   </PropertyGroup>
diff --git a/src/submodules/googletest b/src/submodules/googletest
@@ -1 +1 @@
-Subproject commit 9080381758fad853aa17ba1c3255ee8a35e452ca
+Subproject commit 93f08be653c36ddc6943e9513fc14c7292b4d007
