merge (#4)

merge Co-authored-by: Brennan <brecon@microsoft.com> Co-authored-by: dotnet bot <dotnet-bot@microsoft.com> Co-authored-by: Nate McMaster <natemcmaster@users.noreply.github.com> Co-authored-by: dotnet-maestro <@dotnet-maestro> Co-authored-by: Matt Mitchell <mmitche@microsoft.com> Co-authored-by: John Luo <johluo@microsoft.com> Co-authored-by: Mikael Mengistu <mikaelm12@users.noreply.github.com>
2019-06-05 16:45:00 -04:00 · 2019-06-05 16:45:00 -04:00 · 99a0e98464
parent 887872dac0 61e689471f
commit 99a0e98464
17 changed files with 335 additions and 320 deletions
--- a/eng/Baseline.Designer.props
+++ b/eng/Baseline.Designer.props
@ -2,7 +2,7 @@
 <Project>
  <PropertyGroup>
    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <AspNetCoreBaselineVersion>2.2.4</AspNetCoreBaselineVersion>
+    <AspNetCoreBaselineVersion>2.2.5</AspNetCoreBaselineVersion>
  </PropertyGroup>
  <!-- Package: dotnet-dev-certs-->
  <PropertyGroup Condition=" '$(PackageId)' == 'dotnet-dev-certs' ">
@ -77,11 +77,12 @@
  </ItemGroup>
  <!-- Package: Microsoft.AspNetCore.AspNetCoreModule-->
  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AspNetCoreModule' ">
-    <BaselinePackageVersion>2.2.1</BaselinePackageVersion>
+    <BaselinePackageVersion>2.2.5</BaselinePackageVersion>
  </PropertyGroup>
  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AspNetCoreModule' AND '$(TargetFramework)' == 'netcoreapp2.2' " />
  <!-- Package: Microsoft.AspNetCore.AspNetCoreModuleV2-->
  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AspNetCoreModuleV2' ">
-    <BaselinePackageVersion>2.2.4</BaselinePackageVersion>
+    <BaselinePackageVersion>2.2.5</BaselinePackageVersion>
  </PropertyGroup>
  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AspNetCoreModuleV2' AND '$(TargetFramework)' == 'netcoreapp2.2' " />
  <!-- Package: Microsoft.AspNetCore.Authentication.Abstractions-->
@ -221,27 +222,27 @@
  </ItemGroup>
  <!-- Package: Microsoft.AspNetCore.AzureAppServices.HostingStartup-->
  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AzureAppServices.HostingStartup' ">
-    <BaselinePackageVersion>2.2.2</BaselinePackageVersion>
+    <BaselinePackageVersion>2.2.5</BaselinePackageVersion>
  </PropertyGroup>
  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AzureAppServices.HostingStartup' AND '$(TargetFramework)' == 'net461' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="[2.2.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="[2.2.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[2.2.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[2.2.4, )" />
  </ItemGroup>
  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AzureAppServices.HostingStartup' AND '$(TargetFramework)' == 'netcoreapp2.0' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="[2.2.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="[2.2.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[2.2.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[2.2.4, )" />
  </ItemGroup>
  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AzureAppServices.HostingStartup' AND '$(TargetFramework)' == 'netcoreapp2.1' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="[2.2.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="[2.2.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[2.2.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[2.2.4, )" />
  </ItemGroup>
  <!-- Package: Microsoft.AspNetCore.AzureAppServicesIntegration-->
  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AzureAppServicesIntegration' ">
-    <BaselinePackageVersion>2.2.2</BaselinePackageVersion>
+    <BaselinePackageVersion>2.2.5</BaselinePackageVersion>
  </PropertyGroup>
  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AzureAppServicesIntegration' AND '$(TargetFramework)' == 'netstandard2.0' ">
    <BaselinePackageReference Include="Microsoft.AspNetCore.Hosting" Version="[2.2.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="[2.2.0, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="[2.2.5, )" />
  </ItemGroup>
  <!-- Package: Microsoft.AspNetCore.Connections.Abstractions-->
  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Connections.Abstractions' ">
@ -326,11 +327,11 @@
  </ItemGroup>
  <!-- Package: Microsoft.AspNetCore.DataProtection.StackExchangeRedis-->
  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection.StackExchangeRedis' ">
-    <BaselinePackageVersion>2.2.0</BaselinePackageVersion>
+    <BaselinePackageVersion>2.2.5</BaselinePackageVersion>
  </PropertyGroup>
  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection.StackExchangeRedis' AND '$(TargetFramework)' == 'netstandard2.0' ">
    <BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection" Version="[2.2.0, )" />
-    <BaselinePackageReference Include="StackExchange.Redis" Version="[2.0.513, )" />
+    <BaselinePackageReference Include="StackExchange.Redis" Version="[2.0.593, )" />
  </ItemGroup>
  <!-- Package: Microsoft.AspNetCore.DataProtection.SystemWeb-->
  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection.SystemWeb' ">
@ -581,14 +582,14 @@
  </ItemGroup>
  <!-- Package: Microsoft.AspNetCore.Identity.UI-->
  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity.UI' ">
-    <BaselinePackageVersion>2.2.0</BaselinePackageVersion>
+    <BaselinePackageVersion>2.2.5</BaselinePackageVersion>
  </PropertyGroup>
  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity.UI' AND '$(TargetFramework)' == 'netstandard2.0' ">
    <BaselinePackageReference Include="Microsoft.AspNetCore.Identity" Version="[2.2.0, )" />
    <BaselinePackageReference Include="Microsoft.Extensions.Identity.Stores" Version="[2.2.0, )" />
    <BaselinePackageReference Include="Microsoft.AspNetCore.Mvc" Version="[2.2.0, )" />
    <BaselinePackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="[2.2.0, )" />
    <BaselinePackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="[2.2.0, )" />
    <BaselinePackageReference Include="Microsoft.Extensions.Identity.Stores" Version="[2.2.0, )" />
  </ItemGroup>
  <!-- Package: Microsoft.AspNetCore.Identity-->
  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity' ">
@ -657,7 +658,7 @@
  </ItemGroup>
  <!-- Package: Microsoft.AspNetCore.Mvc.Core-->
  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.Core' ">
-    <BaselinePackageVersion>2.2.2</BaselinePackageVersion>
+    <BaselinePackageVersion>2.2.5</BaselinePackageVersion>
  </PropertyGroup>
  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.Core' AND '$(TargetFramework)' == 'netstandard2.0' ">
    <BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.Core" Version="[2.2.0, )" />
@ -755,7 +756,7 @@
  </ItemGroup>
  <!-- Package: Microsoft.AspNetCore.Mvc.RazorPages-->
  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.RazorPages' ">
-    <BaselinePackageVersion>2.2.0</BaselinePackageVersion>
+    <BaselinePackageVersion>2.2.5</BaselinePackageVersion>
  </PropertyGroup>
  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.RazorPages' AND '$(TargetFramework)' == 'netstandard2.0' ">
    <BaselinePackageReference Include="Microsoft.AspNetCore.Mvc.Razor" Version="[2.2.0, )" />
@ -1127,19 +1128,19 @@
  </ItemGroup>
  <!-- Package: Microsoft.AspNetCore.SignalR.Protocols.MessagePack-->
  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Protocols.MessagePack' ">
-    <BaselinePackageVersion>1.1.0</BaselinePackageVersion>
+    <BaselinePackageVersion>1.1.5</BaselinePackageVersion>
  </PropertyGroup>
  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Protocols.MessagePack' AND '$(TargetFramework)' == 'netstandard2.0' ">
    <BaselinePackageReference Include="MessagePack" Version="[1.7.3.7, )" />
    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[1.1.0, )" />
    <BaselinePackageReference Include="MessagePack" Version="[1.7.3.4, )" />
  </ItemGroup>
  <!-- Package: Microsoft.AspNetCore.SignalR.Redis-->
  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Redis' ">
-    <BaselinePackageVersion>1.1.0</BaselinePackageVersion>
+    <BaselinePackageVersion>1.1.5</BaselinePackageVersion>
  </PropertyGroup>
  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Redis' AND '$(TargetFramework)' == 'netstandard2.0' ">
    <BaselinePackageReference Include="MessagePack" Version="[1.7.3.7, )" />
    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Core" Version="[1.1.0, )" />
    <BaselinePackageReference Include="MessagePack" Version="[1.7.3.4, )" />
    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.2.0, )" />
    <BaselinePackageReference Include="StackExchange.Redis.StrongName" Version="[1.2.6, )" />
  </ItemGroup>
@ -1163,13 +1164,13 @@
  </ItemGroup>
  <!-- Package: Microsoft.AspNetCore.SignalR.StackExchangeRedis-->
  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.StackExchangeRedis' ">
-    <BaselinePackageVersion>1.1.0</BaselinePackageVersion>
+    <BaselinePackageVersion>1.1.5</BaselinePackageVersion>
  </PropertyGroup>
  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.StackExchangeRedis' AND '$(TargetFramework)' == 'netstandard2.0' ">
    <BaselinePackageReference Include="MessagePack" Version="[1.7.3.7, )" />
    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Core" Version="[1.1.0, )" />
    <BaselinePackageReference Include="MessagePack" Version="[1.7.3.4, )" />
    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.2.0, )" />
