Merge branch 'master' into merge/release/5.0-preview7-to-master

Author: pranavkm

eng/Version.Details.xml

@@ -26,7 +26,7 @@ public void Post_RunsAsynchronously_WhenNotBusy()
             Thread capturedThread = null;
 
             var e = new ManualResetEventSlim();
-            
+
             // Act
             context.Post((_) =>
             {
@@ -766,7 +766,6 @@ public async Task InvokeAsync_FuncTaskT_CanReportCancellation()
         }
 
         [Fact]
-        [QuarantinedTest]
         public async Task InvokeAsync_SyncWorkInAsyncTaskIsCompletedFirst()
         {
             // Simplified version of ServerComponentRenderingTest.CanDispatchAsyncWorkToSyncContext

eng/Versions.props

@@ -16,7 +16,7 @@
     <Reference Include="Microsoft.Extensions.DependencyInjection" />
     <Reference Include="Microsoft.Extensions.FileProviders.Physical" />
     <Reference Include="Microsoft.Extensions.FileProviders.Composite" />
-    <Reference Include="Microsoft.Extensions.Hosting.Abstractions" />
+    <Reference Include="Microsoft.Extensions.Hosting" />
     <Reference Include="Microsoft.Extensions.Logging" />
     <Reference Include="Microsoft.Extensions.Options" />
   </ItemGroup>

src/Components/Components/test/Rendering/RendererSynchronizationContextTest.cs

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <Description>ASP.NET Core hosting infrastructure and startup logic for web applications.</Description>
@@ -26,7 +26,7 @@
     <Reference Include="Microsoft.Extensions.DependencyInjection" />
     <Reference Include="Microsoft.Extensions.FileProviders.Physical" />
     <Reference Include="Microsoft.Extensions.FileProviders.Composite" />
-    <Reference Include="Microsoft.Extensions.Hosting.Abstractions" />
+    <Reference Include="Microsoft.Extensions.Hosting" />
     <Reference Include="Microsoft.Extensions.Logging" />
     <Reference Include="Microsoft.Extensions.Options" />
 

src/Hosting/Hosting/ref/Microsoft.AspNetCore.Hosting.csproj

@@ -1450,7 +1450,6 @@ public async Task ChangePhoneNumberWithCustomProvider()
         /// </summary>
         /// <returns>Task</returns>
         [Fact]
-        [QuarantinedTest]
         public async Task ChangePhoneNumberFailsWithWrongPhoneNumber()
         {
             var manager = CreateManager();
@@ -1471,7 +1470,6 @@ public async Task ChangePhoneNumberFailsWithWrongPhoneNumber()
         /// </summary>
         /// <returns>Task</returns>
         [Fact]
-        [QuarantinedTest]
         public async Task CanVerifyPhoneNumber()
         {
             var manager = CreateManager();
@@ -1519,7 +1517,6 @@ public async Task CanChangeEmail()
         /// </summary>
         /// <returns>Task</returns>
         [Fact]
-        [QuarantinedTest]
         public async Task CanChangeEmailOnlyIfEmailSame()
         {
             var manager = CreateManager();

src/Hosting/Hosting/src/Microsoft.AspNetCore.Hosting.csproj

@@ -18,9 +18,9 @@
   "author": "Microsoft",
   "license": "Apache-2.0",
   "bugs": {
-    "url": "https://github.com/dotnet/extensions/issues"
+    "url": "https://github.com/dotnet/aspnetcore/issues"
   },
-  "homepage": "https://github.com/dotnet/extensions/tree/master/src/JSInterop#readme",
+  "homepage": "https://github.com/dotnet/aspnetcore/tree/master/src/JSInterop",
   "files": [
     "dist/**"
   ],

src/Identity/Specification.Tests/src/UserManagerSpecificationTests.cs

@@ -27,7 +27,7 @@ internal static class SpaProxy
 
         // Don't forward User-Agent/Accept because of https://github.com/aspnet/JavaScriptServices/issues/1469
         // Others just aren't applicable in proxy scenarios
-        private static readonly string[] NotForwardedWebSocketHeaders = new[] { "Accept", "Connection", "Host", "User-Agent", "Upgrade", "Sec-WebSocket-Key", "Sec-WebSocket-Version" };
+        private static readonly string[] NotForwardedWebSocketHeaders = new[] { "Accept", "Connection", "Host", "User-Agent", "Upgrade", "Sec-WebSocket-Key", "Sec-WebSocket-Protocol", "Sec-WebSocket-Version" };
 
         public static HttpClient CreateHttpClientForProxy(TimeSpan requestTimeout)
         {
@@ -209,6 +209,10 @@ private static async Task<bool> AcceptProxyWebSocketRequest(HttpContext context,
 
             using (var client = new ClientWebSocket())
             {
+                foreach (var protocol in context.WebSockets.WebSocketRequestedProtocols)
+                {
+                    client.Options.AddSubProtocol(protocol);
+                }
                 foreach (var headerEntry in context.Request.Headers)
                 {
                     if (!NotForwardedWebSocketHeaders.Contains(headerEntry.Key, StringComparer.OrdinalIgnoreCase))

src/JSInterop/Microsoft.JSInterop.JS/src/package.json

@@ -2,6 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>$(DefaultNetCoreTargetFramework)</TargetFrameworks>
+    <Nullable>annotations</Nullable>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
     <Compile Include="Microsoft.AspNetCore.Mvc.Abstractions.netcoreapp.cs" />