diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props
index 0e39a8143fd72bfb5b0073204064d81e423f0783..b80e51cdc83f4e1b8e9fff114de76c8babcf8ea7 100644
--- a/eng/Baseline.Designer.props
+++ b/eng/Baseline.Designer.props
@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <AspNetCoreBaselineVersion>3.1.5</AspNetCoreBaselineVersion>
+    <AspNetCoreBaselineVersion>3.1.6</AspNetCoreBaselineVersion>
   </PropertyGroup>
   <!-- Package: AspNetCoreRuntime.3.0.x64-->
   <PropertyGroup Condition=" '$(PackageId)' == 'AspNetCoreRuntime.3.0.x64' ">
@@ -16,99 +16,99 @@
   <ItemGroup Condition=" '$(PackageId)' == 'AspNetCoreRuntime.3.0.x86' AND '$(TargetFramework)' == 'net461' " />
   <!-- Package: dotnet-sql-cache-->
   <PropertyGroup Condition=" '$(PackageId)' == 'dotnet-sql-cache' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <!-- Package: Microsoft.Authentication.WebAssembly.Msal-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Authentication.WebAssembly.Msal' ">
-    <BaselinePackageVersion>3.2.0</BaselinePackageVersion>
+    <BaselinePackageVersion>3.2.1</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Authentication.WebAssembly.Msal' AND '$(TargetFramework)' == 'netstandard2.1' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="[3.2.0, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="[3.2.1, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.ApiAuthorization.IdentityServer-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ApiAuthorization.IdentityServer' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ApiAuthorization.IdentityServer' AND '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="[3.1.6, )" />
     <BaselinePackageReference Include="IdentityServer4" Version="[3.0.0, )" />
     <BaselinePackageReference Include="IdentityServer4.AspNetIdentity" Version="[3.0.0, )" />
     <BaselinePackageReference Include="IdentityServer4.EntityFramework" Version="[3.0.0, )" />
     <BaselinePackageReference Include="IdentityServer4.EntityFramework.Storage" Version="[3.0.0, )" />
     <BaselinePackageReference Include="IdentityServer4.Storage" Version="[3.0.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Http" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Http" Version="[3.1.6, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.App.Runtime.win-x64-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.App.Runtime.win-x64' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <!-- Package: Microsoft.AspNetCore.Authentication.AzureAD.UI-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.AzureAD.UI' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.AzureAD.UI' AND '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="[3.1.6, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Authentication.AzureADB2C.UI-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.AzureADB2C.UI' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.AzureADB2C.UI' AND '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="[3.1.6, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Authentication.Certificate-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Certificate' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Certificate' AND '$(TargetFramework)' == 'netcoreapp3.1' " />
   <!-- Package: Microsoft.AspNetCore.Authentication.Facebook-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Facebook' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Facebook' AND '$(TargetFramework)' == 'netcoreapp3.1' " />
   <!-- Package: Microsoft.AspNetCore.Authentication.Google-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Google' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Google' AND '$(TargetFramework)' == 'netcoreapp3.1' " />
   <!-- Package: Microsoft.AspNetCore.Authentication.JwtBearer-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.JwtBearer' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.JwtBearer' AND '$(TargetFramework)' == 'netcoreapp3.1' ">
     <BaselinePackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="[5.5.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Authentication.MicrosoftAccount-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.MicrosoftAccount' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.MicrosoftAccount' AND '$(TargetFramework)' == 'netcoreapp3.1' " />
   <!-- Package: Microsoft.AspNetCore.Authentication.Negotiate-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Negotiate' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Negotiate' AND '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="[3.1.6, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Authentication.OpenIdConnect-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.OpenIdConnect' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.OpenIdConnect' AND '$(TargetFramework)' == 'netcoreapp3.1' ">
     <BaselinePackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="[5.5.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Authentication.Twitter-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Twitter' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.Twitter' AND '$(TargetFramework)' == 'netcoreapp3.1' " />
   <!-- Package: Microsoft.AspNetCore.Authentication.WsFederation-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.WsFederation' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authentication.WsFederation' AND '$(TargetFramework)' == 'netcoreapp3.1' ">
     <BaselinePackageReference Include="Microsoft.IdentityModel.Protocols.WsFederation" Version="[5.5.0, )" />
@@ -116,356 +116,356 @@
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Authorization-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authorization' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authorization' AND '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Metadata" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Metadata" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[3.1.6, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authorization' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Metadata" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Metadata" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[3.1.6, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.AzureAppServices.HostingStartup-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AzureAppServices.HostingStartup' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AzureAppServices.HostingStartup' AND '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[3.1.6, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.AzureAppServices.SiteExtension-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AzureAppServices.SiteExtension' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AzureAppServices.SiteExtension' AND '$(TargetFramework)' == 'net461' ">
-    <BaselinePackageReference Include="Microsoft.Web.Xdt.Extensions" Version="[3.1.5-servicing.20271.5, )" />
+    <BaselinePackageReference Include="Microsoft.Web.Xdt.Extensions" Version="[3.1.6-servicing.20317.14, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.AzureAppServicesIntegration-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AzureAppServicesIntegration' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AzureAppServicesIntegration' AND '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="[3.1.6, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Components-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Components.Analyzers" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Authorization" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.JSInterop" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Components.Analyzers" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Authorization" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.JSInterop" Version="[3.1.6, )" />
     <BaselinePackageReference Include="System.ComponentModel.Annotations" Version="[4.7.0, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components' AND '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Components.Analyzers" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Authorization" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.JSInterop" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Components.Analyzers" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Authorization" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.JSInterop" Version="[3.1.6, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Components.Analyzers-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.Analyzers' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <!-- Package: Microsoft.AspNetCore.Components.Authorization-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.Authorization' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.Authorization' AND '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Components" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Authorization" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Components" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Authorization" Version="[3.1.6, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.Authorization' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Components" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Authorization" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Components" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Authorization" Version="[3.1.6, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Components.Forms-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.Forms' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.Forms' AND '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Components" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Components" Version="[3.1.6, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.Forms' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Components" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Components" Version="[3.1.6, )" />
     <BaselinePackageReference Include="System.ComponentModel.Annotations" Version="[4.7.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Components.Web-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.Web' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.Web' AND '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Components" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Components.Forms" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.JSInterop" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Components" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Components.Forms" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.JSInterop" Version="[3.1.6, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.Web' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Components" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Components.Forms" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.JSInterop" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Components" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Components.Forms" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.JSInterop" Version="[3.1.6, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Components.WebAssembly-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly' ">
-    <BaselinePackageVersion>3.2.0</BaselinePackageVersion>
+    <BaselinePackageVersion>3.2.1</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly' AND '$(TargetFramework)' == 'netstandard2.1' ">
-    <BaselinePackageReference Include="Microsoft.JSInterop.WebAssembly" Version="[3.2.0, )" />
+    <BaselinePackageReference Include="Microsoft.JSInterop.WebAssembly" Version="[3.2.1, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Components.Web" Version="[3.1.6, )" />
     <BaselinePackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.HttpHandler" Version="[3.2.0, )" />
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Components.Web" Version="[3.1.3, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Configuration.Json" Version="[3.1.3, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[3.1.3, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Configuration.Json" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[3.1.6, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Components.WebAssembly.Build-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly.Build' ">
-    <BaselinePackageVersion>3.2.0</BaselinePackageVersion>
+    <BaselinePackageVersion>3.2.1</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly.Build' AND '$(TargetFramework)' == 'any' ">
     <BaselinePackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Runtime" Version="[3.2.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Components.WebAssembly.Server-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly.Server' ">
-    <BaselinePackageVersion>3.2.0</BaselinePackageVersion>
+    <BaselinePackageVersion>3.2.1</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly.Server' AND '$(TargetFramework)' == 'netcoreapp3.1' " />
   <!-- Package: Microsoft.AspNetCore.Components.WebAssembly.Authentication-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly.Authentication' ">
-    <BaselinePackageVersion>3.2.0</BaselinePackageVersion>
+    <BaselinePackageVersion>3.2.1</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly.Authentication' AND '$(TargetFramework)' == 'netstandard2.1' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="[3.1.3, )" />
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Components.Web" Version="[3.1.3, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Components.Web" Version="[3.1.6, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Components.WebAssembly.HttpHandler-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly.HttpHandler' ">
-    <BaselinePackageVersion>3.2.0</BaselinePackageVersion>
+    <BaselinePackageVersion>3.2.1</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly.HttpHandler' AND '$(TargetFramework)' == 'netstandard2.1' " />
   <!-- Package: Microsoft.JSInterop.WebAssembly-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.JSInterop.WebAssembly' ">
-    <BaselinePackageVersion>3.2.0</BaselinePackageVersion>
+    <BaselinePackageVersion>3.2.1</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.JSInterop.WebAssembly' AND '$(TargetFramework)' == 'netstandard2.1' ">
-    <BaselinePackageReference Include="Microsoft.JSInterop" Version="[3.1.3, )" />
+    <BaselinePackageReference Include="Microsoft.JSInterop" Version="[3.1.6, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.ConcurrencyLimiter-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ConcurrencyLimiter' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.ConcurrencyLimiter' AND '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[3.1.6, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Connections.Abstractions-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Connections.Abstractions' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Connections.Abstractions' AND '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Http.Features" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Http.Features" Version="[3.1.6, )" />
     <BaselinePackageReference Include="System.IO.Pipelines" Version="[4.7.1, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Connections.Abstractions' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Http.Features" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Http.Features" Version="[3.1.6, )" />
     <BaselinePackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="[1.1.1, )" />
     <BaselinePackageReference Include="System.IO.Pipelines" Version="[4.7.1, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Connections.Abstractions' AND '$(TargetFramework)' == 'netstandard2.1' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Http.Features" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Http.Features" Version="[3.1.6, )" />
     <BaselinePackageReference Include="System.IO.Pipelines" Version="[4.7.1, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Cryptography.Internal-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Cryptography.Internal' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Cryptography.Internal' AND '$(TargetFramework)' == 'netcoreapp3.1' " />
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Cryptography.Internal' AND '$(TargetFramework)' == 'netstandard2.0' " />
   <!-- Package: Microsoft.AspNetCore.Cryptography.KeyDerivation-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Cryptography.KeyDerivation' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Cryptography.KeyDerivation' AND '$(TargetFramework)' == 'netcoreapp2.0' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Cryptography.Internal" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Cryptography.Internal" Version="[3.1.6, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Cryptography.KeyDerivation' AND '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Cryptography.Internal" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Cryptography.Internal" Version="[3.1.6, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Cryptography.KeyDerivation' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Cryptography.Internal" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Cryptography.Internal" Version="[3.1.6, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.DataProtection-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection' AND '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection.Abstractions" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Cryptography.Internal" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection.Abstractions" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Cryptography.Internal" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[3.1.6, )" />
     <BaselinePackageReference Include="Microsoft.Win32.Registry" Version="[4.7.0, )" />
     <BaselinePackageReference Include="System.Security.Cryptography.Xml" Version="[4.7.0, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection.Abstractions" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Cryptography.Internal" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection.Abstractions" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Cryptography.Internal" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[3.1.6, )" />
     <BaselinePackageReference Include="Microsoft.Win32.Registry" Version="[4.7.0, )" />
     <BaselinePackageReference Include="System.Security.Cryptography.Xml" Version="[4.7.0, )" />
     <BaselinePackageReference Include="System.Security.Principal.Windows" Version="[4.7.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.DataProtection.Abstractions-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection.Abstractions' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection.Abstractions' AND '$(TargetFramework)' == 'netcoreapp3.1' " />
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection.Abstractions' AND '$(TargetFramework)' == 'netstandard2.0' " />
   <!-- Package: Microsoft.AspNetCore.DataProtection.AzureKeyVault-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection.AzureKeyVault' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection.AzureKeyVault' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection" Version="[3.1.6, )" />
     <BaselinePackageReference Include="Microsoft.Azure.KeyVault" Version="[2.3.2, )" />
     <BaselinePackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="[3.19.8, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.DataProtection.AzureStorage-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection.AzureStorage' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection.AzureStorage' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection" Version="[3.1.6, )" />
     <BaselinePackageReference Include="Microsoft.Azure.Storage.Blob" Version="[10.0.1, )" />
     <BaselinePackageReference Include="Microsoft.Data.OData" Version="[5.8.4, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.DataProtection.EntityFrameworkCore-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection.EntityFrameworkCore' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection.EntityFrameworkCore' AND '$(TargetFramework)' == 'netstandard2.1' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.EntityFrameworkCore" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.EntityFrameworkCore" Version="[3.1.6, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.DataProtection.Extensions-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection.Extensions' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection.Extensions' AND '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[3.1.6, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection.Extensions' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[3.1.6, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.DataProtection.StackExchangeRedis-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection.StackExchangeRedis' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection.StackExchangeRedis' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection" Version="[3.1.6, )" />
     <BaselinePackageReference Include="StackExchange.Redis" Version="[2.0.593, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore' AND '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <BaselinePackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[3.1.6, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.HeaderPropagation-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.HeaderPropagation' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.HeaderPropagation' AND '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Http" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Http" Version="[3.1.6, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Hosting.WindowsServices-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Hosting.WindowsServices' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Hosting.WindowsServices' AND '$(TargetFramework)' == 'netcoreapp3.1' ">
     <BaselinePackageReference Include="System.ServiceProcess.ServiceController" Version="[4.7.0, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Http.Connections.Client-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Http.Connections.Client' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Http.Connections.Client' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Http.Connections.Common" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Http.Connections.Common" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[3.1.6, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Http.Connections.Client' AND '$(TargetFramework)' == 'netstandard2.1' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Http.Connections.Common" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Http.Connections.Common" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[3.1.6, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Http.Connections.Common-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Http.Connections.Common' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Http.Connections.Common' AND '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="[3.1.6, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Http.Connections.Common' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="[3.1.6, )" />
     <BaselinePackageReference Include="System.Text.Json" Version="[4.7.2, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Http.Features-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Http.Features' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Http.Features' AND '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <BaselinePackageReference Include="Microsoft.Extensions.Primitives" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Primitives" Version="[3.1.6, )" />
     <BaselinePackageReference Include="System.IO.Pipelines" Version="[4.7.1, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Http.Features' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.Extensions.Primitives" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Primitives" Version="[3.1.6, )" />
     <BaselinePackageReference Include="System.IO.Pipelines" Version="[4.7.1, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Identity.EntityFrameworkCore-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity.EntityFrameworkCore' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity.EntityFrameworkCore' AND '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <BaselinePackageReference Include="Microsoft.Extensions.Identity.Stores" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Identity.Stores" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[3.1.6, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity.EntityFrameworkCore' AND '$(TargetFramework)' == 'netstandard2.1' ">
-    <BaselinePackageReference Include="Microsoft.Extensions.Identity.Stores" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Identity.Stores" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[3.1.6, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Identity.Specification.Tests-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity.Specification.Tests' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity.Specification.Tests' AND '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <BaselinePackageReference Include="Microsoft.Extensions.Configuration" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Configuration" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[3.1.6, )" />
     <BaselinePackageReference Include="xunit.assert" Version="[2.4.1, )" />
     <BaselinePackageReference Include="xunit.extensibility.core" Version="[2.4.1, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Identity.UI-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity.UI' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity.UI' AND '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <BaselinePackageReference Include="Microsoft.Extensions.Identity.Stores" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Identity.Stores" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="[3.1.6, )" />
     <BaselinePackageReference Include="Newtonsoft.Json" Version="[12.0.2, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.JsonPatch-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.JsonPatch' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.JsonPatch' AND '$(TargetFramework)' == 'netstandard2.0' ">
     <BaselinePackageReference Include="Microsoft.CSharp" Version="[4.7.0, )" />
@@ -473,239 +473,239 @@
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Metadata-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Metadata' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Metadata' AND '$(TargetFramework)' == 'netcoreapp3.1' " />
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Metadata' AND '$(TargetFramework)' == 'netstandard2.0' " />
   <!-- Package: Microsoft.AspNetCore.MiddlewareAnalysis-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.MiddlewareAnalysis' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.MiddlewareAnalysis' AND '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[3.1.6, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Mvc.NewtonsoftJson-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.NewtonsoftJson' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.NewtonsoftJson' AND '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.JsonPatch" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.JsonPatch" Version="[3.1.6, )" />
     <BaselinePackageReference Include="Newtonsoft.Json" Version="[12.0.2, )" />
     <BaselinePackageReference Include="Newtonsoft.Json.Bson" Version="[1.0.2, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation' AND '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.CodeAnalysis.Razor" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.DependencyModel" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.CodeAnalysis.Razor" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.DependencyModel" Version="[3.1.6, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Mvc.Testing-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.Testing' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Mvc.Testing' AND '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.TestHost" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.DependencyModel" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Hosting" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.TestHost" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.DependencyModel" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Hosting" Version="[3.1.6, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.NodeServices-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.NodeServices' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.NodeServices' AND '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Console" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Console" Version="[3.1.6, )" />
     <BaselinePackageReference Include="Newtonsoft.Json" Version="[12.0.2, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Owin-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Owin' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Owin' AND '$(TargetFramework)' == 'netcoreapp3.1' " />
   <!-- Package: Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv' AND '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="[3.1.6, )" />
     <BaselinePackageReference Include="Libuv" Version="[1.10.0, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[3.1.6, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.SignalR.Client-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Client' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Client' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Client.Core" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Http.Connections.Client" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Client.Core" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Http.Connections.Client" Version="[3.1.6, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.SignalR.Client.Core-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Client.Core' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Client.Core' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[3.1.6, )" />
     <BaselinePackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="[1.1.1, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[3.1.6, )" />
     <BaselinePackageReference Include="System.Threading.Channels" Version="[4.7.1, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Client.Core' AND '$(TargetFramework)' == 'netstandard2.1' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[3.1.6, )" />
     <BaselinePackageReference Include="System.Threading.Channels" Version="[4.7.1, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.SignalR.Common-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Common' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Common' AND '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[3.1.6, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Common' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[3.1.6, )" />
     <BaselinePackageReference Include="System.Text.Json" Version="[4.7.2, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.SignalR.Protocols.Json-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Protocols.Json' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Protocols.Json' AND '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[3.1.6, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Protocols.Json' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[3.1.6, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.SignalR.Protocols.MessagePack-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Protocols.MessagePack' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Protocols.MessagePack' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[3.1.6, )" />
     <BaselinePackageReference Include="MessagePack" Version="[1.7.3.7, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[3.1.6, )" />
     <BaselinePackageReference Include="Newtonsoft.Json" Version="[12.0.2, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.SignalR.Specification.Tests-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Specification.Tests' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Specification.Tests' AND '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[3.1.6, )" />
     <BaselinePackageReference Include="xunit.assert" Version="[2.4.1, )" />
     <BaselinePackageReference Include="xunit.extensibility.core" Version="[2.4.1, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.SignalR.StackExchangeRedis-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.StackExchangeRedis' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.StackExchangeRedis' AND '$(TargetFramework)' == 'netcoreapp3.1' ">
     <BaselinePackageReference Include="MessagePack" Version="[1.7.3.7, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[3.1.6, )" />
     <BaselinePackageReference Include="StackExchange.Redis" Version="[2.0.593, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.SpaServices-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SpaServices' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SpaServices' AND '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.NodeServices" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.NodeServices" Version="[3.1.6, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.SpaServices.Extensions-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SpaServices.Extensions' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SpaServices.Extensions' AND '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.SpaServices" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.SpaServices" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="[3.1.6, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.TestHost-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.TestHost' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.TestHost' AND '$(TargetFramework)' == 'netcoreapp3.1' ">
     <BaselinePackageReference Include="System.IO.Pipelines" Version="[4.7.1, )" />
   </ItemGroup>
   <!-- Package: Microsoft.dotnet-openapi-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.dotnet-openapi' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <!-- Package: Microsoft.DotNet.Web.Client.ItemTemplates-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.DotNet.Web.Client.ItemTemplates' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <!-- Package: Microsoft.DotNet.Web.ItemTemplates-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.DotNet.Web.ItemTemplates' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <!-- Package: Microsoft.DotNet.Web.ProjectTemplates.3.1-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.DotNet.Web.ProjectTemplates.3.1' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <!-- Package: Microsoft.DotNet.Web.Spa.ProjectTemplates.3.1-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.DotNet.Web.Spa.ProjectTemplates.3.1' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <!-- Package: Microsoft.Extensions.ApiDescription.Client-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.ApiDescription.Client' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <!-- Package: Microsoft.Extensions.ApiDescription.Server-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.ApiDescription.Server' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <!-- Package: Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore' AND '$(TargetFramework)' == 'netstandard2.1' ">
-    <BaselinePackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="[3.1.6, )" />
   </ItemGroup>
   <!-- Package: Microsoft.Extensions.Identity.Core-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Identity.Core' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Identity.Core' AND '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[3.1.6, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Identity.Core' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[3.1.6, )" />
   </ItemGroup>
   <!-- Package: Microsoft.Extensions.Identity.Stores-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Identity.Stores' ">
-    <BaselinePackageVersion>3.1.5</BaselinePackageVersion>
+    <BaselinePackageVersion>3.1.6</BaselinePackageVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Identity.Stores' AND '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <BaselinePackageReference Include="Microsoft.Extensions.Identity.Core" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Identity.Core" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[3.1.6, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Identity.Stores' AND '$(TargetFramework)' == 'netstandard2.0' ">
-    <BaselinePackageReference Include="Microsoft.Extensions.Identity.Core" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="[3.1.5, )" />
-    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[3.1.5, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Identity.Core" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="[3.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[3.1.6, )" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/eng/Baseline.xml b/eng/Baseline.xml
index ab96364fc10c65b5ef33806f62609acd29353b8b..650550d17918cb2c6b907e65f6ebabb915f67e37 100644
--- a/eng/Baseline.xml
+++ b/eng/Baseline.xml
@@ -4,87 +4,87 @@ This file contains a list of all the packages and their versions which were rele
 Update this list when preparing for a new patch.
 
 -->
-<Baseline Version="3.1.5">
+<Baseline Version="3.1.6">
   <Package Id="AspNetCoreRuntime.3.0.x64" Version="3.0.3" />
   <Package Id="AspNetCoreRuntime.3.0.x86" Version="3.0.3" />
-  <Package Id="dotnet-sql-cache" Version="3.1.5" />
-  <Package Id="Microsoft.Authentication.WebAssembly.Msal" Version="3.2.0" />
-  <Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.Authentication.Certificate" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.Authentication.Google" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.Authentication.Negotiate" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.Authorization" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.Components" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.Components.Analyzers" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.Components.Authorization" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.Components.Forms" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.Components.Web" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.0" />
-  <Package Id="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.0" />
-  <Package Id="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="3.2.0" />
-  <Package Id="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="3.2.0" />
-  <Package Id="Microsoft.AspNetCore.Components.WebAssembly.HttpHandler" Version="3.2.0" />
-  <Package Id="Microsoft.JSInterop.WebAssembly" Version="3.2.0" />
-  <Package Id="Microsoft.AspNetCore.ConcurrencyLimiter" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.DataProtection" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.DataProtection.AzureKeyVault" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.HeaderPropagation" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.Http.Connections.Client" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.Http.Connections.Common" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.Http.Features" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.Identity.Specification.Tests" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.Identity.UI" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.JsonPatch" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.Metadata" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.NodeServices" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.Owin" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.SignalR.Client" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.SignalR.Common" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.SignalR.Specification.Tests" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.SpaServices" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.5" />
-  <Package Id="Microsoft.AspNetCore.TestHost" Version="3.1.5" />
-  <Package Id="Microsoft.dotnet-openapi" Version="3.1.5" />
-  <Package Id="Microsoft.DotNet.Web.Client.ItemTemplates" Version="3.1.5" />
-  <Package Id="Microsoft.DotNet.Web.ItemTemplates" Version="3.1.5" />
-  <Package Id="Microsoft.DotNet.Web.ProjectTemplates.3.1" Version="3.1.5" />
-  <Package Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.1" Version="3.1.5" />
-  <Package Id="Microsoft.Extensions.ApiDescription.Client" Version="3.1.5" />
-  <Package Id="Microsoft.Extensions.ApiDescription.Server" Version="3.1.5" />
-  <Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="3.1.5" />
-  <Package Id="Microsoft.Extensions.Identity.Core" Version="3.1.5" />
-  <Package Id="Microsoft.Extensions.Identity.Stores" Version="3.1.5" />
+  <Package Id="dotnet-sql-cache" Version="3.1.6" />
+  <Package Id="Microsoft.Authentication.WebAssembly.Msal" Version="3.2.1" />
+  <Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.Authentication.Certificate" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.Authentication.Google" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.Authentication.Negotiate" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.Authorization" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.Components" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.Components.Analyzers" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.Components.Authorization" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.Components.Forms" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.Components.Web" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.1" />
+  <Package Id="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.1" />
+  <Package Id="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="3.2.1" />
+  <Package Id="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="3.2.1" />
+  <Package Id="Microsoft.AspNetCore.Components.WebAssembly.HttpHandler" Version="3.2.1" />
+  <Package Id="Microsoft.JSInterop.WebAssembly" Version="3.2.1" />
+  <Package Id="Microsoft.AspNetCore.ConcurrencyLimiter" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.DataProtection" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.DataProtection.AzureKeyVault" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.HeaderPropagation" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.Http.Connections.Client" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.Http.Connections.Common" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.Http.Features" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.Identity.Specification.Tests" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.Identity.UI" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.JsonPatch" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.Metadata" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.NodeServices" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.Owin" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.SignalR.Client" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.SignalR.Common" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.SignalR.Specification.Tests" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.SpaServices" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.6" />
+  <Package Id="Microsoft.AspNetCore.TestHost" Version="3.1.6" />
+  <Package Id="Microsoft.dotnet-openapi" Version="3.1.6" />
+  <Package Id="Microsoft.DotNet.Web.Client.ItemTemplates" Version="3.1.6" />
+  <Package Id="Microsoft.DotNet.Web.ItemTemplates" Version="3.1.6" />
+  <Package Id="Microsoft.DotNet.Web.ProjectTemplates.3.1" Version="3.1.6" />
+  <Package Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.1" Version="3.1.6" />
+  <Package Id="Microsoft.Extensions.ApiDescription.Client" Version="3.1.6" />
+  <Package Id="Microsoft.Extensions.ApiDescription.Server" Version="3.1.6" />
+  <Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="3.1.6" />
+  <Package Id="Microsoft.Extensions.Identity.Core" Version="3.1.6" />
+  <Package Id="Microsoft.Extensions.Identity.Stores" Version="3.1.6" />
 </Baseline>
\ No newline at end of file
diff --git a/eng/tools/BaselineGenerator/Program.cs b/eng/tools/BaselineGenerator/Program.cs
index f8ea164d53ee1112a780f43170337583dcf19040..d125bfdf71e3bd21b6d75c4abb34861f36152d64 100644
--- a/eng/tools/BaselineGenerator/Program.cs
+++ b/eng/tools/BaselineGenerator/Program.cs
@@ -177,7 +177,7 @@ namespace PackageBaselineGenerator
                 var versionAttribute = document.Root.Attribute("Version");
                 hasChanged = await TryUpdateVersionAsync(
                     versionAttribute,
-                    "Microsoft.AspNetCore.App",
+                    "Microsoft.AspNetCore.App.Runtime.win-x64",
                     packageMetadataResource,
                     logger,
                     cacheContext);
diff --git a/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADOpenIdConnectOptionsConfiguration.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADOpenIdConnectOptionsConfiguration.cs
index a991620aae3200ed916abe68c433abf32e4e7e97..9b5be26438fa20d8a5c0ab45a2fa969c91279023 100644
--- a/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADOpenIdConnectOptionsConfiguration.cs
+++ b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADOpenIdConnectOptionsConfiguration.cs
@@ -21,6 +21,11 @@ namespace Microsoft.AspNetCore.Authentication.AzureAD.UI
         public void Configure(string name, OpenIdConnectOptions options)
         {
             var azureADScheme = GetAzureADScheme(name);
+            if (azureADScheme is null)
+            {
+                return;
+            }
+
             var azureADOptions = _azureADOptions.Get(azureADScheme);
             if (name != azureADOptions.OpenIdConnectSchemeName)
             {
diff --git a/src/Azure/AzureAD/Authentication.AzureAD.UI/test/AzureADAuthenticationBuilderExtensionsTests.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/test/AzureADAuthenticationBuilderExtensionsTests.cs
index 07c0583c32b769160cf7cee22dbac1ef18a5419a..6a31d3477ec2bd4cf676cc0cb8ff007dda416527 100644
--- a/src/Azure/AzureAD/Authentication.AzureAD.UI/test/AzureADAuthenticationBuilderExtensionsTests.cs
+++ b/src/Azure/AzureAD/Authentication.AzureAD.UI/test/AzureADAuthenticationBuilderExtensionsTests.cs
@@ -485,5 +485,25 @@ namespace Microsoft.AspNetCore.Authentication
 
             Assert.NotNull(jwtOptions.Get("other"));
         }
+
+        [Fact]
+        public void AddAzureAD_SkipsOptionsValidationForNonAzureOpenIdConnect()
+        {
+            var services = new ServiceCollection();
+            services.AddSingleton<ILoggerFactory>(new NullLoggerFactory());
+
+            services.AddAuthentication()
+                .AddAzureAD(o => { })
+                .AddOpenIdConnect("other", null, o =>
+                {
+                    o.ClientId = "ClientId";
+                    o.Authority = "https://authority.com";
+                });
+
+            var provider = services.BuildServiceProvider();
+            var openIdConnectOptions = provider.GetService<IOptionsMonitor<OpenIdConnectOptions>>();
+
+            Assert.NotNull(openIdConnectOptions.Get("other"));
+        }
     }
 }
diff --git a/src/Framework/test/TargetingPackTests.cs b/src/Framework/test/TargetingPackTests.cs
index e6e3c57faf893f9575233c50d3862064ac08c97d..d0396314927e1239a8a9588a6466a07c90c7ea59 100644
--- a/src/Framework/test/TargetingPackTests.cs
+++ b/src/Framework/test/TargetingPackTests.cs
@@ -37,17 +37,23 @@ namespace Microsoft.AspNetCore
         [Fact]
         public void TargetingPackContainsListedAssemblies()
         {
+            if (!_isTargetingPackBuilding)
+            {
+                return;
+            }
+
             var actualAssemblies = Directory.GetFiles(Path.Combine(_targetingPackRoot, "ref", _targetingPackTfm), "*.dll")
                 .Select(Path.GetFileNameWithoutExtension)
                 .ToHashSet();
+            var listedTargetingPackAssemblies = TestData.ListedTargetingPackAssemblies.Keys.ToHashSet();
 
             _output.WriteLine("==== actual assemblies ====");
             _output.WriteLine(string.Join('\n', actualAssemblies.OrderBy(i => i)));
             _output.WriteLine("==== expected assemblies ====");
-            _output.WriteLine(string.Join('\n', TestData.ListedTargetingPackAssemblies.OrderBy(i => i)));
+            _output.WriteLine(string.Join('\n', listedTargetingPackAssemblies.OrderBy(i => i)));
 
-            var missing = TestData.ListedTargetingPackAssemblies.Except(actualAssemblies);
-            var unexpected = actualAssemblies.Except(TestData.ListedTargetingPackAssemblies);
+            var missing = listedTargetingPackAssemblies.Except(actualAssemblies);
+            var unexpected = actualAssemblies.Except(listedTargetingPackAssemblies);
 
             _output.WriteLine("==== missing assemblies from the framework ====");
             _output.WriteLine(string.Join('\n', missing));
@@ -59,7 +65,7 @@ namespace Microsoft.AspNetCore
         }
 
         [Fact]
-        public void AssembliesHavePatchVersion0()
+        public void RefAssembliesHaveExpectedAssemblyVersions()
         {
             if (!_isTargetingPackBuilding)
             {
@@ -71,15 +77,15 @@ namespace Microsoft.AspNetCore
 
             Assert.All(dlls, path =>
             {
+                var fileName = Path.GetFileNameWithoutExtension(path);
                 var assemblyName = AssemblyName.GetAssemblyName(path);
                 using var fileStream = File.OpenRead(path);
                 using var peReader = new PEReader(fileStream, PEStreamOptions.Default);
                 var reader = peReader.GetMetadataReader(MetadataReaderOptions.Default);
                 var assemblyDefinition = reader.GetAssemblyDefinition();
 
-                Assert.True(
-                    assemblyDefinition.Version.Revision == 0 && assemblyDefinition.Version.Build == 0,
-                    $"{path} has version {assemblyDefinition.Version} should have a 0.0 revision number and build number version, e.g. major.minor.0.0");
+                TestData.ListedTargetingPackAssemblies.TryGetValue(fileName, out var expectedVersion);
+                Assert.Equal(expectedVersion, assemblyDefinition.Version.ToString());
             });
         }
 
diff --git a/src/Framework/test/TestData.cs b/src/Framework/test/TestData.cs
index 9e6551ba6a2c361f139a2cff62388de3b3789a4a..2271d24ece6fad079652a190287f40ff3348c47b 100644
--- a/src/Framework/test/TestData.cs
+++ b/src/Framework/test/TestData.cs
@@ -10,275 +10,285 @@ namespace Microsoft.AspNetCore
 {
     public class TestData
     {
-        public static HashSet<string> ListedSharedFxAssemblies = new HashSet<string>
-        {
-            "aspnetcorev2_inprocess",
-            "Microsoft.AspNetCore",
-            "Microsoft.AspNetCore.Antiforgery",
-            "Microsoft.AspNetCore.Authentication",
-            "Microsoft.AspNetCore.Authentication.Abstractions",
-            "Microsoft.AspNetCore.Authentication.Cookies",
-            "Microsoft.AspNetCore.Authentication.Core",
-            "Microsoft.AspNetCore.Authentication.OAuth",
-            "Microsoft.AspNetCore.Authorization",
-            "Microsoft.AspNetCore.Authorization.Policy",
-            "Microsoft.AspNetCore.Components",
-            "Microsoft.AspNetCore.Components.Authorization",
-            "Microsoft.AspNetCore.Components.Forms",
-            "Microsoft.AspNetCore.Components.Server",
-            "Microsoft.AspNetCore.Components.Web",
-            "Microsoft.AspNetCore.Connections.Abstractions",
-            "Microsoft.AspNetCore.CookiePolicy",
-            "Microsoft.AspNetCore.Cors",
-            "Microsoft.AspNetCore.Cryptography.Internal",
-            "Microsoft.AspNetCore.Cryptography.KeyDerivation",
-            "Microsoft.AspNetCore.DataProtection",
-            "Microsoft.AspNetCore.DataProtection.Abstractions",
-            "Microsoft.AspNetCore.DataProtection.Extensions",
-            "Microsoft.AspNetCore.Diagnostics",
-            "Microsoft.AspNetCore.Diagnostics.Abstractions",
-            "Microsoft.AspNetCore.Diagnostics.HealthChecks",
-            "Microsoft.AspNetCore.HostFiltering",
-            "Microsoft.AspNetCore.Hosting",
-            "Microsoft.AspNetCore.Hosting.Abstractions",
-            "Microsoft.AspNetCore.Hosting.Server.Abstractions",
-            "Microsoft.AspNetCore.Html.Abstractions",
-            "Microsoft.AspNetCore.Http",
-            "Microsoft.AspNetCore.Http.Abstractions",
-            "Microsoft.AspNetCore.Http.Connections",
-            "Microsoft.AspNetCore.Http.Connections.Common",
-            "Microsoft.AspNetCore.Http.Extensions",
-            "Microsoft.AspNetCore.Http.Features",
-            "Microsoft.AspNetCore.HttpOverrides",
-            "Microsoft.AspNetCore.HttpsPolicy",
-            "Microsoft.AspNetCore.Identity",
-            "Microsoft.AspNetCore.Localization",
-            "Microsoft.AspNetCore.Localization.Routing",
-            "Microsoft.AspNetCore.Metadata",
-            "Microsoft.AspNetCore.Mvc",
-            "Microsoft.AspNetCore.Mvc.Abstractions",
-            "Microsoft.AspNetCore.Mvc.ApiExplorer",
-            "Microsoft.AspNetCore.Mvc.Core",
-            "Microsoft.AspNetCore.Mvc.Cors",
-            "Microsoft.AspNetCore.Mvc.DataAnnotations",
-            "Microsoft.AspNetCore.Mvc.Formatters.Json",
-            "Microsoft.AspNetCore.Mvc.Formatters.Xml",
-            "Microsoft.AspNetCore.Mvc.Localization",
-            "Microsoft.AspNetCore.Mvc.Razor",
-            "Microsoft.AspNetCore.Mvc.RazorPages",
-            "Microsoft.AspNetCore.Mvc.TagHelpers",
-            "Microsoft.AspNetCore.Mvc.ViewFeatures",
-            "Microsoft.AspNetCore.Razor",
-            "Microsoft.AspNetCore.Razor.Runtime",
-            "Microsoft.AspNetCore.ResponseCaching",
-            "Microsoft.AspNetCore.ResponseCaching.Abstractions",
-            "Microsoft.AspNetCore.ResponseCompression",
-            "Microsoft.AspNetCore.Rewrite",
-            "Microsoft.AspNetCore.Routing",
-            "Microsoft.AspNetCore.Routing.Abstractions",
-            "Microsoft.AspNetCore.Server.HttpSys",
-            "Microsoft.AspNetCore.Server.IIS",
-            "Microsoft.AspNetCore.Server.IISIntegration",
-            "Microsoft.AspNetCore.Server.Kestrel",
-            "Microsoft.AspNetCore.Server.Kestrel.Core",
-            "Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets",
-            "Microsoft.AspNetCore.Session",
-            "Microsoft.AspNetCore.SignalR",
-            "Microsoft.AspNetCore.SignalR.Common",
-            "Microsoft.AspNetCore.SignalR.Core",
-            "Microsoft.AspNetCore.SignalR.Protocols.Json",
-            "Microsoft.AspNetCore.StaticFiles",
-            "Microsoft.AspNetCore.WebSockets",
-            "Microsoft.AspNetCore.WebUtilities",
-            "Microsoft.Extensions.Caching.Abstractions",
-            "Microsoft.Extensions.Caching.Memory",
-            "Microsoft.Extensions.Configuration",
-            "Microsoft.Extensions.Configuration.Abstractions",
-            "Microsoft.Extensions.Configuration.Binder",
-            "Microsoft.Extensions.Configuration.CommandLine",
-            "Microsoft.Extensions.Configuration.EnvironmentVariables",
-            "Microsoft.Extensions.Configuration.FileExtensions",
-            "Microsoft.Extensions.Configuration.Ini",
-            "Microsoft.Extensions.Configuration.Json",
-            "Microsoft.Extensions.Configuration.KeyPerFile",
-            "Microsoft.Extensions.Configuration.UserSecrets",
-            "Microsoft.Extensions.Configuration.Xml",
-            "Microsoft.Extensions.DependencyInjection",
-            "Microsoft.Extensions.DependencyInjection.Abstractions",
-            "Microsoft.Extensions.Diagnostics.HealthChecks",
-            "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions",
-            "Microsoft.Extensions.FileProviders.Abstractions",
-            "Microsoft.Extensions.FileProviders.Composite",
-            "Microsoft.Extensions.FileProviders.Embedded",
-            "Microsoft.Extensions.FileProviders.Physical",
-            "Microsoft.Extensions.FileSystemGlobbing",
-            "Microsoft.Extensions.Hosting",
-            "Microsoft.Extensions.Hosting.Abstractions",
-            "Microsoft.Extensions.Http",
-            "Microsoft.Extensions.Identity.Core",
-            "Microsoft.Extensions.Identity.Stores",
-            "Microsoft.Extensions.Localization",
-            "Microsoft.Extensions.Localization.Abstractions",
-            "Microsoft.Extensions.Logging",
-            "Microsoft.Extensions.Logging.Abstractions",
-            "Microsoft.Extensions.Logging.Configuration",
-            "Microsoft.Extensions.Logging.Console",
-            "Microsoft.Extensions.Logging.Debug",
-            "Microsoft.Extensions.Logging.EventLog",
-            "Microsoft.Extensions.Logging.EventSource",
-            "Microsoft.Extensions.Logging.TraceSource",
-            "Microsoft.Extensions.ObjectPool",
-            "Microsoft.Extensions.Options",
-            "Microsoft.Extensions.Options.ConfigurationExtensions",
-            "Microsoft.Extensions.Options.DataAnnotations",
-            "Microsoft.Extensions.Primitives",
-            "Microsoft.Extensions.WebEncoders",
-            "Microsoft.JSInterop",
-            "Microsoft.Net.Http.Headers",
-            "Microsoft.Win32.SystemEvents",
-            "System.Diagnostics.EventLog",
-            "System.Drawing.Common",
-            "System.IO.Pipelines",
-            "System.Security.Cryptography.Pkcs",
-            "System.Security.Cryptography.Xml",
-            "System.Security.Permissions",
-            "System.Windows.Extensions"
-        };
+        public static List<string> ListedSharedFxAssemblies;
+        public static SortedDictionary<string, string> ListedTargetingPackAssemblies;
 
-        public static HashSet<string> ListedTargetingPackAssemblies = new HashSet<string>
+        static TestData()
         {
-            "Microsoft.AspNetCore",
-            "Microsoft.AspNetCore.Antiforgery",
-            "Microsoft.AspNetCore.Authentication",
-            "Microsoft.AspNetCore.Authentication.Abstractions",
-            "Microsoft.AspNetCore.Authentication.Cookies",
-            "Microsoft.AspNetCore.Authentication.Core",
-            "Microsoft.AspNetCore.Authentication.OAuth",
-            "Microsoft.AspNetCore.Authorization",
-            "Microsoft.AspNetCore.Authorization.Policy",
-            "Microsoft.AspNetCore.Components",
-            "Microsoft.AspNetCore.Components.Authorization",
-            "Microsoft.AspNetCore.Components.Forms",
-            "Microsoft.AspNetCore.Components.Server",
-            "Microsoft.AspNetCore.Components.Web",
-            "Microsoft.AspNetCore.Connections.Abstractions",
-            "Microsoft.AspNetCore.CookiePolicy",
-            "Microsoft.AspNetCore.Cors",
-            "Microsoft.AspNetCore.Cryptography.Internal",
-            "Microsoft.AspNetCore.Cryptography.KeyDerivation",
-            "Microsoft.AspNetCore.DataProtection",
-            "Microsoft.AspNetCore.DataProtection.Abstractions",
-            "Microsoft.AspNetCore.DataProtection.Extensions",
-            "Microsoft.AspNetCore.Diagnostics",
-            "Microsoft.AspNetCore.Diagnostics.Abstractions",
-            "Microsoft.AspNetCore.Diagnostics.HealthChecks",
-            "Microsoft.AspNetCore.HostFiltering",
-            "Microsoft.AspNetCore.Hosting",
-            "Microsoft.AspNetCore.Hosting.Abstractions",
-            "Microsoft.AspNetCore.Hosting.Server.Abstractions",
-            "Microsoft.AspNetCore.Html.Abstractions",
-            "Microsoft.AspNetCore.Http",
-            "Microsoft.AspNetCore.Http.Abstractions",
-            "Microsoft.AspNetCore.Http.Connections",
-            "Microsoft.AspNetCore.Http.Connections.Common",
-            "Microsoft.AspNetCore.Http.Extensions",
-            "Microsoft.AspNetCore.Http.Features",
-            "Microsoft.AspNetCore.HttpOverrides",
-            "Microsoft.AspNetCore.HttpsPolicy",
-            "Microsoft.AspNetCore.Identity",
-            "Microsoft.AspNetCore.Localization",
-            "Microsoft.AspNetCore.Localization.Routing",
-            "Microsoft.AspNetCore.Metadata",
-            "Microsoft.AspNetCore.Mvc",
-            "Microsoft.AspNetCore.Mvc.Abstractions",
-            "Microsoft.AspNetCore.Mvc.ApiExplorer",
-            "Microsoft.AspNetCore.Mvc.Core",
-            "Microsoft.AspNetCore.Mvc.Cors",
-            "Microsoft.AspNetCore.Mvc.DataAnnotations",
-            "Microsoft.AspNetCore.Mvc.Formatters.Json",
-            "Microsoft.AspNetCore.Mvc.Formatters.Xml",
-            "Microsoft.AspNetCore.Mvc.Localization",
-            "Microsoft.AspNetCore.Mvc.Razor",
-            "Microsoft.AspNetCore.Mvc.RazorPages",
-            "Microsoft.AspNetCore.Mvc.TagHelpers",
-            "Microsoft.AspNetCore.Mvc.ViewFeatures",
-            "Microsoft.AspNetCore.Razor",
-            "Microsoft.AspNetCore.Razor.Runtime",
-            "Microsoft.AspNetCore.ResponseCaching",
-            "Microsoft.AspNetCore.ResponseCaching.Abstractions",
-            "Microsoft.AspNetCore.ResponseCompression",
-            "Microsoft.AspNetCore.Rewrite",
-            "Microsoft.AspNetCore.Routing",
-            "Microsoft.AspNetCore.Routing.Abstractions",
-            "Microsoft.AspNetCore.Server.HttpSys",
-            "Microsoft.AspNetCore.Server.IIS",
-            "Microsoft.AspNetCore.Server.IISIntegration",
-            "Microsoft.AspNetCore.Server.Kestrel",
-            "Microsoft.AspNetCore.Server.Kestrel.Core",
-            "Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets",
-            "Microsoft.AspNetCore.Session",
-            "Microsoft.AspNetCore.SignalR",
-            "Microsoft.AspNetCore.SignalR.Common",
-            "Microsoft.AspNetCore.SignalR.Core",
-            "Microsoft.AspNetCore.SignalR.Protocols.Json",
-            "Microsoft.AspNetCore.StaticFiles",
-            "Microsoft.AspNetCore.WebSockets",
-            "Microsoft.AspNetCore.WebUtilities",
-            "Microsoft.Extensions.Caching.Abstractions",
-            "Microsoft.Extensions.Caching.Memory",
-            "Microsoft.Extensions.Configuration",
-            "Microsoft.Extensions.Configuration.Abstractions",
-            "Microsoft.Extensions.Configuration.Binder",
-            "Microsoft.Extensions.Configuration.CommandLine",
-            "Microsoft.Extensions.Configuration.EnvironmentVariables",
-            "Microsoft.Extensions.Configuration.FileExtensions",
-            "Microsoft.Extensions.Configuration.Ini",
-            "Microsoft.Extensions.Configuration.Json",
-            "Microsoft.Extensions.Configuration.KeyPerFile",
-            "Microsoft.Extensions.Configuration.UserSecrets",
-            "Microsoft.Extensions.Configuration.Xml",
-            "Microsoft.Extensions.DependencyInjection",
-            "Microsoft.Extensions.DependencyInjection.Abstractions",
-            "Microsoft.Extensions.Diagnostics.HealthChecks",
-            "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions",
-            "Microsoft.Extensions.FileProviders.Abstractions",
-            "Microsoft.Extensions.FileProviders.Composite",
-            "Microsoft.Extensions.FileProviders.Embedded",
-            "Microsoft.Extensions.FileProviders.Physical",
-            "Microsoft.Extensions.FileSystemGlobbing",
-            "Microsoft.Extensions.Hosting",
-            "Microsoft.Extensions.Hosting.Abstractions",
-            "Microsoft.Extensions.Http",
-            "Microsoft.Extensions.Identity.Core",
-            "Microsoft.Extensions.Identity.Stores",
-            "Microsoft.Extensions.Localization",
-            "Microsoft.Extensions.Localization.Abstractions",
-            "Microsoft.Extensions.Logging",
-            "Microsoft.Extensions.Logging.Abstractions",
-            "Microsoft.Extensions.Logging.Configuration",
-            "Microsoft.Extensions.Logging.Console",
-            "Microsoft.Extensions.Logging.Debug",
-            "Microsoft.Extensions.Logging.EventLog",
-            "Microsoft.Extensions.Logging.EventSource",
-            "Microsoft.Extensions.Logging.TraceSource",
-            "Microsoft.Extensions.ObjectPool",
-            "Microsoft.Extensions.Options",
-            "Microsoft.Extensions.Options.ConfigurationExtensions",
-            "Microsoft.Extensions.Options.DataAnnotations",
-            "Microsoft.Extensions.Primitives",
-            "Microsoft.Extensions.WebEncoders",
-            "Microsoft.JSInterop",
-            "Microsoft.Net.Http.Headers",
-            "Microsoft.Win32.Registry",
-            "System.Diagnostics.EventLog",
-            "System.IO.Pipelines",
-            "System.Security.AccessControl",
-            "System.Security.Cryptography.Cng",
-            "System.Security.Cryptography.Xml",
-            "System.Security.Permissions",
-            "System.Security.Principal.Windows",
-            "System.Windows.Extensions"
-        };
+            ListedSharedFxAssemblies = new List<string>()
+            {
+                "aspnetcorev2_inprocess",
+                "Microsoft.AspNetCore",
+                "Microsoft.AspNetCore.Antiforgery",
+                "Microsoft.AspNetCore.Authentication",
+                "Microsoft.AspNetCore.Authentication.Abstractions",
+                "Microsoft.AspNetCore.Authentication.Cookies",
+                "Microsoft.AspNetCore.Authentication.Core",
+                "Microsoft.AspNetCore.Authentication.OAuth",
+                "Microsoft.AspNetCore.Authorization",
+                "Microsoft.AspNetCore.Authorization.Policy",
+                "Microsoft.AspNetCore.Components",
+                "Microsoft.AspNetCore.Components.Authorization",
+                "Microsoft.AspNetCore.Components.Forms",
+                "Microsoft.AspNetCore.Components.Server",
+                "Microsoft.AspNetCore.Components.Web",
+                "Microsoft.AspNetCore.Connections.Abstractions",
+                "Microsoft.AspNetCore.CookiePolicy",
+                "Microsoft.AspNetCore.Cors",
+                "Microsoft.AspNetCore.Cryptography.Internal",
+                "Microsoft.AspNetCore.Cryptography.KeyDerivation",
+                "Microsoft.AspNetCore.DataProtection",
+                "Microsoft.AspNetCore.DataProtection.Abstractions",
+                "Microsoft.AspNetCore.DataProtection.Extensions",
+                "Microsoft.AspNetCore.Diagnostics",
+                "Microsoft.AspNetCore.Diagnostics.Abstractions",
+                "Microsoft.AspNetCore.Diagnostics.HealthChecks",
+                "Microsoft.AspNetCore.HostFiltering",
+                "Microsoft.AspNetCore.Hosting",
+                "Microsoft.AspNetCore.Hosting.Abstractions",
+                "Microsoft.AspNetCore.Hosting.Server.Abstractions",
+                "Microsoft.AspNetCore.Html.Abstractions",
+                "Microsoft.AspNetCore.Http",
+                "Microsoft.AspNetCore.Http.Abstractions",
+                "Microsoft.AspNetCore.Http.Connections",
+                "Microsoft.AspNetCore.Http.Connections.Common",
+                "Microsoft.AspNetCore.Http.Extensions",
+                "Microsoft.AspNetCore.Http.Features",
+                "Microsoft.AspNetCore.HttpOverrides",
+                "Microsoft.AspNetCore.HttpsPolicy",
+                "Microsoft.AspNetCore.Identity",
+                "Microsoft.AspNetCore.Localization",
+                "Microsoft.AspNetCore.Localization.Routing",
+                "Microsoft.AspNetCore.Metadata",
+                "Microsoft.AspNetCore.Mvc",
+                "Microsoft.AspNetCore.Mvc.Abstractions",
+                "Microsoft.AspNetCore.Mvc.ApiExplorer",
+                "Microsoft.AspNetCore.Mvc.Core",
+                "Microsoft.AspNetCore.Mvc.Cors",
+                "Microsoft.AspNetCore.Mvc.DataAnnotations",
+                "Microsoft.AspNetCore.Mvc.Formatters.Json",
+                "Microsoft.AspNetCore.Mvc.Formatters.Xml",
+                "Microsoft.AspNetCore.Mvc.Localization",
+                "Microsoft.AspNetCore.Mvc.Razor",
+                "Microsoft.AspNetCore.Mvc.RazorPages",
+                "Microsoft.AspNetCore.Mvc.TagHelpers",
+                "Microsoft.AspNetCore.Mvc.ViewFeatures",
+                "Microsoft.AspNetCore.Razor",
+                "Microsoft.AspNetCore.Razor.Runtime",
+                "Microsoft.AspNetCore.ResponseCaching",
+                "Microsoft.AspNetCore.ResponseCaching.Abstractions",
+                "Microsoft.AspNetCore.ResponseCompression",
+                "Microsoft.AspNetCore.Rewrite",
+                "Microsoft.AspNetCore.Routing",
+                "Microsoft.AspNetCore.Routing.Abstractions",
+                "Microsoft.AspNetCore.Server.HttpSys",
+                "Microsoft.AspNetCore.Server.IIS",
+                "Microsoft.AspNetCore.Server.IISIntegration",
+                "Microsoft.AspNetCore.Server.Kestrel",
+                "Microsoft.AspNetCore.Server.Kestrel.Core",
+                "Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets",
+                "Microsoft.AspNetCore.Session",
+                "Microsoft.AspNetCore.SignalR",
+                "Microsoft.AspNetCore.SignalR.Common",
+                "Microsoft.AspNetCore.SignalR.Core",
+                "Microsoft.AspNetCore.SignalR.Protocols.Json",
+                "Microsoft.AspNetCore.StaticFiles",
+                "Microsoft.AspNetCore.WebSockets",
+                "Microsoft.AspNetCore.WebUtilities",
+                "Microsoft.Extensions.Caching.Abstractions",
+                "Microsoft.Extensions.Caching.Memory",
+                "Microsoft.Extensions.Configuration",
+                "Microsoft.Extensions.Configuration.Abstractions",
+                "Microsoft.Extensions.Configuration.Binder",
+                "Microsoft.Extensions.Configuration.CommandLine",
+                "Microsoft.Extensions.Configuration.EnvironmentVariables",
+                "Microsoft.Extensions.Configuration.FileExtensions",
+                "Microsoft.Extensions.Configuration.Ini",
+                "Microsoft.Extensions.Configuration.Json",
+                "Microsoft.Extensions.Configuration.KeyPerFile",
+                "Microsoft.Extensions.Configuration.UserSecrets",
+                "Microsoft.Extensions.Configuration.Xml",
+                "Microsoft.Extensions.DependencyInjection",
+                "Microsoft.Extensions.DependencyInjection.Abstractions",
+                "Microsoft.Extensions.Diagnostics.HealthChecks",
+                "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions",
+                "Microsoft.Extensions.FileProviders.Abstractions",
+                "Microsoft.Extensions.FileProviders.Composite",
+                "Microsoft.Extensions.FileProviders.Embedded",
+                "Microsoft.Extensions.FileProviders.Physical",
+                "Microsoft.Extensions.FileSystemGlobbing",
+                "Microsoft.Extensions.Hosting",
+                "Microsoft.Extensions.Hosting.Abstractions",
+                "Microsoft.Extensions.Http",
+                "Microsoft.Extensions.Identity.Core",
+                "Microsoft.Extensions.Identity.Stores",
+                "Microsoft.Extensions.Localization",
+                "Microsoft.Extensions.Localization.Abstractions",
+                "Microsoft.Extensions.Logging",
+                "Microsoft.Extensions.Logging.Abstractions",
+                "Microsoft.Extensions.Logging.Configuration",
+                "Microsoft.Extensions.Logging.Console",
+                "Microsoft.Extensions.Logging.Debug",
+                "Microsoft.Extensions.Logging.EventLog",
+                "Microsoft.Extensions.Logging.EventSource",
+                "Microsoft.Extensions.Logging.TraceSource",
+                "Microsoft.Extensions.ObjectPool",
+                "Microsoft.Extensions.Options",
+                "Microsoft.Extensions.Options.ConfigurationExtensions",
+                "Microsoft.Extensions.Options.DataAnnotations",
+                "Microsoft.Extensions.Primitives",
+                "Microsoft.Extensions.WebEncoders",
+                "Microsoft.JSInterop",
+                "Microsoft.Net.Http.Headers",
+                "Microsoft.Win32.SystemEvents",
+                "System.Diagnostics.EventLog",
+                "System.Drawing.Common",
+                "System.IO.Pipelines",
+                "System.Security.Cryptography.Pkcs",
+                "System.Security.Cryptography.Xml",
+                "System.Security.Permissions",
+                "System.Windows.Extensions"
+            };
+            ListedTargetingPackAssemblies = new SortedDictionary<string, string>
+            {
+                { "Microsoft.AspNetCore", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Antiforgery", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Authentication", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Authentication.Abstractions", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Authentication.Cookies", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Authentication.Core", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Authentication.OAuth", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Authorization", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Authorization.Policy", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Components", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Components.Authorization", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Components.Forms", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Components.Server", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Components.Web", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Connections.Abstractions", "5.0.0.0" },
+                { "Microsoft.AspNetCore.CookiePolicy", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Cors", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Cryptography.Internal", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Cryptography.KeyDerivation", "5.0.0.0" },
+                { "Microsoft.AspNetCore.DataProtection", "5.0.0.0" },
+                { "Microsoft.AspNetCore.DataProtection.Abstractions", "5.0.0.0" },
+                { "Microsoft.AspNetCore.DataProtection.Extensions", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Diagnostics", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Diagnostics.Abstractions", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Diagnostics.HealthChecks", "5.0.0.0" },
+                { "Microsoft.AspNetCore.HostFiltering", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Hosting", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Hosting.Abstractions", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Hosting.Server.Abstractions", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Html.Abstractions", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Http", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Http.Abstractions", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Http.Connections", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Http.Connections.Common", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Http.Extensions", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Http.Features", "5.0.0.0" },
+                { "Microsoft.AspNetCore.HttpOverrides", "5.0.0.0" },
+                { "Microsoft.AspNetCore.HttpsPolicy", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Identity", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Localization", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Localization.Routing", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Metadata", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Mvc", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Mvc.Abstractions", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Mvc.ApiExplorer", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Mvc.Core", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Mvc.Cors", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Mvc.DataAnnotations", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Mvc.Formatters.Json", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Mvc.Formatters.Xml", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Mvc.Localization", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Mvc.Razor", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Mvc.RazorPages", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Mvc.TagHelpers", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Mvc.ViewFeatures", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Razor", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Razor.Runtime", "5.0.0.0" },
+                { "Microsoft.AspNetCore.ResponseCaching", "5.0.0.0" },
+                { "Microsoft.AspNetCore.ResponseCaching.Abstractions", "5.0.0.0" },
+                { "Microsoft.AspNetCore.ResponseCompression", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Rewrite", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Routing", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Routing.Abstractions", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Server.HttpSys", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Server.IIS", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Server.IISIntegration", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Server.Kestrel", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Server.Kestrel.Core", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets", "5.0.0.0" },
+                { "Microsoft.AspNetCore.Session", "5.0.0.0" },
+                { "Microsoft.AspNetCore.SignalR", "5.0.0.0" },
+                { "Microsoft.AspNetCore.SignalR.Common", "5.0.0.0" },
+                { "Microsoft.AspNetCore.SignalR.Core", "5.0.0.0" },
+                { "Microsoft.AspNetCore.SignalR.Protocols.Json", "5.0.0.0" },
+                { "Microsoft.AspNetCore.StaticFiles", "5.0.0.0" },
+                { "Microsoft.AspNetCore.WebSockets", "5.0.0.0" },
+                { "Microsoft.AspNetCore.WebUtilities", "5.0.0.0" },
+                { "Microsoft.Extensions.Caching.Abstractions", "5.0.0.0" },
+                { "Microsoft.Extensions.Caching.Memory", "5.0.0.0" },
+                { "Microsoft.Extensions.Configuration", "5.0.0.0" },
+                { "Microsoft.Extensions.Configuration.Abstractions", "5.0.0.0" },
+                { "Microsoft.Extensions.Configuration.Binder", "5.0.0.0" },
+                { "Microsoft.Extensions.Configuration.CommandLine", "5.0.0.0" },
+                { "Microsoft.Extensions.Configuration.EnvironmentVariables", "5.0.0.0" },
+                { "Microsoft.Extensions.Configuration.FileExtensions", "5.0.0.0" },
+                { "Microsoft.Extensions.Configuration.Ini", "5.0.0.0" },
+                { "Microsoft.Extensions.Configuration.Json", "5.0.0.0" },
+                { "Microsoft.Extensions.Configuration.KeyPerFile", "5.0.0.0" },
+                { "Microsoft.Extensions.Configuration.UserSecrets", "5.0.0.0" },
+                { "Microsoft.Extensions.Configuration.Xml", "5.0.0.0" },
+                { "Microsoft.Extensions.DependencyInjection", "5.0.0.0" },
+                { "Microsoft.Extensions.DependencyInjection.Abstractions", "5.0.0.0" },
+                { "Microsoft.Extensions.Diagnostics.HealthChecks", "5.0.0.0" },
+                { "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions", "5.0.0.0" },
+                { "Microsoft.Extensions.FileProviders.Abstractions", "5.0.0.0" },
+                { "Microsoft.Extensions.FileProviders.Composite", "5.0.0.0" },
+                { "Microsoft.Extensions.FileProviders.Embedded", "5.0.0.0" },
+                { "Microsoft.Extensions.FileProviders.Physical", "5.0.0.0" },
+                { "Microsoft.Extensions.FileSystemGlobbing", "5.0.0.0" },
+                { "Microsoft.Extensions.Hosting", "5.0.0.0" },
+                { "Microsoft.Extensions.Hosting.Abstractions", "5.0.0.0" },
+                { "Microsoft.Extensions.Http", "5.0.0.0" },
+                { "Microsoft.Extensions.Identity.Core", "5.0.0.0" },
+                { "Microsoft.Extensions.Identity.Stores", "5.0.0.0" },
+                { "Microsoft.Extensions.Localization", "5.0.0.0" },
+                { "Microsoft.Extensions.Localization.Abstractions", "5.0.0.0" },
+                { "Microsoft.Extensions.Logging", "5.0.0.0" },
+                { "Microsoft.Extensions.Logging.Abstractions", "5.0.0.0" },
+                { "Microsoft.Extensions.Logging.Configuration", "5.0.0.0" },
+                { "Microsoft.Extensions.Logging.Console", "5.0.0.0" },
+                { "Microsoft.Extensions.Logging.Debug", "5.0.0.0" },
+                { "Microsoft.Extensions.Logging.EventLog", "5.0.0.0" },
+                { "Microsoft.Extensions.Logging.EventSource", "5.0.0.0" },
+                { "Microsoft.Extensions.Logging.TraceSource", "5.0.0.0" },
+                { "Microsoft.Extensions.ObjectPool", "5.0.0.0" },
+                { "Microsoft.Extensions.Options", "5.0.0.0" },
+                { "Microsoft.Extensions.Options.ConfigurationExtensions", "5.0.0.0" },
+                { "Microsoft.Extensions.Options.DataAnnotations", "5.0.0.0" },
+                { "Microsoft.Extensions.Primitives", "5.0.0.0" },
+                { "Microsoft.Extensions.WebEncoders", "5.0.0.0" },
+                { "Microsoft.JSInterop", "5.0.0.0" },
+                { "Microsoft.Net.Http.Headers", "5.0.0.0" },
+                { "Microsoft.Win32.Registry", "5.0.0.0" },
+                { "System.Diagnostics.EventLog", "5.0.0.0" },
+                { "System.IO.Pipelines", "5.0.0.0" },
+                { "System.Security.AccessControl", "5.0.0.0" },
+                { "System.Security.Cryptography.Cng", "5.0.0.0" },
+                { "System.Security.Cryptography.Xml", "5.0.0.0" },
+                { "System.Security.Permissions", "5.0.0.0" },
+                { "System.Security.Principal.Windows", "5.0.0.0" },
+                { "System.Windows.Extensions", "5.0.0.0" }
+            };
+
+            if (!VerifyAncmBinary())
+            {
+                ListedSharedFxAssemblies.Remove("aspnetcorev2_inprocess");
+            }
+        }
 
         public static string GetSharedFxVersion() => GetTestDataValue("SharedFxVersion");