-    <BaselinePackageReference Include="StackExchange.Redis" Version="[2.0.513, )" />
+    <BaselinePackageReference Include="StackExchange.Redis" Version="[2.0.593, )" />
  </ItemGroup>
  <!-- Package: Microsoft.AspNetCore.SignalR-->
  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR' ">
--- a/eng/Baseline.xml
+++ b/eng/Baseline.xml
@ -1,10 +1,10 @@
-<!--
+<!--
 This file contains a list of all the packages and their versions which were released in the last servicing
 build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch.
 -->
-<Baseline Version="2.2.4">
+<Baseline Version="2.2.5">
  <Package Id="dotnet-dev-certs" Version="2.2.0" />
  <Package Id="dotnet-sql-cache" Version="2.2.0" />
  <Package Id="dotnet-user-secrets" Version="2.2.0" />
@ -12,8 +12,8 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch.
  <Package Id="Microsoft.AspNetCore.Antiforgery" Version="2.2.0" />
  <Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="2.2.0-preview-35687" />
  <Package Id="Microsoft.AspNetCore.ApplicationInsights.HostingStartup" Version="2.2.0" />
-  <Package Id="Microsoft.AspNetCore.AspNetCoreModule" Version="2.2.1" />
+  <Package Id="Microsoft.AspNetCore.AspNetCoreModule" Version="2.2.5" />
-  <Package Id="Microsoft.AspNetCore.AspNetCoreModuleV2" Version="2.2.4" />
+  <Package Id="Microsoft.AspNetCore.AspNetCoreModuleV2" Version="2.2.5" />
  <Package Id="Microsoft.AspNetCore.Authentication.Abstractions" Version="2.2.0" />
  <Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="2.2.0" />
  <Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="2.2.0" />
@ -30,8 +30,8 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch.
  <Package Id="Microsoft.AspNetCore.Authentication" Version="2.2.0" />
  <Package Id="Microsoft.AspNetCore.Authorization.Policy" Version="2.2.0" />
  <Package Id="Microsoft.AspNetCore.Authorization" Version="2.2.0" />
-  <Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="2.2.2" />
+  <Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="2.2.5" />
-  <Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="2.2.2" />
+  <Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="2.2.5" />
  <Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="2.2.0" />
  <Package Id="Microsoft.AspNetCore.CookiePolicy" Version="2.2.0" />
  <Package Id="Microsoft.AspNetCore.Cors" Version="2.2.0" />
@ -42,7 +42,7 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch.
  <Package Id="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="2.2.0" />
  <Package Id="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="2.2.0" />
  <Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="2.2.0" />
-  <Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="2.2.0" />
+  <Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="2.2.5" />
  <Package Id="Microsoft.AspNetCore.DataProtection.SystemWeb" Version="2.2.0" />
  <Package Id="Microsoft.AspNetCore.DataProtection" Version="2.2.0" />
  <Package Id="Microsoft.AspNetCore.Diagnostics.Abstractions" Version="2.2.0" />
@ -66,7 +66,7 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch.
  <Package Id="Microsoft.AspNetCore.HttpsPolicy" Version="2.2.0" />
  <Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="2.2.0" />
  <Package Id="Microsoft.AspNetCore.Identity.Specification.Tests" Version="2.2.0" />
-  <Package Id="Microsoft.AspNetCore.Identity.UI" Version="2.2.0" />
+  <Package Id="Microsoft.AspNetCore.Identity.UI" Version="2.2.5" />
  <Package Id="Microsoft.AspNetCore.Identity" Version="2.2.0" />
  <Package Id="Microsoft.AspNetCore.JsonPatch" Version="2.2.0" />
  <Package Id="Microsoft.AspNetCore.Localization.Routing" Version="2.2.0" />
@ -75,7 +75,7 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch.
  <Package Id="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.2.0" />
  <Package Id="Microsoft.AspNetCore.Mvc.Analyzers" Version="2.2.0" />
  <Package Id="Microsoft.AspNetCore.Mvc.ApiExplorer" Version="2.2.0" />
-  <Package Id="Microsoft.AspNetCore.Mvc.Core" Version="2.2.2" />
+  <Package Id="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
  <Package Id="Microsoft.AspNetCore.Mvc.Cors" Version="2.2.0" />
  <Package Id="Microsoft.AspNetCore.Mvc.DataAnnotations" Version="2.2.0" />
  <Package Id="Microsoft.AspNetCore.Mvc.Formatters.Json" Version="2.2.0" />
@ -83,7 +83,7 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch.
  <Package Id="Microsoft.AspNetCore.Mvc.Localization" Version="2.2.0" />
  <Package Id="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="2.2.0" />
  <Package Id="Microsoft.AspNetCore.Mvc.Razor" Version="2.2.0" />
-  <Package Id="Microsoft.AspNetCore.Mvc.RazorPages" Version="2.2.0" />
+  <Package Id="Microsoft.AspNetCore.Mvc.RazorPages" Version="2.2.5" />
  <Package Id="Microsoft.AspNetCore.Mvc.TagHelpers" Version="2.2.0" />
  <Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="2.2.0" />
  <Package Id="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="2.2.0" />
@ -115,10 +115,10 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch.
  <Package Id="Microsoft.AspNetCore.SignalR.Common" Version="1.1.0" />
  <Package Id="Microsoft.AspNetCore.SignalR.Core" Version="1.1.0" />
  <Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="1.1.0" />
-  <Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="1.1.0" />
+  <Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="1.1.5" />
-  <Package Id="Microsoft.AspNetCore.SignalR.Redis" Version="1.1.0" />
+  <Package Id="Microsoft.AspNetCore.SignalR.Redis" Version="1.1.5" />
  <Package Id="Microsoft.AspNetCore.SignalR.Specification.Tests" Version="1.1.0" />
-  <Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="1.1.0" />
+  <Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="1.1.5" />
  <Package Id="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
  <Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="2.2.0" />
  <Package Id="Microsoft.AspNetCore.SpaServices" Version="2.2.0" />
--- a/eng/PatchConfig.props
+++ b/eng/PatchConfig.props
@ -61,5 +61,4 @@ Later on, this will be checked using this condition:
      Microsoft.AspNetCore.Mvc.Api.Analyzers;
    </PackagesInPatch>
  </PropertyGroup>
 </Project>
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@ -57,241 +57,241 @@
      <Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
      <Sha>b9c9b57de1ba41f75427db0a51b2e897d0354656</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Analyzer.Testing" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.AspNetCore.Analyzer.Testing" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.ActivatorUtilities.Sources" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.ActivatorUtilities.Sources" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.SqlServer" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Caching.SqlServer" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.CommandLineUtils.Sources" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.CommandLineUtils.Sources" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.AzureKeyVault" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Configuration.AzureKeyVault" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.CommandLine" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Configuration.CommandLine" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.FileExtensions" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Configuration.FileExtensions" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.KeyPerFile" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Configuration.KeyPerFile" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.UserSecrets" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Configuration.UserSecrets" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Xml" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Configuration.Xml" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Configuration" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.DiagnosticAdapter" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.DiagnosticAdapter" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileProviders.Composite" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.FileProviders.Composite" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileProviders.Physical" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.FileProviders.Physical" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.HashCodeCombiner.Sources" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.HashCodeCombiner.Sources" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.Hosting" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Hosting" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.Http" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Http" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.Localization.Abstractions" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Localization.Abstractions" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.Localization" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Localization" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.AzureAppServices" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Logging.AzureAppServices" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Console" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Logging.Console" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Debug" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Logging.Debug" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.EventSource" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Logging.EventSource" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.EventLog" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Logging.EventLog" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.TraceSource" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Logging.TraceSource" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Testing" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Logging.Testing" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Logging" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.ObjectPool" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.ObjectPool" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.Options.DataAnnotations" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Options.DataAnnotations" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.Options" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Options" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.ParameterDefaultValue.Sources" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.ParameterDefaultValue.Sources" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.Primitives" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Primitives" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.TypeNameHelper.Sources" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.TypeNameHelper.Sources" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.ValueStopwatch.Sources" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.ValueStopwatch.Sources" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.WebEncoders" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.WebEncoders" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Internal.Extensions.Refs" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Internal.Extensions.Refs" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.JSInterop" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.JSInterop" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
-    <Dependency Name="Mono.WebAssembly.Interop" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Mono.WebAssembly.Interop" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
    <Dependency Name="Microsoft.CSharp" Version="4.6.0-preview6.19303.8" CoherentParentDependency="Microsoft.NETCore.App">
      <Uri>https://github.com/dotnet/corefx</Uri>
@ -369,17 +369,17 @@
      <Uri>https://github.com/dotnet/corefx</Uri>
      <Sha>d47cae744ddfb625db8e391cecb261e4c3d7bb1c</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyModel" Version="3.0.0-preview6-27803-13" CoherentParentDependency="Microsoft.Extensions.Logging">
+    <Dependency Name="Microsoft.Extensions.DependencyModel" Version="3.0.0-preview6-27804-01" CoherentParentDependency="Microsoft.Extensions.Logging">
      <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>372355272004e08c035c61077f5d6ca4d8f9cd22</Sha>
+      <Sha>fdf81c6faf7c7e0463d191a3a1d36c25c201e5cb</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview6-27803-13" CoherentParentDependency="Microsoft.Extensions.Logging">
+    <Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview6-27804-01" CoherentParentDependency="Microsoft.Extensions.Logging">
      <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>372355272004e08c035c61077f5d6ca4d8f9cd22</Sha>
+      <Sha>fdf81c6faf7c7e0463d191a3a1d36c25c201e5cb</Sha>
    </Dependency>
-    <Dependency Name="NETStandard.Library.Ref" Version="2.1.0-preview6-27803-13" CoherentParentDependency="Microsoft.Extensions.Logging">
+    <Dependency Name="NETStandard.Library.Ref" Version="2.1.0-preview6-27804-01" CoherentParentDependency="Microsoft.Extensions.Logging">
      <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>372355272004e08c035c61077f5d6ca4d8f9cd22</Sha>
+      <Sha>fdf81c6faf7c7e0463d191a3a1d36c25c201e5cb</Sha>
    </Dependency>
  </ProductDependencies>
  <ToolsetDependencies>
@ -388,9 +388,9 @@
      <Uri>https://github.com/dotnet/corefx</Uri>
      <Sha>d47cae744ddfb625db8e391cecb261e4c3d7bb1c</Sha>
    </Dependency>
-    <Dependency Name="Internal.AspNetCore.Analyzers" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Internal.AspNetCore.Analyzers" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
    <Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19302.2">
      <Uri>https://github.com/dotnet/arcade</Uri>
@ -404,9 +404,9 @@
      <Uri>https://github.com/dotnet/arcade</Uri>
      <Sha>e6a5d5f970bb872451c6310ae34eda31041fb552</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Testing" Version="3.0.0-preview6.19304.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.AspNetCore.Testing" Version="3.0.0-preview6.19304.6" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>04a5ac947976fc17e701ffd4cd406b589e14b1e5</Sha>
+      <Sha>54d51a340698b6883dd3e47be372c07e0acf75bc</Sha>
    </Dependency>
  </ToolsetDependencies>
 </Dependencies>
--- a/eng/Versions.props
+++ b/eng/Versions.props
@ -23,9 +23,9 @@
    <!-- Packages from dotnet/arcade -->
    <MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19302.2</MicrosoftDotNetGenAPIPackageVersion>
    <!-- Packages from dotnet/core-setup -->
-    <MicrosoftExtensionsDependencyModelPackageVersion>3.0.0-preview6-27803-13</MicrosoftExtensionsDependencyModelPackageVersion>
+    <MicrosoftExtensionsDependencyModelPackageVersion>3.0.0-preview6-27804-01</MicrosoftExtensionsDependencyModelPackageVersion>
-    <MicrosoftNETCoreAppPackageVersion>3.0.0-preview6-27803-13</MicrosoftNETCoreAppPackageVersion>
+    <MicrosoftNETCoreAppPackageVersion>3.0.0-preview6-27804-01</MicrosoftNETCoreAppPackageVersion>
-    <NETStandardLibraryRefPackageVersion>2.1.0-preview6-27803-13</NETStandardLibraryRefPackageVersion>
+    <NETStandardLibraryRefPackageVersion>2.1.0-preview6-27804-01</NETStandardLibraryRefPackageVersion>
    <!-- Packages from dotnet/corefx -->
    <MicrosoftCSharpPackageVersion>4.6.0-preview6.19303.8</MicrosoftCSharpPackageVersion>
    <MicrosoftWin32RegistryPackageVersion>4.6.0-preview6.19303.8</MicrosoftWin32RegistryPackageVersion>
@ -51,67 +51,67 @@
    <!-- Packages from aspnet/Blazor -->
    <MicrosoftAspNetCoreBlazorMonoPackageVersion>0.10.0-preview7.19303.2</MicrosoftAspNetCoreBlazorMonoPackageVersion>
    <!-- Packages from aspnet/Extensions -->
-    <InternalAspNetCoreAnalyzersPackageVersion>3.0.0-preview6.19304.2</InternalAspNetCoreAnalyzersPackageVersion>
+    <InternalAspNetCoreAnalyzersPackageVersion>3.0.0-preview6.19304.6</InternalAspNetCoreAnalyzersPackageVersion>
-    <MicrosoftAspNetCoreAnalyzerTestingPackageVersion>3.0.0-preview6.19304.2</MicrosoftAspNetCoreAnalyzerTestingPackageVersion>
+    <MicrosoftAspNetCoreAnalyzerTestingPackageVersion>3.0.0-preview6.19304.6</MicrosoftAspNetCoreAnalyzerTestingPackageVersion>
-    <MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.0.0-preview6.19304.2</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
+    <MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.0.0-preview6.19304.6</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
-    <MicrosoftAspNetCoreTestingPackageVersion>3.0.0-preview6.19304.2</MicrosoftAspNetCoreTestingPackageVersion>
+    <MicrosoftAspNetCoreTestingPackageVersion>3.0.0-preview6.19304.6</MicrosoftAspNetCoreTestingPackageVersion>
-    <MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion>
+    <MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion>
-    <MicrosoftExtensionsCachingAbstractionsPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsCachingAbstractionsPackageVersion>
+    <MicrosoftExtensionsCachingAbstractionsPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsCachingAbstractionsPackageVersion>
-    <MicrosoftExtensionsCachingMemoryPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsCachingMemoryPackageVersion>
+    <MicrosoftExtensionsCachingMemoryPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsCachingMemoryPackageVersion>
-    <MicrosoftExtensionsCachingSqlServerPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsCachingSqlServerPackageVersion>
+    <MicrosoftExtensionsCachingSqlServerPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsCachingSqlServerPackageVersion>
-    <MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>
+    <MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>
-    <MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
+    <MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
-    <MicrosoftExtensionsConfigurationAbstractionsPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
+    <MicrosoftExtensionsConfigurationAbstractionsPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
-    <MicrosoftExtensionsConfigurationAzureKeyVaultPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsConfigurationAzureKeyVaultPackageVersion>
+    <MicrosoftExtensionsConfigurationAzureKeyVaultPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsConfigurationAzureKeyVaultPackageVersion>
-    <MicrosoftExtensionsConfigurationBinderPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsConfigurationBinderPackageVersion>
+    <MicrosoftExtensionsConfigurationBinderPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsConfigurationBinderPackageVersion>
-    <MicrosoftExtensionsConfigurationCommandLinePackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
+    <MicrosoftExtensionsConfigurationCommandLinePackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
-    <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
+    <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
-    <MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>
+    <MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>
-    <MicrosoftExtensionsConfigurationIniPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsConfigurationIniPackageVersion>
+    <MicrosoftExtensionsConfigurationIniPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsConfigurationIniPackageVersion>
-    <MicrosoftExtensionsConfigurationJsonPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsConfigurationJsonPackageVersion>
+    <MicrosoftExtensionsConfigurationJsonPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsConfigurationJsonPackageVersion>
-    <MicrosoftExtensionsConfigurationKeyPerFilePackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsConfigurationKeyPerFilePackageVersion>
+    <MicrosoftExtensionsConfigurationKeyPerFilePackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsConfigurationKeyPerFilePackageVersion>
-    <MicrosoftExtensionsConfigurationPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsConfigurationPackageVersion>
+    <MicrosoftExtensionsConfigurationPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsConfigurationPackageVersion>
-    <MicrosoftExtensionsConfigurationUserSecretsPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
+    <MicrosoftExtensionsConfigurationUserSecretsPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
-    <MicrosoftExtensionsConfigurationXmlPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsConfigurationXmlPackageVersion>
+    <MicrosoftExtensionsConfigurationXmlPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsConfigurationXmlPackageVersion>
-    <MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
+    <MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
-    <MicrosoftExtensionsDependencyInjectionPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsDependencyInjectionPackageVersion>
+    <MicrosoftExtensionsDependencyInjectionPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsDependencyInjectionPackageVersion>
-    <MicrosoftExtensionsDiagnosticAdapterPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsDiagnosticAdapterPackageVersion>
+    <MicrosoftExtensionsDiagnosticAdapterPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsDiagnosticAdapterPackageVersion>
-    <MicrosoftExtensionsDiagnosticsHealthChecksAbstractionsPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsDiagnosticsHealthChecksAbstractionsPackageVersion>
+    <MicrosoftExtensionsDiagnosticsHealthChecksAbstractionsPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsDiagnosticsHealthChecksAbstractionsPackageVersion>
-    <MicrosoftExtensionsDiagnosticsHealthChecksPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsDiagnosticsHealthChecksPackageVersion>
+    <MicrosoftExtensionsDiagnosticsHealthChecksPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsDiagnosticsHealthChecksPackageVersion>
-    <MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
+    <MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
-    <MicrosoftExtensionsFileProvidersCompositePackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsFileProvidersCompositePackageVersion>
+    <MicrosoftExtensionsFileProvidersCompositePackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsFileProvidersCompositePackageVersion>
-    <MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>
+    <MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>
-    <MicrosoftExtensionsFileProvidersPhysicalPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
+    <MicrosoftExtensionsFileProvidersPhysicalPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
-    <MicrosoftExtensionsFileSystemGlobbingPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
+    <MicrosoftExtensionsFileSystemGlobbingPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
-    <MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
+    <MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
-    <MicrosoftExtensionsHostingAbstractionsPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsHostingAbstractionsPackageVersion>
+    <MicrosoftExtensionsHostingAbstractionsPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsHostingAbstractionsPackageVersion>
-    <MicrosoftExtensionsHostingPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsHostingPackageVersion>
+    <MicrosoftExtensionsHostingPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsHostingPackageVersion>
-    <MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
+    <MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
-    <MicrosoftExtensionsHttpPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsHttpPackageVersion>
+    <MicrosoftExtensionsHttpPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsHttpPackageVersion>
-    <MicrosoftExtensionsLocalizationAbstractionsPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsLocalizationAbstractionsPackageVersion>
+    <MicrosoftExtensionsLocalizationAbstractionsPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsLocalizationAbstractionsPackageVersion>
-    <MicrosoftExtensionsLocalizationPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsLocalizationPackageVersion>
+    <MicrosoftExtensionsLocalizationPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsLocalizationPackageVersion>
-    <MicrosoftExtensionsLoggingAbstractionsPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
+    <MicrosoftExtensionsLoggingAbstractionsPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
-    <MicrosoftExtensionsLoggingAzureAppServicesPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsLoggingAzureAppServicesPackageVersion>
+    <MicrosoftExtensionsLoggingAzureAppServicesPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsLoggingAzureAppServicesPackageVersion>
-    <MicrosoftExtensionsLoggingConfigurationPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsLoggingConfigurationPackageVersion>
+    <MicrosoftExtensionsLoggingConfigurationPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsLoggingConfigurationPackageVersion>
-    <MicrosoftExtensionsLoggingConsolePackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsLoggingConsolePackageVersion>
+    <MicrosoftExtensionsLoggingConsolePackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsLoggingConsolePackageVersion>
-    <MicrosoftExtensionsLoggingDebugPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsLoggingDebugPackageVersion>
+    <MicrosoftExtensionsLoggingDebugPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsLoggingDebugPackageVersion>
-    <MicrosoftExtensionsLoggingEventSourcePackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsLoggingEventSourcePackageVersion>
+    <MicrosoftExtensionsLoggingEventSourcePackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsLoggingEventSourcePackageVersion>
-    <MicrosoftExtensionsLoggingEventLogPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsLoggingEventLogPackageVersion>
+    <MicrosoftExtensionsLoggingEventLogPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsLoggingEventLogPackageVersion>
-    <MicrosoftExtensionsLoggingPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsLoggingPackageVersion>
+    <MicrosoftExtensionsLoggingPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsLoggingPackageVersion>
-    <MicrosoftExtensionsLoggingTestingPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsLoggingTestingPackageVersion>
+    <MicrosoftExtensionsLoggingTestingPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsLoggingTestingPackageVersion>
-    <MicrosoftExtensionsLoggingTraceSourcePackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsLoggingTraceSourcePackageVersion>
+    <MicrosoftExtensionsLoggingTraceSourcePackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsLoggingTraceSourcePackageVersion>
-    <MicrosoftExtensionsObjectPoolPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsObjectPoolPackageVersion>
+    <MicrosoftExtensionsObjectPoolPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsObjectPoolPackageVersion>
-    <MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>
+    <MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>
-    <MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>
+    <MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>
-    <MicrosoftExtensionsOptionsPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsOptionsPackageVersion>
+    <MicrosoftExtensionsOptionsPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsOptionsPackageVersion>
-    <MicrosoftExtensionsParameterDefaultValueSourcesPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsParameterDefaultValueSourcesPackageVersion>
+    <MicrosoftExtensionsParameterDefaultValueSourcesPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsParameterDefaultValueSourcesPackageVersion>
-    <MicrosoftExtensionsPrimitivesPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsPrimitivesPackageVersion>
+    <MicrosoftExtensionsPrimitivesPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsPrimitivesPackageVersion>
-    <MicrosoftExtensionsTypeNameHelperSourcesPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsTypeNameHelperSourcesPackageVersion>
+    <MicrosoftExtensionsTypeNameHelperSourcesPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsTypeNameHelperSourcesPackageVersion>
-    <MicrosoftExtensionsValueStopwatchSourcesPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsValueStopwatchSourcesPackageVersion>
+    <MicrosoftExtensionsValueStopwatchSourcesPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsValueStopwatchSourcesPackageVersion>
-    <MicrosoftExtensionsWebEncodersPackageVersion>3.0.0-preview6.19304.2</MicrosoftExtensionsWebEncodersPackageVersion>
+    <MicrosoftExtensionsWebEncodersPackageVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsWebEncodersPackageVersion>
-    <MicrosoftInternalExtensionsRefsPackageVersion>3.0.0-preview6.19304.2</MicrosoftInternalExtensionsRefsPackageVersion>
+    <MicrosoftInternalExtensionsRefsPackageVersion>3.0.0-preview6.19304.6</MicrosoftInternalExtensionsRefsPackageVersion>
-    <MicrosoftJSInteropPackageVersion>3.0.0-preview6.19304.2</MicrosoftJSInteropPackageVersion>
+    <MicrosoftJSInteropPackageVersion>3.0.0-preview6.19304.6</MicrosoftJSInteropPackageVersion>
-    <MonoWebAssemblyInteropPackageVersion>3.0.0-preview6.19304.2</MonoWebAssemblyInteropPackageVersion>
+    <MonoWebAssemblyInteropPackageVersion>3.0.0-preview6.19304.6</MonoWebAssemblyInteropPackageVersion>
    <!-- Packages from aspnet/EntityFrameworkCore -->
    <dotnetefPackageVersion>3.0.0-preview7.19303.12</dotnetefPackageVersion>
    <MicrosoftEntityFrameworkCoreInMemoryPackageVersion>3.0.0-preview7.19303.12</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
--- a/eng/targets/Helix.Common.props
+++ b/eng/targets/Helix.Common.props
@ -15,8 +15,7 @@
    <HelixAvailableTargetQueue Include="Windows.81.Amd64.Open" Platform="Windows" />
    <HelixAvailableTargetQueue Include="Windows.7.Amd64.Open" Platform="Windows" />
    <HelixAvailableTargetQueue Include="Windows.10.Amd64.EnterpriseRS3.ASPNET.Open" Platform="Windows" EnableByDefault="false" />
-    <HelixAvailableTargetQueue Include="OSX.1012.Amd64.Open" Platform="OSX" />
+    <HelixAvailableTargetQueue Include="OSX.1013.Amd64.Open" Platform="OSX" />
    <HelixAvailableTargetQueue Include="OSX.1014.Amd64.Open" Platform="OSX" />
    <HelixAvailableTargetQueue Include="Ubuntu.1810.Amd64.Open" Platform="Linux" />
    <HelixAvailableTargetQueue Include="Ubuntu.1604.Amd64.Open" Platform="Linux" />
    <HelixAvailableTargetQueue Include="Centos.7.Amd64.Open" Platform="Linux" />
--- a/eng/tools/BaselineGenerator/Program.cs
+++ b/eng/tools/BaselineGenerator/Program.cs
@ -61,7 +61,11 @@ namespace PackageBaselineGenerator
            var sourceRepository = new SourceRepository(packageSource, providers);
            if (_update.HasValue())
            {
-                return await RunUpdateAsync(inputPath, input, sourceRepository);
+                var updateResult = await RunUpdateAsync(inputPath, input, sourceRepository);
                if (updateResult != 0)
                {
                    return updateResult;
                }
            }
            var feedType = await sourceRepository.GetFeedType(CancellationToken.None);
--- a/eng/tools/BaselineGenerator/README.md
+++ b/eng/tools/BaselineGenerator/README.md
@ -8,8 +8,8 @@ Add `--package-source {source}` to the commands below if the packages of interes
 ### Auto-update
-1. Run `dotnet run --update` in this project folder.
+Run `dotnet run --update` in this project folder. This will attempt to find the latest patch version of packages and
-2. Run `dotnet run` in this project.
+update the baseline file.
 ### Manual update
--- a/src/SignalR/clients/csharp/Client.Core/src/HubConnection.cs
+++ b/src/SignalR/clients/csharp/Client.Core/src/HubConnection.cs
@ -1944,7 +1944,7 @@ namespace Microsoft.AspNetCore.SignalR.Client
            public async Task<ConnectionState> WaitForActiveConnectionAsync(string methodName, [CallerMemberName] string memberName = null, [CallerFilePath] string filePath = null, [CallerLineNumber] int lineNumber = 0)
            {
-                await WaitConnectionLockAsync();
+                await WaitConnectionLockAsync(methodName);
                if (CurrentConnectionStateUnsynchronized == null || CurrentConnectionStateUnsynchronized.Stopping)
                {
--- a/src/SignalR/clients/csharp/Client/test/FunctionalTests/HubConnectionTests.cs
+++ b/src/SignalR/clients/csharp/Client/test/FunctionalTests/HubConnectionTests.cs
@ -1044,8 +1044,8 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests
        }
        [Theory]
-        [MemberData(nameof(HubProtocolsAndTransportsAndHubPaths))]
+        [MemberData(nameof(HubProtocolsList))]
-        public async Task ServerThrowsHubExceptionOnHubMethodArgumentCountMismatch(string hubProtocolName, HttpTransportType transportType, string hubPath)
+        public async Task ServerThrowsHubExceptionOnHubMethodArgumentCountMismatch(string hubProtocolName)
        {
            bool ExpectedErrors(WriteContext writeContext)
            {
@ -1056,7 +1056,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests
            var hubProtocol = HubProtocols[hubProtocolName];
            using (StartServer<Startup>(out var server, ExpectedErrors))
            {
-                var connection = CreateHubConnection(server.Url, hubPath, transportType, hubProtocol, LoggerFactory);
+                var connection = CreateHubConnection(server.Url, "/default", HttpTransportType.LongPolling, hubProtocol, LoggerFactory);
                try
                {
                    await connection.StartAsync().OrTimeout();
@ -1076,7 +1076,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests
            }
        }
-        [Theory(Skip = "Will be fixed by https://github.com/dotnet/corefx/issues/36901")]
+        [Theory]
        [MemberData(nameof(HubProtocolsAndTransportsAndHubPaths))]
        public async Task ServerThrowsHubExceptionOnHubMethodArgumentTypeMismatch(string hubProtocolName, HttpTransportType transportType, string hubPath)
        {
@ -1873,6 +1873,17 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests
            }
        }
        public static IEnumerable<object[]> HubProtocolsList
        {
            get
            {
                foreach (var protocol in HubProtocols)
                {
                    yield return new object[] { protocol.Key };
                }
            }
        }
        // This list excludes "special" hub paths like "default-nowebsockets" which exist for specific tests.
        public static string[] HubPaths = new[] { "/default", "/dynamic", "/hubT" };
--- a/src/SignalR/clients/ts/FunctionalTests/ComplexObject.cs
+++ b/src/SignalR/clients/ts/FunctionalTests/ComplexObject.cs
@ -10,6 +10,7 @@ namespace FunctionalTests
        public string String { get; set; }
        public int[] IntArray { get; set; }
        public byte[] ByteArray { get; set; }
        public Guid Guid { get; set; }
        public DateTime DateTime { get;set; }
    }
 }
--- a/src/SignalR/clients/ts/FunctionalTests/TestHub.cs
+++ b/src/SignalR/clients/ts/FunctionalTests/TestHub.cs
@ -125,6 +125,7 @@ namespace FunctionalTests
            {
                ByteArray = new byte[] { 0x1, 0x2, 0x3 },
                DateTime = new DateTime(2000, 1, 1, 0, 0, 0, DateTimeKind.Utc),
                Guid = new Guid("00010203-0405-0607-0706-050403020100"),
                IntArray = new int[] { 1, 2, 3 },
                String = "hello world",
            };
--- a/src/SignalR/clients/ts/FunctionalTests/ts/HubConnectionTests.ts
+++ b/src/SignalR/clients/ts/FunctionalTests/ts/HubConnectionTests.ts
@ -462,6 +462,7 @@ describe("hubConnection", () => {
                    DateTime: protocol.name === "json"
                        ? "2002-04-01T10:20:15Z"
                        : new Date(Date.UTC(2002, 3, 1, 10, 20, 15)), // Apr 1, 2002, 10:20:15am UTC
                    Guid: "00010203-0405-0607-0706-050403020100",
                    IntArray: [0x01, 0x02, 0x03, 0xff],
                    String: "Hello, World!",
                };
@ -504,6 +505,7 @@ describe("hubConnection", () => {
                    DateTime: protocol.name === "json"
                        ? "2000-01-01T00:00:00Z"
                        : new Date(Date.UTC(2000, 0, 1)),
                    Guid: "00010203-0405-0607-0706-050403020100",
                    IntArray: [0x01, 0x02, 0x03],
                    String: "hello world",
                };
--- a/src/SignalR/common/Protocols.Json/src/Microsoft.AspNetCore.SignalR.Protocols.Json.csproj
+++ b/src/SignalR/common/Protocols.Json/src/Microsoft.AspNetCore.SignalR.Protocols.Json.csproj
@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <Description>Implements the SignalR Hub Protocol using System.Text.Json.</Description>
--- a/src/SignalR/common/Protocols.Json/src/Protocol/JsonHubProtocol.cs
+++ b/src/SignalR/common/Protocols.Json/src/Protocol/JsonHubProtocol.cs
@ -124,9 +124,12 @@ namespace Microsoft.AspNetCore.SignalR.Protocol
                var hasArguments = false;
                object[] arguments = null;
                string[] streamIds = null;
-                JsonDocument argumentsToken = null;
+                bool hasArgumentsToken = false;
-                JsonDocument itemsToken = null;
+                Utf8JsonReader argumentsToken = default;
-                JsonDocument resultToken = null;
+                bool hasItemsToken = false;
                Utf8JsonReader itemsToken = default;
                bool hasResultToken = false;
                Utf8JsonReader resultToken = default;
                ExceptionDispatchInfo argumentBindingException = null;
                Dictionary<string, string> headers = null;
                var completed = false;
@ -192,15 +195,16 @@ namespace Microsoft.AspNetCore.SignalR.Protocol
                                if (string.IsNullOrEmpty(invocationId))
                                {
-                                    // If we don't have an invocation id then we need to store it as a JsonDocument so we can parse it later
+                                    // If we don't have an invocation id then we need to value copy the reader so we can parse it later
-                                    resultToken = JsonDocument.ParseValue(ref reader);
+                                    hasResultToken = true;
                                    resultToken = reader;
                                    reader.Skip();
                                }
                                else
                                {
                                    // If we have an invocation id already we can parse the end result
                                    var returnType = binder.GetReturnType(invocationId);
-                                    using var token = JsonDocument.ParseValue(ref reader);
+                                    result = BindType(ref reader, returnType);
                                    result = BindType(token.RootElement, returnType);
                                }
                            }
                            else if (reader.TextEquals(ItemPropertyNameBytes.EncodedUtf8Bytes))
@ -216,16 +220,17 @@ namespace Microsoft.AspNetCore.SignalR.Protocol
                                }
                                else
                                {
-                                    // If we don't have an id yet then we need to store it as a JsonDocument to parse later
+                                    // If we don't have an id yet then we need to value copy the reader so we can parse it later
-                                    itemsToken = JsonDocument.ParseValue(ref reader);
+                                    hasItemsToken = true;
                                    itemsToken = reader;
                                    reader.Skip();
                                    continue;
                                }
                                try
                                {
                                    var itemType = binder.GetStreamItemType(id);
-                                    using var token = JsonDocument.ParseValue(ref reader);
+                                    item = BindType(ref reader, itemType);
                                    item = BindType(token.RootElement, itemType);
                                }
                                catch (Exception ex)
                                {
@ -246,16 +251,17 @@ namespace Microsoft.AspNetCore.SignalR.Protocol
                                if (string.IsNullOrEmpty(target))
                                {
-                                    // We don't know the method name yet so just store the array in JsonDocument
+                                    // We don't know the method name yet so just value copy the reader so we can parse it later
-                                    argumentsToken = JsonDocument.ParseValue(ref reader);
+                                    hasArgumentsToken = true;
                                    argumentsToken = reader;
                                    reader.Skip();
                                }
                                else
                                {
                                    try
                                    {
                                        var paramTypes = binder.GetParameterTypes(target);
-                                        using var token = JsonDocument.ParseValue(ref reader);
+                                        arguments = BindTypes(ref reader, paramTypes);
                                        arguments = BindTypes(token.RootElement, paramTypes);
                                    }
                                    catch (Exception ex)
                                    {
@ -295,22 +301,18 @@ namespace Microsoft.AspNetCore.SignalR.Protocol
                {
                    case HubProtocolConstants.InvocationMessageType:
                        {
-                            if (argumentsToken != null)
+                            if (hasArgumentsToken)
                            {
                                // We weren't able to bind the arguments because they came before the 'target', so try to bind now that we've read everything.
                                try
                                {
                                    var paramTypes = binder.GetParameterTypes(target);
-                                    arguments = BindTypes(argumentsToken.RootElement, paramTypes);
+                                    arguments = BindTypes(ref argumentsToken, paramTypes);
                                }
                                catch (Exception ex)
                                {
                                    argumentBindingException = ExceptionDispatchInfo.Capture(ex);
                                }
                                finally
                                {
                                    argumentsToken.Dispose();
                                }
                            }
                            message = argumentBindingException != null
@ -320,22 +322,18 @@ namespace Microsoft.AspNetCore.SignalR.Protocol
                        break;
                    case HubProtocolConstants.StreamInvocationMessageType:
                        {
-                            if (argumentsToken != null)
+                            if (hasArgumentsToken)
                            {
                                // We weren't able to bind the arguments because they came before the 'target', so try to bind now that we've read everything.
                                try
                                {
                                    var paramTypes = binder.GetParameterTypes(target);
-                                    arguments = BindTypes(argumentsToken.RootElement, paramTypes);
+                                    arguments = BindTypes(ref argumentsToken, paramTypes);
                                }
                                catch (Exception ex)
                                {
                                    argumentBindingException = ExceptionDispatchInfo.Capture(ex);
                                }
                                finally
                                {
                                    argumentsToken.Dispose();
                                }
                            }
                            message = argumentBindingException != null
@ -344,38 +342,27 @@ namespace Microsoft.AspNetCore.SignalR.Protocol
                        }
                        break;
                    case HubProtocolConstants.StreamItemMessageType:
-                        if (itemsToken != null)
+                        if (hasItemsToken)
                        {
                            try
                            {
                                var returnType = binder.GetStreamItemType(invocationId);
-                                item = BindType(itemsToken.RootElement, returnType);
+                                item = BindType(ref itemsToken, returnType);
                            }
                            catch (JsonException ex)
                            {
                                message = new StreamBindingFailureMessage(invocationId, ExceptionDispatchInfo.Capture(ex));
                                break;
                            }
                            finally
                            {
                                itemsToken.Dispose();
                            }
                        }
                        message = BindStreamItemMessage(invocationId, item, hasItem, binder);
                        break;
                    case HubProtocolConstants.CompletionMessageType:
-                        if (resultToken != null)
+                        if (hasResultToken)
                        {
-                            try
+                            var returnType = binder.GetReturnType(invocationId);
-                            {
+                            result = BindType(ref resultToken, returnType);
                                var returnType = binder.GetReturnType(invocationId);
                                result = BindType(resultToken.RootElement, returnType);
                            }
                            finally
                            {
                                resultToken.Dispose();
                            }
                        }
                        message = BindCompletionMessage(invocationId, error, result, hasResult, binder);
@ -698,48 +685,47 @@ namespace Microsoft.AspNetCore.SignalR.Protocol
            return new InvocationMessage(invocationId, target, arguments, streamIds);
        }
-        private object BindType(JsonElement jsonObject, Type type)
+        private object BindType(ref Utf8JsonReader reader, Type type)
        {
-            if (type == typeof(DateTime))
+            return JsonSerializer.ReadValue(ref reader, type, _payloadSerializerOptions);
            {
                return jsonObject.GetDateTime();
            }
            else if (type == typeof(DateTimeOffset))
            {
                return jsonObject.GetDateTimeOffset();
            }
            return JsonSerializer.Parse(jsonObject.GetRawText(), type, _payloadSerializerOptions);
        }
-        private object[] BindTypes(JsonElement jsonArray, IReadOnlyList<Type> paramTypes)
+        private object[] BindTypes(ref Utf8JsonReader reader, IReadOnlyList<Type> paramTypes)
        {
            object[] arguments = null;
            var paramIndex = 0;
            var argumentsCount = jsonArray.GetArrayLength();
            var paramCount = paramTypes.Count;
-            if (argumentsCount != paramCount)
+            var depth = reader.CurrentDepth;
            reader.CheckRead();
            while (reader.TokenType != JsonTokenType.EndArray && reader.CurrentDepth > depth)
            {
-                throw new InvalidDataException($"Invocation provides {argumentsCount} argument(s) but target expects {paramCount}.");
+                if (paramIndex < paramCount)
                {
                    arguments ??= new object[paramCount];
                    try
                    {
                        arguments[paramIndex] = BindType(ref reader, paramTypes[paramIndex]);
                    }
                    catch (Exception ex)
                    {
                        throw new InvalidDataException("Error binding arguments. Make sure that the types of the provided values match the types of the hub method being invoked.", ex);
                    }
                }
                else
                {
                    // Skip extra arguments and throw error after reading them all
                    reader.Skip();
                }
                reader.CheckRead();
                paramIndex++;
            }
-            foreach (var element in jsonArray.EnumerateArray())
+            if (paramIndex != paramCount)
            {
-                if (arguments == null)
+                throw new InvalidDataException($"Invocation provides {paramIndex} argument(s) but target expects {paramCount}.");
                {
                    arguments = new object[paramCount];
                }
                try
                {
                    arguments[paramIndex] = BindType(element, paramTypes[paramIndex]);
                    paramIndex++;
                }
                catch (Exception ex)
                {
                    throw new InvalidDataException("Error binding arguments. Make sure that the types of the provided values match the types of the hub method being invoked.", ex);
                }
            }
            return arguments ?? Array.Empty<object>();
--- a/src/SignalR/common/Shared/AsyncEnumerableAdapters.cs
+++ b/src/SignalR/common/Shared/AsyncEnumerableAdapters.cs
@ -45,7 +45,7 @@ namespace Microsoft.AspNetCore.SignalR.Internal
            public IAsyncEnumerator<TResult> GetAsyncEnumerator(CancellationToken cancellationToken = default)
            {
-                var enumerator = _asyncEnumerable.GetAsyncEnumerator();
+                var enumerator = _asyncEnumerable.GetAsyncEnumerator(_cts.Token);
                if (cancellationToken.CanBeCanceled)
                {
                    var registration = cancellationToken.Register((ctsState) =>
@ -53,7 +53,7 @@ namespace Microsoft.AspNetCore.SignalR.Internal
                        ((CancellationTokenSource)ctsState).Cancel();
                    }, _cts);
-                    return new CancelableEnumerator<TResult>(_asyncEnumerable.GetAsyncEnumerator(), registration);
+                    return new CancelableEnumerator<TResult>(enumerator, registration);
                }
                return enumerator;
--- a/src/SignalR/common/SignalR.Common/test/Internal/Protocol/JsonHubProtocolTestsBase.cs
+++ b/src/SignalR/common/SignalR.Common/test/Internal/Protocol/JsonHubProtocolTestsBase.cs
@ -205,9 +205,8 @@ namespace Microsoft.AspNetCore.SignalR.Common.Tests.Internal.Protocol
        [InlineData("{\"type\":4,\"invocationId\":\"42\",\"target\":\"foo\",\"arguments\":[ \"abc\", \"xyz\"]}", "Error binding arguments. Make sure that the types of the provided values match the types of the hub method being invoked.")]
        [InlineData("{\"type\":1,\"invocationId\":\"42\",\"target\":\"foo\",\"arguments\":[1,\"\",{\"1\":1,\"2\":2}]}", "Invocation provides 3 argument(s) but target expects 2.")]
        [InlineData("{\"type\":1,\"arguments\":[1,\"\",{\"1\":1,\"2\":2}]},\"invocationId\":\"42\",\"target\":\"foo\"", "Invocation provides 3 argument(s) but target expects 2.")]
-        // Both of these should be fixed by https://github.com/dotnet/corefx/issues/36901
+        [InlineData("{\"type\":1,\"invocationId\":\"42\",\"target\":\"foo\",\"arguments\":[1,[1]]}", "Error binding arguments. Make sure that the types of the provided values match the types of the hub method being invoked.")]
-        // [InlineData("{\"type\":1,\"invocationId\":\"42\",\"target\":\"foo\",\"arguments\":[1,[1]]}", "Error binding arguments. Make sure that the types of the provided values match the types of the hub method being invoked.")]
+        [InlineData("{\"type\":1,\"invocationId\":\"42\",\"target\":\"foo\",\"arguments\":[1,[]]}", "Error binding arguments. Make sure that the types of the provided values match the types of the hub method being invoked.")]
        // [InlineData("{\"type\":1,\"invocationId\":\"42\",\"target\":\"foo\",\"arguments\":[1,[]]}", "Error binding arguments. Make sure that the types of the provided values match the types of the hub method being invoked.")]
        public void ArgumentBindingErrors(string input, string expectedMessage)
        {
            input = Frame(input);
@ -219,6 +218,18 @@ namespace Microsoft.AspNetCore.SignalR.Common.Tests.Internal.Protocol
            Assert.Equal(expectedMessage, bindingFailure.BindingFailure.SourceException.Message);
        }
        [Theory]
        [InlineData("{\"type\":1,\"invocationId\":\"42\",\"target\":\"foo\",\"arguments\":[[}]}")]
        public void InvalidNestingWhileBindingTypesFails(string input)
        {
            input = Frame(input);
            var binder = new TestBinder(paramTypes: new[] { typeof(int[]) }, returnType: null);
            var data = new ReadOnlySequence<byte>(Encoding.UTF8.GetBytes(input));
            var ex = Assert.Throws<InvalidDataException>(() => JsonHubProtocol.TryParseMessage(ref data, binder, out var message));
            Assert.Equal("Error reading JSON.", ex.Message);
        }
        [Theory]
        [InlineData("{\"type\":1,\"invocationId\":\"42\",\"target\":\"foo\",\"arguments\":[\"2007-03-01T13:00:00Z\"]}")]
        [InlineData("{\"type\":1,\"invocationId\":\"42\",\"arguments\":[\"2007-03-01T13:00:00Z\"],\"target\":\"foo\"}")]