From 4a7bf75e89e3dfe7264a641ed041f50788d28d20 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 18 Sep 2019 19:15:49 +0000
Subject: [PATCH] [master] Update dependencies from 3 repositories (#13548)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Skip/disable tests in 2.2 for IIS (#12985)

* Skip/disable tests in 2.2 for IIS

* Update ServicesTests.cs

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190813.3

- Microsoft.NET.Sdk.Razor - 3.0.0-preview9.19413.3
- Microsoft.CodeAnalysis.Razor - 3.0.0-preview9.19413.3
- Microsoft.AspNetCore.Razor.Language - 3.0.0-preview9.19413.3
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.0-preview9.19413.3

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190813.10

- Microsoft.EntityFrameworkCore.Tools - 3.0.0-preview9.19413.10
- Microsoft.EntityFrameworkCore.SqlServer - 3.0.0-preview9.19413.10
- dotnet-ef - 3.0.0-preview9.19413.10
- Microsoft.EntityFrameworkCore - 3.0.0-preview9.19413.10
- Microsoft.EntityFrameworkCore.InMemory - 3.0.0-preview9.19413.10
- Microsoft.EntityFrameworkCore.Relational - 3.0.0-preview9.19413.10
- Microsoft.EntityFrameworkCore.Sqlite - 3.0.0-preview9.19413.10

Dependency coherency updates

- Microsoft.AspNetCore.Analyzer.Testing - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ActivatorUtilities.Sources - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Abstractions - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Memory - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.SqlServer - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.StackExchangeRedis - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Abstractions - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.AzureKeyVault - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Binder - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.CommandLine - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.FileExtensions - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Ini - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Json - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.KeyPerFile - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.UserSecrets - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Xml - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection.Abstractions - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DiagnosticAdapter - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Abstractions - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Composite - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Embedded - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Physical - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileSystemGlobbing - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting.Abstractions - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Http - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization.Abstractions - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Abstractions - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.AzureAppServices - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Configuration - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Console - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Debug - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventSource - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventLog - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.TraceSource - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Testing - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ObjectPool - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.ConfigurationExtensions - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.DataAnnotations - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ParameterDefaultValue.Sources - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Primitives - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.TypeNameHelper.Sources - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ValueStopwatch.Sources - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.WebEncoders - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Internal.Extensions.Refs - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.JSInterop - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Mono.WebAssembly.Interop - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview9-19411-11 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.Logging - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyModel - 3.0.0-preview9-19411-11 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 3.0.0-preview9-19411-11 (parent: Microsoft.Extensions.Logging)
- NETStandard.Library.Ref - 2.1.0-preview9-19411-11 (parent: Microsoft.Extensions.Logging)
- Internal.AspNetCore.Analyzers - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.Testing - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190813.14

- Microsoft.EntityFrameworkCore.Tools - 3.0.0-preview9.19413.14
- Microsoft.EntityFrameworkCore.SqlServer - 3.0.0-preview9.19413.14
- dotnet-ef - 3.0.0-preview9.19413.14
- Microsoft.EntityFrameworkCore - 3.0.0-preview9.19413.14
- Microsoft.EntityFrameworkCore.InMemory - 3.0.0-preview9.19413.14
- Microsoft.EntityFrameworkCore.Relational - 3.0.0-preview9.19413.14
- Microsoft.EntityFrameworkCore.Sqlite - 3.0.0-preview9.19413.14

Dependency coherency updates

- Microsoft.AspNetCore.Analyzer.Testing - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ActivatorUtilities.Sources - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Abstractions - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Memory - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.SqlServer - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.StackExchangeRedis - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Abstractions - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.AzureKeyVault - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Binder - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.CommandLine - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.FileExtensions - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Ini - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Json - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.KeyPerFile - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.UserSecrets - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Xml - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection.Abstractions - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DiagnosticAdapter - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Abstractions - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Composite - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Embedded - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Physical - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileSystemGlobbing - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting.Abstractions - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Http - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization.Abstractions - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Abstractions - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.AzureAppServices - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Configuration - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Console - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Debug - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventSource - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventLog - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.TraceSource - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Testing - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ObjectPool - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.ConfigurationExtensions - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.DataAnnotations - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ParameterDefaultValue.Sources - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Primitives - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.TypeNameHelper.Sources - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ValueStopwatch.Sources - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.WebEncoders - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Internal.Extensions.Refs - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.JSInterop - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Mono.WebAssembly.Interop - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview9-19411-11 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.Logging - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyModel - 3.0.0-preview9-19411-11 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 3.0.0-preview9-19411-11 (parent: Microsoft.Extensions.Logging)
- NETStandard.Library.Ref - 2.1.0-preview9-19411-11 (parent: Microsoft.Extensions.Logging)
- Internal.AspNetCore.Analyzers - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.Testing - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190814.3

- Microsoft.NET.Sdk.Razor - 3.0.0-preview9.19414.3
- Microsoft.CodeAnalysis.Razor - 3.0.0-preview9.19414.3
- Microsoft.AspNetCore.Razor.Language - 3.0.0-preview9.19414.3
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.0-preview9.19414.3

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190814.3

- Microsoft.EntityFrameworkCore.Tools - 3.0.0-preview9.19414.3
- Microsoft.EntityFrameworkCore.SqlServer - 3.0.0-preview9.19414.3
- dotnet-ef - 3.0.0-preview9.19414.3
- Microsoft.EntityFrameworkCore - 3.0.0-preview9.19414.3
- Microsoft.EntityFrameworkCore.InMemory - 3.0.0-preview9.19414.3
- Microsoft.EntityFrameworkCore.Relational - 3.0.0-preview9.19414.3
- Microsoft.EntityFrameworkCore.Sqlite - 3.0.0-preview9.19414.3

Dependency coherency updates

- Microsoft.AspNetCore.Analyzer.Testing - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ActivatorUtilities.Sources - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Abstractions - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Memory - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.SqlServer - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.StackExchangeRedis - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Abstractions - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.AzureKeyVault - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Binder - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.CommandLine - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.FileExtensions - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Ini - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Json - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.KeyPerFile - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.UserSecrets - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Xml - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection.Abstractions - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DiagnosticAdapter - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Abstractions - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Composite - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Embedded - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Physical - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileSystemGlobbing - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting.Abstractions - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Http - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization.Abstractions - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Abstractions - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.AzureAppServices - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Configuration - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Console - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Debug - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventSource - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventLog - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.TraceSource - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Testing - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ObjectPool - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.ConfigurationExtensions - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.DataAnnotations - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ParameterDefaultValue.Sources - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Primitives - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.TypeNameHelper.Sources - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ValueStopwatch.Sources - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.WebEncoders - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Internal.Extensions.Refs - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.JSInterop - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Mono.WebAssembly.Interop - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview9-19411-11 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.Logging - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyModel - 3.0.0-preview9-19411-11 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 3.0.0-preview9-19411-11 (parent: Microsoft.Extensions.Logging)
- NETStandard.Library.Ref - 2.1.0-preview9-19411-11 (parent: Microsoft.Extensions.Logging)
- Internal.AspNetCore.Analyzers - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.Testing - 3.0.0-preview9.19412.2 (parent: Microsoft.EntityFrameworkCore)

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190814.8

- Microsoft.EntityFrameworkCore.Tools - 3.0.0-preview9.19414.8
- Microsoft.EntityFrameworkCore.SqlServer - 3.0.0-preview9.19414.8
- dotnet-ef - 3.0.0-preview9.19414.8
- Microsoft.EntityFrameworkCore - 3.0.0-preview9.19414.8
- Microsoft.EntityFrameworkCore.InMemory - 3.0.0-preview9.19414.8
- Microsoft.EntityFrameworkCore.Relational - 3.0.0-preview9.19414.8
- Microsoft.EntityFrameworkCore.Sqlite - 3.0.0-preview9.19414.8

Dependency coherency updates

- Microsoft.AspNetCore.Analyzer.Testing - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ActivatorUtilities.Sources - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Abstractions - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Memory - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.SqlServer - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.StackExchangeRedis - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Abstractions - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.AzureKeyVault - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Binder - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.CommandLine - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.FileExtensions - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Ini - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Json - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.KeyPerFile - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.UserSecrets - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Xml - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection.Abstractions - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DiagnosticAdapter - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Abstractions - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Composite - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Embedded - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Physical - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileSystemGlobbing - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting.Abstractions - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Http - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization.Abstractions - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Abstractions - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.AzureAppServices - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Configuration - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Console - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Debug - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventSource - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventLog - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.TraceSource - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Testing - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ObjectPool - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.ConfigurationExtensions - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.DataAnnotations - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ParameterDefaultValue.Sources - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Primitives - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.TypeNameHelper.Sources - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ValueStopwatch.Sources - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.WebEncoders - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Internal.Extensions.Refs - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.JSInterop - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Mono.WebAssembly.Interop - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview9-19414-02 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.Logging - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyModel - 3.0.0-preview9-19414-02 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 3.0.0-preview9-19414-02 (parent: Microsoft.Extensions.Logging)
- NETStandard.Library.Ref - 2.1.0-preview9-19414-02 (parent: Microsoft.Extensions.Logging)
- Internal.AspNetCore.Analyzers - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.Testing - 3.0.0-preview9.19414.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Net.Compilers.Toolset - 3.3.0-beta3-19413-08 (parent: Microsoft.Extensions.Logging)

* React to JSRuntime changes

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190815.5

- Microsoft.NET.Sdk.Razor - 3.0.0-preview9.19415.5
- Microsoft.CodeAnalysis.Razor - 3.0.0-preview9.19415.5
- Microsoft.AspNetCore.Razor.Language - 3.0.0-preview9.19415.5
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.0-preview9.19415.5

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190815.5

- Microsoft.EntityFrameworkCore.Tools - 3.0.0-preview9.19415.5
- Microsoft.EntityFrameworkCore.SqlServer - 3.0.0-preview9.19415.5
- dotnet-ef - 3.0.0-preview9.19415.5
- Microsoft.EntityFrameworkCore - 3.0.0-preview9.19415.5
- Microsoft.EntityFrameworkCore.InMemory - 3.0.0-preview9.19415.5
- Microsoft.EntityFrameworkCore.Relational - 3.0.0-preview9.19415.5
- Microsoft.EntityFrameworkCore.Sqlite - 3.0.0-preview9.19415.5

* Dependency coherency updates

- Microsoft.AspNetCore.Analyzer.Testing - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ActivatorUtilities.Sources - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Abstractions - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Memory - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.SqlServer - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.StackExchangeRedis - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Abstractions - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.AzureKeyVault - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Binder - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.CommandLine - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.FileExtensions - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Ini - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Json - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.KeyPerFile - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.UserSecrets - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Xml - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection.Abstractions - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DiagnosticAdapter - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Abstractions - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Composite - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Embedded - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Physical - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileSystemGlobbing - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting.Abstractions - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Http - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization.Abstractions - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Abstractions - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.AzureAppServices - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Configuration - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Console - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Debug - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventSource - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventLog - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.TraceSource - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Testing - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ObjectPool - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.ConfigurationExtensions - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.DataAnnotations - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ParameterDefaultValue.Sources - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Primitives - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.TypeNameHelper.Sources - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ValueStopwatch.Sources - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.WebEncoders - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Internal.Extensions.Refs - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.JSInterop - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Mono.WebAssembly.Interop - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview9-19414-17 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.Logging - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyModel - 3.0.0-preview9-19414-17 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 3.0.0-preview9-19414-17 (parent: Microsoft.Extensions.Logging)
- NETStandard.Library.Ref - 2.1.0-preview9-19414-17 (parent: Microsoft.Extensions.Logging)
- Internal.AspNetCore.Analyzers - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.Testing - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Net.Compilers.Toolset - 3.3.0-beta3-19415-01 (parent: Microsoft.Extensions.Logging)

* React to extensions changes

* refs

* fix xunit namespace

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190815.10

- Microsoft.NET.Sdk.Razor - 3.0.0-preview9.19415.10
- Microsoft.CodeAnalysis.Razor - 3.0.0-preview9.19415.10
- Microsoft.AspNetCore.Razor.Language - 3.0.0-preview9.19415.10
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.0-preview9.19415.10

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190815.12

- Microsoft.EntityFrameworkCore.Tools - 3.0.0-preview9.19415.12
- Microsoft.EntityFrameworkCore.SqlServer - 3.0.0-preview9.19415.12
- dotnet-ef - 3.0.0-preview9.19415.12
- Microsoft.EntityFrameworkCore - 3.0.0-preview9.19415.12
- Microsoft.EntityFrameworkCore.InMemory - 3.0.0-preview9.19415.12
- Microsoft.EntityFrameworkCore.Relational - 3.0.0-preview9.19415.12
- Microsoft.EntityFrameworkCore.Sqlite - 3.0.0-preview9.19415.12

Dependency coherency updates

- Microsoft.AspNetCore.Analyzer.Testing - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ActivatorUtilities.Sources - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Abstractions - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Memory - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.SqlServer - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.StackExchangeRedis - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Abstractions - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.AzureKeyVault - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Binder - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.CommandLine - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.FileExtensions - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Ini - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Json - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.KeyPerFile - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.UserSecrets - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Xml - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection.Abstractions - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DiagnosticAdapter - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Abstractions - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Composite - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Embedded - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Physical - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileSystemGlobbing - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting.Abstractions - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Http - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization.Abstractions - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Abstractions - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.AzureAppServices - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Configuration - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Console - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Debug - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventSource - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventLog - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.TraceSource - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Testing - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ObjectPool - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.ConfigurationExtensions - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.DataAnnotations - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ParameterDefaultValue.Sources - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Primitives - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.TypeNameHelper.Sources - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ValueStopwatch.Sources - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.WebEncoders - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Internal.Extensions.Refs - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.JSInterop - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Mono.WebAssembly.Interop - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview9-19414-17 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.Logging - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyModel - 3.0.0-preview9-19414-17 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 3.0.0-preview9-19414-17 (parent: Microsoft.Extensions.Logging)
- NETStandard.Library.Ref - 2.1.0-preview9-19414-17 (parent: Microsoft.Extensions.Logging)
- Internal.AspNetCore.Analyzers - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.Testing - 3.0.0-preview9.19415.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Net.Compilers.Toolset - 3.3.0-beta3-19415-01 (parent: Microsoft.Extensions.Logging)

* Move public rendering types to .RenderTree

Fixes: #12552

We're not documenting these types for public use in this release. We
already have an analyzer implemented to chase you away from taking a
dependency.

* Remove ref:suppressField

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190815.11

- Microsoft.NET.Sdk.Razor - 3.0.0-preview9.19415.11
- Microsoft.CodeAnalysis.Razor - 3.0.0-preview9.19415.11
- Microsoft.AspNetCore.Razor.Language - 3.0.0-preview9.19415.11
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.0-preview9.19415.11

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190815.13

- Microsoft.EntityFrameworkCore.Tools - 3.0.0-preview9.19415.13
- Microsoft.EntityFrameworkCore.SqlServer - 3.0.0-preview9.19415.13
- dotnet-ef - 3.0.0-preview9.19415.13
- Microsoft.EntityFrameworkCore - 3.0.0-preview9.19415.13
- Microsoft.EntityFrameworkCore.InMemory - 3.0.0-preview9.19415.13
- Microsoft.EntityFrameworkCore.Relational - 3.0.0-preview9.19415.13
- Microsoft.EntityFrameworkCore.Sqlite - 3.0.0-preview9.19415.13

Dependency coherency updates

- Microsoft.AspNetCore.Analyzer.Testing - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ActivatorUtilities.Sources - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Abstractions - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Memory - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.SqlServer - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.StackExchangeRedis - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Abstractions - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.AzureKeyVault - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Binder - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.CommandLine - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.FileExtensions - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Ini - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Json - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.KeyPerFile - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.UserSecrets - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Xml - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection.Abstractions - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DiagnosticAdapter - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Abstractions - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Composite - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Embedded - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Physical - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileSystemGlobbing - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting.Abstractions - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Http - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization.Abstractions - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Abstractions - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.AzureAppServices - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Configuration - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Console - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Debug - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventSource - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventLog - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.TraceSource - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Testing - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ObjectPool - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.ConfigurationExtensions - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.DataAnnotations - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ParameterDefaultValue.Sources - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Primitives - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.TypeNameHelper.Sources - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ValueStopwatch.Sources - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.WebEncoders - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Internal.Extensions.Refs - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.JSInterop - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Mono.WebAssembly.Interop - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview9-19414-17 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.Logging - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyModel - 3.0.0-preview9-19414-17 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 3.0.0-preview9-19414-17 (parent: Microsoft.Extensions.Logging)
- NETStandard.Library.Ref - 2.1.0-preview9-19414-17 (parent: Microsoft.Extensions.Logging)
- Internal.AspNetCore.Analyzers - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.Testing - 3.0.0-preview9.19415.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Net.Compilers.Toolset - 3.3.0-beta3-19415-01 (parent: Microsoft.Extensions.Logging)

* React to more changes

* Create CircuitSecret

Fixes: #13012

This change introduces a circuit id 'secret' as the concept that's used when
doing handshaking between the client and the server, and makes CircuitId
(visible to user-code) a separate concept (not a secret, can't be used
to open a connection).

The scope of this grew once I realized that we probably shouldn't be
logging Circuit Secret in so many places, we should be logging CircuitId
as the piece of data we use for correlation, and try to keep the secret
out of logs except where really necessary (and with trace level).

I ended up creating a new type to represent the combination of the
circuit id and secret and prevent
accidental misuse, and then chased down all of the build errors.

As an extra detail, the circuit id is part of the data-protected payload
that's used as the secret. This way we can always get the id back from
the secret without any external storage.

* Rename DOM types and change namespace

Fixes: #12553

This change renames all of our browser/DOM specific types from
`UIFooEventArgs` to `FooEventArgs` and puts the in the `.Web` namespace.

In addition to this, we're moving `EventHandlers` and `BindAttributes`
to the same. This has the impact of scoping the mappings those classes
provide based on the `.Web` namespace.

This means that we now expect `.Web` to be present as a using in
basically all contexts for a browser-based Blazor app. Updated
templates, samples and tests. I'll also need to update about a million
tests in the compiler codebase.

I've logged https://github.com/aspnet/AspNetCore.Docs/issues/13832 to
track the docs and release notes part of this work.

* Fixup template

* Refine service reference warnings and errors
- #12792
- client:
  - add error if OpenAPI file does not exist
  - separate unsupported TFM case from targets being called when disabled
- server:
  - generalize multi-targeting handling in Microsoft.Extensions.ApiDescription.Server
    - add `$(_OpenApiGenerateDocumentsTFM)`, the TFM used when invoking inner build
    - default `$(OpenApiGenerateDocuments)` to 'true' only when a supported TFM exists
  - add separate error for non-existent cache file in `OpenApiGetDocuments` target
  - add error in `GetDocumentInsider` if no documents are found
    - make `<Warning />` in the targets file an `<Error />`
    - add more text to existing `ServiceNotFound` error
- both:
  - write errors to `stderr`
  - clean up top-level output for `Exception`s
    - stop writing the `Message` twice

* Correct "Open API" mentions; should be "OpenAPI"
  - change package tags and comments

* Add service reference projects to MvcNoDeps.slnf

nits:
- add "service reference" tag in Microsoft.Extensions.ApiDescription.* packages
- add "document generation" tag in Microsoft.Extensions.ApiDescription.Server package
- `.Trim()` TFM properties because `<TargetFrameworks>;netcoreapp3.0;;</TargetFrameworks>` is allowed
- don't use bold black for verbose messages
- reorder MSBuild property settings for readability

* Ignore overriden properties in component parameters (#13198)

* Ignore overriden properties in component parameters

* Modify MemberAssignment to return shadowed properties, but not inherited properties
* Modify ComponentProperties to throw if a Parameter property is non-public

Fixes https://github.com/aspnet/AspNetCore/issues/13162

* Update SDK to preview 8

* Move service reference projects into Tools directory (#13185)

- start of #4914 and #4896
- make infrastructure more accessible to these projects
- update list of projects
  - run `.\eng\scripts\GenerateProjectList.ps1`

* Remove site-extension workarounds (#13044)

* Fix build race (#13197)

* [release/3.0] Update dependencies from 3 repositories (#13205)

* Update dependencies from https://github.com/aspnet/Blazor build 20190816.1

- Microsoft.AspNetCore.Blazor.Mono - 3.0.0-preview9.19416.1

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190816.1

- Microsoft.NET.Sdk.Razor - 3.0.0-preview9.19416.1
- Microsoft.CodeAnalysis.Razor - 3.0.0-preview9.19416.1
- Microsoft.AspNetCore.Razor.Language - 3.0.0-preview9.19416.1
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.0-preview9.19416.1

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190816.8

- Microsoft.EntityFrameworkCore.Tools - 3.0.0-preview9.19416.8
- Microsoft.EntityFrameworkCore.SqlServer - 3.0.0-preview9.19416.8
- dotnet-ef - 3.0.0-preview9.19416.8
- Microsoft.EntityFrameworkCore - 3.0.0-preview9.19416.8
- Microsoft.EntityFrameworkCore.InMemory - 3.0.0-preview9.19416.8
- Microsoft.EntityFrameworkCore.Relational - 3.0.0-preview9.19416.8
- Microsoft.EntityFrameworkCore.Sqlite - 3.0.0-preview9.19416.8

* [release/3.0] Update dependencies from aspnet/EntityFrameworkCore (#13210)

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190816.12

- Microsoft.EntityFrameworkCore.Tools - 3.0.0-preview9.19416.12
- Microsoft.EntityFrameworkCore.SqlServer - 3.0.0-preview9.19416.12
- dotnet-ef - 3.0.0-preview9.19416.12
- Microsoft.EntityFrameworkCore - 3.0.0-preview9.19416.12
- Microsoft.EntityFrameworkCore.InMemory - 3.0.0-preview9.19416.12
- Microsoft.EntityFrameworkCore.Relational - 3.0.0-preview9.19416.12
- Microsoft.EntityFrameworkCore.Sqlite - 3.0.0-preview9.19416.12

Dependency coherency updates

- Microsoft.AspNetCore.Analyzer.Testing - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ActivatorUtilities.Sources - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Abstractions - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Memory - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.SqlServer - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.StackExchangeRedis - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Abstractions - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.AzureKeyVault - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Binder - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.CommandLine - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.FileExtensions - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Ini - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Json - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.KeyPerFile - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.UserSecrets - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Xml - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection.Abstractions - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DiagnosticAdapter - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Abstractions - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Composite - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Embedded - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Physical - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileSystemGlobbing - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting.Abstractions - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Http - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization.Abstractions - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Abstractions - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.AzureAppServices - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Configuration - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Console - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Debug - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventSource - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventLog - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.TraceSource - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Testing - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ObjectPool - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.ConfigurationExtensions - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.DataAnnotations - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ParameterDefaultValue.Sources - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Primitives - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.TypeNameHelper.Sources - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ValueStopwatch.Sources - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.WebEncoders - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Internal.Extensions.Refs - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.JSInterop - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Mono.WebAssembly.Interop - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview9-19416-01 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.Logging - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyModel - 3.0.0-preview9-19416-01 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 3.0.0-preview9-19416-01 (parent: Microsoft.Extensions.Logging)
- NETStandard.Library.Ref - 2.1.0-preview9-19416-01 (parent: Microsoft.Extensions.Logging)
- Internal.AspNetCore.Analyzers - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.Testing - 3.0.0-preview9.19416.7 (parent: Microsoft.EntityFrameworkCore)

* React to breaking changes

* [Blazor] Enables the client to initiate blazor server-side renders (#13147)

* [Blazor] Allows multiple components as entry points
* Removes all overloads that register a component statically with aborts
  selector.
* Updates render component to have a RenderMode parameter that indicates
  how the component must render. Valid values are Static, Server, and
  ServerPrerendered.
* When using Server or ServerPrerendered we emit marker comments into
  the page that are later used by blazor.server.js to bootrstrap a
  blazor server-side application.

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190817.1 (#13227)

- Microsoft.EntityFrameworkCore.Tools - 3.0.0-preview9.19417.1
- Microsoft.EntityFrameworkCore.SqlServer - 3.0.0-preview9.19417.1
- dotnet-ef - 3.0.0-preview9.19417.1
- Microsoft.EntityFrameworkCore - 3.0.0-preview9.19417.1
- Microsoft.EntityFrameworkCore.InMemory - 3.0.0-preview9.19417.1
- Microsoft.EntityFrameworkCore.Relational - 3.0.0-preview9.19417.1
- Microsoft.EntityFrameworkCore.Sqlite - 3.0.0-preview9.19417.1

* [release/3.0] Update dependencies from 2 repositories (#13244)

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190818.2

- Microsoft.NET.Sdk.Razor - 3.0.0-preview9.19418.2
- Microsoft.CodeAnalysis.Razor - 3.0.0-preview9.19418.2
- Microsoft.AspNetCore.Razor.Language - 3.0.0-preview9.19418.2
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.0-preview9.19418.2

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190818.1

- Microsoft.EntityFrameworkCore.Tools - 3.0.0-preview9.19418.1
- Microsoft.EntityFrameworkCore.SqlServer - 3.0.0-preview9.19418.1
- dotnet-ef - 3.0.0-preview9.19418.1
- Microsoft.EntityFrameworkCore - 3.0.0-preview9.19418.1
- Microsoft.EntityFrameworkCore.InMemory - 3.0.0-preview9.19418.1
- Microsoft.EntityFrameworkCore.Relational - 3.0.0-preview9.19418.1
- Microsoft.EntityFrameworkCore.Sqlite - 3.0.0-preview9.19418.1

Dependency coherency updates

- Microsoft.AspNetCore.Analyzer.Testing - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ActivatorUtilities.Sources - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Abstractions - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Memory - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.SqlServer - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.StackExchangeRedis - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Abstractions - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.AzureKeyVault - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Binder - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.CommandLine - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.FileExtensions - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Ini - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Json - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.KeyPerFile - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.UserSecrets - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Xml - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection.Abstractions - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DiagnosticAdapter - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Abstractions - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Composite - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Embedded - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Physical - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileSystemGlobbing - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting.Abstractions - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Http - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization.Abstractions - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Abstractions - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.AzureAppServices - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Configuration - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Console - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Debug - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventSource - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventLog - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.TraceSource - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Testing - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ObjectPool - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.ConfigurationExtensions - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.DataAnnotations - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ParameterDefaultValue.Sources - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Primitives - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.TypeNameHelper.Sources - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ValueStopwatch.Sources - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.WebEncoders - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Internal.Extensions.Refs - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.JSInterop - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Mono.WebAssembly.Interop - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview9-19416-02 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.Logging - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyModel - 3.0.0-preview9-19416-02 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 3.0.0-preview9-19416-02 (parent: Microsoft.Extensions.Logging)
- NETStandard.Library.Ref - 2.1.0-preview9-19416-02 (parent: Microsoft.Extensions.Logging)
- Internal.AspNetCore.Analyzers - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.Testing - 3.0.0-preview9.19417.1 (parent: Microsoft.EntityFrameworkCore)

* [Blazor] Adds a version to the Circuit ID purpose (#13250)

* It prevents older payloads from being unprotected should we ever change the format.
* Follows recommended practices when using data protection.

* Add AdditionalAssemblies to Router

Adds the ability to specify multiple assemblies to the Router
component.

Prior to preview 8, the router would search all dependencies of
`AppAssembly` for routable components. We made an intentional change to
stop that. However, we haven't yet give users a way to specify multiple
assemblies if their components are split across assemblies.

* Update dependencies from https://github.com/dotnet/arcade build 20190816.16 (#13253)

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19416.16
- Microsoft.DotNet.GenAPI - 1.0.0-beta.19416.16
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19416.16

* Wait until after UseHttps() to read HttpProtocols (#13202)

- This makes it so ListenOptions.HttpProtocols can be set after
  ListenOptions.UseHttps() is called and still function.

* Improve reliability of reliability tests

Fixes: #13086

- Fixed some wrong logging (wrong EventIds)
- Added a base class for ignitor tests
- Centralized code for capturing data in ignitor
- Make `WaitForXyz` methods return the thing they found
- Make `WaitForXyz` methods report logs on timeout
- Fix synchronization problems with some tests
- Split invalid event tests into their own class for code reuse

The main thing here is that some of the JS interop reliability tests had
causality/synchronization problems. They were either not waiting for a
render batch, or they were not *triggering* a render batch.

In addition to that, I did a general consolidation of the infrastructure
for these tests to make sure that they are all using the same set of
practices. I found and fixed cases where tests were using timeouts that
were too small (inconsistency) or where they were using non-threadsafe
data structures (these tests always involve concurrency).

* Fix AllProtocols with duplicates

* Use min.js files

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190819.6 (#13268)

- Microsoft.EntityFrameworkCore.Tools - 3.0.0-preview9.19419.6
- Microsoft.EntityFrameworkCore.SqlServer - 3.0.0-preview9.19419.6
- dotnet-ef - 3.0.0-preview9.19419.6
- Microsoft.EntityFrameworkCore - 3.0.0-preview9.19419.6
- Microsoft.EntityFrameworkCore.InMemory - 3.0.0-preview9.19419.6
- Microsoft.EntityFrameworkCore.Relational - 3.0.0-preview9.19419.6
- Microsoft.EntityFrameworkCore.Sqlite - 3.0.0-preview9.19419.6

* Fix privacy link (#13262)

* Do not throw if RouteComparison compares two identical references

Fixes https://github.com/aspnet/AspNetCore/issues/13313

* [release/3.0] Update dependencies from 3 repositories (#13306)

* Update dependencies from https://github.com/aspnet/Blazor build 20190820.2

- Microsoft.AspNetCore.Blazor.Mono - 3.0.0-preview9.19420.2

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190820.6

- Microsoft.NET.Sdk.Razor - 3.0.0-preview9.19420.6
- Microsoft.CodeAnalysis.Razor - 3.0.0-preview9.19420.6
- Microsoft.AspNetCore.Razor.Language - 3.0.0-preview9.19420.6
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.0-preview9.19420.6

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190820.12

- Microsoft.EntityFrameworkCore.Tools - 3.0.0-preview9.19420.12
- Microsoft.EntityFrameworkCore.SqlServer - 3.0.0-preview9.19420.12
- dotnet-ef - 3.0.0-preview9.19420.12
- Microsoft.EntityFrameworkCore - 3.0.0-preview9.19420.12
- Microsoft.EntityFrameworkCore.InMemory - 3.0.0-preview9.19420.12
- Microsoft.EntityFrameworkCore.Relational - 3.0.0-preview9.19420.12
- Microsoft.EntityFrameworkCore.Sqlite - 3.0.0-preview9.19420.12

* Dependency coherency updates

- Microsoft.AspNetCore.Analyzer.Testing - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ActivatorUtilities.Sources - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Abstractions - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Memory - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.SqlServer - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.StackExchangeRedis - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Abstractions - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.AzureKeyVault - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Binder - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.CommandLine - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.FileExtensions - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Ini - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Json - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.KeyPerFile - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.UserSecrets - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Xml - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection.Abstractions - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DiagnosticAdapter - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Abstractions - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Composite - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Embedded - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Physical - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileSystemGlobbing - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting.Abstractions - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Http - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization.Abstractions - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Abstractions - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.AzureAppServices - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Configuration - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Console - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Debug - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventSource - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventLog - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.TraceSource - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Testing - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ObjectPool - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.ConfigurationExtensions - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.DataAnnotations - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ParameterDefaultValue.Sources - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Primitives - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.TypeNameHelper.Sources - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ValueStopwatch.Sources - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.WebEncoders - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Internal.Extensions.Refs - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.JSInterop - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Mono.WebAssembly.Interop - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Internal.AspNetCore.Analyzers - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.Testing - 3.0.0-preview9.19419.3 (parent: Microsoft.EntityFrameworkCore)

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190820.23

- Microsoft.EntityFrameworkCore.Tools - 3.0.0-preview9.19420.23
- Microsoft.EntityFrameworkCore.SqlServer - 3.0.0-preview9.19420.23
- dotnet-ef - 3.0.0-preview9.19420.23
- Microsoft.EntityFrameworkCore - 3.0.0-preview9.19420.23
- Microsoft.EntityFrameworkCore.InMemory - 3.0.0-preview9.19420.23
- Microsoft.EntityFrameworkCore.Relational - 3.0.0-preview9.19420.23
- Microsoft.EntityFrameworkCore.Sqlite - 3.0.0-preview9.19420.23

Dependency coherency updates

- Microsoft.AspNetCore.Analyzer.Testing - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ActivatorUtilities.Sources - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Abstractions - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Memory - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.SqlServer - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.StackExchangeRedis - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Abstractions - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.AzureKeyVault - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Binder - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.CommandLine - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.FileExtensions - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Ini - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Json - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.KeyPerFile - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.UserSecrets - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Xml - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection.Abstractions - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DiagnosticAdapter - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Abstractions - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Composite - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Embedded - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Physical - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileSystemGlobbing - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting.Abstractions - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Http - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization.Abstractions - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Abstractions - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.AzureAppServices - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Configuration - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Console - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Debug - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventSource - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventLog - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.TraceSource - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Testing - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ObjectPool - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.ConfigurationExtensions - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.DataAnnotations - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ParameterDefaultValue.Sources - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Primitives - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.TypeNameHelper.Sources - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ValueStopwatch.Sources - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.WebEncoders - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Internal.Extensions.Refs - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.JSInterop - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Mono.WebAssembly.Interop - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview9-19419-06 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.Logging - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyModel - 3.0.0-preview9-19419-06 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 3.0.0-preview9-19419-06 (parent: Microsoft.Extensions.Logging)
- NETStandard.Library.Ref - 2.1.0-preview9-19419-06 (parent: Microsoft.Extensions.Logging)
- Internal.AspNetCore.Analyzers - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.Testing - 3.0.0-preview9.19420.3 (parent: Microsoft.EntityFrameworkCore)

* Update dependencies from https://github.com/aspnet/Blazor build 20190821.2

- Microsoft.AspNetCore.Blazor.Mono - 3.0.0-preview9.19421.2

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190821.6

- Microsoft.NET.Sdk.Razor - 3.0.0-preview9.19421.6
- Microsoft.CodeAnalysis.Razor - 3.0.0-preview9.19421.6
- Microsoft.AspNetCore.Razor.Language - 3.0.0-preview9.19421.6
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.0-preview9.19421.6

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190821.12

- Microsoft.EntityFrameworkCore.Tools - 3.0.0-preview9.19421.12
- Microsoft.EntityFrameworkCore.SqlServer - 3.0.0-preview9.19421.12
- dotnet-ef - 3.0.0-preview9.19421.12
- Microsoft.EntityFrameworkCore - 3.0.0-preview9.19421.12
- Microsoft.EntityFrameworkCore.InMemory - 3.0.0-preview9.19421.12
- Microsoft.EntityFrameworkCore.Relational - 3.0.0-preview9.19421.12
- Microsoft.EntityFrameworkCore.Sqlite - 3.0.0-preview9.19421.12

* [release/3.0-preview9] Update dependencies from 3 repositories (#13317)

* Update dependencies from https://github.com/aspnet/Blazor build 20190821.1

- Microsoft.AspNetCore.Blazor.Mono - 3.0.0-preview9.19421.1

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190821.5

- Microsoft.EntityFrameworkCore.Tools - 3.0.0-preview9.19421.5
- Microsoft.EntityFrameworkCore.SqlServer - 3.0.0-preview9.19421.5
- dotnet-ef - 3.0.0-preview9.19421.5
- Microsoft.EntityFrameworkCore - 3.0.0-preview9.19421.5
- Microsoft.EntityFrameworkCore.InMemory - 3.0.0-preview9.19421.5
- Microsoft.EntityFrameworkCore.Relational - 3.0.0-preview9.19421.5
- Microsoft.EntityFrameworkCore.Sqlite - 3.0.0-preview9.19421.5

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190821.1

- Microsoft.NET.Sdk.Razor - 3.0.0-preview9.19421.1
- Microsoft.CodeAnalysis.Razor - 3.0.0-preview9.19421.1
- Microsoft.AspNetCore.Razor.Language - 3.0.0-preview9.19421.1
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.0-preview9.19421.1

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190821.6

- Microsoft.EntityFrameworkCore.Tools - 3.0.0-preview9.19421.6
- Microsoft.EntityFrameworkCore.SqlServer - 3.0.0-preview9.19421.6
- dotnet-ef - 3.0.0-preview9.19421.6
- Microsoft.EntityFrameworkCore - 3.0.0-preview9.19421.6
- Microsoft.EntityFrameworkCore.InMemory - 3.0.0-preview9.19421.6
- Microsoft.EntityFrameworkCore.Relational - 3.0.0-preview9.19421.6
- Microsoft.EntityFrameworkCore.Sqlite - 3.0.0-preview9.19421.6

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190821.7

- Microsoft.EntityFrameworkCore.Tools - 3.0.0-preview9.19421.7
- Microsoft.EntityFrameworkCore.SqlServer - 3.0.0-preview9.19421.7
- dotnet-ef - 3.0.0-preview9.19421.7
- Microsoft.EntityFrameworkCore - 3.0.0-preview9.19421.7
- Microsoft.EntityFrameworkCore.InMemory - 3.0.0-preview9.19421.7
- Microsoft.EntityFrameworkCore.Relational - 3.0.0-preview9.19421.7
- Microsoft.EntityFrameworkCore.Sqlite - 3.0.0-preview9.19421.7

Dependency coherency updates

- Microsoft.AspNetCore.Analyzer.Testing - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ActivatorUtilities.Sources - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Abstractions - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Memory - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.SqlServer - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.StackExchangeRedis - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Abstractions - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.AzureKeyVault - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Binder - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.CommandLine - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.FileExtensions - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Ini - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Json - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.KeyPerFile - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.UserSecrets - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Xml - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection.Abstractions - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DiagnosticAdapter - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Abstractions - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Composite - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Embedded - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Physical - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileSystemGlobbing - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting.Abstractions - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Http - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization.Abstractions - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Abstractions - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.AzureAppServices - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Configuration - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Console - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Debug - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventSource - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventLog - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.TraceSource - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Testing - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ObjectPool - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.ConfigurationExtensions - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.DataAnnotations - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ParameterDefaultValue.Sources - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Primitives - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.TypeNameHelper.Sources - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ValueStopwatch.Sources - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.WebEncoders - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Internal.Extensions.Refs - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.JSInterop - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Mono.WebAssembly.Interop - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Internal.AspNetCore.Analyzers - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.Testing - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190821.11

- Microsoft.EntityFrameworkCore.Tools - 3.0.0-preview9.19421.11
- Microsoft.EntityFrameworkCore.SqlServer - 3.0.0-preview9.19421.11
- dotnet-ef - 3.0.0-preview9.19421.11
- Microsoft.EntityFrameworkCore - 3.0.0-preview9.19421.11
- Microsoft.EntityFrameworkCore.InMemory - 3.0.0-preview9.19421.11
- Microsoft.EntityFrameworkCore.Relational - 3.0.0-preview9.19421.11
- Microsoft.EntityFrameworkCore.Sqlite - 3.0.0-preview9.19421.11

Dependency coherency updates

- Microsoft.AspNetCore.Analyzer.Testing - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ActivatorUtilities.Sources - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Abstractions - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Memory - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.SqlServer - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.StackExchangeRedis - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Abstractions - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.AzureKeyVault - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Binder - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.CommandLine - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.FileExtensions - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Ini - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Json - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.KeyPerFile - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.UserSecrets - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Xml - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection.Abstractions - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DiagnosticAdapter - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Abstractions - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Composite - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Embedded - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Physical - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileSystemGlobbing - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting.Abstractions - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Http - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization.Abstractions - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Abstractions - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.AzureAppServices - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Configuration - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Console - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Debug - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventSource - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventLog - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.TraceSource - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Testing - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ObjectPool - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.ConfigurationExtensions - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.DataAnnotations - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ParameterDefaultValue.Sources - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Primitives - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.TypeNameHelper.Sources - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ValueStopwatch.Sources - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.WebEncoders - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Internal.Extensions.Refs - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.JSInterop - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Mono.WebAssembly.Interop - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Internal.AspNetCore.Analyzers - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.Testing - 3.0.0-preview9.19421.2 (parent: Microsoft.EntityFrameworkCore)

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190821.5

- Microsoft.NET.Sdk.Razor - 3.0.0-preview9.19421.5
- Microsoft.CodeAnalysis.Razor - 3.0.0-preview9.19421.5
- Microsoft.AspNetCore.Razor.Language - 3.0.0-preview9.19421.5
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.0-preview9.19421.5

* Update gRPC template dependency for preview 9 (#13265)

* Update gRPC template dependency to final for preview 9

* Rebrand aspnetcore to rc1 (#13341)

* [release/3.0-preview9] Update dependencies from aspnet/AspNetCore-Tooling (#13342)

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190822.6

- Microsoft.NET.Sdk.Razor - 3.0.0-preview9.19422.6
- Microsoft.CodeAnalysis.Razor - 3.0.0-preview9.19422.6
- Microsoft.AspNetCore.Razor.Language - 3.0.0-preview9.19422.6
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.0-preview9.19422.6

* Update dependencies

* OpenAPI ServiceReference Tool (#12810)

Add ServiceReference tool

* [release/3.0] Update dependencies from 2 repositories (#13344)

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190821.7

- Microsoft.NET.Sdk.Razor - 3.0.0-preview9.19421.7
- Microsoft.CodeAnalysis.Razor - 3.0.0-preview9.19421.7
- Microsoft.AspNetCore.Razor.Language - 3.0.0-preview9.19421.7
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.0-preview9.19421.7

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190821.14

- Microsoft.EntityFrameworkCore.Tools - 3.0.0-preview9.19421.14
- Microsoft.EntityFrameworkCore.SqlServer - 3.0.0-preview9.19421.14
- dotnet-ef - 3.0.0-preview9.19421.14
- Microsoft.EntityFrameworkCore - 3.0.0-preview9.19421.14
- Microsoft.EntityFrameworkCore.InMemory - 3.0.0-preview9.19421.14
- Microsoft.EntityFrameworkCore.Relational - 3.0.0-preview9.19421.14
- Microsoft.EntityFrameworkCore.Sqlite - 3.0.0-preview9.19421.14

Dependency coherency updates

- Microsoft.AspNetCore.Analyzer.Testing - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ActivatorUtilities.Sources - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Abstractions - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Memory - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.SqlServer - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.StackExchangeRedis - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Abstractions - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.AzureKeyVault - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Binder - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.CommandLine - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.FileExtensions - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Ini - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Json - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.KeyPerFile - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.UserSecrets - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Xml - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection.Abstractions - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DiagnosticAdapter - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Abstractions - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Composite - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Embedded - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Physical - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileSystemGlobbing - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting.Abstractions - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Http - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization.Abstractions - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Abstractions - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.AzureAppServices - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Configuration - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Console - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Debug - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventSource - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventLog - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.TraceSource - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Testing - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ObjectPool - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.ConfigurationExtensions - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.DataAnnotations - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ParameterDefaultValue.Sources - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Primitives - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.TypeNameHelper.Sources - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ValueStopwatch.Sources - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.WebEncoders - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Internal.Extensions.Refs - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.JSInterop - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Mono.WebAssembly.Interop - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-rc1-19420-08 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.Logging - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyModel - 3.0.0-rc1-19420-08 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 3.0.0-rc1-19420-08 (parent: Microsoft.Extensions.Logging)
- NETStandard.Library.Ref - 2.1.0-rc1-19420-08 (parent: Microsoft.Extensions.Logging)
- Internal.AspNetCore.Analyzers - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.Testing - 3.0.0-preview9.19421.3 (parent: Microsoft.EntityFrameworkCore)

* [release/3.0] Update dependencies from 2 repositories (#13362)

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190822.12

- Microsoft.NET.Sdk.Razor - 3.0.0-rc1.19422.12
- Microsoft.CodeAnalysis.Razor - 3.0.0-rc1.19422.12
- Microsoft.AspNetCore.Razor.Language - 3.0.0-rc1.19422.12
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.0-rc1.19422.12

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190822.6

- Microsoft.EntityFrameworkCore.Tools - 3.0.0-rc1.19422.6
- Microsoft.EntityFrameworkCore.SqlServer - 3.0.0-rc1.19422.6
- dotnet-ef - 3.0.0-rc1.19422.6
- Microsoft.EntityFrameworkCore - 3.0.0-rc1.19422.6
- Microsoft.EntityFrameworkCore.InMemory - 3.0.0-rc1.19422.6
- Microsoft.EntityFrameworkCore.Relational - 3.0.0-rc1.19422.6
- Microsoft.EntityFrameworkCore.Sqlite - 3.0.0-rc1.19422.6

Dependency coherency updates

- Microsoft.Bcl.AsyncInterfaces - 1.0.0-preview9.19421.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.CSharp - 4.6.0-preview9.19421.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Win32.Registry - 4.6.0-preview9.19421.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Win32.SystemEvents - 4.6.0-preview9.19421.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ComponentModel.Annotations - 4.6.0-preview9.19421.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Diagnostics.EventLog - 4.6.0-preview9.19421.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Drawing.Common - 4.6.0-preview9.19421.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.IO.Pipelines - 4.6.0-preview9.19421.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Net.Http.WinHttpHandler - 4.6.0-preview9.19421.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Net.WebSockets.WebSocketProtocol - 4.6.0-preview9.19421.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Reflection.Metadata - 1.7.0-preview9.19421.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Runtime.CompilerServices.Unsafe - 4.6.0-preview9.19421.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Cng - 4.6.0-preview9.19421.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Pkcs - 4.6.0-preview9.19421.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Xml - 4.6.0-preview9.19421.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Permissions - 4.6.0-preview9.19421.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Principal.Windows - 4.6.0-preview9.19421.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ServiceProcess.ServiceController - 4.6.0-preview9.19421.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Encodings.Web - 4.6.0-preview9.19421.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Json - 4.6.0-preview9.19421.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Threading.Channels - 4.6.0-preview9.19421.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Windows.Extensions - 4.6.0-preview9.19421.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.Platforms - 3.0.0-preview9.19421.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Net.Compilers.Toolset - 3.3.1-beta3-19421-04 (parent: Microsoft.Extensions.Logging)

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190822.14

- Microsoft.NET.Sdk.Razor - 3.0.0-rc1.19422.14
- Microsoft.CodeAnalysis.Razor - 3.0.0-rc1.19422.14
- Microsoft.AspNetCore.Razor.Language - 3.0.0-rc1.19422.14
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.0-rc1.19422.14

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190822.8

- Microsoft.EntityFrameworkCore.Tools - 3.0.0-rc1.19422.8
- Microsoft.EntityFrameworkCore.SqlServer - 3.0.0-rc1.19422.8
- dotnet-ef - 3.0.0-rc1.19422.8
- Microsoft.EntityFrameworkCore - 3.0.0-rc1.19422.8
- Microsoft.EntityFrameworkCore.InMemory - 3.0.0-rc1.19422.8
- Microsoft.EntityFrameworkCore.Relational - 3.0.0-rc1.19422.8
- Microsoft.EntityFrameworkCore.Sqlite - 3.0.0-rc1.19422.8

Dependency coherency updates

- Microsoft.AspNetCore.Analyzer.Testing - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ActivatorUtilities.Sources - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Abstractions - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Memory - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.SqlServer - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.StackExchangeRedis - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Abstractions - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.AzureKeyVault - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Binder - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.CommandLine - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.FileExtensions - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Ini - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Json - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.KeyPerFile - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.UserSecrets - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Xml - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection.Abstractions - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DiagnosticAdapter - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Abstractions - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Composite - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Embedded - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Physical - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileSystemGlobbing - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting.Abstractions - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Http - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization.Abstractions - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Abstractions - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.AzureAppServices - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Configuration - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Console - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Debug - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventSource - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventLog - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.TraceSource - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Testing - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ObjectPool - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.ConfigurationExtensions - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.DataAnnotations - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ParameterDefaultValue.Sources - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Primitives - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.TypeNameHelper.Sources - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ValueStopwatch.Sources - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.WebEncoders - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Internal.Extensions.Refs - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.JSInterop - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Mono.WebAssembly.Interop - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Bcl.AsyncInterfaces - 1.0.0-rc1.19420.10 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-rc1-19421-22 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.Logging - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.CSharp - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Win32.Registry - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Win32.SystemEvents - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ComponentModel.Annotations - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Diagnostics.EventLog - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Drawing.Common - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.IO.Pipelines - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Net.Http.WinHttpHandler - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Net.WebSockets.WebSocketProtocol - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Reflection.Metadata - 1.7.0-rc1.19420.10 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Runtime.CompilerServices.Unsafe - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Cng - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Pkcs - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Xml - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Permissions - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Principal.Windows - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ServiceProcess.ServiceController - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Encodings.Web - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Json - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Threading.Channels - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Windows.Extensions - 4.6.0-rc1.19420.10 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Extensions.DependencyModel - 3.0.0-rc1-19421-22 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 3.0.0-rc1-19421-22 (parent: Microsoft.Extensions.Logging)
- NETStandard.Library.Ref - 2.1.0-rc1-19421-22 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.Platforms - 3.0.0-rc1.19420.10 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Internal.AspNetCore.Analyzers - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.Testing - 3.0.0-rc1.19422.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Net.Compilers.Toolset - 3.3.1-beta3-19422-01 (parent: Microsoft.Extensions.Logging)

* Set Blazor Client projects to use preview 9 label

* Properly wait for workaround (#13286)

* Blazor fixes (#13377)

* Remove incorrect comment from template. Fixes #13331
* Fix reload button. Fixes #13370
* Fix navigation after reconnection. Fixes #13371
* Auth template fixes. Fixes #13374 and #13375

* Use Microsoft.Extensions.CommandLineUtils and Microsoft.Extensions.Tools.Internal in service ref programs
- add '--quiet' option
- add '--debug' option (when building Debug configuration)
- support `--` in `dotnet-getdocument`; users may want to explictly add options for GetDocument.Insider
- remove '--no-color' option
- use `IReporter` extension methods instead of static `Reporter` class
- reduce `static` use to ease testing (coming soon) and share the `IConsole` and `IReporter`
  - add `ProgramBase`
- allow mix of known and unknown command-line arguments
  - maintain existing behaviour using switch added in aspnet/Extensions#2210

nits:
- add a couple more `CommandLineApplicationExtensions` methods
- take VS suggestions

* Fix a typo and address remaining service reference TODO items (#13364)

- #4923
- typo caused problems when cleaning files
- add `%(OpenApiProjectReference.GlobalPropertiesToRemove)` metadata
  - stop removing `$(Configuration)` or `$(Platform)` global properties
- address timing issues cropping up occasionally in builds using service ref features
  - avoid `AfterTargets="Build"`; referencing projects sometimes continue while post-build work is done
    - instead use `BeforeTargets="Build"` since that's a no-op target wrapping up a build
- set only properties in buildMultiTargeting\Microsoft.Extensions.ApiDescription.Server.targets
  - items not evaluated early enough to reference in all cases
- rename Microsoft.Extensions.ApiDescription.Client tasks
- remove net461 task assembly

* [ApiAuthorization] Disables pop-up logout by default

* There is an issue in Edge that prevents it from working.
* Can be enabled by setting 'popUpDisabled = false' in 'authorize.service.ts'

* [3.0] Also target netstandard2.1 for Identity.EFCore (#13402)

* Also target netstandard2.1 for Identity.EFCore

* Remove source build line

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190823.6 (#13407)

- Microsoft.EntityFrameworkCore.Tools - 3.0.0-preview9.19423.6
- Microsoft.EntityFrameworkCore.SqlServer - 3.0.0-preview9.19423.6
- dotnet-ef - 3.0.0-preview9.19423.6
- Microsoft.EntityFrameworkCore - 3.0.0-preview9.19423.6
- Microsoft.EntityFrameworkCore.InMemory - 3.0.0-preview9.19423.6
- Microsoft.EntityFrameworkCore.Relational - 3.0.0-preview9.19423.6
- Microsoft.EntityFrameworkCore.Sqlite - 3.0.0-preview9.19423.6

Dependency coherency updates

- Microsoft.AspNetCore.Analyzer.Testing - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ActivatorUtilities.Sources - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Abstractions - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Memory - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.SqlServer - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.StackExchangeRedis - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Abstractions - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.AzureKeyVault - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Binder - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.CommandLine - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.FileExtensions - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Ini - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Json - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.KeyPerFile - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.UserSecrets - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Xml - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection.Abstractions - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DiagnosticAdapter - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Abstractions - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Composite - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Embedded - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Physical - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileSystemGlobbing - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting.Abstractions - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Http - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization.Abstractions - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Abstractions - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.AzureAppServices - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Configuration - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Console - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Debug - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventSource - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventLog - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.TraceSource - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Testing - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ObjectPool - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.ConfigurationExtensions - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.DataAnnotations - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ParameterDefaultValue.Sources - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Primitives - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.TypeNameHelper.Sources - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ValueStopwatch.Sources - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.WebEncoders - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Internal.Extensions.Refs - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.JSInterop - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Mono.WebAssembly.Interop - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-preview9-19423-09 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.Logging - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyModel - 3.0.0-preview9-19423-09 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 3.0.0-preview9-19423-09 (parent: Microsoft.Extensions.Logging)
- NETStandard.Library.Ref - 2.1.0-preview9-19423-09 (parent: Microsoft.Extensions.Logging)
- Internal.AspNetCore.Analyzers - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.Testing - 3.0.0-preview9.19423.4 (parent: Microsoft.EntityFrameworkCore)

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190823.3 (#13414)

- Microsoft.NET.Sdk.Razor - 3.0.0-preview9.19423.3
- Microsoft.CodeAnalysis.Razor - 3.0.0-preview9.19423.3
- Microsoft.AspNetCore.Razor.Language - 3.0.0-preview9.19423.3
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.0-preview9.19423.3

* Mark bytes as consumed #13372 (#13394)

* [release/3.0] Update dependencies from 2 repositories (#13411)

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190823.2

- Microsoft.NET.Sdk.Razor - 3.0.0-rc1.19423.2
- Microsoft.CodeAnalysis.Razor - 3.0.0-rc1.19423.2
- Microsoft.AspNetCore.Razor.Language - 3.0.0-rc1.19423.2
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.0-rc1.19423.2

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190823.5

- Microsoft.EntityFrameworkCore.Tools - 3.0.0-rc1.19423.5
- Microsoft.EntityFrameworkCore.SqlServer - 3.0.0-rc1.19423.5
- dotnet-ef - 3.0.0-rc1.19423.5
- Microsoft.EntityFrameworkCore - 3.0.0-rc1.19423.5
- Microsoft.EntityFrameworkCore.InMemory - 3.0.0-rc1.19423.5
- Microsoft.EntityFrameworkCore.Relational - 3.0.0-rc1.19423.5
- Microsoft.EntityFrameworkCore.Sqlite - 3.0.0-rc1.19423.5

Dependency coherency updates

- Microsoft.AspNetCore.Analyzer.Testing - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ActivatorUtilities.Sources - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Abstractions - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Memory - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.SqlServer - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.StackExchangeRedis - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Abstractions - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.AzureKeyVault - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Binder - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.CommandLine - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.FileExtensions - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Ini - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Json - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.KeyPerFile - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.UserSecrets - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Xml - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection.Abstractions - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DiagnosticAdapter - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Abstractions - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Composite - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Embedded - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Physical - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileSystemGlobbing - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting.Abstractions - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Http - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization.Abstractions - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Abstractions - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.AzureAppServices - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Configuration - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Console - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Debug - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventSource - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventLog - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.TraceSource - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Testing - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ObjectPool - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.ConfigurationExtensions - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.DataAnnotations - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ParameterDefaultValue.Sources - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Primitives - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.TypeNameHelper.Sources - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ValueStopwatch.Sources - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.WebEncoders - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Internal.Extensions.Refs - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.JSInterop - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Mono.WebAssembly.Interop - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-rc1-19422-14 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.Logging - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyModel - 3.0.0-rc1-19422-14 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 3.0.0-rc1-19422-14 (parent: Microsoft.Extensions.Logging)
- NETStandard.Library.Ref - 2.1.0-rc1-19422-14 (parent: Microsoft.Extensions.Logging)
- Internal.AspNetCore.Analyzers - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.Testing - 3.0.0-rc1.19423.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Net.Compilers.Toolset - 3.3.1-beta3-19422-05 (parent: Microsoft.Extensions.Logging)

* [release/3.0] Update dependencies from 2 repositories (#13424)

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190824.3

- Microsoft.NET.Sdk.Razor - 3.0.0-rc1.19424.3
- Microsoft.CodeAnalysis.Razor - 3.0.0-rc1.19424.3
- Microsoft.AspNetCore.Razor.Language - 3.0.0-rc1.19424.3
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.0-rc1.19424.3

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190824.4

- Microsoft.EntityFrameworkCore.Tools - 3.0.0-rc1.19424.4
- Microsoft.EntityFrameworkCore.SqlServer - 3.0.0-rc1.19424.4
- dotnet-ef - 3.0.0-rc1.19424.4
- Microsoft.EntityFrameworkCore - 3.0.0-rc1.19424.4
- Microsoft.EntityFrameworkCore.InMemory - 3.0.0-rc1.19424.4
- Microsoft.EntityFrameworkCore.Relational - 3.0.0-rc1.19424.4
- Microsoft.EntityFrameworkCore.Sqlite - 3.0.0-rc1.19424.4

* [release/3.0] Update dependencies from 2 repositories (#13428)

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190824.5

- Microsoft.NET.Sdk.Razor - 3.0.0-rc1.19424.5
- Microsoft.CodeAnalysis.Razor - 3.0.0-rc1.19424.5
- Microsoft.AspNetCore.Razor.Language - 3.0.0-rc1.19424.5
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.0-rc1.19424.5

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190824.6

- Microsoft.EntityFrameworkCore.Tools - 3.0.0-rc1.19424.6
- Microsoft.EntityFrameworkCore.SqlServer - 3.0.0-rc1.19424.6
- dotnet-ef - 3.0.0-rc1.19424.6
- Microsoft.EntityFrameworkCore - 3.0.0-rc1.19424.6
- Microsoft.EntityFrameworkCore.InMemory - 3.0.0-rc1.19424.6
- Microsoft.EntityFrameworkCore.Relational - 3.0.0-rc1.19424.6
- Microsoft.EntityFrameworkCore.Sqlite - 3.0.0-rc1.19424.6

Dependency coherency updates

- Microsoft.AspNetCore.Analyzer.Testing - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ActivatorUtilities.Sources - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Abstractions - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Memory - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.SqlServer - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.StackExchangeRedis - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Abstractions - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.AzureKeyVault - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Binder - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.CommandLine - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.FileExtensions - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Ini - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Json - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.KeyPerFile - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.UserSecrets - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Xml - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection.Abstractions - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DiagnosticAdapter - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Abstractions - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Composite - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Embedded - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Physical - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileSystemGlobbing - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting.Abstractions - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Http - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization.Abstractions - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Abstractions - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.AzureAppServices - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Configuration - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Console - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Debug - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventSource - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventLog - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.TraceSource - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Testing - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ObjectPool - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.ConfigurationExtensions - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.DataAnnotations - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ParameterDefaultValue.Sources - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Primitives - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.TypeNameHelper.Sources - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ValueStopwatch.Sources - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.WebEncoders - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Internal.Extensions.Refs - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.JSInterop - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Mono.WebAssembly.Interop - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-rc1-19423-11 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.Logging - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyModel - 3.0.0-rc1-19423-11 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 3.0.0-rc1-19423-11 (parent: Microsoft.Extensions.Logging)
- NETStandard.Library.Ref - 2.1.0-rc1-19423-11 (parent: Microsoft.Extensions.Logging)
- Internal.AspNetCore.Analyzers - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.Testing - 3.0.0-rc1.19424.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Net.Compilers.Toolset - 3.3.1-beta3-19423-01 (parent: Microsoft.Extensions.Logging)

* Remove last couple of (test-only) System.Data.SqlClient dependencies (#13426)

* Clean up reference conflict warnings in Microsoft.dotnet-openapi project

* Move AfterBuild Target to more accurate project (#13281)

* Update dependencies from https://github.com/dotnet/arcade build 20190825.1 (#13447)

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19425.1
- Microsoft.DotNet.GenAPI - 1.0.0-beta.19425.1
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19425.1

* Skip default port tests (#12983)

* Add tests of client code generation components (#13444)

- #4914
- test service ref MSBuild tasks
  - add `MockBuildEngine` class to support tests where a task logs
- correct an incredibly minor product issue about logging errors for `@(OpenApiProjectReference)` items
  - set `%(SourceProject)` metadata and use it when logging
- add test project that builds and can be tested in the future

* [release/3.0] Update dependencies from 3 repositories (#13463)

* Update dependencies from https://github.com/aspnet/Blazor build 20190826.1

- Microsoft.AspNetCore.Blazor.Mono - 3.0.0-preview9.19426.1

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190826.1

- Microsoft.NET.Sdk.Razor - 3.0.0-rc1.19426.1
- Microsoft.CodeAnalysis.Razor - 3.0.0-rc1.19426.1
- Microsoft.AspNetCore.Razor.Language - 3.0.0-rc1.19426.1
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.0-rc1.19426.1

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190826.3

- Microsoft.EntityFrameworkCore.Tools - 3.0.0-rc1.19426.3
- Microsoft.EntityFrameworkCore.SqlServer - 3.0.0-rc1.19426.3
- dotnet-ef - 3.0.0-rc1.19426.3
- Microsoft.EntityFrameworkCore - 3.0.0-rc1.19426.3
- Microsoft.EntityFrameworkCore.InMemory - 3.0.0-rc1.19426.3
- Microsoft.EntityFrameworkCore.Relational - 3.0.0-rc1.19426.3
- Microsoft.EntityFrameworkCore.Sqlite - 3.0.0-rc1.19426.3

* [release/3.0] Update dependencies from 2 repositories (#13472)

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190826.5

- Microsoft.NET.Sdk.Razor - 3.0.0-rc1.19426.5
- Microsoft.CodeAnalysis.Razor - 3.0.0-rc1.19426.5
- Microsoft.AspNetCore.Razor.Language - 3.0.0-rc1.19426.5
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.0-rc1.19426.5

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190826.7

- Microsoft.EntityFrameworkCore.Tools - 3.0.0-rc1.19426.7
- Microsoft.EntityFrameworkCore.SqlServer - 3.0.0-rc1.19426.7
- dotnet-ef - 3.0.0-rc1.19426.7
- Microsoft.EntityFrameworkCore - 3.0.0-rc1.19426.7
- Microsoft.EntityFrameworkCore.InMemory - 3.0.0-rc1.19426.7
- Microsoft.EntityFrameworkCore.Relational - 3.0.0-rc1.19426.7
- Microsoft.EntityFrameworkCore.Sqlite - 3.0.0-rc1.19426.7

Dependency coherency updates

- Microsoft.AspNetCore.Analyzer.Testing - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ActivatorUtilities.Sources - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Abstractions - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Memory - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.SqlServer - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.StackExchangeRedis - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Abstractions - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.AzureKeyVault - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Binder - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.CommandLine - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.FileExtensions - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Ini - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Json - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.KeyPerFile - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.UserSecrets - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Xml - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection.Abstractions - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DiagnosticAdapter - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Abstractions - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Composite - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Embedded - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Physical - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileSystemGlobbing - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting.Abstractions - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Http - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization.Abstractions - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Abstractions - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.AzureAppServices - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Configuration - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Console - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Debug - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventSource - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventLog - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.TraceSource - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Testing - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ObjectPool - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.ConfigurationExtensions - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.DataAnnotations - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ParameterDefaultValue.Sources - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Primitives - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.TypeNameHelper.Sources - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ValueStopwatch.Sources - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.WebEncoders - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Internal.Extensions.Refs - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.JSInterop - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Mono.WebAssembly.Interop - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-rc1-19425-03 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.Logging - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyModel - 3.0.0-rc1-19425-03 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 3.0.0-rc1-19425-03 (parent: Microsoft.Extensions.Logging)
- NETStandard.Library.Ref - 2.1.0-rc1-19425-03 (parent: Microsoft.Extensions.Logging)
- Internal.AspNetCore.Analyzers - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.Testing - 3.0.0-rc1.19426.4 (parent: Microsoft.EntityFrameworkCore)

* Remove prebuilts for source build (#13360)

* Add XML docs to pubternal types

* Ignore MaxRequestBodySize for upgraded requests (#13477)

* Fix AzureAd options validation (#13480)

* Skip getting AzureAdOptions for not AzureADUi Cookies scheme #13311 (#13327)

* Also check Azure Jwt options for #13311

* Fixup Razor Class Library template namespace and component content (#13419)

* Http2MessageBody.TryRead TryStart/TryStop (#13464)

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190827.4 (#13500)

- Microsoft.EntityFrameworkCore.Tools - 3.0.0-rc1.19427.4
- Microsoft.EntityFrameworkCore.SqlServer - 3.0.0-rc1.19427.4
- dotnet-ef - 3.0.0-rc1.19427.4
- Microsoft.EntityFrameworkCore - 3.0.0-rc1.19427.4
- Microsoft.EntityFrameworkCore.InMemory - 3.0.0-rc1.19427.4
- Microsoft.EntityFrameworkCore.Relational - 3.0.0-rc1.19427.4
- Microsoft.EntityFrameworkCore.Sqlite - 3.0.0-rc1.19427.4

* [release/3.0] Update dependencies from 2 repositories (#13508)

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190827.3
- Microsoft.NET.Sdk.Razor - 3.0.0-rc1.19427.3
- Microsoft.CodeAnalysis.Razor - 3.0.0-rc1.19427.3
- Microsoft.AspNetCore.Razor.Language - 3.0.0-rc1.19427.3
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.0-rc1.19427.3

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190827.8
- Microsoft.EntityFrameworkCore.Tools - 3.0.0-rc1.19427.8
- Microsoft.EntityFrameworkCore.SqlServer - 3.0.0-rc1.19427.8
- dotnet-ef - 3.0.0-rc1.19427.8
- Microsoft.EntityFrameworkCore - 3.0.0-rc1.19427.8
- Microsoft.EntityFrameworkCore.InMemory - 3.0.0-rc1.19427.8
- Microsoft.EntityFrameworkCore.Relational - 3.0.0-rc1.19427.8
- Microsoft.EntityFrameworkCore.Sqlite - 3.0.0-rc1.19427.8

Dependency coherency updates
- Microsoft.AspNetCore.Analyzer.Testing - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ActivatorUtilities.Sources - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Abstractions - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Memory - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.SqlServer - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.StackExchangeRedis - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Abstractions - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.AzureKeyVault - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Binder - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.CommandLine - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.FileExtensions - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Ini - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Json - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.KeyPerFile - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.UserSecrets - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Xml - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection.Abstractions - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DiagnosticAdapter - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Abstractions - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Composite - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Embedded - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Physical - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileSystemGlobbing - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting.Abstractions - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Http - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization.Abstractions - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Abstractions - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.AzureAppServices - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Configuration - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Console - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Debug - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventSource - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventLog - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.TraceSource - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Testing - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ObjectPool - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.ConfigurationExtensions - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.DataAnnotations - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ParameterDefaultValue.Sources - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Primitives - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.TypeNameHelper.Sources - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ValueStopwatch.Sources - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.WebEncoders - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Internal.Extensions.Refs - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.JSInterop - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Mono.WebAssembly.Interop - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-rc1-19426-11 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.Logging - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyModel - 3.0.0-rc1-19426-11 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 3.0.0-rc1-19426-11 (parent: Microsoft.Extensions.Logging)
- NETStandard.Library.Ref - 2.1.0-rc1-19426-11 (parent: Microsoft.Extensions.Logging)
- Internal.AspNetCore.Analyzers - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.Testing - 3.0.0-rc1.19427.3 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Net.Compilers.Toolset - 3.3.1-beta3-19426-02 (parent: Microsoft.Extensions.Logging)

* Microsoft.dotnet-openapi is a shipping package (#13481)

Microsoft.dotnet-openapi is a shipping package

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190828.3 (#13534)

- Microsoft.EntityFrameworkCore.Tools - 3.0.0-rc1.19428.3
- Microsoft.EntityFrameworkCore.SqlServer - 3.0.0-rc1.19428.3
- dotnet-ef - 3.0.0-rc1.19428.3
- Microsoft.EntityFrameworkCore - 3.0.0-rc1.19428.3
- Microsoft.EntityFrameworkCore.InMemory - 3.0.0-rc1.19428.3
- Microsoft.EntityFrameworkCore.Relational - 3.0.0-rc1.19428.3
- Microsoft.EntityFrameworkCore.Sqlite - 3.0.0-rc1.19428.3

Dependency coherency updates

- Microsoft.AspNetCore.Analyzer.Testing - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ActivatorUtilities.Sources - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Abstractions - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Memory - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.SqlServer - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.StackExchangeRedis - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Abstractions - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.AzureKeyVault - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Binder - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.CommandLine - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.FileExtensions - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Ini - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Json - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.KeyPerFile - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.UserSecrets - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Xml - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection.Abstractions - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DiagnosticAdapter - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Abstractions - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Composite - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Embedded - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Physical - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileSystemGlobbing - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting.Abstractions - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Http - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization.Abstractions - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Abstractions - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.AzureAppServices - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Configuration - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Console - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Debug - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventSource - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventLog - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.TraceSource - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Testing - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ObjectPool - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.ConfigurationExtensions - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.DataAnnotations - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ParameterDefaultValue.Sources - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Primitives - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.TypeNameHelper.Sources - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ValueStopwatch.Sources - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.WebEncoders - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Internal.Extensions.Refs - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.JSInterop - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Mono.WebAssembly.Interop - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Internal.AspNetCore.Analyzers - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.Testing - 3.0.0-rc1.19427.5 (parent: Microsoft.EntityFrameworkCore)

* [SPA] Enable support for publish single file (#13518)

* Updates the angular template to exclude the client-side files from the single file publish output
* Updates the react template to exclude the client-side files from the single file publish output
* Updates the react-redux template to exclude the client-side files from the single file publish output

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190828.5

- Microsoft.EntityFrameworkCore.Tools - 5.0.0-alpha1.19428.5
- Microsoft.EntityFrameworkCore.SqlServer - 5.0.0-alpha1.19428.5
- dotnet-ef - 5.0.0-alpha1.19428.5
- Microsoft.EntityFrameworkCore - 5.0.0-alpha1.19428.5
- Microsoft.EntityFrameworkCore.InMemory - 5.0.0-alpha1.19428.5
- Microsoft.EntityFrameworkCore.Relational - 5.0.0-alpha1.19428.5
- Microsoft.EntityFrameworkCore.Sqlite - 5.0.0-alpha1.19428.5

Dependency coherency updates

- Microsoft.AspNetCore.Analyzer.Testing - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.BenchmarkRunner.Sources - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ActivatorUtilities.Sources - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Abstractions - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Memory - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.SqlServer - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.StackExchangeRedis - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.CommandLineUtils.Sources - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Abstractions - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.AzureKeyVault - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Binder - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.CommandLine - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.EnvironmentVariables - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.FileExtensions - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Ini - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Json - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.KeyPerFile - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.UserSecrets - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Xml - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection.Abstractions - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DiagnosticAdapter - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Abstractions - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Composite - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Embedded - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Physical - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileSystemGlobbing - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HashCodeCombiner.Sources - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting.Abstractions - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HostFactoryResolver.Sources - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Http - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization.Abstractions - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Abstractions - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.AzureAppServices - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Configuration - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Console - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Debug - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventSource - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventLog - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.TraceSource - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Testing - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ObjectPool - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.ConfigurationExtensions - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.DataAnnotations - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ParameterDefaultValue.Sources - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Primitives - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.TypeNameHelper.Sources - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ValueStopwatch.Sources - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.WebEncoders - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Internal.Extensions.Refs - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.JSInterop - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Mono.WebAssembly.Interop - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Bcl.AsyncInterfaces - 1.2.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 5.0.0-alpha1.19425.8 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.Logging - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.CSharp - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Win32.Registry - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Win32.SystemEvents - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ComponentModel.Annotations - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Diagnostics.EventLog - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Drawing.Common - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.IO.Pipelines - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Net.Http.WinHttpHandler - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Net.WebSockets.WebSocketProtocol - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Reflection.Metadata - 1.9.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Runtime.CompilerServices.Unsafe - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Cng - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Pkcs - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Xml - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Permissions - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Principal.Windows - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ServiceProcess.ServiceController - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Encodings.Web - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Json - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Threading.Channels - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Windows.Extensions - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Extensions.DependencyModel - 5.0.0-alpha1.19425.8 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 5.0.0-alpha1.19425.8 (parent: Microsoft.Extensions.Logging)
- NETStandard.Library.Ref - 2.1.0-alpha1.19425.8 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.Platforms - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Internal.AspNetCore.Analyzers - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.Testing - 5.0.0-alpha1.19427.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Net.Compilers.Toolset - 3.4.0-beta1-19424-01 (parent: Microsoft.Extensions.Logging)

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190828.8

- Microsoft.NET.Sdk.Razor - 5.0.0-alpha1.19428.8
- Microsoft.CodeAnalysis.Razor - 5.0.0-alpha1.19428.8
- Microsoft.AspNetCore.Razor.Language - 5.0.0-alpha1.19428.8
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 5.0.0-alpha1.19428.8

* Update dependencies from https://github.com/aspnet/Blazor build 20190828.2

- Microsoft.AspNetCore.Blazor.Mono - 5.0.0-alpha1.19428.2

* [release/3.0] Update dependencies from 2 repositories (#13546)

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190828.6

- Microsoft.NET.Sdk.Razor - 3.0.0-rc1.19428.6
- Microsoft.CodeAnalysis.Razor - 3.0.0-rc1.19428.6
- Microsoft.AspNetCore.Razor.Language - 3.0.0-rc1.19428.6
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.0-rc1.19428.6

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190828.6

- Microsoft.EntityFrameworkCore.Tools - 3.0.0-rc1.19428.6
- Microsoft.EntityFrameworkCore.SqlServer - 3.0.0-rc1.19428.6
- dotnet-ef - 3.0.0-rc1.19428.6
- Microsoft.EntityFrameworkCore - 3.0.0-rc1.19428.6
- Microsoft.EntityFrameworkCore.InMemory - 3.0.0-rc1.19428.6
- Microsoft.EntityFrameworkCore.Relational - 3.0.0-rc1.19428.6
- Microsoft.EntityFrameworkCore.Sqlite - 3.0.0-rc1.19428.6

Dependency coherency updates

- Microsoft.AspNetCore.Analyzer.Testing - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ActivatorUtilities.Sources - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Abstractions - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Memory - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.SqlServer - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.StackExchangeRedis - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Abstractions - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.AzureKeyVault - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Binder - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.CommandLine - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.FileExtensions - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Ini - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Json - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.KeyPerFile - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.UserSecrets - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Xml - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection.Abstractions - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DiagnosticAdapter - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Abstractions - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Composite - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Embedded - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Physical - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileSystemGlobbing - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting.Abstractions - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Http - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization.Abstractions - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Abstractions - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.AzureAppServices - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Configuration - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Console - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Debug - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventSource - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventLog - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.TraceSource - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Testing - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ObjectPool - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.ConfigurationExtensions - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.DataAnnotations - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ParameterDefaultValue.Sources - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Primitives - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.TypeNameHelper.Sources - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ValueStopwatch.Sources - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.WebEncoders - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Internal.Extensions.Refs - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.JSInterop - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Mono.WebAssembly.Interop - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-rc1-19427-13 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.Logging - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyModel - 3.0.0-rc1-19427-13 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 3.0.0-rc1-19427-13 (parent: Microsoft.Extensions.Logging)
- NETStandard.Library.Ref - 2.1.0-rc1-19427-13 (parent: Microsoft.Extensions.Logging)
- Internal.AspNetCore.Analyzers - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.Testing - 3.0.0-rc1.19428.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Net.Compilers.Toolset - 3.3.1-beta3-19428-02 (parent: Microsoft.Extensions.Logging)

* Update manually generated reference for RenderTreeFrame (#13522)

Fixes https://github.com/aspnet/AspNetCore/issues/13504

* Lazyily initialize Https port in HttpsRedirectionMiddleware

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190829.7 (#13570)

- Microsoft.EntityFrameworkCore.Tools - 3.0.0-rc1.19429.7
- Microsoft.EntityFrameworkCore.SqlServer - 3.0.0-rc1.19429.7
- dotnet-ef - 3.0.0-rc1.19429.7
- Microsoft.EntityFrameworkCore - 3.0.0-rc1.19429.7
- Microsoft.EntityFrameworkCore.InMemory - 3.0.0-rc1.19429.7
- Microsoft.EntityFrameworkCore.Relational - 3.0.0-rc1.19429.7
- Microsoft.EntityFrameworkCore.Sqlite - 3.0.0-rc1.19429.7

* Update Microsoft.Data.SqlClient version (#13530)

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190829.6

- Microsoft.EntityFrameworkCore.Tools - 5.0.0-alpha1.19429.6
- Microsoft.EntityFrameworkCore.SqlServer - 5.0.0-alpha1.19429.6
- dotnet-ef - 5.0.0-alpha1.19429.6
- Microsoft.EntityFrameworkCore - 5.0.0-alpha1.19429.6
- Microsoft.EntityFrameworkCore.InMemory - 5.0.0-alpha1.19429.6
- Microsoft.EntityFrameworkCore.Relational - 5.0.0-alpha1.19429.6
- Microsoft.EntityFrameworkCore.Sqlite - 5.0.0-alpha1.19429.6

Dependency coherency updates

- Microsoft.AspNetCore.Analyzer.Testing - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.BenchmarkRunner.Sources - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ActivatorUtilities.Sources - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Abstractions - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Memory - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.SqlServer - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.StackExchangeRedis - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.CommandLineUtils.Sources - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Abstractions - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.AzureKeyVault - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Binder - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.CommandLine - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.EnvironmentVariables - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.FileExtensions - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Ini - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Json - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.KeyPerFile - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.UserSecrets - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Xml - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection.Abstractions - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DiagnosticAdapter - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Abstractions - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Composite - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Embedded - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Physical - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileSystemGlobbing - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HashCodeCombiner.Sources - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting.Abstractions - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HostFactoryResolver.Sources - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Http - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization.Abstractions - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Abstractions - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.AzureAppServices - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Configuration - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Console - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Debug - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventSource - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventLog - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.TraceSource - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Testing - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ObjectPool - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.ConfigurationExtensions - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.DataAnnotations - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ParameterDefaultValue.Sources - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Primitives - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.TypeNameHelper.Sources - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ValueStopwatch.Sources - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.WebEncoders - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Internal.Extensions.Refs - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.JSInterop - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Mono.WebAssembly.Interop - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Bcl.AsyncInterfaces - 1.2.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 5.0.0-alpha1.19425.8 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.Logging - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.CSharp - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Win32.Registry - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Win32.SystemEvents - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ComponentModel.Annotations - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Diagnostics.EventLog - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Drawing.Common - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.IO.Pipelines - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Net.Http.WinHttpHandler - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Net.WebSockets.WebSocketProtocol - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Reflection.Metadata - 1.9.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Runtime.CompilerServices.Unsafe - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Cng - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Pkcs - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Xml - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Permissions - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Principal.Windows - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ServiceProcess.ServiceController - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Encodings.Web - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Json - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Threading.Channels - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Windows.Extensions - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Extensions.DependencyModel - 5.0.0-alpha1.19425.8 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 5.0.0-alpha1.19425.8 (parent: Microsoft.Extensions.Logging)
- NETStandard.Library.Ref - 2.1.0-alpha1.19425.8 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.Platforms - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Internal.AspNetCore.Analyzers - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.Testing - 5.0.0-alpha1.19428.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Net.Compilers.Toolset - 3.4.0-beta1-19424-01 (parent: Microsoft.Extensions.Logging)

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190829.7

- Microsoft.NET.Sdk.Razor - 5.0.0-alpha1.19429.7
- Microsoft.CodeAnalysis.Razor - 5.0.0-alpha1.19429.7
- Microsoft.AspNetCore.Razor.Language - 5.0.0-alpha1.19429.7
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 5.0.0-alpha1.19429.7

* [release/3.0] Update dependencies from 2 repositories (#13577)

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190829.8

- Microsoft.NET.Sdk.Razor - 3.0.0-rc1.19429.8
- Microsoft.CodeAnalysis.Razor - 3.0.0-rc1.19429.8
- Microsoft.AspNetCore.Razor.Language - 3.0.0-rc1.19429.8
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.0-rc1.19429.8

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190829.10

- Microsoft.EntityFrameworkCore.Tools - 3.0.0-rc1.19429.10
- Microsoft.EntityFrameworkCore.SqlServer - 3.0.0-rc1.19429.10
- dotnet-ef - 3.0.0-rc1.19429.10
- Microsoft.EntityFrameworkCore - 3.0.0-rc1.19429.10
- Microsoft.EntityFrameworkCore.InMemory - 3.0.0-rc1.19429.10
- Microsoft.EntityFrameworkCore.Relational - 3.0.0-rc1.19429.10
- Microsoft.EntityFrameworkCore.Sqlite - 3.0.0-rc1.19429.10

Dependency coherency updates

- Microsoft.AspNetCore.Analyzer.Testing - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ActivatorUtilities.Sources - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Abstractions - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Memory - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.SqlServer - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.StackExchangeRedis - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Abstractions - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.AzureKeyVault - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Binder - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.CommandLine - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.FileExtensions - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Ini - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Json - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.KeyPerFile - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.UserSecrets - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Xml - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection.Abstractions - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DiagnosticAdapter - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Abstractions - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Composite - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Embedded - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Physical - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileSystemGlobbing - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting.Abstractions - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Http - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization.Abstractions - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Abstractions - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.AzureAppServices - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Configuration - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Console - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Debug - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventSource - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventLog - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.TraceSource - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Testing - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ObjectPool - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.ConfigurationExtensions - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.DataAnnotations - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ParameterDefaultValue.Sources - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Primitives - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.TypeNameHelper.Sources - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ValueStopwatch.Sources - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.WebEncoders - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Internal.Extensions.Refs - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.JSInterop - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Mono.WebAssembly.Interop - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-rc1-19428-14 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.Logging - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyModel - 3.0.0-rc1-19428-14 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 3.0.0-rc1-19428-14 (parent: Microsoft.Extensions.Logging)
- NETStandard.Library.Ref - 2.1.0-rc1-19428-14 (parent: Microsoft.Extensions.Logging)
- Internal.AspNetCore.Analyzers - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.Testing - 3.0.0-rc1.19429.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Net.Compilers.Toolset - 3.3.1-beta3-19429-03 (parent: Microsoft.Extensions.Logging)

* Deflake ConcurrentPipeWriterTests.PassthroughIfAllFlushesAreAw… (#13563)

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190830.6

- Microsoft.EntityFrameworkCore.Tools - 5.0.0-alpha1.19430.6
- Microsoft.EntityFrameworkCore.SqlServer - 5.0.0-alpha1.19430.6
- dotnet-ef - 5.0.0-alpha1.19430.6
- Microsoft.EntityFrameworkCore - 5.0.0-alpha1.19430.6
- Microsoft.EntityFrameworkCore.InMemory - 5.0.0-alpha1.19430.6
- Microsoft.EntityFrameworkCore.Relational - 5.0.0-alpha1.19430.6
- Microsoft.EntityFrameworkCore.Sqlite - 5.0.0-alpha1.19430.6

Dependency coherency updates

- Microsoft.AspNetCore.Analyzer.Testing - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.BenchmarkRunner.Sources - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ActivatorUtilities.Sources - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Abstractions - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Memory - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.SqlServer - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.StackExchangeRedis - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.CommandLineUtils.Sources - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Abstractions - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.AzureKeyVault - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Binder - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.CommandLine - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.EnvironmentVariables - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.FileExtensions - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Ini - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Json - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.KeyPerFile - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.UserSecrets - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Xml - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection.Abstractions - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DiagnosticAdapter - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Abstractions - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Composite - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Embedded - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Physical - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileSystemGlobbing - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HashCodeCombiner.Sources - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting.Abstractions - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HostFactoryResolver.Sources - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Http - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization.Abstractions - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Abstractions - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.AzureAppServices - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Configuration - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Console - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Debug - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventSource - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventLog - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.TraceSource - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Testing - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ObjectPool - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.ConfigurationExtensions - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.DataAnnotations - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ParameterDefaultValue.Sources - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Primitives - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.TypeNameHelper.Sources - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ValueStopwatch.Sources - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.WebEncoders - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Internal.Extensions.Refs - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.JSInterop - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Mono.WebAssembly.Interop - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Bcl.AsyncInterfaces - 1.2.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 5.0.0-alpha1.19425.8 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.Logging - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.CSharp - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Win32.Registry - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Win32.SystemEvents - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ComponentModel.Annotations - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Diagnostics.EventLog - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Drawing.Common - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.IO.Pipelines - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Net.Http.WinHttpHandler - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Net.WebSockets.WebSocketProtocol - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Reflection.Metadata - 1.9.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Runtime.CompilerServices.Unsafe - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Cng - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Pkcs - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Xml - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Permissions - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Principal.Windows - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ServiceProcess.ServiceController - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Encodings.Web - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Json - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Threading.Channels - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Windows.Extensions - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Extensions.DependencyModel - 5.0.0-alpha1.19425.8 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 5.0.0-alpha1.19425.8 (parent: Microsoft.Extensions.Logging)
- NETStandard.Library.Ref - 2.1.0-alpha1.19425.8 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.Platforms - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Internal.AspNetCore.Analyzers - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.Testing - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Net.Compilers.Toolset - 3.4.0-beta1-19424-01 (parent: Microsoft.Extensions.Logging)

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190830.3

- Microsoft.NET.Sdk.Razor - 5.0.0-alpha1.19430.3
- Microsoft.CodeAnalysis.Razor - 5.0.0-alpha1.19430.3
- Microsoft.AspNetCore.Razor.Language - 5.0.0-alpha1.19430.3
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 5.0.0-alpha1.19430.3

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190831.5

- Microsoft.EntityFrameworkCore.Tools - 5.0.0-alpha1.19431.5
- Microsoft.EntityFrameworkCore.SqlServer - 5.0.0-alpha1.19431.5
- dotnet-ef - 5.0.0-alpha1.19431.5
- Microsoft.EntityFrameworkCore - 5.0.0-alpha1.19431.5
- Microsoft.EntityFrameworkCore.InMemory - 5.0.0-alpha1.19431.5
- Microsoft.EntityFrameworkCore.Relational - 5.0.0-alpha1.19431.5
- Microsoft.EntityFrameworkCore.Sqlite - 5.0.0-alpha1.19431.5

Dependency coherency updates

- Microsoft.AspNetCore.Analyzer.Testing - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.BenchmarkRunner.Sources - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ActivatorUtilities.Sources - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Abstractions - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Memory - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.SqlServer - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.StackExchangeRedis - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.CommandLineUtils.Sources - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Abstractions - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.AzureKeyVault - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Binder - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.CommandLine - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.EnvironmentVariables - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.FileExtensions - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Ini - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Json - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.KeyPerFile - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.UserSecrets - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Xml - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection.Abstractions - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DiagnosticAdapter - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Abstractions - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Composite - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Embedded - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Physical - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileSystemGlobbing - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HashCodeCombiner.Sources - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting.Abstractions - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HostFactoryResolver.Sources - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Http - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization.Abstractions - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Abstractions - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.AzureAppServices - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Configuration - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Console - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Debug - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventSource - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventLog - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.TraceSource - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Testing - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ObjectPool - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.ConfigurationExtensions - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.DataAnnotations - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ParameterDefaultValue.Sources - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Primitives - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.TypeNameHelper.Sources - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ValueStopwatch.Sources - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.WebEncoders - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Internal.Extensions.Refs - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.JSInterop - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Mono.WebAssembly.Interop - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Bcl.AsyncInterfaces - 1.2.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 5.0.0-alpha1.19425.8 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.Logging - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.CSharp - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Win32.Registry - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Win32.SystemEvents - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ComponentModel.Annotations - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Diagnostics.EventLog - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Drawing.Common - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.IO.Pipelines - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Net.Http.WinHttpHandler - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Net.WebSockets.WebSocketProtocol - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Reflection.Metadata - 1.9.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Runtime.CompilerServices.Unsafe - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Cng - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Pkcs - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Xml - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Permissions - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Principal.Windows - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ServiceProcess.ServiceController - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Encodings.Web - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Json - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Threading.Channels - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Windows.Extensions - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Extensions.DependencyModel - 5.0.0-alpha1.19425.8 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 5.0.0-alpha1.19425.8 (parent: Microsoft.Extensions.Logging)
- NETStandard.Library.Ref - 2.1.0-alpha1.19425.8 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.Platforms - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Internal.AspNetCore.Analyzers - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.Testing - 5.0.0-alpha1.19429.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Net.Compilers.Toolset - 3.4.0-beta1-19424-01 (parent: Microsoft.Extensions.Logging)

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190831.5

- Microsoft.NET.Sdk.Razor - 5.0.0-alpha1.19431.5
- Microsoft.CodeAnalysis.Razor - 5.0.0-alpha1.19431.5
- Microsoft.AspNetCore.Razor.Language - 5.0.0-alpha1.19431.5
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 5.0.0-alpha1.19431.5

* [release/3.0] Update dependencies from 2 repositories (#13592)

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190830.5

- Microsoft.NET.Sdk.Razor - 3.0.0-rc1.19430.5
- Microsoft.CodeAnalysis.Razor - 3.0.0-rc1.19430.5
- Microsoft.AspNetCore.Razor.Language - 3.0.0-rc1.19430.5
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.0-rc1.19430.5

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190830.7

- Microsoft.EntityFrameworkCore.Tools - 3.0.0-rc1.19430.7
- Microsoft.EntityFrameworkCore.SqlServer - 3.0.0-rc1.19430.7
- dotnet-ef - 3.0.0-rc1.19430.7
- Microsoft.EntityFrameworkCore - 3.0.0-rc1.19430.7
- Microsoft.EntityFrameworkCore.InMemory - 3.0.0-rc1.19430.7
- Microsoft.EntityFrameworkCore.Relational - 3.0.0-rc1.19430.7
- Microsoft.EntityFrameworkCore.Sqlite - 3.0.0-rc1.19430.7

Dependency coherency updates

- Microsoft.AspNetCore.Analyzer.Testing - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ActivatorUtilities.Sources - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Abstractions - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Memory - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.SqlServer - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.StackExchangeRedis - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Abstractions - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.AzureKeyVault - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Binder - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.CommandLine - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.FileExtensions - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Ini - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Json - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.KeyPerFile - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.UserSecrets - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Xml - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection.Abstractions - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DiagnosticAdapter - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Abstractions - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Composite - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Embedded - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Physical - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileSystemGlobbing - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting.Abstractions - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Http - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization.Abstractions - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Abstractions - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.AzureAppServices - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Configuration - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Console - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Debug - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventSource - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventLog - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.TraceSource - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Testing - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ObjectPool - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.ConfigurationExtensions - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.DataAnnotations - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ParameterDefaultValue.Sources - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Primitives - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.TypeNameHelper.Sources - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ValueStopwatch.Sources - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.WebEncoders - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Internal.Extensions.Refs - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.JSInterop - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Mono.WebAssembly.Interop - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-rc1-19429-07 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.Logging - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyModel - 3.0.0-rc1-19429-07 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 3.0.0-rc1-19429-07 (parent: Microsoft.Extensions.Logging)
- NETStandard.Library.Ref - 2.1.0-rc1-19429-07 (parent: Microsoft.Extensions.Logging)
- Internal.AspNetCore.Analyzers - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.Testing - 3.0.0-rc1.19430.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Net.Compilers.Toolset - 3.3.1-beta3-19430-03 (parent: Microsoft.Extensions.Logging)

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190831.3

- Microsoft.NET.Sdk.Razor - 3.0.0-rc1.19431.3
- Microsoft.CodeAnalysis.Razor - 3.0.0-rc1.19431.3
- Microsoft.AspNetCore.Razor.Language - 3.0.0-rc1.19431.3
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.0-rc1.19431.3

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190831.3

- Microsoft.EntityFrameworkCore.Tools - 3.0.0-rc1.19431.3
- Microsoft.EntityFrameworkCore.SqlServer - 3.0.0-rc1.19431.3
- dotnet-ef - 3.0.0-rc1.19431.3
- Microsoft.EntityFrameworkCore - 3.0.0-rc1.19431.3
- Microsoft.EntityFrameworkCore.InMemory - 3.0.0-rc1.19431.3
- Microsoft.EntityFrameworkCore.Relational - 3.0.0-rc1.19431.3
- Microsoft.EntityFrameworkCore.Sqlite - 3.0.0-rc1.19431.3

Dependency coherency updates

- Microsoft.AspNetCore.Analyzer.Testing - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ActivatorUtilities.Sources - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Abstractions - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Memory - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.SqlServer - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.StackExchangeRedis - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Abstractions - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.AzureKeyVault - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Binder - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.CommandLine - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.FileExtensions - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Ini - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Json - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.KeyPerFile - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.UserSecrets - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Xml - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection.Abstractions - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DiagnosticAdapter - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Abstractions - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Composite - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Embedded - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Physical - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileSystemGlobbing - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting.Abstractions - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Http - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization.Abstractions - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Abstractions - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.AzureAppServices - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Configuration - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Console - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Debug - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventSource - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventLog - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.TraceSource - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Testing - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ObjectPool - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.ConfigurationExtensions - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.DataAnnotations - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ParameterDefaultValue.Sources - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Primitives - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.TypeNameHelper.Sources - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ValueStopwatch.Sources - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.WebEncoders - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Internal.Extensions.Refs - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.JSInterop - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Mono.WebAssembly.Interop - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-rc1-19430-09 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.Logging - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyModel - 3.0.0-rc1-19430-09 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 3.0.0-rc1-19430-09 (parent: Microsoft.Extensions.Logging)
- NETStandard.Library.Ref - 2.1.0-rc1-19430-09 (parent: Microsoft.Extensions.Logging)
- Internal.AspNetCore.Analyzers - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.Testing - 3.0.0-rc1.19431.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Net.Compilers.Toolset - 3.3.1-beta3-19430-03 (parent: Microsoft.Extensions.Logging)

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190901.1

- Microsoft.EntityFrameworkCore.Tools - 5.0.0-alpha1.19451.1
- Microsoft.EntityFrameworkCore.SqlServer - 5.0.0-alpha1.19451.1
- dotnet-ef - 5.0.0-alpha1.19451.1
- Microsoft.EntityFrameworkCore - 5.0.0-alpha1.19451.1
- Microsoft.EntityFrameworkCore.InMemory - 5.0.0-alpha1.19451.1
- Microsoft.EntityFrameworkCore.Relational - 5.0.0-alpha1.19451.1
- Microsoft.EntityFrameworkCore.Sqlite - 5.0.0-alpha1.19451.1

Dependency coherency updates

- Microsoft.AspNetCore.Analyzer.Testing - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.BenchmarkRunner.Sources - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ActivatorUtilities.Sources - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Abstractions - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Memory - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.SqlServer - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.StackExchangeRedis - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.CommandLineUtils.Sources - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Abstractions - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.AzureKeyVault - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Binder - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.CommandLine - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.EnvironmentVariables - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.FileExtensions - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Ini - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Json - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.KeyPerFile - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.UserSecrets - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Xml - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection.Abstractions - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DiagnosticAdapter - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Abstractions - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Composite - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Embedded - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Physical - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileSystemGlobbing - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HashCodeCombiner.Sources - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting.Abstractions - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HostFactoryResolver.Sources - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Http - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization.Abstractions - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Abstractions - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.AzureAppServices - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Configuration - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Console - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Debug - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventSource - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventLog - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.TraceSource - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Testing - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ObjectPool - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.ConfigurationExtensions - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.DataAnnotations - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ParameterDefaultValue.Sources - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Primitives - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.TypeNameHelper.Sources - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ValueStopwatch.Sources - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.WebEncoders - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Internal.Extensions.Refs - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.JSInterop - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Mono.WebAssembly.Interop - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Bcl.AsyncInterfaces - 1.2.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 5.0.0-alpha1.19425.8 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.Logging - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.CSharp - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Win32.Registry - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Win32.SystemEvents - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ComponentModel.Annotations - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Diagnostics.EventLog - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Drawing.Common - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.IO.Pipelines - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Net.Http.WinHttpHandler - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Net.WebSockets.WebSocketProtocol - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Reflection.Metadata - 1.9.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Runtime.CompilerServices.Unsafe - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Cng - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Pkcs - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Xml - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Permissions - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Principal.Windows - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ServiceProcess.ServiceController - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Encodings.Web - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Json - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Threading.Channels - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Windows.Extensions - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Extensions.DependencyModel - 5.0.0-alpha1.19425.8 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 5.0.0-alpha1.19425.8 (parent: Microsoft.Extensions.Logging)
- NETStandard.Library.Ref - 2.1.0-alpha1.19425.8 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.Platforms - 5.0.0-alpha1.19425.4 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Internal.AspNetCore.Analyzers - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.Testing - 5.0.0-alpha1.19431.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Net.Compilers.Toolset - 3.4.0-beta1-19424-01 (parent: Microsoft.Extensions.Logging)

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190901.1

- Microsoft.NET.Sdk.Razor - 5.0.0-alpha1.19451.1
- Microsoft.CodeAnalysis.Razor - 5.0.0-alpha1.19451.1
- Microsoft.AspNetCore.Razor.Language - 5.0.0-alpha1.19451.1
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 5.0.0-alpha1.19451.1

* Update dependencies from https://github.com/dotnet/arcade build 20190830.3 (#13621)

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19430.3
- Microsoft.DotNet.GenAPI - 1.0.0-beta.19430.3
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19430.3

* [release/3.0] Update dependencies from 2 repositories (#13633)

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190902.1

- Microsoft.NET.Sdk.Razor - 3.0.0-rc1.19452.1
- Microsoft.CodeAnalysis.Razor - 3.0.0-rc1.19452.1
- Microsoft.AspNetCore.Razor.Language - 3.0.0-rc1.19452.1
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.0-rc1.19452.1

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190902.1

- Microsoft.EntityFrameworkCore.Tools - 3.0.0-rc1.19452.1
- Microsoft.EntityFrameworkCore.SqlServer - 3.0.0-rc1.19452.1
- dotnet-ef - 3.0.0-rc1.19452.1
- Microsoft.EntityFrameworkCore - 3.0.0-rc1.19452.1
- Microsoft.EntityFrameworkCore.InMemory - 3.0.0-rc1.19452.1
- Microsoft.EntityFrameworkCore.Relational - 3.0.0-rc1.19452.1
- Microsoft.EntityFrameworkCore.Sqlite - 3.0.0-rc1.19452.1

* Update dependencies from https://github.com/aspnet/Blazor build 20190902.3

- Microsoft.AspNetCore.Blazor.Mono - 5.0.0-alpha1.19452.3

* [release/3.0] Update dependencies from 3 repositories (#13640)

* Update dependencies from https://github.com/aspnet/Blazor build 20190902.1

- Microsoft.AspNetCore.Blazor.Mono - 3.0.0-preview9.19452.1

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190902.2

- Microsoft.NET.Sdk.Razor - 3.0.0-rc1.19452.2
- Microsoft.CodeAnalysis.Razor - 3.0.0-rc1.19452.2
- Microsoft.AspNetCore.Razor.Language - 3.0.0-rc1.19452.2
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.0-rc1.19452.2

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190902.2

- Microsoft.EntityFrameworkCore.Tools - 3.0.0-rc1.19452.2
- Microsoft.EntityFrameworkCore.SqlServer - 3.0.0-rc1.19452.2
- dotnet-ef - 3.0.0-rc1.19452.2
- Microsoft.EntityFrameworkCore - 3.0.0-rc1.19452.2
- Microsoft.EntityFrameworkCore.InMemory - 3.0.0-rc1.19452.2
- Microsoft.EntityFrameworkCore.Relational - 3.0.0-rc1.19452.2
- Microsoft.EntityFrameworkCore.Sqlite - 3.0.0-rc1.19452.2

Dependency coherency updates

- Microsoft.AspNetCore.Analyzer.Testing - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ActivatorUtilities.Sources - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Abstractions - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Memory - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.SqlServer - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.StackExchangeRedis - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Abstractions - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.AzureKeyVault - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Binder - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.CommandLine - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.FileExtensions - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Ini - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Json - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.KeyPerFile - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.UserSecrets - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Xml - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection.Abstractions - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DiagnosticAdapter - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Abstractions - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Composite - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Embedded - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Physical - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileSystemGlobbing - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting.Abstractions - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Http - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization.Abstractions - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Abstractions - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.AzureAppServices - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Configuration - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Console - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Debug - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventSource - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventLog - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.TraceSource - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Testing - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ObjectPool - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.ConfigurationExtensions - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.DataAnnotations - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ParameterDefaultValue.Sources - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Primitives - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.TypeNameHelper.Sources - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ValueStopwatch.Sources - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.WebEncoders - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Internal.Extensions.Refs - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.JSInterop - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Mono.WebAssembly.Interop - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Internal.AspNetCore.Analyzers - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.Testing - 3.0.0-rc1.19452.2 (parent: Microsoft.EntityFrameworkCore)

* Build analyzers and bundled dotnet tools in source build (#13569)

* Add external package available in source buid

* Do not infer Required attributes based on context for non-nullable generic types (#13551)

Fixes https://github.com/aspnet/AspNetCore/issues/13512

* Skip broken shutdown test (#13652)

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190903.10 (#13669)

- Microsoft.EntityFrameworkCore.Tools - 3.0.0-rc1.19453.10
- Microsoft.EntityFrameworkCore.SqlServer - 3.0.0-rc1.19453.10
- dotnet-ef - 3.0.0-rc1.19453.10
- Microsoft.EntityFrameworkCore - 3.0.0-rc1.19453.10
- Microsoft.EntityFrameworkCore.InMemory - 3.0.0-rc1.19453.10
- Microsoft.EntityFrameworkCore.Relational - 3.0.0-rc1.19453.10
- Microsoft.EntityFrameworkCore.Sqlite - 3.0.0-rc1.19453.10

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190903.12

- Microsoft.EntityFrameworkCore.Tools - 5.0.0-alpha1.19453.12
- Microsoft.EntityFrameworkCore.SqlServer - 5.0.0-alpha1.19453.12
- dotnet-ef - 5.0.0-alpha1.19453.12
- Microsoft.EntityFrameworkCore - 5.0.0-alpha1.19453.12
- Microsoft.EntityFrameworkCore.InMemory - 5.0.0-alpha1.19453.12
- Microsoft.EntityFrameworkCore.Relational - 5.0.0-alpha1.19453.12
- Microsoft.EntityFrameworkCore.Sqlite - 5.0.0-alpha1.19453.12

Dependency coherency updates

- Microsoft.AspNetCore.Analyzer.Testing - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.BenchmarkRunner.Sources - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ActivatorUtilities.Sources - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Abstractions - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Memory - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.SqlServer - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.StackExchangeRedis - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.CommandLineUtils.Sources - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Abstractions - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.AzureKeyVault - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Binder - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.CommandLine - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.EnvironmentVariables - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.FileExtensions - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Ini - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Json - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.KeyPerFile - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.UserSecrets - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Xml - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection.Abstractions - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DiagnosticAdapter - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Abstractions - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Composite - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Embedded - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Physical - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileSystemGlobbing - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HashCodeCombiner.Sources - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting.Abstractions - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HostFactoryResolver.Sources - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Http - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization.Abstractions - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Abstractions - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.AzureAppServices - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Configuration - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Console - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Debug - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventSource - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventLog - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.TraceSource - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Testing - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ObjectPool - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.ConfigurationExtensions - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.DataAnnotations - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ParameterDefaultValue.Sources - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Primitives - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.TypeNameHelper.Sources - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ValueStopwatch.Sources - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.WebEncoders - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Internal.Extensions.Refs - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.JSInterop - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Mono.WebAssembly.Interop - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Bcl.AsyncInterfaces - 1.2.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 5.0.0-alpha1.19452.1 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.Logging - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.CSharp - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Win32.Registry - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Win32.SystemEvents - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ComponentModel.Annotations - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Diagnostics.EventLog - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Drawing.Common - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.IO.Pipelines - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Net.Http.WinHttpHandler - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Net.WebSockets.WebSocketProtocol - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Reflection.Metadata - 1.9.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Runtime.CompilerServices.Unsafe - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Cng - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Pkcs - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Xml - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Permissions - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Principal.Windows - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ServiceProcess.ServiceController - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Encodings.Web - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Json - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Threading.Channels - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Windows.Extensions - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Extensions.DependencyModel - 5.0.0-alpha1.19452.1 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 5.0.0-alpha1.19452.1 (parent: Microsoft.Extensions.Logging)
- NETStandard.Library.Ref - 2.1.0-alpha1.19452.1 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.Platforms - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Internal.AspNetCore.Analyzers - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.Testing - 5.0.0-alpha1.19452.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Net.Compilers.Toolset - 3.4.0-beta1-19424-01 (parent: Microsoft.Extensions.Logging)

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190903.2

- Microsoft.NET.Sdk.Razor - 5.0.0-alpha1.19453.2
- Microsoft.CodeAnalysis.Razor - 5.0.0-alpha1.19453.2
- Microsoft.AspNetCore.Razor.Language - 5.0.0-alpha1.19453.2
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 5.0.0-alpha1.19453.2

* Correct the spelling of 'EnableEndpointRouting' (#13655)

Fixes #11467

* Remove test workaround for fixed issue.

Fixes #11206

* components-reconnect-refused to components-reconnect-rejected (#13659)

components-reconnect-refused to components-reconnect-rejected

* [Templates][Fixes #13641] Run rimraf before running the app to give it a better chance of avoiding a failure

* Rimraf has reliability issues on windows.
* This change runs rimraf with a few retries before starting the app with `dotnet run` so that `npm run start` on the ReactDeveloperMiddleware has a better chance to succeed.

* [Identity][Infrastructure] Improve test reliability (#13646)

* Catches HttpClient exceptions and retries on IdentityUI_ScriptTags_SubresourceIntegrityCheck and IdentityUI_ScriptTags_FallbackSourceContent_Matches_CDNContent

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190904.5

- Microsoft.EntityFrameworkCore.Tools - 5.0.0-alpha1.19454.5
- Microsoft.EntityFrameworkCore.SqlServer - 5.0.0-alpha1.19454.5
- dotnet-ef - 5.0.0-alpha1.19454.5
- Microsoft.EntityFrameworkCore - 5.0.0-alpha1.19454.5
- Microsoft.EntityFrameworkCore.InMemory - 5.0.0-alpha1.19454.5
- Microsoft.EntityFrameworkCore.Relational - 5.0.0-alpha1.19454.5
- Microsoft.EntityFrameworkCore.Sqlite - 5.0.0-alpha1.19454.5

Dependency coherency updates

- Microsoft.AspNetCore.Analyzer.Testing - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.BenchmarkRunner.Sources - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ActivatorUtilities.Sources - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Abstractions - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Memory - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.SqlServer - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.StackExchangeRedis - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.CommandLineUtils.Sources - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Abstractions - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.AzureKeyVault - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Binder - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.CommandLine - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.EnvironmentVariables - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.FileExtensions - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Ini - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Json - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.KeyPerFile - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.UserSecrets - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Xml - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection.Abstractions - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DiagnosticAdapter - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Abstractions - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Composite - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Embedded - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Physical - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileSystemGlobbing - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HashCodeCombiner.Sources - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting.Abstractions - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HostFactoryResolver.Sources - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Http - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization.Abstractions - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Abstractions - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.AzureAppServices - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Configuration - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Console - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Debug - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventSource - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventLog - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.TraceSource - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Testing - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ObjectPool - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.ConfigurationExtensions - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.DataAnnotations - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ParameterDefaultValue.Sources - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Primitives - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.TypeNameHelper.Sources - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ValueStopwatch.Sources - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.WebEncoders - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Internal.Extensions.Refs - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.JSInterop - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Mono.WebAssembly.Interop - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Bcl.AsyncInterfaces - 1.2.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 5.0.0-alpha1.19452.1 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.Logging - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.CSharp - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Win32.Registry - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Win32.SystemEvents - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ComponentModel.Annotations - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Diagnostics.EventLog - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Drawing.Common - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.IO.Pipelines - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Net.Http.WinHttpHandler - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Net.WebSockets.WebSocketProtocol - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Reflection.Metadata - 1.9.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Runtime.CompilerServices.Unsafe - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Cng - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Pkcs - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Xml - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Permissions - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Principal.Windows - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ServiceProcess.ServiceController - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Encodings.Web - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Json - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Threading.Channels - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Windows.Extensions - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Extensions.DependencyModel - 5.0.0-alpha1.19452.1 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 5.0.0-alpha1.19452.1 (parent: Microsoft.Extensions.Logging)
- NETStandard.Library.Ref - 2.1.0-alpha1.19452.1 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.Platforms - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Internal.AspNetCore.Analyzers - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.Testing - 5.0.0-alpha1.19453.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Net.Compilers.Toolset - 3.4.0-beta1-19424-01 (parent: Microsoft.Extensions.Logging)

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190904.1

- Microsoft.NET.Sdk.Razor - 5.0.0-alpha1.19454.1
- Microsoft.CodeAnalysis.Razor - 5.0.0-alpha1.19454.1
- Microsoft.AspNetCore.Razor.Language - 5.0.0-alpha1.19454.1
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 5.0.0-alpha1.19454.1

* Fixup loc test

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190905.19

- Microsoft.NET.Sdk.Razor - 5.0.0-alpha1.19455.19
- Microsoft.CodeAnalysis.Razor - 5.0.0-alpha1.19455.19
- Microsoft.AspNetCore.Razor.Language - 5.0.0-alpha1.19455.19
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 5.0.0-alpha1.19455.19

* Update dependencies from https://github.com/aspnet/Blazor build 20190905.3

- Microsoft.AspNetCore.Blazor.Mono - 5.0.0-alpha1.19455.3

* Fix bad merge in verison.props

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190906.16

- Microsoft.EntityFrameworkCore.Tools - 5.0.0-alpha1.19456.16
- Microsoft.EntityFrameworkCore.SqlServer - 5.0.0-alpha1.19456.16
- dotnet-ef - 5.0.0-alpha1.19456.16
- Microsoft.EntityFrameworkCore - 5.0.0-alpha1.19456.16
- Microsoft.EntityFrameworkCore.InMemory - 5.0.0-alpha1.19456.16
- Microsoft.EntityFrameworkCore.Relational - 5.0.0-alpha1.19456.16
- Microsoft.EntityFrameworkCore.Sqlite - 5.0.0-alpha1.19456.16

Dependency coherency updates

- Microsoft.AspNetCore.Analyzer.Testing - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.BenchmarkRunner.Sources - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ActivatorUtilities.Sources - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Abstractions - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Memory - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.SqlServer - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.StackExchangeRedis - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.CommandLineUtils.Sources - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Abstractions - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.AzureKeyVault - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Binder - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.CommandLine - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.EnvironmentVariables - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.FileExtensions - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Ini - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Json - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.KeyPerFile - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.UserSecrets - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Xml - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection.Abstractions - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DiagnosticAdapter - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Abstractions - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Composite - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Embedded - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Physical - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileSystemGlobbing - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HashCodeCombiner.Sources - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting.Abstractions - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HostFactoryResolver.Sources - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Http - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization.Abstractions - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Abstractions - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.AzureAppServices - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Configuration - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Console - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Debug - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventSource - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventLog - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.TraceSource - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Testing - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ObjectPool - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.ConfigurationExtensions - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.DataAnnotations - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ParameterDefaultValue.Sources - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Primitives - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.TypeNameHelper.Sources - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ValueStopwatch.Sources - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.WebEncoders - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Internal.Extensions.Refs - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.JSInterop - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Mono.WebAssembly.Interop - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Bcl.AsyncInterfaces - 1.2.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 5.0.0-alpha1.19452.1 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.Logging - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.CSharp - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Win32.Registry - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Win32.SystemEvents - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ComponentModel.Annotations - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Diagnostics.EventLog - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Drawing.Common - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.IO.Pipelines - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Net.Http.WinHttpHandler - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Net.WebSockets.WebSocketProtocol - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Reflection.Metadata - 1.9.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Runtime.CompilerServices.Unsafe - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Cng - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Pkcs - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Xml - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Permissions - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Principal.Windows - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ServiceProcess.ServiceController - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Encodings.Web - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Json - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Threading.Channels - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Windows.Extensions - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Extensions.DependencyModel - 5.0.0-alpha1.19452.1 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 5.0.0-alpha1.19452.1 (parent: Microsoft.Extensions.Logging)
- NETStandard.Library.Ref - 2.1.0-alpha1.19452.1 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.Platforms - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Internal.AspNetCore.Analyzers - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.Testing - 5.0.0-alpha1.19455.5 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Net.Compilers.Toolset - 3.4.0-beta1-19424-01 (parent: Microsoft.Extensions.Logging)

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190906.4

- Microsoft.NET.Sdk.Razor - 5.0.0-alpha1.19456.4
- Microsoft.CodeAnalysis.Razor - 5.0.0-alpha1.19456.4
- Microsoft.AspNetCore.Razor.Language - 5.0.0-alpha1.19456.4
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 5.0.0-alpha1.19456.4

* Update dependencies from https://github.com/aspnet/Blazor build 20190906.4

- Microsoft.AspNetCore.Blazor.Mono - 5.0.0-alpha1.19456.4

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190907.1

- Microsoft.EntityFrameworkCore.Tools - 5.0.0-alpha1.19457.1
- Microsoft.EntityFrameworkCore.SqlServer - 5.0.0-alpha1.19457.1
- dotnet-ef - 5.0.0-alpha1.19457.1
- Microsoft.EntityFrameworkCore - 5.0.0-alpha1.19457.1
- Microsoft.EntityFrameworkCore.InMemory - 5.0.0-alpha1.19457.1
- Microsoft.EntityFrameworkCore.Relational - 5.0.0-alpha1.19457.1
- Microsoft.EntityFrameworkCore.Sqlite - 5.0.0-alpha1.19457.1

Dependency coherency updates

- Microsoft.AspNetCore.Analyzer.Testing - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.BenchmarkRunner.Sources - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ActivatorUtilities.Sources - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Abstractions - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Memory - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.SqlServer - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.StackExchangeRedis - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.CommandLineUtils.Sources - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Abstractions - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.AzureKeyVault - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Binder - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.CommandLine - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.EnvironmentVariables - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.FileExtensions - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Ini - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Json - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.KeyPerFile - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.UserSecrets - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Xml - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection.Abstractions - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DiagnosticAdapter - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Abstractions - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Composite - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Embedded - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Physical - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileSystemGlobbing - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HashCodeCombiner.Sources - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting.Abstractions - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HostFactoryResolver.Sources - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Http - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization.Abstractions - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Abstractions - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.AzureAppServices - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Configuration - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Console - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Debug - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventSource - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventLog - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.TraceSource - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Testing - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ObjectPool - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.ConfigurationExtensions - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.DataAnnotations - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ParameterDefaultValue.Sources - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Primitives - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.TypeNameHelper.Sources - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ValueStopwatch.Sources - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.WebEncoders - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Internal.Extensions.Refs - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.JSInterop - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Mono.WebAssembly.Interop - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Bcl.AsyncInterfaces - 1.2.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 5.0.0-alpha1.19452.1 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.Logging - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.CSharp - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Win32.Registry - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Win32.SystemEvents - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ComponentModel.Annotations - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Diagnostics.EventLog - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Drawing.Common - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.IO.Pipelines - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Net.Http.WinHttpHandler - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Net.WebSockets.WebSocketProtocol - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Reflection.Metadata - 1.9.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Runtime.CompilerServices.Unsafe - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Cng - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Pkcs - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Xml - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Permissions - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Principal.Windows - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ServiceProcess.ServiceController - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Encodings.Web - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Json - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Threading.Channels - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Windows.Extensions - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Extensions.DependencyModel - 5.0.0-alpha1.19452.1 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 5.0.0-alpha1.19452.1 (parent: Microsoft.Extensions.Logging)
- NETStandard.Library.Ref - 2.1.0-alpha1.19452.1 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.Platforms - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Internal.AspNetCore.Analyzers - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.Testing - 5.0.0-alpha1.19456.12 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Net.Compilers.Toolset - 3.4.0-beta1-19424-01 (parent: Microsoft.Extensions.Logging)

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190907.2

- Microsoft.NET.Sdk.Razor - 5.0.0-alpha1.19457.2
- Microsoft.CodeAnalysis.Razor - 5.0.0-alpha1.19457.2
- Microsoft.AspNetCore.Razor.Language - 5.0.0-alpha1.19457.2
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 5.0.0-alpha1.19457.2

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190907.5

- Microsoft.NET.Sdk.Razor - 5.0.0-alpha1.19457.5
- Microsoft.CodeAnalysis.Razor - 5.0.0-alpha1.19457.5
- Microsoft.AspNetCore.Razor.Language - 5.0.0-alpha1.19457.5
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 5.0.0-alpha1.19457.5

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190908.8

- Microsoft.NET.Sdk.Razor - 5.0.0-alpha1.19458.8
- Microsoft.CodeAnalysis.Razor - 5.0.0-alpha1.19458.8
- Microsoft.AspNetCore.Razor.Language - 5.0.0-alpha1.19458.8
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 5.0.0-alpha1.19458.8

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190908.1

- Microsoft.EntityFrameworkCore.Tools - 5.0.0-alpha1.19458.1
- Microsoft.EntityFrameworkCore.SqlServer - 5.0.0-alpha1.19458.1
- dotnet-ef - 5.0.0-alpha1.19458.1
- Microsoft.EntityFrameworkCore - 5.0.0-alpha1.19458.1
- Microsoft.EntityFrameworkCore.InMemory - 5.0.0-alpha1.19458.1
- Microsoft.EntityFrameworkCore.Relational - 5.0.0-alpha1.19458.1
- Microsoft.EntityFrameworkCore.Sqlite - 5.0.0-alpha1.19458.1

Dependency coherency updates

- Microsoft.AspNetCore.Analyzer.Testing - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.BenchmarkRunner.Sources - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ActivatorUtilities.Sources - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Abstractions - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Memory - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.SqlServer - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.StackExchangeRedis - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.CommandLineUtils.Sources - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Abstractions - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.AzureKeyVault - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Binder - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.CommandLine - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.EnvironmentVariables - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.FileExtensions - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Ini - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Json - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.KeyPerFile - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.UserSecrets - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Xml - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection.Abstractions - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DiagnosticAdapter - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Abstractions - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Composite - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Embedded - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Physical - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileSystemGlobbing - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HashCodeCombiner.Sources - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting.Abstractions - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HostFactoryResolver.Sources - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Http - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization.Abstractions - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Abstractions - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.AzureAppServices - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Configuration - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Console - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Debug - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventSource - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventLog - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.TraceSource - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Testing - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ObjectPool - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.ConfigurationExtensions - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.DataAnnotations - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ParameterDefaultValue.Sources - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Primitives - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.TypeNameHelper.Sources - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ValueStopwatch.Sources - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.WebEncoders - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Internal.Extensions.Refs - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.JSInterop - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Mono.WebAssembly.Interop - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Bcl.AsyncInterfaces - 1.2.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 5.0.0-alpha1.19452.1 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.Logging - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.CSharp - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Win32.Registry - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Win32.SystemEvents - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ComponentModel.Annotations - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Diagnostics.EventLog - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Drawing.Common - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.IO.Pipelines - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Net.Http.WinHttpHandler - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Net.WebSockets.WebSocketProtocol - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Reflection.Metadata - 1.9.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Runtime.CompilerServices.Unsafe - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Cng - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Pkcs - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Xml - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Permissions - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Principal.Windows - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ServiceProcess.ServiceController - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Encodings.Web - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Json - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Threading.Channels - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Windows.Extensions - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Extensions.DependencyModel - 5.0.0-alpha1.19452.1 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 5.0.0-alpha1.19452.1 (parent: Microsoft.Extensions.Logging)
- NETStandard.Library.Ref - 2.1.0-alpha1.19452.1 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.Platforms - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Internal.AspNetCore.Analyzers - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.Testing - 5.0.0-alpha1.19457.7 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Net.Compilers.Toolset - 3.4.0-beta1-19424-01 (parent: Microsoft.Extensions.Logging)

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190909.21

- Microsoft.EntityFrameworkCore.Tools - 5.0.0-alpha1.19459.21
- Microsoft.EntityFrameworkCore.SqlServer - 5.0.0-alpha1.19459.21
- dotnet-ef - 5.0.0-alpha1.19459.21
- Microsoft.EntityFrameworkCore - 5.0.0-alpha1.19459.21
- Microsoft.EntityFrameworkCore.InMemory - 5.0.0-alpha1.19459.21
- Microsoft.EntityFrameworkCore.Relational - 5.0.0-alpha1.19459.21
- Microsoft.EntityFrameworkCore.Sqlite - 5.0.0-alpha1.19459.21

Dependency coherency updates

- Microsoft.AspNetCore.Analyzer.Testing - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.BenchmarkRunner.Sources - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ActivatorUtilities.Sources - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Abstractions - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Memory - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.SqlServer - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.StackExchangeRedis - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.CommandLineUtils.Sources - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Abstractions - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.AzureKeyVault - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Binder - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.CommandLine - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.EnvironmentVariables - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.FileExtensions - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Ini - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Json - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.KeyPerFile - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.UserSecrets - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Xml - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection.Abstractions - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DiagnosticAdapter - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Abstractions - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Composite - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Embedded - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Physical - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileSystemGlobbing - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HashCodeCombiner.Sources - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting.Abstractions - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HostFactoryResolver.Sources - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Http - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization.Abstractions - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Abstractions - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.AzureAppServices - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Configuration - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Console - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Debug - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventSource - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventLog - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.TraceSource - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Testing - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ObjectPool - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.ConfigurationExtensions - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.DataAnnotations - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ParameterDefaultValue.Sources - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Primitives - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.TypeNameHelper.Sources - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ValueStopwatch.Sources - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.WebEncoders - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Internal.Extensions.Refs - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.JSInterop - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Mono.WebAssembly.Interop - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Bcl.AsyncInterfaces - 1.2.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 5.0.0-alpha1.19452.1 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.Logging - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.CSharp - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Win32.Registry - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Win32.SystemEvents - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ComponentModel.Annotations - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Diagnostics.EventLog - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Drawing.Common - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.IO.Pipelines - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Net.Http.WinHttpHandler - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Net.WebSockets.WebSocketProtocol - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Reflection.Metadata - 1.9.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Runtime.CompilerServices.Unsafe - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Cng - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Pkcs - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Xml - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Permissions - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Principal.Windows - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ServiceProcess.ServiceController - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Encodings.Web - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Json - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Threading.Channels - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Windows.Extensions - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Extensions.DependencyModel - 5.0.0-alpha1.19452.1 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 5.0.0-alpha1.19452.1 (parent: Microsoft.Extensions.Logging)
- NETStandard.Library.Ref - 2.1.0-alpha1.19452.1 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.Platforms - 5.0.0-alpha1.19451.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Internal.AspNetCore.Analyzers - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.Testing - 5.0.0-alpha1.19458.4 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Net.Compilers.Toolset - 3.4.0-beta1-19424-01 (parent: Microsoft.Extensions.Logging)

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190909.8

- Microsoft.NET.Sdk.Razor - 5.0.0-alpha1.19459.8
- Microsoft.CodeAnalysis.Razor - 5.0.0-alpha1.19459.8
- Microsoft.AspNetCore.Razor.Language - 5.0.0-alpha1.19459.8
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 5.0.0-alpha1.19459.8

* Update dependencies from https://github.com/aspnet/Blazor build 20190909.3

- Microsoft.AspNetCore.Blazor.Mono - 5.0.0-alpha1.19459.3

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190910.11

- Microsoft.EntityFrameworkCore.Tools - 5.0.0-alpha1.19460.11
- Microsoft.EntityFrameworkCore.SqlServer - 5.0.0-alpha1.19460.11
- dotnet-ef - 5.0.0-alpha1.19460.11
- Microsoft.EntityFrameworkCore - 5.0.0-alpha1.19460.11
- Microsoft.EntityFrameworkCore.InMemory - 5.0.0-alpha1.19460.11
- Microsoft.EntityFrameworkCore.Relational - 5.0.0-alpha1.19460.11
- Microsoft.EntityFrameworkCore.Sqlite - 5.0.0-alpha1.19460.11

Dependency coherency updates

- Microsoft.AspNetCore.Analyzer.Testing - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.BenchmarkRunner.Sources - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ActivatorUtilities.Sources - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Abstractions - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Memory - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.SqlServer - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.StackExchangeRedis - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.CommandLineUtils.Sources - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Abstractions - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.AzureKeyVault - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Binder - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.CommandLine - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.EnvironmentVariables - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.FileExtensions - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Ini - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Json - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.KeyPerFile - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.UserSecrets - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Xml - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection.Abstractions - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DiagnosticAdapter - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Abstractions - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Composite - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Embedded - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Physical - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileSystemGlobbing - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HashCodeCombiner.Sources - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting.Abstractions - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HostFactoryResolver.Sources - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Http - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization.Abstractions - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Abstractions - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.AzureAppServices - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Configuration - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Console - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Debug - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventSource - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventLog - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.TraceSource - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Testing - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ObjectPool - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.ConfigurationExtensions - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.DataAnnotations - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ParameterDefaultValue.Sources - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Primitives - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.TypeNameHelper.Sources - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ValueStopwatch.Sources - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.WebEncoders - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Internal.Extensions.Refs - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.JSInterop - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Mono.WebAssembly.Interop - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Bcl.AsyncInterfaces - 1.2.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 5.0.0-alpha1.19458.15 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.Logging - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.CSharp - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Win32.Registry - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Win32.SystemEvents - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ComponentModel.Annotations - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Diagnostics.EventLog - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Drawing.Common - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.IO.Pipelines - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Net.Http.WinHttpHandler - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Net.WebSockets.WebSocketProtocol - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Reflection.Metadata - 1.9.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Runtime.CompilerServices.Unsafe - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Cng - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Pkcs - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Xml - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Permissions - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Principal.Windows - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ServiceProcess.ServiceController - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Encodings.Web - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Json - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Threading.Channels - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Windows.Extensions - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Extensions.DependencyModel - 5.0.0-alpha1.19458.15 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 5.0.0-alpha1.19458.15 (parent: Microsoft.Extensions.Logging)
- NETStandard.Library.Ref - 2.1.0-alpha1.19458.15 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.Platforms - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Internal.AspNetCore.Analyzers - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.Testing - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Net.Compilers.Toolset - 3.4.0-beta1-19456-03 (parent: Microsoft.Extensions.Logging)

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190910.4

- Microsoft.NET.Sdk.Razor - 5.0.0-alpha1.19460.4
- Microsoft.CodeAnalysis.Razor - 5.0.0-alpha1.19460.4
- Microsoft.AspNetCore.Razor.Language - 5.0.0-alpha1.19460.4
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 5.0.0-alpha1.19460.4

* Fixup build failure

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190911.1

- Microsoft.NET.Sdk.Razor - 5.0.0-alpha1.19461.1
- Microsoft.CodeAnalysis.Razor - 5.0.0-alpha1.19461.1
- Microsoft.AspNetCore.Razor.Language - 5.0.0-alpha1.19461.1
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 5.0.0-alpha1.19461.1

* Update dependencies from https://github.com/aspnet/Blazor build 20190911.2

- Microsoft.AspNetCore.Blazor.Mono - 5.0.0-alpha1.19461.2

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190912.5

- Microsoft.EntityFrameworkCore.Tools - 5.0.0-alpha1.19462.5
- Microsoft.EntityFrameworkCore.SqlServer - 5.0.0-alpha1.19462.5
- dotnet-ef - 5.0.0-alpha1.19462.5
- Microsoft.EntityFrameworkCore - 5.0.0-alpha1.19462.5
- Microsoft.EntityFrameworkCore.InMemory - 5.0.0-alpha1.19462.5
- Microsoft.EntityFrameworkCore.Relational - 5.0.0-alpha1.19462.5
- Microsoft.EntityFrameworkCore.Sqlite - 5.0.0-alpha1.19462.5

Dependency coherency updates

- Microsoft.AspNetCore.Analyzer.Testing - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.BenchmarkRunner.Sources - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ActivatorUtilities.Sources - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Abstractions - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Memory - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.SqlServer - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.StackExchangeRedis - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.CommandLineUtils.Sources - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Abstractions - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.AzureKeyVault - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Binder - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.CommandLine - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.EnvironmentVariables - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.FileExtensions - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Ini - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Json - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.KeyPerFile - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.UserSecrets - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Xml - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection.Abstractions - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DiagnosticAdapter - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Abstractions - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Composite - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Embedded - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Physical - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileSystemGlobbing - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HashCodeCombiner.Sources - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting.Abstractions - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HostFactoryResolver.Sources - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Http - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization.Abstractions - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Abstractions - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.AzureAppServices - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Configuration - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Console - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Debug - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventSource - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventLog - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.TraceSource - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Testing - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ObjectPool - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.ConfigurationExtensions - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.DataAnnotations - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ParameterDefaultValue.Sources - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Primitives - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.TypeNameHelper.Sources - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ValueStopwatch.Sources - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.WebEncoders - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Internal.Extensions.Refs - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.JSInterop - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Mono.WebAssembly.Interop - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Bcl.AsyncInterfaces - 1.2.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 5.0.0-alpha1.19458.15 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.Logging - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.CSharp - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Win32.Registry - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Win32.SystemEvents - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ComponentModel.Annotations - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Diagnostics.EventLog - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Drawing.Common - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.IO.Pipelines - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Net.Http.WinHttpHandler - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Net.WebSockets.WebSocketProtocol - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Reflection.Metadata - 1.9.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Runtime.CompilerServices.Unsafe - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Cng - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Pkcs - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Xml - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Permissions - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Principal.Windows - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ServiceProcess.ServiceController - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Encodings.Web - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Json - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Threading.Channels - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Windows.Extensions - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Extensions.DependencyModel - 5.0.0-alpha1.19458.15 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 5.0.0-alpha1.19458.15 (parent: Microsoft.Extensions.Logging)
- NETStandard.Library.Ref - 2.1.0-alpha1.19458.15 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.Platforms - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Internal.AspNetCore.Analyzers - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.Testing - 5.0.0-alpha1.19459.8 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Net.Compilers.Toolset - 3.4.0-beta1-19456-03 (parent: Microsoft.Extensions.Logging)

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190912.9

- Microsoft.NET.Sdk.Razor - 5.0.0-alpha1.19462.9
- Microsoft.CodeAnalysis.Razor - 5.0.0-alpha1.19462.9
- Microsoft.AspNetCore.Razor.Language - 5.0.0-alpha1.19462.9
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 5.0.0-alpha1.19462.9

* Update dependencies from https://github.com/aspnet/Blazor build 20190913.2

- Microsoft.AspNetCore.Blazor.Mono - 5.0.0-alpha1.19463.2

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190916.5

- Microsoft.EntityFrameworkCore.Tools - 5.0.0-alpha1.19466.5
- Microsoft.EntityFrameworkCore.SqlServer - 5.0.0-alpha1.19466.5
- dotnet-ef - 5.0.0-alpha1.19466.5
- Microsoft.EntityFrameworkCore - 5.0.0-alpha1.19466.5
- Microsoft.EntityFrameworkCore.InMemory - 5.0.0-alpha1.19466.5
- Microsoft.EntityFrameworkCore.Relational - 5.0.0-alpha1.19466.5
- Microsoft.EntityFrameworkCore.Sqlite - 5.0.0-alpha1.19466.5

Dependency coherency updates

- Microsoft.AspNetCore.Analyzer.Testing - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.BenchmarkRunner.Sources - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ActivatorUtilities.Sources - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Abstractions - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Memory - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.SqlServer - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.StackExchangeRedis - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.CommandLineUtils.Sources - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Abstractions - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.AzureKeyVault - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Binder - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.CommandLine - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.EnvironmentVariables - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.FileExtensions - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Ini - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Json - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.KeyPerFile - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.UserSecrets - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Xml - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection.Abstractions - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DiagnosticAdapter - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Abstractions - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Composite - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Embedded - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Physical - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileSystemGlobbing - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HashCodeCombiner.Sources - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting.Abstractions - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HostFactoryResolver.Sources - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Http - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization.Abstractions - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Abstractions - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.AzureAppServices - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Configuration - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Console - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Debug - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventSource - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventLog - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.TraceSource - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Testing - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ObjectPool - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.ConfigurationExtensions - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.DataAnnotations - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ParameterDefaultValue.Sources - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Primitives - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.TypeNameHelper.Sources - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ValueStopwatch.Sources - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.WebEncoders - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Internal.Extensions.Refs - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.JSInterop - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Mono.WebAssembly.Interop - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Bcl.AsyncInterfaces - 1.2.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 5.0.0-alpha1.19458.15 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.Logging - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.CSharp - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Win32.Registry - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Win32.SystemEvents - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ComponentModel.Annotations - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Diagnostics.EventLog - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Drawing.Common - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.IO.Pipelines - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Net.Http.WinHttpHandler - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Net.WebSockets.WebSocketProtocol - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Reflection.Metadata - 1.9.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Runtime.CompilerServices.Unsafe - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Cng - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Pkcs - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Xml - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Permissions - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Principal.Windows - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ServiceProcess.ServiceController - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Encodings.Web - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Json - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Threading.Channels - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Windows.Extensions - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Extensions.DependencyModel - 5.0.0-alpha1.19458.15 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 5.0.0-alpha1.19458.15 (parent: Microsoft.Extensions.Logging)
- NETStandard.Library.Ref - 2.1.0-alpha1.19458.15 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.Platforms - 5.0.0-alpha1.19458.6 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Internal.AspNetCore.Analyzers - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.Testing - 5.0.0-alpha1.19465.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Net.Compilers.Toolset - 3.4.0-beta1-19456-03 (parent: Microsoft.Extensions.Logging)

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190916.1

- Microsoft.NET.Sdk.Razor - 5.0.0-alpha1.19466.1
- Microsoft.CodeAnalysis.Razor - 5.0.0-alpha1.19466.1
- Microsoft.AspNetCore.Razor.Language - 5.0.0-alpha1.19466.1
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 5.0.0-alpha1.19466.1

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190917.7

- Microsoft.EntityFrameworkCore.Tools - 5.0.0-alpha1.19467.7
- Microsoft.EntityFrameworkCore.SqlServer - 5.0.0-alpha1.19467.7
- dotnet-ef - 5.0.0-alpha1.19467.7
- Microsoft.EntityFrameworkCore - 5.0.0-alpha1.19467.7
- Microsoft.EntityFrameworkCore.InMemory - 5.0.0-alpha1.19467.7
- Microsoft.EntityFrameworkCore.Relational - 5.0.0-alpha1.19467.7
- Microsoft.EntityFrameworkCore.Sqlite - 5.0.0-alpha1.19467.7

Dependency coherency updates

- Microsoft.AspNetCore.Analyzer.Testing - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.BenchmarkRunner.Sources - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ActivatorUtilities.Sources - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Abstractions - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.Memory - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.SqlServer - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Caching.StackExchangeRedis - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.CommandLineUtils.Sources - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Abstractions - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.AzureKeyVault - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Binder - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.CommandLine - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.EnvironmentVariables - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.FileExtensions - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Ini - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Json - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.KeyPerFile - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.UserSecrets - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration.Xml - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Configuration - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection.Abstractions - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DependencyInjection - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.DiagnosticAdapter - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Diagnostics.HealthChecks - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Abstractions - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Composite - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Embedded - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileProviders.Physical - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.FileSystemGlobbing - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HashCodeCombiner.Sources - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting.Abstractions - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Hosting - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.HostFactoryResolver.Sources - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Http - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization.Abstractions - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Localization - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Abstractions - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.AzureAppServices - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Configuration - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Console - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Debug - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventSource - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.EventLog - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.TraceSource - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Logging.Testing - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ObjectPool - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.ConfigurationExtensions - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options.DataAnnotations - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Options - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ParameterDefaultValue.Sources - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.Primitives - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.TypeNameHelper.Sources - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.ValueStopwatch.Sources - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Extensions.WebEncoders - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Internal.Extensions.Refs - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.JSInterop - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Mono.WebAssembly.Interop - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Bcl.AsyncInterfaces - 1.2.0-alpha1.19462.7 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.NETCore.App.Runtime.win-x64 - 5.0.0-alpha1.19465.2 (parent: Microsoft.Extensions.Logging)
- Microsoft.Extensions.Logging - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.CSharp - 5.0.0-alpha1.19462.7 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Win32.Registry - 5.0.0-alpha1.19462.7 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Win32.SystemEvents - 5.0.0-alpha1.19462.7 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ComponentModel.Annotations - 5.0.0-alpha1.19462.7 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Diagnostics.EventLog - 5.0.0-alpha1.19462.7 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Drawing.Common - 5.0.0-alpha1.19462.7 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.IO.Pipelines - 5.0.0-alpha1.19462.7 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Net.Http.WinHttpHandler - 5.0.0-alpha1.19462.7 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Net.WebSockets.WebSocketProtocol - 5.0.0-alpha1.19462.7 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Reflection.Metadata - 1.9.0-alpha1.19462.7 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Runtime.CompilerServices.Unsafe - 5.0.0-alpha1.19462.7 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Cng - 5.0.0-alpha1.19462.7 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Pkcs - 5.0.0-alpha1.19462.7 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Cryptography.Xml - 5.0.0-alpha1.19462.7 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Permissions - 5.0.0-alpha1.19462.7 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Security.Principal.Windows - 5.0.0-alpha1.19462.7 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.ServiceProcess.ServiceController - 5.0.0-alpha1.19462.7 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Encodings.Web - 5.0.0-alpha1.19462.7 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Text.Json - 5.0.0-alpha1.19462.7 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Threading.Channels - 5.0.0-alpha1.19462.7 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- System.Windows.Extensions - 5.0.0-alpha1.19462.7 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Microsoft.Extensions.DependencyModel - 5.0.0-alpha1.19465.2 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.App.Ref - 5.0.0-alpha1.19465.2 (parent: Microsoft.Extensions.Logging)
- NETStandard.Library.Ref - 2.1.0-alpha1.19465.2 (parent: Microsoft.Extensions.Logging)
- Microsoft.NETCore.Platforms - 5.0.0-alpha1.19462.7 (parent: Microsoft.NETCore.App.Runtime.win-x64)
- Internal.AspNetCore.Analyzers - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.AspNetCore.Testing - 5.0.0-alpha1.19466.1 (parent: Microsoft.EntityFrameworkCore)
- Microsoft.Net.Compilers.Toolset - 3.4.0-beta1-19456-03 (parent: Microsoft.Extensions.Logging)

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190917.1

- Microsoft.NET.Sdk.Razor - 5.0.0-alpha1.19467.1
- Microsoft.CodeAnalysis.Razor - 5.0.0-alpha1.19467.1
- Microsoft.AspNetCore.Razor.Language - 5.0.0-alpha1.19467.1
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 5.0.0-alpha1.19467.1

* Fix tests

* Use `$(DefaultNetCoreTargetFramework)` in openapi tool

* Use `$(DefaultNetCoreTargetFramework)` in ConsoleClient.csproj
---
 .vscode/settings.json                         |  14 +-
 Directory.Build.targets                       |   3 +-
 eng/Build.props                               |   1 +
 eng/Dependencies.props                        |   9 +-
 eng/ProjectReferences.props                   |   8 +-
 eng/Signing.props                             |  10 +-
 eng/Tools.props                               |   4 +-
 eng/Version.Details.xml                       | 404 ++++++------
 eng/Versions.props                            | 204 +++---
 eng/Workarounds.targets                       |   4 +-
 eng/common/darc-init.ps1                      |   4 +-
 eng/common/darc-init.sh                       |   6 +-
 eng/common/native/CommonLibrary.psm1          |   2 +
 eng/common/performance/perfhelixpublish.proj  |  29 +-
 eng/common/performance/performance-setup.ps1  |  19 +-
 eng/common/performance/performance-setup.sh   |  76 ++-
 eng/common/post-build/darc-gather-drop.ps1    |  10 +
 eng/common/post-build/dotnetsymbol-init.ps1   |  29 -
 eng/common/post-build/sourcelink-cli-init.ps1 |  29 -
 .../post-build/sourcelink-validation.ps1      |  84 ++-
 eng/common/post-build/symbols-validation.ps1  |  20 +-
 eng/common/sdl/execute-all-sdl-tools.ps1      |   8 +-
 eng/common/sdl/init-sdl.ps1                   |   3 +
 eng/common/sdl/packages.config                |   4 +-
 eng/common/sdl/run-sdl.ps1                    |  34 +-
 eng/common/templates/job/execute-sdl.yml      |  15 +-
 .../channels/internal-servicing.yml           |  17 +-
 .../post-build/channels/netcore-dev-5.yml     |  25 +-
 .../channels/netcore-tools-latest.yml         |  25 +-
 .../channels/public-dev-release.yml           |  23 +-
 .../post-build/channels/public-release.yml    |  18 +-
 .../channels/public-validation-release.yml    |  12 +-
 .../templates/post-build/common-variables.yml |   7 +
 .../templates/post-build/post-build.yml       |  35 +-
 eng/common/tools.ps1                          |   2 +
 eng/common/tools.sh                           |  15 +-
 .../Analyzers/test/AnalyzerTestBase.cs        |   1 -
 .../StartupWithMapBlazorHub.cs                |   2 +-
 .../AzureADJwtBearerOptionsConfiguration.cs   |   5 +
 ...eADAuthenticationBuilderExtensionsTests.cs |  32 +
 ...omponentInternalUsageDiagnosticAnalzyer.cs |   4 +
 .../Analyzers/test/AnalyzerTestBase.cs        |   1 -
 ...rosoft.AspNetCore.Blazor.netstandard2.0.cs |   2 +-
 .../Blazor/src/Hosting/WebAssemblyHost.cs     |   1 -
 .../src/Microsoft.AspNetCore.Blazor.csproj    |  10 +-
 .../Rendering/WebAssemblyEventDispatcher.cs   |   1 +
 .../src/Rendering/WebAssemblyRenderer.cs      |   2 +-
 .../src/Services/WebAssemblyJSRuntime.cs      |  26 +-
 .../Build/test/BindRazorIntegrationTest.cs    |   5 +
 .../ComponentRenderingRazorIntegrationTest.cs |  12 +-
 .../test/RenderingRazorIntegrationTest.cs     |  81 +--
 .../test/RuntimeDependenciesResolverTest.cs   |   2 +-
 src/Components/Blazor/Directory.Build.props   |   9 +
 .../BlazorWasm-CSharp/Client/_Imports.razor   |   1 +
 .../HostedInAspNet.Client/_Imports.razor      |   1 +
 .../_Imports.razor                            |   1 +
 .../testassets/StandaloneApp/_Imports.razor   |   3 +-
 .../Microsoft.AspNetCore.Components.csproj    |   5 +-
 ...rosoft.AspNetCore.Components.netcoreapp.cs |  86 ++-
 ...etCore.Components.netstandard2.0.Manual.cs |  85 +--
 ...ft.AspNetCore.Components.netstandard2.0.cs |  86 ++-
 .../src/BindElementAttribute.cs               |   0
 src/Components/Components/src/Dispatcher.cs   |   1 +
 .../Components/src/ElementReference.cs        |  50 +-
 .../src/EventHandlerAttribute.cs              |   0
 .../Microsoft.AspNetCore.Components.csproj    |   9 +-
 .../src/Reflection/ComponentProperties.cs     |   8 +-
 .../src/Reflection/MemberAssignment.cs        |  19 +-
 src/Components/Components/src/RenderHandle.cs |   2 +-
 .../EventFieldInfo.cs                         |  11 +-
 .../{Rendering => RenderTree}/RenderBatch.cs  |   9 +-
 .../{Rendering => RenderTree}/Renderer.Log.cs |   3 +-
 .../src/{Rendering => RenderTree}/Renderer.cs |  11 +-
 .../Components/src/Routing/RouteEntry.cs      |   2 +
 .../src/Routing/RouteTableFactory.cs          |  75 ++-
 .../Components/src/Routing/RouteTemplate.cs   |   3 +
 .../Components/src/Routing/Router.cs          |  16 +-
 .../test/ParameterViewTest.Assignment.cs      |  83 ++-
 .../test/RenderTreeDiffBuilderTest.cs         |   2 +-
 .../Components/test/RendererTest.cs           |   9 +-
 .../test/Routing/RouteTableFactoryTests.cs    |  74 +++
 ...rosoft.AspNetCore.Components.Server.csproj |   2 +-
 ...AspNetCore.Components.Server.netcoreapp.cs |  16 +-
 ...nentEndpointConventionBuilderExtensions.cs |  52 --
 ...ComponentEndpointRouteBuilderExtensions.cs | 255 +-------
 .../Server/src/CircuitDisconnectMiddleware.cs |  56 +-
 .../src/Circuits/ArrayBuilderMemoryStream.cs  |   2 +-
 src/Components/Server/src/Circuits/Circuit.cs |   2 +-
 .../Server/src/Circuits/CircuitFactory.cs     |  93 ++-
 .../Server/src/Circuits/CircuitHost.cs        | 152 +++--
 .../Server/src/Circuits/CircuitId.cs          |  63 ++
 .../Server/src/Circuits/CircuitIdFactory.cs   |  56 +-
 .../Server/src/Circuits/CircuitRegistry.cs    | 160 +++--
 .../src/{ => Circuits}/ComponentDescriptor.cs |   6 +-
 .../src/Circuits/DefaultCircuitFactory.cs     | 135 ----
 .../Server/src/Circuits/RemoteJSRuntime.cs    |  49 +-
 .../Server/src/Circuits/RemoteRenderer.cs     |  17 +-
 .../Server/src/Circuits/RenderBatchWriter.cs  |   3 +-
 .../Circuits/ServerComponentDeserializer.cs   | 263 ++++++++
 .../src/Circuits/ServerComponentTypeCache.cs  |  59 ++
 src/Components/Server/src/ComponentHub.cs     | 107 +++-
 .../ComponentServiceCollectionExtensions.cs   |   5 +-
 ...rosoft.AspNetCore.Components.Server.csproj |   8 +-
 .../test/CircuitDisconnectMiddlewareTest.cs   |  16 +-
 .../Server/test/Circuits/CircuitHostTest.cs   |  25 +-
 .../test/Circuits/CircuitIdFactoryTest.cs     |  31 +-
 .../test/Circuits/CircuitRegistryTest.cs      |  17 +-
 .../test/Circuits/RemoteRendererTest.cs       |  13 +-
 .../ServerComponentDeserializerTest.cs        | 261 ++++++++
 .../Server/test/Circuits/TestCircuitHost.cs   |   7 +-
 ...onentEndpointRouteBuilderExtensionsTest.cs |   4 +-
 .../ElementReferenceJsonConverterTest.cs}     |  38 +-
 ....AspNetCore.Components.Server.Tests.csproj |   5 +-
 src/Components/Shared/src/ArrayBuilder.cs     |   2 +-
 .../src/ElementReferenceJsonConverter.cs      |  52 ++
 src/Components/Shared/src/WebEventData.cs     |  22 +-
 .../Web.JS/dist/Release/blazor.server.js      |   2 +-
 .../Web.JS/dist/Release/blazor.webassembly.js |   2 +-
 src/Components/Web.JS/package.json            |   2 +-
 src/Components/Web.JS/src/Boot.Server.ts      |  24 +-
 .../src/Platform/Circuits/CircuitManager.ts   | 270 +++++++-
 .../Circuits/DefaultReconnectDisplay.ts       |   2 +
 .../src/Platform/Circuits/RenderQueue.ts      |  10 +
 .../Platform/Circuits/UserSpecifiedDisplay.ts |   8 +-
 .../Web.JS/src/Rendering/LogicalElements.ts   |   9 +-
 .../Web.JS/src/Services/NavigationManager.ts  |   4 +-
 src/Components/Web.JS/yarn.lock               |   6 +-
 ...Microsoft.AspNetCore.Components.Web.csproj |   2 +
 ...ft.AspNetCore.Components.Web.netcoreapp.cs | 531 ++++++++-------
 ...spNetCore.Components.Web.netstandard2.0.cs | 531 ++++++++-------
 src/Components/Web/src/EventHandlers.cs       | 128 ----
 ...Microsoft.AspNetCore.Components.Web.csproj |   7 +-
 .../Web/src/{ => Web}/BindAttributes.cs       |   2 +-
 .../ClipboardEventArgs.cs}                    |   4 +-
 .../Web/src/{ => Web}/DataTransfer.cs         |   8 +-
 .../DataTransferItem.cs}                      |   8 +-
 .../DragEventArgs.cs}                         |   4 +-
 .../ErrorEventArgs.cs}                        |   4 +-
 src/Components/Web/src/Web/EventHandlers.cs   | 128 ++++
 .../FocusEventArgs.cs}                        |   4 +-
 .../KeyboardEventArgs.cs}                     |  12 +-
 .../MouseEventArgs.cs}                        |   4 +-
 .../PointerEventArgs.cs}                      |   4 +-
 .../ProgressEventArgs.cs}                     |   6 +-
 .../TouchEventArgs.cs}                        |  14 +-
 .../{UITouchPoint.cs => Web/TouchPoint.cs}    |   4 +-
 ...ventCallbackFactoryEventArgsExtensions.cs} |  84 +--
 .../WheelEventArgs.cs}                        |   6 +-
 src/Components/Web/src/WebEventDescriptor.cs  |   7 +-
 ...soft.AspNetCore.Components.E2ETests.csproj |   9 +-
 .../CircuitGracefulTerminationTests.cs        |   3 -
 .../ComponentHubInvalidEventTest.cs           | 138 ++++
 .../ComponentHubReliabilityTest.cs            | 279 ++------
 .../ServerExecutionTests/IgnitorTest.cs       | 131 ++++
 .../InteropReliabilityTests.cs                | 285 ++-------
 .../MultipleRootComponentsTest.cs             |  82 +++
 .../RemoteRendererBufferLimitTest.cs          |  81 +--
 .../ServerExecutionTests/ServerAuthTest.cs    |   2 +-
 .../ServerExecutionTests/ServerSideAppTest.cs |   4 +-
 .../test/E2ETest/Tests/EventTest.cs           |   1 -
 .../test/E2ETest/Tests/FormsTest.cs           |   1 -
 .../test/E2ETest/Tests/RoutingTest.cs         |   9 +
 .../Ignitor.Test/RenderBatchReaderTest.cs     |   2 +-
 .../AsyncEventHandlerComponent.razor          |   4 +-
 .../EventCallbackTest/ButtonComponent.razor   |   2 +-
 .../StronglyTypedButton.razor                 |   2 +-
 .../BasicTestApp/FocusEventComponent.razor    |   8 +-
 .../test/testassets/BasicTestApp/Index.razor  |   1 +
 .../BasicTestApp/InteropComponent.razor       |  14 +-
 .../InteropTest/JavaScriptInterop.cs          |  70 +-
 .../BasicTestApp/KeyPressEventComponent.razor |   2 +-
 .../BasicTestApp/LongRunningInterop.razor     |   6 +-
 .../BasicTestApp/MouseEventComponent.razor    |  18 +-
 .../MultipleComponents/GreeterComponent.razor |  19 +
 .../NavigationManagerComponent.razor          |   9 +-
 .../TestRouterWithAdditionalAssembly.razor    |  11 +
 .../ServerReliability/JSInterop.cs            |   6 +-
 .../ReliabilityComponent.razor                |   6 +-
 .../BasicTestApp/TouchEventComponent.razor    |   2 +-
 .../testassets/BasicTestApp/_Imports.razor    |   1 +
 .../BasicTestApp/wwwroot/index.html           |   5 +
 .../ComponentsApp.App/_Imports.razor          |   1 +
 .../ComponentsApp.Server.csproj               |   2 +-
 .../ComponentsApp.Server/Pages/_Host.cshtml   |   3 +-
 .../ComponentsApp.Server/Startup.cs           |   2 +-
 .../test/testassets/Ignitor/BlazorClient.cs   | 286 ++++++---
 .../Ignitor/CapturedJSInteropCall.cs          |  19 +
 .../testassets/Ignitor/CapturedRenderBatch.cs |  17 +
 .../test/testassets/Ignitor/ElementNode.cs    |   3 +-
 .../test/testassets/Ignitor/Operations.cs     |  18 +
 .../test/testassets/Ignitor/Program.cs        |  14 +-
 .../testassets/TestContentPackage/MyPrompt.cs |   2 +-
 .../TestContentPackage/_Imports.razor         |   1 +
 .../Pages/MultipleComponents.cshtml           |  55 ++
 .../TestServer/Pages/PrerenderedHost.cshtml   |   2 +-
 .../TestServer/Pages/_ServerHost.cshtml       |  39 ++
 .../test/testassets/TestServer/Startup.cs     |  33 +-
 .../testassets/TestServer/appsettings.json    |   2 +-
 .../test/Cng/BCryptUtilTests.cs               |   2 +-
 .../test/Cng/CachedAlgorithmHandlesTests.cs   |   2 +-
 .../test/Pbkdf2Tests.cs                       |   2 +-
 .../Internal/DefaultKeyResolution.cs          |   4 +
 .../Internal/ICacheableKeyRingProvider.cs     |   4 +
 .../Internal/IInternalXmlKeyManager.cs        |   4 +
 .../Internal/IKeyRingProvider.cs              |   4 +
 ...CngCbcAuthenticatedEncryptorFactoryTest.cs |   2 +-
 ...CngGcmAuthenticatedEncryptorFactoryTest.cs |   2 +-
 .../AuthenticatedEncryptorDescriptorTests.cs  |   2 +-
 ...tedEncryptorDescriptorDeserializerTests.cs |   2 +-
 ...tedEncryptorDescriptorDeserializerTests.cs |   2 +-
 .../Cng/CbcAuthenticatedEncryptorTests.cs     |   2 +-
 .../Cng/CngAuthenticatedEncryptorBaseTests.cs |   2 +-
 .../Cng/GcmAuthenticatedEncryptorTests.cs     |   2 +-
 .../test/ContainerUtilsTests.cs               |   2 +-
 .../Internal/KeyManagementOptionsSetupTest.cs |   2 +-
 .../ManagedAuthenticatedEncryptorTests.cs     |   2 +-
 .../test/RegistryPolicyResolverTests.cs       |   2 +-
 .../FileSystemXmlRepositoryTests.cs           |   2 +-
 .../RegistryXmlRepositoryTests.cs             |   2 +-
 .../test/SP800_108/SP800_108Tests.cs          |   2 +-
 .../DpapiNGXmlEncryptionTests.cs              |   2 +-
 .../XmlEncryption/DpapiXmlEncryptionTests.cs  |   1 -
 .../test/DataProtectionProviderTests.cs       |   1 -
 .../test/X509StoreIsAvailableAttribute.cs     |   2 +-
 .../test/DataProtectionRedisTests.cs          |   1 -
 .../TestRedisServerIsAvailableAttribute.cs    |   2 +-
 ...onalRunTestOnlyWindows8OrLaterAttribute.cs |   2 +-
 .../ConditionalRunTestOnlyWindowsAttribute.cs |   2 +-
 .../WebHostFunctionalTests.cs                 |   2 +-
 .../src/Internal/ConversionResult.cs          |   6 +-
 .../src/Internal/ConversionResultProvider.cs  |   4 +
 .../src/Internal/DictionaryAdapterOfTU.cs     |   4 +
 .../src/Internal/DynamicObjectAdapter.cs      |   4 +
 .../JsonPatch/src/Internal/IAdapter.cs        |   4 +
 .../JsonPatch/src/Internal/ListAdapter.cs     |  16 +
 .../JsonPatch/src/Internal/ObjectVisitor.cs   |   8 +-
 .../JsonPatch/src/Internal/ParsedPath.cs      |   4 +
 .../JsonPatch/src/Internal/PocoAdapter.cs     |   4 +
 src/Framework/test/TargetingPackTests.cs      |   3 -
 .../test/Internal/HostingEventSourceTests.cs  |   1 -
 src/Hosting/Hosting/test/WebHostTests.cs      |   1 -
 ...re.Server.IntegrationTesting.netcoreapp.cs |   6 +-
 .../SkipIfEnvironmentVariableNotEnabled.cs    |   2 +-
 ...SExpressSchemaMissingInProcessAttribute.cs |   2 +-
 .../src/xunit/SkipOn32BitOSAttribute.cs       |   2 +-
 src/Hosting/TestHost/test/TestClientTests.cs  |   2 +-
 .../test/Properties/AssemblyInfo.cs           |   2 +-
 .../test/WebHostServiceTests.cs               |   2 +-
 .../test/FunctionalTests/ShutdownTests.cs     |   3 +-
 .../FunctionalTests/WebHostBuilderTests.cs    |   1 -
 src/Http/WebUtilities/src/FormPipeReader.cs   |   2 +
 .../WebUtilities/test/FormPipeReaderTests.cs  |  26 +
 .../ConfigureSigningCredentialsTests.cs       |   2 +-
 .../Configuration/SigningKeysLoaderTests.cs   |   2 +-
 ...tity.EntityFrameworkCore.netstandard2.1.cs | 222 +++++++
 .../test/EF.Test/CustomPocoTest.cs            |   2 +-
 .../test/EF.Test/DefaultPocoTest.cs           |   2 +-
 .../test/EF.Test/MaxKeyLengthSchemaTest.cs    |   4 +-
 .../test/EF.Test/SqlStoreOnlyUsersTestBase.cs |   2 +-
 .../test/EF.Test/SqlStoreTestBase.cs          |   2 +-
 .../test/EF.Test/UserOnlyCustomContextTest.cs |   2 +-
 .../test/EF.Test/UserOnlyTest.cs              |   2 +-
 .../test/EF.Test/UserStoreTest.cs             |   2 +-
 .../src/UserManagerSpecificationTests.cs      |   1 -
 .../Areas/Identity/Pages/V4/_Layout.cshtml    |   9 +-
 .../Properties/AssemblyInfo.cs                |   2 +-
 .../Identity.Test/IdentityUIScriptsTest.cs    |  24 +-
 .../test/Identity.Test/RetryHandler.cs        |  65 ++
 .../CorsMiddlewareFunctionalTest.cs           |   1 -
 .../DatabaseErrorPageMiddlewareTest.cs        |   2 +-
 .../MigrationsEndPointMiddlewareTest.cs       |   2 +-
 .../DatabaseErrorPageSampleTest.cs            |   2 +-
 .../HealthChecksSample.csproj                 |   2 +-
 .../SqlConnectionHealthCheck.cs               |   2 +-
 .../src/HttpsRedirectionMiddleware.cs         |  64 +-
 .../StartupResourcesInClassLibrary.cs         |   6 +-
 .../Model.cs                                  |   2 +-
 .../StaticFileMiddlewareTests.cs              |   1 -
 .../UnitTests/DefaultFilesMiddlewareTests.cs  |   2 +-
 .../DirectoryBrowserMiddlewareTests.cs        |   2 +-
 .../UnitTests/StaticFileMiddlewareTests.cs    |   2 +-
 .../test/ConformanceTests/AutobahnTests.cs    |   2 +-
 .../SkipIfWsTestNotPresentAttribute.cs        |   2 +-
 .../UnitTests/WebSocketMiddlewareTests.cs     |   1 -
 .../MusicStore.E2ETests/Common/DbUtils.cs     |   4 +-
 .../MusicStore.E2ETests/DotnetRunTests.cs     |   2 +-
 .../MusicStore.E2ETests.csproj                |   6 +-
 .../NtlmAuthentationTest.cs                   |   2 +-
 .../MusicStore.E2ETests/OpenIdConnectTests.cs |   2 +-
 .../MusicStore.E2ETests/PublishAndRunTests.cs |   2 +-
 .../test/MusicStore.E2ETests/SmokeTests.cs    |   2 +-
 .../SmokeTestsOnNanoServer.cs                 |   2 +-
 .../MusicStore.E2ETests/StoreSmokeTests.cs    |   2 +-
 ...t.Extensions.ApiDescription.Server.targets |  59 --
 src/Mvc/GetDocumentInsider/src/AnsiConsole.cs |  15 -
 .../GetDocumentInsider/src/AnsiConstants.cs   |  20 -
 .../GetDocumentInsider/src/AnsiTextWriter.cs  | 131 ----
 .../src/CommandLineUtils/CommandArgument.cs   |  19 -
 .../CommandLineApplication.cs                 | 604 ------------------
 .../CommandLineApplicationExtensions.cs       |  18 -
 .../src/CommandLineUtils/CommandOption.cs     | 125 ----
 .../src/CommandLineUtils/CommandOptionType.cs |  13 -
 .../CommandParsingException.cs                |  15 -
 .../src/Commands/CommandBase.cs               |  37 --
 src/Mvc/GetDocumentInsider/src/ProductInfo.cs |  16 -
 src/Mvc/GetDocumentInsider/src/Program.cs     |  49 --
 src/Mvc/GetDocumentInsider/src/Reporter.cs    |  58 --
 .../test/Infrastructure/MvcTestSource.cs      |   1 -
 .../test/Infrastructure/MvcTestSource.cs      |   1 -
 src/Mvc/Mvc.Core/test/FileResultTest.cs       |   2 +-
 .../SystemTextJsonInputFormatterTest.cs       |   2 +-
 .../FloatingPointTypeModelBinderTestOfT.cs    |   1 -
 .../Validation/DefaultObjectValidatorTests.cs |   1 -
 .../src/DataAnnotationsMetadataProvider.cs    |  21 +-
 .../test/CompareAttributeAdapterTest.cs       |   1 -
 .../DataAnnotationsMetadataProviderTest.cs    |  32 +
 .../Mvc.Formatters.Xml/test/XmlAssertTest.cs  |   1 -
 ...taContractSerializerOutputFormatterTest.cs |   2 +-
 .../test/XmlSerializerInputFormatterTest.cs   |   1 -
 .../test/LanguageViewLocationExpanderTest.cs  |  14 +-
 ...crosoft.AspNetCore.Mvc.ViewFeatures.csproj |   3 +-
 ....AspNetCore.Mvc.ViewFeatures.netcoreapp.cs |  10 +-
 ...MvcViewFeaturesMvcCoreBuilderExtensions.cs |   3 +
 .../src/HtmlHelperComponentExtensions.cs      |  86 ++-
 .../Infrastructure/ComponentHtmlContent.cs    |  14 +-
 ...crosoft.AspNetCore.Mvc.ViewFeatures.csproj |  21 +-
 .../UnsupportedJavaScriptRuntime.cs           |   6 +-
 src/Mvc/Mvc.ViewFeatures/src/RenderMode.cs    |  34 +
 .../src/Rendering/ViewContext.cs              |  10 +
 .../src/ServerComponentInvocationSequence.cs  |  26 +
 .../src/ServerComponentSerializer.cs          |  90 +++
 .../HtmlHelperComponentExtensionsTests.cs     | 244 ++++++-
 src/Mvc/Mvc.sln                               |  88 ---
 src/Mvc/MvcNoDeps.slnf                        | 130 ++--
 src/Mvc/dotnet-getdocument/src/Exe.cs         | 131 ----
 src/Mvc/dotnet-getdocument/src/Program.cs     |  43 --
 .../MvcSandbox/Components/_Imports.razor      |   1 +
 .../MvcSandbox/Pages/Components.cshtml        |   2 +-
 src/Mvc/samples/MvcSandbox/Startup.cs         |   2 +-
 .../Mvc.FunctionalTests/ApiExplorerTest.cs    |   2 +-
 .../ConsumesAttributeTestsBase.cs             |   2 +-
 .../ContentNegotiationTest.cs                 |   2 +-
 .../DoNotRespectBrowserAcceptHeaderTests.cs   |   2 +-
 .../Mvc.FunctionalTests/FileResultTests.cs    |   2 +-
 .../Mvc.FunctionalTests/FlushPointTest.cs     |   1 -
 .../InputFormatterTests.cs                    |   2 +-
 .../InputObjectValidationTests.cs             |   2 +-
 ...TempDataInCookiesUsingCookieConsentTest.cs |   1 -
 ...ontractSerializerFormattersWrappingTest.cs |   4 +-
 .../XmlOutputFormatterTests.cs                |   2 +-
 .../XmlSerializerInputFormatterTests.cs       |   2 +-
 .../CollectionModelBinderIntegrationTest.cs   |  99 +++
 .../DictionaryModelBinderIntegrationTest.cs   | 206 ++++++
 .../WebSites/BasicWebSite/BasicWebSite.csproj |   1 +
 .../RazorComponents/_Imports.razor            |   1 +
 .../Views/RazorComponents/Index.cshtml        |   6 +-
 .../Views/RazorComponents/Navigation.cshtml   |   2 +-
 .../content/BlazorServerWeb-CSharp/App.razor  |  10 +-
 .../BlazorServerWeb-CSharp/Pages/_Host.cshtml |   3 +-
 .../content/BlazorServerWeb-CSharp/Startup.cs |   2 +-
 .../BlazorServerWeb-CSharp/_Imports.razor     |   1 +
 .../.template.config/template.json            |   1 +
 .../RazorClassLibrary-CSharp/Component1.razor |   2 +-
 .../ExampleJsInterop.cs                       |   4 +-
 .../RazorClassLibrary-CSharp/_Imports.razor   |   1 +
 .../Pages/Shared/_Layout.cshtml               |   6 +-
 .../Shared/_ValidationScriptsPartial.cshtml   |   4 +-
 .../Views/Shared/_Layout.cshtml               |   6 +-
 .../Shared/_ValidationScriptsPartial.cshtml   |   4 +-
 .../Views/Shared/_Layout.cshtml               |   6 +-
 .../Shared/_ValidationScriptsPartial.cshtml   |   4 +-
 .../Angular-CSharp.csproj.in                  |   1 +
 .../React-CSharp.csproj.in                    |   1 +
 .../ReactRedux-CSharp.csproj.in               |   1 +
 .../api-authorization/authorize.service.ts    |   4 +
 .../api-authorization/AuthorizeService.js     |   4 +
 .../test/BlazorServerTemplateTest.cs          |   1 -
 src/ProjectTemplates/test/MvcTemplateTest.cs  |   1 -
 .../test/RazorPagesTemplateTest.cs            |   1 -
 .../SpaTemplateTest/AngularTemplateTest.cs    |   1 -
 .../test/SpaTemplateTest/ReactTemplateTest.cs |   1 -
 .../SpaTemplateTest/SpaTemplateTestBase.cs    |  35 +-
 .../test/template-baselines.json              |   1 +
 .../CrossMachineTests.cs                      |   2 +-
 .../NegotiateHandlerFunctionalTests.cs        |   4 +-
 .../Authentication/test/CertificateTests.cs   |   2 +-
 .../Authentication/test/CookieTests.cs        |   4 +-
 .../test/SecureDataFormatTests.cs             |   2 +-
 .../test/TicketSerializerTests.cs             |   2 +-
 .../FunctionalTests/AuthenticationTests.cs    |   1 -
 .../test/FunctionalTests/HttpsTests.cs        |   1 -
 .../Listener/RequestBodyTests.cs              |   1 -
 .../Listener/RequestHeaderTests.cs            |   2 +-
 .../FunctionalTests/Listener/RequestTests.cs  |   2 +-
 .../Listener/ResponseBodyTests.cs             |   1 -
 .../Listener/ResponseHeaderTests.cs           |   2 +-
 .../FunctionalTests/Listener/ServerTests.cs   |   1 -
 .../test/FunctionalTests/MessagePumpTests.cs  |   2 +-
 .../OSDontSkipConditionAttribute.cs           |   2 +-
 .../FunctionalTests/OpaqueUpgradeTests.cs     |   1 -
 .../Properties/AssemblyInfo.cs                |   2 +-
 .../FunctionalTests/RequestBodyLimitTests.cs  |   2 +-
 .../test/FunctionalTests/RequestBodyTests.cs  |   2 +-
 .../FunctionalTests/RequestHeaderTests.cs     |   2 +-
 .../test/FunctionalTests/RequestTests.cs      |   2 +-
 .../test/FunctionalTests/ResponseBodyTests.cs |   1 -
 .../FunctionalTests/ResponseCachingTests.cs   |   1 -
 .../FunctionalTests/ResponseHeaderTests.cs    |   2 +-
 .../FunctionalTests/ResponseSendFileTests.cs  |   3 +-
 .../test/FunctionalTests/ResponseTests.cs     |   1 -
 .../test/FunctionalTests/ServerTests.cs       |   1 -
 .../Core/IISHttpContext.FeatureCollection.cs  |   1 +
 .../Common.FunctionalTests/AppOfflineTests.cs |   1 -
 .../Common.FunctionalTests/BasicAuthTests.cs  |   2 +-
 .../ClientCertificateTests.cs                 |   2 +-
 .../ClientDisconnectStress.cs                 |   2 +-
 .../CommonStartupTests.cs                     |   2 +-
 .../CompressionTests.cs                       |   2 +-
 .../ConfigurationChangeTests.cs               |   1 -
 .../test/Common.FunctionalTests/HttpsTests.cs |   2 +-
 .../Inprocess/ClientDisconnectTests.cs        |   4 +-
 .../Inprocess/CompressionTests.cs             |   2 +-
 .../Inprocess/EnvironmentVariableTests.cs     |   2 +-
 .../Inprocess/ErrorPagesTests.cs              |   2 +-
 .../Inprocess/EventLogTests.cs                |   2 +-
 .../Inprocess/FeatureCollectionTests.cs       |   2 +-
 .../Inprocess/FrebTests.cs                    |   1 -
 .../Inprocess/HelloWorldTests.cs              |   2 +-
 .../Inprocess/HostingEnvironmentTests.cs      |   2 +-
 .../InvalidReadWriteOperationTests.cs         |   2 +-
 .../Inprocess/LargeResponseBodyTests.cs       |   2 +-
 .../Inprocess/LogPipeTests.cs                 |   2 +-
 .../Inprocess/MaxRequestBodySizeTests.cs      |   4 +-
 .../Inprocess/RequestTests.cs                 |   4 +-
 .../Inprocess/ResponseBodyTests.cs            |   2 +-
 .../Inprocess/ResponseHeaderTests.cs          |   2 +-
 .../Inprocess/ResponseInvalidOrderingTests.cs |   2 +-
 .../Inprocess/ServerVariablesTest.cs          |   2 +-
 .../Inprocess/ShutdownTests.cs                |   2 +-
 .../Inprocess/StartupExceptionTests.cs        |   2 +-
 .../Inprocess/StartupTests.cs                 |   1 -
 .../Inprocess/SynchronousReadAndWriteTests.cs |   2 +-
 .../Common.FunctionalTests/LogFileTests.cs    |   1 -
 .../MultiApplicationTests.cs                  |   2 +-
 .../OutOfProcess/AspNetCorePortTests.cs       |   2 +-
 .../OutOfProcess/GlobalVersionTests.cs        |   2 +-
 .../OutOfProcess/HelloWorldTest.cs            |   2 +-
 .../RequiresNewHandler.cs                     |   2 +-
 .../Common.FunctionalTests/RequiresNewShim.cs |   2 +-
 .../ServerAbortTests.cs                       |   2 +-
 .../SkipIfNotAdminAttribute.cs                |   2 +-
 .../SkipVSTSAttribute.cs                      |   2 +-
 .../RequiresEnvironmentVariableAttribute.cs   |   2 +-
 .../Utilities/SkipIfDebugAttribute.cs         |   4 +-
 .../WindowsAuthTests.cs                       |   2 +-
 .../NewHandlerTests.cs                        |   2 +-
 .../ForwardsCompatibilityTests.cs             |   2 +-
 .../ApplicationInitializationTests.cs         |   1 -
 .../Inprocess/StdOutRedirectionTests.cs       |   2 +-
 .../RequiresIISAttribute.cs                   |   2 +-
 .../test/IIS.Tests/ClientDisconnectTests.cs   |   1 -
 .../IIS.Tests/ConnectionIdFeatureTests.cs     |   2 +-
 .../IIS.Tests/HttpBodyControlFeatureTests.cs  |   2 +-
 .../test/IIS.Tests/MaxRequestBodySizeTests.cs |   2 +-
 .../IIS/test/IIS.Tests/ResponseAbortTests.cs  |   2 +-
 .../IIS/IIS/test/IIS.Tests/TestServerTest.cs  |   2 +-
 ...pIfHostableWebCoreNotAvailibleAttribute.cs |   2 +-
 .../InProcess/AppOfflineIISExpressTests.cs    |   2 +-
 .../InProcess/AuthenticationTests.cs          |   2 +-
 .../InProcess/IISExpressShutdownTests.cs      |   2 +-
 .../InProcess/WebSocketTests.cs               |   2 +-
 .../OutOfProcess/MultipleAppTests.cs          |   2 +-
 .../OutOfProcess/NtlmAuthentationTest.cs      |   2 +-
 .../RequiresIISAttribute.cs                   |   2 +-
 .../UpgradeFeatureDetectionTests.cs           |   2 +-
 .../InProcessWebSite/Startup.WebSockets.cs    |   1 +
 .../src/Internal/Http2/Http2MessageBody.cs    |  20 +-
 .../Core/src/ListenOptionsHttpsExtensions.cs  |   6 +-
 .../Kestrel/Core/test/AddressBinderTests.cs   |   1 -
 .../Core/test/ConcurrentPipeWriterTests.cs    |  53 +-
 .../Kestrel/test/GeneratedCodeTests.cs        |   1 -
 .../test/KestrelConfigurationBuilderTests.cs  |   1 -
 .../test/LibuvTransportTests.cs               |   1 -
 .../HostNameIsReachableAttribute.cs           |   2 +-
 .../IPv6ScopeIdPresentConditionAttribute.cs   |   2 +-
 .../IPv6SupportedConditionAttribute.cs        |   2 +-
 .../BindTests/AddressRegistrationTests.cs     |  21 +-
 .../FunctionalTests/Http2/HandshakeTests.cs   |   1 -
 .../FunctionalTests/Http2/ShutdownTests.cs    |   1 -
 .../MaxRequestBufferSizeTests.cs              |   1 -
 .../test/FunctionalTests/RequestTests.cs      |   1 -
 .../test/FunctionalTests/ResponseTests.cs     |   1 -
 .../FunctionalTests/UnixDomainSocketsTests.cs |   1 -
 .../ConnectionLimitTests.cs                   |   1 -
 .../Http2/Http2StreamTests.cs                 |   2 +-
 .../Http2/Http2TimeoutTests.cs                |   1 -
 .../Http2/TlsTests.cs                         |   1 -
 .../HttpConnectionManagerTests.cs             |   1 -
 .../HttpsConnectionMiddlewareTests.cs         |  40 +-
 .../LoggingConnectionMiddlewareTests.cs       |   1 -
 .../InMemory.FunctionalTests/RequestTests.cs  |   1 -
 .../InMemory.FunctionalTests/ResponseTests.cs |   1 -
 .../Interop.FunctionalTests/ChromeTests.cs    |   1 -
 .../Interop.FunctionalTests/H2SpecTests.cs    |   1 -
 .../HttpClientHttp2InteropTests.cs            |   1 -
 .../SkipIfChromeUnavailableAttribute.cs       |   2 +-
 .../test/Interop.FunctionalTests/Utilities.cs |   2 +-
 .../ListenHandleTests.cs                      |   1 -
 .../test/FunctionalTests/HelloWorldTest.cs    |   2 +-
 .../FunctionalTests/NtlmAuthenticationTest.cs |   2 +-
 .../ResponseCompressionTests.cs               |   2 +-
 .../test/FunctionalTests/ResponseTests.cs     |   2 +-
 src/Shared/Components/ServerComponent.cs      |  32 +
 .../Components/ServerComponentMarker.cs       |  60 ++
 .../ServerComponentSerializationSettings.cs   |  26 +
 src/Shared/E2ETesting/BrowserTestBase.cs      |   9 +-
 src/Shared/Process/ProcessExtensions.cs       |  67 +-
 .../FunctionalTests/HubConnectionTests.cs     |   2 +-
 .../SignalR.Client.FunctionalTestApp.csproj   |  20 -
 .../SignalR.Npm.FunctionalTests.npmproj       |  20 +
 .../clients/ts/FunctionalTests/package.json   |   2 +-
 .../ts/FunctionalTests/scripts/run-tests.ts   |  18 +-
 .../test/HttpConnectionDispatcherTests.cs     |   1 -
 .../test/MapConnectionHandlerTests.cs         |   2 +-
 .../WebSocketsSupportedConditionAttribute.cs  |   2 +-
 .../Internal/DefaultHubProtocolResolver.cs    |   5 +-
 .../test/DefaultTransportFactoryTests.cs      |   2 +-
 .../server/SignalR/test/EndToEndTests.cs      |   1 -
 .../DefaultHubProtocolResolverTests.cs        |  16 +
 .../SignalR/test/WebSocketsTransportTests.cs  |   2 +-
 .../StackExchangeRedis/test/RedisEndToEnd.cs  |   2 +-
 .../test/SkipIfDockerNotPresentAttribute.cs   |   2 +-
 src/SiteExtensions/build.cmd                  |   6 +-
 .../README.md                                 |   7 +
 .../src/CSharpIdentifier.cs                   |   2 +-
 .../src/GetCurrentOpenApiReference.cs}        |   4 +-
 .../src/GetOpenApiReferenceMetadata.cs}       |   7 +-
 .../src/MetadataSerializer.cs                 |   0
 ...ft.Extensions.ApiDescription.Client.csproj |   6 +-
 ...ft.Extensions.ApiDescription.Client.nuspec |   3 +-
 .../src/Properties/AssemblyInfo.cs            |   6 +
 .../src/Resources.resx                        |   0
 ...oft.Extensions.ApiDescription.Client.props |  24 +-
 ...t.Extensions.ApiDescription.Client.targets |  21 +-
 .../src/build/OpenApiItemsSchema.xaml         |   0
 ...oft.Extensions.ApiDescription.Client.props |   0
 ...t.Extensions.ApiDescription.Client.targets |   0
 .../test/CSharpIdentifierTest.cs              | 107 ++++
 .../test/GetCurrentOpenApiReferenceTest.cs    |  57 ++
 .../test/GetOpenApiReferenceMetadataTest.cs   | 576 +++++++++++++++++
 ...ensions.ApiDescription.Client.Tests.csproj |  21 +
 .../test/MockBuildEngine.cs                   | 102 +++
 .../ConsoleClient/ConsoleClient.csproj        |  38 ++
 .../TestProjects/ConsoleClient/Program.cs     |  12 +
 .../test/TestProjects/build/Fakes.targets     |  40 ++
 .../test/TestProjects/files/NSwag.json        | 183 ++++++
 .../test/TestProjects/files/azureMonitor.json |   1 +
 .../test/TestProjects/files/swashbuckle.json  | 155 +++++
 .../README.md                                 |   8 +
 ...ft.Extensions.ApiDescription.Server.csproj |   2 +-
 ...ft.Extensions.ApiDescription.Server.nuspec |   0
 ...oft.Extensions.ApiDescription.Server.props |  13 +-
 ...t.Extensions.ApiDescription.Server.targets |  71 ++
 ...oft.Extensions.ApiDescription.Server.props |   0
 ...t.Extensions.ApiDescription.Server.targets |  39 +-
 .../test/CertificateManagerTests.cs           |   2 +-
 src/Tools/GetDocumentInsider/README.md        |   7 +
 .../src/CommandException.cs                   |   0
 .../src/Commands/CommandBase.cs               |  58 ++
 .../src/Commands/GetDocumentCommand.cs        |  14 +-
 .../src/Commands/GetDocumentCommandContext.cs |   5 +-
 .../src/Commands/GetDocumentCommandWorker.cs  |  71 +-
 .../src/Commands/HelpCommandBase.cs           |  13 +-
 .../src/Commands/ProjectCommandBase.cs        |   9 +-
 .../src/GetDocumentInsider.csproj             |   7 +-
 src/Tools/GetDocumentInsider/src/Program.cs   |  24 +
 .../GetDocumentInsider/src/ProgramBase.cs     |  68 ++
 .../src/ReporterExtensions.cs                 |  40 ++
 .../GetDocumentInsider/src/Resources.resx     |  16 +-
 .../src/runtimeconfig.template.json           |   0
 src/Tools/Microsoft.dotnet-openapi/README.md  |  84 +++
 .../src/Application.cs                        | 104 +++
 .../src/CodeGenerator.cs                      |  11 +
 .../src/Commands/AddCommand.cs                |  34 +
 .../src/Commands/AddFileCommand.cs            |  81 +++
 .../src/Commands/AddProjectCommand.cs         |  57 ++
 .../src/Commands/AddURLCommand.cs             |  59 ++
 .../src/Commands/BaseCommand.cs               | 538 ++++++++++++++++
 .../src/Commands/RefreshCommand.cs            |  67 ++
 .../src/Commands/RemoveCommand.cs             |  78 +++
 .../Microsoft.dotnet-openapi/src/DebugMode.cs |  27 +
 .../src/HttpClientWrapper.cs                  |  72 +++
 .../src/IHttpClientWrapper.cs                 |  14 +
 .../src/IHttpResponseMessageWrapper.cs        |  19 +
 .../Internal/OpenapiDependencyAttribute.cs    |  25 +
 .../src/Microsoft.dotnet-openapi.csproj       |  37 ++
 .../Microsoft.dotnet-openapi/src/Program.cs   |  53 ++
 .../src/ProjectExtensions.cs                  |  23 +
 .../src/Properties/AssemblyInfo.cs            |   6 +
 .../test/OpenApiAddFileTests.cs               | 254 ++++++++
 .../test/OpenApiAddProjectTests.cs            | 123 ++++
 .../test/OpenApiAddURLTests.cs                | 493 ++++++++++++++
 .../test/OpenApiRefreshTests.cs               |  48 ++
 .../test/OpenApiRemoveTests.cs                | 201 ++++++
 .../test/OpenApiTestBase.cs                   | 183 ++++++
 .../test/ProcessEx.cs                         | 146 +++++
 .../test/Properties/AssemblyInfo.cs           |   6 +
 .../test/TestContent/Startup.cs.txt           |  46 ++
 .../test/TestContent/openapi.json.txt         | 514 +++++++++++++++
 .../dotnet-microsoft.openapi.Tests.csproj     |  51 ++
 .../test/xunit.runner.json                    |   5 +
 src/Tools/README.md                           |  31 +-
 src/Tools/Shared/CommandLine/CliContext.cs    |   4 +
 .../CommandLineApplicationExtensions.cs       |  12 +
 .../Shared/CommandLine/ConsoleReporter.cs     |   6 +-
 src/Tools/Shared/CommandLine/DebugHelper.cs   |   6 +-
 src/Tools/Shared/CommandLine/Ensure.cs        |   2 +-
 src/Tools/Shared/CommandLine/IConsole.cs      |   4 +
 src/Tools/Shared/CommandLine/IReporter.cs     |   6 +-
 src/Tools/Shared/CommandLine/NullReporter.cs  |   4 +
 .../Shared/CommandLine/PhysicalConsole.cs     |   4 +
 .../TestHelpers}/TemporaryCSharpProject.cs    |  17 +-
 .../TestHelpers}/TemporaryDirectory.cs        |  22 +-
 src/Tools/Tools.sln                           | 104 ++-
 src/Tools/build.cmd                           |   3 +
 src/Tools/build.sh                            |   7 +
 src/Tools/dotnet-dev-certs/src/Program.cs     |   8 +-
 .../src/dotnet-dev-certs.csproj               |   1 +
 src/Tools/dotnet-getdocument/README.md        |   7 +
 .../src/Commands/InvokeCommand.cs             |  35 +-
 src/Tools/dotnet-getdocument/src/Exe.cs       |  63 ++
 src/Tools/dotnet-getdocument/src/Program.cs   |  24 +
 .../dotnet-getdocument/src/ProjectOptions.cs  |   4 +-
 .../dotnet-getdocument/src/Resources.resx     |  63 +-
 .../src/dotnet-getdocument.csproj             |  10 +-
 .../src/runtimeconfig.template.json           |   0
 .../src/Internal/CommandContext.cs            |   6 +-
 .../src/Internal/ICommand.cs                  |   6 +-
 .../src/Internal/InitCommand.cs               |  14 +-
 .../src/Internal/ProjectIdResolver.cs         |   4 +
 .../ReadableJsonConfigurationSource.cs        |   6 +-
 .../src/Internal/SecretsStore.cs              |   6 +-
 .../src/dotnet-user-secrets.csproj            |   1 +
 .../dotnet-watch/src/PrefixConsoleReporter.cs |  12 +-
 src/Tools/dotnet-watch/src/Program.cs         |  14 +-
 .../dotnet-watch/src/dotnet-watch.csproj      |   5 +-
 .../dotnet-watch/test/AppWithDepsTests.cs     |   1 -
 src/Tools/dotnet-watch/test/AssertEx.cs       |   2 -
 .../dotnet-watch/test/DotNetWatcherTests.cs   |   3 +-
 .../dotnet-watch/test/GlobbingAppTests.cs     |   1 -
 .../test/MsBuildFileSetFactoryTest.cs         |  32 +-
 src/Tools/dotnet-watch/test/NoDepsAppTests.cs |   1 -
 .../test/Properties/AssemblyInfo.cs           |   2 +-
 .../test/Utilities/TestProjectGraph.cs        |   8 +-
 .../test/dotnet-watch.Tests.csproj            |   2 +-
 655 files changed, 12172 insertions(+), 5315 deletions(-)
 delete mode 100644 eng/common/post-build/dotnetsymbol-init.ps1
 delete mode 100644 eng/common/post-build/sourcelink-cli-init.ps1
 create mode 100644 src/Components/Blazor/Directory.Build.props
 create mode 100644 src/Components/Blazor/testassets/HostedInAspNet.Client/_Imports.razor
 rename src/Components/{Web => Components}/src/BindElementAttribute.cs (100%)
 rename src/Components/{Web => Components}/src/EventHandlerAttribute.cs (100%)
 rename src/Components/Components/src/{Rendering => RenderTree}/EventFieldInfo.cs (52%)
 rename src/Components/Components/src/{Rendering => RenderTree}/RenderBatch.cs (85%)
 rename src/Components/Components/src/{Rendering => RenderTree}/Renderer.Log.cs (97%)
 rename src/Components/Components/src/{Rendering => RenderTree}/Renderer.cs (98%)
 delete mode 100644 src/Components/Server/src/Builder/ComponentEndpointConventionBuilderExtensions.cs
 create mode 100644 src/Components/Server/src/Circuits/CircuitId.cs
 rename src/Components/Server/src/{ => Circuits}/ComponentDescriptor.cs (72%)
 delete mode 100644 src/Components/Server/src/Circuits/DefaultCircuitFactory.cs
 create mode 100644 src/Components/Server/src/Circuits/ServerComponentDeserializer.cs
 create mode 100644 src/Components/Server/src/Circuits/ServerComponentTypeCache.cs
 create mode 100644 src/Components/Server/test/Circuits/ServerComponentDeserializerTest.cs
 rename src/Components/{Components/test/ElementReferenceTest.cs => Server/test/ElementReferenceJsonConverterTest.cs} (52%)
 create mode 100644 src/Components/Shared/src/ElementReferenceJsonConverter.cs
 delete mode 100644 src/Components/Web/src/EventHandlers.cs
 rename src/Components/Web/src/{ => Web}/BindAttributes.cs (97%)
 rename src/Components/Web/src/{UIClipboardEventArgs.cs => Web/ClipboardEventArgs.cs} (82%)
 rename src/Components/Web/src/{ => Web}/DataTransfer.cs (83%)
 rename src/Components/Web/src/{UIDataTransferItem.cs => Web/DataTransferItem.cs} (72%)
 rename src/Components/Web/src/{UIDragEventArgs.cs => Web/DragEventArgs.cs} (84%)
 rename src/Components/Web/src/{UIErrorEventArgs.cs => Web/ErrorEventArgs.cs} (92%)
 create mode 100644 src/Components/Web/src/Web/EventHandlers.cs
 rename src/Components/Web/src/{UIFocusEventArgs.cs => Web/FocusEventArgs.cs} (87%)
 rename src/Components/Web/src/{UIKeyboardEventArgs.cs => Web/KeyboardEventArgs.cs} (89%)
 rename src/Components/Web/src/{UIMouseEventArgs.cs => Web/MouseEventArgs.cs} (97%)
 rename src/Components/Web/src/{UIPointerEventArgs.cs => Web/PointerEventArgs.cs} (95%)
 rename src/Components/Web/src/{UIProgressEventArgs.cs => Web/ProgressEventArgs.cs} (87%)
 rename src/Components/Web/src/{UITouchEventArgs.cs => Web/TouchEventArgs.cs} (78%)
 rename src/Components/Web/src/{UITouchPoint.cs => Web/TouchPoint.cs} (96%)
 rename src/Components/Web/src/{WebEventCallbackFactoryUIEventArgsExtensions.cs => Web/WebEventCallbackFactoryEventArgsExtensions.cs} (73%)
 rename src/Components/Web/src/{UIWheelEventArgs.cs => Web/WheelEventArgs.cs} (83%)
 create mode 100644 src/Components/test/E2ETest/ServerExecutionTests/ComponentHubInvalidEventTest.cs
 create mode 100644 src/Components/test/E2ETest/ServerExecutionTests/IgnitorTest.cs
 create mode 100644 src/Components/test/E2ETest/ServerExecutionTests/MultipleRootComponentsTest.cs
 create mode 100644 src/Components/test/testassets/BasicTestApp/MultipleComponents/GreeterComponent.razor
 create mode 100644 src/Components/test/testassets/BasicTestApp/RouterTest/TestRouterWithAdditionalAssembly.razor
 create mode 100644 src/Components/test/testassets/BasicTestApp/_Imports.razor
 create mode 100644 src/Components/test/testassets/Ignitor/CapturedJSInteropCall.cs
 create mode 100644 src/Components/test/testassets/Ignitor/CapturedRenderBatch.cs
 create mode 100644 src/Components/test/testassets/Ignitor/Operations.cs
 create mode 100644 src/Components/test/testassets/TestContentPackage/_Imports.razor
 create mode 100644 src/Components/test/testassets/TestServer/Pages/MultipleComponents.cshtml
 create mode 100644 src/Components/test/testassets/TestServer/Pages/_ServerHost.cshtml
 create mode 100644 src/Identity/EntityFrameworkCore/ref/Microsoft.AspNetCore.Identity.EntityFrameworkCore.netstandard2.1.cs
 create mode 100644 src/Identity/test/Identity.Test/RetryHandler.cs
 delete mode 100644 src/Mvc/Extensions.ApiDescription.Server/src/build/Microsoft.Extensions.ApiDescription.Server.targets
 delete mode 100644 src/Mvc/GetDocumentInsider/src/AnsiConsole.cs
 delete mode 100644 src/Mvc/GetDocumentInsider/src/AnsiConstants.cs
 delete mode 100644 src/Mvc/GetDocumentInsider/src/AnsiTextWriter.cs
 delete mode 100644 src/Mvc/GetDocumentInsider/src/CommandLineUtils/CommandArgument.cs
 delete mode 100644 src/Mvc/GetDocumentInsider/src/CommandLineUtils/CommandLineApplication.cs
 delete mode 100644 src/Mvc/GetDocumentInsider/src/CommandLineUtils/CommandLineApplicationExtensions.cs
 delete mode 100644 src/Mvc/GetDocumentInsider/src/CommandLineUtils/CommandOption.cs
 delete mode 100644 src/Mvc/GetDocumentInsider/src/CommandLineUtils/CommandOptionType.cs
 delete mode 100644 src/Mvc/GetDocumentInsider/src/CommandLineUtils/CommandParsingException.cs
 delete mode 100644 src/Mvc/GetDocumentInsider/src/Commands/CommandBase.cs
 delete mode 100644 src/Mvc/GetDocumentInsider/src/ProductInfo.cs
 delete mode 100644 src/Mvc/GetDocumentInsider/src/Program.cs
 delete mode 100644 src/Mvc/GetDocumentInsider/src/Reporter.cs
 create mode 100644 src/Mvc/Mvc.ViewFeatures/src/RenderMode.cs
 create mode 100644 src/Mvc/Mvc.ViewFeatures/src/ServerComponentInvocationSequence.cs
 create mode 100644 src/Mvc/Mvc.ViewFeatures/src/ServerComponentSerializer.cs
 delete mode 100644 src/Mvc/dotnet-getdocument/src/Exe.cs
 delete mode 100644 src/Mvc/dotnet-getdocument/src/Program.cs
 create mode 100644 src/Mvc/samples/MvcSandbox/Components/_Imports.razor
 create mode 100644 src/Mvc/test/WebSites/BasicWebSite/RazorComponents/_Imports.razor
 create mode 100644 src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/_Imports.razor
 create mode 100644 src/Shared/Components/ServerComponent.cs
 create mode 100644 src/Shared/Components/ServerComponentMarker.cs
 create mode 100644 src/Shared/Components/ServerComponentSerializationSettings.cs
 create mode 100644 src/Tools/Extensions.ApiDescription.Client/README.md
 rename src/{Mvc => Tools}/Extensions.ApiDescription.Client/src/CSharpIdentifier.cs (97%)
 rename src/{Mvc/Extensions.ApiDescription.Client/src/GetCurrentItems.cs => Tools/Extensions.ApiDescription.Client/src/GetCurrentOpenApiReference.cs} (89%)
 rename src/{Mvc/Extensions.ApiDescription.Client/src/GetFileReferenceMetadata.cs => Tools/Extensions.ApiDescription.Client/src/GetOpenApiReferenceMetadata.cs} (95%)
 rename src/{Mvc => Tools}/Extensions.ApiDescription.Client/src/MetadataSerializer.cs (100%)
 rename src/{Mvc => Tools}/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.csproj (79%)
 rename src/{Mvc => Tools}/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.nuspec (72%)
 create mode 100644 src/Tools/Extensions.ApiDescription.Client/src/Properties/AssemblyInfo.cs
 rename src/{Mvc => Tools}/Extensions.ApiDescription.Client/src/Resources.resx (100%)
 rename src/{Mvc => Tools}/Extensions.ApiDescription.Client/src/build/Microsoft.Extensions.ApiDescription.Client.props (84%)
 rename src/{Mvc => Tools}/Extensions.ApiDescription.Client/src/build/Microsoft.Extensions.ApiDescription.Client.targets (91%)
 rename src/{Mvc => Tools}/Extensions.ApiDescription.Client/src/build/OpenApiItemsSchema.xaml (100%)
 rename src/{Mvc => Tools}/Extensions.ApiDescription.Client/src/buildMultiTargeting/Microsoft.Extensions.ApiDescription.Client.props (100%)
 rename src/{Mvc => Tools}/Extensions.ApiDescription.Client/src/buildMultiTargeting/Microsoft.Extensions.ApiDescription.Client.targets (100%)
 create mode 100644 src/Tools/Extensions.ApiDescription.Client/test/CSharpIdentifierTest.cs
 create mode 100644 src/Tools/Extensions.ApiDescription.Client/test/GetCurrentOpenApiReferenceTest.cs
 create mode 100644 src/Tools/Extensions.ApiDescription.Client/test/GetOpenApiReferenceMetadataTest.cs
 create mode 100644 src/Tools/Extensions.ApiDescription.Client/test/Microsoft.Extensions.ApiDescription.Client.Tests.csproj
 create mode 100644 src/Tools/Extensions.ApiDescription.Client/test/MockBuildEngine.cs
 create mode 100644 src/Tools/Extensions.ApiDescription.Client/test/TestProjects/ConsoleClient/ConsoleClient.csproj
 create mode 100644 src/Tools/Extensions.ApiDescription.Client/test/TestProjects/ConsoleClient/Program.cs
 create mode 100644 src/Tools/Extensions.ApiDescription.Client/test/TestProjects/build/Fakes.targets
 create mode 100644 src/Tools/Extensions.ApiDescription.Client/test/TestProjects/files/NSwag.json
 create mode 100644 src/Tools/Extensions.ApiDescription.Client/test/TestProjects/files/azureMonitor.json
 create mode 100644 src/Tools/Extensions.ApiDescription.Client/test/TestProjects/files/swashbuckle.json
 create mode 100644 src/Tools/Extensions.ApiDescription.Server/README.md
 rename src/{Mvc => Tools}/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj (92%)
 rename src/{Mvc => Tools}/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec (100%)
 rename src/{Mvc => Tools}/Extensions.ApiDescription.Server/src/build/Microsoft.Extensions.ApiDescription.Server.props (67%)
 create mode 100644 src/Tools/Extensions.ApiDescription.Server/src/build/Microsoft.Extensions.ApiDescription.Server.targets
 rename src/{Mvc => Tools}/Extensions.ApiDescription.Server/src/buildMultiTargeting/Microsoft.Extensions.ApiDescription.Server.props (100%)
 rename src/{Mvc => Tools}/Extensions.ApiDescription.Server/src/buildMultiTargeting/Microsoft.Extensions.ApiDescription.Server.targets (54%)
 create mode 100644 src/Tools/GetDocumentInsider/README.md
 rename src/{Mvc => Tools}/GetDocumentInsider/src/CommandException.cs (100%)
 create mode 100644 src/Tools/GetDocumentInsider/src/Commands/CommandBase.cs
 rename src/{Mvc => Tools}/GetDocumentInsider/src/Commands/GetDocumentCommand.cs (92%)
 rename src/{Mvc => Tools}/GetDocumentInsider/src/Commands/GetDocumentCommandContext.cs (77%)
 rename src/{Mvc => Tools}/GetDocumentInsider/src/Commands/GetDocumentCommandWorker.cs (78%)
 rename src/{Mvc => Tools}/GetDocumentInsider/src/Commands/HelpCommandBase.cs (53%)
 rename src/{Mvc => Tools}/GetDocumentInsider/src/Commands/ProjectCommandBase.cs (86%)
 rename src/{Mvc => Tools}/GetDocumentInsider/src/GetDocumentInsider.csproj (74%)
 create mode 100644 src/Tools/GetDocumentInsider/src/Program.cs
 create mode 100644 src/Tools/GetDocumentInsider/src/ProgramBase.cs
 create mode 100644 src/Tools/GetDocumentInsider/src/ReporterExtensions.cs
 rename src/{Mvc => Tools}/GetDocumentInsider/src/Resources.resx (93%)
 rename src/{Mvc => Tools}/GetDocumentInsider/src/runtimeconfig.template.json (100%)
 create mode 100644 src/Tools/Microsoft.dotnet-openapi/README.md
 create mode 100644 src/Tools/Microsoft.dotnet-openapi/src/Application.cs
 create mode 100644 src/Tools/Microsoft.dotnet-openapi/src/CodeGenerator.cs
 create mode 100644 src/Tools/Microsoft.dotnet-openapi/src/Commands/AddCommand.cs
 create mode 100644 src/Tools/Microsoft.dotnet-openapi/src/Commands/AddFileCommand.cs
 create mode 100644 src/Tools/Microsoft.dotnet-openapi/src/Commands/AddProjectCommand.cs
 create mode 100644 src/Tools/Microsoft.dotnet-openapi/src/Commands/AddURLCommand.cs
 create mode 100644 src/Tools/Microsoft.dotnet-openapi/src/Commands/BaseCommand.cs
 create mode 100644 src/Tools/Microsoft.dotnet-openapi/src/Commands/RefreshCommand.cs
 create mode 100644 src/Tools/Microsoft.dotnet-openapi/src/Commands/RemoveCommand.cs
 create mode 100644 src/Tools/Microsoft.dotnet-openapi/src/DebugMode.cs
 create mode 100644 src/Tools/Microsoft.dotnet-openapi/src/HttpClientWrapper.cs
 create mode 100644 src/Tools/Microsoft.dotnet-openapi/src/IHttpClientWrapper.cs
 create mode 100644 src/Tools/Microsoft.dotnet-openapi/src/IHttpResponseMessageWrapper.cs
 create mode 100644 src/Tools/Microsoft.dotnet-openapi/src/Internal/OpenapiDependencyAttribute.cs
 create mode 100644 src/Tools/Microsoft.dotnet-openapi/src/Microsoft.dotnet-openapi.csproj
 create mode 100644 src/Tools/Microsoft.dotnet-openapi/src/Program.cs
 create mode 100644 src/Tools/Microsoft.dotnet-openapi/src/ProjectExtensions.cs
 create mode 100644 src/Tools/Microsoft.dotnet-openapi/src/Properties/AssemblyInfo.cs
 create mode 100644 src/Tools/Microsoft.dotnet-openapi/test/OpenApiAddFileTests.cs
 create mode 100644 src/Tools/Microsoft.dotnet-openapi/test/OpenApiAddProjectTests.cs
 create mode 100644 src/Tools/Microsoft.dotnet-openapi/test/OpenApiAddURLTests.cs
 create mode 100644 src/Tools/Microsoft.dotnet-openapi/test/OpenApiRefreshTests.cs
 create mode 100644 src/Tools/Microsoft.dotnet-openapi/test/OpenApiRemoveTests.cs
 create mode 100644 src/Tools/Microsoft.dotnet-openapi/test/OpenApiTestBase.cs
 create mode 100644 src/Tools/Microsoft.dotnet-openapi/test/ProcessEx.cs
 create mode 100644 src/Tools/Microsoft.dotnet-openapi/test/Properties/AssemblyInfo.cs
 create mode 100644 src/Tools/Microsoft.dotnet-openapi/test/TestContent/Startup.cs.txt
 create mode 100644 src/Tools/Microsoft.dotnet-openapi/test/TestContent/openapi.json.txt
 create mode 100644 src/Tools/Microsoft.dotnet-openapi/test/dotnet-microsoft.openapi.Tests.csproj
 create mode 100644 src/Tools/Microsoft.dotnet-openapi/test/xunit.runner.json
 rename src/Tools/{dotnet-watch/test/Utilities => Shared/TestHelpers}/TemporaryCSharpProject.cs (91%)
 rename src/Tools/{dotnet-watch/test/Utilities => Shared/TestHelpers}/TemporaryDirectory.cs (78%)
 create mode 100644 src/Tools/build.cmd
 create mode 100755 src/Tools/build.sh
 create mode 100644 src/Tools/dotnet-getdocument/README.md
 rename src/{Mvc => Tools}/dotnet-getdocument/src/Commands/InvokeCommand.cs (92%)
 create mode 100644 src/Tools/dotnet-getdocument/src/Exe.cs
 create mode 100644 src/Tools/dotnet-getdocument/src/Program.cs
 rename src/{Mvc => Tools}/dotnet-getdocument/src/ProjectOptions.cs (94%)
 rename src/{Mvc => Tools}/dotnet-getdocument/src/Resources.resx (91%)
 rename src/{Mvc => Tools}/dotnet-getdocument/src/dotnet-getdocument.csproj (72%)
 rename src/{Mvc => Tools}/dotnet-getdocument/src/runtimeconfig.template.json (100%)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 89a3c7cca0..3a67def99f 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,9 +1,9 @@
 {
-    "files.trimTrailingWhitespace": true,
-    "files.associations": {
-        "*.*proj": "xml",
-        "*.props": "xml",
-        "*.targets": "xml",
-        "*.tasks": "xml"
-    }
+  "files.trimTrailingWhitespace": true,
+  "files.associations": {
+    "*.*proj": "xml",
+    "*.props": "xml",
+    "*.targets": "xml",
+    "*.tasks": "xml"
+  }
 }
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 5006951f11..f5b217f365 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -16,7 +16,8 @@
     <IsPackable Condition="'$(IsAspNetCoreApp)' == 'true' AND '$(IsShippingPackage)' != 'true'">false</IsPackable>
 
     <!-- Only build assemblies in Microsoft.AspNetCore.App in source build -->
-    <ExcludeFromSourceBuild Condition="'$(ExcludeFromSourceBuild)' == '' and '$(DotNetBuildFromSource)' == 'true' and '$(IsAspNetCoreApp)' != 'true'">true</ExcludeFromSourceBuild>
+    <!-- Analyzer package are needed in source build for WebSDK -->
+    <ExcludeFromSourceBuild Condition="'$(ExcludeFromSourceBuild)' == '' and '$(DotNetBuildFromSource)' == 'true' and '$(IsAspNetCoreApp)' != 'true' and '$(IsAnalyzersProject)' != 'true'">true</ExcludeFromSourceBuild>
   </PropertyGroup>
 
   <PropertyGroup Label="Resx settings">
diff --git a/eng/Build.props b/eng/Build.props
index e47402faf8..fa5e1d21d6 100644
--- a/eng/Build.props
+++ b/eng/Build.props
@@ -28,6 +28,7 @@
     <!-- These projects are meant to be executed by tests. -->
     <ProjectToExclude Include="
                       $(RepoRoot)src\Tools\dotnet-watch\test\TestProjects\**\*.csproj;
+                      $(RepoRoot)src\Tools\Tests.Common\TestProjects\**\*.csproj;
                       $(RepoRoot)src\Razor\Razor.Design\test\testassets\**\*.*proj;
                       $(RepoRoot)src\submodules\**\*.*proj;
                       $(RepoRoot)src\Installers\**\*.*proj;
diff --git a/eng/Dependencies.props b/eng/Dependencies.props
index 4d1a3b5c02..0cd5ac2537 100644
--- a/eng/Dependencies.props
+++ b/eng/Dependencies.props
@@ -140,7 +140,6 @@ and are generated based on the last package release.
     <LatestPackageReference Include="Microsoft.Owin.Testing" Version="$(MicrosoftOwinTestingPackageVersion)" />
     <LatestPackageReference Include="Microsoft.Web.Administration" Version="$(MicrosoftWebAdministrationPackageVersion)" />
     <LatestPackageReference Include="Microsoft.Web.Xdt" Version="$(MicrosoftWebXdtPackageVersion)" />
-    <LatestPackageReference Include="System.Data.SqlClient" Version="$(SystemDataSqlClientPackageVersion)" />
     <LatestPackageReference Include="System.IdentityModel.Tokens.Jwt" Version="$(SystemIdentityModelTokensJwtPackageVersion)" />
     <LatestPackageReference Include="System.Net.Http.WinHttpHandler" Version="$(SystemNetHttpWinHttpHandlerPackageVersion)" />
     <LatestPackageReference Include="System.Net.WebSockets.WebSocketProtocol" Version="$(SystemNetWebSocketsWebSocketProtocolPackageVersion)" />
@@ -149,10 +148,16 @@ and are generated based on the last package release.
   </ItemGroup>
 
   <ItemGroup Label="MSBuild">
+    <LatestPackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildPackageVersion)" />
     <LatestPackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkPackageVersion)" />
+    <LatestPackageReference Include="Microsoft.Build.Locator" Version="$(MicrosoftBuildLocatorPackageVersion)" />
     <LatestPackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCorePackageVersion)" />
   </ItemGroup>
 
+  <ItemGroup Label="External dependencies available in source build" >
+    <LatestPackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
+  </ItemGroup>
+
   <ItemGroup Label="External dependencies" Condition="'$(DotNetBuildFromSource)' != 'true'">
     <LatestPackageReference Include="AngleSharp" Version="$(AngleSharpPackageVersion)" />
     <LatestPackageReference Include="BenchmarkDotNet" Version="$(BenchmarkDotNetPackageVersion)" />
@@ -170,8 +175,8 @@ and are generated based on the last package release.
     <LatestPackageReference Include="Mono.Cecil" Version="$(MonoCecilPackageVersion)" />
     <LatestPackageReference Include="Mono.WebAssembly.Interop" Version="$(MonoWebAssemblyInteropPackageVersion)" />
     <LatestPackageReference Include="Moq" Version="$(MoqPackageVersion)" />
-    <LatestPackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
     <LatestPackageReference Include="Newtonsoft.Json.Bson" Version="$(NewtonsoftJsonBsonPackageVersion)" />
+    <LatestPackageReference Include="NSwag.ApiDescription.Client" Version="$(NSwagApiDescriptionClientPackageVersion)" />
     <LatestPackageReference Include="Selenium.Support" Version="$(SeleniumSupportPackageVersion)" />
     <LatestPackageReference Include="Selenium.WebDriver" Version="$(SeleniumWebDriverPackageVersion)" />
     <LatestPackageReference Include="Selenium.WebDriver.ChromeDriver" Version="$(SeleniumWebDriverChromeDriverPackageVersion)" />
diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props
index 9bdbb3ec7b..d1d79ea73f 100644
--- a/eng/ProjectReferences.props
+++ b/eng/ProjectReferences.props
@@ -8,11 +8,11 @@
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" ProjectPath="$(RepoRoot)src\Identity\ApiAuthorization.IdentityServer\src\Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj"  />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Identity.Specification.Tests" ProjectPath="$(RepoRoot)src\Identity\Specification.Tests\src\Microsoft.AspNetCore.Identity.Specification.Tests.csproj"  />
     <ProjectReferenceProvider Include="Microsoft.Web.Xdt.Extensions" ProjectPath="$(RepoRoot)src\SiteExtensions\Microsoft.Web.Xdt.Extensions\src\Microsoft.Web.Xdt.Extensions.csproj"  />
+    <ProjectReferenceProvider Include="dotnet-getdocument" ProjectPath="$(RepoRoot)src\Tools\dotnet-getdocument\src\dotnet-getdocument.csproj"  />
+    <ProjectReferenceProvider Include="Microsoft.Extensions.ApiDescription.Client" ProjectPath="$(RepoRoot)src\Tools\Extensions.ApiDescription.Client\src\Microsoft.Extensions.ApiDescription.Client.csproj"  />
+    <ProjectReferenceProvider Include="Microsoft.Extensions.ApiDescription.Server" ProjectPath="$(RepoRoot)src\Tools\Extensions.ApiDescription.Server\src\Microsoft.Extensions.ApiDescription.Server.csproj"  />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.DeveloperCertificates.XPlat" ProjectPath="$(RepoRoot)src\Tools\FirstRunCertGenerator\src\Microsoft.AspNetCore.DeveloperCertificates.XPlat.csproj"  />
-    <ProjectReferenceProvider Include="dotnet-getdocument" ProjectPath="$(RepoRoot)src\Mvc\dotnet-getdocument\src\dotnet-getdocument.csproj"  />
-    <ProjectReferenceProvider Include="Microsoft.Extensions.ApiDescription.Client" ProjectPath="$(RepoRoot)src\Mvc\Extensions.ApiDescription.Client\src\Microsoft.Extensions.ApiDescription.Client.csproj"  />
-    <ProjectReferenceProvider Include="Microsoft.Extensions.ApiDescription.Server" ProjectPath="$(RepoRoot)src\Mvc\Extensions.ApiDescription.Server\src\Microsoft.Extensions.ApiDescription.Server.csproj"  />
-    <ProjectReferenceProvider Include="GetDocument.Insider" ProjectPath="$(RepoRoot)src\Mvc\GetDocumentInsider\src\GetDocumentInsider.csproj"  />
+    <ProjectReferenceProvider Include="GetDocument.Insider" ProjectPath="$(RepoRoot)src\Tools\GetDocumentInsider\src\GetDocumentInsider.csproj"  />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.SignalR.Specification.Tests" ProjectPath="$(RepoRoot)src\SignalR\server\Specification.Tests\src\Microsoft.AspNetCore.SignalR.Specification.Tests.csproj"  />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Blazor.Build" ProjectPath="$(RepoRoot)src\Components\Blazor\Build\src\Microsoft.AspNetCore.Blazor.Build.csproj"  />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore" ProjectPath="$(RepoRoot)src\DefaultBuilder\src\Microsoft.AspNetCore.csproj" RefProjectPath="$(RepoRoot)src\DefaultBuilder\ref\Microsoft.AspNetCore.csproj" />
diff --git a/eng/Signing.props b/eng/Signing.props
index 0dc432069d..829cd569e9 100644
--- a/eng/Signing.props
+++ b/eng/Signing.props
@@ -54,6 +54,7 @@
     <FileSignInfo Include="dotnet-sql-cache.exe" CertificateName="Microsoft400" />
     <FileSignInfo Include="dotnet-user-secrets.exe" CertificateName="Microsoft400" />
     <FileSignInfo Include="dotnet-watch.exe" CertificateName="Microsoft400" />
+    <FileSignInfo Include="dotnet-openapi.exe" CertificateName="Microsoft400" />
     <FileSignInfo Include="Microsoft.AspNetCore.Blazor.Build.exe" CertificateName="Microsoft400" />
     <FileSignInfo Include="sni.dll" CertificateName="Microsoft400" />
 
@@ -98,10 +99,17 @@
     <FileSignInfo Include="@(_DotNetFilesToExclude->'%(FileName)%(Extension)'->Distinct())" CertificateName="None" />
 
     <!--
-      We include the Microsoft.Data.SqlClient.dll assembly in our global tool 'dotnet-sql-cache'.
+      We include the Microsoft.Build.Locator.dll assembly in our global tool 'Microsoft.dotnet-openapi'.
+      It is already signed by that team, so we don't need to sign it.
+    -->
+    <FileSignInfo Include="Microsoft.Build.Locator.dll" CertificateName="None" />
+
+    <!--
+      We include the Microsoft.Data.SqlClient.dll and Microsoft.Identity.Client.dll assembly in our global tool 'dotnet-sql-cache'.
       It is already signed by that team, so we don't need to sign it.
     -->
     <FileSignInfo Include="Microsoft.Data.SqlClient.dll" CertificateName="None" />
+    <FileSignInfo Include="Microsoft.Identity.Client.dll" CertificateName="None" />
   </ItemGroup>
 
 </Project>
diff --git a/eng/Tools.props b/eng/Tools.props
index 46285b1448..cdfb67026c 100644
--- a/eng/Tools.props
+++ b/eng/Tools.props
@@ -6,7 +6,9 @@
       Without this here, we see regular failures with 'error MSB4236: The SDK 'Yarn.MSBuild' specified could not be found.'
       Since this project is evaluated before .npmproj files are loaded, this should cause the package to end
       up in the NuGet cache ahead of time.
+
+      This is not needed in source build.
     -->
-    <PackageReference Include="Yarn.MSBuild" Version="1.15.2" />
+    <PackageReference Condition="'$(DotNetBuildFromSource)' != 'true'" Include="Yarn.MSBuild" Version="1.15.2" />
   </ItemGroup>
 </Project>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 69bf0109bb..3ed95a1555 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -9,412 +9,412 @@
 -->
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.AspNetCore.Blazor.Mono" Version="5.0.0-alpha1.19426.2">
+    <Dependency Name="Microsoft.AspNetCore.Blazor.Mono" Version="5.0.0-alpha1.19463.2">
       <Uri>https://github.com/aspnet/Blazor</Uri>
-      <Sha>7eeab316fa122b69a9bd777c93dcc78bc6a68905</Sha>
+      <Sha>f5d0da88db7b29207fc005a7478bf0b9b6fc9fc9</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Razor.Language" Version="5.0.0-alpha1.19426.2">
+    <Dependency Name="Microsoft.AspNetCore.Razor.Language" Version="5.0.0-alpha1.19467.1">
       <Uri>https://github.com/aspnet/AspNetCore-Tooling</Uri>
-      <Sha>e60ad5d5d050ab5ee87f4cf1fb9ae440db87777d</Sha>
+      <Sha>01db467df0350147bbf04f80f8c16033c23a4b4a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="5.0.0-alpha1.19426.2">
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="5.0.0-alpha1.19467.1">
       <Uri>https://github.com/aspnet/AspNetCore-Tooling</Uri>
-      <Sha>e60ad5d5d050ab5ee87f4cf1fb9ae440db87777d</Sha>
+      <Sha>01db467df0350147bbf04f80f8c16033c23a4b4a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Razor" Version="5.0.0-alpha1.19426.2">
+    <Dependency Name="Microsoft.CodeAnalysis.Razor" Version="5.0.0-alpha1.19467.1">
       <Uri>https://github.com/aspnet/AspNetCore-Tooling</Uri>
-      <Sha>e60ad5d5d050ab5ee87f4cf1fb9ae440db87777d</Sha>
+      <Sha>01db467df0350147bbf04f80f8c16033c23a4b4a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk.Razor" Version="5.0.0-alpha1.19426.2">
+    <Dependency Name="Microsoft.NET.Sdk.Razor" Version="5.0.0-alpha1.19467.1">
       <Uri>https://github.com/aspnet/AspNetCore-Tooling</Uri>
-      <Sha>e60ad5d5d050ab5ee87f4cf1fb9ae440db87777d</Sha>
+      <Sha>01db467df0350147bbf04f80f8c16033c23a4b4a</Sha>
     </Dependency>
-    <Dependency Name="dotnet-ef" Version="5.0.0-alpha1.19407.3">
+    <Dependency Name="dotnet-ef" Version="5.0.0-alpha1.19467.7">
       <Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
-      <Sha>44d8c31bcb4bb46714389619070be9d1c6bad319</Sha>
+      <Sha>0e4d1f3b9b9051ebf08342047a6db4b8a2bfcaef</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.0-alpha1.19407.3">
+    <Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.0-alpha1.19467.7">
       <Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
-      <Sha>44d8c31bcb4bb46714389619070be9d1c6bad319</Sha>
+      <Sha>0e4d1f3b9b9051ebf08342047a6db4b8a2bfcaef</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="5.0.0-alpha1.19407.3">
+    <Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="5.0.0-alpha1.19467.7">
       <Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
-      <Sha>44d8c31bcb4bb46714389619070be9d1c6bad319</Sha>
+      <Sha>0e4d1f3b9b9051ebf08342047a6db4b8a2bfcaef</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.0-alpha1.19407.3">
+    <Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.0-alpha1.19467.7">
       <Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
-      <Sha>44d8c31bcb4bb46714389619070be9d1c6bad319</Sha>
+      <Sha>0e4d1f3b9b9051ebf08342047a6db4b8a2bfcaef</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.0-alpha1.19407.3">
+    <Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.0-alpha1.19467.7">
       <Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
-      <Sha>44d8c31bcb4bb46714389619070be9d1c6bad319</Sha>
+      <Sha>0e4d1f3b9b9051ebf08342047a6db4b8a2bfcaef</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="5.0.0-alpha1.19407.3">
+    <Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="5.0.0-alpha1.19467.7">
       <Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
-      <Sha>44d8c31bcb4bb46714389619070be9d1c6bad319</Sha>
+      <Sha>0e4d1f3b9b9051ebf08342047a6db4b8a2bfcaef</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore" Version="5.0.0-alpha1.19407.3">
+    <Dependency Name="Microsoft.EntityFrameworkCore" Version="5.0.0-alpha1.19467.7">
       <Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
-      <Sha>44d8c31bcb4bb46714389619070be9d1c6bad319</Sha>
+      <Sha>0e4d1f3b9b9051ebf08342047a6db4b8a2bfcaef</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Analyzer.Testing" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.AspNetCore.Analyzer.Testing" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.ActivatorUtilities.Sources" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.ActivatorUtilities.Sources" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.SqlServer" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Caching.SqlServer" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.CommandLineUtils.Sources" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.CommandLineUtils.Sources" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.AzureKeyVault" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Configuration.AzureKeyVault" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.CommandLine" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Configuration.CommandLine" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.FileExtensions" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Configuration.FileExtensions" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.KeyPerFile" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Configuration.KeyPerFile" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.UserSecrets" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Configuration.UserSecrets" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Xml" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Configuration.Xml" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Configuration" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DiagnosticAdapter" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.DiagnosticAdapter" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileProviders.Composite" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.FileProviders.Composite" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileProviders.Physical" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.FileProviders.Physical" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.HashCodeCombiner.Sources" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.HashCodeCombiner.Sources" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Hosting" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Hosting" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Http" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Http" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Localization.Abstractions" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Localization.Abstractions" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Localization" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Localization" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.AzureAppServices" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Logging.AzureAppServices" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Console" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Logging.Console" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Debug" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Logging.Debug" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.EventSource" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Logging.EventSource" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.EventLog" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Logging.EventLog" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.TraceSource" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Logging.TraceSource" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Testing" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Logging.Testing" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Logging" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.ObjectPool" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.ObjectPool" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Options.DataAnnotations" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Options.DataAnnotations" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Options" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Options" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.ParameterDefaultValue.Sources" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.ParameterDefaultValue.Sources" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Primitives" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.Primitives" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.TypeNameHelper.Sources" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.TypeNameHelper.Sources" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.ValueStopwatch.Sources" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.ValueStopwatch.Sources" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.WebEncoders" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Extensions.WebEncoders" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Internal.Extensions.Refs" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.Internal.Extensions.Refs" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.JSInterop" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.JSInterop" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Mono.WebAssembly.Interop" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Mono.WebAssembly.Interop" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="1.1.0-alpha1.19381.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="1.2.0-alpha1.19462.7" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>a6c1d1ac235aba5bf17dd06228a62509192cda6a</Sha>
+      <Sha>be3d4bad4576eecda116d3e9a368cd6959ecf5ce</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CSharp" Version="5.0.0-alpha1.19381.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.CSharp" Version="5.0.0-alpha1.19462.7" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>a6c1d1ac235aba5bf17dd06228a62509192cda6a</Sha>
+      <Sha>be3d4bad4576eecda116d3e9a368cd6959ecf5ce</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Win32.Registry" Version="5.0.0-alpha1.19381.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Win32.Registry" Version="5.0.0-alpha1.19462.7" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>a6c1d1ac235aba5bf17dd06228a62509192cda6a</Sha>
+      <Sha>be3d4bad4576eecda116d3e9a368cd6959ecf5ce</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Win32.SystemEvents" Version="5.0.0-alpha1.19381.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Win32.SystemEvents" Version="5.0.0-alpha1.19462.7" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>a6c1d1ac235aba5bf17dd06228a62509192cda6a</Sha>
+      <Sha>be3d4bad4576eecda116d3e9a368cd6959ecf5ce</Sha>
     </Dependency>
-    <Dependency Name="System.ComponentModel.Annotations" Version="5.0.0-alpha1.19381.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
+    <Dependency Name="System.ComponentModel.Annotations" Version="5.0.0-alpha1.19462.7" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>a6c1d1ac235aba5bf17dd06228a62509192cda6a</Sha>
+      <Sha>be3d4bad4576eecda116d3e9a368cd6959ecf5ce</Sha>
     </Dependency>
     <Dependency Name="System.Data.SqlClient" Version="4.7.0-preview6.19264.9" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64" Pinned="true">
       <Uri>https://github.com/dotnet/corefx</Uri>
       <Sha>a28176b5ec68b6da1472934fe9493790d1665cae</Sha>
     </Dependency>
-    <Dependency Name="System.Diagnostics.EventLog" Version="5.0.0-alpha1.19381.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
+    <Dependency Name="System.Diagnostics.EventLog" Version="5.0.0-alpha1.19462.7" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>a6c1d1ac235aba5bf17dd06228a62509192cda6a</Sha>
+      <Sha>be3d4bad4576eecda116d3e9a368cd6959ecf5ce</Sha>
     </Dependency>
-    <Dependency Name="System.Drawing.Common" Version="5.0.0-alpha1.19381.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
+    <Dependency Name="System.Drawing.Common" Version="5.0.0-alpha1.19462.7" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>a6c1d1ac235aba5bf17dd06228a62509192cda6a</Sha>
+      <Sha>be3d4bad4576eecda116d3e9a368cd6959ecf5ce</Sha>
     </Dependency>
-    <Dependency Name="System.IO.Pipelines" Version="5.0.0-alpha1.19381.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
+    <Dependency Name="System.IO.Pipelines" Version="5.0.0-alpha1.19462.7" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>a6c1d1ac235aba5bf17dd06228a62509192cda6a</Sha>
+      <Sha>be3d4bad4576eecda116d3e9a368cd6959ecf5ce</Sha>
     </Dependency>
-    <Dependency Name="System.Net.Http.WinHttpHandler" Version="5.0.0-alpha1.19381.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
+    <Dependency Name="System.Net.Http.WinHttpHandler" Version="5.0.0-alpha1.19462.7" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>a6c1d1ac235aba5bf17dd06228a62509192cda6a</Sha>
+      <Sha>be3d4bad4576eecda116d3e9a368cd6959ecf5ce</Sha>
     </Dependency>
-    <Dependency Name="System.Net.WebSockets.WebSocketProtocol" Version="5.0.0-alpha1.19381.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
+    <Dependency Name="System.Net.WebSockets.WebSocketProtocol" Version="5.0.0-alpha1.19462.7" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>a6c1d1ac235aba5bf17dd06228a62509192cda6a</Sha>
+      <Sha>be3d4bad4576eecda116d3e9a368cd6959ecf5ce</Sha>
     </Dependency>
-    <Dependency Name="System.Reflection.Metadata" Version="1.8.0-alpha1.19381.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
+    <Dependency Name="System.Reflection.Metadata" Version="1.9.0-alpha1.19462.7" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>a6c1d1ac235aba5bf17dd06228a62509192cda6a</Sha>
+      <Sha>be3d4bad4576eecda116d3e9a368cd6959ecf5ce</Sha>
     </Dependency>
-    <Dependency Name="System.Runtime.CompilerServices.Unsafe" Version="5.0.0-alpha1.19381.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
+    <Dependency Name="System.Runtime.CompilerServices.Unsafe" Version="5.0.0-alpha1.19462.7" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>a6c1d1ac235aba5bf17dd06228a62509192cda6a</Sha>
+      <Sha>be3d4bad4576eecda116d3e9a368cd6959ecf5ce</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.Cng" Version="5.0.0-alpha1.19381.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
+    <Dependency Name="System.Security.Cryptography.Cng" Version="5.0.0-alpha1.19462.7" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>a6c1d1ac235aba5bf17dd06228a62509192cda6a</Sha>
+      <Sha>be3d4bad4576eecda116d3e9a368cd6959ecf5ce</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.Pkcs" Version="5.0.0-alpha1.19381.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
+    <Dependency Name="System.Security.Cryptography.Pkcs" Version="5.0.0-alpha1.19462.7" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>a6c1d1ac235aba5bf17dd06228a62509192cda6a</Sha>
+      <Sha>be3d4bad4576eecda116d3e9a368cd6959ecf5ce</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.Xml" Version="5.0.0-alpha1.19381.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
+    <Dependency Name="System.Security.Cryptography.Xml" Version="5.0.0-alpha1.19462.7" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>a6c1d1ac235aba5bf17dd06228a62509192cda6a</Sha>
+      <Sha>be3d4bad4576eecda116d3e9a368cd6959ecf5ce</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Permissions" Version="5.0.0-alpha1.19381.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
+    <Dependency Name="System.Security.Permissions" Version="5.0.0-alpha1.19462.7" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>a6c1d1ac235aba5bf17dd06228a62509192cda6a</Sha>
+      <Sha>be3d4bad4576eecda116d3e9a368cd6959ecf5ce</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Principal.Windows" Version="5.0.0-alpha1.19381.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
+    <Dependency Name="System.Security.Principal.Windows" Version="5.0.0-alpha1.19462.7" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>a6c1d1ac235aba5bf17dd06228a62509192cda6a</Sha>
+      <Sha>be3d4bad4576eecda116d3e9a368cd6959ecf5ce</Sha>
     </Dependency>
-    <Dependency Name="System.ServiceProcess.ServiceController" Version="5.0.0-alpha1.19381.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
+    <Dependency Name="System.ServiceProcess.ServiceController" Version="5.0.0-alpha1.19462.7" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>a6c1d1ac235aba5bf17dd06228a62509192cda6a</Sha>
+      <Sha>be3d4bad4576eecda116d3e9a368cd6959ecf5ce</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Encodings.Web" Version="5.0.0-alpha1.19381.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
+    <Dependency Name="System.Text.Encodings.Web" Version="5.0.0-alpha1.19462.7" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>a6c1d1ac235aba5bf17dd06228a62509192cda6a</Sha>
+      <Sha>be3d4bad4576eecda116d3e9a368cd6959ecf5ce</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Json" Version="5.0.0-alpha1.19381.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
+    <Dependency Name="System.Text.Json" Version="5.0.0-alpha1.19462.7" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>a6c1d1ac235aba5bf17dd06228a62509192cda6a</Sha>
+      <Sha>be3d4bad4576eecda116d3e9a368cd6959ecf5ce</Sha>
     </Dependency>
-    <Dependency Name="System.Threading.Channels" Version="5.0.0-alpha1.19381.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
+    <Dependency Name="System.Threading.Channels" Version="5.0.0-alpha1.19462.7" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>a6c1d1ac235aba5bf17dd06228a62509192cda6a</Sha>
+      <Sha>be3d4bad4576eecda116d3e9a368cd6959ecf5ce</Sha>
     </Dependency>
-    <Dependency Name="System.Windows.Extensions" Version="5.0.0-alpha1.19381.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
+    <Dependency Name="System.Windows.Extensions" Version="5.0.0-alpha1.19462.7" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>a6c1d1ac235aba5bf17dd06228a62509192cda6a</Sha>
+      <Sha>be3d4bad4576eecda116d3e9a368cd6959ecf5ce</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyModel" Version="5.0.0-alpha1.19404.5" CoherentParentDependency="Microsoft.Extensions.Logging">
+    <Dependency Name="Microsoft.Extensions.DependencyModel" Version="5.0.0-alpha1.19465.2" CoherentParentDependency="Microsoft.Extensions.Logging">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>62a9f1bdf39ba0b719875d33e248408d3802e925</Sha>
+      <Sha>9042fe6c81aa3b47f58ccd94ff02e42f9f7a4e46</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="5.0.0-alpha1.19404.5" CoherentParentDependency="Microsoft.Extensions.Logging">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="5.0.0-alpha1.19465.2" CoherentParentDependency="Microsoft.Extensions.Logging">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>62a9f1bdf39ba0b719875d33e248408d3802e925</Sha>
+      <Sha>9042fe6c81aa3b47f58ccd94ff02e42f9f7a4e46</Sha>
     </Dependency>
     <!--
          Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
          All Runtime.$rid packages should have the same version.
     -->
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.0-alpha1.19404.5" CoherentParentDependency="Microsoft.Extensions.Logging">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.0-alpha1.19465.2" CoherentParentDependency="Microsoft.Extensions.Logging">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>62a9f1bdf39ba0b719875d33e248408d3802e925</Sha>
+      <Sha>9042fe6c81aa3b47f58ccd94ff02e42f9f7a4e46</Sha>
     </Dependency>
-    <Dependency Name="NETStandard.Library.Ref" Version="2.1.0-alpha1.19404.5" CoherentParentDependency="Microsoft.Extensions.Logging">
+    <Dependency Name="NETStandard.Library.Ref" Version="2.1.0-alpha1.19465.2" CoherentParentDependency="Microsoft.Extensions.Logging">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>62a9f1bdf39ba0b719875d33e248408d3802e925</Sha>
+      <Sha>9042fe6c81aa3b47f58ccd94ff02e42f9f7a4e46</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
     <!-- Listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
-    <Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0-alpha1.19381.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0-alpha1.19462.7" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>a6c1d1ac235aba5bf17dd06228a62509192cda6a</Sha>
+      <Sha>be3d4bad4576eecda116d3e9a368cd6959ecf5ce</Sha>
     </Dependency>
-    <Dependency Name="Internal.AspNetCore.Analyzers" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Internal.AspNetCore.Analyzers" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19411.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
@@ -428,13 +428,13 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>a11024c8c22cc762011addafc30c653c938048f4</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Testing" Version="5.0.0-alpha1.19406.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
+    <Dependency Name="Microsoft.AspNetCore.Testing" Version="5.0.0-alpha1.19466.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>dbe3543601c1ab290fde1ae30ea8dd978d33d4d3</Sha>
+      <Sha>3702cd2801d0459663bccebe6ae63054748b8589</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.3.0-beta3-19406-05" CoherentParentDependency="Microsoft.Extensions.Logging">
+    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.4.0-beta1-19456-03" CoherentParentDependency="Microsoft.Extensions.Logging">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>a1905991543bed104f7f7f0842aca2b65d263b87</Sha>
+      <Sha>3c865821f2864393a0ff7fe22c92ded6d51a546c</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index c3b3b87f7b..a6cffe7296 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -52,115 +52,115 @@
     <!-- Packages from dotnet/arcade -->
     <MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19411.1</MicrosoftDotNetGenAPIPackageVersion>
     <!-- Packages from dotnet/roslyn -->
-    <MicrosoftNetCompilersToolsetPackageVersion>3.3.0-beta3-19406-05</MicrosoftNetCompilersToolsetPackageVersion>
+    <MicrosoftNetCompilersToolsetPackageVersion>3.4.0-beta1-19456-03</MicrosoftNetCompilersToolsetPackageVersion>
     <!-- Packages from dotnet/core-setup -->
-    <MicrosoftExtensionsDependencyModelPackageVersion>5.0.0-alpha1.19404.5</MicrosoftExtensionsDependencyModelPackageVersion>
-    <MicrosoftNETCoreAppRefPackageVersion>5.0.0-alpha1.19404.5</MicrosoftNETCoreAppRefPackageVersion>
-    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.0-alpha1.19404.5</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
-    <NETStandardLibraryRefPackageVersion>2.1.0-alpha1.19404.5</NETStandardLibraryRefPackageVersion>
+    <MicrosoftExtensionsDependencyModelPackageVersion>5.0.0-alpha1.19465.2</MicrosoftExtensionsDependencyModelPackageVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>5.0.0-alpha1.19465.2</MicrosoftNETCoreAppRefPackageVersion>
+    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.0-alpha1.19465.2</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
+    <NETStandardLibraryRefPackageVersion>2.1.0-alpha1.19465.2</NETStandardLibraryRefPackageVersion>
     <!-- Packages from dotnet/corefx -->
-    <MicrosoftBclAsyncInterfacesPackageVersion>1.1.0-alpha1.19381.2</MicrosoftBclAsyncInterfacesPackageVersion>
-    <MicrosoftCSharpPackageVersion>5.0.0-alpha1.19381.2</MicrosoftCSharpPackageVersion>
-    <MicrosoftWin32RegistryPackageVersion>5.0.0-alpha1.19381.2</MicrosoftWin32RegistryPackageVersion>
-    <MicrosoftWin32SystemEventsPackageVersion>5.0.0-alpha1.19381.2</MicrosoftWin32SystemEventsPackageVersion>
-    <SystemComponentModelAnnotationsPackageVersion>5.0.0-alpha1.19381.2</SystemComponentModelAnnotationsPackageVersion>
+    <MicrosoftBclAsyncInterfacesPackageVersion>1.2.0-alpha1.19462.7</MicrosoftBclAsyncInterfacesPackageVersion>
+    <MicrosoftCSharpPackageVersion>5.0.0-alpha1.19462.7</MicrosoftCSharpPackageVersion>
+    <MicrosoftWin32RegistryPackageVersion>5.0.0-alpha1.19462.7</MicrosoftWin32RegistryPackageVersion>
+    <MicrosoftWin32SystemEventsPackageVersion>5.0.0-alpha1.19462.7</MicrosoftWin32SystemEventsPackageVersion>
+    <SystemComponentModelAnnotationsPackageVersion>5.0.0-alpha1.19462.7</SystemComponentModelAnnotationsPackageVersion>
     <SystemDataSqlClientPackageVersion>4.7.0-preview6.19264.9</SystemDataSqlClientPackageVersion>
-    <SystemDiagnosticsEventLogPackageVersion>5.0.0-alpha1.19381.2</SystemDiagnosticsEventLogPackageVersion>
-    <SystemDrawingCommonPackageVersion>5.0.0-alpha1.19381.2</SystemDrawingCommonPackageVersion>
-    <SystemIOPipelinesPackageVersion>5.0.0-alpha1.19381.2</SystemIOPipelinesPackageVersion>
-    <SystemNetHttpWinHttpHandlerPackageVersion>5.0.0-alpha1.19381.2</SystemNetHttpWinHttpHandlerPackageVersion>
-    <SystemNetWebSocketsWebSocketProtocolPackageVersion>5.0.0-alpha1.19381.2</SystemNetWebSocketsWebSocketProtocolPackageVersion>
-    <SystemReflectionMetadataPackageVersion>1.8.0-alpha1.19381.2</SystemReflectionMetadataPackageVersion>
-    <SystemRuntimeCompilerServicesUnsafePackageVersion>5.0.0-alpha1.19381.2</SystemRuntimeCompilerServicesUnsafePackageVersion>
-    <SystemSecurityCryptographyCngPackageVersion>5.0.0-alpha1.19381.2</SystemSecurityCryptographyCngPackageVersion>
-    <SystemSecurityCryptographyPkcsPackageVersion>5.0.0-alpha1.19381.2</SystemSecurityCryptographyPkcsPackageVersion>
-    <SystemSecurityCryptographyXmlPackageVersion>5.0.0-alpha1.19381.2</SystemSecurityCryptographyXmlPackageVersion>
-    <SystemSecurityPermissionsPackageVersion>5.0.0-alpha1.19381.2</SystemSecurityPermissionsPackageVersion>
-    <SystemSecurityPrincipalWindowsPackageVersion>5.0.0-alpha1.19381.2</SystemSecurityPrincipalWindowsPackageVersion>
-    <SystemServiceProcessServiceControllerPackageVersion>5.0.0-alpha1.19381.2</SystemServiceProcessServiceControllerPackageVersion>
-    <SystemTextEncodingsWebPackageVersion>5.0.0-alpha1.19381.2</SystemTextEncodingsWebPackageVersion>
-    <SystemTextJsonPackageVersion>5.0.0-alpha1.19381.2</SystemTextJsonPackageVersion>
-    <SystemThreadingChannelsPackageVersion>5.0.0-alpha1.19381.2</SystemThreadingChannelsPackageVersion>
-    <SystemWindowsExtensionsPackageVersion>5.0.0-alpha1.19381.2</SystemWindowsExtensionsPackageVersion>
+    <SystemDiagnosticsEventLogPackageVersion>5.0.0-alpha1.19462.7</SystemDiagnosticsEventLogPackageVersion>
+    <SystemDrawingCommonPackageVersion>5.0.0-alpha1.19462.7</SystemDrawingCommonPackageVersion>
+    <SystemIOPipelinesPackageVersion>5.0.0-alpha1.19462.7</SystemIOPipelinesPackageVersion>
+    <SystemNetHttpWinHttpHandlerPackageVersion>5.0.0-alpha1.19462.7</SystemNetHttpWinHttpHandlerPackageVersion>
+    <SystemNetWebSocketsWebSocketProtocolPackageVersion>5.0.0-alpha1.19462.7</SystemNetWebSocketsWebSocketProtocolPackageVersion>
+    <SystemReflectionMetadataPackageVersion>1.9.0-alpha1.19462.7</SystemReflectionMetadataPackageVersion>
+    <SystemRuntimeCompilerServicesUnsafePackageVersion>5.0.0-alpha1.19462.7</SystemRuntimeCompilerServicesUnsafePackageVersion>
+    <SystemSecurityCryptographyCngPackageVersion>5.0.0-alpha1.19462.7</SystemSecurityCryptographyCngPackageVersion>
+    <SystemSecurityCryptographyPkcsPackageVersion>5.0.0-alpha1.19462.7</SystemSecurityCryptographyPkcsPackageVersion>
+    <SystemSecurityCryptographyXmlPackageVersion>5.0.0-alpha1.19462.7</SystemSecurityCryptographyXmlPackageVersion>
+    <SystemSecurityPermissionsPackageVersion>5.0.0-alpha1.19462.7</SystemSecurityPermissionsPackageVersion>
+    <SystemSecurityPrincipalWindowsPackageVersion>5.0.0-alpha1.19462.7</SystemSecurityPrincipalWindowsPackageVersion>
+    <SystemServiceProcessServiceControllerPackageVersion>5.0.0-alpha1.19462.7</SystemServiceProcessServiceControllerPackageVersion>
+    <SystemTextEncodingsWebPackageVersion>5.0.0-alpha1.19462.7</SystemTextEncodingsWebPackageVersion>
+    <SystemTextJsonPackageVersion>5.0.0-alpha1.19462.7</SystemTextJsonPackageVersion>
+    <SystemThreadingChannelsPackageVersion>5.0.0-alpha1.19462.7</SystemThreadingChannelsPackageVersion>
+    <SystemWindowsExtensionsPackageVersion>5.0.0-alpha1.19462.7</SystemWindowsExtensionsPackageVersion>
     <!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
-    <MicrosoftNETCorePlatformsPackageVersion>5.0.0-alpha1.19381.2</MicrosoftNETCorePlatformsPackageVersion>
+    <MicrosoftNETCorePlatformsPackageVersion>5.0.0-alpha1.19462.7</MicrosoftNETCorePlatformsPackageVersion>
     <!-- Packages from aspnet/Blazor -->
-    <MicrosoftAspNetCoreBlazorMonoPackageVersion>5.0.0-alpha1.19426.2</MicrosoftAspNetCoreBlazorMonoPackageVersion>
+    <MicrosoftAspNetCoreBlazorMonoPackageVersion>5.0.0-alpha1.19463.2</MicrosoftAspNetCoreBlazorMonoPackageVersion>
     <!-- Packages from aspnet/Extensions -->
-    <InternalAspNetCoreAnalyzersPackageVersion>5.0.0-alpha1.19406.3</InternalAspNetCoreAnalyzersPackageVersion>
-    <MicrosoftAspNetCoreAnalyzerTestingPackageVersion>5.0.0-alpha1.19406.3</MicrosoftAspNetCoreAnalyzerTestingPackageVersion>
-    <MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>5.0.0-alpha1.19406.3</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
-    <MicrosoftAspNetCoreTestingPackageVersion>5.0.0-alpha1.19406.3</MicrosoftAspNetCoreTestingPackageVersion>
-    <MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion>
-    <MicrosoftExtensionsCachingAbstractionsPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsCachingAbstractionsPackageVersion>
-    <MicrosoftExtensionsCachingMemoryPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsCachingMemoryPackageVersion>
-    <MicrosoftExtensionsCachingSqlServerPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsCachingSqlServerPackageVersion>
-    <MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>
-    <MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
-    <MicrosoftExtensionsConfigurationAbstractionsPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
-    <MicrosoftExtensionsConfigurationAzureKeyVaultPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsConfigurationAzureKeyVaultPackageVersion>
-    <MicrosoftExtensionsConfigurationBinderPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsConfigurationBinderPackageVersion>
-    <MicrosoftExtensionsConfigurationCommandLinePackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
-    <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
-    <MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>
-    <MicrosoftExtensionsConfigurationIniPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsConfigurationIniPackageVersion>
-    <MicrosoftExtensionsConfigurationJsonPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsConfigurationJsonPackageVersion>
-    <MicrosoftExtensionsConfigurationKeyPerFilePackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsConfigurationKeyPerFilePackageVersion>
-    <MicrosoftExtensionsConfigurationPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsConfigurationPackageVersion>
-    <MicrosoftExtensionsConfigurationUserSecretsPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
-    <MicrosoftExtensionsConfigurationXmlPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsConfigurationXmlPackageVersion>
-    <MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
-    <MicrosoftExtensionsDependencyInjectionPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsDependencyInjectionPackageVersion>
-    <MicrosoftExtensionsDiagnosticAdapterPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsDiagnosticAdapterPackageVersion>
-    <MicrosoftExtensionsDiagnosticsHealthChecksAbstractionsPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsDiagnosticsHealthChecksAbstractionsPackageVersion>
-    <MicrosoftExtensionsDiagnosticsHealthChecksPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsDiagnosticsHealthChecksPackageVersion>
-    <MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
-    <MicrosoftExtensionsFileProvidersCompositePackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsFileProvidersCompositePackageVersion>
-    <MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>
-    <MicrosoftExtensionsFileProvidersPhysicalPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
-    <MicrosoftExtensionsFileSystemGlobbingPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
-    <MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
-    <MicrosoftExtensionsHostingAbstractionsPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsHostingAbstractionsPackageVersion>
-    <MicrosoftExtensionsHostingPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsHostingPackageVersion>
-    <MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
-    <MicrosoftExtensionsHttpPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsHttpPackageVersion>
-    <MicrosoftExtensionsLocalizationAbstractionsPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsLocalizationAbstractionsPackageVersion>
-    <MicrosoftExtensionsLocalizationPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsLocalizationPackageVersion>
-    <MicrosoftExtensionsLoggingAbstractionsPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
-    <MicrosoftExtensionsLoggingAzureAppServicesPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsLoggingAzureAppServicesPackageVersion>
-    <MicrosoftExtensionsLoggingConfigurationPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsLoggingConfigurationPackageVersion>
-    <MicrosoftExtensionsLoggingConsolePackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsLoggingConsolePackageVersion>
-    <MicrosoftExtensionsLoggingDebugPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsLoggingDebugPackageVersion>
-    <MicrosoftExtensionsLoggingEventSourcePackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsLoggingEventSourcePackageVersion>
-    <MicrosoftExtensionsLoggingEventLogPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsLoggingEventLogPackageVersion>
-    <MicrosoftExtensionsLoggingPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsLoggingPackageVersion>
-    <MicrosoftExtensionsLoggingTestingPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsLoggingTestingPackageVersion>
-    <MicrosoftExtensionsLoggingTraceSourcePackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsLoggingTraceSourcePackageVersion>
-    <MicrosoftExtensionsObjectPoolPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsObjectPoolPackageVersion>
-    <MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>
-    <MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>
-    <MicrosoftExtensionsOptionsPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsOptionsPackageVersion>
-    <MicrosoftExtensionsParameterDefaultValueSourcesPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsParameterDefaultValueSourcesPackageVersion>
-    <MicrosoftExtensionsPrimitivesPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsPrimitivesPackageVersion>
-    <MicrosoftExtensionsTypeNameHelperSourcesPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsTypeNameHelperSourcesPackageVersion>
-    <MicrosoftExtensionsValueStopwatchSourcesPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsValueStopwatchSourcesPackageVersion>
-    <MicrosoftExtensionsWebEncodersPackageVersion>5.0.0-alpha1.19406.3</MicrosoftExtensionsWebEncodersPackageVersion>
-    <MicrosoftInternalExtensionsRefsPackageVersion>5.0.0-alpha1.19406.3</MicrosoftInternalExtensionsRefsPackageVersion>
-    <MicrosoftJSInteropPackageVersion>5.0.0-alpha1.19406.3</MicrosoftJSInteropPackageVersion>
-    <MonoWebAssemblyInteropPackageVersion>5.0.0-alpha1.19406.3</MonoWebAssemblyInteropPackageVersion>
+    <InternalAspNetCoreAnalyzersPackageVersion>5.0.0-alpha1.19466.1</InternalAspNetCoreAnalyzersPackageVersion>
+    <MicrosoftAspNetCoreAnalyzerTestingPackageVersion>5.0.0-alpha1.19466.1</MicrosoftAspNetCoreAnalyzerTestingPackageVersion>
+    <MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>5.0.0-alpha1.19466.1</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
+    <MicrosoftAspNetCoreTestingPackageVersion>5.0.0-alpha1.19466.1</MicrosoftAspNetCoreTestingPackageVersion>
+    <MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion>
+    <MicrosoftExtensionsCachingAbstractionsPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsCachingAbstractionsPackageVersion>
+    <MicrosoftExtensionsCachingMemoryPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsCachingMemoryPackageVersion>
+    <MicrosoftExtensionsCachingSqlServerPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsCachingSqlServerPackageVersion>
+    <MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>
+    <MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
+    <MicrosoftExtensionsConfigurationAbstractionsPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
+    <MicrosoftExtensionsConfigurationAzureKeyVaultPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsConfigurationAzureKeyVaultPackageVersion>
+    <MicrosoftExtensionsConfigurationBinderPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsConfigurationBinderPackageVersion>
+    <MicrosoftExtensionsConfigurationCommandLinePackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
+    <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
+    <MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>
+    <MicrosoftExtensionsConfigurationIniPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsConfigurationIniPackageVersion>
+    <MicrosoftExtensionsConfigurationJsonPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsConfigurationJsonPackageVersion>
+    <MicrosoftExtensionsConfigurationKeyPerFilePackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsConfigurationKeyPerFilePackageVersion>
+    <MicrosoftExtensionsConfigurationPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsConfigurationPackageVersion>
+    <MicrosoftExtensionsConfigurationUserSecretsPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
+    <MicrosoftExtensionsConfigurationXmlPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsConfigurationXmlPackageVersion>
+    <MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
+    <MicrosoftExtensionsDependencyInjectionPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsDependencyInjectionPackageVersion>
+    <MicrosoftExtensionsDiagnosticAdapterPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsDiagnosticAdapterPackageVersion>
+    <MicrosoftExtensionsDiagnosticsHealthChecksAbstractionsPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsDiagnosticsHealthChecksAbstractionsPackageVersion>
+    <MicrosoftExtensionsDiagnosticsHealthChecksPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsDiagnosticsHealthChecksPackageVersion>
+    <MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
+    <MicrosoftExtensionsFileProvidersCompositePackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsFileProvidersCompositePackageVersion>
+    <MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>
+    <MicrosoftExtensionsFileProvidersPhysicalPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
+    <MicrosoftExtensionsFileSystemGlobbingPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
+    <MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
+    <MicrosoftExtensionsHostingAbstractionsPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsHostingAbstractionsPackageVersion>
+    <MicrosoftExtensionsHostingPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsHostingPackageVersion>
+    <MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
+    <MicrosoftExtensionsHttpPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsHttpPackageVersion>
+    <MicrosoftExtensionsLocalizationAbstractionsPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsLocalizationAbstractionsPackageVersion>
+    <MicrosoftExtensionsLocalizationPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsLocalizationPackageVersion>
+    <MicrosoftExtensionsLoggingAbstractionsPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
+    <MicrosoftExtensionsLoggingAzureAppServicesPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsLoggingAzureAppServicesPackageVersion>
+    <MicrosoftExtensionsLoggingConfigurationPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsLoggingConfigurationPackageVersion>
+    <MicrosoftExtensionsLoggingConsolePackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsLoggingConsolePackageVersion>
+    <MicrosoftExtensionsLoggingDebugPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsLoggingDebugPackageVersion>
+    <MicrosoftExtensionsLoggingEventSourcePackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsLoggingEventSourcePackageVersion>
+    <MicrosoftExtensionsLoggingEventLogPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsLoggingEventLogPackageVersion>
+    <MicrosoftExtensionsLoggingPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsLoggingPackageVersion>
+    <MicrosoftExtensionsLoggingTestingPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsLoggingTestingPackageVersion>
+    <MicrosoftExtensionsLoggingTraceSourcePackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsLoggingTraceSourcePackageVersion>
+    <MicrosoftExtensionsObjectPoolPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsObjectPoolPackageVersion>
+    <MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>
+    <MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>
+    <MicrosoftExtensionsOptionsPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsOptionsPackageVersion>
+    <MicrosoftExtensionsParameterDefaultValueSourcesPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsParameterDefaultValueSourcesPackageVersion>
+    <MicrosoftExtensionsPrimitivesPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsPrimitivesPackageVersion>
+    <MicrosoftExtensionsTypeNameHelperSourcesPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsTypeNameHelperSourcesPackageVersion>
+    <MicrosoftExtensionsValueStopwatchSourcesPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsValueStopwatchSourcesPackageVersion>
+    <MicrosoftExtensionsWebEncodersPackageVersion>5.0.0-alpha1.19466.1</MicrosoftExtensionsWebEncodersPackageVersion>
+    <MicrosoftInternalExtensionsRefsPackageVersion>5.0.0-alpha1.19466.1</MicrosoftInternalExtensionsRefsPackageVersion>
+    <MicrosoftJSInteropPackageVersion>5.0.0-alpha1.19466.1</MicrosoftJSInteropPackageVersion>
+    <MonoWebAssemblyInteropPackageVersion>5.0.0-alpha1.19466.1</MonoWebAssemblyInteropPackageVersion>
     <!-- Packages from aspnet/EntityFrameworkCore -->
-    <dotnetefPackageVersion>5.0.0-alpha1.19407.3</dotnetefPackageVersion>
-    <MicrosoftEntityFrameworkCoreInMemoryPackageVersion>5.0.0-alpha1.19407.3</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
-    <MicrosoftEntityFrameworkCoreRelationalPackageVersion>5.0.0-alpha1.19407.3</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
-    <MicrosoftEntityFrameworkCoreSqlitePackageVersion>5.0.0-alpha1.19407.3</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
-    <MicrosoftEntityFrameworkCoreSqlServerPackageVersion>5.0.0-alpha1.19407.3</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
-    <MicrosoftEntityFrameworkCoreToolsPackageVersion>5.0.0-alpha1.19407.3</MicrosoftEntityFrameworkCoreToolsPackageVersion>
-    <MicrosoftEntityFrameworkCorePackageVersion>5.0.0-alpha1.19407.3</MicrosoftEntityFrameworkCorePackageVersion>
+    <dotnetefPackageVersion>5.0.0-alpha1.19467.7</dotnetefPackageVersion>
+    <MicrosoftEntityFrameworkCoreInMemoryPackageVersion>5.0.0-alpha1.19467.7</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
+    <MicrosoftEntityFrameworkCoreRelationalPackageVersion>5.0.0-alpha1.19467.7</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
+    <MicrosoftEntityFrameworkCoreSqlitePackageVersion>5.0.0-alpha1.19467.7</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
+    <MicrosoftEntityFrameworkCoreSqlServerPackageVersion>5.0.0-alpha1.19467.7</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
+    <MicrosoftEntityFrameworkCoreToolsPackageVersion>5.0.0-alpha1.19467.7</MicrosoftEntityFrameworkCoreToolsPackageVersion>
+    <MicrosoftEntityFrameworkCorePackageVersion>5.0.0-alpha1.19467.7</MicrosoftEntityFrameworkCorePackageVersion>
     <!-- Packages from aspnet/AspNetCore-Tooling -->
-    <MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>5.0.0-alpha1.19426.2</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
-    <MicrosoftAspNetCoreRazorLanguagePackageVersion>5.0.0-alpha1.19426.2</MicrosoftAspNetCoreRazorLanguagePackageVersion>
-    <MicrosoftCodeAnalysisRazorPackageVersion>5.0.0-alpha1.19426.2</MicrosoftCodeAnalysisRazorPackageVersion>
-    <MicrosoftNETSdkRazorPackageVersion>5.0.0-alpha1.19426.2</MicrosoftNETSdkRazorPackageVersion>
+    <MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>5.0.0-alpha1.19467.1</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
+    <MicrosoftAspNetCoreRazorLanguagePackageVersion>5.0.0-alpha1.19467.1</MicrosoftAspNetCoreRazorLanguagePackageVersion>
+    <MicrosoftCodeAnalysisRazorPackageVersion>5.0.0-alpha1.19467.1</MicrosoftCodeAnalysisRazorPackageVersion>
+    <MicrosoftNETSdkRazorPackageVersion>5.0.0-alpha1.19467.1</MicrosoftNETSdkRazorPackageVersion>
   </PropertyGroup>
   <!--
 
@@ -196,7 +196,9 @@
     <!-- Partner teams -->
     <MicrosoftAzureKeyVaultPackageVersion>2.3.2</MicrosoftAzureKeyVaultPackageVersion>
     <MicrosoftAzureStorageBlobPackageVersion>10.0.1</MicrosoftAzureStorageBlobPackageVersion>
+    <MicrosoftBuildPackageVersion>15.8.166</MicrosoftBuildPackageVersion>
     <MicrosoftBuildFrameworkPackageVersion>15.8.166</MicrosoftBuildFrameworkPackageVersion>
+    <MicrosoftBuildLocatorPackageVersion>1.2.6</MicrosoftBuildLocatorPackageVersion>
     <MicrosoftBuildUtilitiesCorePackageVersion>15.8.166</MicrosoftBuildUtilitiesCorePackageVersion>
     <MicrosoftCodeAnalysisCommonPackageVersion>3.0.0</MicrosoftCodeAnalysisCommonPackageVersion>
     <MicrosoftCodeAnalysisCSharpPackageVersion>3.0.0</MicrosoftCodeAnalysisCSharpPackageVersion>
diff --git a/eng/Workarounds.targets b/eng/Workarounds.targets
index 21aabd0940..bb01d5f38b 100644
--- a/eng/Workarounds.targets
+++ b/eng/Workarounds.targets
@@ -20,8 +20,8 @@
   <!-- Workaround https://github.com/dotnet/source-build/issues/1112. Source link is currently disabled in source build so define this dummy target which is required for pack. -->
   <Import Condition="'$(DotNetBuildFromSource)' == 'true'" Project="WorkaroundsImported.targets" />
 
-  <!-- Workaround for https://github.com/dotnet/arcade/issues/204 -->
-  <ItemGroup>
+  <!-- Workaround for https://github.com/dotnet/arcade/issues/204, not needed in source build -->
+  <ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
     <PackageReference Include="Internal.AspNetCore.BuildTasks" PrivateAssets="All" Version="$(InternalAspNetCoreBuildTasksPackageVersion)" IsImplicitlyDefined="true" />
   </ItemGroup>
 
diff --git a/eng/common/darc-init.ps1 b/eng/common/darc-init.ps1
index 8854d979f3..46d175fdfd 100644
--- a/eng/common/darc-init.ps1
+++ b/eng/common/darc-init.ps1
@@ -1,9 +1,9 @@
 param (
     $darcVersion = $null,
-    $versionEndpoint = "https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16"
+    $versionEndpoint = "https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16",
+    $verbosity = "m"
 )
 
-$verbosity = "m"
 . $PSScriptRoot\tools.ps1
 
 function InstallDarcCli ($darcVersion) {
diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh
index abdd0bc05a..242429bca6 100755
--- a/eng/common/darc-init.sh
+++ b/eng/common/darc-init.sh
@@ -3,6 +3,7 @@
 source="${BASH_SOURCE[0]}"
 darcVersion=''
 versionEndpoint="https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16"
+verbosity=m
 
 while [[ $# > 0 ]]; do
   opt="$(echo "$1" | awk '{print tolower($0)}')"
@@ -15,6 +16,10 @@ while [[ $# > 0 ]]; do
       versionEndpoint=$2
       shift
       ;;
+    --verbosity)
+      verbosity=$2
+      shift
+      ;;
     *)
       echo "Invalid argument: $1"
       usage
@@ -34,7 +39,6 @@ while [[ -h "$source" ]]; do
   [[ $source != /* ]] && source="$scriptroot/$source"
 done
 scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
-verbosity=m
 
 . "$scriptroot/tools.sh"
 
diff --git a/eng/common/native/CommonLibrary.psm1 b/eng/common/native/CommonLibrary.psm1
index 2a08d5246e..41416862d9 100644
--- a/eng/common/native/CommonLibrary.psm1
+++ b/eng/common/native/CommonLibrary.psm1
@@ -152,6 +152,8 @@ function Get-File {
   }
   else {
     Write-Verbose "Downloading $Uri"
+    # Don't display the console progress UI - it's a huge perf hit
+    $ProgressPreference = 'SilentlyContinue'   
     while($Attempt -Lt $DownloadRetries)
     {
       try {
diff --git a/eng/common/performance/perfhelixpublish.proj b/eng/common/performance/perfhelixpublish.proj
index 05e5f09891..e5826b5323 100644
--- a/eng/common/performance/perfhelixpublish.proj
+++ b/eng/common/performance/perfhelixpublish.proj
@@ -5,8 +5,14 @@
     <CliArguments>--dotnet-versions %DOTNET_VERSION% --cli-source-info args --cli-branch %PERFLAB_BRANCH% --cli-commit-sha %PERFLAB_HASH% --cli-repository https://github.com/%PERFLAB_REPO% --cli-source-timestamp %PERFLAB_BUILDTIMESTAMP%</CliArguments>
     <Python>py -3</Python>
     <CoreRun>%HELIX_CORRELATION_PAYLOAD%\Core_Root\CoreRun.exe</CoreRun>
+    <BaselineCoreRun>%HELIX_CORRELATION_PAYLOAD%\Baseline_Core_Root\CoreRun.exe</BaselineCoreRun>
     <HelixPreCommands>$(HelixPreCommands);call %HELIX_CORRELATION_PAYLOAD%\performance\tools\machine-setup.cmd</HelixPreCommands>
     <ArtifactsDirectory>%HELIX_CORRELATION_PAYLOAD%\artifacts\BenchmarkDotNet.Artifacts</ArtifactsDirectory>
+    <BaselineArtifactsDirectory>%HELIX_CORRELATION_PAYLOAD%\artifacts\BenchmarkDotNet.Artifacts_Baseline</BaselineArtifactsDirectory>
+    <ResultsComparer>%HELIX_CORRELATION_PAYLOAD%\performance\src\tools\ResultsComparer\ResultsComparer.csproj</ResultsComparer>
+    <DotnetExe>%HELIX_CORRELATION_PAYLOAD%\performance\tools\dotnet\$(Architecture)\dotnet.exe</DotnetExe>
+    <Percent>%25%25</Percent>
+    <XMLResults>%HELIX_WORKITEM_ROOT%\testResults.xml</XMLResults>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(AGENT_OS)' != 'Windows_NT' and '$(RunFromPerfRepo)' == 'false'">
@@ -24,14 +30,24 @@
     <CliArguments>--dotnet-versions $DOTNET_VERSION --cli-source-info args --cli-branch $PERFLAB_BRANCH --cli-commit-sha $PERFLAB_HASH --cli-repository https://github.com/$PERFLAB_REPO --cli-source-timestamp $PERFLAB_BUILDTIMESTAMP</CliArguments>
     <Python>python3</Python>
     <CoreRun>$(BaseDirectory)/Core_Root/corerun</CoreRun>
+    <BaselineCoreRun>$(BaseDirectory)/Baseline_Core_Root/corerun</BaselineCoreRun>
     <HelixPreCommands>$(HelixPreCommands);chmod +x $(PerformanceDirectory)/tools/machine-setup.sh;. $(PerformanceDirectory)/tools/machine-setup.sh</HelixPreCommands>
     <ArtifactsDirectory>$(BaseDirectory)/artifacts/BenchmarkDotNet.Artifacts</ArtifactsDirectory>
+    <BaselineArtifactsDirectory>$(BaseDirectory)/artifacts/BenchmarkDotNet.Artifacts_Baseline</BaselineArtifactsDirectory>
+    <ResultsComparer>$(PerformanceDirectory)/src/tools/ResultsComparer/ResultsComparer.csproj</ResultsComparer>
+    <DotnetExe>$(PerformanceDirectory)/tools/dotnet/$(Architecture)/dotnet</DotnetExe>
+    <Percent>%25</Percent>
+    <XMLResults>$HELIX_WORKITEM_ROOT/testResults.xml</XMLResults>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(UseCoreRun)' == 'true'">
     <CoreRunArgument>--corerun $(CoreRun)</CoreRunArgument>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(UseBaselineCoreRun)' == 'true'">
+    <BaselineCoreRunArgument>--corerun $(BaselineCoreRun)</BaselineCoreRunArgument>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(WorkItemCommand)' != ''">
     <WorkItemCommand>$(Python) $(WorkItemCommand) --incremental no --architecture $(Architecture) -f $(_Framework) $(PerfLabArguments)</WorkItemCommand>
   </PropertyGroup>
@@ -57,20 +73,29 @@
     <Partition Include="$(BuildConfig).Partition4" Index="4" />
   </ItemGroup>
 
+  <PropertyGroup Condition="'$(Compare)' == 'true'">
+    <FailOnTestFailure>false</FailOnTestFailure>
+  </PropertyGroup>
+
   <!-- 
     Partition the Microbenchmarks project, but nothing else
   -->
   <ItemGroup Condition="$(TargetCsproj.Contains('MicroBenchmarks.csproj'))">
     <HelixWorkItem Include="@(Partition)">
       <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
-      <Command>$(WorkItemCommand) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument) --artifacts $(ArtifactsDirectory) --partition-count $(PartitionCount) --partition-index %(HelixWorkItem.Index)"</Command>
+      <PreCommands Condition="'$(Compare)' == 'true'">$(WorkItemCommand) --bdn-artifacts $(BaselineArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(BaselineCoreRunArgument) --partition-count $(PartitionCount) --partition-index %(HelixWorkItem.Index)"</PreCommands>
+      <Command>$(WorkItemCommand) --bdn-artifacts $(ArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument) --partition-count $(PartitionCount) --partition-index %(HelixWorkItem.Index)"</Command>
+      <PostCommands Condition="'$(Compare)' == 'true'">$(DotnetExe) run -f $(_Framework) -p $(ResultsComparer) --base $(BaselineArtifactsDirectory) --diff $(ArtifactsDirectory) --threshold 2$(Percent) --xml $(XMLResults);$(FinalCommand)</PostCommands>
       <Timeout>4:00</Timeout>
     </HelixWorkItem>
   </ItemGroup>
+
   <ItemGroup Condition="!$(TargetCsproj.Contains('MicroBenchmarks.csproj'))">
     <HelixWorkItem Include="$(BuildConfig).WorkItem">
       <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
-      <Command>$(WorkItemCommand) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument) --artifacts $(ArtifactsDirectory)"</Command>
+      <PreCommands Condition="'$(Compare)' == 'true'">$(WorkItemCommand) --bdn-artifacts $(BaselineArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(BaselineCoreRunArgument)"</PreCommands>
+      <Command>$(WorkItemCommand) --bdn-artifacts $(ArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument)"</Command>
+      <PostCommands Condition="'$(Compare)' == 'true'">$(DotnetExe) run -f $(_Framework) -p $(ResultsComparer) --base $(BaselineArtifactsDirectory) --diff $(ArtifactsDirectory) --threshold 2$(Percent) --xml $(XMLResults)</PostCommands>
       <Timeout>4:00</Timeout>
     </HelixWorkItem>
   </ItemGroup>
diff --git a/eng/common/performance/performance-setup.ps1 b/eng/common/performance/performance-setup.ps1
index 937e4544a1..268986246e 100644
--- a/eng/common/performance/performance-setup.ps1
+++ b/eng/common/performance/performance-setup.ps1
@@ -1,6 +1,7 @@
 Param(
     [string] $SourceDirectory=$env:BUILD_SOURCESDIRECTORY,
     [string] $CoreRootDirectory,
+    [string] $BaselineCoreRootDirectory,
     [string] $Architecture="x64",
     [string] $Framework="netcoreapp5.0",
     [string] $CompilationMode="Tiered",
@@ -12,11 +13,13 @@ Param(
     [string] $Csproj="src\benchmarks\micro\MicroBenchmarks.csproj",
     [string] $Kind="micro",
     [switch] $Internal,
+    [switch] $Compare,
     [string] $Configurations="CompilationMode=$CompilationMode"
 )
 
 $RunFromPerformanceRepo = ($Repository -eq "dotnet/performance")
 $UseCoreRun = ($CoreRootDirectory -ne [string]::Empty)
+$UseBaselineCoreRun = ($BaselineCoreRootDirectory -ne [string]::Empty)
 
 $PayloadDirectory = (Join-Path $SourceDirectory "Payload")
 $PerformanceDirectory = (Join-Path $PayloadDirectory "performance")
@@ -29,11 +32,17 @@ $HelixSourcePrefix = "pr"
 $Queue = "Windows.10.Amd64.ClientRS4.DevEx.15.8.Open"
 
 if ($Framework.StartsWith("netcoreapp")) {
-    $Queue = "Windows.10.Amd64.ClientRS4.Open"
+    $Queue = "Windows.10.Amd64.ClientRS5.Open"
+}
+
+if ($Compare) {
+    $Queue = "Windows.10.Amd64.19H1.Tiger.Perf.Open"
+    $PerfLabArguments = ""
+    $ExtraBenchmarkDotNetArguments = ""
 }
 
 if ($Internal) {
-    $Queue = "Windows.10.Amd64.ClientRS5.Perf"
+    $Queue = "Windows.10.Amd64.19H1.Tiger.Perf"
     $PerfLabArguments = "--upload-to-perflab-container"
     $ExtraBenchmarkDotNetArguments = ""
     $Creator = ""
@@ -56,6 +65,10 @@ if ($UseCoreRun) {
     $NewCoreRoot = (Join-Path $PayloadDirectory "Core_Root")
     Move-Item -Path $CoreRootDirectory -Destination $NewCoreRoot
 }
+if ($UseBaselineCoreRun) {
+    $NewBaselineCoreRoot = (Join-Path $PayloadDirectory "Baseline_Core_Root")
+    Move-Item -Path $BaselineCoreRootDirectory -Destination $NewBaselineCoreRoot
+}
 
 $DocsDir = (Join-Path $PerformanceDirectory "docs")
 robocopy $DocsDir $WorkItemDirectory
@@ -80,7 +93,9 @@ Write-PipelineSetVariable -Name 'TargetCsproj' -Value "$Csproj" -IsMultiJobVaria
 Write-PipelineSetVariable -Name 'Kind' -Value "$Kind" -IsMultiJobVariable $false
 Write-PipelineSetVariable -Name 'Architecture' -Value "$Architecture" -IsMultiJobVariable $false
 Write-PipelineSetVariable -Name 'UseCoreRun' -Value "$UseCoreRun" -IsMultiJobVariable $false
+Write-PipelineSetVariable -Name 'UseBaselineCoreRun' -Value "$UseBaselineCoreRun" -IsMultiJobVariable $false
 Write-PipelineSetVariable -Name 'RunFromPerfRepo' -Value "$RunFromPerformanceRepo" -IsMultiJobVariable $false
+Write-PipelineSetVariable -Name 'Compare' -Value "$Compare" -IsMultiJobVariable $false
 
 # Helix Arguments
 Write-PipelineSetVariable -Name 'Creator' -Value "$Creator" -IsMultiJobVariable $false
diff --git a/eng/common/performance/performance-setup.sh b/eng/common/performance/performance-setup.sh
index 068bfcbb3b..550b3ebf18 100755
--- a/eng/common/performance/performance-setup.sh
+++ b/eng/common/performance/performance-setup.sh
@@ -2,6 +2,7 @@
 
 source_directory=$BUILD_SOURCESDIRECTORY
 core_root_directory=
+baseline_core_root_directory=
 architecture=x64
 framework=netcoreapp5.0
 compilation_mode=tiered
@@ -10,12 +11,14 @@ branch=$BUILD_SOURCEBRANCH
 commit_sha=$BUILD_SOURCEVERSION
 build_number=$BUILD_BUILDNUMBER
 internal=false
+compare=false
 kind="micro"
 run_categories="coreclr corefx"
 csproj="src\benchmarks\micro\MicroBenchmarks.csproj"
 configurations=
 run_from_perf_repo=false
 use_core_run=true
+use_baseline_core_run=true
 
 while (($# > 0)); do
   lowerI="$(echo $1 | awk '{print tolower($0)}')"
@@ -28,6 +31,10 @@ while (($# > 0)); do
       core_root_directory=$2
       shift 2
       ;;
+    --baselinecorerootdirectory)
+      baseline_core_root_directory=$2
+      shift 2
+      ;;
     --architecture)
       architecture=$2
       shift 2
@@ -72,6 +79,10 @@ while (($# > 0)); do
       internal=true
       shift 1
       ;;
+    --compare)
+      compare=true
+      shift 1
+      ;;
     --configurations)
       configurations=$2
       shift 2
@@ -114,6 +125,10 @@ if [ -z "$core_root_directory" ]; then
     use_core_run=false
 fi
 
+if [ -z "$baseline_core_root_directory" ]; then
+    use_baseline_core_run=false
+fi
+
 payload_directory=$source_directory/Payload
 performance_directory=$payload_directory/performance
 workitem_directory=$source_directory/workitem
@@ -123,6 +138,19 @@ queue=Ubuntu.1804.Amd64.Open
 creator=$BUILD_DEFINITIONNAME
 helix_source_prefix="pr"
 
+if [[ "$compare" == true ]]; then
+  extra_benchmark_dotnet_arguments=
+  perflab_arguments=
+
+  # No open queues for arm64
+  if [[ "$architecture" = "arm64" ]]; then
+    echo "Compare not available for arm64"
+    exit 1
+  fi
+
+  queue=Ubuntu.1804.Amd64.Tiger.Perf.Open
+fi
+
 if [[ "$internal" == true ]]; then
     perflab_arguments="--upload-to-perflab-container"
     helix_source_prefix="official"
@@ -132,7 +160,7 @@ if [[ "$internal" == true ]]; then
     if [[ "$architecture" = "arm64" ]]; then
         queue=Ubuntu.1804.Arm64.Perf
     else
-        queue=Ubuntu.1804.Amd64.Perf
+        queue=Ubuntu.1804.Amd64.Tiger.Perf
     fi
 fi
 
@@ -156,21 +184,33 @@ if [[ "$use_core_run" = true ]]; then
     mv $core_root_directory $new_core_root
 fi
 
+if [[ "$use_baseline_core_run" = true ]]; then
+  new_baseline_core_root=$payload_directory/Baseline_Core_Root
+  mv $baseline_core_root_directory $new_baseline_core_root
+fi
+
+ci=true
+
+_script_dir=$(pwd)/eng/common
+. "$_script_dir/pipeline-logging-functions.sh"
+
 # Make sure all of our variables are available for future steps
-echo "##vso[task.setvariable variable=UseCoreRun]$use_core_run"
-echo "##vso[task.setvariable variable=Architecture]$architecture"
-echo "##vso[task.setvariable variable=PayloadDirectory]$payload_directory"
-echo "##vso[task.setvariable variable=PerformanceDirectory]$performance_directory"
-echo "##vso[task.setvariable variable=WorkItemDirectory]$workitem_directory"
-echo "##vso[task.setvariable variable=Queue]$queue"
-echo "##vso[task.setvariable variable=SetupArguments]$setup_arguments"
-echo "##vso[task.setvariable variable=Python]python3"
-echo "##vso[task.setvariable variable=PerfLabArguments]$perflab_arguments"
-echo "##vso[task.setvariable variable=ExtraBenchmarkDotNetArguments]$extra_benchmark_dotnet_arguments"
-echo "##vso[task.setvariable variable=BDNCategories]$run_categories"
-echo "##vso[task.setvariable variable=TargetCsproj]$csproj"
-echo "##vso[task.setvariable variable=RunFromPerfRepo]$run_from_perf_repo"
-echo "##vso[task.setvariable variable=Creator]$creator"
-echo "##vso[task.setvariable variable=HelixSourcePrefix]$helix_source_prefix"
-echo "##vso[task.setvariable variable=Kind]$kind"
-echo "##vso[task.setvariable variable=_BuildConfig]$architecture.$kind.$framework"
\ No newline at end of file
+Write-PipelineSetVariable -name "UseCoreRun" -value "$use_core_run" -is_multi_job_variable false
+Write-PipelineSetVariable -name "UseBaselineCoreRun" -value "$use_baseline_core_run" -is_multi_job_variable false
+Write-PipelineSetVariable -name "Architecture" -value "$architecture" -is_multi_job_variable false
+Write-PipelineSetVariable -name "PayloadDirectory" -value "$payload_directory" -is_multi_job_variable false
+Write-PipelineSetVariable -name "PerformanceDirectory" -value "$performance_directory" -is_multi_job_variable false
+Write-PipelineSetVariable -name "WorkItemDirectory" -value "$workitem_directory" -is_multi_job_variable false
+Write-PipelineSetVariable -name "Queue" -value "$queue" -is_multi_job_variable false
+Write-PipelineSetVariable -name "SetupArguments" -value "$setup_arguments" -is_multi_job_variable false
+Write-PipelineSetVariable -name "Python" -value "$python3" -is_multi_job_variable false
+Write-PipelineSetVariable -name "PerfLabArguments" -value "$perflab_arguments" -is_multi_job_variable false
+Write-PipelineSetVariable -name "ExtraBenchmarkDotNetArguments" -value "$extra_benchmark_dotnet_arguments" -is_multi_job_variable false
+Write-PipelineSetVariable -name "BDNCategories" -value "$run_categories" -is_multi_job_variable false
+Write-PipelineSetVariable -name "TargetCsproj" -value "$csproj" -is_multi_job_variable false
+Write-PipelineSetVariable -name "RunFromPerfRepo" -value "$run_from_perf_repo" -is_multi_job_variable false
+Write-PipelineSetVariable -name "Creator" -value "$creator" -is_multi_job_variable false
+Write-PipelineSetVariable -name "HelixSourcePrefix" -value "$helix_source_prefix" -is_multi_job_variable false
+Write-PipelineSetVariable -name "Kind" -value "$kind" -is_multi_job_variable false
+Write-PipelineSetVariable -name "_BuildConfig" -value "$architecture.$kind.$framework" -is_multi_job_variable false
+Write-PipelineSetVariable -name "Compare" -value "$compare" -is_multi_job_variable false
diff --git a/eng/common/post-build/darc-gather-drop.ps1 b/eng/common/post-build/darc-gather-drop.ps1
index 93a0bd8328..89854d3c1c 100644
--- a/eng/common/post-build/darc-gather-drop.ps1
+++ b/eng/common/post-build/darc-gather-drop.ps1
@@ -19,7 +19,17 @@ try {
     ExitWithExitCode $exitCode
   }
 
+  # For now, only use a dry run.
+  # Ideally we would change darc to enable a quick request that
+  # would check whether the file exists that you can download it,
+  # and that it won't conflict with other files.
+  # https://github.com/dotnet/arcade/issues/3674
+  # Right now we can't remove continue-on-error because we ocassionally will have
+  # dependencies that have no associated builds (e.g. an old dependency).
+  # We need to add an option to baseline specific dependencies away, or add them manually
+  # to the BAR.
   darc gather-drop --non-shipping `
+    --dry-run `
     --continue-on-error `
     --id $BarBuildId `
     --output-dir $DropLocation `
diff --git a/eng/common/post-build/dotnetsymbol-init.ps1 b/eng/common/post-build/dotnetsymbol-init.ps1
deleted file mode 100644
index e7659b98c8..0000000000
--- a/eng/common/post-build/dotnetsymbol-init.ps1
+++ /dev/null
@@ -1,29 +0,0 @@
-param (
-  $dotnetsymbolVersion = $null
-)
-
-$ErrorActionPreference = "Stop"
-Set-StrictMode -Version 2.0
-
-. $PSScriptRoot\..\tools.ps1
-
-$verbosity = "minimal"
-
-function Installdotnetsymbol ($dotnetsymbolVersion) {
-  $dotnetsymbolPackageName = "dotnet-symbol"
-
-  $dotnetRoot = InitializeDotNetCli -install:$true
-  $dotnet = "$dotnetRoot\dotnet.exe"
-  $toolList = & "$dotnet" tool list --global
-
-  if (($toolList -like "*$dotnetsymbolPackageName*") -and ($toolList -like "*$dotnetsymbolVersion*")) {
-    Write-Host "dotnet-symbol version $dotnetsymbolVersion is already installed."
-  }
-  else {
-    Write-Host "Installing dotnet-symbol version $dotnetsymbolVersion..."
-    Write-Host "You may need to restart your command window if this is the first dotnet tool you have installed."
-    & "$dotnet" tool install $dotnetsymbolPackageName --version $dotnetsymbolVersion --verbosity $verbosity --global
-  }
-}
-
-Installdotnetsymbol $dotnetsymbolVersion
diff --git a/eng/common/post-build/sourcelink-cli-init.ps1 b/eng/common/post-build/sourcelink-cli-init.ps1
deleted file mode 100644
index 9eaa25b3b5..0000000000
--- a/eng/common/post-build/sourcelink-cli-init.ps1
+++ /dev/null
@@ -1,29 +0,0 @@
-param (
-  $sourcelinkCliVersion = $null
-)
-
-$ErrorActionPreference = "Stop"
-Set-StrictMode -Version 2.0
-
-. $PSScriptRoot\..\tools.ps1
-
-$verbosity = "minimal"
-
-function InstallSourcelinkCli ($sourcelinkCliVersion) {
-  $sourcelinkCliPackageName = "sourcelink"
-
-  $dotnetRoot = InitializeDotNetCli -install:$true
-  $dotnet = "$dotnetRoot\dotnet.exe"
-  $toolList = & "$dotnet" tool list --global
-
-  if (($toolList -like "*$sourcelinkCliPackageName*") -and ($toolList -like "*$sourcelinkCliVersion*")) {
-    Write-Host "SourceLink CLI version $sourcelinkCliVersion is already installed."
-  }
-  else {
-    Write-Host "Installing SourceLink CLI version $sourcelinkCliVersion..."
-    Write-Host "You may need to restart your command window if this is the first dotnet tool you have installed."
-    & "$dotnet" tool install $sourcelinkCliPackageName --version $sourcelinkCliVersion --verbosity $verbosity --global 
-  }
-}
-
-InstallSourcelinkCli $sourcelinkCliVersion
diff --git a/eng/common/post-build/sourcelink-validation.ps1 b/eng/common/post-build/sourcelink-validation.ps1
index 41e01ae6e6..bbfdacca13 100644
--- a/eng/common/post-build/sourcelink-validation.ps1
+++ b/eng/common/post-build/sourcelink-validation.ps1
@@ -1,8 +1,8 @@
 param(
   [Parameter(Mandatory=$true)][string] $InputPath,              # Full path to directory where Symbols.NuGet packages to be checked are stored
   [Parameter(Mandatory=$true)][string] $ExtractPath,            # Full path to directory where the packages will be extracted during validation
-  [Parameter(Mandatory=$true)][string] $GHRepoName,             # GitHub name of the repo including the Org. E.g., dotnet/arcade
-  [Parameter(Mandatory=$true)][string] $GHCommit,               # GitHub commit SHA used to build the packages
+  [Parameter(Mandatory=$false)][string] $GHRepoName,            # GitHub name of the repo including the Org. E.g., dotnet/arcade
+  [Parameter(Mandatory=$false)][string] $GHCommit,              # GitHub commit SHA used to build the packages
   [Parameter(Mandatory=$true)][string] $SourcelinkCliVersion    # Version of SourceLink CLI to use
 )
 
@@ -13,6 +13,12 @@ param(
 # all files present in the repo at a specific commit point.
 $global:RepoFiles = @{}
 
+# Maximum number of jobs to run in parallel
+$MaxParallelJobs = 6
+
+# Wait time between check for system load
+$SecondsBetweenLoadChecks = 10
+
 $ValidatePackage = {
   param( 
     [string] $PackagePath                                 # Full path to a Symbols.NuGet package
@@ -22,8 +28,8 @@ $ValidatePackage = {
 
   # Ensure input file exist
   if (!(Test-Path $PackagePath)) {
-    Write-PipelineTaskError "Input file does not exist: $PackagePath"
-    ExitWithExitCode 1
+    Write-Host "Input file does not exist: $PackagePath"
+    return 1
   }
 
   # Extensions for which we'll look for SourceLink information
@@ -38,7 +44,7 @@ $ValidatePackage = {
 
   Add-Type -AssemblyName System.IO.Compression.FileSystem
 
-  [System.IO.Directory]::CreateDirectory($ExtractPath);
+  [System.IO.Directory]::CreateDirectory($ExtractPath)  | Out-Null
 
   try {
     $zip = [System.IO.Compression.ZipFile]::OpenRead($PackagePath)
@@ -138,16 +144,18 @@ $ValidatePackage = {
 
   if ($FailedFiles -eq 0) {
     Write-Host "Passed."
+    return 0
   }
   else {
-    Write-PipelineTaskError "$PackagePath has broken SourceLink links."
+    Write-Host "$PackagePath has broken SourceLink links."
+    return 1
   }
 }
 
 function ValidateSourceLinkLinks {
-  if (!($GHRepoName -Match "^[^\s\/]+/[^\s\/]+$")) {
+  if ($GHRepoName -ne "" -and !($GHRepoName -Match "^[^\s\/]+/[^\s\/]+$")) {
     if (!($GHRepoName -Match "^[^\s-]+-[^\s]+$")) {
-      Write-PipelineTaskError "GHRepoName should be in the format <org>/<repo> or <org>-<repo>"
+      Write-PipelineTaskError "GHRepoName should be in the format <org>/<repo> or <org>-<repo>. '$GHRepoName'"
       ExitWithExitCode 1
     }
     else {
@@ -155,30 +163,33 @@ function ValidateSourceLinkLinks {
     }
   }
 
-  if (!($GHCommit -Match "^[0-9a-fA-F]{40}$")) {
-    Write-PipelineTaskError "GHCommit should be a 40 chars hexadecimal string"
+  if ($GHCommit -ne "" -and !($GHCommit -Match "^[0-9a-fA-F]{40}$")) {
+    Write-PipelineTaskError "GHCommit should be a 40 chars hexadecimal string. '$GHCommit'"
     ExitWithExitCode 1
   }
 
-  $RepoTreeURL = -Join("http://api.github.com/repos/", $GHRepoName, "/git/trees/", $GHCommit, "?recursive=1")
-  $CodeExtensions = @(".cs", ".vb", ".fs", ".fsi", ".fsx", ".fsscript")
+  if ($GHRepoName -ne "" -and $GHCommit -ne "") {
+    $RepoTreeURL = -Join("http://api.github.com/repos/", $GHRepoName, "/git/trees/", $GHCommit, "?recursive=1")
+    $CodeExtensions = @(".cs", ".vb", ".fs", ".fsi", ".fsx", ".fsscript")
 
-  try {
-    # Retrieve the list of files in the repo at that particular commit point and store them in the RepoFiles hash
-    $Data = Invoke-WebRequest $RepoTreeURL -UseBasicParsing | ConvertFrom-Json | Select-Object -ExpandProperty tree
+    try {
+      # Retrieve the list of files in the repo at that particular commit point and store them in the RepoFiles hash
+      $Data = Invoke-WebRequest $RepoTreeURL -UseBasicParsing | ConvertFrom-Json | Select-Object -ExpandProperty tree
   
-    foreach ($file in $Data) {
-      $Extension = [System.IO.Path]::GetExtension($file.path)
+      foreach ($file in $Data) {
+        $Extension = [System.IO.Path]::GetExtension($file.path)
 
-      if ($CodeExtensions.Contains($Extension)) {
-        $RepoFiles[$file.path] = 1
+        if ($CodeExtensions.Contains($Extension)) {
+          $RepoFiles[$file.path] = 1
+        }
       }
     }
+    catch {
+      Write-Host "Problems downloading the list of files from the repo. Url used: $RepoTreeURL . Execution will proceed without caching."
+    }
   }
-  catch {
-    Write-PipelineTaskError "Problems downloading the list of files from the repo. Url used: $RepoTreeURL"
-    Write-Host $_
-    ExitWithExitCode 1
+  elseif ($GHRepoName -ne "" -or $GHCommit -ne "") {
+    Write-Host "For using the http caching mechanism both GHRepoName and GHCommit should be informed."
   }
   
   if (Test-Path $ExtractPath) {
@@ -186,14 +197,33 @@ function ValidateSourceLinkLinks {
   }
 
   # Process each NuGet package in parallel
-  $Jobs = @()
   Get-ChildItem "$InputPath\*.symbols.nupkg" |
     ForEach-Object {
-      $Jobs += Start-Job -ScriptBlock $ValidatePackage -ArgumentList $_.FullName
+      Start-Job -ScriptBlock $ValidatePackage -ArgumentList $_.FullName | Out-Null
+      $NumJobs = @(Get-Job -State 'Running').Count
+      
+      while ($NumJobs -ge $MaxParallelJobs) {
+        Write-Host "There are $NumJobs validation jobs running right now. Waiting $SecondsBetweenLoadChecks seconds to check again."
+        sleep $SecondsBetweenLoadChecks
+        $NumJobs = @(Get-Job -State 'Running').Count
+      }
+
+      foreach ($Job in @(Get-Job -State 'Completed')) {
+        Receive-Job -Id $Job.Id
+        Remove-Job -Id $Job.Id
+      }
     }
 
-  foreach ($Job in $Jobs) {
-    Wait-Job -Id $Job.Id | Receive-Job
+  $ValidationFailures = 0
+  foreach ($Job in @(Get-Job)) {
+    $jobResult = Wait-Job -Id $Job.Id | Receive-Job
+    if ($jobResult -ne "0") {
+      $ValidationFailures++
+    }
+  }
+  if ($ValidationFailures -gt 0) {
+    Write-PipelineTaskError " $ValidationFailures package(s) failed validation."
+    ExitWithExitCode 1
   }
 }
 
diff --git a/eng/common/post-build/symbols-validation.ps1 b/eng/common/post-build/symbols-validation.ps1
index d5ec51b150..096ac321d1 100644
--- a/eng/common/post-build/symbols-validation.ps1
+++ b/eng/common/post-build/symbols-validation.ps1
@@ -37,10 +37,10 @@ function FirstMatchingSymbolDescriptionOrDefault {
   # DWARF file for a .dylib
   $DylibDwarf = $SymbolPath.Replace($Extension, ".dylib.dwarf")
  
-  $dotnetsymbolExe = "$env:USERPROFILE\.dotnet\tools"
-  $dotnetsymbolExe = Resolve-Path "$dotnetsymbolExe\dotnet-symbol.exe"
+  $dotnetSymbolExe = "$env:USERPROFILE\.dotnet\tools"
+  $dotnetSymbolExe = Resolve-Path "$dotnetSymbolExe\dotnet-symbol.exe"
 
-  & $dotnetsymbolExe --symbols --modules --windows-pdbs $TargetServerParam $FullPath -o $SymbolsPath | Out-Null
+  & $dotnetSymbolExe --symbols --modules --windows-pdbs $TargetServerParam $FullPath -o $SymbolsPath | Out-Null
 
   if (Test-Path $PdbPath) {
     return "PDB"
@@ -159,25 +159,25 @@ function CheckSymbolsAvailable {
     }
 }
 
-function Installdotnetsymbol {
-  $dotnetsymbolPackageName = "dotnet-symbol"
+function InstallDotnetSymbol {
+  $dotnetSymbolPackageName = "dotnet-symbol"
 
   $dotnetRoot = InitializeDotNetCli -install:$true
   $dotnet = "$dotnetRoot\dotnet.exe"
   $toolList = & "$dotnet" tool list --global
 
-  if (($toolList -like "*$dotnetsymbolPackageName*") -and ($toolList -like "*$dotnetsymbolVersion*")) {
-    Write-Host "dotnet-symbol version $dotnetsymbolVersion is already installed."
+  if (($toolList -like "*$dotnetSymbolPackageName*") -and ($toolList -like "*$dotnetSymbolVersion*")) {
+    Write-Host "dotnet-symbol version $dotnetSymbolVersion is already installed."
   }
   else {
-    Write-Host "Installing dotnet-symbol version $dotnetsymbolVersion..."
+    Write-Host "Installing dotnet-symbol version $dotnetSymbolVersion..."
     Write-Host "You may need to restart your command window if this is the first dotnet tool you have installed."
-    & "$dotnet" tool install $dotnetsymbolPackageName --version $dotnetsymbolVersion --verbosity "minimal" --global
+    & "$dotnet" tool install $dotnetSymbolPackageName --version $dotnetSymbolVersion --verbosity "minimal" --global
   }
 }
 
 try {
-  Installdotnetsymbol
+  InstallDotnetSymbol
 
   CheckSymbolsAvailable
 }
diff --git a/eng/common/sdl/execute-all-sdl-tools.ps1 b/eng/common/sdl/execute-all-sdl-tools.ps1
index aab7589f2c..fa239484f2 100644
--- a/eng/common/sdl/execute-all-sdl-tools.ps1
+++ b/eng/common/sdl/execute-all-sdl-tools.ps1
@@ -53,8 +53,8 @@ if ($ValidPath -eq $False)
   exit 1
 }
 
-& $(Join-Path $PSScriptRoot "init-sdl.ps1") -GuardianCliLocation $guardianCliLocation -Repository $RepoName -BranchName $BranchName -WorkingDirectory $ArtifactsDirectory -AzureDevOpsAccessToken $AzureDevOpsAccessToken -GuardianLoggerLevel $GuardianLoggerLevel
-$gdnFolder = Join-Path $ArtifactsDirectory ".gdn"
+& $(Join-Path $PSScriptRoot "init-sdl.ps1") -GuardianCliLocation $guardianCliLocation -Repository $RepoName -BranchName $BranchName -WorkingDirectory (Split-Path $SourceDirectory -Parent) -AzureDevOpsAccessToken $AzureDevOpsAccessToken -GuardianLoggerLevel $GuardianLoggerLevel
+$gdnFolder = Join-Path (Split-Path $SourceDirectory -Parent) ".gdn"
 
 if ($TsaOnboard) {
   if ($TsaCodebaseName -and $TsaNotificationEmail -and $TsaCodebaseAdmin -and $TsaBugAreaPath) {
@@ -86,8 +86,8 @@ if ($TsaPublish) {
     if (-not $TsaRepositoryName) {
       $TsaRepositoryName = "$($Repository)-$($BranchName)"
     }
-    Write-Host "$guardianCliLocation tsa-publish --all-tools --repository-name `"$TsaRepositoryName`" --branch-name `"$TsaBranchName`" --build-number `"$BuildNumber`" --codebase-name `"$TsaCodebaseName`" --notification-alias `"$TsaNotificationEmail`" --codebase-admin `"$TsaCodebaseAdmin`" --instance-url `"$TsaInstanceUrl`" --project-name `"$TsaProjectName`" --area-path `"$TsaBugAreaPath`" --iteration-path `"$TsaIterationPath`" --working-directory $SourceDirectory --logger-level $GuardianLoggerLevel"
-    & $guardianCliLocation tsa-publish --all-tools --repository-name "$TsaRepositoryName" --branch-name "$TsaBranchName" --build-number "$BuildNumber" --codebase-name "$TsaCodebaseName" --notification-alias "$TsaNotificationEmail" --codebase-admin "$TsaCodebaseAdmin" --instance-url "$TsaInstanceUrl" --project-name "$TsaProjectName" --area-path "$TsaBugAreaPath" --iteration-path "$TsaIterationPath" --working-directory $ArtifactsDirectory  --logger-level $GuardianLoggerLevel
+    Write-Host "$guardianCliLocation tsa-publish --all-tools --repository-name `"$TsaRepositoryName`" --branch-name `"$TsaBranchName`" --build-number `"$BuildNumber`" --codebase-name `"$TsaCodebaseName`" --notification-alias `"$TsaNotificationEmail`" --codebase-admin `"$TsaCodebaseAdmin`" --instance-url `"$TsaInstanceUrl`" --project-name `"$TsaProjectName`" --area-path `"$TsaBugAreaPath`" --iteration-path `"$TsaIterationPath`" --working-directory $ArtifactsDirectory --logger-level $GuardianLoggerLevel"
+    & $guardianCliLocation tsa-publish --all-tools --repository-name "$TsaRepositoryName" --branch-name "$TsaBranchName" --build-number "$BuildNumber" --onboard $True --codebase-name "$TsaCodebaseName" --notification-alias "$TsaNotificationEmail" --codebase-admin "$TsaCodebaseAdmin" --instance-url "$TsaInstanceUrl" --project-name "$TsaProjectName" --area-path "$TsaBugAreaPath" --iteration-path "$TsaIterationPath" --working-directory $ArtifactsDirectory  --logger-level $GuardianLoggerLevel
     if ($LASTEXITCODE -ne 0) {
       Write-Host "Guardian tsa-publish failed with exit code $LASTEXITCODE."
       exit $LASTEXITCODE
diff --git a/eng/common/sdl/init-sdl.ps1 b/eng/common/sdl/init-sdl.ps1
index 26e01c0673..c737eb0e71 100644
--- a/eng/common/sdl/init-sdl.ps1
+++ b/eng/common/sdl/init-sdl.ps1
@@ -11,6 +11,9 @@ $ErrorActionPreference = "Stop"
 Set-StrictMode -Version 2.0
 $LASTEXITCODE = 0
 
+# Don't display the console progress UI - it's a huge perf hit
+$ProgressPreference = 'SilentlyContinue'
+
 # Construct basic auth from AzDO access token; construct URI to the repository's gdn folder stored in that repository; construct location of zip file
 $encodedPat = [Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes(":$AzureDevOpsAccessToken"))
 $escapedRepository = [Uri]::EscapeDataString("/$Repository/$BranchName/.gdn")
diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config
index 3f97ac2f16..256ffbfb93 100644
--- a/eng/common/sdl/packages.config
+++ b/eng/common/sdl/packages.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Guardian.Cli" version="0.7.1"/>
+  <package id="Microsoft.Guardian.Cli" version="0.7.2"/>
 </packages>
diff --git a/eng/common/sdl/run-sdl.ps1 b/eng/common/sdl/run-sdl.ps1
index d7b8564458..9bc25314ae 100644
--- a/eng/common/sdl/run-sdl.ps1
+++ b/eng/common/sdl/run-sdl.ps1
@@ -25,43 +25,35 @@ if ($ValidPath -eq $False)
   exit 1
 }
 
+$configParam = @("--config")
+
 foreach ($tool in $ToolsList) {
   $gdnConfigFile = Join-Path $gdnConfigPath "$tool-configure.gdnconfig"
-  $config = $False
   Write-Host $tool
   # We have to manually configure tools that run on source to look at the source directory only
   if ($tool -eq "credscan") {
-    Write-Host "$GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args `" TargetDirectory : $TargetDirectory `" $(If ($CrScanAdditionalRunConfigParams) {$CrScanAdditionalRunConfigParams})"
-    & $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " TargetDirectory : $TargetDirectory " $(If ($CrScanAdditionalRunConfigParams) {$CrScanAdditionalRunConfigParams})
+    Write-Host "$GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args `" TargetDirectory < $TargetDirectory `" `" OutputType < pre `" $(If ($CrScanAdditionalRunConfigParams) {$CrScanAdditionalRunConfigParams})"
+    & $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " TargetDirectory < $TargetDirectory " "OutputType < pre" $(If ($CrScanAdditionalRunConfigParams) {$CrScanAdditionalRunConfigParams})
     if ($LASTEXITCODE -ne 0) {
       Write-Host "Guardian configure for $tool failed with exit code $LASTEXITCODE."
       exit $LASTEXITCODE
     }
-    $config = $True
   }
   if ($tool -eq "policheck") {
-    Write-Host "$GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args `" Target : $TargetDirectory `" $(If ($PoliCheckAdditionalRunConfigParams) {$PoliCheckAdditionalRunConfigParams})"
-    & $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " Target : $TargetDirectory " $(If ($PoliCheckAdditionalRunConfigParams) {$PoliCheckAdditionalRunConfigParams})
+    Write-Host "$GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args `" Target < $TargetDirectory `" $(If ($PoliCheckAdditionalRunConfigParams) {$PoliCheckAdditionalRunConfigParams})"
+    & $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " Target < $TargetDirectory " $(If ($PoliCheckAdditionalRunConfigParams) {$PoliCheckAdditionalRunConfigParams})
     if ($LASTEXITCODE -ne 0) {
       Write-Host "Guardian configure for $tool failed with exit code $LASTEXITCODE."
       exit $LASTEXITCODE
     }
-    $config = $True
   }
 
-  Write-Host "$GuardianCliLocation run --working-directory $WorkingDirectory --tool $tool --baseline mainbaseline --update-baseline $UpdateBaseline --logger-level $GuardianLoggerLevel --config $gdnConfigFile $config"
-  if ($config) {
-    & $GuardianCliLocation run --working-directory $WorkingDirectory --tool $tool --baseline mainbaseline --update-baseline $UpdateBaseline --logger-level $GuardianLoggerLevel --config $gdnConfigFile
-    if ($LASTEXITCODE -ne 0) {
-      Write-Host "Guardian run for $tool using $gdnConfigFile failed with exit code $LASTEXITCODE."
-      exit $LASTEXITCODE
-    }
-  } else {
-    & $GuardianCliLocation run --working-directory $WorkingDirectory --tool $tool --baseline mainbaseline --update-baseline $UpdateBaseline --logger-level $GuardianLoggerLevel
-    if ($LASTEXITCODE -ne 0) {
-      Write-Host "Guardian run for $tool failed with exit code $LASTEXITCODE."
-      exit $LASTEXITCODE
-    }
-  }
+  $configParam+=$gdnConfigFile
 }
 
+Write-Host "$GuardianCliLocation run --working-directory $WorkingDirectory --baseline mainbaseline --update-baseline $UpdateBaseline --logger-level $GuardianLoggerLevel $configParam"
+& $GuardianCliLocation run --working-directory $WorkingDirectory --tool $tool --baseline mainbaseline --update-baseline $UpdateBaseline --logger-level $GuardianLoggerLevel $configParam
+if ($LASTEXITCODE -ne 0) {
+  Write-Host "Guardian run for $ToolsList using $configParam failed with exit code $LASTEXITCODE."
+  exit $LASTEXITCODE
+}
diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml
index 91621cf88f..a7f9964195 100644
--- a/eng/common/templates/job/execute-sdl.yml
+++ b/eng/common/templates/job/execute-sdl.yml
@@ -1,7 +1,10 @@
 parameters:
   overrideParameters: ''                                       # Optional: to override values for parameters.
   additionalParameters: ''                                     # Optional: parameters that need user specific values eg: '-SourceToolsList @("abc","def") -ArtifactToolsList @("ghi","jkl")'
-  continueOnError: false                                       # optional: determines whether to continue the build if the step errors;
+  # There is some sort of bug (has been reported) in Azure DevOps where if this parameter is named
+  # 'continueOnError', the parameter value is not correctly picked up.
+  # This can also be remedied by the caller (post-build.yml) if it does not use a nested parameter
+  sdlContinueOnError: false                                    # optional: determines whether to continue the build if the step errors;
   dependsOn: ''                                                # Optional: dependencies of the job
 
 jobs:
@@ -26,12 +29,12 @@ jobs:
       -InputPath $(Build.SourcesDirectory)\artifacts\BlobArtifacts
       -ExtractPath $(Build.SourcesDirectory)\artifacts\BlobArtifacts
     displayName: Extract Blob Artifacts
-    continueOnError: ${{ parameters.continueOnError }}
+    continueOnError: ${{ parameters.sdlContinueOnError }}
   - powershell: eng/common/sdl/extract-artifact-packages.ps1
       -InputPath $(Build.SourcesDirectory)\artifacts\PackageArtifacts
       -ExtractPath $(Build.SourcesDirectory)\artifacts\PackageArtifacts
     displayName: Extract Package Artifacts
-    continueOnError: ${{ parameters.continueOnError }}
+    continueOnError: ${{ parameters.sdlContinueOnError }}
   - task: NuGetToolInstaller@1
     displayName: 'Install NuGet.exe'
   - task: NuGetCommand@2
@@ -45,12 +48,12 @@ jobs:
   - ${{ if ne(parameters.overrideParameters, '') }}:
     - powershell: eng/common/sdl/execute-all-sdl-tools.ps1 ${{ parameters.overrideParameters }}
       displayName: Execute SDL
-      continueOnError: ${{ parameters.continueOnError }}
+      continueOnError: ${{ parameters.sdlContinueOnError }}
   - ${{ if eq(parameters.overrideParameters, '') }}:
     - powershell: eng/common/sdl/execute-all-sdl-tools.ps1
-        -GuardianPackageName Microsoft.Guardian.Cli.0.7.1
+        -GuardianPackageName Microsoft.Guardian.Cli.0.7.2
         -NugetPackageDirectory $(Build.SourcesDirectory)\.packages
         -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw)
         ${{ parameters.additionalParameters }}
       displayName: Execute SDL
-      continueOnError: ${{ parameters.continueOnError }}
+      continueOnError: ${{ parameters.sdlContinueOnError }}
diff --git a/eng/common/templates/post-build/channels/internal-servicing.yml b/eng/common/templates/post-build/channels/internal-servicing.yml
index dc065ab308..4ca36358d9 100644
--- a/eng/common/templates/post-build/channels/internal-servicing.yml
+++ b/eng/common/templates/post-build/channels/internal-servicing.yml
@@ -1,5 +1,7 @@
 parameters:
   enableSymbolValidation: true
+  symbolPublishingAdditionalParameters: ''
+  artifactsPublishingAdditionalParameters: ''
 
 stages:
 - stage: IS_Publish
@@ -20,10 +22,16 @@ stages:
       vmImage: 'windows-2019'
     steps:
       - task: DownloadBuildArtifacts@0
-        displayName: Download Artifacts
+        displayName: Download Blob Artifacts
         inputs:
-          downloadType: specific files
-          matchingPattern: "*Artifacts*"
+          artifactName: 'BlobArtifacts'
+        continueOnError: true
+
+      - task: DownloadBuildArtifacts@0
+        displayName: Download PDB Artifacts
+        inputs:
+          artifactName: 'PDBArtifacts'
+        continueOnError: true
 
       - task: PowerShell@2
         displayName: Publish
@@ -34,7 +42,9 @@ stages:
             /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) 
             /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/'
             /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
+            /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt'
             /p:Configuration=Release
+            ${{ parameters.symbolPublishingAdditionalParameters }}
 
   - job: publish_assets
     displayName: Publish Assets
@@ -92,6 +102,7 @@ stages:
             /p:BlobBasePath='$(Build.ArtifactStagingDirectory)\BlobArtifacts' 
             /p:PackageBasePath='$(Build.ArtifactStagingDirectory)\PackageArtifacts' 
             /p:Configuration=Release 
+            ${{ parameters.artifactsPublishingAdditionalParameters }}
         
       - task: NuGetCommand@2
         displayName: Publish Packages to AzDO Feed
diff --git a/eng/common/templates/post-build/channels/netcore-dev-5.yml b/eng/common/templates/post-build/channels/netcore-dev-5.yml
index f2b0cfb269..812def3154 100644
--- a/eng/common/templates/post-build/channels/netcore-dev-5.yml
+++ b/eng/common/templates/post-build/channels/netcore-dev-5.yml
@@ -1,5 +1,8 @@
 parameters:
   enableSymbolValidation: true
+  symbolPublishingAdditionalParameters: ''
+  artifactsPublishingAdditionalParameters: ''
+  publishInstallersAndChecksums: false
 
 stages:
 - stage: NetCore_Dev5_Publish
@@ -20,10 +23,16 @@ stages:
       vmImage: 'windows-2019'
     steps:
       - task: DownloadBuildArtifacts@0
-        displayName: Download Artifacts
+        displayName: Download Blob Artifacts
         inputs:
-          downloadType: specific files
-          matchingPattern: "*Artifacts*"
+          artifactName: 'BlobArtifacts'
+        continueOnError: true
+
+      - task: DownloadBuildArtifacts@0
+        displayName: Download PDB Artifacts
+        inputs:
+          artifactName: 'PDBArtifacts'
+        continueOnError: true
 
       - task: PowerShell@2
         displayName: Publish
@@ -34,7 +43,9 @@ stages:
             /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) 
             /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/'
             /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
+            /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt'
             /p:Configuration=Release
+            ${{ parameters.symbolPublishingAdditionalParameters }}
 
   - job:
     displayName: Publish Assets
@@ -91,7 +102,13 @@ stages:
             /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' 
             /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' 
             /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' 
-            /p:Configuration=Release 
+            /p:Configuration=Release
+            /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl)
+            /p:InstallersAzureAccountKey=$(dotnetcli-storage-key)
+            /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }}
+            /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl)
+            /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key)
+            ${{ parameters.artifactsPublishingAdditionalParameters }}
         
       - task: NuGetCommand@2
         displayName: Publish Packages to AzDO Feed
diff --git a/eng/common/templates/post-build/channels/netcore-tools-latest.yml b/eng/common/templates/post-build/channels/netcore-tools-latest.yml
index fd6c09b227..c2d2076730 100644
--- a/eng/common/templates/post-build/channels/netcore-tools-latest.yml
+++ b/eng/common/templates/post-build/channels/netcore-tools-latest.yml
@@ -1,5 +1,8 @@
 parameters:
   enableSymbolValidation: true
+  symbolPublishingAdditionalParameters: ''
+  artifactsPublishingAdditionalParameters: ''
+  publishInstallersAndChecksums: false
 
 stages:
 - stage: NetCore_Tools_Latest_Publish
@@ -20,10 +23,16 @@ stages:
       vmImage: 'windows-2019'
     steps:
       - task: DownloadBuildArtifacts@0
-        displayName: Download Artifacts
+        displayName: Download Blob Artifacts
         inputs:
-          downloadType: specific files
-          matchingPattern: "*Artifacts*"
+          artifactName: 'BlobArtifacts'
+        continueOnError: true
+
+      - task: DownloadBuildArtifacts@0
+        displayName: Download PDB Artifacts
+        inputs:
+          artifactName: 'PDBArtifacts'
+        continueOnError: true
 
       - task: PowerShell@2
         displayName: Publish
@@ -34,7 +43,9 @@ stages:
             /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) 
             /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/'
             /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
+            /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt'
             /p:Configuration=Release
+            ${{ parameters.symbolPublishingAdditionalParameters }}
 
   - job:
     displayName: Publish Assets
@@ -91,7 +102,13 @@ stages:
             /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' 
             /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' 
             /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' 
-            /p:Configuration=Release 
+            /p:Configuration=Release
+            /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl)
+            /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }}
+            /p:InstallersAzureAccountKey=$(dotnetcli-storage-key)
+            /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl)
+            /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key)
+            ${{ parameters.artifactsPublishingAdditionalParameters }}
         
       - task: NuGetCommand@2
         displayName: Publish Packages to AzDO Feed
diff --git a/eng/common/templates/post-build/channels/public-dev-release.yml b/eng/common/templates/post-build/channels/public-dev-release.yml
index 771dcf4ef8..afa9542148 100644
--- a/eng/common/templates/post-build/channels/public-dev-release.yml
+++ b/eng/common/templates/post-build/channels/public-dev-release.yml
@@ -1,5 +1,8 @@
 parameters:
   enableSymbolValidation: true
+  symbolPublishingAdditionalParameters: ''
+  artifactsPublishingAdditionalParameters: ''
+  publishInstallersAndChecksums: false
 
 stages:
 - stage: Publish
@@ -20,10 +23,16 @@ stages:
       vmImage: 'windows-2019'
     steps:
       - task: DownloadBuildArtifacts@0
-        displayName: Download Artifacts
+        displayName: Download Blob Artifacts
         inputs:
-          downloadType: specific files
-          matchingPattern: "*Artifacts*"
+          artifactName: 'BlobArtifacts'
+        continueOnError: true
+
+      - task: DownloadBuildArtifacts@0
+        displayName: Download PDB Artifacts
+        inputs:
+          artifactName: 'PDBArtifacts'
+        continueOnError: true
 
       - task: PowerShell@2
         displayName: Publish
@@ -34,7 +43,9 @@ stages:
             /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) 
             /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/'
             /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
+            /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt'
             /p:Configuration=Release
+            ${{ parameters.symbolPublishingAdditionalParameters }}
 
   - job:
     displayName: Publish Assets
@@ -92,6 +103,12 @@ stages:
             /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' 
             /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' 
             /p:Configuration=Release 
+            /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }}
+            /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl)
+            /p:InstallersAzureAccountKey=$(dotnetcli-storage-key)
+            /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl)
+            /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key)
+            ${{ parameters.artifactsPublishingAdditionalParameters }}
         
       - task: NuGetCommand@2
         displayName: Publish Packages to AzDO Feed
diff --git a/eng/common/templates/post-build/channels/public-release.yml b/eng/common/templates/post-build/channels/public-release.yml
index 00108bd3f8..7ec1f89c08 100644
--- a/eng/common/templates/post-build/channels/public-release.yml
+++ b/eng/common/templates/post-build/channels/public-release.yml
@@ -1,5 +1,7 @@
 parameters:
   enableSymbolValidation: true
+  symbolPublishingAdditionalParameters: ''
+  artifactsPublishingAdditionalParameters: ''
 
 stages:
 - stage: PubRel_Publish
@@ -20,10 +22,16 @@ stages:
       vmImage: 'windows-2019'
     steps:
       - task: DownloadBuildArtifacts@0
-        displayName: Download Artifacts
+        displayName: Download Blob Artifacts
         inputs:
-          downloadType: specific files
-          matchingPattern: "*Artifacts*"
+          artifactName: 'BlobArtifacts'
+        continueOnError: true
+
+      - task: DownloadBuildArtifacts@0
+        displayName: Download PDB Artifacts
+        inputs:
+          artifactName: 'PDBArtifacts'
+        continueOnError: true
 
       - task: PowerShell@2
         displayName: Publish
@@ -34,7 +42,9 @@ stages:
             /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) 
             /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/'
             /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
+            /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt'
             /p:Configuration=Release
+            ${{ parameters.symbolPublishingAdditionalParameters }}
 
   - job: publish_assets
     displayName: Publish Assets
@@ -80,6 +90,7 @@ stages:
             /p:IsInternalBuild=$(IsInternalBuild)
             /p:RepositoryName=$(Build.Repository.Name)
             /p:CommitSha=$(Build.SourceVersion)
+            /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' 
             /p:AzureStorageAccountName=$(ProxyBackedFeedsAccountName)
             /p:AzureStorageAccountKey=$(dotnetfeed-storage-access-key-1)
             /p:AzureDevOpsFeedsBaseUrl=$(dotnetfeed-internal-private-feed-url)
@@ -92,6 +103,7 @@ stages:
             /p:BlobBasePath='$(Build.ArtifactStagingDirectory)\BlobArtifacts' 
             /p:PackageBasePath='$(Build.ArtifactStagingDirectory)\PackageArtifacts' 
             /p:Configuration=Release 
+            ${{ parameters.artifactsPublishingAdditionalParameters }}
         
       - task: NuGetCommand@2
         displayName: Publish Packages to AzDO Feed
diff --git a/eng/common/templates/post-build/channels/public-validation-release.yml b/eng/common/templates/post-build/channels/public-validation-release.yml
index f64184da9f..12124d6215 100644
--- a/eng/common/templates/post-build/channels/public-validation-release.yml
+++ b/eng/common/templates/post-build/channels/public-validation-release.yml
@@ -1,3 +1,7 @@
+parameters:
+  artifactsPublishingAdditionalParameters: ''
+  publishInstallersAndChecksums: false
+
 stages:
 - stage: PVR_Publish
   dependsOn: validate
@@ -62,7 +66,13 @@ stages:
             /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' 
             /p:BlobBasePath='$(Build.ArtifactStagingDirectory)\BlobArtifacts' 
             /p:PackageBasePath='$(Build.ArtifactStagingDirectory)\PackageArtifacts' 
-            /p:Configuration=Release 
+            /p:Configuration=Release
+            /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl)
+            /p:InstallersAzureAccountKey=$(dotnetcli-storage-key)
+            /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }}
+            /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl)
+            /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key)
+            ${{ parameters.artifactsPublishingAdditionalParameters }}
 
       - task: NuGetCommand@2
         displayName: Publish Packages to AzDO Feed
diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml
index 52a74487fd..7b3fdb1361 100644
--- a/eng/common/templates/post-build/common-variables.yml
+++ b/eng/common/templates/post-build/common-variables.yml
@@ -1,5 +1,6 @@
 variables:
   - group: Publish-Build-Assets
+  - group: DotNet-DotNetCli-Storage
 
   # .NET Core 3 Dev
   - name: PublicDevRelease_30_Channel_Id
@@ -45,3 +46,9 @@ variables:
     value: 3.0.0
   - name: SymbolToolVersion
     value: 1.0.1
+
+  # Default locations for Installers and checksums
+  - name: ChecksumsBlobFeedUrl
+    value: https://dotnetclichecksums.blob.core.windows.net/dotnet/index.json
+  - name: InstallersBlobFeedUrl
+    value: https://dotnetcli.blob.core.windows.net/dotnet/index.json
diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml
index aba0b0fcaf..34667b6c09 100644
--- a/eng/common/templates/post-build/post-build.yml
+++ b/eng/common/templates/post-build/post-build.yml
@@ -1,12 +1,20 @@
 parameters:
-  enableSourceLinkValidation: true
+  enableSourceLinkValidation: false
   enableSigningValidation: true
-  enableSymbolValidation: true
+  enableSymbolValidation: false
   enableNugetValidation: true
+  publishInstallersAndChecksums: false
   SDLValidationParameters:
     enable: false
+    continueOnError: false
     params: ''
 
+  # These parameters let the user customize the call to sdk-task.ps1 for publishing
+  # symbols & general artifacts as well as for signing validation
+  symbolPublishingAdditionalParameters: ''
+  artifactsPublishingAdditionalParameters: ''
+  signingValidationAdditionalParameters: ''
+
   # Which stages should finish execution before post-build stages start
   dependsOn: [build]
 
@@ -53,7 +61,8 @@ stages:
             arguments: -task SigningValidation -restore -msbuildEngine dotnet
               /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts'
               /p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt'
-              /p:Configuration=Release
+              /p:Configuration=Release 
+              ${{ parameters.signingValidationAdditionalParameters }}
 
   - ${{ if eq(parameters.enableSourceLinkValidation, 'true') }}:
     - job:
@@ -78,26 +87,46 @@ stages:
               -GHRepoName $(Build.Repository.Name) 
               -GHCommit $(Build.SourceVersion)
               -SourcelinkCliVersion $(SourceLinkCLIVersion)
+          continueOnError: true
 
   - ${{ if eq(parameters.SDLValidationParameters.enable, 'true') }}:
     - template: /eng/common/templates/job/execute-sdl.yml
       parameters:
         additionalParameters: ${{ parameters.SDLValidationParameters.params }}
+        continueOnError: ${{ parameters.SDLValidationParameters.continueOnError }}
 
 - template: \eng\common\templates\post-build\channels\netcore-dev-5.yml
   parameters:
     enableSymbolValidation: ${{ parameters.enableSymbolValidation }}
+    symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
+    artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
+    publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
 
 - template: \eng\common\templates\post-build\channels\public-dev-release.yml
   parameters:
     enableSymbolValidation: ${{ parameters.enableSymbolValidation }}
+    symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
+    artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
+    publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
 
 - template: \eng\common\templates\post-build\channels\netcore-tools-latest.yml
   parameters:
     enableSymbolValidation: ${{ parameters.enableSymbolValidation }}
+    symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
+    artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
+    publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
 
 - template: \eng\common\templates\post-build\channels\public-validation-release.yml
+  parameters:
+    artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
+    publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
 
 - template: \eng\common\templates\post-build\channels\public-release.yml
+  parameters:
+    symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
+    artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
 
 - template: \eng\common\templates\post-build\channels\internal-servicing.yml
+  parameters:
+    symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
+    artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 9c12b1b4fd..bb5638930a 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -163,6 +163,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) {
   $installScript = Join-Path $dotnetRoot "dotnet-install.ps1"
   if (!(Test-Path $installScript)) {
     Create-Directory $dotnetRoot
+    $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
     Invoke-WebRequest "https://dot.net/$dotnetInstallScriptVersion/dotnet-install.ps1" -OutFile $installScript
   }
 
@@ -282,6 +283,7 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) {
 
     Create-Directory $packageDir
     Write-Host "Downloading $packageName $packageVersion"
+    $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
     Invoke-WebRequest "https://dotnet.myget.org/F/roslyn-tools/api/v2/package/$packageName/$packageVersion/" -OutFile $packagePath
     Unzip $packagePath $packageDir
   }
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index 3af9be6157..94a1edd7d0 100755
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -208,12 +208,19 @@ function GetDotNetInstallScript {
 
     # Use curl if available, otherwise use wget
     if command -v curl > /dev/null; then
-      curl "$install_script_url" -sSL --retry 10 --create-dirs -o "$install_script"
-    else
-      wget -q -O "$install_script" "$install_script_url"
+      curl "$install_script_url" -sSL --retry 10 --create-dirs -o "$install_script" || {
+        local exit_code=$?
+        Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to acquire dotnet install script (exit code '$exit_code')."
+        ExitWithExitCode $exit_code
+      }
+    else 
+      wget -q -O "$install_script" "$install_script_url" || {
+        local exit_code=$?
+        Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to acquire dotnet install script (exit code '$exit_code')."
+        ExitWithExitCode $exit_code
+      }
     fi
   fi
-
   # return value
   _GetDotNetInstallScript="$install_script"
 }
diff --git a/src/Analyzers/Analyzers/test/AnalyzerTestBase.cs b/src/Analyzers/Analyzers/test/AnalyzerTestBase.cs
index 9ec94add87..ed80fa3d08 100644
--- a/src/Analyzers/Analyzers/test/AnalyzerTestBase.cs
+++ b/src/Analyzers/Analyzers/test/AnalyzerTestBase.cs
@@ -6,7 +6,6 @@ using System.IO;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Analyzer.Testing;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.CodeAnalysis;
 
 namespace Microsoft.AspNetCore.Analyzers
diff --git a/src/Analyzers/Analyzers/test/TestFiles/CompilationFeatureDetectorTest/StartupWithMapBlazorHub.cs b/src/Analyzers/Analyzers/test/TestFiles/CompilationFeatureDetectorTest/StartupWithMapBlazorHub.cs
index 764ac23bd5..22e3148624 100644
--- a/src/Analyzers/Analyzers/test/TestFiles/CompilationFeatureDetectorTest/StartupWithMapBlazorHub.cs
+++ b/src/Analyzers/Analyzers/test/TestFiles/CompilationFeatureDetectorTest/StartupWithMapBlazorHub.cs
@@ -13,7 +13,7 @@ namespace Microsoft.AspNetCore.Analyzers.TestFiles.CompilationFeatureDetectorTes
 
             app.UseEndpoints(endpoints =>
             {
-                endpoints.MapBlazorHub<App>("app");
+                endpoints.MapBlazorHub();
             });
         }
 
diff --git a/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADJwtBearerOptionsConfiguration.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADJwtBearerOptionsConfiguration.cs
index fbf398888d..75337b2cc4 100644
--- a/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADJwtBearerOptionsConfiguration.cs
+++ b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADJwtBearerOptionsConfiguration.cs
@@ -24,6 +24,11 @@ namespace Microsoft.AspNetCore.Authentication
         public void Configure(string name, JwtBearerOptions options)
         {
             var azureADScheme = GetAzureADScheme(name);
+            if (azureADScheme is null)
+            {
+                return;
+            }
+
             var azureADOptions = _azureADOptions.Get(azureADScheme);
             if (name != azureADOptions.JwtBearerSchemeName)
             {
diff --git a/src/Azure/AzureAD/Authentication.AzureAD.UI/test/AzureADAuthenticationBuilderExtensionsTests.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/test/AzureADAuthenticationBuilderExtensionsTests.cs
index db937ca62e..07c0583c32 100644
--- a/src/Azure/AzureAD/Authentication.AzureAD.UI/test/AzureADAuthenticationBuilderExtensionsTests.cs
+++ b/src/Azure/AzureAD/Authentication.AzureAD.UI/test/AzureADAuthenticationBuilderExtensionsTests.cs
@@ -268,6 +268,22 @@ namespace Microsoft.AspNetCore.Authentication
             Assert.Contains(expectedMessage, exception.Failures);
         }
 
+        [Fact]
+        public void AddAzureAD_SkipsOptionsValidationForNonAzureCookies()
+        {
+            var services = new ServiceCollection();
+            services.AddSingleton<ILoggerFactory>(new NullLoggerFactory());
+
+            services.AddAuthentication()
+                .AddAzureAD(o => { })
+                .AddCookie("other");
+
+            var provider = services.BuildServiceProvider();
+            var cookieAuthOptions = provider.GetService<IOptionsMonitor<CookieAuthenticationOptions>>();
+
+            Assert.NotNull(cookieAuthOptions.Get("other"));
+        }
+
         [Fact]
         public void AddAzureADBearer_AddsAllAuthenticationHandlers()
         {
@@ -453,5 +469,21 @@ namespace Microsoft.AspNetCore.Authentication
 
             Assert.Contains(expectedMessage, exception.Failures);
         }
+
+        [Fact]
+        public void AddAzureADBearer_SkipsOptionsValidationForNonAzureCookies()
+        {
+            var services = new ServiceCollection();
+            services.AddSingleton<ILoggerFactory>(new NullLoggerFactory());
+
+            services.AddAuthentication()
+                .AddAzureADBearer(o => { })
+                .AddJwtBearer("other", o => { });
+
+            var provider = services.BuildServiceProvider();
+            var jwtOptions = provider.GetService<IOptionsMonitor<JwtBearerOptions>>();
+
+            Assert.NotNull(jwtOptions.Get("other"));
+        }
     }
 }
diff --git a/src/Components/Analyzers/src/ComponentInternalUsageDiagnosticAnalzyer.cs b/src/Components/Analyzers/src/ComponentInternalUsageDiagnosticAnalzyer.cs
index 3f0c765614..8f6272c326 100644
--- a/src/Components/Analyzers/src/ComponentInternalUsageDiagnosticAnalzyer.cs
+++ b/src/Components/Analyzers/src/ComponentInternalUsageDiagnosticAnalzyer.cs
@@ -8,6 +8,10 @@ using Microsoft.CodeAnalysis.Diagnostics;
 
 namespace Microsoft.Extensions.Internal
 {
+    /// <summary>
+    /// This API supports infrastructure and is not intended to be used
+    /// directly from your code. This API may change or be removed in future releases.
+    /// </summary>
     [DiagnosticAnalyzer(LanguageNames.CSharp)]
     public class ComponentInternalUsageDiagnosticAnalyzer : DiagnosticAnalyzer
     {
diff --git a/src/Components/Analyzers/test/AnalyzerTestBase.cs b/src/Components/Analyzers/test/AnalyzerTestBase.cs
index e174b4f667..8c1ae95376 100644
--- a/src/Components/Analyzers/test/AnalyzerTestBase.cs
+++ b/src/Components/Analyzers/test/AnalyzerTestBase.cs
@@ -6,7 +6,6 @@ using System.IO;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Analyzer.Testing;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.CodeAnalysis;
 
 namespace Microsoft.AspNetCore.Components.Analyzers
diff --git a/src/Components/Blazor/Blazor/ref/Microsoft.AspNetCore.Blazor.netstandard2.0.cs b/src/Components/Blazor/Blazor/ref/Microsoft.AspNetCore.Blazor.netstandard2.0.cs
index a2feb9c39c..375c6d09a6 100644
--- a/src/Components/Blazor/Blazor/ref/Microsoft.AspNetCore.Blazor.netstandard2.0.cs
+++ b/src/Components/Blazor/Blazor/ref/Microsoft.AspNetCore.Blazor.netstandard2.0.cs
@@ -68,7 +68,7 @@ namespace Microsoft.AspNetCore.Blazor.Rendering
     public static partial class WebAssemblyEventDispatcher
     {
         [Microsoft.JSInterop.JSInvokableAttribute("DispatchEvent")]
-        public static System.Threading.Tasks.Task DispatchEvent(Microsoft.AspNetCore.Components.Web.WebEventDescriptor eventDescriptor, string eventArgsJson) { throw null; }
+        public static System.Threading.Tasks.Task DispatchEvent(Microsoft.AspNetCore.Components.RenderTree.WebEventDescriptor eventDescriptor, string eventArgsJson) { throw null; }
     }
 }
 namespace Microsoft.AspNetCore.Components.Builder
diff --git a/src/Components/Blazor/Blazor/src/Hosting/WebAssemblyHost.cs b/src/Components/Blazor/Blazor/src/Hosting/WebAssemblyHost.cs
index b68aa3c36e..25f1c16838 100644
--- a/src/Components/Blazor/Blazor/src/Hosting/WebAssemblyHost.cs
+++ b/src/Components/Blazor/Blazor/src/Hosting/WebAssemblyHost.cs
@@ -38,7 +38,6 @@ namespace Microsoft.AspNetCore.Blazor.Hosting
             // this happens in the browser it will be a direct call from Mono. We effectively needs to set the
             // JSRuntime in the 'root' execution context which implies that we want to do as part of a direct
             // call from Program.Main, and before any 'awaits'.
-            JSRuntime.SetCurrentJSRuntime(_runtime);
             SetBrowserHttpMessageHandlerAsDefault();
 
             return StartAsyncAwaited();
diff --git a/src/Components/Blazor/Blazor/src/Microsoft.AspNetCore.Blazor.csproj b/src/Components/Blazor/Blazor/src/Microsoft.AspNetCore.Blazor.csproj
index aa489c210f..0673c85b2d 100644
--- a/src/Components/Blazor/Blazor/src/Microsoft.AspNetCore.Blazor.csproj
+++ b/src/Components/Blazor/Blazor/src/Microsoft.AspNetCore.Blazor.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -13,9 +13,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="..\..\..\Shared\src\BrowserNavigationManagerInterop.cs" />
-    <Compile Include="..\..\..\Shared\src\JsonSerializerOptionsProvider.cs" />
-    <Compile Include="..\..\..\Shared\src\WebEventData.cs" />
+    <Compile Include="$(ComponentsSharedSourceRoot)src\BrowserNavigationManagerInterop.cs" />
+    <Compile Include="$(ComponentsSharedSourceRoot)src\JsonSerializerOptionsProvider.cs" />
+    <Compile Include="$(ComponentsSharedSourceRoot)src\WebEventData.cs" />
+
+    <Compile Include="$(ComponentsSharedSourceRoot)src\ElementReferenceJsonConverter.cs" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Components/Blazor/Blazor/src/Rendering/WebAssemblyEventDispatcher.cs b/src/Components/Blazor/Blazor/src/Rendering/WebAssemblyEventDispatcher.cs
index d46500bae7..77aa59cbc1 100644
--- a/src/Components/Blazor/Blazor/src/Rendering/WebAssemblyEventDispatcher.cs
+++ b/src/Components/Blazor/Blazor/src/Rendering/WebAssemblyEventDispatcher.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Components.RenderTree;
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.JSInterop;
 
diff --git a/src/Components/Blazor/Blazor/src/Rendering/WebAssemblyRenderer.cs b/src/Components/Blazor/Blazor/src/Rendering/WebAssemblyRenderer.cs
index 5964637090..8651e14930 100644
--- a/src/Components/Blazor/Blazor/src/Rendering/WebAssemblyRenderer.cs
+++ b/src/Components/Blazor/Blazor/src/Rendering/WebAssemblyRenderer.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Blazor.Services;
 using Microsoft.AspNetCore.Components;
-using Microsoft.AspNetCore.Components.Rendering;
+using Microsoft.AspNetCore.Components.RenderTree;
 using Microsoft.Extensions.Logging;
 
 namespace Microsoft.AspNetCore.Blazor.Rendering
diff --git a/src/Components/Blazor/Blazor/src/Services/WebAssemblyJSRuntime.cs b/src/Components/Blazor/Blazor/src/Services/WebAssemblyJSRuntime.cs
index 80ab06c39d..c5404c256f 100644
--- a/src/Components/Blazor/Blazor/src/Services/WebAssemblyJSRuntime.cs
+++ b/src/Components/Blazor/Blazor/src/Services/WebAssemblyJSRuntime.cs
@@ -1,12 +1,34 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using Microsoft.AspNetCore.Components;
 using Mono.WebAssembly.Interop;
 
 namespace Microsoft.AspNetCore.Blazor.Services
 {
-    internal static class WebAssemblyJSRuntime
+    internal sealed class WebAssemblyJSRuntime : MonoWebAssemblyJSRuntime
     {
-        public static readonly MonoWebAssemblyJSRuntime Instance = new MonoWebAssemblyJSRuntime();
+        private static readonly WebAssemblyJSRuntime _instance = new WebAssemblyJSRuntime();
+        private static bool _initialized;
+
+        public WebAssemblyJSRuntime()
+        {
+            JsonSerializerOptions.Converters.Add(new ElementReferenceJsonConverter());
+        }
+
+        public static WebAssemblyJSRuntime Instance
+        {
+            get
+            {
+                if (!_initialized)
+                {
+                    // This is executing in MonoWASM. Consequently we do not to have concern ourselves with thread safety.
+                    _initialized = true;
+                    Initialize(_instance);
+                }
+
+                return _instance;
+            }
+        }
     }
 }
diff --git a/src/Components/Blazor/Build/test/BindRazorIntegrationTest.cs b/src/Components/Blazor/Build/test/BindRazorIntegrationTest.cs
index bc63a4b0df..1fafb9e81d 100644
--- a/src/Components/Blazor/Build/test/BindRazorIntegrationTest.cs
+++ b/src/Components/Blazor/Build/test/BindRazorIntegrationTest.cs
@@ -271,6 +271,7 @@ namespace Test
         {
             // Arrange
             var component = CompileToComponent(@"
+@using Microsoft.AspNetCore.Components.Web
 <input @bind=""@ParentValue"" />
 @code {
     public int ParentValue { get; set; } = 42;
@@ -292,6 +293,7 @@ namespace Test
         {
             // Arrange
             var component = CompileToComponent(@"
+@using Microsoft.AspNetCore.Components.Web
 <input type=""text"" @bind=""@CurrentDate"" @bind:format=""MM/dd/yyyy""/>
 @code {
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
@@ -314,6 +316,7 @@ namespace Test
         {
             // Arrange
             var component = CompileToComponent(@"
+@using Microsoft.AspNetCore.Components.Web
 <input type=""text"" @bind=""@CurrentDate"" @bind:format=""@Format""/>
 @code {
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
@@ -338,6 +341,7 @@ namespace Test
         {
             // Arrange
             var component = CompileToComponent(@"
+@using Microsoft.AspNetCore.Components.Web
 <input type=""text"" @bind=""@ParentValue"" />
 @code {
     public int ParentValue { get; set; } = 42;
@@ -360,6 +364,7 @@ namespace Test
         {
             // Arrange
             var component = CompileToComponent(@"
+@using Microsoft.AspNetCore.Components.Web
 <input type=""checkbox"" @bind=""@Enabled"" />
 @code {
     public bool Enabled { get; set; }
diff --git a/src/Components/Blazor/Build/test/ComponentRenderingRazorIntegrationTest.cs b/src/Components/Blazor/Build/test/ComponentRenderingRazorIntegrationTest.cs
index 6513224c05..d15cf4f584 100644
--- a/src/Components/Blazor/Build/test/ComponentRenderingRazorIntegrationTest.cs
+++ b/src/Components/Blazor/Build/test/ComponentRenderingRazorIntegrationTest.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.RenderTree;
 using Microsoft.AspNetCore.Components.Test.Helpers;
+using Microsoft.AspNetCore.Components.Web;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -202,23 +203,25 @@ namespace Test
             AdditionalSyntaxTrees.Add(Parse(@"
 using System;
 using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Web;
 
 namespace Test
 {
     public class MyComponent : ComponentBase
     {
         [Parameter]
-        public Action<UIMouseEventArgs> OnClick { get; set; }
+        public Action<MouseEventArgs> OnClick { get; set; }
     }
 }
 "));
 
             var component = CompileToComponent($@"
+@using Microsoft.AspNetCore.Components.Web
 <MyComponent OnClick=""{expression}""/>
 
 @code {{
     private int counter;
-    private void Increment(UIMouseEventArgs e) {{
+    private void Increment(MouseEventArgs e) {{
         counter++;
     }}
 }}");
@@ -235,7 +238,7 @@ namespace Test
                     AssertFrame.Attribute(frame, "OnClick", 1);
 
                     // The handler will have been assigned to a lambda
-                    var handler = Assert.IsType<Action<UIMouseEventArgs>>(frame.AttributeValue);
+                    var handler = Assert.IsType<Action<MouseEventArgs>>(frame.AttributeValue);
                     Assert.Equal("Test.TestComponent", handler.Target.GetType().FullName);
                 });
         }
@@ -445,11 +448,12 @@ namespace Test
 
             // Act
             var component = CompileToComponent(@"
+@using Microsoft.AspNetCore.Components.Web
 <p @onmouseover=""OnComponentHover"" style=""background: @ParentBgColor;"" />
 @code {
     public string ParentBgColor { get; set; } = ""#FFFFFF"";
 
-    public void OnComponentHover(UIMouseEventArgs e)
+    public void OnComponentHover(MouseEventArgs e)
     {
     }
 }
diff --git a/src/Components/Blazor/Build/test/RenderingRazorIntegrationTest.cs b/src/Components/Blazor/Build/test/RenderingRazorIntegrationTest.cs
index 990ec1db18..3f380cbc79 100644
--- a/src/Components/Blazor/Build/test/RenderingRazorIntegrationTest.cs
+++ b/src/Components/Blazor/Build/test/RenderingRazorIntegrationTest.cs
@@ -7,6 +7,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.RenderTree;
 using Microsoft.AspNetCore.Components.Test.Helpers;
+using Microsoft.AspNetCore.Components.Web;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -308,11 +309,12 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test
         public async Task SupportsTwoWayBindingForTextboxes()
         {
             // Arrange/Act
-            var component = CompileToComponent(
-                @"<input @bind=""MyValue"" />
-                @code {
-                    public string MyValue { get; set; } = ""Initial value"";
-                }");
+            var component = CompileToComponent(@"
+@using Microsoft.AspNetCore.Components.Web
+<input @bind=""MyValue"" />
+@code {
+    public string MyValue { get; set; } = ""Initial value"";
+}");
             var myValueProperty = component.GetType().GetProperty("MyValue");
 
             var renderer = new TestRenderer();
@@ -343,11 +345,12 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test
         public async Task SupportsTwoWayBindingForTextareas()
         {
             // Arrange/Act
-            var component = CompileToComponent(
-                @"<textarea @bind=""MyValue"" ></textarea>
-                @code {
-                    public string MyValue { get; set; } = ""Initial value"";
-                }");
+            var component = CompileToComponent(@"
+@using Microsoft.AspNetCore.Components.Web
+<textarea @bind=""MyValue"" ></textarea>
+@code {
+    public string MyValue { get; set; } = ""Initial value"";
+}");
             var myValueProperty = component.GetType().GetProperty("MyValue");
 
             var renderer = new TestRenderer();
@@ -378,11 +381,12 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test
         public async Task SupportsTwoWayBindingForDateValues()
         {
             // Arrange/Act
-            var component = CompileToComponent(
-                @"<input @bind=""MyDate"" />
-                @code {
-                    public DateTime MyDate { get; set; } = new DateTime(2018, 3, 4, 1, 2, 3);
-                }");
+            var component = CompileToComponent(@"
+@using Microsoft.AspNetCore.Components.Web
+<input @bind=""MyDate"" />
+@code {
+    public DateTime MyDate { get; set; } = new DateTime(2018, 3, 4, 1, 2, 3);
+}");
             var myDateProperty = component.GetType().GetProperty("MyDate");
 
             var renderer = new TestRenderer();
@@ -416,11 +420,12 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test
         {
             // Arrange/Act
             var testDateFormat = "ddd yyyy-MM-dd";
-            var component = CompileToComponent(
-                $@"<input @bind=""@MyDate"" @bind:format=""{testDateFormat}"" />
-                @code {{
-                    public DateTime MyDate {{ get; set; }} = new DateTime(2018, 3, 4);
-                }}");
+            var component = CompileToComponent($@"
+@using Microsoft.AspNetCore.Components.Web
+<input @bind=""@MyDate"" @bind:format=""{testDateFormat}"" />
+@code {{
+    public DateTime MyDate {{ get; set; }} = new DateTime(2018, 3, 4);
+}}");
             var myDateProperty = component.GetType().GetProperty("MyDate");
 
             var renderer = new TestRenderer();
@@ -467,6 +472,7 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test
         {
             // Arrange
             var component = CompileToComponent(@"
+@using Microsoft.AspNetCore.Components.Web
 <button @onclick=""x => Clicked = true"" />
 @code {
     public bool Clicked { get; set; }
@@ -486,10 +492,10 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test
                 {
                     AssertFrame.Attribute(frame, "onclick", 1);
 
-                    var func = Assert.IsType<Action<UIMouseEventArgs>>(frame.AttributeValue);
+                    var func = Assert.IsType<Action<MouseEventArgs>>(frame.AttributeValue);
                     Assert.False((bool)clicked.GetValue(component));
 
-                    func(new UIMouseEventArgs());
+                    func(new MouseEventArgs());
                     Assert.True((bool)clicked.GetValue(component));
                 });
         }
@@ -499,9 +505,10 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test
         {
             // Arrange
             var component = CompileToComponent(@"
+@using Microsoft.AspNetCore.Components.Web
 <button @onclick=""OnClick"" />
 @code {
-    public void OnClick(UIMouseEventArgs e) { Clicked = true; }
+    public void OnClick(MouseEventArgs e) { Clicked = true; }
     public bool Clicked { get; set; }
 }");
 
@@ -513,7 +520,7 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test
             var frames = GetRenderTree(renderer, component);
 
             // Assert
-            Action<UIMouseEventArgs> func = default; // Since this is a method group, we don't need to create an EventCallback
+            Action<MouseEventArgs> func = default; // Since this is a method group, we don't need to create an EventCallback
             Assert.Collection(
                 frames,
                 frame => AssertFrame.Element(frame, "button", 2, 0),
@@ -521,13 +528,13 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test
                 {
                     AssertFrame.Attribute(frame, "onclick", 1);
 
-                    func = Assert.IsType<Action<UIMouseEventArgs>>(frame.AttributeValue);
+                    func = Assert.IsType<Action<MouseEventArgs>>(frame.AttributeValue);
                     Assert.False((bool)clicked.GetValue(component));
 
 
                 });
 
-            func.Invoke(new UIMouseEventArgs());
+            func.Invoke(new MouseEventArgs());
             Assert.True((bool)clicked.GetValue(component));
         }
 
@@ -535,11 +542,12 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test
         public async Task SupportsTwoWayBindingForBoolValues()
         {
             // Arrange/Act
-            var component = CompileToComponent(
-                @"<input @bind=""MyValue"" />
-                @code {
-                    public bool MyValue { get; set; } = true;
-                }");
+            var component = CompileToComponent(@"
+@using Microsoft.AspNetCore.Components.Web
+<input @bind=""MyValue"" />
+@code {
+    public bool MyValue { get; set; } = true;
+}");
             var myValueProperty = component.GetType().GetProperty("MyValue");
 
             var renderer = new TestRenderer();
@@ -571,11 +579,12 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test
         {
             // Arrange/Act
             var myEnumType = FullTypeName<MyEnum>();
-            var component = CompileToComponent(
-                $@"<input @bind=""MyValue"" />
-                @code {{
-                    public {myEnumType} MyValue {{ get; set; }} = {myEnumType}.{nameof(MyEnum.FirstValue)};
-                }}");
+            var component = CompileToComponent($@"
+@using Microsoft.AspNetCore.Components.Web
+<input @bind=""MyValue"" />
+@code {{
+    public {myEnumType} MyValue {{ get; set; }} = {myEnumType}.{nameof(MyEnum.FirstValue)};
+}}");
             var myValueProperty = component.GetType().GetProperty("MyValue");
 
             var renderer = new TestRenderer();
diff --git a/src/Components/Blazor/Build/test/RuntimeDependenciesResolverTest.cs b/src/Components/Blazor/Build/test/RuntimeDependenciesResolverTest.cs
index dd3456d99d..5838d419d7 100644
--- a/src/Components/Blazor/Build/test/RuntimeDependenciesResolverTest.cs
+++ b/src/Components/Blazor/Build/test/RuntimeDependenciesResolverTest.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Blazor.Build.Test
diff --git a/src/Components/Blazor/Directory.Build.props b/src/Components/Blazor/Directory.Build.props
new file mode 100644
index 0000000000..dd413c575c
--- /dev/null
+++ b/src/Components/Blazor/Directory.Build.props
@@ -0,0 +1,9 @@
+<Project>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
+
+  <PropertyGroup>
+    <!-- Override prerelease label and use preview 9, even in the final build -->
+    <PreReleaseVersionLabel>$(BlazorClientPreReleaseVersionLabel)</PreReleaseVersionLabel>
+    <DotNetFinalVersionKind></DotNetFinalVersionKind>
+  </PropertyGroup>
+</Project>
diff --git a/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/_Imports.razor b/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/_Imports.razor
index 87ceeb5d5c..912a5070c2 100644
--- a/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/_Imports.razor
+++ b/src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/_Imports.razor
@@ -1,6 +1,7 @@
 @using System.Net.Http
 @using Microsoft.AspNetCore.Components.Forms
 @using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
 @using Microsoft.JSInterop
 @*#if (!Hosted)
 @using BlazorWasm_CSharp
diff --git a/src/Components/Blazor/testassets/HostedInAspNet.Client/_Imports.razor b/src/Components/Blazor/testassets/HostedInAspNet.Client/_Imports.razor
new file mode 100644
index 0000000000..66ebfa5d18
--- /dev/null
+++ b/src/Components/Blazor/testassets/HostedInAspNet.Client/_Imports.razor
@@ -0,0 +1 @@
+@using Microsoft.AspNetCore.Components.Web
diff --git a/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/_Imports.razor b/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/_Imports.razor
index 54219b6cbf..dc263c9383 100644
--- a/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/_Imports.razor
+++ b/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/_Imports.razor
@@ -1,5 +1,6 @@
 @using System.Net.Http
 @using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
 @using Microsoft.JSInterop
 @using Microsoft.AspNetCore.Blazor.E2EPerformance
 @using Microsoft.AspNetCore.Blazor.E2EPerformance.Shared
diff --git a/src/Components/Blazor/testassets/StandaloneApp/_Imports.razor b/src/Components/Blazor/testassets/StandaloneApp/_Imports.razor
index b4ffe12094..efbdfe11c5 100644
--- a/src/Components/Blazor/testassets/StandaloneApp/_Imports.razor
+++ b/src/Components/Blazor/testassets/StandaloneApp/_Imports.razor
@@ -1,4 +1,5 @@
-@using System.Net.Http
+@using System.Net.Http
 @using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
 @using StandaloneApp
 @using StandaloneApp.Shared
diff --git a/src/Components/Components/ref/Microsoft.AspNetCore.Components.csproj b/src/Components/Components/ref/Microsoft.AspNetCore.Components.csproj
index 2528a898a1..8a32a89b9e 100644
--- a/src/Components/Components/ref/Microsoft.AspNetCore.Components.csproj
+++ b/src/Components/Components/ref/Microsoft.AspNetCore.Components.csproj
@@ -5,14 +5,15 @@
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <Compile Include="Microsoft.AspNetCore.Components.netstandard2.0.cs" />
-    <Reference Include="Microsoft.JSInterop"  />
     <Reference Include="Microsoft.Extensions.Logging.Abstractions"  />
     <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions"  />
+    <Reference Include="Microsoft.Extensions.HashCodeCombiner.Sources"  />
+    <Reference Include="System.Buffers"  />
   </ItemGroup>
 <ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
     <Compile Include="Microsoft.AspNetCore.Components.netcoreapp.cs" />
-    <Reference Include="Microsoft.JSInterop"  />
     <Reference Include="Microsoft.Extensions.Logging.Abstractions"  />
     <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions"  />
+    <Reference Include="Microsoft.Extensions.HashCodeCombiner.Sources"  />
   </ItemGroup>
 </Project>
diff --git a/src/Components/Components/ref/Microsoft.AspNetCore.Components.netcoreapp.cs b/src/Components/Components/ref/Microsoft.AspNetCore.Components.netcoreapp.cs
index e8054887c5..72adf28aa7 100644
--- a/src/Components/Components/ref/Microsoft.AspNetCore.Components.netcoreapp.cs
+++ b/src/Components/Components/ref/Microsoft.AspNetCore.Components.netcoreapp.cs
@@ -50,6 +50,15 @@ namespace Microsoft.AspNetCore.Components
         public static bool TryConvertToString(object obj, System.Globalization.CultureInfo culture, out string value) { throw null; }
         public static bool TryConvertTo<T>(object obj, System.Globalization.CultureInfo culture, out T value) { throw null; }
     }
+    [System.AttributeUsageAttribute(System.AttributeTargets.Class, AllowMultiple=true, Inherited=true)]
+    public sealed partial class BindElementAttribute : System.Attribute
+    {
+        public BindElementAttribute(string element, string suffix, string valueAttribute, string changeAttribute) { }
+        public string ChangeAttribute { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public string Element { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public string Suffix { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public string ValueAttribute { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+    }
     [System.AttributeUsageAttribute(System.AttributeTargets.Property, AllowMultiple=false, Inherited=true)]
     public sealed partial class CascadingParameterAttribute : System.Attribute
     {
@@ -110,6 +119,8 @@ namespace Microsoft.AspNetCore.Components
     public readonly partial struct ElementReference
     {
         private readonly object _dummy;
+        public ElementReference(string id) { throw null; }
+        public string Id { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
     }
     [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
     public readonly partial struct EventCallback
@@ -192,6 +203,13 @@ namespace Microsoft.AspNetCore.Components
         public bool HasDelegate { get { throw null; } }
         public System.Threading.Tasks.Task InvokeAsync(TValue arg) { throw null; }
     }
+    [System.AttributeUsageAttribute(System.AttributeTargets.Class, AllowMultiple=true, Inherited=true)]
+    public sealed partial class EventHandlerAttribute : System.Attribute
+    {
+        public EventHandlerAttribute(string attributeName, System.Type eventArgsType) { }
+        public string AttributeName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public System.Type EventArgsType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+    }
     public partial interface IComponent
     {
         void Attach(Microsoft.AspNetCore.Components.RenderHandle renderHandle);
@@ -360,39 +378,6 @@ namespace Microsoft.AspNetCore.Components.CompilerServices
 }
 namespace Microsoft.AspNetCore.Components.Rendering
 {
-    public partial class EventFieldInfo
-    {
-        public EventFieldInfo() { }
-        public int ComponentId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public object FieldValue { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-    }
-    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
-    public readonly partial struct RenderBatch
-    {
-        private readonly object _dummy;
-        public Microsoft.AspNetCore.Components.RenderTree.ArrayRange<int> DisposedComponentIDs { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-        public Microsoft.AspNetCore.Components.RenderTree.ArrayRange<ulong> DisposedEventHandlerIDs { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-        public Microsoft.AspNetCore.Components.RenderTree.ArrayRange<Microsoft.AspNetCore.Components.RenderTree.RenderTreeFrame> ReferenceFrames { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-        public Microsoft.AspNetCore.Components.RenderTree.ArrayRange<Microsoft.AspNetCore.Components.RenderTree.RenderTreeDiff> UpdatedComponents { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-    }
-    public abstract partial class Renderer : System.IDisposable
-    {
-        public Renderer(System.IServiceProvider serviceProvider, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { }
-        public abstract Microsoft.AspNetCore.Components.Dispatcher Dispatcher { get; }
-        public event System.UnhandledExceptionEventHandler UnhandledSynchronizationException { add { } remove { } }
-        protected internal int AssignRootComponentId(Microsoft.AspNetCore.Components.IComponent component) { throw null; }
-        public virtual System.Threading.Tasks.Task DispatchEventAsync(ulong eventHandlerId, Microsoft.AspNetCore.Components.Rendering.EventFieldInfo fieldInfo, System.EventArgs eventArgs) { throw null; }
-        public void Dispose() { }
-        protected virtual void Dispose(bool disposing) { }
-        protected Microsoft.AspNetCore.Components.RenderTree.ArrayRange<Microsoft.AspNetCore.Components.RenderTree.RenderTreeFrame> GetCurrentRenderTreeFrames(int componentId) { throw null; }
-        protected abstract void HandleException(System.Exception exception);
-        protected Microsoft.AspNetCore.Components.IComponent InstantiateComponent(System.Type componentType) { throw null; }
-        protected virtual void ProcessPendingRender() { }
-        protected System.Threading.Tasks.Task RenderRootComponentAsync(int componentId) { throw null; }
-        [System.Diagnostics.DebuggerStepThroughAttribute]
-        protected System.Threading.Tasks.Task RenderRootComponentAsync(int componentId, Microsoft.AspNetCore.Components.ParameterView initialParameters) { throw null; }
-        protected abstract System.Threading.Tasks.Task UpdateDisplayAsync(in Microsoft.AspNetCore.Components.Rendering.RenderBatch renderBatch);
-    }
     public sealed partial class RenderTreeBuilder : System.IDisposable
     {
         public RenderTreeBuilder() { }
@@ -448,6 +433,39 @@ namespace Microsoft.AspNetCore.Components.RenderTree
         public ArrayRange(T[] array, int count) { throw null; }
         public Microsoft.AspNetCore.Components.RenderTree.ArrayRange<T> Clone() { throw null; }
     }
+    public partial class EventFieldInfo
+    {
+        public EventFieldInfo() { }
+        public int ComponentId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public object FieldValue { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
+    public readonly partial struct RenderBatch
+    {
+        private readonly object _dummy;
+        public Microsoft.AspNetCore.Components.RenderTree.ArrayRange<int> DisposedComponentIDs { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public Microsoft.AspNetCore.Components.RenderTree.ArrayRange<ulong> DisposedEventHandlerIDs { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public Microsoft.AspNetCore.Components.RenderTree.ArrayRange<Microsoft.AspNetCore.Components.RenderTree.RenderTreeFrame> ReferenceFrames { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public Microsoft.AspNetCore.Components.RenderTree.ArrayRange<Microsoft.AspNetCore.Components.RenderTree.RenderTreeDiff> UpdatedComponents { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+    }
+    public abstract partial class Renderer : System.IDisposable
+    {
+        public Renderer(System.IServiceProvider serviceProvider, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { }
+        public abstract Microsoft.AspNetCore.Components.Dispatcher Dispatcher { get; }
+        public event System.UnhandledExceptionEventHandler UnhandledSynchronizationException { add { } remove { } }
+        protected internal int AssignRootComponentId(Microsoft.AspNetCore.Components.IComponent component) { throw null; }
+        public virtual System.Threading.Tasks.Task DispatchEventAsync(ulong eventHandlerId, Microsoft.AspNetCore.Components.RenderTree.EventFieldInfo fieldInfo, System.EventArgs eventArgs) { throw null; }
+        public void Dispose() { }
+        protected virtual void Dispose(bool disposing) { }
+        protected Microsoft.AspNetCore.Components.RenderTree.ArrayRange<Microsoft.AspNetCore.Components.RenderTree.RenderTreeFrame> GetCurrentRenderTreeFrames(int componentId) { throw null; }
+        protected abstract void HandleException(System.Exception exception);
+        protected Microsoft.AspNetCore.Components.IComponent InstantiateComponent(System.Type componentType) { throw null; }
+        protected virtual void ProcessPendingRender() { }
+        protected System.Threading.Tasks.Task RenderRootComponentAsync(int componentId) { throw null; }
+        [System.Diagnostics.DebuggerStepThroughAttribute]
+        protected System.Threading.Tasks.Task RenderRootComponentAsync(int componentId, Microsoft.AspNetCore.Components.ParameterView initialParameters) { throw null; }
+        protected abstract System.Threading.Tasks.Task UpdateDisplayAsync(in Microsoft.AspNetCore.Components.RenderTree.RenderBatch renderBatch);
+    }
     [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
     public readonly partial struct RenderTreeDiff
     {
@@ -514,6 +532,8 @@ namespace Microsoft.AspNetCore.Components.Routing
     {
         public Router() { }
         [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public System.Collections.Generic.IEnumerable<System.Reflection.Assembly> AdditionalAssemblies { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
         public System.Reflection.Assembly AppAssembly { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
         [Microsoft.AspNetCore.Components.ParameterAttribute]
         public Microsoft.AspNetCore.Components.RenderFragment<Microsoft.AspNetCore.Components.RouteData> Found { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
diff --git a/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.Manual.cs b/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.Manual.cs
index ed14f101cd..0f6b699935 100644
--- a/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.Manual.cs
+++ b/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.Manual.cs
@@ -1,47 +1,58 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
+using System.Runtime.InteropServices;
+using Microsoft.AspNetCore.Components.Rendering;
+
 namespace Microsoft.AspNetCore.Components.RenderTree
 {
     // https://github.com/dotnet/arcade/pull/2033
-    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Explicit)]
+    [StructLayout(LayoutKind.Explicit, Pack = 4)]
     public readonly partial struct RenderTreeFrame
     {
-        [System.Runtime.InteropServices.FieldOffsetAttribute(8)]
-        public readonly int AttributeEventHandlerId;
-        [System.Runtime.InteropServices.FieldOffsetAttribute(16)]
-        public readonly string AttributeName;
-        [System.Runtime.InteropServices.FieldOffsetAttribute(24)]
-        public readonly object AttributeValue;
-        [System.Runtime.InteropServices.FieldOffsetAttribute(12)]
-        public readonly int ComponentId;
-        [System.Runtime.InteropServices.FieldOffsetAttribute(16)]
-        public readonly System.Action<object> ComponentReferenceCaptureAction;
-        [System.Runtime.InteropServices.FieldOffsetAttribute(8)]
-        public readonly int ComponentReferenceCaptureParentFrameIndex;
-        [System.Runtime.InteropServices.FieldOffsetAttribute(8)]
-        public readonly int ComponentSubtreeLength;
-        [System.Runtime.InteropServices.FieldOffsetAttribute(16)]
-        public readonly System.Type ComponentType;
-        [System.Runtime.InteropServices.FieldOffsetAttribute(16)]
-        public readonly string ElementName;
-        [System.Runtime.InteropServices.FieldOffsetAttribute(24)]
-        public readonly System.Action<Microsoft.AspNetCore.Components.ElementReference> ElementReferenceCaptureAction;
-        [System.Runtime.InteropServices.FieldOffsetAttribute(16)]
-        public readonly string ElementReferenceCaptureId;
-        [System.Runtime.InteropServices.FieldOffsetAttribute(8)]
-        public readonly int ElementSubtreeLength;
-        [System.Runtime.InteropServices.FieldOffsetAttribute(4)]
-        public readonly Microsoft.AspNetCore.Components.RenderTree.RenderTreeFrameType FrameType;
-        [System.Runtime.InteropServices.FieldOffsetAttribute(16)]
-        public readonly string MarkupContent;
-        [System.Runtime.InteropServices.FieldOffsetAttribute(8)]
-        public readonly int RegionSubtreeLength;
-        [System.Runtime.InteropServices.FieldOffsetAttribute(0)]
-        public readonly int Sequence;
-        [System.Runtime.InteropServices.FieldOffsetAttribute(16)]
-        public readonly string TextContent;
-        public Microsoft.AspNetCore.Components.IComponent Component { get { throw null; } }
-        public override string ToString() { throw null; }
+        [FieldOffset(0)] public readonly int Sequence;
+
+        [FieldOffset(4)] public readonly RenderTreeFrameType FrameType;
+
+        [FieldOffset(8)] public readonly int ElementSubtreeLength;
+
+        [FieldOffset(16)] public readonly string ElementName;
+
+        [FieldOffset(24)] public readonly object ElementKey;
+
+        [FieldOffset(16)] public readonly string TextContent;
+
+        [FieldOffset(8)] public readonly ulong AttributeEventHandlerId;
+
+        [FieldOffset(16)] public readonly string AttributeName;
+
+        [FieldOffset(24)] public readonly object AttributeValue;
+
+        [FieldOffset(32)] public readonly string AttributeEventUpdatesAttributeName;
+
+        [FieldOffset(8)] public readonly int ComponentSubtreeLength;
+
+        [FieldOffset(12)] public readonly int ComponentId;
+
+        [FieldOffset(16)] public readonly Type ComponentType;
+
+        [FieldOffset(32)] public readonly object ComponentKey;
+
+        public IComponent Component => null;
+
+        [FieldOffset(8)] public readonly int RegionSubtreeLength;
+
+        [FieldOffset(16)] public readonly string ElementReferenceCaptureId;
+
+        [FieldOffset(24)] public readonly Action<ElementReference> ElementReferenceCaptureAction;
+
+        [FieldOffset(8)] public readonly int ComponentReferenceCaptureParentFrameIndex;
+
+        [FieldOffset(16)] public readonly Action<object> ComponentReferenceCaptureAction;
+
+        [FieldOffset(16)] public readonly string MarkupContent;
+
+        public override string ToString() => null;
     }
 }
diff --git a/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.cs b/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.cs
index e8054887c5..72adf28aa7 100644
--- a/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.cs
+++ b/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.cs
@@ -50,6 +50,15 @@ namespace Microsoft.AspNetCore.Components
         public static bool TryConvertToString(object obj, System.Globalization.CultureInfo culture, out string value) { throw null; }
         public static bool TryConvertTo<T>(object obj, System.Globalization.CultureInfo culture, out T value) { throw null; }
     }
+    [System.AttributeUsageAttribute(System.AttributeTargets.Class, AllowMultiple=true, Inherited=true)]
+    public sealed partial class BindElementAttribute : System.Attribute
+    {
+        public BindElementAttribute(string element, string suffix, string valueAttribute, string changeAttribute) { }
+        public string ChangeAttribute { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public string Element { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public string Suffix { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public string ValueAttribute { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+    }
     [System.AttributeUsageAttribute(System.AttributeTargets.Property, AllowMultiple=false, Inherited=true)]
     public sealed partial class CascadingParameterAttribute : System.Attribute
     {
@@ -110,6 +119,8 @@ namespace Microsoft.AspNetCore.Components
     public readonly partial struct ElementReference
     {
         private readonly object _dummy;
+        public ElementReference(string id) { throw null; }
+        public string Id { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
     }
     [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
     public readonly partial struct EventCallback
@@ -192,6 +203,13 @@ namespace Microsoft.AspNetCore.Components
         public bool HasDelegate { get { throw null; } }
         public System.Threading.Tasks.Task InvokeAsync(TValue arg) { throw null; }
     }
+    [System.AttributeUsageAttribute(System.AttributeTargets.Class, AllowMultiple=true, Inherited=true)]
+    public sealed partial class EventHandlerAttribute : System.Attribute
+    {
+        public EventHandlerAttribute(string attributeName, System.Type eventArgsType) { }
+        public string AttributeName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public System.Type EventArgsType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+    }
     public partial interface IComponent
     {
         void Attach(Microsoft.AspNetCore.Components.RenderHandle renderHandle);
@@ -360,39 +378,6 @@ namespace Microsoft.AspNetCore.Components.CompilerServices
 }
 namespace Microsoft.AspNetCore.Components.Rendering
 {
-    public partial class EventFieldInfo
-    {
-        public EventFieldInfo() { }
-        public int ComponentId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public object FieldValue { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-    }
-    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
-    public readonly partial struct RenderBatch
-    {
-        private readonly object _dummy;
-        public Microsoft.AspNetCore.Components.RenderTree.ArrayRange<int> DisposedComponentIDs { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-        public Microsoft.AspNetCore.Components.RenderTree.ArrayRange<ulong> DisposedEventHandlerIDs { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-        public Microsoft.AspNetCore.Components.RenderTree.ArrayRange<Microsoft.AspNetCore.Components.RenderTree.RenderTreeFrame> ReferenceFrames { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-        public Microsoft.AspNetCore.Components.RenderTree.ArrayRange<Microsoft.AspNetCore.Components.RenderTree.RenderTreeDiff> UpdatedComponents { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-    }
-    public abstract partial class Renderer : System.IDisposable
-    {
-        public Renderer(System.IServiceProvider serviceProvider, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { }
-        public abstract Microsoft.AspNetCore.Components.Dispatcher Dispatcher { get; }
-        public event System.UnhandledExceptionEventHandler UnhandledSynchronizationException { add { } remove { } }
-        protected internal int AssignRootComponentId(Microsoft.AspNetCore.Components.IComponent component) { throw null; }
-        public virtual System.Threading.Tasks.Task DispatchEventAsync(ulong eventHandlerId, Microsoft.AspNetCore.Components.Rendering.EventFieldInfo fieldInfo, System.EventArgs eventArgs) { throw null; }
-        public void Dispose() { }
-        protected virtual void Dispose(bool disposing) { }
-        protected Microsoft.AspNetCore.Components.RenderTree.ArrayRange<Microsoft.AspNetCore.Components.RenderTree.RenderTreeFrame> GetCurrentRenderTreeFrames(int componentId) { throw null; }
-        protected abstract void HandleException(System.Exception exception);
-        protected Microsoft.AspNetCore.Components.IComponent InstantiateComponent(System.Type componentType) { throw null; }
-        protected virtual void ProcessPendingRender() { }
-        protected System.Threading.Tasks.Task RenderRootComponentAsync(int componentId) { throw null; }
-        [System.Diagnostics.DebuggerStepThroughAttribute]
-        protected System.Threading.Tasks.Task RenderRootComponentAsync(int componentId, Microsoft.AspNetCore.Components.ParameterView initialParameters) { throw null; }
-        protected abstract System.Threading.Tasks.Task UpdateDisplayAsync(in Microsoft.AspNetCore.Components.Rendering.RenderBatch renderBatch);
-    }
     public sealed partial class RenderTreeBuilder : System.IDisposable
     {
         public RenderTreeBuilder() { }
@@ -448,6 +433,39 @@ namespace Microsoft.AspNetCore.Components.RenderTree
         public ArrayRange(T[] array, int count) { throw null; }
         public Microsoft.AspNetCore.Components.RenderTree.ArrayRange<T> Clone() { throw null; }
     }
+    public partial class EventFieldInfo
+    {
+        public EventFieldInfo() { }
+        public int ComponentId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public object FieldValue { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
+    public readonly partial struct RenderBatch
+    {
+        private readonly object _dummy;
+        public Microsoft.AspNetCore.Components.RenderTree.ArrayRange<int> DisposedComponentIDs { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public Microsoft.AspNetCore.Components.RenderTree.ArrayRange<ulong> DisposedEventHandlerIDs { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public Microsoft.AspNetCore.Components.RenderTree.ArrayRange<Microsoft.AspNetCore.Components.RenderTree.RenderTreeFrame> ReferenceFrames { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public Microsoft.AspNetCore.Components.RenderTree.ArrayRange<Microsoft.AspNetCore.Components.RenderTree.RenderTreeDiff> UpdatedComponents { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+    }
+    public abstract partial class Renderer : System.IDisposable
+    {
+        public Renderer(System.IServiceProvider serviceProvider, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { }
+        public abstract Microsoft.AspNetCore.Components.Dispatcher Dispatcher { get; }
+        public event System.UnhandledExceptionEventHandler UnhandledSynchronizationException { add { } remove { } }
+        protected internal int AssignRootComponentId(Microsoft.AspNetCore.Components.IComponent component) { throw null; }
+        public virtual System.Threading.Tasks.Task DispatchEventAsync(ulong eventHandlerId, Microsoft.AspNetCore.Components.RenderTree.EventFieldInfo fieldInfo, System.EventArgs eventArgs) { throw null; }
+        public void Dispose() { }
+        protected virtual void Dispose(bool disposing) { }
+        protected Microsoft.AspNetCore.Components.RenderTree.ArrayRange<Microsoft.AspNetCore.Components.RenderTree.RenderTreeFrame> GetCurrentRenderTreeFrames(int componentId) { throw null; }
+        protected abstract void HandleException(System.Exception exception);
+        protected Microsoft.AspNetCore.Components.IComponent InstantiateComponent(System.Type componentType) { throw null; }
+        protected virtual void ProcessPendingRender() { }
+        protected System.Threading.Tasks.Task RenderRootComponentAsync(int componentId) { throw null; }
+        [System.Diagnostics.DebuggerStepThroughAttribute]
+        protected System.Threading.Tasks.Task RenderRootComponentAsync(int componentId, Microsoft.AspNetCore.Components.ParameterView initialParameters) { throw null; }
+        protected abstract System.Threading.Tasks.Task UpdateDisplayAsync(in Microsoft.AspNetCore.Components.RenderTree.RenderBatch renderBatch);
+    }
     [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
     public readonly partial struct RenderTreeDiff
     {
@@ -514,6 +532,8 @@ namespace Microsoft.AspNetCore.Components.Routing
     {
         public Router() { }
         [Microsoft.AspNetCore.Components.ParameterAttribute]
+        public System.Collections.Generic.IEnumerable<System.Reflection.Assembly> AdditionalAssemblies { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        [Microsoft.AspNetCore.Components.ParameterAttribute]
         public System.Reflection.Assembly AppAssembly { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
         [Microsoft.AspNetCore.Components.ParameterAttribute]
         public Microsoft.AspNetCore.Components.RenderFragment<Microsoft.AspNetCore.Components.RouteData> Found { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
diff --git a/src/Components/Web/src/BindElementAttribute.cs b/src/Components/Components/src/BindElementAttribute.cs
similarity index 100%
rename from src/Components/Web/src/BindElementAttribute.cs
rename to src/Components/Components/src/BindElementAttribute.cs
diff --git a/src/Components/Components/src/Dispatcher.cs b/src/Components/Components/src/Dispatcher.cs
index 908daba4cc..88ba020813 100644
--- a/src/Components/Components/src/Dispatcher.cs
+++ b/src/Components/Components/src/Dispatcher.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components.Rendering;
+using Microsoft.AspNetCore.Components.RenderTree;
 
 namespace Microsoft.AspNetCore.Components
 {
diff --git a/src/Components/Components/src/ElementReference.cs b/src/Components/Components/src/ElementReference.cs
index 92affa1249..e25c673be7 100644
--- a/src/Components/Components/src/ElementReference.cs
+++ b/src/Components/Components/src/ElementReference.cs
@@ -3,8 +3,6 @@
 
 using System;
 using System.Globalization;
-using System.Text.Json;
-using System.Text.Json.Serialization;
 using System.Threading;
 
 namespace Microsoft.AspNetCore.Components
@@ -12,7 +10,6 @@ namespace Microsoft.AspNetCore.Components
     /// <summary>
     /// Represents a reference to a rendered element.
     /// </summary>
-    [JsonConverter(typeof(ElementReferenceConverter))]
     public readonly struct ElementReference
     {
         private static long _nextIdForWebAssemblyOnly = 1;
@@ -24,9 +21,9 @@ namespace Microsoft.AspNetCore.Components
         /// The Id is unique at least within the scope of a given user/circuit.
         /// This property is public to support Json serialization and should not be used by user code.
         /// </remarks>
-        internal string Id { get; }
+        public string Id { get; }
 
-        private ElementReference(string id)
+        public ElementReference(string id)
         {
             Id = id;
         }
@@ -54,48 +51,5 @@ namespace Microsoft.AspNetCore.Components
                 return Guid.NewGuid().ToString("D", CultureInfo.InvariantCulture);
             }
         }
-
-        private sealed class ElementReferenceConverter : JsonConverter<ElementReference>
-        {
-            private static readonly JsonEncodedText IdProperty = JsonEncodedText.Encode("__internalId");
-
-            public override ElementReference Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-            {
-                string id = null;
-                while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
-                {
-                    if (reader.TokenType == JsonTokenType.PropertyName)
-                    {
-                        if (reader.ValueTextEquals(IdProperty.EncodedUtf8Bytes))
-                        {
-                            reader.Read();
-                            id = reader.GetString();
-                        }
-                        else
-                        {
-                            throw new JsonException($"Unexpected JSON property '{reader.GetString()}'.");
-                        }
-                    }
-                    else
-                    {
-                        throw new JsonException($"Unexcepted JSON Token {reader.TokenType}.");
-                    }
-                }
-
-                if (id is null)
-                {
-                    throw new JsonException("__internalId is required.");
-                }
-
-                return new ElementReference(id);
-            }
-
-            public override void Write(Utf8JsonWriter writer, ElementReference value, JsonSerializerOptions options)
-            {
-                writer.WriteStartObject();
-                writer.WriteString(IdProperty, value.Id);
-                writer.WriteEndObject();
-            }
-        }
     }
 }
diff --git a/src/Components/Web/src/EventHandlerAttribute.cs b/src/Components/Components/src/EventHandlerAttribute.cs
similarity index 100%
rename from src/Components/Web/src/EventHandlerAttribute.cs
rename to src/Components/Components/src/EventHandlerAttribute.cs
diff --git a/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj b/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj
index 837116e584..bdbe946125 100644
--- a/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj
+++ b/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
@@ -10,14 +10,17 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\..\Shared\src\JsonSerializerOptionsProvider.cs" />
     <Compile Include="$(ComponentsSharedSourceRoot)src\ArrayBuilder.cs" LinkBase="RenderTree" />
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="Microsoft.JSInterop" />
     <Reference Include="Microsoft.Extensions.Logging.Abstractions" />
     <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
+    <Reference Include="Microsoft.Extensions.HashCodeCombiner.Sources" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
+    <Reference Include="System.Buffers" />
   </ItemGroup>
 
   <Target Name="_GetNuspecDependencyPackageVersions">
diff --git a/src/Components/Components/src/Reflection/ComponentProperties.cs b/src/Components/Components/src/Reflection/ComponentProperties.cs
index 04f2f8d0c1..0b85a66a84 100644
--- a/src/Components/Components/src/Reflection/ComponentProperties.cs
+++ b/src/Components/Components/src/Reflection/ComponentProperties.cs
@@ -238,9 +238,15 @@ namespace Microsoft.AspNetCore.Components.Reflection
                         continue;
                     }
 
+                    var propertyName = propertyInfo.Name;
+                    if (parameterAttribute != null && (propertyInfo.SetMethod == null || !propertyInfo.SetMethod.IsPublic))
+                    {
+                        throw new InvalidOperationException(
+                            $"The type '{targetType.FullName}' declares a parameter matching the name '{propertyName}' that is not public. Parameters must be public.");
+                    }
+
                     var propertySetter = MemberAssignment.CreatePropertySetter(targetType, propertyInfo, cascading: cascadingParameterAttribute != null);
 
-                    var propertyName = propertyInfo.Name;
                     if (WritersByName.ContainsKey(propertyName))
                     {
                         throw new InvalidOperationException(
diff --git a/src/Components/Components/src/Reflection/MemberAssignment.cs b/src/Components/Components/src/Reflection/MemberAssignment.cs
index b59d7d2ed7..ab0cf6b1e7 100644
--- a/src/Components/Components/src/Reflection/MemberAssignment.cs
+++ b/src/Components/Components/src/Reflection/MemberAssignment.cs
@@ -13,17 +13,34 @@ namespace Microsoft.AspNetCore.Components.Reflection
         public static IEnumerable<PropertyInfo> GetPropertiesIncludingInherited(
             Type type, BindingFlags bindingFlags)
         {
+            var dictionary = new Dictionary<string, List<PropertyInfo>>();
+
             while (type != null)
             {
                 var properties = type.GetProperties(bindingFlags)
                     .Where(prop => prop.DeclaringType == type);
                 foreach (var property in properties)
                 {
-                    yield return property;
+                    if (!dictionary.TryGetValue(property.Name, out var others))
+                    {
+                        others = new List<PropertyInfo>();
+                        dictionary.Add(property.Name, others);
+                    }
+
+                    if (others.Any(other => other.GetMethod?.GetBaseDefinition() == property.GetMethod?.GetBaseDefinition()))
+                    {
+                        // This is an inheritance case. We can safely ignore the value of property since
+                        // we have seen a more derived value.
+                        continue;
+                    }
+
+                    others.Add(property);
                 }
 
                 type = type.BaseType;
             }
+
+            return dictionary.Values.SelectMany(p => p);
         }
 
         public static IPropertySetter CreatePropertySetter(Type targetType, PropertyInfo property, bool cascading)
diff --git a/src/Components/Components/src/RenderHandle.cs b/src/Components/Components/src/RenderHandle.cs
index dc383a38f2..fb646feeee 100644
--- a/src/Components/Components/src/RenderHandle.cs
+++ b/src/Components/Components/src/RenderHandle.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNetCore.Components.Rendering;
+using Microsoft.AspNetCore.Components.RenderTree;
 
 namespace Microsoft.AspNetCore.Components
 {
diff --git a/src/Components/Components/src/Rendering/EventFieldInfo.cs b/src/Components/Components/src/RenderTree/EventFieldInfo.cs
similarity index 52%
rename from src/Components/Components/src/Rendering/EventFieldInfo.cs
rename to src/Components/Components/src/RenderTree/EventFieldInfo.cs
index 391844405f..129057ff73 100644
--- a/src/Components/Components/src/Rendering/EventFieldInfo.cs
+++ b/src/Components/Components/src/RenderTree/EventFieldInfo.cs
@@ -1,13 +1,16 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNetCore.Components.Rendering
+namespace Microsoft.AspNetCore.Components.RenderTree
 {
     /// <summary>
-    /// Information supplied with an event notification that can be used to update an existing
-    /// render tree to match the latest UI state when a form field has mutated. To determine
-    /// which field has been mutated, the renderer matches it based on the event handler ID.
+    /// Types in the Microsoft.AspNetCore.Components.RenderTree are not recommended for use outside
+    /// of the Blazor framework. These types will change in a future release.
     /// </summary>
+    // 
+    // Information supplied with an event notification that can be used to update an existing
+    // render tree to match the latest UI state when a form field has mutated. To determine
+    // which field has been mutated, the renderer matches it based on the event handler ID.
     public class EventFieldInfo
     {
         /// <summary>
diff --git a/src/Components/Components/src/Rendering/RenderBatch.cs b/src/Components/Components/src/RenderTree/RenderBatch.cs
similarity index 85%
rename from src/Components/Components/src/Rendering/RenderBatch.cs
rename to src/Components/Components/src/RenderTree/RenderBatch.cs
index e4e0d6cb4f..092c6ec378 100644
--- a/src/Components/Components/src/Rendering/RenderBatch.cs
+++ b/src/Components/Components/src/RenderTree/RenderBatch.cs
@@ -1,13 +1,14 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNetCore.Components.RenderTree;
-
-namespace Microsoft.AspNetCore.Components.Rendering
+namespace Microsoft.AspNetCore.Components.RenderTree
 {
     /// <summary>
-    /// Describes a set of UI changes.
+    /// Types in the Microsoft.AspNetCore.Components.RenderTree are not recommended for use outside
+    /// of the Blazor framework. These types will change in a future release.
     /// </summary>
+    //
+    // Describes a set of UI changes.
     public readonly struct RenderBatch
     {
         /// <summary>
diff --git a/src/Components/Components/src/Rendering/Renderer.Log.cs b/src/Components/Components/src/RenderTree/Renderer.Log.cs
similarity index 97%
rename from src/Components/Components/src/Rendering/Renderer.Log.cs
rename to src/Components/Components/src/RenderTree/Renderer.Log.cs
index bd65809632..9362ecf4f5 100644
--- a/src/Components/Components/src/Rendering/Renderer.Log.cs
+++ b/src/Components/Components/src/RenderTree/Renderer.Log.cs
@@ -2,9 +2,10 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using Microsoft.AspNetCore.Components.Rendering;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.AspNetCore.Components.Rendering
+namespace Microsoft.AspNetCore.Components.RenderTree
 {
     public abstract partial class Renderer
     {
diff --git a/src/Components/Components/src/Rendering/Renderer.cs b/src/Components/Components/src/RenderTree/Renderer.cs
similarity index 98%
rename from src/Components/Components/src/Rendering/Renderer.cs
rename to src/Components/Components/src/RenderTree/Renderer.cs
index 3acaccd2ed..05cfb41abe 100644
--- a/src/Components/Components/src/Rendering/Renderer.cs
+++ b/src/Components/Components/src/RenderTree/Renderer.cs
@@ -6,15 +6,18 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Components.RenderTree;
+using Microsoft.AspNetCore.Components.Rendering;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.AspNetCore.Components.Rendering
+namespace Microsoft.AspNetCore.Components.RenderTree
 {
     /// <summary>
-    /// Provides mechanisms for rendering hierarchies of <see cref="IComponent"/> instances,
-    /// dispatching events to them, and notifying when the user interface is being updated.
+    /// Types in the Microsoft.AspNetCore.Components.RenderTree are not recommended for use outside
+    /// of the Blazor framework. These types will change in a future release.
     /// </summary>
+    //
+    // Provides mechanisms for rendering hierarchies of <see cref="IComponent"/> instances,
+    // dispatching events to them, and notifying when the user interface is being updated.
     public abstract partial class Renderer : IDisposable
     {
         private readonly IServiceProvider _serviceProvider;
diff --git a/src/Components/Components/src/Routing/RouteEntry.cs b/src/Components/Components/src/Routing/RouteEntry.cs
index 3870ef2245..d2bca6d2a7 100644
--- a/src/Components/Components/src/Routing/RouteEntry.cs
+++ b/src/Components/Components/src/Routing/RouteEntry.cs
@@ -3,9 +3,11 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 
 namespace Microsoft.AspNetCore.Components.Routing
 {
+    [DebuggerDisplay("Handler = {Handler}, Template = {Template}")]
     internal class RouteEntry
     {
         public RouteEntry(RouteTemplate template, Type handler, string[] unusedRouteParameterNames)
diff --git a/src/Components/Components/src/Routing/RouteTableFactory.cs b/src/Components/Components/src/Routing/RouteTableFactory.cs
index e0601bc95a..de6fe31c1d 100644
--- a/src/Components/Components/src/Routing/RouteTableFactory.cs
+++ b/src/Components/Components/src/Routing/RouteTableFactory.cs
@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using Microsoft.AspNetCore.Components.Routing;
+using Microsoft.Extensions.Internal;
 
 namespace Microsoft.AspNetCore.Components
 {
@@ -15,20 +16,21 @@ namespace Microsoft.AspNetCore.Components
     /// </summary>
     internal static class RouteTableFactory
     {
-        private static readonly ConcurrentDictionary<Assembly, RouteTable> Cache =
-            new ConcurrentDictionary<Assembly, RouteTable>();
+        private static readonly ConcurrentDictionary<Key, RouteTable> Cache =
+            new ConcurrentDictionary<Key, RouteTable>();
         public static readonly IComparer<RouteEntry> RoutePrecedence = Comparer<RouteEntry>.Create(RouteComparison);
 
-        public static RouteTable Create(Assembly appAssembly)
+        public static RouteTable Create(IEnumerable<Assembly> assemblies)
         {
-            if (Cache.TryGetValue(appAssembly, out var resolvedComponents))
+            var key = new Key(assemblies.OrderBy(a => a.FullName).ToArray());
+            if (Cache.TryGetValue(key, out var resolvedComponents))
             {
                 return resolvedComponents;
             }
 
-            var componentTypes = appAssembly.ExportedTypes.Where(t => typeof(IComponent).IsAssignableFrom(t));
+            var componentTypes = key.Assemblies.SelectMany(a => a.ExportedTypes.Where(t => typeof(IComponent).IsAssignableFrom(t)));
             var routeTable = Create(componentTypes);
-            Cache.TryAdd(appAssembly, routeTable);
+            Cache.TryAdd(key, routeTable);
             return routeTable;
         }
 
@@ -112,6 +114,11 @@ namespace Microsoft.AspNetCore.Components
         /// </summary>
         internal static int RouteComparison(RouteEntry x, RouteEntry y)
         {
+            if (ReferenceEquals(x, y))
+            {
+                return 0;
+            }
+
             var xTemplate = x.Template;
             var yTemplate = y.Template;
             if (xTemplate.Segments.Length != y.Template.Segments.Length)
@@ -160,5 +167,61 @@ namespace Microsoft.AspNetCore.Components
 ");
             }
         }
+
+        private readonly struct Key : IEquatable<Key>
+        {
+            public readonly Assembly[] Assemblies;
+
+            public Key(Assembly[] assemblies)
+            {
+                Assemblies = assemblies;
+            }
+
+            public override bool Equals(object obj)
+            {
+                return obj is Key other ? base.Equals(other) : false;
+            }
+
+            public bool Equals(Key other)
+            {
+                if (Assemblies == null && other.Assemblies == null)
+                {
+                    return true;
+                }
+                else if (Assemblies == null ^ other.Assemblies == null)
+                {
+                    return false;
+                }
+                else if (Assemblies.Length != other.Assemblies.Length)
+                {
+                    return false;
+                }
+
+                for (var i = 0; i < Assemblies.Length; i++)
+                {
+                    if (!Assemblies[i].Equals(other.Assemblies[i]))
+                    {
+                        return false;
+                    }
+                }
+
+                return true;
+            }
+
+            public override int GetHashCode()
+            {
+                var hash = new HashCodeCombiner();
+
+                if (Assemblies != null)
+                {
+                    for (var i = 0; i < Assemblies.Length; i++)
+                    {
+                        hash.Add(Assemblies[i]);
+                    }
+                }
+
+                return hash;
+            }
+        }
     }
 }
diff --git a/src/Components/Components/src/Routing/RouteTemplate.cs b/src/Components/Components/src/Routing/RouteTemplate.cs
index bb59be07ee..a79f0f911a 100644
--- a/src/Components/Components/src/Routing/RouteTemplate.cs
+++ b/src/Components/Components/src/Routing/RouteTemplate.cs
@@ -2,8 +2,11 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 
+using System.Diagnostics;
+
 namespace Microsoft.AspNetCore.Components.Routing
 {
+    [DebuggerDisplay("{TemplateText}")]
     internal class RouteTemplate
     {
         public RouteTemplate(string templateText, TemplateSegment[] segments)
diff --git a/src/Components/Components/src/Routing/Router.cs b/src/Components/Components/src/Routing/Router.cs
index ef34a47957..b93db4b6ac 100644
--- a/src/Components/Components/src/Routing/Router.cs
+++ b/src/Components/Components/src/Routing/Router.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components.Rendering;
@@ -37,6 +38,12 @@ namespace Microsoft.AspNetCore.Components.Routing
         /// </summary>
         [Parameter] public Assembly AppAssembly { get; set; }
 
+        /// <summary>
+        /// Gets or sets a collection of additional assemblies that should be searched for components
+        /// that can match URIs.
+        /// </summary>
+        [Parameter] public IEnumerable<Assembly> AdditionalAssemblies { get; set; }
+
         /// <summary>
         /// Gets or sets the content to display when no match is found for the requested route.
         /// </summary>
@@ -64,6 +71,11 @@ namespace Microsoft.AspNetCore.Components.Routing
         {
             parameters.SetParameterProperties(this);
 
+            if (AppAssembly == null)
+            {
+                throw new InvalidOperationException($"The {nameof(Router)} component requires a value for the parameter {nameof(AppAssembly)}.");
+            }
+
             // Found content is mandatory, because even though we could use something like <RouteView ...> as a
             // reasonable default, if it's not declared explicitly in the template then people will have no way
             // to discover how to customize this (e.g., to add authorization).
@@ -79,7 +91,9 @@ namespace Microsoft.AspNetCore.Components.Routing
                 throw new InvalidOperationException($"The {nameof(Router)} component requires a value for the parameter {nameof(NotFound)}.");
             }
 
-            Routes = RouteTableFactory.Create(AppAssembly);
+
+            var assemblies = AdditionalAssemblies == null ? new[] { AppAssembly } : new[] { AppAssembly }.Concat(AdditionalAssemblies);
+            Routes = RouteTableFactory.Create(assemblies);
             Refresh(isNavigationIntercepted: false);
             return Task.CompletedTask;
         }
diff --git a/src/Components/Components/test/ParameterViewTest.Assignment.cs b/src/Components/Components/test/ParameterViewTest.Assignment.cs
index bf2f38af5a..9f677ef50a 100644
--- a/src/Components/Components/test/ParameterViewTest.Assignment.cs
+++ b/src/Components/Components/test/ParameterViewTest.Assignment.cs
@@ -6,7 +6,6 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNetCore.Components.Rendering;
-using Microsoft.AspNetCore.Components.RenderTree;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Components
@@ -71,6 +70,24 @@ namespace Microsoft.AspNetCore.Components
             Assert.Equal(456, target.DerivedClassIntProp);
         }
 
+        [Fact]
+        public void IncomingParameterMatchesOverridenParameter_ThatDoesNotHasAttribute()
+        {
+            // Test for https://github.com/aspnet/AspNetCore/issues/13162
+            // Arrange
+            var parameters = new ParameterViewBuilder
+            {
+                { nameof(DerivedType.VirtualProp), 123 },
+            }.Build();
+            var target = new DerivedType();
+
+            // Act
+            parameters.SetParameterProperties(target);
+
+            // Assert
+            Assert.Equal(123, target.VirtualProp);
+        }
+
         [Fact]
         public void NoIncomingParameterMatchesDeclaredParameter_LeavesValueUnchanged()
         {
@@ -172,6 +189,43 @@ namespace Microsoft.AspNetCore.Components
                 ex.Message);
         }
 
+        [Fact]
+        public void IncomingParameterMatchesPropertyNotPublic_Throws()
+        {
+            // Arrange
+            var target = new HasNonPublicPropertyWithParameterAttribute();
+            var parameters = new ParameterViewBuilder
+            {
+                { nameof(HasNonPublicPropertyWithParameterAttribute.IntProp), 123 },
+            }.Build();
+
+            // Act
+            var ex = Assert.Throws<InvalidOperationException>(
+                () => parameters.SetParameterProperties(target));
+
+            // Assert
+            Assert.Equal(default, target.IntProp);
+            Assert.Equal(
+                $"The type '{typeof(HasNonPublicPropertyWithParameterAttribute).FullName}' declares a parameter matching the name '{nameof(HasNonPublicPropertyWithParameterAttribute.IntProp)}' that is not public. Parameters must be public.",
+                ex.Message);
+        }
+
+        [Fact]
+        public void IncomingCascadingParameterMatchesPropertyNotPublic_Works()
+        {
+            // Arrange
+            var target = new HasNonPublicCascadingParameter();
+            var builder = new ParameterViewBuilder();
+            builder.Add("Cascading", "Test", cascading: true);
+            var parameters = builder.Build();
+
+            // Act
+            parameters.SetParameterProperties(target);
+
+            // Assert
+            Assert.Equal("Test", target.GetCascadingValue());
+        }
+
         [Fact]
         public void IncomingNonCascadingValueMatchesCascadingParameter_Throws()
         {
@@ -497,13 +551,9 @@ namespace Microsoft.AspNetCore.Components
 
         class HasInstanceProperties
         {
-            // "internal" to show we're not requiring public accessors, but also
-            // to keep the assertions simple in the tests
-
             [Parameter] public int IntProp { get; set; }
             [Parameter] public string StringProp { get; set; }
 
-            // Also a truly private one to show there's nothing special about 'internal'
             [Parameter] public object ObjectProp { get; set; }
 
             public static string ObjectPropName => nameof(ObjectProp);
@@ -521,6 +571,12 @@ namespace Microsoft.AspNetCore.Components
 
         class HasPropertyWithoutParameterAttribute
         {
+            public int IntProp { get; set; }
+        }
+
+        class HasNonPublicPropertyWithParameterAttribute
+        {
+            [Parameter]
             internal int IntProp { get; set; }
         }
 
@@ -539,6 +595,16 @@ namespace Microsoft.AspNetCore.Components
             [Parameter] public int DerivedClassIntProp { get; set; }
         }
 
+        class BaseType
+        {
+            [Parameter] public virtual int VirtualProp { get; set; }
+        }
+
+        class DerivedType : BaseType
+        {
+            public override int VirtualProp { get; set; }
+        }
+
         class HasParametersVaryingOnlyByCase
         {
             [Parameter] public object MyValue { get; set; }
@@ -575,6 +641,13 @@ namespace Microsoft.AspNetCore.Components
             [Parameter(CaptureUnmatchedValues = true)] public KeyValuePair<string, object>[] CaptureUnmatchedValuesProp { get; set; }
         }
 
+        class HasNonPublicCascadingParameter
+        {
+            [CascadingParameter] private string Cascading { get; set; }
+
+            public string GetCascadingValue() => Cascading;
+        }
+
         class ParameterViewBuilder : IEnumerable
         {
             private readonly List<(string Name, object Value, bool Cascading)> _keyValuePairs
diff --git a/src/Components/Components/test/RenderTreeDiffBuilderTest.cs b/src/Components/Components/test/RenderTreeDiffBuilderTest.cs
index 503d45155f..28f617eba2 100644
--- a/src/Components/Components/test/RenderTreeDiffBuilderTest.cs
+++ b/src/Components/Components/test/RenderTreeDiffBuilderTest.cs
@@ -2231,7 +2231,7 @@ namespace Microsoft.AspNetCore.Components.Test
             public object ObjectProperty { get; set; }
 
             [Parameter]
-            public string ReadonlyProperty { get; private set; }
+            public string ReadonlyProperty { get; set; }
 
             [Parameter]
             public string PrivateProperty { get; set; }
diff --git a/src/Components/Components/test/RendererTest.cs b/src/Components/Components/test/RendererTest.cs
index 71ebf86351..a48cda6939 100644
--- a/src/Components/Components/test/RendererTest.cs
+++ b/src/Components/Components/test/RendererTest.cs
@@ -13,7 +13,6 @@ using Microsoft.AspNetCore.Components.Rendering;
 using Microsoft.AspNetCore.Components.RenderTree;
 using Microsoft.AspNetCore.Components.Test.Helpers;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Logging.Abstractions;
 using Xunit;
 
@@ -3791,10 +3790,10 @@ namespace Microsoft.AspNetCore.Components.Test
         private class FakeComponent : IComponent
         {
             [Parameter]
-            public int IntProperty { get; private set; }
+            public int IntProperty { get; set; }
 
             [Parameter]
-            public string StringProperty { get; private set; }
+            public string StringProperty { get; set; }
 
             [Parameter]
             public object ObjectProperty { get; set; }
@@ -3927,7 +3926,7 @@ namespace Microsoft.AspNetCore.Components.Test
         private class ReRendersParentComponent : AutoRenderComponent
         {
             [Parameter]
-            public TestComponent Parent { get; private set; }
+            public TestComponent Parent { get; set; }
 
             private bool _isFirstTime = true;
 
@@ -4057,7 +4056,7 @@ namespace Microsoft.AspNetCore.Components.Test
             public bool Disposed { get; private set; }
 
             [Parameter]
-            public Action DisposeAction { get; private set; }
+            public Action DisposeAction { get; set; }
 
             public void Dispose()
             {
diff --git a/src/Components/Components/test/Routing/RouteTableFactoryTests.cs b/src/Components/Components/test/Routing/RouteTableFactoryTests.cs
index 8250fab16b..92bea90d79 100644
--- a/src/Components/Components/test/Routing/RouteTableFactoryTests.cs
+++ b/src/Components/Components/test/Routing/RouteTableFactoryTests.cs
@@ -11,6 +11,45 @@ namespace Microsoft.AspNetCore.Components.Test.Routing
 {
     public class RouteTableFactoryTests
     {
+        [Fact]
+        public void CanCacheRouteTable()
+        {
+            // Arrange
+            var routes1 = RouteTableFactory.Create(new[] { GetType().Assembly, });
+
+            // Act
+            var routes2 = RouteTableFactory.Create(new[] { GetType().Assembly, });
+
+            // Assert
+            Assert.Same(routes1, routes2);
+        }
+
+        [Fact]
+        public void CanCacheRouteTableWithDifferentAssembliesAndOrder()
+        {
+            // Arrange
+            var routes1 = RouteTableFactory.Create(new[] { typeof(object).Assembly, GetType().Assembly, });
+
+            // Act
+            var routes2 = RouteTableFactory.Create(new[] { GetType().Assembly, typeof(object).Assembly, });
+
+            // Assert
+            Assert.Same(routes1, routes2);
+        }
+
+        [Fact]
+        public void DoesNotCacheRouteTableForDifferentAssemblies()
+        {
+            // Arrange
+            var routes1 = RouteTableFactory.Create(new[] { GetType().Assembly, });
+
+            // Act
+            var routes2 = RouteTableFactory.Create(new[] { GetType().Assembly, typeof(object).Assembly, });
+
+            // Assert
+            Assert.NotSame(routes1, routes2);
+        }
+
         [Fact]
         public void CanDiscoverRoute()
         {
@@ -327,6 +366,41 @@ namespace Microsoft.AspNetCore.Components.Test.Routing
             Assert.Equal("a/brilliant", routeTable.Routes[0].Template.TemplateText);
         }
 
+        [Fact]
+        public void DoesNotThrowIfStableSortComparesRouteWithItself()
+        {
+            // Test for https://github.com/aspnet/AspNetCore/issues/13313
+            // Arrange & Act
+            var builder = new TestRouteTableBuilder();
+            builder.AddRoute("r16");
+            builder.AddRoute("r05");
+            builder.AddRoute("r09");
+            builder.AddRoute("r00");
+            builder.AddRoute("r13");
+            builder.AddRoute("r02");
+            builder.AddRoute("r03");
+            builder.AddRoute("r10");
+            builder.AddRoute("r15");
+            builder.AddRoute("r14");
+            builder.AddRoute("r12");
+            builder.AddRoute("r07");
+            builder.AddRoute("r11");
+            builder.AddRoute("r08");
+            builder.AddRoute("r06");
+            builder.AddRoute("r04");
+            builder.AddRoute("r01");
+
+            var routeTable = builder.Build();
+
+            // Act
+            Assert.Equal(17, routeTable.Routes.Length);
+            for (var i = 0; i < 17; i++)
+            {
+                var templateText = "r" + i.ToString().PadLeft(2, '0');
+                Assert.Equal(templateText, routeTable.Routes[i].Template.TemplateText);
+            }
+        }
+
         [Theory]
         [InlineData("/literal", "/Literal/")]
         [InlineData("/{parameter}", "/{parameter}/")]
diff --git a/src/Components/Server/ref/Microsoft.AspNetCore.Components.Server.csproj b/src/Components/Server/ref/Microsoft.AspNetCore.Components.Server.csproj
index 95ae38cbad..838eac284a 100644
--- a/src/Components/Server/ref/Microsoft.AspNetCore.Components.Server.csproj
+++ b/src/Components/Server/ref/Microsoft.AspNetCore.Components.Server.csproj
@@ -7,7 +7,7 @@
     <Compile Include="Microsoft.AspNetCore.Components.Server.netcoreapp.cs" />
     <Reference Include="Microsoft.AspNetCore.Components.Authorization"  />
     <Reference Include="Microsoft.AspNetCore.Components.Web"  />
-    <Reference Include="Microsoft.AspNetCore.DataProtection"  />
+    <Reference Include="Microsoft.AspNetCore.DataProtection.Extensions"  />
     <Reference Include="Microsoft.AspNetCore.SignalR"  />
     <Reference Include="Microsoft.AspNetCore.StaticFiles"  />
     <Reference Include="Microsoft.Extensions.Caching.Memory"  />
diff --git a/src/Components/Server/ref/Microsoft.AspNetCore.Components.Server.netcoreapp.cs b/src/Components/Server/ref/Microsoft.AspNetCore.Components.Server.netcoreapp.cs
index 6227f945a3..b9cfbda974 100644
--- a/src/Components/Server/ref/Microsoft.AspNetCore.Components.Server.netcoreapp.cs
+++ b/src/Components/Server/ref/Microsoft.AspNetCore.Components.Server.netcoreapp.cs
@@ -8,20 +8,12 @@ namespace Microsoft.AspNetCore.Builder
         internal ComponentEndpointConventionBuilder() { }
         public void Add(System.Action<Microsoft.AspNetCore.Builder.EndpointBuilder> convention) { }
     }
-    public static partial class ComponentEndpointConventionBuilderExtensions
-    {
-        public static Microsoft.AspNetCore.Builder.ComponentEndpointConventionBuilder AddComponent(this Microsoft.AspNetCore.Builder.ComponentEndpointConventionBuilder builder, System.Type componentType, string selector) { throw null; }
-    }
     public static partial class ComponentEndpointRouteBuilderExtensions
     {
-        public static Microsoft.AspNetCore.Builder.ComponentEndpointConventionBuilder MapBlazorHub(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder endpoints, System.Type type, string selector) { throw null; }
-        public static Microsoft.AspNetCore.Builder.ComponentEndpointConventionBuilder MapBlazorHub(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder endpoints, System.Type type, string selector, System.Action<Microsoft.AspNetCore.Http.Connections.HttpConnectionDispatcherOptions> configureOptions) { throw null; }
-        public static Microsoft.AspNetCore.Builder.ComponentEndpointConventionBuilder MapBlazorHub(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder endpoints, System.Type componentType, string selector, string path) { throw null; }
-        public static Microsoft.AspNetCore.Builder.ComponentEndpointConventionBuilder MapBlazorHub(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder endpoints, System.Type componentType, string selector, string path, System.Action<Microsoft.AspNetCore.Http.Connections.HttpConnectionDispatcherOptions> configureOptions) { throw null; }
-        public static Microsoft.AspNetCore.Builder.ComponentEndpointConventionBuilder MapBlazorHub<TComponent>(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder endpoints, string selector) where TComponent : Microsoft.AspNetCore.Components.IComponent { throw null; }
-        public static Microsoft.AspNetCore.Builder.ComponentEndpointConventionBuilder MapBlazorHub<TComponent>(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder endpoints, string selector, System.Action<Microsoft.AspNetCore.Http.Connections.HttpConnectionDispatcherOptions> configureOptions) where TComponent : Microsoft.AspNetCore.Components.IComponent { throw null; }
-        public static Microsoft.AspNetCore.Builder.ComponentEndpointConventionBuilder MapBlazorHub<TComponent>(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder endpoints, string selector, string path) where TComponent : Microsoft.AspNetCore.Components.IComponent { throw null; }
-        public static Microsoft.AspNetCore.Builder.ComponentEndpointConventionBuilder MapBlazorHub<TComponent>(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder endpoints, string selector, string path, System.Action<Microsoft.AspNetCore.Http.Connections.HttpConnectionDispatcherOptions> configureOptions) where TComponent : Microsoft.AspNetCore.Components.IComponent { throw null; }
+        public static Microsoft.AspNetCore.Builder.ComponentEndpointConventionBuilder MapBlazorHub(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder endpoints) { throw null; }
+        public static Microsoft.AspNetCore.Builder.ComponentEndpointConventionBuilder MapBlazorHub(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder endpoints, System.Action<Microsoft.AspNetCore.Http.Connections.HttpConnectionDispatcherOptions> configureOptions) { throw null; }
+        public static Microsoft.AspNetCore.Builder.ComponentEndpointConventionBuilder MapBlazorHub(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder endpoints, string path) { throw null; }
+        public static Microsoft.AspNetCore.Builder.ComponentEndpointConventionBuilder MapBlazorHub(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder endpoints, string path, System.Action<Microsoft.AspNetCore.Http.Connections.HttpConnectionDispatcherOptions> configureOptions) { throw null; }
     }
 }
 namespace Microsoft.AspNetCore.Components.Server
diff --git a/src/Components/Server/src/Builder/ComponentEndpointConventionBuilderExtensions.cs b/src/Components/Server/src/Builder/ComponentEndpointConventionBuilderExtensions.cs
deleted file mode 100644
index b7d260d25e..0000000000
--- a/src/Components/Server/src/Builder/ComponentEndpointConventionBuilderExtensions.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using Microsoft.AspNetCore.Components.Server;
-
-namespace Microsoft.AspNetCore.Builder
-{
-    /// <summary>
-    /// Extensions for <see cref="ComponentEndpointConventionBuilder"/>.
-    /// </summary>
-    public static class ComponentEndpointConventionBuilderExtensions
-    {
-        /// <summary>
-        /// Adds <paramref name="componentType"/> to the list of components registered with this hub instance.
-        /// </summary>
-        /// <param name="builder">The <see cref="ComponentEndpointConventionBuilder"/>.</param>
-        /// <param name="componentType">The component type.</param>
-        /// <param name="selector">The component selector in the DOM for the <paramref name="componentType"/>.</param>
-        /// <returns>The <paramref name="builder"/>.</returns>
-        public static ComponentEndpointConventionBuilder AddComponent(this ComponentEndpointConventionBuilder builder, Type componentType, string selector)
-        {
-            if (builder == null)
-            {
-                throw new ArgumentNullException(nameof(builder));
-            }
-
-            if (componentType == null)
-            {
-                throw new ArgumentNullException(nameof(componentType));
-            }
-
-            if (selector == null)
-            {
-                throw new ArgumentNullException(nameof(selector));
-            }
-
-            builder.Add(endpointBuilder => AddComponent(endpointBuilder.Metadata, componentType, selector));
-            return builder;
-        }
-
-        private static void AddComponent(IList<object> metadata, Type type, string selector)
-        {
-            metadata.Add(new ComponentDescriptor
-            {
-                ComponentType = type,
-                Selector = selector
-            });
-        }
-    }
-}
diff --git a/src/Components/Server/src/Builder/ComponentEndpointRouteBuilderExtensions.cs b/src/Components/Server/src/Builder/ComponentEndpointRouteBuilderExtensions.cs
index d747a69b60..eec26e87ad 100644
--- a/src/Components/Server/src/Builder/ComponentEndpointRouteBuilderExtensions.cs
+++ b/src/Components/Server/src/Builder/ComponentEndpointRouteBuilderExtensions.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Server;
 using Microsoft.AspNetCore.Http.Connections;
 using Microsoft.AspNetCore.Routing;
@@ -16,215 +15,28 @@ namespace Microsoft.AspNetCore.Builder
     public static class ComponentEndpointRouteBuilderExtensions
     {
         /// <summary>
-        ///Maps the Blazor <see cref="Hub" /> to the default path and associates
-        /// the component <typeparamref name="TComponent"/> to this hub instance as the given DOM <paramref name="selector"/>.
+        /// Maps the Blazor <see cref="Hub" /> to the default path.
         /// </summary>
-        /// <typeparam name="TComponent">The first <see cref="IComponent"/> associated with this Blazor <see cref="Hub" />.</typeparam>
         /// <param name="endpoints">The <see cref="IEndpointRouteBuilder"/>.</param>
-        /// <param name="selector">The selector for the <typeparamref name="TComponent"/>.</param>
         /// <returns>The <see cref="ComponentEndpointConventionBuilder"/>.</returns>
-        public static ComponentEndpointConventionBuilder MapBlazorHub<TComponent>(
-            this IEndpointRouteBuilder endpoints,
-            string selector) where TComponent : IComponent
+        public static ComponentEndpointConventionBuilder MapBlazorHub(this IEndpointRouteBuilder endpoints)
         {
             if (endpoints == null)
             {
                 throw new ArgumentNullException(nameof(endpoints));
             }
 
-            if (selector == null)
-            {
-                throw new ArgumentNullException(nameof(selector));
-            }
-
-            return endpoints.MapBlazorHub(typeof(TComponent), selector, ComponentHub.DefaultPath);
+            return endpoints.MapBlazorHub(ComponentHub.DefaultPath);
         }
 
         /// <summary>
-        ///Maps the Blazor <see cref="Hub" /> to the default path and associates
-        /// the component <typeparamref name="TComponent"/> to this hub instance as the given DOM <paramref name="selector"/>.
-        /// </summary>
-        /// <typeparam name="TComponent">The first <see cref="IComponent"/> associated with this Blazor <see cref="Hub" />.</typeparam>
-        /// <param name="endpoints">The <see cref="IEndpointRouteBuilder"/>.</param>
-        /// <param name="selector">The selector for the <typeparamref name="TComponent"/>.</param>
-        /// <param name="configureOptions">A callback to configure dispatcher options.</param>
-        /// <returns>The <see cref="ComponentEndpointConventionBuilder"/>.</returns>
-        public static ComponentEndpointConventionBuilder MapBlazorHub<TComponent>(
-            this IEndpointRouteBuilder endpoints,
-            string selector,
-            Action<HttpConnectionDispatcherOptions> configureOptions) where TComponent : IComponent
-        {
-            if (endpoints == null)
-            {
-                throw new ArgumentNullException(nameof(endpoints));
-            }
-
-            if (selector == null)
-            {
-                throw new ArgumentNullException(nameof(selector));
-            }
-
-            if (configureOptions == null)
-            {
-                throw new ArgumentNullException(nameof(configureOptions));
-            }
-
-            return endpoints.MapBlazorHub(typeof(TComponent), selector, ComponentHub.DefaultPath, configureOptions);
-        }
-
-        /// <summary>
-        ///Maps the Blazor <see cref="Hub" /> to the default path and associates
-        /// the component <paramref name="type"/> to this hub instance as the given DOM <paramref name="selector"/>.
+        /// Maps the Blazor <see cref="Hub" /> to the path <paramref name="path"/>.
         /// </summary>
         /// <param name="endpoints">The <see cref="IEndpointRouteBuilder"/>.</param>
-        /// <param name="type">The first <see cref="IComponent"/> associated with this Blazor <see cref="Hub" />.</param>
-        /// <param name="selector">The selector for the component.</param>
-        /// <returns>The <see cref="ComponentEndpointConventionBuilder"/>.</returns>
-        public static ComponentEndpointConventionBuilder MapBlazorHub(
-            this IEndpointRouteBuilder endpoints,
-            Type type,
-            string selector)
-        {
-            if (endpoints == null)
-            {
-                throw new ArgumentNullException(nameof(endpoints));
-            }
-
-            if (type == null)
-            {
-                throw new ArgumentNullException(nameof(type));
-            }
-
-            if (selector == null)
-            {
-                throw new ArgumentNullException(nameof(selector));
-            }
-
-            return endpoints.MapBlazorHub(type, selector, ComponentHub.DefaultPath);
-        }
-
-        /// <summary>
-        ///Maps the Blazor <see cref="Hub" /> to the default path and associates
-        /// the component <paramref name="type"/> to this hub instance as the given DOM <paramref name="selector"/>.
-        /// </summary>
-        /// <param name="endpoints">The <see cref="IEndpointRouteBuilder"/>.</param>
-        /// <param name="type">The first <see cref="IComponent"/> associated with this Blazor <see cref="Hub" />.</param>
-        /// <param name="selector">The selector for the component.</param>
-        /// <param name="configureOptions">A callback to configure dispatcher options.</param>
-        /// <returns>The <see cref="ComponentEndpointConventionBuilder"/>.</returns>
-        public static ComponentEndpointConventionBuilder MapBlazorHub(
-            this IEndpointRouteBuilder endpoints,
-            Type type,
-            string selector,
-            Action<HttpConnectionDispatcherOptions> configureOptions)
-        {
-            if (endpoints == null)
-            {
-                throw new ArgumentNullException(nameof(endpoints));
-            }
-
-            if (type == null)
-            {
-                throw new ArgumentNullException(nameof(type));
-            }
-
-            if (selector == null)
-            {
-                throw new ArgumentNullException(nameof(selector));
-            }
-
-            if (configureOptions == null)
-            {
-                throw new ArgumentNullException(nameof(configureOptions));
-            }
-
-            return endpoints.MapBlazorHub(type, selector, ComponentHub.DefaultPath, configureOptions);
-        }
-
-        /// <summary>
-        /// Maps the Blazor <see cref="Hub" /> to the path <paramref name="path"/> and associates
-        /// the component <typeparamref name="TComponent"/> to this hub instance as the given DOM <paramref name="selector"/>.
-        /// </summary>
-        /// <typeparam name="TComponent">The first <see cref="IComponent"/> associated with this Blazor <see cref="Hub" />.</typeparam>
-        /// <param name="endpoints">The <see cref="IEndpointRouteBuilder"/>.</param>
-        /// <param name="selector">The selector for the <typeparamref name="TComponent"/>.</param>
-        /// <param name="path">The path to map the Blazor <see cref="Hub" />.</param>
-        /// <returns>The <see cref="ComponentEndpointConventionBuilder"/>.</returns>
-        public static ComponentEndpointConventionBuilder MapBlazorHub<TComponent>(
-            this IEndpointRouteBuilder endpoints,
-            string selector,
-            string path) where TComponent : IComponent
-        {
-            if (endpoints == null)
-            {
-                throw new ArgumentNullException(nameof(endpoints));
-            }
-
-            if (path == null)
-            {
-                throw new ArgumentNullException(nameof(path));
-            }
-
-            if (selector == null)
-            {
-                throw new ArgumentNullException(nameof(selector));
-            }
-
-            return endpoints.MapBlazorHub(typeof(TComponent), selector, path);
-        }
-
-        /// <summary>
-        /// Maps the Blazor <see cref="Hub" /> to the path <paramref name="path"/> and associates
-        /// the component <typeparamref name="TComponent"/> to this hub instance as the given DOM <paramref name="selector"/>.
-        /// </summary>
-        /// <typeparam name="TComponent">The first <see cref="IComponent"/> associated with this Blazor <see cref="Hub" />.</typeparam>
-        /// <param name="endpoints">The <see cref="IEndpointRouteBuilder"/>.</param>
-        /// <param name="selector">The selector for the <typeparamref name="TComponent"/>.</param>
-        /// <param name="path">The path to map the Blazor <see cref="Hub" />.</param>
-        /// <param name="configureOptions">A callback to configure dispatcher options.</param>
-        /// <returns>The <see cref="ComponentEndpointConventionBuilder"/>.</returns>
-        public static ComponentEndpointConventionBuilder MapBlazorHub<TComponent>(
-            this IEndpointRouteBuilder endpoints,
-            string selector,
-            string path,
-            Action<HttpConnectionDispatcherOptions> configureOptions) where TComponent : IComponent
-        {
-            if (endpoints == null)
-            {
-                throw new ArgumentNullException(nameof(endpoints));
-            }
-
-            if (path == null)
-            {
-                throw new ArgumentNullException(nameof(path));
-            }
-
-            if (selector == null)
-            {
-                throw new ArgumentNullException(nameof(selector));
-            }
-
-            if (configureOptions == null)
-            {
-                throw new ArgumentNullException(nameof(configureOptions));
-            }
-
-            return endpoints.MapBlazorHub(typeof(TComponent), selector, path, configureOptions);
-        }
-
-        /// <summary>
-        /// Maps the Blazor <see cref="Hub" /> to the path <paramref name="path"/> and associates
-        /// the component <paramref name="componentType"/> to this hub instance as the given DOM <paramref name="selector"/>.
-        /// </summary>
-        /// <param name="endpoints">The <see cref="IEndpointRouteBuilder"/>.</param>
-        /// <param name="componentType">The first <see cref="IComponent"/> associated with this Blazor <see cref="Hub" />.</param>
-        /// <param name="selector">The selector for the <paramref name="componentType"/>.</param>
         /// <param name="path">The path to map the Blazor <see cref="Hub" />.</param>
         /// <returns>The <see cref="ComponentEndpointConventionBuilder"/>.</returns>
         public static ComponentEndpointConventionBuilder MapBlazorHub(
             this IEndpointRouteBuilder endpoints,
-            Type componentType,
-            string selector,
             string path)
         {
             if (endpoints == null)
@@ -237,33 +49,41 @@ namespace Microsoft.AspNetCore.Builder
                 throw new ArgumentNullException(nameof(path));
             }
 
-            if (componentType == null)
-            {
-                throw new ArgumentNullException(nameof(componentType));
-            }
-
-            if (selector == null)
-            {
-                throw new ArgumentNullException(nameof(selector));
-            }
-
-            return endpoints.MapBlazorHub(componentType, selector, path, configureOptions: _ => { });
+            return endpoints.MapBlazorHub(path, configureOptions: _ => { });
         }
 
         /// <summary>
-        /// Maps the Blazor <see cref="Hub" /> to the path <paramref name="path"/> and associates
-        /// the component <paramref name="componentType"/> to this hub instance as the given DOM <paramref name="selector"/>.
+        ///Maps the Blazor <see cref="Hub" /> to the default path.
         /// </summary>
         /// <param name="endpoints">The <see cref="IEndpointRouteBuilder"/>.</param>
-        /// <param name="componentType">The first <see cref="IComponent"/> associated with this Blazor <see cref="Hub" />.</param>
-        /// <param name="selector">The selector for the <paramref name="componentType"/>.</param>
         /// <param name="configureOptions">A callback to configure dispatcher options.</param>
-        /// <param name="path">The path to map the Blazor <see cref="Hub" />.</param>
         /// <returns>The <see cref="ComponentEndpointConventionBuilder"/>.</returns>
         public static ComponentEndpointConventionBuilder MapBlazorHub(
             this IEndpointRouteBuilder endpoints,
-            Type componentType,
-            string selector,
+            Action<HttpConnectionDispatcherOptions> configureOptions)
+        {
+            if (endpoints == null)
+            {
+                throw new ArgumentNullException(nameof(endpoints));
+            }
+
+            if (configureOptions == null)
+            {
+                throw new ArgumentNullException(nameof(configureOptions));
+            }
+
+            return endpoints.MapBlazorHub(ComponentHub.DefaultPath, configureOptions);
+        }
+
+        /// <summary>
+        /// Maps the Blazor <see cref="Hub" /> to the path <paramref name="path"/>.
+        /// </summary>
+        /// <param name="endpoints">The <see cref="IEndpointRouteBuilder"/>.</param>
+        /// <param name="path">The path to map the Blazor <see cref="Hub" />.</param>
+        /// <param name="configureOptions">A callback to configure dispatcher options.</param>
+        /// <returns>The <see cref="ComponentEndpointConventionBuilder"/>.</returns>
+        public static ComponentEndpointConventionBuilder MapBlazorHub(
+            this IEndpointRouteBuilder endpoints,
             string path,
             Action<HttpConnectionDispatcherOptions> configureOptions)
         {
@@ -277,16 +97,6 @@ namespace Microsoft.AspNetCore.Builder
                 throw new ArgumentNullException(nameof(path));
             }
 
-            if (componentType == null)
-            {
-                throw new ArgumentNullException(nameof(componentType));
-            }
-
-            if (selector == null)
-            {
-                throw new ArgumentNullException(nameof(selector));
-            }
-
             if (configureOptions == null)
             {
                 throw new ArgumentNullException(nameof(configureOptions));
@@ -299,10 +109,7 @@ namespace Microsoft.AspNetCore.Builder
                 endpoints.CreateApplicationBuilder().UseMiddleware<CircuitDisconnectMiddleware>().Build())
                 .WithDisplayName("Blazor disconnect");
 
-            return new ComponentEndpointConventionBuilder(
-                hubEndpoint,
-                disconnectEndpoint)
-                    .AddComponent(componentType, selector);
+            return new ComponentEndpointConventionBuilder(hubEndpoint, disconnectEndpoint);
         }
     }
 }
diff --git a/src/Components/Server/src/CircuitDisconnectMiddleware.cs b/src/Components/Server/src/CircuitDisconnectMiddleware.cs
index 0792e009d3..d64c31e7da 100644
--- a/src/Components/Server/src/CircuitDisconnectMiddleware.cs
+++ b/src/Components/Server/src/CircuitDisconnectMiddleware.cs
@@ -39,65 +39,71 @@ namespace Microsoft.AspNetCore.Components.Server
                 return;
             }
 
-            var (hasCircuitId, circuitId) = await TryGetCircuitIdAsync(context);
-            if (!hasCircuitId)
+            var circuitId = await GetCircuitIdAsync(context);
+            if (circuitId is null)
             {
                 context.Response.StatusCode = StatusCodes.Status400BadRequest;
                 return;
             }
 
-            await TerminateCircuitGracefully(circuitId);
+            await TerminateCircuitGracefully(circuitId.Value);
 
             context.Response.StatusCode = StatusCodes.Status200OK;
         }
 
-        private async Task<(bool, string)> TryGetCircuitIdAsync(HttpContext context)
+        private async Task<CircuitId?> GetCircuitIdAsync(HttpContext context)
         {
             try
             {
                 if (!context.Request.HasFormContentType)
                 {
-                    return (false, null);
+                    return default;
                 }
 
                 var form = await context.Request.ReadFormAsync();
-                if (!form.TryGetValue(CircuitIdKey, out var circuitId) || !CircuitIdFactory.ValidateCircuitId(circuitId))
+                if (!form.TryGetValue(CircuitIdKey, out var text))
                 {
-                    return (false, null);
+                    return default;
                 }
 
-                return (true, circuitId);
+                if (!CircuitIdFactory.TryParseCircuitId(text, out var circuitId))
+                {
+                    Log.InvalidCircuitId(Logger, text);
+                    return default;
+                }
+
+                return circuitId;
             }
             catch
             {
-                return (false, null);
+                return default;
             }
         }
 
-        private async Task TerminateCircuitGracefully(string circuitId)
+        private async Task TerminateCircuitGracefully(CircuitId circuitId)
         {
-            try
-            {
-                await Registry.TerminateAsync(circuitId);
-                Log.CircuitTerminatedGracefully(Logger, circuitId);
-            }
-            catch (Exception e)
-            {
-                Log.UnhandledExceptionInCircuit(Logger, circuitId, e);
-            }
+            // We don't expect TerminateAsync to throw.
+            Log.CircuitTerminatingGracefully(Logger, circuitId);
+            await Registry.TerminateAsync(circuitId);
+            Log.CircuitTerminatedGracefully(Logger, circuitId);
         }
 
         private class Log
         {
-            private static readonly Action<ILogger, string, Exception> _circuitTerminatedGracefully =
-                LoggerMessage.Define<string>(LogLevel.Debug, new EventId(1, "CircuitTerminatedGracefully"), "Circuit '{CircuitId}' terminated gracefully");
+            private static readonly Action<ILogger, CircuitId, Exception> _circuitTerminatingGracefully =
+                LoggerMessage.Define<CircuitId>(LogLevel.Debug, new EventId(1, "CircuitTerminatingGracefully"), "Circuit with id '{CircuitId}' terminating gracefully.");
 
-            private static readonly Action<ILogger, string, Exception> _unhandledExceptionInCircuit =
-                LoggerMessage.Define<string>(LogLevel.Warning, new EventId(2, "UnhandledExceptionInCircuit"), "Unhandled exception in circuit {CircuitId} while terminating gracefully.");
+            private static readonly Action<ILogger, CircuitId, Exception> _circuitTerminatedGracefully =
+                LoggerMessage.Define<CircuitId>(LogLevel.Debug, new EventId(2, "CircuitTerminatedGracefully"), "Circuit with id '{CircuitId}' terminated gracefully.");
 
-            public static void CircuitTerminatedGracefully(ILogger logger, string circuitId) => _circuitTerminatedGracefully(logger, circuitId, null);
+            private static readonly Action<ILogger, string, Exception> _invalidCircuitId =
+                LoggerMessage.Define<string>(LogLevel.Debug, new EventId(3, "InvalidCircuitId"), "CircuitDisconnectMiddleware recieved an invalid circuit id '{CircuitIdSecret}'.");
 
-            public static void UnhandledExceptionInCircuit(ILogger logger, string circuitId, Exception exception) => _unhandledExceptionInCircuit(logger, circuitId, exception);
+            public static void CircuitTerminatingGracefully(ILogger logger, CircuitId circuitId) => _circuitTerminatingGracefully(logger, circuitId, null);
+
+            public static void CircuitTerminatedGracefully(ILogger logger, CircuitId circuitId) => _circuitTerminatedGracefully(logger, circuitId, null);
+
+            public static void InvalidCircuitId(ILogger logger, string circuitSecret) => _invalidCircuitId(logger, circuitSecret, null);
         }
     }
 }
diff --git a/src/Components/Server/src/Circuits/ArrayBuilderMemoryStream.cs b/src/Components/Server/src/Circuits/ArrayBuilderMemoryStream.cs
index ff1ff63114..2b8f2eed56 100644
--- a/src/Components/Server/src/Circuits/ArrayBuilderMemoryStream.cs
+++ b/src/Components/Server/src/Circuits/ArrayBuilderMemoryStream.cs
@@ -7,7 +7,7 @@ using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Microsoft.AspNetCore.Components.Web.Rendering
+namespace Microsoft.AspNetCore.Components.Server.Circuits
 {
     /// <summary>
     /// Writeable memory stream backed by a an <see cref="ArrayBuilder{T}"/>.
diff --git a/src/Components/Server/src/Circuits/Circuit.cs b/src/Components/Server/src/Circuits/Circuit.cs
index 536fb86f93..9d6620d83a 100644
--- a/src/Components/Server/src/Circuits/Circuit.cs
+++ b/src/Components/Server/src/Circuits/Circuit.cs
@@ -18,6 +18,6 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
         /// <summary>
         /// Gets the identifier for the <see cref="Circuit"/>.
         /// </summary>
-        public string Id => _circuitHost.CircuitId;
+        public string Id => _circuitHost.CircuitId.Id;
     }
 }
diff --git a/src/Components/Server/src/Circuits/CircuitFactory.cs b/src/Components/Server/src/Circuits/CircuitFactory.cs
index c91545d131..4c74631535 100644
--- a/src/Components/Server/src/Circuits/CircuitFactory.cs
+++ b/src/Components/Server/src/Circuits/CircuitFactory.cs
@@ -1,18 +1,101 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Security.Claims;
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Components.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Microsoft.JSInterop;
 
 namespace Microsoft.AspNetCore.Components.Server.Circuits
 {
-    internal abstract class CircuitFactory
+    internal class CircuitFactory
     {
-        public abstract CircuitHost CreateCircuitHost(
-            HttpContext httpContext,
+        private readonly IServiceScopeFactory _scopeFactory;
+        private readonly ILoggerFactory _loggerFactory;
+        private readonly CircuitIdFactory _circuitIdFactory;
+        private readonly CircuitOptions _options;
+        private readonly ILogger _logger;
+
+        public CircuitFactory(
+            IServiceScopeFactory scopeFactory,
+            ILoggerFactory loggerFactory,
+            CircuitIdFactory circuitIdFactory,
+            IOptions<CircuitOptions> options)
+        {
+            _scopeFactory = scopeFactory;
+            _loggerFactory = loggerFactory;
+            _circuitIdFactory = circuitIdFactory;
+            _options = options.Value;
+            _logger = _loggerFactory.CreateLogger<CircuitFactory>();
+        }
+
+        public CircuitHost CreateCircuitHost(
+            IReadOnlyList<ComponentDescriptor> components,
             CircuitClientProxy client,
             string baseUri,
             string uri,
-            ClaimsPrincipal user);
+            ClaimsPrincipal user)
+        {
+            var scope = _scopeFactory.CreateScope();
+            var jsRuntime = (RemoteJSRuntime)scope.ServiceProvider.GetRequiredService<IJSRuntime>();
+            jsRuntime.Initialize(client);
+
+            var navigationManager = (RemoteNavigationManager)scope.ServiceProvider.GetRequiredService<NavigationManager>();
+            var navigationInterception = (RemoteNavigationInterception)scope.ServiceProvider.GetRequiredService<INavigationInterception>();
+            if (client.Connected)
+            {
+                navigationManager.AttachJsRuntime(jsRuntime);
+                navigationManager.Initialize(baseUri, uri);
+
+                navigationInterception.AttachJSRuntime(jsRuntime);
+            }
+            else
+            {
+                navigationManager.Initialize(baseUri, uri);
+            }
+
+            var renderer = new RemoteRenderer(
+                scope.ServiceProvider,
+                _loggerFactory,
+                _options,
+                client,
+                _loggerFactory.CreateLogger<RemoteRenderer>());
+
+            var circuitHandlers = scope.ServiceProvider.GetServices<CircuitHandler>()
+                .OrderBy(h => h.Order)
+                .ToArray();
+
+            var circuitHost = new CircuitHost(
+                _circuitIdFactory.CreateCircuitId(),
+                scope,
+                _options,
+                client,
+                renderer,
+                components,
+                jsRuntime,
+                circuitHandlers,
+                _loggerFactory.CreateLogger<CircuitHost>());
+            Log.CreatedCircuit(_logger, circuitHost);
+
+            // Initialize per - circuit data that services need
+            (circuitHost.Services.GetRequiredService<ICircuitAccessor>() as DefaultCircuitAccessor).Circuit = circuitHost.Circuit;
+            circuitHost.SetCircuitUser(user);
+
+            return circuitHost;
+        }
+
+        private static class Log
+        {
+            private static readonly Action<ILogger, string, string, Exception> _createdCircuit =
+                LoggerMessage.Define<string, string>(LogLevel.Debug, new EventId(1, "CreatedCircuit"), "Created circuit {CircuitId} for connection {ConnectionId}");
+
+            internal static void CreatedCircuit(ILogger logger, CircuitHost circuitHost) =>
+                _createdCircuit(logger, circuitHost.CircuitId.Id, circuitHost.Client.ConnectionId, null);
+        }
     }
 }
diff --git a/src/Components/Server/src/Circuits/CircuitHost.cs b/src/Components/Server/src/Circuits/CircuitHost.cs
index 0f0cbceafb..0d7c7336dd 100644
--- a/src/Components/Server/src/Circuits/CircuitHost.cs
+++ b/src/Components/Server/src/Circuits/CircuitHost.cs
@@ -8,11 +8,10 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.AspNetCore.Components.Web;
-using Microsoft.AspNetCore.Components.Web.Rendering;
 using Microsoft.AspNetCore.SignalR;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Microsoft.JSInterop;
+using Microsoft.JSInterop.Infrastructure;
 
 namespace Microsoft.AspNetCore.Components.Server.Circuits
 {
@@ -25,11 +24,6 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
         private bool _initialized;
         private bool _disposed;
 
-        /// <summary>
-        /// Sets the <see cref="IJSRuntime"/> for the current excution context.
-        /// </summary>
-        public void SetCurrentJSRuntime() => JSInterop.JSRuntime.SetCurrentJSRuntime(JSRuntime);
-
         // This event is fired when there's an unrecoverable exception coming from the circuit, and
         // it need so be torn down. The registry listens to this even so that the circuit can
         // be torn down even when a client is not connected.
@@ -39,7 +33,7 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
         public event UnhandledExceptionEventHandler UnhandledException;
 
         public CircuitHost(
-            string circuitId,
+            CircuitId circuitId,
             IServiceScope scope,
             CircuitOptions options,
             CircuitClientProxy client,
@@ -49,7 +43,12 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
             CircuitHandler[] circuitHandlers,
             ILogger logger)
         {
-            CircuitId = circuitId ?? throw new ArgumentNullException(nameof(circuitId));
+            CircuitId = circuitId;
+            if (CircuitId.Secret is null)
+            {
+                // Prevent the use of a 'default' secret.
+                throw new ArgumentException(nameof(circuitId));
+            }
 
             _scope = scope ?? throw new ArgumentNullException(nameof(scope));
             _options = options ?? throw new ArgumentNullException(nameof(options));
@@ -71,7 +70,7 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
 
         public CircuitHandle Handle { get; }
 
-        public string CircuitId { get; }
+        public CircuitId CircuitId { get; }
 
         public Circuit Circuit { get; }
 
@@ -100,7 +99,6 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
 
                 try
                 {
-                    SetCurrentJSRuntime();
                     _initialized = true; // We're ready to accept incoming JSInterop calls from here on
 
                     await OnCircuitOpenedAsync(cancellationToken);
@@ -113,8 +111,8 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
                     var count = Descriptors.Count;
                     for (var i = 0; i < count; i++)
                     {
-                        var (componentType, domElementSelector) = Descriptors[i];
-                        await Renderer.AddComponentAsync(componentType, domElementSelector);
+                        var (componentType, sequence) = Descriptors[i];
+                        await Renderer.AddComponentAsync(componentType, sequence.ToString());
                     }
 
                     Log.InitializationSucceeded(_logger);
@@ -195,7 +193,7 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
         // exceptions.
         private async Task OnCircuitOpenedAsync(CancellationToken cancellationToken)
         {
-            Log.CircuitOpened(_logger, Circuit.Id);
+            Log.CircuitOpened(_logger, CircuitId);
 
             Renderer.Dispatcher.AssertAccess();
 
@@ -224,7 +222,7 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
 
         public async Task OnConnectionUpAsync(CancellationToken cancellationToken)
         {
-            Log.ConnectionUp(_logger, Circuit.Id, Client.ConnectionId);
+            Log.ConnectionUp(_logger, CircuitId, Client.ConnectionId);
 
             Renderer.Dispatcher.AssertAccess();
             
@@ -253,7 +251,7 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
 
         public async Task OnConnectionDownAsync(CancellationToken cancellationToken)
         {
-            Log.ConnectionDown(_logger, Circuit.Id, Client.ConnectionId);
+            Log.ConnectionDown(_logger, CircuitId, Client.ConnectionId);
 
             Renderer.Dispatcher.AssertAccess();
             
@@ -282,7 +280,7 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
 
         private async Task OnCircuitDownAsync(CancellationToken cancellationToken)
         {
-            Log.CircuitClosed(_logger, Circuit.Id);
+            Log.CircuitClosed(_logger, CircuitId);
 
             List<Exception> exceptions = null;
 
@@ -340,9 +338,9 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
             {
                 await Renderer.Dispatcher.InvokeAsync(() =>
                 {
-                    SetCurrentJSRuntime();
                     Log.BeginInvokeDotNet(_logger, callId, assemblyName, methodIdentifier, dotNetObjectId);
-                    DotNetDispatcher.BeginInvoke(callId, assemblyName, methodIdentifier, dotNetObjectId, argsJson);
+                    var invocationInfo = new DotNetInvocationInfo(assemblyName, methodIdentifier, dotNetObjectId, callId);
+                    DotNetDispatcher.BeginInvokeDotNet(JSRuntime, invocationInfo, argsJson);
                 });
             }
             catch (Exception ex)
@@ -366,7 +364,6 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
             {
                 await Renderer.Dispatcher.InvokeAsync(() =>
                 {
-                    SetCurrentJSRuntime();
                     if (!succeded)
                     {
                         // We can log the arguments here because it is simply the JS error with the call stack.
@@ -377,7 +374,7 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
                         Log.EndInvokeJSSucceeded(_logger, asyncCall);
                     }
 
-                    DotNetDispatcher.EndInvoke(arguments);
+                    DotNetDispatcher.EndInvokeJS(JSRuntime, arguments);
                 });
             }
             catch (Exception ex)
@@ -415,7 +412,6 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
             {
                 await Renderer.Dispatcher.InvokeAsync(() =>
                 {
-                    SetCurrentJSRuntime();
                     return Renderer.DispatchEventAsync(
                         webEventData.EventHandlerId,
                         webEventData.EventFieldInfo,
@@ -443,7 +439,6 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
             {
                 await Renderer.Dispatcher.InvokeAsync(() =>
                 {
-                    SetCurrentJSRuntime();
                     Log.LocationChange(_logger, uri, CircuitId);
                     var navigationManager = (RemoteNavigationManager)Services.GetRequiredService<NavigationManager>();
                     navigationManager.NotifyLocationChanged(uri, intercepted);
@@ -549,8 +544,7 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
             }
             else
             {
-                return
-                    $"There was an unhandled exception on the current circuit, so this circuit will be terminated. For more details turn on " +
+                return $"There was an unhandled exception on the current circuit, so this circuit will be terminated. For more details turn on " +
                     $"detailed exceptions in '{typeof(CircuitOptions).Name}.{nameof(CircuitOptions.DetailedErrors)}'. {additionalInformation}";
             }
         }
@@ -586,19 +580,19 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
             private static readonly Action<ILogger, Exception> _intializationStarted;
             private static readonly Action<ILogger, Exception> _intializationSucceded;
             private static readonly Action<ILogger, Exception> _intializationFailed;
-            private static readonly Action<ILogger, string, Exception> _disposeStarted;
-            private static readonly Action<ILogger, string, Exception> _disposeSucceded;
-            private static readonly Action<ILogger, string, Exception> _disposeFailed;
-            private static readonly Action<ILogger, string, Exception> _onCircuitOpened;
-            private static readonly Action<ILogger, string, string, Exception> _onConnectionUp;
-            private static readonly Action<ILogger, string, string, Exception> _onConnectionDown;
-            private static readonly Action<ILogger, string, Exception> _onCircuitClosed;
+            private static readonly Action<ILogger, CircuitId, Exception> _disposeStarted;
+            private static readonly Action<ILogger, CircuitId, Exception> _disposeSucceded;
+            private static readonly Action<ILogger, CircuitId, Exception> _disposeFailed;
+            private static readonly Action<ILogger, CircuitId, Exception> _onCircuitOpened;
+            private static readonly Action<ILogger, CircuitId, string, Exception> _onConnectionUp;
+            private static readonly Action<ILogger, CircuitId, string, Exception> _onConnectionDown;
+            private static readonly Action<ILogger, CircuitId, Exception> _onCircuitClosed;
             private static readonly Action<ILogger, Type, string, string, Exception> _circuitHandlerFailed;
-            private static readonly Action<ILogger, string, Exception> _circuitUnhandledException;
-            private static readonly Action<ILogger, string, Exception> _circuitTransmittingClientError;
-            private static readonly Action<ILogger, string, Exception> _circuitTransmittedClientErrorSuccess;
-            private static readonly Action<ILogger, string, Exception> _circuitTransmitErrorFailed;
-            private static readonly Action<ILogger, string, Exception> _unhandledExceptionClientDisconnected;
+            private static readonly Action<ILogger, CircuitId, Exception> _circuitUnhandledException;
+            private static readonly Action<ILogger, CircuitId, Exception> _circuitTransmittingClientError;
+            private static readonly Action<ILogger, CircuitId, Exception> _circuitTransmittedClientErrorSuccess;
+            private static readonly Action<ILogger, CircuitId, Exception> _circuitTransmitErrorFailed;
+            private static readonly Action<ILogger, CircuitId, Exception> _unhandledExceptionClientDisconnected;
 
             private static readonly Action<ILogger, string, string, string, Exception> _beginInvokeDotNetStatic;
             private static readonly Action<ILogger, string, long, string, Exception> _beginInvokeDotNetInstance;
@@ -609,11 +603,11 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
             private static readonly Action<ILogger, long, Exception> _endInvokeJSSucceeded;
             private static readonly Action<ILogger, Exception> _dispatchEventFailedToParseEventData;
             private static readonly Action<ILogger, string, Exception> _dispatchEventFailedToDispatchEvent;
-            private static readonly Action<ILogger, string, string, Exception> _locationChange;
-            private static readonly Action<ILogger, string, string, Exception> _locationChangeSucceeded;
-            private static readonly Action<ILogger, string, string, Exception> _locationChangeFailed;
-            private static readonly Action<ILogger, string, string, Exception> _locationChangeFailedInCircuit;
-            private static readonly Action<ILogger, long, string, Exception> _onRenderCompletedFailed;
+            private static readonly Action<ILogger, string, CircuitId, Exception> _locationChange;
+            private static readonly Action<ILogger, string, CircuitId, Exception> _locationChangeSucceeded;
+            private static readonly Action<ILogger, string, CircuitId, Exception> _locationChangeFailed;
+            private static readonly Action<ILogger, string, CircuitId, Exception> _locationChangeFailedInCircuit;
+            private static readonly Action<ILogger, long, CircuitId, Exception> _onRenderCompletedFailed;
 
             private static class EventIds
             {
@@ -648,19 +642,19 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
                 public static readonly EventId LocationChangeSucceded = new EventId(209, "LocationChangeSucceeded");
                 public static readonly EventId LocationChangeFailed = new EventId(210, "LocationChangeFailed");
                 public static readonly EventId LocationChangeFailedInCircuit = new EventId(211, "LocationChangeFailedInCircuit");
-                public static readonly EventId OnRenderCompletedFailed = new EventId(212, " OnRenderCompletedFailed");
+                public static readonly EventId OnRenderCompletedFailed = new EventId(212, "OnRenderCompletedFailed");
             }
 
             static Log()
             {
                 _intializationStarted = LoggerMessage.Define(
                     LogLevel.Debug,
-                    EventIds.InitializationFailed,
+                    EventIds.InitializationStarted,
                     "Circuit initialization started.");
 
                 _intializationSucceded = LoggerMessage.Define(
                     LogLevel.Debug,
-                    EventIds.InitializationFailed,
+                    EventIds.InitializationSucceeded,
                     "Circuit initialization succeeded.");
 
                 _intializationFailed = LoggerMessage.Define(
@@ -668,37 +662,37 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
                     EventIds.InitializationFailed,
                     "Circuit initialization failed.");
 
-                _disposeStarted = LoggerMessage.Define<string>(
+                _disposeStarted = LoggerMessage.Define<CircuitId>(
                     LogLevel.Debug,
                     EventIds.DisposeStarted,
                     "Disposing circuit '{CircuitId}' started.");
 
-                _disposeSucceded = LoggerMessage.Define<string>(
+                _disposeSucceded = LoggerMessage.Define<CircuitId>(
                     LogLevel.Debug,
                     EventIds.DisposeSucceeded,
                     "Disposing circuit '{CircuitId}' succeded.");
 
-                _disposeFailed = LoggerMessage.Define<string>(
+                _disposeFailed = LoggerMessage.Define<CircuitId>(
                     LogLevel.Debug,
                     EventIds.DisposeFailed,
                     "Disposing circuit '{CircuitId}' failed.");
 
-                _onCircuitOpened = LoggerMessage.Define<string>(
+                _onCircuitOpened = LoggerMessage.Define<CircuitId>(
                     LogLevel.Debug,
                     EventIds.OnCircuitOpened,
                     "Opening circuit with id '{CircuitId}'.");
 
-                _onConnectionUp = LoggerMessage.Define<string, string>(
+                _onConnectionUp = LoggerMessage.Define<CircuitId, string>(
                     LogLevel.Debug,
                     EventIds.OnConnectionUp,
                     "Circuit id '{CircuitId}' connected using connection '{ConnectionId}'.");
 
-                _onConnectionDown = LoggerMessage.Define<string, string>(
+                _onConnectionDown = LoggerMessage.Define<CircuitId, string>(
                     LogLevel.Debug,
                     EventIds.OnConnectionDown,
                     "Circuit id '{CircuitId}' disconnected from connection '{ConnectionId}'.");
 
-                _onCircuitClosed = LoggerMessage.Define<string>(
+                _onCircuitClosed = LoggerMessage.Define<CircuitId>(
                    LogLevel.Debug,
                    EventIds.OnCircuitClosed,
                    "Closing circuit with id '{CircuitId}'.");
@@ -708,27 +702,27 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
                     EventIds.CircuitHandlerFailed,
                     "Unhandled error invoking circuit handler type {handlerType}.{handlerMethod}: {Message}");
 
-                _circuitUnhandledException = LoggerMessage.Define<string>(
+                _circuitUnhandledException = LoggerMessage.Define<CircuitId>(
                    LogLevel.Error,
                    EventIds.CircuitUnhandledException,
                    "Unhandled exception in circuit '{CircuitId}'.");
 
-                _circuitTransmittingClientError = LoggerMessage.Define<string>(
+                _circuitTransmittingClientError = LoggerMessage.Define<CircuitId>(
                     LogLevel.Debug,
                     EventIds.CircuitTransmittingClientError,
                     "About to notify client of an error in circuit '{CircuitId}'.");
 
-                _circuitTransmittedClientErrorSuccess = LoggerMessage.Define<string>(
+                _circuitTransmittedClientErrorSuccess = LoggerMessage.Define<CircuitId>(
                     LogLevel.Debug,
                     EventIds.CircuitTransmittedClientErrorSuccess,
                     "Successfully transmitted error to client in circuit '{CircuitId}'.");
 
-                _circuitTransmitErrorFailed = LoggerMessage.Define<string>(
+                _circuitTransmitErrorFailed = LoggerMessage.Define<CircuitId>(
                     LogLevel.Debug,
                     EventIds.CircuitTransmitErrorFailed,
                     "Failed to transmit exception to client in circuit '{CircuitId}'.");
 
-                _unhandledExceptionClientDisconnected = LoggerMessage.Define<string>(
+                _unhandledExceptionClientDisconnected = LoggerMessage.Define<CircuitId>(
                     LogLevel.Debug,
                     EventIds.UnhandledExceptionClientDisconnected,
                     "An exception ocurred on the circuit host '{CircuitId}' while the client is disconnected.");
@@ -778,27 +772,27 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
                     EventIds.DispatchEventFailedToDispatchEvent,
                     "There was an error dispatching the event '{EventHandlerId}' to the application.");
 
-                _locationChange = LoggerMessage.Define<string, string>(
+                _locationChange = LoggerMessage.Define<string, CircuitId>(
                     LogLevel.Debug,
                     EventIds.LocationChange,
                     "Location changing to {URI} in circuit '{CircuitId}'.");
 
-                _locationChangeSucceeded = LoggerMessage.Define<string, string>(
+                _locationChangeSucceeded = LoggerMessage.Define<string, CircuitId>(
                     LogLevel.Debug,
                     EventIds.LocationChangeSucceded,
                     "Location change to '{URI}' in circuit '{CircuitId}' succeded.");
 
-                _locationChangeFailed = LoggerMessage.Define<string, string>(
+                _locationChangeFailed = LoggerMessage.Define<string, CircuitId>(
                     LogLevel.Debug,
                     EventIds.LocationChangeFailed,
                     "Location change to '{URI}' in circuit '{CircuitId}' failed.");
 
-                _locationChangeFailedInCircuit = LoggerMessage.Define<string, string>(
+                _locationChangeFailedInCircuit = LoggerMessage.Define<string, CircuitId>(
                     LogLevel.Error,
                     EventIds.LocationChangeFailed,
                     "Location change to '{URI}' in circuit '{CircuitId}' failed.");
 
-                _onRenderCompletedFailed = LoggerMessage.Define<long, string>(
+                _onRenderCompletedFailed = LoggerMessage.Define<long, CircuitId>(
                     LogLevel.Debug,
                     EventIds.OnRenderCompletedFailed,
                     "Failed to complete render batch '{RenderId}' in circuit host '{CircuitId}'.");
@@ -807,13 +801,13 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
             public static void InitializationStarted(ILogger logger) => _intializationStarted(logger, null);
             public static void InitializationSucceeded(ILogger logger) => _intializationSucceded(logger, null);
             public static void InitializationFailed(ILogger logger, Exception exception) => _intializationFailed(logger, exception);
-            public static void DisposeStarted(ILogger logger, string circuitId) => _disposeStarted(logger, circuitId, null);
-            public static void DisposeSucceeded(ILogger logger, string circuitId) => _disposeSucceded(logger, circuitId, null);
-            public static void DisposeFailed(ILogger logger, string circuitId, Exception exception) => _disposeFailed(logger, circuitId, exception);
-            public static void CircuitOpened(ILogger logger, string circuitId) => _onCircuitOpened(logger, circuitId, null);
-            public static void ConnectionUp(ILogger logger, string circuitId, string connectionId) => _onConnectionUp(logger, circuitId, connectionId, null);
-            public static void ConnectionDown(ILogger logger, string circuitId, string connectionId) => _onConnectionDown(logger, circuitId, connectionId, null);
-            public static void CircuitClosed(ILogger logger, string circuitId) => _onCircuitClosed(logger, circuitId, null);
+            public static void DisposeStarted(ILogger logger, CircuitId circuitId) => _disposeStarted(logger, circuitId, null);
+            public static void DisposeSucceeded(ILogger logger, CircuitId circuitId) => _disposeSucceded(logger, circuitId, null);
+            public static void DisposeFailed(ILogger logger, CircuitId circuitId, Exception exception) => _disposeFailed(logger, circuitId, exception);
+            public static void CircuitOpened(ILogger logger, CircuitId circuitId) => _onCircuitOpened(logger, circuitId, null);
+            public static void ConnectionUp(ILogger logger, CircuitId circuitId, string connectionId) => _onConnectionUp(logger, circuitId, connectionId, null);
+            public static void ConnectionDown(ILogger logger, CircuitId circuitId, string connectionId) => _onConnectionDown(logger, circuitId, connectionId, null);
+            public static void CircuitClosed(ILogger logger, CircuitId circuitId) => _onCircuitClosed(logger, circuitId, null);
 
             public static void CircuitHandlerFailed(ILogger logger, CircuitHandler handler, string handlerMethod, Exception exception)
             {
@@ -825,8 +819,8 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
                     exception);
             }
 
-            public static void CircuitUnhandledException(ILogger logger, string circuitId, Exception exception) => _circuitUnhandledException(logger, circuitId, exception);
-            public static void CircuitTransmitErrorFailed(ILogger logger, string circuitId, Exception exception) => _circuitTransmitErrorFailed(logger, circuitId, exception);
+            public static void CircuitUnhandledException(ILogger logger, CircuitId circuitId, Exception exception) => _circuitUnhandledException(logger, circuitId, exception);
+            public static void CircuitTransmitErrorFailed(ILogger logger, CircuitId circuitId, Exception exception) => _circuitTransmitErrorFailed(logger, circuitId, exception);
             public static void EndInvokeDispatchException(ILogger logger, Exception ex) => _endInvokeDispatchException(logger, ex);
             public static void EndInvokeJSFailed(ILogger logger, long asyncHandle, string arguments) => _endInvokeJSFailed(logger, asyncHandle, arguments, null);
             public static void EndInvokeJSSucceeded(ILogger logger, long asyncCall) => _endInvokeJSSucceeded(logger, asyncCall, null);
@@ -857,14 +851,14 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
                 }
             }
 
-            public static void LocationChange(ILogger logger, string uri, string circuitId) => _locationChange(logger, uri, circuitId, null);
-            public static void LocationChangeSucceeded(ILogger logger, string uri, string circuitId) => _locationChangeSucceeded(logger, uri, circuitId, null);
-            public static void LocationChangeFailed(ILogger logger, string uri, string circuitId, Exception exception) => _locationChangeFailed(logger, uri, circuitId, exception);
-            public static void LocationChangeFailedInCircuit(ILogger logger, string uri, string circuitId, Exception exception) => _locationChangeFailedInCircuit(logger, uri, circuitId, exception);
-            public static void UnhandledExceptionClientDisconnected(ILogger logger, string circuitId, Exception exception) => _unhandledExceptionClientDisconnected(logger, circuitId, exception);
-            public static void CircuitTransmittingClientError(ILogger logger, string circuitId) => _circuitTransmittingClientError(logger, circuitId, null);
-            public static void CircuitTransmittedClientErrorSuccess(ILogger logger, string circuitId) => _circuitTransmittedClientErrorSuccess(logger, circuitId, null);
-            public static void OnRenderCompletedFailed(ILogger logger, long renderId, string circuitId, Exception e) => _onRenderCompletedFailed(logger, renderId, circuitId, e);
+            public static void LocationChange(ILogger logger, string uri, CircuitId circuitId) => _locationChange(logger, uri, circuitId, null);
+            public static void LocationChangeSucceeded(ILogger logger, string uri, CircuitId circuitId) => _locationChangeSucceeded(logger, uri, circuitId, null);
+            public static void LocationChangeFailed(ILogger logger, string uri, CircuitId circuitId, Exception exception) => _locationChangeFailed(logger, uri, circuitId, exception);
+            public static void LocationChangeFailedInCircuit(ILogger logger, string uri, CircuitId circuitId, Exception exception) => _locationChangeFailedInCircuit(logger, uri, circuitId, exception);
+            public static void UnhandledExceptionClientDisconnected(ILogger logger, CircuitId circuitId, Exception exception) => _unhandledExceptionClientDisconnected(logger, circuitId, exception);
+            public static void CircuitTransmittingClientError(ILogger logger, CircuitId circuitId) => _circuitTransmittingClientError(logger, circuitId, null);
+            public static void CircuitTransmittedClientErrorSuccess(ILogger logger, CircuitId circuitId) => _circuitTransmittedClientErrorSuccess(logger, circuitId, null);
+            public static void OnRenderCompletedFailed(ILogger logger, long renderId, CircuitId circuitId, Exception e) => _onRenderCompletedFailed(logger, renderId, circuitId, e);
         }
     }
 }
diff --git a/src/Components/Server/src/Circuits/CircuitId.cs b/src/Components/Server/src/Circuits/CircuitId.cs
new file mode 100644
index 0000000000..3d63d2fdb4
--- /dev/null
+++ b/src/Components/Server/src/Circuits/CircuitId.cs
@@ -0,0 +1,63 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime.InteropServices;
+using System.Security.Cryptography;
+
+namespace Microsoft.AspNetCore.Components.Server.Circuits
+{
+    // Consists of a secret (data protected payload) and a non-secret identifier
+    // for use in logs and user code.
+    //
+    // The contract of this is that the id is derived from the Secret. We use the secret
+    // for comparisons, but we use the id for display (and exposing to user code). As a result,
+    // we don't include the id in any comparisons done by this class.
+    //
+    // Intentionally not overriding ToString here so that this won't accidentally
+    // get logged. It's ok to log the secret at TRACE.
+    internal readonly struct CircuitId : IEquatable<CircuitId>
+    {
+        public CircuitId(string secret, string id)
+        {
+            Secret = secret ?? throw new ArgumentNullException(nameof(secret));
+            Id = id ?? throw new ArgumentNullException(nameof(id));
+        }
+
+        public string Id { get; }
+
+        public string Secret { get; }
+
+        public bool Equals([AllowNull] CircuitId other)
+        {
+            // We want to use a fixed time equality comparison for a *real* comparisons.
+            // The only use case for Secret being null is with a default struct value,
+            // which wouldn't be the result of untrusted input.
+            if (other.Secret == null)
+            {
+                return Secret == null;
+            }
+
+            return
+                CryptographicOperations.FixedTimeEquals(
+                    MemoryMarshal.AsBytes(Secret.AsSpan()),
+                    MemoryMarshal.AsBytes(other.Secret.AsSpan()));
+        }
+
+        public override bool Equals(object obj)
+        {
+            return obj is CircuitId other ? Equals(other) : false;
+        }
+
+        public override int GetHashCode()
+        {
+            return HashCode.Combine(Secret);
+        }
+
+        public override string ToString()
+        {
+            return Id;
+        }
+    }
+}
diff --git a/src/Components/Server/src/Circuits/CircuitIdFactory.cs b/src/Components/Server/src/Circuits/CircuitIdFactory.cs
index 830ac8d51a..544a1b791c 100644
--- a/src/Components/Server/src/Circuits/CircuitIdFactory.cs
+++ b/src/Components/Server/src/Circuits/CircuitIdFactory.cs
@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using System.Data;
 using System.Security.Cryptography;
 using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.WebUtilities;
-using Microsoft.Extensions.Options;
 
 namespace Microsoft.AspNetCore.Components.Server.Circuits
 {
@@ -13,7 +13,12 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
     // Generates strong cryptographic ids for circuits that are protected with authenticated encryption.
     internal class CircuitIdFactory
     {
-        private const string CircuitIdProtectorPurpose = "Microsoft.AspNetCore.Components.Server";
+        private const string CircuitIdProtectorPurpose = "Microsoft.AspNetCore.Components.Server.CircuitIdFactory,V1";
+
+        // We use 64 bytes, where the last 32 are the public version of the id.
+        // This way we can always recover the public id from the secret form.
+        private const int SecretLength = 64;
+        private const int IdLength = 32;
 
         private readonly RandomNumberGenerator _generator = RandomNumberGenerator.Create();
         private readonly IDataProtector _protector;
@@ -27,29 +32,58 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
         // we don't care about the underlying payload, other than its uniqueness and the fact that we
         // authenticate encrypt it using data protection.
         // For validation, the fact that we can unprotect the payload is guarantee enough.
-        public string CreateCircuitId()
+        public CircuitId CreateCircuitId()
         {
-            var buffer = new byte[32];
+            var buffer = new byte[SecretLength];
             _generator.GetBytes(buffer);
-            var payload = _protector.Protect(buffer);
 
-            return Base64UrlTextEncoder.Encode(payload);
+            var id = new byte[IdLength];
+            Array.Copy(
+                sourceArray: buffer,
+                sourceIndex: SecretLength - IdLength,
+                destinationArray: id,
+                destinationIndex: 0,
+                length: IdLength);
+
+            var secret = _protector.Protect(buffer);
+            return new CircuitId(Base64UrlTextEncoder.Encode(secret), Base64UrlTextEncoder.Encode(id));
         }
 
-        public bool ValidateCircuitId(string circuitId)
+        public bool TryParseCircuitId(string text, out CircuitId circuitId)
         {
+            if (text is null)
+            {
+                circuitId = default;
+                return false;
+            }
+
             try
             {
-                var protectedBytes = Base64UrlTextEncoder.Decode(circuitId);
-                _protector.Unprotect(protectedBytes);
+                var protectedBytes = Base64UrlTextEncoder.Decode(text);
+                var unprotectedBytes = _protector.Unprotect(protectedBytes);
 
-                // Its enough that we prove that we can unprotect the payload to validate the circuit id,
-                // as this demonstrates that it the id wasn't tampered with.
+                if (unprotectedBytes.Length != SecretLength)
+                {
+                    // Wrong length
+                    circuitId = default;
+                    return false;
+                }
+
+                var id = new byte[IdLength];
+                Array.Copy(
+                    sourceArray: unprotectedBytes,
+                    sourceIndex: SecretLength - IdLength,
+                    destinationArray: id,
+                    destinationIndex: 0,
+                    length: IdLength);
+
+                circuitId = new CircuitId(text, Base64UrlTextEncoder.Encode(id));
                 return true;
             }
             catch (Exception)
             {
                 // The payload format is not correct (either not base64urlencoded or not data protected)
+                circuitId = default;
                 return false;
             }
         }
diff --git a/src/Components/Server/src/Circuits/CircuitRegistry.cs b/src/Components/Server/src/Circuits/CircuitRegistry.cs
index 3e3461a7dc..ab261a108b 100644
--- a/src/Components/Server/src/Circuits/CircuitRegistry.cs
+++ b/src/Components/Server/src/Circuits/CircuitRegistry.cs
@@ -47,12 +47,12 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
         public CircuitRegistry(
             IOptions<CircuitOptions> options,
             ILogger<CircuitRegistry> logger,
-            CircuitIdFactory circuitIdFactory)
+            CircuitIdFactory CircuitHostFactory)
         {
             _options = options.Value;
             _logger = logger;
-            _circuitIdFactory = circuitIdFactory;
-            ConnectedCircuits = new ConcurrentDictionary<string, CircuitHost>(StringComparer.Ordinal);
+            _circuitIdFactory = CircuitHostFactory;
+            ConnectedCircuits = new ConcurrentDictionary<CircuitId, CircuitHost>();
 
             DisconnectedCircuits = new MemoryCache(new MemoryCacheOptions
             {
@@ -65,7 +65,7 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
             };
         }
 
-        internal ConcurrentDictionary<string, CircuitHost> ConnectedCircuits { get; }
+        internal ConcurrentDictionary<CircuitId, CircuitHost> ConnectedCircuits { get; }
 
         internal MemoryCache DisconnectedCircuits { get; }
 
@@ -155,7 +155,7 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
             };
 
             var entry = new DisconnectedCircuitEntry(circuitHost, cancellationTokenSource);
-            DisconnectedCircuits.Set(circuitHost.CircuitId, entry, entryOptions);
+            DisconnectedCircuits.Set(circuitHost.CircuitId.Secret, entry, entryOptions);
         }
 
         // ConnectAsync is called from the CircuitHub - but the error handling story is a little bit complicated.
@@ -164,20 +164,13 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
         //
         // The solution is to handle exceptions here, and then return null to represent failure.
         //
-        // 1. If the circuit id is invalue return null
-        // 2. If the circuit is not found return null
-        // 3. If the circuit is found, but fails to connect, we need to dispose it here and return null
-        // 4. If everything goes well, return the circuit.
-        public virtual async Task<CircuitHost> ConnectAsync(string circuitId, IClientProxy clientProxy, string connectionId, CancellationToken cancellationToken)
+        // 1. If the circuit is not found return null
+        // 2. If the circuit is found, but fails to connect, we need to dispose it here and return null
+        // 3. If everything goes well, return the circuit.
+        public virtual async Task<CircuitHost> ConnectAsync(CircuitId circuitId, IClientProxy clientProxy, string connectionId, CancellationToken cancellationToken)
         {
             Log.CircuitConnectStarted(_logger, circuitId);
 
-            if (!_circuitIdFactory.ValidateCircuitId(circuitId))
-            {
-                Log.InvalidCircuitId(_logger, circuitId);
-                return null;
-            }
-
             CircuitHost circuitHost;
             bool previouslyConnected;
 
@@ -193,8 +186,8 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
 
                 if (circuitHost == null)
                 {
-                    Log.FailedToReconnectToCircuit(_logger, circuitId);
-                    // Failed to connect. Nothing to do here.
+                    Log.FailedToFindCircuit(_logger, circuitId);
+                    // Failed to find a matching circuit. Nothing to do here.
                     return null;
                 }
 
@@ -220,12 +213,12 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
             try
             {
                 await circuitHandlerTask;
-                Log.ReconnectionSucceeded(_logger, circuitId);
+                Log.ReconnectionSucceeded(_logger, circuitHost.CircuitId);
                 return circuitHost;
             }
             catch (Exception ex)
             {
-                Log.FailedToReconnectToCircuit(_logger, circuitId, ex);
+                Log.FailedToReconnectToCircuit(_logger, circuitHost.CircuitId, ex);
                 await TerminateAsync(circuitId);
 
                 // Return null on failure, because we need to clean up the circuit.
@@ -233,11 +226,11 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
             }
         }
 
-        protected virtual (CircuitHost circuitHost, bool previouslyConnected) ConnectCore(string circuitId, IClientProxy clientProxy, string connectionId)
+        protected virtual (CircuitHost circuitHost, bool previouslyConnected) ConnectCore(CircuitId circuitId, IClientProxy clientProxy, string connectionId)
         {
             if (ConnectedCircuits.TryGetValue(circuitId, out var connectedCircuitHost))
             {
-                Log.ConnectingToActiveCircuit(_logger, circuitId, connectionId);
+                Log.ConnectingToActiveCircuit(_logger, connectedCircuitHost.CircuitId, connectionId);
 
                 // The host is still active i.e. the server hasn't detected the client disconnect.
                 // However the client reconnected establishing a new connection.
@@ -245,15 +238,15 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
                 return (connectedCircuitHost, true);
             }
 
-            if (DisconnectedCircuits.TryGetValue(circuitId, out DisconnectedCircuitEntry disconnectedEntry))
+            if (DisconnectedCircuits.TryGetValue(circuitId.Secret, out DisconnectedCircuitEntry disconnectedEntry))
             {
-                Log.ConnectingToDisconnectedCircuit(_logger, circuitId, connectionId);
+                Log.ConnectingToDisconnectedCircuit(_logger, disconnectedEntry.CircuitHost.CircuitId, connectionId);
 
                 // The host was in disconnected state. Transfer it to ConnectedCircuits so that it's no longer considered disconnected.
                 // First discard the CancellationTokenSource so that the cache entry does not expire.
                 DisposeTokenSource(disconnectedEntry);
 
-                DisconnectedCircuits.Remove(circuitId);
+                DisconnectedCircuits.Remove(circuitId.Secret);
                 ConnectedCircuits.TryAdd(circuitId, disconnectedEntry.CircuitHost);
 
                 disconnectedEntry.CircuitHost.Client.Transfer(clientProxy, connectionId);
@@ -313,17 +306,18 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
             }
         }
 
-        public ValueTask TerminateAsync(string circuitId)
+        // We don't expect this to throw. User code only runs inside DisposeAsync and that does its own error handling.
+        public ValueTask TerminateAsync(CircuitId circuitId)
         {
             CircuitHost circuitHost;
             DisconnectedCircuitEntry entry = default;
             lock (CircuitRegistryLock)
             {
-                if (ConnectedCircuits.TryGetValue(circuitId, out circuitHost) || DisconnectedCircuits.TryGetValue(circuitId, out entry))
+                if (ConnectedCircuits.TryGetValue(circuitId, out circuitHost) || DisconnectedCircuits.TryGetValue(circuitId.Secret, out entry))
                 {
                     circuitHost ??= entry.CircuitHost;
-                    DisconnectedCircuits.Remove(circuitHost.CircuitId);
-                    ConnectedCircuits.TryRemove(circuitHost.CircuitId, out _);
+                    DisconnectedCircuits.Remove(circuitId.Secret);
+                    ConnectedCircuits.TryRemove(circuitId, out _);
                     Log.CircuitDisconnectedPermanently(_logger, circuitHost.CircuitId);
                     circuitHost.Client.SetDisconnected();
                 }
@@ -372,36 +366,36 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
         {
             private static readonly Action<ILogger, string, Exception> _exceptionDisposingCircuitHost;
             private static readonly Action<ILogger, string, Exception> _unhandledExceptionDisposingTokenSource;
-            private static readonly Action<ILogger, string, Exception> _circuitReconnectStarted;
-            private static readonly Action<ILogger, string, Exception> _invalidCircuitId;
-            private static readonly Action<ILogger, string, string, Exception> _connectingToActiveCircuit;
-            private static readonly Action<ILogger, string, string, Exception> _connectingToDisconnectedCircuit;
-            private static readonly Action<ILogger, string, Exception> _failedToReconnectToCircuit;
-            private static readonly Action<ILogger, string, Exception> _reconnectionSucceeded;
-            private static readonly Action<ILogger, string, string, Exception> _circuitDisconnectStarted;
-            private static readonly Action<ILogger, string, Exception> _circuitNotActive;
-            private static readonly Action<ILogger, string, string, Exception> _circuitConnectedToDifferentConnection;
-            private static readonly Action<ILogger, string, Exception> _circuitMarkedDisconnected;
-            private static readonly Action<ILogger, string, Exception> _circuitDisconnectedPermanently;
-            private static readonly Action<ILogger, string, EvictionReason, Exception> _circuitEvicted;
-            private static readonly Action<ILogger, string, Exception> _circuitExceptionHandlerFailed;
+            private static readonly Action<ILogger, CircuitId, Exception> _circuitReconnectStarted;
+            private static readonly Action<ILogger, CircuitId, Exception> _failedToFindCircuit;
+            private static readonly Action<ILogger, CircuitId, string, Exception> _connectingToActiveCircuit;
+            private static readonly Action<ILogger, CircuitId, string, Exception> _connectingToDisconnectedCircuit;
+            private static readonly Action<ILogger, CircuitId, Exception> _failedToReconnectToCircuit;
+            private static readonly Action<ILogger, CircuitId, Exception> _reconnectionSucceeded;
+            private static readonly Action<ILogger, CircuitId, string, Exception> _circuitDisconnectStarted;
+            private static readonly Action<ILogger, CircuitId, Exception> _circuitNotActive;
+            private static readonly Action<ILogger, CircuitId, string, Exception> _circuitConnectedToDifferentConnection;
+            private static readonly Action<ILogger, CircuitId, Exception> _circuitMarkedDisconnected;
+            private static readonly Action<ILogger, CircuitId, Exception> _circuitDisconnectedPermanently;
+            private static readonly Action<ILogger, CircuitId, EvictionReason, Exception> _circuitEvicted;
+            private static readonly Action<ILogger, CircuitId, Exception> _circuitExceptionHandlerFailed;
 
             private static class EventIds
             {
                 public static readonly EventId ExceptionDisposingCircuit = new EventId(100, "ExceptionDisposingCircuit");
                 public static readonly EventId ExceptionDisposingTokenSource = new EventId(101, "ExceptionDisposingTokenSource");
                 public static readonly EventId AttemptingToReconnect = new EventId(102, "AttemptingToReconnect");
-                public static readonly EventId InvalidCircuitId = new EventId(103, "InvalidCircuitId");
-                public static readonly EventId ConnectingToActiveCircuit = new EventId(104, "ConnectingToActiveCircuit");
-                public static readonly EventId ConnectingToDisconnectedCircuit = new EventId(105, "ConnectingToDisconnectedCircuit");
-                public static readonly EventId FailedToReconnectToCircuit = new EventId(106, "FailedToReconnectToCircuit");
-                public static readonly EventId CircuitDisconnectStarted = new EventId(107, "CircuitDisconnectStarted");
-                public static readonly EventId CircuitNotActive = new EventId(108, "CircuitNotActive");
-                public static readonly EventId CircuitConnectedToDifferentConnection = new EventId(109, "CircuitConnectedToDifferentConnection");
-                public static readonly EventId CircuitMarkedDisconnected = new EventId(110, "CircuitMarkedDisconnected");
-                public static readonly EventId CircuitEvicted = new EventId(111, "CircuitEvicted");
-                public static readonly EventId CircuitDisconnectedPermanently = new EventId(112, "CircuitDisconnectedPermanently");
-                public static readonly EventId CircuitExceptionHandlerFailed = new EventId(113, "CircuitExceptionHandlerFailed");
+                public static readonly EventId FailedToFindCircuit = new EventId(104, "FailedToFindCircuit");
+                public static readonly EventId ConnectingToActiveCircuit = new EventId(105, "ConnectingToActiveCircuit");
+                public static readonly EventId ConnectingToDisconnectedCircuit = new EventId(106, "ConnectingToDisconnectedCircuit");
+                public static readonly EventId FailedToReconnectToCircuit = new EventId(107, "FailedToReconnectToCircuit");
+                public static readonly EventId CircuitDisconnectStarted = new EventId(108, "CircuitDisconnectStarted");
+                public static readonly EventId CircuitNotActive = new EventId(109, "CircuitNotActive");
+                public static readonly EventId CircuitConnectedToDifferentConnection = new EventId(110, "CircuitConnectedToDifferentConnection");
+                public static readonly EventId CircuitMarkedDisconnected = new EventId(111, "CircuitMarkedDisconnected");
+                public static readonly EventId CircuitEvicted = new EventId(112, "CircuitEvicted");
+                public static readonly EventId CircuitDisconnectedPermanently = new EventId(113, "CircuitDisconnectedPermanently");
+                public static readonly EventId CircuitExceptionHandlerFailed = new EventId(114, "CircuitExceptionHandlerFailed");
             }
 
             static Log()
@@ -416,67 +410,67 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
                     EventIds.ExceptionDisposingTokenSource,
                     "Exception thrown when disposing token source: {Message}");
 
-                _circuitReconnectStarted = LoggerMessage.Define<string>(
+                _circuitReconnectStarted = LoggerMessage.Define<CircuitId>(
                     LogLevel.Debug,
                     EventIds.AttemptingToReconnect,
-                    "Attempting to reconnect to Circuit with id {CircuitId}.");
+                    "Attempting to reconnect to Circuit with secret {CircuitHost}.");
 
-                _invalidCircuitId = LoggerMessage.Define<string>(
+                _failedToFindCircuit = LoggerMessage.Define<CircuitId>(
                     LogLevel.Debug,
-                    EventIds.InvalidCircuitId,
-                    "Failed to validate circuit id {CircuitId}.");
+                    EventIds.FailedToFindCircuit,
+                    "Failed to find a matching circuit for circuit secret {CircuitHost}.");
 
-                _connectingToActiveCircuit = LoggerMessage.Define<string, string>(
+                _connectingToActiveCircuit = LoggerMessage.Define<CircuitId, string>(
                     LogLevel.Debug,
                     EventIds.ConnectingToActiveCircuit,
                     "Transferring active circuit {CircuitId} to connection {ConnectionId}.");
 
-                _connectingToDisconnectedCircuit = LoggerMessage.Define<string, string>(
+                _connectingToDisconnectedCircuit = LoggerMessage.Define<CircuitId, string>(
                     LogLevel.Debug,
                     EventIds.ConnectingToDisconnectedCircuit,
                     "Transfering disconnected circuit {CircuitId} to connection {ConnectionId}.");
 
-                _failedToReconnectToCircuit = LoggerMessage.Define<string>(
+                _failedToReconnectToCircuit = LoggerMessage.Define<CircuitId>(
                     LogLevel.Debug,
                     EventIds.FailedToReconnectToCircuit,
                     "Failed to reconnect to a circuit with id {CircuitId}.");
 
-                _reconnectionSucceeded = LoggerMessage.Define<string>(
+                _reconnectionSucceeded = LoggerMessage.Define<CircuitId>(
                     LogLevel.Debug,
                     EventIds.FailedToReconnectToCircuit,
                     "Reconnect to circuit with id {CircuitId} succeeded.");
 
-                _circuitDisconnectStarted = LoggerMessage.Define<string, string>(
+                _circuitDisconnectStarted = LoggerMessage.Define<CircuitId, string>(
                     LogLevel.Debug,
                     EventIds.CircuitDisconnectStarted,
                     "Attempting to disconnect circuit with id {CircuitId} from connection {ConnectionId}.");
 
-                _circuitNotActive = LoggerMessage.Define<string>(
+                _circuitNotActive = LoggerMessage.Define<CircuitId>(
                     LogLevel.Debug,
                     EventIds.CircuitNotActive,
                     "Failed to disconnect circuit with id {CircuitId}. The circuit is not active.");
 
-                _circuitConnectedToDifferentConnection = LoggerMessage.Define<string, string>(
+                _circuitConnectedToDifferentConnection = LoggerMessage.Define<CircuitId, string>(
                     LogLevel.Debug,
                     EventIds.CircuitConnectedToDifferentConnection,
                     "Failed to disconnect circuit with id {CircuitId}. The circuit is connected to {ConnectionId}.");
 
-                _circuitMarkedDisconnected = LoggerMessage.Define<string>(
+                _circuitMarkedDisconnected = LoggerMessage.Define<CircuitId>(
                     LogLevel.Debug,
                     EventIds.CircuitMarkedDisconnected,
                     "Circuit with id {CircuitId} is disconnected.");
 
-                _circuitDisconnectedPermanently = LoggerMessage.Define<string>(
+                _circuitDisconnectedPermanently = LoggerMessage.Define<CircuitId>(
                     LogLevel.Debug,
                     EventIds.CircuitDisconnectedPermanently,
                     "Circuit with id {CircuitId} has been removed from the registry for permanent disconnection.");
 
-                _circuitEvicted = LoggerMessage.Define<string, EvictionReason>(
+                _circuitEvicted = LoggerMessage.Define<CircuitId, EvictionReason>(
                     LogLevel.Debug,
                     EventIds.CircuitEvicted,
                     "Circuit with id {CircuitId} evicted due to {EvictionReason}.");
 
-                _circuitExceptionHandlerFailed = LoggerMessage.Define<string>(
+                _circuitExceptionHandlerFailed = LoggerMessage.Define<CircuitId>(
                     LogLevel.Error,
                     EventIds.CircuitExceptionHandlerFailed,
                     "Exception handler for {CircuitId} failed.");
@@ -488,43 +482,43 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
             public static void ExceptionDisposingTokenSource(ILogger logger, Exception exception) =>
                 _unhandledExceptionDisposingTokenSource(logger, exception.Message, exception);
 
-            public static void CircuitConnectStarted(ILogger logger, string circuitId) =>
+            public static void CircuitConnectStarted(ILogger logger, CircuitId circuitId) =>
                 _circuitReconnectStarted(logger, circuitId, null);
 
-            public static void InvalidCircuitId(ILogger logger, string circuitId) =>
-                _invalidCircuitId(logger, circuitId, null);
+            public static void FailedToFindCircuit(ILogger logger, CircuitId circuitId) =>
+                _failedToFindCircuit(logger, circuitId, null);
 
-            public static void ConnectingToActiveCircuit(ILogger logger, string circuitId, string connectionId) =>
+            public static void ConnectingToActiveCircuit(ILogger logger, CircuitId circuitId, string connectionId) =>
                 _connectingToActiveCircuit(logger, circuitId, connectionId, null);
 
-            public static void ConnectingToDisconnectedCircuit(ILogger logger, string circuitId, string connectionId) =>
+            public static void ConnectingToDisconnectedCircuit(ILogger logger, CircuitId circuitId, string connectionId) =>
                 _connectingToDisconnectedCircuit(logger, circuitId, connectionId, null);
 
-            public static void FailedToReconnectToCircuit(ILogger logger, string circuitId, Exception exception = null) =>
+            public static void FailedToReconnectToCircuit(ILogger logger, CircuitId circuitId, Exception exception = null) =>
                 _failedToReconnectToCircuit(logger, circuitId, exception);
 
-            public static void ReconnectionSucceeded(ILogger logger, string circuitId) =>
+            public static void ReconnectionSucceeded(ILogger logger, CircuitId circuitId) =>
                 _reconnectionSucceeded(logger, circuitId, null);
 
-            public static void CircuitDisconnectStarted(ILogger logger, string circuitId, string connectionId) =>
+            public static void CircuitDisconnectStarted(ILogger logger, CircuitId circuitId, string connectionId) =>
                 _circuitDisconnectStarted(logger, circuitId, connectionId, null);
 
-            public static void CircuitNotActive(ILogger logger, string circuitId) =>
+            public static void CircuitNotActive(ILogger logger, CircuitId circuitId) =>
                 _circuitNotActive(logger, circuitId, null);
 
-            public static void CircuitConnectedToDifferentConnection(ILogger logger, string circuitId, string connectionId) =>
+            public static void CircuitConnectedToDifferentConnection(ILogger logger, CircuitId circuitId, string connectionId) =>
                 _circuitConnectedToDifferentConnection(logger, circuitId, connectionId, null);
 
-            public static void CircuitMarkedDisconnected(ILogger logger, string circuitId) =>
+            public static void CircuitMarkedDisconnected(ILogger logger, CircuitId circuitId) =>
                 _circuitMarkedDisconnected(logger, circuitId, null);
 
-            public static void CircuitDisconnectedPermanently(ILogger logger, string circuitId) =>
+            public static void CircuitDisconnectedPermanently(ILogger logger, CircuitId circuitId) =>
                 _circuitDisconnectedPermanently(logger, circuitId, null);
 
-            public static void CircuitEvicted(ILogger logger, string circuitId, EvictionReason evictionReason) =>
+            public static void CircuitEvicted(ILogger logger, CircuitId circuitId, EvictionReason evictionReason) =>
                _circuitEvicted(logger, circuitId, evictionReason, null);
 
-            public static void CircuitExceptionHandlerFailed(ILogger logger, string circuitId, Exception exception) =>
+            public static void CircuitExceptionHandlerFailed(ILogger logger, CircuitId circuitId, Exception exception) =>
                 _circuitExceptionHandlerFailed(logger, circuitId, exception);
         }
     }
diff --git a/src/Components/Server/src/ComponentDescriptor.cs b/src/Components/Server/src/Circuits/ComponentDescriptor.cs
similarity index 72%
rename from src/Components/Server/src/ComponentDescriptor.cs
rename to src/Components/Server/src/Circuits/ComponentDescriptor.cs
index 30c6319974..0c3dcf6cf2 100644
--- a/src/Components/Server/src/ComponentDescriptor.cs
+++ b/src/Components/Server/src/Circuits/ComponentDescriptor.cs
@@ -9,12 +9,12 @@ namespace Microsoft.AspNetCore.Components.Server
     {
         public Type ComponentType { get; set; }
 
-        public string Selector { get; set; }
+        public int Sequence { get; set; }
 
-        public void Deconstruct(out Type componentType, out string selector)
+        public void Deconstruct(out Type componentType, out int sequence)
         {
             componentType = ComponentType;
-            selector = Selector;
+            sequence = Sequence;
         }
     }
 }
diff --git a/src/Components/Server/src/Circuits/DefaultCircuitFactory.cs b/src/Components/Server/src/Circuits/DefaultCircuitFactory.cs
deleted file mode 100644
index cbeb6d2c7e..0000000000
--- a/src/Components/Server/src/Circuits/DefaultCircuitFactory.cs
+++ /dev/null
@@ -1,135 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
-using System.Text.Encodings.Web;
-using Microsoft.AspNetCore.Components.Routing;
-using Microsoft.AspNetCore.Components.Web.Rendering;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using Microsoft.JSInterop;
-
-namespace Microsoft.AspNetCore.Components.Server.Circuits
-{
-    internal class DefaultCircuitFactory : CircuitFactory
-    {
-        private readonly IServiceScopeFactory _scopeFactory;
-        private readonly ILoggerFactory _loggerFactory;
-        private readonly CircuitIdFactory _circuitIdFactory;
-        private readonly CircuitOptions _options;
-        private readonly ILogger _logger;
-
-        public DefaultCircuitFactory(
-            IServiceScopeFactory scopeFactory,
-            ILoggerFactory loggerFactory,
-            CircuitIdFactory circuitIdFactory,
-            IOptions<CircuitOptions> options)
-        {
-            _scopeFactory = scopeFactory ?? throw new ArgumentNullException(nameof(scopeFactory));
-            _loggerFactory = loggerFactory ?? throw new ArgumentNullException(nameof(loggerFactory));
-            _circuitIdFactory = circuitIdFactory ?? throw new ArgumentNullException(nameof(circuitIdFactory));
-            _options = options?.Value ?? throw new ArgumentNullException(nameof(options));
-
-            _logger = _loggerFactory.CreateLogger<DefaultCircuitFactory>();
-        }
-
-        public override CircuitHost CreateCircuitHost(
-            HttpContext httpContext,
-            CircuitClientProxy client,
-            string baseUri,
-            string uri,
-            ClaimsPrincipal user)
-        {
-            // We do as much intialization as possible eagerly in this method, which makes the error handling
-            // story much simpler. If we throw from here, it's handled inside the initial hub method.
-            var components = ResolveComponentMetadata(httpContext);
-
-            var scope = _scopeFactory.CreateScope();
-            var jsRuntime = (RemoteJSRuntime)scope.ServiceProvider.GetRequiredService<IJSRuntime>();
-            jsRuntime.Initialize(client);
-
-            var navigationManager = (RemoteNavigationManager)scope.ServiceProvider.GetRequiredService<NavigationManager>();
-            var navigationInterception = (RemoteNavigationInterception)scope.ServiceProvider.GetRequiredService<INavigationInterception>();
-            if (client.Connected)
-            {
-                navigationManager.AttachJsRuntime(jsRuntime);
-                navigationManager.Initialize(baseUri, uri);
-
-                navigationInterception.AttachJSRuntime(jsRuntime);
-            }
-            else
-            {
-                navigationManager.Initialize(baseUri, uri);
-            }
-
-            var renderer = new RemoteRenderer(
-                scope.ServiceProvider,
-                _loggerFactory,
-                _options,
-                jsRuntime,
-                client,
-                _loggerFactory.CreateLogger<RemoteRenderer>());
-
-            var circuitHandlers = scope.ServiceProvider.GetServices<CircuitHandler>()
-                .OrderBy(h => h.Order)
-                .ToArray();
-
-            var circuitHost = new CircuitHost(
-                _circuitIdFactory.CreateCircuitId(),
-                scope,
-                _options,
-                client,
-                renderer,
-                components,
-                jsRuntime,
-                circuitHandlers,
-                _loggerFactory.CreateLogger<CircuitHost>());
-            Log.CreatedCircuit(_logger, circuitHost);
-
-            // Initialize per - circuit data that services need
-            (circuitHost.Services.GetRequiredService<ICircuitAccessor>() as DefaultCircuitAccessor).Circuit = circuitHost.Circuit;
-            circuitHost.SetCircuitUser(user);
-
-            return circuitHost;
-        }
-
-        public static IReadOnlyList<ComponentDescriptor> ResolveComponentMetadata(HttpContext httpContext)
-        {
-            var endpoint = httpContext.GetEndpoint();
-            if (endpoint == null)
-            {
-                throw new InvalidOperationException(
-                    $"{nameof(ComponentHub)} doesn't have an associated endpoint. " +
-                    "Use 'app.UseEndpoints(endpoints => endpoints.MapBlazorHub<App>(\"app\"))' to register your hub.");
-            }
-
-            return endpoint.Metadata.GetOrderedMetadata<ComponentDescriptor>();
-        }
-
-        private static class Log
-        {
-            private static readonly Action<ILogger, string, string, Exception> _createdConnectedCircuit =
-                LoggerMessage.Define<string, string>(LogLevel.Debug, new EventId(1, "CreatedConnectedCircuit"), "Created circuit {CircuitId} for connection {ConnectionId}");
-
-            private static readonly Action<ILogger, string, Exception> _createdDisconnectedCircuit =
-                LoggerMessage.Define<string>(LogLevel.Debug, new EventId(2, "CreatedDisconnectedCircuit"), "Created circuit {CircuitId} for disconnected client");
-
-            internal static void CreatedCircuit(ILogger logger, CircuitHost circuitHost)
-            {
-                if (circuitHost.Client.Connected)
-                {
-                    _createdConnectedCircuit(logger, circuitHost.CircuitId, circuitHost.Client.ConnectionId, null);
-                }
-                else
-                {
-                    _createdDisconnectedCircuit(logger, circuitHost.CircuitId, null);
-                }
-            }
-        }
-    }
-}
diff --git a/src/Components/Server/src/Circuits/RemoteJSRuntime.cs b/src/Components/Server/src/Circuits/RemoteJSRuntime.cs
index 442775d451..ef42dcaa72 100644
--- a/src/Components/Server/src/Circuits/RemoteJSRuntime.cs
+++ b/src/Components/Server/src/Circuits/RemoteJSRuntime.cs
@@ -2,16 +2,16 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using System.Runtime.ExceptionServices;
 using System.Text.Json;
 using Microsoft.AspNetCore.SignalR;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Microsoft.JSInterop;
+using Microsoft.JSInterop.Infrastructure;
 
 namespace Microsoft.AspNetCore.Components.Server.Circuits
 {
-    internal class RemoteJSRuntime : JSRuntimeBase
+    internal class RemoteJSRuntime : JSRuntime
     {
         private readonly CircuitOptions _options;
         private readonly ILogger<RemoteJSRuntime> _logger;
@@ -22,6 +22,7 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
             _options = options.Value;
             _logger = logger;
             DefaultAsyncTimeout = _options.JSInteropDefaultCallTimeout;
+            JsonSerializerOptions.Converters.Add(new ElementReferenceJsonConverter());
         }
 
         internal void Initialize(CircuitClientProxy clientProxy)
@@ -29,28 +30,34 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
             _clientProxy = clientProxy ?? throw new ArgumentNullException(nameof(clientProxy));
         }
 
-        protected override void EndInvokeDotNet(string callId, bool success, object resultOrError, string assemblyName, string methodIdentifier, long dotNetObjectId)
+        protected override void EndInvokeDotNet(DotNetInvocationInfo invocationInfo, in DotNetInvocationResult invocationResult)
         {
-            if (!success)
+            if (!invocationResult.Success)
             {
-                var actualException = resultOrError is Exception ex ? ex : resultOrError is ExceptionDispatchInfo edi ? edi.SourceException : resultOrError;
-                Log.InvokeDotNetMethodException(_logger, callId, assemblyName, methodIdentifier, dotNetObjectId, actualException as Exception);
+                Log.InvokeDotNetMethodException(_logger, invocationInfo, invocationResult.Exception);
+                string errorMessage;
+
                 if (_options.DetailedErrors)
                 {
-                    EndInvokeDotNetCore(callId, success, actualException.ToString());
+                    errorMessage = invocationResult.Exception.ToString();
                 }
                 else
                 {
-                    var message = $"There was an exception invoking '{methodIdentifier}' on assembly '{assemblyName}'. For more details turn on " +
-                        $"detailed exceptions in '{typeof(CircuitOptions).Name}.{nameof(CircuitOptions.DetailedErrors)}'";
+                    errorMessage = $"There was an exception invoking '{invocationInfo.MethodIdentifier}'";
+                    if (invocationInfo.AssemblyName != null)
+                    {
+                        errorMessage += $" on assembly '{invocationInfo.AssemblyName}'";
+                    }
 
-                    EndInvokeDotNetCore(callId, success, message);
+                    errorMessage += $". For more details turn on detailed exceptions in '{nameof(CircuitOptions)}.{nameof(CircuitOptions.DetailedErrors)}'";
                 }
+
+                EndInvokeDotNetCore(invocationInfo.CallId, success: false, errorMessage);
             }
             else
             {
-                Log.InvokeDotNetMethodSuccess(_logger, callId, assemblyName, methodIdentifier, dotNetObjectId);
-                EndInvokeDotNetCore(callId, success, resultOrError);
+                Log.InvokeDotNetMethodSuccess(_logger, invocationInfo);
+                EndInvokeDotNetCore(invocationInfo.CallId, success: true, invocationResult.Result);
             }
         }
 
@@ -58,7 +65,7 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
         {
             _clientProxy.SendAsync(
                 "JS.EndInvokeDotNet",
-                JsonSerializer.Serialize(new[] { callId, success, resultOrError }, JsonSerializerOptionsProvider.Options));
+                JsonSerializer.Serialize(new[] { callId, success, resultOrError }, JsonSerializerOptions));
         }
 
         protected override void BeginInvokeJS(long asyncHandle, string identifier, string argsJson)
@@ -112,27 +119,27 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
             internal static void BeginInvokeJS(ILogger logger, long asyncHandle, string identifier) =>
                 _beginInvokeJS(logger, asyncHandle, identifier, null);
 
-            internal static void InvokeDotNetMethodException(ILogger logger, string callId, string assemblyName, string methodIdentifier, long dotNetObjectReference, Exception exception)
+            internal static void InvokeDotNetMethodException(ILogger logger, in DotNetInvocationInfo invocationInfo , Exception exception)
             {
-                if (assemblyName != null)
+                if (invocationInfo.AssemblyName != null)
                 {
-                    _invokeStaticDotNetMethodException(logger, assemblyName, methodIdentifier, callId, exception);
+                    _invokeStaticDotNetMethodException(logger, invocationInfo.AssemblyName, invocationInfo.MethodIdentifier, invocationInfo.CallId, exception);
                 }
                 else
                 {
-                    _invokeInstanceDotNetMethodException(logger, methodIdentifier, dotNetObjectReference, callId, exception);
+                    _invokeInstanceDotNetMethodException(logger, invocationInfo.MethodIdentifier, invocationInfo.DotNetObjectId, invocationInfo.CallId, exception);
                 }
             }
 
-            internal static void InvokeDotNetMethodSuccess(ILogger<RemoteJSRuntime> logger, string callId, string assemblyName, string methodIdentifier, long dotNetObjectId)
+            internal static void InvokeDotNetMethodSuccess(ILogger<RemoteJSRuntime> logger, in DotNetInvocationInfo invocationInfo)
             {
-                if (assemblyName != null)
+                if (invocationInfo.AssemblyName != null)
                 {
-                    _invokeStaticDotNetMethodSuccess(logger, assemblyName, methodIdentifier, callId, null);
+                    _invokeStaticDotNetMethodSuccess(logger, invocationInfo.AssemblyName, invocationInfo.MethodIdentifier, invocationInfo.CallId, null);
                 }
                 else
                 {
-                    _invokeInstanceDotNetMethodSuccess(logger, methodIdentifier, dotNetObjectId, callId, null);
+                    _invokeInstanceDotNetMethodSuccess(logger, invocationInfo.MethodIdentifier, invocationInfo.DotNetObjectId, invocationInfo.CallId, null);
                 }
 
             }
diff --git a/src/Components/Server/src/Circuits/RemoteRenderer.cs b/src/Components/Server/src/Circuits/RemoteRenderer.cs
index a53ee90de3..31046788a9 100644
--- a/src/Components/Server/src/Circuits/RemoteRenderer.cs
+++ b/src/Components/Server/src/Circuits/RemoteRenderer.cs
@@ -6,21 +6,17 @@ using System.Collections.Concurrent;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Components.Rendering;
-using Microsoft.AspNetCore.Components.Server;
-using Microsoft.AspNetCore.Components.Server.Circuits;
 using Microsoft.AspNetCore.SignalR;
 using Microsoft.Extensions.Internal;
 using Microsoft.Extensions.Logging;
 using Microsoft.JSInterop;
 
-namespace Microsoft.AspNetCore.Components.Web.Rendering
+namespace Microsoft.AspNetCore.Components.Server.Circuits
 {
-    internal class RemoteRenderer : Renderer
+    internal class RemoteRenderer : Microsoft.AspNetCore.Components.RenderTree.Renderer
     {
         private static readonly Task CanceledTask = Task.FromCanceled(new CancellationToken(canceled: true));
 
-        private readonly IJSRuntime _jsRuntime;
         private readonly CircuitClientProxy _client;
         private readonly CircuitOptions _options;
         private readonly ILogger _logger;
@@ -40,12 +36,10 @@ namespace Microsoft.AspNetCore.Components.Web.Rendering
             IServiceProvider serviceProvider,
             ILoggerFactory loggerFactory,
             CircuitOptions options,
-            IJSRuntime jsRuntime,
             CircuitClientProxy client,
             ILogger logger)
             : base(serviceProvider, loggerFactory)
         {
-            _jsRuntime = jsRuntime;
             _client = client;
             _options = options;
             _logger = logger;
@@ -64,10 +58,7 @@ namespace Microsoft.AspNetCore.Components.Web.Rendering
             var component = InstantiateComponent(componentType);
             var componentId = AssignRootComponentId(component);
 
-            var attachComponentTask = _jsRuntime.InvokeAsync<object>(
-                "Blazor._internal.attachRootComponentToElement",
-                domElementSelector,
-                componentId);
+            var attachComponentTask = _client.SendAsync("JS.AttachComponent", componentId, domElementSelector);
             CaptureAsyncExceptions(attachComponentTask);
 
             return RenderRootComponentAsync(componentId);
@@ -132,7 +123,7 @@ namespace Microsoft.AspNetCore.Components.Web.Rendering
         }
 
         /// <inheritdoc />
-        protected override Task UpdateDisplayAsync(in RenderBatch batch)
+        protected override Task UpdateDisplayAsync(in Microsoft.AspNetCore.Components.RenderTree.RenderBatch batch)
         {
             if (_disposing)
             {
diff --git a/src/Components/Server/src/Circuits/RenderBatchWriter.cs b/src/Components/Server/src/Circuits/RenderBatchWriter.cs
index f71da86e59..4238447c81 100644
--- a/src/Components/Server/src/Circuits/RenderBatchWriter.cs
+++ b/src/Components/Server/src/Circuits/RenderBatchWriter.cs
@@ -5,10 +5,9 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
-using Microsoft.AspNetCore.Components.Rendering;
 using Microsoft.AspNetCore.Components.RenderTree;
 
-namespace Microsoft.AspNetCore.Components.Web.Rendering
+namespace Microsoft.AspNetCore.Components.Server.Circuits
 {
     // TODO: We should consider *not* having this type of infrastructure in the .Server
     // project, but instead in some new project called .Remote or similar, since it
diff --git a/src/Components/Server/src/Circuits/ServerComponentDeserializer.cs b/src/Components/Server/src/Circuits/ServerComponentDeserializer.cs
new file mode 100644
index 0000000000..0fe81f4ead
--- /dev/null
+++ b/src/Components/Server/src/Circuits/ServerComponentDeserializer.cs
@@ -0,0 +1,263 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using Microsoft.AspNetCore.DataProtection;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Components.Server
+{
+    // **Component descriptor protocol**
+    // MVC serializes one or more components as comments in HTML.
+    // Each comment is in the form <!-- Blazor:<<Json>>--> for example { "type": "server", "sequence": 0, descriptor: "base64(dataprotected(<<ServerComponent>>))" }
+    // Where <<Json>> has the following properties:
+    // 'type' indicates the marker type. For now it's limited to server.
+    // 'sequence' indicates the order in which this component got rendered on the server.
+    // 'descriptor' a data-protected payload that allows the server to validate the legitimacy of the rendered component.
+    // 'prerenderId' a unique identifier that uniquely identifies the marker to match start and end markers.
+    //
+    // descriptor holds the information to validate a component render request. It prevents an infinite number of components
+    // from being rendered by a given client.
+    //
+    // descriptor is a data protected json payload that holds the following information
+    // 'sequence' indicates the order in which this component got rendered on the server.
+    // 'assemblyName' the assembly name for the rendered component.
+    // 'type' the full type name for the rendered component.
+    // 'invocationId' a random string that matches all components rendered by as part of a single HTTP response.
+    // For example: base64(dataprotection({ "sequence": 1, "assemblyName": "Microsoft.AspNetCore.Components", "type":"Microsoft.AspNetCore.Components.Routing.Router", "invocationId": "<<guid>>"}))
+
+    // Serialization:
+    // For a given response, MVC renders one or more markers in sequence, including a descriptor for each rendered
+    // component containing the information described above.
+
+    // Deserialization:
+    // To prevent a client from rendering an infinite amount of components, we require clients to send all component
+    // markers in order. They can do so thanks to the sequence included in the marker.
+    // When we process a marker we do the following.
+    // * We unprotect the data-protected information.
+    // * We validate that the sequence number for the descriptor goes after the previous descriptor.
+    // * We compare the invocationId for the previous descriptor against the invocationId for the current descriptor to make sure they match.
+    // By doing this we achieve three things:
+    // * We ensure that the descriptor came from the server.
+    // * We ensure that a client can't just send an infinite amount of components to render.
+    // * We ensure that we do the minimal amount of work in the case of an invalid sequence of descriptors.
+    //
+    // For example:
+    // A client can't just send 100 component markers and force us to process them if the server didn't generate those 100 markers.
+    //  * If a marker is out of sequence we will fail early, so we process at most n-1 markers.
+    //  * If a marker has the right sequence but the invocation ID is different we will fail at that point. We know for sure that the
+    //    component wasn't render as part of the same response.
+    //  * If a marker can't be unprotected we will fail early. We know that the marker was tampered with and can't be trusted.
+    internal class ServerComponentDeserializer
+    {
+        private readonly IDataProtector _dataProtector;
+        private readonly ILogger<ServerComponentDeserializer> _logger;
+        private readonly ServerComponentTypeCache _rootComponentTypeCache;
+
+        public ServerComponentDeserializer(
+            IDataProtectionProvider dataProtectionProvider,
+            ILogger<ServerComponentDeserializer> logger,
+            ServerComponentTypeCache rootComponentTypeCache)
+        {
+            // When we protect the data we use a time-limited data protector with the
+            // limits established in 'ServerComponentSerializationSettings.DataExpiration'
+            // We don't use any of the additional methods provided by ITimeLimitedDataProtector
+            // in this class, but we need to create one for the unprotect operations to work
+            // even though we simply call '_dataProtector.Unprotect'.
+            // See the comment in ServerComponentSerializationSettings.DataExpiration to understand
+            // why we limit the validity of the protected payloads.
+            _dataProtector = dataProtectionProvider
+                .CreateProtector(ServerComponentSerializationSettings.DataProtectionProviderPurpose)
+                .ToTimeLimitedDataProtector();
+
+            _logger = logger;
+            _rootComponentTypeCache = rootComponentTypeCache;
+        }
+
+        public bool TryDeserializeComponentDescriptorCollection(string serializedComponentRecords, out List<ComponentDescriptor> descriptors)
+        {
+            var markers = JsonSerializer.Deserialize<IEnumerable<ServerComponentMarker>>(serializedComponentRecords, ServerComponentSerializationSettings.JsonSerializationOptions);
+            descriptors = new List<ComponentDescriptor>();
+            int lastSequence = -1;
+
+            var previousInstance = new ServerComponent();
+            foreach (var marker in markers)
+            {
+                if (marker.Type != ServerComponentMarker.ServerMarkerType)
+                {
+                    Log.InvalidMarkerType(_logger, marker.Type);
+                    descriptors.Clear();
+                    return false;
+                }
+
+                if (marker.Descriptor == null)
+                {
+                    Log.MissingMarkerDescriptor(_logger);
+                    descriptors.Clear();
+                    return false;
+                }
+
+                var (descriptor, serverComponent) = DeserializeServerComponent(marker);
+                if (descriptor == null)
+                {
+                    // We failed to deserialize the component descriptor for some reason.
+                    descriptors.Clear();
+                    return false;
+                }
+
+                // We force our client to send the descriptors in order so that we do minimal work.
+                // The list of descriptors starts with 0 and lastSequence is initialized to -1 so this
+                // check covers that the sequence starts by 0.
+                if (lastSequence != serverComponent.Sequence - 1)
+                {
+                    if (lastSequence == -1)
+                    {
+                        Log.DescriptorSequenceMustStartAtZero(_logger, serverComponent.Sequence);
+                    }
+                    else
+                    {
+                        Log.OutOfSequenceDescriptor(_logger, lastSequence, serverComponent.Sequence);
+                    }
+                    descriptors.Clear();
+                    return false;
+                }
+
+                if (lastSequence != -1 && !previousInstance.InvocationId.Equals(serverComponent.InvocationId))
+                {
+                    Log.MismatchedInvocationId(_logger, previousInstance.InvocationId.ToString("N"), serverComponent.InvocationId.ToString("N"));
+                    descriptors.Clear();
+                    return false;
+                }
+
+                // As described below, we build a chain of descriptors to prevent being flooded by
+                // descriptors from a client not behaving properly.
+                lastSequence = serverComponent.Sequence;
+                previousInstance = serverComponent;
+                descriptors.Add(descriptor);
+            }
+
+            return true;
+        }
+
+        private (ComponentDescriptor, ServerComponent) DeserializeServerComponent(ServerComponentMarker record)
+        {
+            string unprotected;
+            try
+            {
+                unprotected = _dataProtector.Unprotect(record.Descriptor);
+            }
+            catch (Exception e)
+            {
+                Log.FailedToUnprotectDescriptor(_logger, e);
+                return default;
+            }
+
+            ServerComponent serverComponent;
+            try
+            {
+                serverComponent = JsonSerializer.Deserialize<ServerComponent>(
+                    unprotected,
+                    ServerComponentSerializationSettings.JsonSerializationOptions);
+            }
+            catch (Exception e)
+            {
+                Log.FailedToDeserializeDescriptor(_logger, e);
+                return default;
+            }
+
+            var componentType = _rootComponentTypeCache
+                .GetRootComponent(serverComponent.AssemblyName, serverComponent.TypeName);
+
+            if (componentType == null)
+            {
+                Log.FailedToFindComponent(_logger, serverComponent.TypeName, serverComponent.AssemblyName);
+                return default;
+            }
+
+            var componentDescriptor = new ComponentDescriptor
+            {
+                ComponentType = componentType,
+                Sequence = serverComponent.Sequence
+            };
+
+            return (componentDescriptor, serverComponent);
+        }
+
+        private static class Log
+        {
+            private static readonly Action<ILogger, Exception> _failedToDeserializeDescriptor =
+                LoggerMessage.Define(
+                    LogLevel.Debug,
+                    new EventId(1, "FailedToDeserializeDescriptor"),
+                    "Failed to deserialize the component descriptor.");
+
+            private static readonly Action<ILogger, string, string, Exception> _failedToFindComponent =
+                LoggerMessage.Define<string, string>(
+                    LogLevel.Debug,
+                    new EventId(2, "FailedToFindComponent"),
+                    "Failed to find component '{ComponentName}' in assembly '{Assembly}'.");
+
+            private static readonly Action<ILogger, Exception> _failedToUnprotectDescriptor =
+                LoggerMessage.Define(
+                    LogLevel.Debug,
+                    new EventId(3, "FailedToUnprotectDescriptor"),
+                    "Failed to unprotect the component descriptor.");
+
+            private static readonly Action<ILogger, string, Exception> _invalidMarkerType =
+                LoggerMessage.Define<string>(
+                    LogLevel.Debug,
+                    new EventId(4, "InvalidMarkerType"),
+                    "Invalid component marker type '{}'.");
+
+            private static readonly Action<ILogger, Exception> _missingMarkerDescriptor =
+                LoggerMessage.Define(
+                    LogLevel.Debug,
+                    new EventId(5, "MissingMarkerDescriptor"),
+                    "The component marker is missing the descriptor.");
+
+            private static readonly Action<ILogger, string, string, Exception> _mismatchedInvocationId =
+                LoggerMessage.Define<string, string>(
+                    LogLevel.Debug,
+                    new EventId(6, "MismatchedInvocationId"),
+                    "The descriptor invocationId is '{invocationId}' and got a descriptor with invocationId '{currentInvocationId}'.");
+
+            private static readonly Action<ILogger, int, int, Exception> _outOfSequenceDescriptor =
+                LoggerMessage.Define<int, int>(
+                    LogLevel.Debug,
+                    new EventId(7, "OutOfSequenceDescriptor"),
+                    "The last descriptor sequence was '{lastSequence}' and got a descriptor with sequence '{receivedSequence}'.");
+
+            private static readonly Action<ILogger, int, Exception> _descriptorSequenceMustStartAtZero =
+                LoggerMessage.Define<int>(
+                    LogLevel.Debug,
+                    new EventId(8, "DescriptorSequenceMustStartAtZero"),
+                    "The descriptor sequence '{sequence}' is an invalid start sequence.");
+
+            public static void FailedToDeserializeDescriptor(ILogger<ServerComponentDeserializer> logger, Exception e) =>
+                _failedToDeserializeDescriptor(logger, e);
+
+            public static void FailedToFindComponent(ILogger<ServerComponentDeserializer> logger, string assemblyName, string typeName) =>
+                _failedToFindComponent(logger, assemblyName, typeName, null);
+
+            public static void FailedToUnprotectDescriptor(ILogger<ServerComponentDeserializer> logger, Exception e) =>
+                _failedToUnprotectDescriptor(logger, e);
+
+            public static void InvalidMarkerType(ILogger<ServerComponentDeserializer> logger, string markerType) =>
+                _invalidMarkerType(logger, markerType, null);
+
+            public static void MissingMarkerDescriptor(ILogger<ServerComponentDeserializer> logger) =>
+                _missingMarkerDescriptor(logger, null);
+
+            public static void MismatchedInvocationId(ILogger<ServerComponentDeserializer> logger, string invocationId, string currentInvocationId) =>
+                _mismatchedInvocationId(logger, invocationId, currentInvocationId, null);
+
+            public static void OutOfSequenceDescriptor(ILogger<ServerComponentDeserializer> logger, int lastSequence, int sequence) =>
+                _outOfSequenceDescriptor(logger, lastSequence, sequence, null);
+
+            public static void DescriptorSequenceMustStartAtZero(ILogger<ServerComponentDeserializer> logger, int sequence) =>
+                _descriptorSequenceMustStartAtZero(logger, sequence, null);
+        }
+    }
+}
diff --git a/src/Components/Server/src/Circuits/ServerComponentTypeCache.cs b/src/Components/Server/src/Circuits/ServerComponentTypeCache.cs
new file mode 100644
index 0000000000..4c694795d6
--- /dev/null
+++ b/src/Components/Server/src/Circuits/ServerComponentTypeCache.cs
@@ -0,0 +1,59 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Concurrent;
+using System.Linq;
+using System.Reflection;
+
+namespace Microsoft.AspNetCore.Components
+{
+    // A cache for root component types
+    internal class ServerComponentTypeCache
+    {
+        private readonly ConcurrentDictionary<Key, Type> _typeToKeyLookUp = new ConcurrentDictionary<Key, Type>();
+
+        public Type GetRootComponent(string assembly, string type)
+        {
+            var key = new Key(assembly, type);
+            if (_typeToKeyLookUp.TryGetValue(key, out var resolvedType))
+            {
+                return resolvedType;
+            }
+            else
+            {
+                return _typeToKeyLookUp.GetOrAdd(key, ResolveType, AppDomain.CurrentDomain.GetAssemblies());
+            }
+        }
+
+        private static Type ResolveType(Key key, Assembly[] assemblies)
+        {
+            var assembly = assemblies
+                .FirstOrDefault(a => string.Equals(a.GetName().Name, key.Assembly, StringComparison.Ordinal));
+
+            if (assembly == null)
+            {
+                return null;
+            }
+
+            return assembly.GetType(key.Type, throwOnError: false, ignoreCase: false);
+        }
+
+        private struct Key : IEquatable<Key>
+        {
+            public Key(string assembly, string type) =>
+                (Assembly, Type) = (assembly, type);
+
+            public string Assembly { get; set; }
+
+            public string Type { get; set; }
+
+            public override bool Equals(object obj) => Equals((Key)obj);
+
+            public bool Equals(Key other) => string.Equals(Assembly, other.Assembly, StringComparison.Ordinal) &&
+                string.Equals(Type, other.Type, StringComparison.Ordinal);
+
+            public override int GetHashCode() => HashCode.Combine(Assembly, Type);
+        }
+    }
+}
diff --git a/src/Components/Server/src/ComponentHub.cs b/src/Components/Server/src/ComponentHub.cs
index 7ba95300de..cb347a30be 100644
--- a/src/Components/Server/src/ComponentHub.cs
+++ b/src/Components/Server/src/ComponentHub.cs
@@ -8,7 +8,6 @@ using Microsoft.AspNetCore.Components.Server.Circuits;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.SignalR;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
 
 namespace Microsoft.AspNetCore.Components.Server
 {
@@ -37,20 +36,23 @@ namespace Microsoft.AspNetCore.Components.Server
     internal sealed class ComponentHub : Hub
     {
         private static readonly object CircuitKey = new object();
+        private readonly ServerComponentDeserializer _serverComponentSerializer;
         private readonly CircuitFactory _circuitFactory;
+        private readonly CircuitIdFactory _circuitIdFactory;
         private readonly CircuitRegistry _circuitRegistry;
-        private readonly CircuitOptions _options;
         private readonly ILogger _logger;
 
         public ComponentHub(
+            ServerComponentDeserializer serializer,
             CircuitFactory circuitFactory,
+            CircuitIdFactory circuitIdFactory,
             CircuitRegistry circuitRegistry,
-            ILogger<ComponentHub> logger,
-            IOptions<CircuitOptions> options)
+            ILogger<ComponentHub> logger)
         {
+            _serverComponentSerializer = serializer;
             _circuitFactory = circuitFactory;
+            _circuitIdFactory = circuitIdFactory;
             _circuitRegistry = circuitRegistry;
-            _options = options.Value;
             _logger = logger;
         }
 
@@ -72,7 +74,7 @@ namespace Microsoft.AspNetCore.Components.Server
             return _circuitRegistry.DisconnectAsync(circuitHost, Context.ConnectionId);
         }
 
-        public async ValueTask<string> StartCircuit(string baseUri, string uri)
+        public async ValueTask<string> StartCircuit(string baseUri, string uri, string serializedComponentRecords)
         {
             var circuitHost = GetCircuit();
             if (circuitHost != null)
@@ -101,11 +103,11 @@ namespace Microsoft.AspNetCore.Components.Server
                 return null;
             }
 
-            // From this point, we can try to actually initialize the circuit.
-            if (DefaultCircuitFactory.ResolveComponentMetadata(Context.GetHttpContext()).Count == 0)
+            if (!_serverComponentSerializer.TryDeserializeComponentDescriptorCollection(serializedComponentRecords, out var components))
             {
-                // No components preregistered so return. This is totally normal if the components were prerendered.
-                Log.NoComponentsRegisteredInEndpoint(_logger, Context.GetHttpContext().GetEndpoint()?.DisplayName);
+                Log.InvalidInputData(_logger);
+                await NotifyClientError(Clients.Caller, $"The list of component records is not valid.");
+                Context.Abort();
                 return null;
             }
 
@@ -113,7 +115,7 @@ namespace Microsoft.AspNetCore.Components.Server
             {
                 var circuitClient = new CircuitClientProxy(Clients.Caller, Context.ConnectionId);
                 circuitHost = _circuitFactory.CreateCircuitHost(
-                    Context.GetHttpContext(),
+                    components,
                     circuitClient,
                     baseUri,
                     uri,
@@ -129,7 +131,12 @@ namespace Microsoft.AspNetCore.Components.Server
                 // to run inside it until after InitializeAsync completes.
                 _circuitRegistry.Register(circuitHost);
                 SetCircuit(circuitHost);
-                return circuitHost.CircuitId;
+
+                // Returning the secret here so the client can reconnect.
+                //
+                // Logging the secret and circuit ID here so we can associate them with just logs (if TRACE level is on).
+                Log.CreatedCircuit(_logger, circuitHost.CircuitId, circuitHost.CircuitId.Secret, Context.ConnectionId);
+                return circuitHost.CircuitId.Secret;
             }
             catch (Exception ex)
             {
@@ -142,10 +149,22 @@ namespace Microsoft.AspNetCore.Components.Server
             }
         }
 
-        public async ValueTask<bool> ConnectCircuit(string circuitId)
+        public async ValueTask<bool> ConnectCircuit(string circuitIdSecret)
         {
-            // ConnectionAsync will not throw.
-            var circuitHost = await _circuitRegistry.ConnectAsync(circuitId, Clients.Caller, Context.ConnectionId, Context.ConnectionAborted);
+            // TryParseCircuitId will not throw.
+            if (!_circuitIdFactory.TryParseCircuitId(circuitIdSecret, out var circuitId))
+            {
+                // Invalid id.
+                Log.InvalidCircuitId(_logger, circuitIdSecret);
+                return false;
+            }
+
+            // ConnectAsync will not throw.
+            var circuitHost = await _circuitRegistry.ConnectAsync(
+                circuitId,
+                Clients.Caller,
+                Context.ConnectionId,
+                Context.ConnectionAborted);
             if (circuitHost != null)
             {
                 SetCircuit(circuitHost);
@@ -167,7 +186,7 @@ namespace Microsoft.AspNetCore.Components.Server
                 return;
             }
 
-             _ = circuitHost.BeginInvokeDotNetFromJS(callId, assemblyName, methodIdentifier, dotNetObjectId, argsJson);
+            _ = circuitHost.BeginInvokeDotNetFromJS(callId, assemblyName, methodIdentifier, dotNetObjectId, argsJson);
         }
 
         public async ValueTask EndInvokeJSFromDotNet(long asyncHandle, bool succeeded, string arguments)
@@ -178,7 +197,7 @@ namespace Microsoft.AspNetCore.Components.Server
                 return;
             }
 
-             _ = circuitHost.EndInvokeJSFromDotNet(asyncHandle, succeeded, arguments);
+            _ = circuitHost.EndInvokeJSFromDotNet(asyncHandle, succeeded, arguments);
         }
 
         public async ValueTask DispatchBrowserEvent(string eventDescriptor, string eventArgs)
@@ -189,7 +208,7 @@ namespace Microsoft.AspNetCore.Components.Server
                 return;
             }
 
-             _ = circuitHost.DispatchEvent(eventDescriptor, eventArgs);
+            _ = circuitHost.DispatchEvent(eventDescriptor, eventArgs);
         }
 
         public async ValueTask OnRenderCompleted(long renderId, string errorMessageOrNull)
@@ -212,7 +231,7 @@ namespace Microsoft.AspNetCore.Components.Server
                 return;
             }
 
-             _ = circuitHost.OnLocationChangedAsync(uri, intercepted);
+            _ = circuitHost.OnLocationChangedAsync(uri, intercepted);
         }
 
         // We store the CircuitHost through a *handle* here because Context.Items is tied to the lifetime
@@ -261,35 +280,33 @@ namespace Microsoft.AspNetCore.Components.Server
 
         private static class Log
         {
-            private static readonly Action<ILogger, string, Exception> _noComponentsRegisteredInEndpoint =
-                LoggerMessage.Define<string>(LogLevel.Debug, new EventId(1, "NoComponentsRegisteredInEndpoint"), "No components registered in the current endpoint '{Endpoint}'");
-
             private static readonly Action<ILogger, long, Exception> _receivedConfirmationForBatch =
-                LoggerMessage.Define<long>(LogLevel.Debug, new EventId(2, "ReceivedConfirmationForBatch"), "Received confirmation for batch {BatchId}");
+                LoggerMessage.Define<long>(LogLevel.Debug, new EventId(1, "ReceivedConfirmationForBatch"), "Received confirmation for batch {BatchId}");
 
-            private static readonly Action<ILogger, string, Exception> _unhandledExceptionInCircuit =
-                LoggerMessage.Define<string>(LogLevel.Warning, new EventId(3, "UnhandledExceptionInCircuit"), "Unhandled exception in circuit {CircuitId}");
-
-            private static readonly Action<ILogger, string, Exception> _circuitAlreadyInitialized =
-                LoggerMessage.Define<string>(LogLevel.Debug, new EventId(4, "CircuitAlreadyInitialized"), "The circuit host '{CircuitId}' has already been initialized");
+            private static readonly Action<ILogger, CircuitId, Exception> _circuitAlreadyInitialized =
+                LoggerMessage.Define<CircuitId>(LogLevel.Debug, new EventId(2, "CircuitAlreadyInitialized"), "The circuit host '{CircuitId}' has already been initialized");
 
             private static readonly Action<ILogger, string, Exception> _circuitHostNotInitialized =
-                LoggerMessage.Define<string>(LogLevel.Debug, new EventId(5, "CircuitHostNotInitialized"), "Call to '{CallSite}' received before the circuit host initialization");
+                LoggerMessage.Define<string>(LogLevel.Debug, new EventId(3, "CircuitHostNotInitialized"), "Call to '{CallSite}' received before the circuit host initialization");
 
             private static readonly Action<ILogger, string, Exception> _circuitHostShutdown =
-                LoggerMessage.Define<string>(LogLevel.Debug, new EventId(6, "CircuitHostShutdown"), "Call to '{CallSite}' received after the circuit was shut down");
+                LoggerMessage.Define<string>(LogLevel.Debug, new EventId(4, "CircuitHostShutdown"), "Call to '{CallSite}' received after the circuit was shut down");
 
             private static readonly Action<ILogger, string, Exception> _invalidInputData =
-                LoggerMessage.Define<string>(LogLevel.Debug, new EventId(7, "InvalidInputData"), "Call to '{CallSite}' received invalid input data");
+                LoggerMessage.Define<string>(LogLevel.Debug, new EventId(5, "InvalidInputData"), "Call to '{CallSite}' received invalid input data");
 
             private static readonly Action<ILogger, Exception> _circuitInitializationFailed =
-                LoggerMessage.Define(LogLevel.Debug, new EventId(8, "CircuitInitializationFailed"), "Circuit initialization failed");
+                LoggerMessage.Define(LogLevel.Debug, new EventId(6, "CircuitInitializationFailed"), "Circuit initialization failed");
 
-            public static void NoComponentsRegisteredInEndpoint(ILogger logger, string endpointDisplayName) => _noComponentsRegisteredInEndpoint(logger, endpointDisplayName, null);
+            private static readonly Action<ILogger, CircuitId, string, string, Exception> _createdCircuit =
+                LoggerMessage.Define<CircuitId, string, string>(LogLevel.Debug, new EventId(7, "CreatedCircuit"), "Created circuit '{CircuitId}' with secret '{CircuitIdSecret}' for '{ConnectionId}'");
+
+            private static readonly Action<ILogger, string, Exception> _invalidCircuitId =
+                LoggerMessage.Define<string>(LogLevel.Debug, new EventId(8, "InvalidCircuitId"), "ConnectAsync recieved an invalid circuit id '{CircuitIdSecret}'");
 
             public static void ReceivedConfirmationForBatch(ILogger logger, long batchId) => _receivedConfirmationForBatch(logger, batchId, null);
 
-            public static void CircuitAlreadyInitialized(ILogger logger, string circuitId) => _circuitAlreadyInitialized(logger, circuitId, null);
+            public static void CircuitAlreadyInitialized(ILogger logger, CircuitId circuitId) => _circuitAlreadyInitialized(logger, circuitId, null);
 
             public static void CircuitHostNotInitialized(ILogger logger, [CallerMemberName] string callSite = "") => _circuitHostNotInitialized(logger, callSite, null);
 
@@ -298,6 +315,28 @@ namespace Microsoft.AspNetCore.Components.Server
             public static void InvalidInputData(ILogger logger, [CallerMemberName] string callSite = "") => _invalidInputData(logger, callSite, null);
 
             public static void CircuitInitializationFailed(ILogger logger, Exception exception) => _circuitInitializationFailed(logger, exception);
+
+            public static void CreatedCircuit(ILogger logger, CircuitId circuitId, string circuitSecret, string connectionId)
+            {
+                // Redact the secret unless tracing is on.
+                if (!logger.IsEnabled(LogLevel.Trace))
+                {
+                    circuitSecret = "(redacted)";
+                }
+
+                _createdCircuit(logger, circuitId, circuitSecret, connectionId, null);
+            }
+
+            public static void InvalidCircuitId(ILogger logger, string circuitSecret)
+            {
+                // Redact the secret unless tracing is on.
+                if (!logger.IsEnabled(LogLevel.Trace))
+                {
+                    circuitSecret = "(redacted)";
+                }
+
+                _invalidCircuitId(logger, circuitSecret, null);
+            }
         }
     }
 }
diff --git a/src/Components/Server/src/DependencyInjection/ComponentServiceCollectionExtensions.cs b/src/Components/Server/src/DependencyInjection/ComponentServiceCollectionExtensions.cs
index a9666ba8ba..5a079c5401 100644
--- a/src/Components/Server/src/DependencyInjection/ComponentServiceCollectionExtensions.cs
+++ b/src/Components/Server/src/DependencyInjection/ComponentServiceCollectionExtensions.cs
@@ -55,8 +55,9 @@ namespace Microsoft.Extensions.DependencyInjection
             // user's configuration. So even if the user has multiple independent server-side
             // Components entrypoints, this lot is the same and repeated registrations are a no-op.
             services.TryAddEnumerable(ServiceDescriptor.Singleton<IPostConfigureOptions<StaticFileOptions>, ConfigureStaticFilesOptions>());
-            services.TryAddSingleton<CircuitFactory, DefaultCircuitFactory>();
-
+            services.TryAddSingleton<CircuitFactory>();
+            services.TryAddSingleton<ServerComponentDeserializer>();
+            services.TryAddSingleton<ServerComponentTypeCache>();
             services.TryAddSingleton<CircuitIdFactory>();
 
             services.TryAddScoped(s => s.GetRequiredService<ICircuitAccessor>().Circuit);
diff --git a/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj b/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj
index 234ad4bf45..e80b45f7ab 100644
--- a/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj
+++ b/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj
@@ -14,7 +14,7 @@
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.Components.Authorization" />
     <Reference Include="Microsoft.AspNetCore.Components.Web" />
-    <Reference Include="Microsoft.AspNetCore.DataProtection" />
+    <Reference Include="Microsoft.AspNetCore.DataProtection.Extensions" />
     <Reference Include="Microsoft.AspNetCore.SignalR" />
     <Reference Include="Microsoft.AspNetCore.StaticFiles" />
     <Reference Include="Microsoft.Extensions.Caching.Memory" />
@@ -41,6 +41,7 @@
   <ItemGroup>
     <Compile Include="$(ComponentsSharedSourceRoot)src\CacheHeaderSettings.cs" Link="Shared\CacheHeaderSettings.cs" />
     <Compile Include="$(ComponentsSharedSourceRoot)src\ArrayBuilder.cs" LinkBase="Circuits" />
+    <Compile Include="$(ComponentsSharedSourceRoot)src\ElementReferenceJsonConverter.cs" />
 
     <Compile Include="..\..\Shared\src\BrowserNavigationManagerInterop.cs" />
     <Compile Include="..\..\Shared\src\JsonSerializerOptionsProvider.cs" />
@@ -65,6 +66,11 @@
     <Compile Include="$(MessagePackRoot)SequencePool.cs" LinkBase="BlazorPack\MessagePack" />
     <Compile Include="$(MessagePackRoot)SequenceReader.cs" LinkBase="BlazorPack\MessagePack" />
     <Compile Include="$(MessagePackRoot)SequenceReaderExtensions.cs" LinkBase="BlazorPack\MessagePack" />
+
+    <!-- Shared descriptor infrastructure with MVC -->
+    <Compile Include="$(RepoRoot)src\Shared\Components\ServerComponent.cs" />
+    <Compile Include="$(RepoRoot)src\Shared\Components\ServerComponentSerializationSettings.cs" />
+    <Compile Include="$(RepoRoot)src\Shared\Components\ServerComponentMarker.cs" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/src/Components/Server/test/CircuitDisconnectMiddlewareTest.cs b/src/Components/Server/test/CircuitDisconnectMiddlewareTest.cs
index 627c51b576..a63ece5b88 100644
--- a/src/Components/Server/test/CircuitDisconnectMiddlewareTest.cs
+++ b/src/Components/Server/test/CircuitDisconnectMiddlewareTest.cs
@@ -138,7 +138,7 @@ namespace Microsoft.AspNetCore.Components.Server
         {
             // Arrange
             var circuitIdFactory = TestCircuitIdFactory.CreateTestFactory();
-            var id = circuitIdFactory.CreateCircuitId();
+            var circuitId = circuitIdFactory.CreateCircuitId();
             var registry = new CircuitRegistry(
                 Options.Create(new CircuitOptions()),
                 NullLogger<CircuitRegistry>.Instance,
@@ -151,7 +151,7 @@ namespace Microsoft.AspNetCore.Components.Server
                 (ctx) => Task.CompletedTask);
 
             using var memory = new MemoryStream();
-            await new FormUrlEncodedContent(new Dictionary<string, string> { ["circuitId"] = id }).CopyToAsync(memory);
+            await new FormUrlEncodedContent(new Dictionary<string, string> { ["circuitId"] = circuitId.Secret, }).CopyToAsync(memory);
             memory.Seek(0, SeekOrigin.Begin);
 
             var context = new DefaultHttpContext();
@@ -171,8 +171,8 @@ namespace Microsoft.AspNetCore.Components.Server
         {
             // Arrange
             var circuitIdFactory = TestCircuitIdFactory.CreateTestFactory();
-            var id = circuitIdFactory.CreateCircuitId();
-            var testCircuitHost = TestCircuitHost.Create(id);
+            var circuitId = circuitIdFactory.CreateCircuitId();
+            var testCircuitHost = TestCircuitHost.Create(circuitId);
 
             var registry = new CircuitRegistry(
                 Options.Create(new CircuitOptions()),
@@ -188,7 +188,7 @@ namespace Microsoft.AspNetCore.Components.Server
                 (ctx) => Task.CompletedTask);
 
             using var memory = new MemoryStream();
-            await new FormUrlEncodedContent(new Dictionary<string, string> { ["circuitId"] = id }).CopyToAsync(memory);
+            await new FormUrlEncodedContent(new Dictionary<string, string> { ["circuitId"] = circuitId.Secret, }).CopyToAsync(memory);
             memory.Seek(0, SeekOrigin.Begin);
 
             var context = new DefaultHttpContext();
@@ -208,8 +208,8 @@ namespace Microsoft.AspNetCore.Components.Server
         {
             // Arrange
             var circuitIdFactory = TestCircuitIdFactory.CreateTestFactory();
-            var id = circuitIdFactory.CreateCircuitId();
-            var circuitHost = TestCircuitHost.Create(id);
+            var circuitId = circuitIdFactory.CreateCircuitId();
+            var circuitHost = TestCircuitHost.Create(circuitId);
 
             var registry = new CircuitRegistry(
                 Options.Create(new CircuitOptions()),
@@ -226,7 +226,7 @@ namespace Microsoft.AspNetCore.Components.Server
                 (ctx) => Task.CompletedTask);
 
             using var memory = new MemoryStream();
-            await new FormUrlEncodedContent(new Dictionary<string, string> { ["circuitId"] = id }).CopyToAsync(memory);
+            await new FormUrlEncodedContent(new Dictionary<string, string> { ["circuitId"] = circuitId.Secret }).CopyToAsync(memory);
             memory.Seek(0, SeekOrigin.Begin);
 
             var context = new DefaultHttpContext();
diff --git a/src/Components/Server/test/Circuits/CircuitHostTest.cs b/src/Components/Server/test/Circuits/CircuitHostTest.cs
index dc4d5da01f..91a1ef26d7 100644
--- a/src/Components/Server/test/Circuits/CircuitHostTest.cs
+++ b/src/Components/Server/test/Circuits/CircuitHostTest.cs
@@ -26,9 +26,8 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
             var serviceScope = new Mock<IServiceScope>();
             var remoteRenderer = GetRemoteRenderer();
             var circuitHost = TestCircuitHost.Create(
-                Guid.NewGuid().ToString(),
-                serviceScope.Object,
-                remoteRenderer);
+                serviceScope: serviceScope.Object,
+                remoteRenderer: remoteRenderer);
 
             // Act
             await circuitHost.DisposeAsync();
@@ -52,9 +51,8 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
 
             var remoteRenderer = GetRemoteRenderer();
             var circuitHost = TestCircuitHost.Create(
-                Guid.NewGuid().ToString(),
-                serviceScope.Object,
-                remoteRenderer);
+                serviceScope: serviceScope.Object,
+                remoteRenderer: remoteRenderer);
 
             // Act
             await circuitHost.DisposeAsync();
@@ -77,9 +75,8 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
                 .Throws<InvalidTimeZoneException>();
             var remoteRenderer = GetRemoteRenderer();
             var circuitHost = TestCircuitHost.Create(
-                Guid.NewGuid().ToString(),
-                serviceScope.Object,
-                remoteRenderer,
+                serviceScope: serviceScope.Object,
+                remoteRenderer: remoteRenderer,
                 handlers: new[] { handler.Object });
 
             var throwOnDisposeComponent = new ThrowOnDisposeComponent();
@@ -101,9 +98,8 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
             var serviceScope = new Mock<IServiceScope>();
             var remoteRenderer = GetRemoteRenderer();
             var circuitHost = TestCircuitHost.Create(
-                Guid.NewGuid().ToString(),
-                serviceScope.Object,
-                remoteRenderer);
+                serviceScope: serviceScope.Object,
+                remoteRenderer: remoteRenderer);
 
             var component = new DispatcherComponent(circuitHost.Renderer.Dispatcher);
             circuitHost.Renderer.AssignRootComponentId(component);
@@ -256,14 +252,13 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
         {
             return new TestRemoteRenderer(
                 Mock.Of<IServiceProvider>(),
-                Mock.Of<IJSRuntime>(),
                 Mock.Of<IClientProxy>());
         }
 
         private class TestRemoteRenderer : RemoteRenderer
         {
-            public TestRemoteRenderer(IServiceProvider serviceProvider, IJSRuntime jsRuntime, IClientProxy client)
-                : base(serviceProvider, NullLoggerFactory.Instance, new CircuitOptions(), jsRuntime, new CircuitClientProxy(client, "connection"), NullLogger.Instance)
+            public TestRemoteRenderer(IServiceProvider serviceProvider, IClientProxy client)
+                : base(serviceProvider, NullLoggerFactory.Instance, new CircuitOptions(), new CircuitClientProxy(client, "connection"), NullLogger.Instance)
             {
             }
 
diff --git a/src/Components/Server/test/Circuits/CircuitIdFactoryTest.cs b/src/Components/Server/test/Circuits/CircuitIdFactoryTest.cs
index 50b5f1701e..35bc454416 100644
--- a/src/Components/Server/test/Circuits/CircuitIdFactoryTest.cs
+++ b/src/Components/Server/test/Circuits/CircuitIdFactoryTest.cs
@@ -3,13 +3,12 @@
 
 using System;
 using System.Linq;
-using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.WebUtilities;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Components.Server.Circuits
 {
-    public class CircuitIdFactoryTest
+    public class circuitIdFactoryTest
     {
         [Fact]
         public void CreateCircuitId_Generates_NewRandomId()
@@ -17,12 +16,12 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
             var factory = TestCircuitIdFactory.CreateTestFactory();
 
             // Act
-            var id = factory.CreateCircuitId();
+            var secret = factory.CreateCircuitId();
 
             // Assert
-            Assert.NotNull(id);
+            Assert.NotNull(secret.Secret);
             // This is the magic data protection header that validates its protected
-            Assert.StartsWith("CfDJ", id);
+            Assert.StartsWith("CfDJ", secret.Secret);
         }
 
         [Fact]
@@ -32,13 +31,14 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
             var factory = TestCircuitIdFactory.CreateTestFactory();
 
             // Act
-            var ids = Enumerable.Range(0, 100).Select(i => factory.CreateCircuitId()).ToArray();
+            var secrets = Enumerable.Range(0, 100).Select(i => factory.CreateCircuitId()).Select(s => s.Secret).ToArray();
 
             // Assert
-            Assert.All(ids, id => Assert.NotNull(id));
-            Assert.Equal(100, ids.Distinct(StringComparer.Ordinal).Count());
+            Assert.All(secrets, secret => Assert.NotNull(secret));
+            Assert.Equal(100, secrets.Distinct(StringComparer.Ordinal).Count());
         }
 
+        // Note that this test also verifies that the ID can be reproduced from the secret.
         [Fact]
         public void CircuitIds_Roundtrip()
         {
@@ -47,10 +47,13 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
             var id = factory.CreateCircuitId();
 
             // Act
-            var isValid = factory.ValidateCircuitId(id);
+            var isValid = factory.TryParseCircuitId(id.Secret, out var parsed);
 
             // Assert
             Assert.True(isValid, "Failed to validate id");
+            Assert.Equal(id, parsed);
+            Assert.Equal(id.Secret, parsed.Secret);
+            Assert.Equal(id.Id, parsed.Id);
         }
 
         [Fact]
@@ -60,7 +63,7 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
             var factory = TestCircuitIdFactory.CreateTestFactory();
 
             // Act
-            var isValid = factory.ValidateCircuitId("$%@&==");
+            var isValid = factory.TryParseCircuitId("$%@&==", out _);
 
             // Assert
             Assert.False(isValid, "Accepted an invalid payload");
@@ -71,16 +74,16 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
         {
             // Arrange
             var factory = TestCircuitIdFactory.CreateTestFactory();
-            var id = factory.CreateCircuitId();
-            var protectedBytes = Base64UrlTextEncoder.Decode(id);
+            var secret = factory.CreateCircuitId();
+            var protectedBytes = Base64UrlTextEncoder.Decode(secret.Secret);
             for (int i = protectedBytes.Length - 10; i < protectedBytes.Length; i++)
             {
                 protectedBytes[i] = 0;
             }
-            var tamperedId = Base64UrlTextEncoder.Encode(protectedBytes);
+            var tampered = Base64UrlTextEncoder.Encode(protectedBytes);
 
             // Act
-            var isValid = factory.ValidateCircuitId(tamperedId);
+            var isValid = factory.TryParseCircuitId(tampered, out _);
 
             // Assert
             Assert.False(isValid, "Accepted a tampered payload");
diff --git a/src/Components/Server/test/Circuits/CircuitRegistryTest.cs b/src/Components/Server/test/Circuits/CircuitRegistryTest.cs
index f57c27dbfa..2ae3eca5e7 100644
--- a/src/Components/Server/test/Circuits/CircuitRegistryTest.cs
+++ b/src/Components/Server/test/Circuits/CircuitRegistryTest.cs
@@ -8,7 +8,6 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.SignalR;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
@@ -163,14 +162,14 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
             // Arrange
             var registry = CreateRegistry();
             var circuitHost = TestCircuitHost.Create();
-            registry.DisconnectedCircuits.Set(circuitHost.CircuitId, circuitHost, new MemoryCacheEntryOptions { Size = 1 });
+            registry.DisconnectedCircuits.Set(circuitHost.CircuitId.Secret, circuitHost, new MemoryCacheEntryOptions { Size = 1 });
 
             // Act
             await registry.DisconnectAsync(circuitHost, circuitHost.Client.ConnectionId);
 
             // Assert
             Assert.Empty(registry.ConnectedCircuits.Values);
-            Assert.True(registry.DisconnectedCircuits.TryGetValue(circuitHost.CircuitId, out _));
+            Assert.True(registry.DisconnectedCircuits.TryGetValue(circuitHost.CircuitId.Secret, out _));
         }
 
         [Fact]
@@ -267,7 +266,7 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
             Assert.Same(client, circuitHost.Client.Client);
             Assert.Equal(newId, circuitHost.Client.ConnectionId);
 
-            Assert.False(registry.DisconnectedCircuits.TryGetValue(circuitHost.CircuitId, out _));
+            Assert.False(registry.DisconnectedCircuits.TryGetValue(circuitHost.CircuitId.Secret, out _));
         }
 
         [Fact]
@@ -297,7 +296,7 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
             Assert.Same(client, circuitHost.Client.Client);
             Assert.Equal(newId, circuitHost.Client.ConnectionId);
 
-            Assert.False(registry.DisconnectedCircuits.TryGetValue(circuitHost.CircuitId, out _));
+            Assert.False(registry.DisconnectedCircuits.TryGetValue(circuitHost.CircuitId.Secret, out _));
         }
 
         [Fact]
@@ -322,9 +321,9 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
 
             // Act
             // Verify it's present in the dictionary.
-            Assert.True(registry.DisconnectedCircuits.TryGetValue(circuitHost.CircuitId, out var _));
+            Assert.True(registry.DisconnectedCircuits.TryGetValue(circuitHost.CircuitId.Secret, out var _));
             await Task.Run(() => tcs.Task.TimeoutAfter(TimeSpan.FromSeconds(10)));
-            Assert.False(registry.DisconnectedCircuits.TryGetValue(circuitHost.CircuitId, out var _));
+            Assert.False(registry.DisconnectedCircuits.TryGetValue(circuitHost.CircuitId.Secret, out var _));
         }
 
         [Fact]
@@ -355,7 +354,7 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
             Assert.True(registry.ConnectedCircuits.TryGetValue(circuitHost.CircuitId, out var cacheValue));
             Assert.Same(circuitHost, cacheValue);
             // Nothing should be disconnected.
-            Assert.False(registry.DisconnectedCircuits.TryGetValue(circuitHost.CircuitId, out var _));
+            Assert.False(registry.DisconnectedCircuits.TryGetValue(circuitHost.CircuitId.Secret, out var _));
         }
 
         private class TestCircuitRegistry : CircuitRegistry
@@ -370,7 +369,7 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
 
             public Action OnAfterEntryEvicted { get; set; }
 
-            protected override (CircuitHost, bool) ConnectCore(string circuitId, IClientProxy clientProxy, string connectionId)
+            protected override (CircuitHost, bool) ConnectCore(CircuitId circuitId, IClientProxy clientProxy, string connectionId)
             {
                 if (BeforeConnect != null)
                 {
diff --git a/src/Components/Server/test/Circuits/RemoteRendererTest.cs b/src/Components/Server/test/Circuits/RemoteRendererTest.cs
index 11f772e3ca..e7cda62bb2 100644
--- a/src/Components/Server/test/Circuits/RemoteRendererTest.cs
+++ b/src/Components/Server/test/Circuits/RemoteRendererTest.cs
@@ -426,27 +426,18 @@ namespace Microsoft.AspNetCore.Components.Web.Rendering
 
         private TestRemoteRenderer GetRemoteRenderer(IServiceProvider serviceProvider, CircuitClientProxy circuitClient = null)
         {
-            var jsRuntime = new Mock<IJSRuntime>();
-            jsRuntime.Setup(r => r.InvokeAsync<object>(
-                "Blazor._internal.attachRootComponentToElement",
-                It.IsAny<int>(),
-                It.IsAny<string>(),
-                It.IsAny<int>()))
-                .ReturnsAsync(Task.FromResult<object>(null));
-
             return new TestRemoteRenderer(
                 serviceProvider,
                 NullLoggerFactory.Instance,
                 new CircuitOptions(),
-                jsRuntime.Object,
                 circuitClient ?? new CircuitClientProxy(),
                 NullLogger.Instance);
         }
 
         private class TestRemoteRenderer : RemoteRenderer
         {
-            public TestRemoteRenderer(IServiceProvider serviceProvider, ILoggerFactory loggerFactory, CircuitOptions options, IJSRuntime jsRuntime, CircuitClientProxy client, ILogger logger)
-                : base(serviceProvider, loggerFactory, options, jsRuntime, client, logger)
+            public TestRemoteRenderer(IServiceProvider serviceProvider, ILoggerFactory loggerFactory, CircuitOptions options, CircuitClientProxy client, ILogger logger)
+                : base(serviceProvider, loggerFactory, options, client, logger)
             {
             }
 
diff --git a/src/Components/Server/test/Circuits/ServerComponentDeserializerTest.cs b/src/Components/Server/test/Circuits/ServerComponentDeserializerTest.cs
new file mode 100644
index 0000000000..1b3a8601da
--- /dev/null
+++ b/src/Components/Server/test/Circuits/ServerComponentDeserializerTest.cs
@@ -0,0 +1,261 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Linq;
+using System.Text.Json;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.DataProtection;
+using Microsoft.AspNetCore.Mvc.ViewFeatures;
+using Microsoft.Extensions.Logging.Abstractions;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Components.Server.Circuits
+{
+    public class ServerComponentDeserializerTest
+    {
+        private readonly IDataProtectionProvider _ephemeralDataProtectionProvider;
+        private readonly ITimeLimitedDataProtector _protector;
+        private readonly ServerComponentInvocationSequence _invocationSequence = new ServerComponentInvocationSequence();
+
+        public ServerComponentDeserializerTest()
+        {
+            _ephemeralDataProtectionProvider = new EphemeralDataProtectionProvider();
+            _protector = _ephemeralDataProtectionProvider
+                .CreateProtector(ServerComponentSerializationSettings.DataProtectionProviderPurpose)
+                .ToTimeLimitedDataProtector();
+        }
+
+        [Fact]
+        public void CanParseSingleMarker()
+        {
+            // Arrange
+            var markers = SerializeMarkers(CreateMarkers(typeof(TestComponent)));
+            var serverComponentDeserializer = CreateServerComponentDeserializer();
+
+            // Act & assert
+            Assert.True(serverComponentDeserializer.TryDeserializeComponentDescriptorCollection(markers, out var descriptors));
+            var deserializedDescriptor = Assert.Single(descriptors);
+            Assert.Equal(typeof(TestComponent).FullName, deserializedDescriptor.ComponentType.FullName);
+            Assert.Equal(0, deserializedDescriptor.Sequence);
+        }
+
+        [Fact]
+        public void CanParseMultipleMarkers()
+        {
+            // Arrange
+            var markers = SerializeMarkers(CreateMarkers(typeof(TestComponent), typeof(TestComponent)));
+            var serverComponentDeserializer = CreateServerComponentDeserializer();
+
+            // Act & assert
+            Assert.True(serverComponentDeserializer.TryDeserializeComponentDescriptorCollection(markers, out var descriptors));
+            Assert.Equal(2, descriptors.Count);
+
+            var firstDescriptor = descriptors[0];
+            Assert.Equal(typeof(TestComponent).FullName, firstDescriptor.ComponentType.FullName);
+            Assert.Equal(0, firstDescriptor.Sequence);
+
+            var secondDescriptor = descriptors[1];
+            Assert.Equal(typeof(TestComponent).FullName, secondDescriptor.ComponentType.FullName);
+            Assert.Equal(1, secondDescriptor.Sequence);
+        }
+
+        [Fact]
+        public void DoesNotParseOutOfOrderMarkers()
+        {
+            // Arrange
+            var markers = SerializeMarkers(CreateMarkers(typeof(TestComponent), typeof(TestComponent)).Reverse().ToArray());
+            var serverComponentDeserializer = CreateServerComponentDeserializer();
+
+            // Act & assert
+            Assert.False(serverComponentDeserializer.TryDeserializeComponentDescriptorCollection(markers, out var descriptors));
+            Assert.Empty(descriptors);
+        }
+
+        [Fact]
+        public void DoesNotParseMarkersFromDifferentInvocationSequences()
+        {
+            // Arrange
+            var firstChain = CreateMarkers(typeof(TestComponent));
+            var secondChain = CreateMarkers(new ServerComponentInvocationSequence(), typeof(TestComponent), typeof(TestComponent)).Skip(1);
+            var markers = SerializeMarkers(firstChain.Concat(secondChain).ToArray());
+            var serverComponentDeserializer = CreateServerComponentDeserializer();
+
+            // Act & assert
+            Assert.False(serverComponentDeserializer.TryDeserializeComponentDescriptorCollection(markers, out var descriptors));
+            Assert.Empty(descriptors);
+        }
+
+        [Fact]
+        public void DoesNotParseMarkersWhoseSequenceDoesNotStartAtZero()
+        {
+            // Arrange
+            var markers = SerializeMarkers(CreateMarkers(typeof(TestComponent), typeof(TestComponent)).Skip(1).ToArray());
+            var serverComponentDeserializer = CreateServerComponentDeserializer();
+
+            // Act & assert
+            Assert.False(serverComponentDeserializer.TryDeserializeComponentDescriptorCollection(markers, out var descriptors));
+            Assert.Empty(descriptors);
+        }
+
+        [Fact]
+        public void DoesNotParseMarkersWithGapsInTheSequence()
+        {
+            // Arrange
+            var brokenChain = CreateMarkers(typeof(TestComponent), typeof(TestComponent), typeof(TestComponent))
+                .Where(m => m.Sequence != 1)
+                .ToArray();
+
+            var markers = SerializeMarkers(brokenChain);
+            var serverComponentDeserializer = CreateServerComponentDeserializer();
+
+            // Act & assert
+            Assert.False(serverComponentDeserializer.TryDeserializeComponentDescriptorCollection(markers, out var descriptors));
+            Assert.Empty(descriptors);
+        }
+
+        [Fact]
+        public void DoesNotParseMarkersWithMissingDescriptor()
+        {
+            // Arrange
+            var missingDescriptorMarker = CreateMarkers(typeof(TestComponent));
+            missingDescriptorMarker[0].Descriptor = null;
+
+            var markers = SerializeMarkers(missingDescriptorMarker);
+            var serverComponentDeserializer = CreateServerComponentDeserializer();
+
+            // Act & assert
+            Assert.False(serverComponentDeserializer.TryDeserializeComponentDescriptorCollection(markers, out var descriptors));
+            Assert.Empty(descriptors);
+        }
+
+        [Fact]
+        public void DoesNotParseMarkersWithMissingType()
+        {
+            // Arrange
+            var missingTypeMarker = CreateMarkers(typeof(TestComponent));
+            missingTypeMarker[0].Type = null;
+
+            var markers = SerializeMarkers(missingTypeMarker);
+            var serverComponentDeserializer = CreateServerComponentDeserializer();
+
+            // Act & assert
+            Assert.False(serverComponentDeserializer.TryDeserializeComponentDescriptorCollection(markers, out var descriptors));
+            Assert.Empty(descriptors);
+        }
+
+        // Ensures we don't use untrusted data for validation.
+        [Fact]
+        public void AllowsMarkersWithMissingSequence()
+        {
+            // Arrange
+            var missingSequenceMarker = CreateMarkers(typeof(TestComponent), typeof(TestComponent));
+            missingSequenceMarker[0].Sequence = null;
+            missingSequenceMarker[1].Sequence = null;
+
+            var markers = SerializeMarkers(missingSequenceMarker);
+            var serverComponentDeserializer = CreateServerComponentDeserializer();
+
+            // Act & assert
+            Assert.True(serverComponentDeserializer.TryDeserializeComponentDescriptorCollection(markers, out var descriptors));
+            Assert.Equal(2, descriptors.Count);
+        }
+
+        // Ensures that we don't try to load assemblies
+        [Fact]
+        public void DoesNotParseMarkersWithUnknownComponentTypeAssembly()
+        {
+            // Arrange
+            var missingUnknownComponentTypeMarker = CreateMarkers(typeof(TestComponent));
+            missingUnknownComponentTypeMarker[0].Descriptor = _protector.Protect(
+                SerializeComponent("UnknownAssembly", "System.String"),
+                TimeSpan.FromSeconds(30));
+
+            var markers = SerializeMarkers(missingUnknownComponentTypeMarker);
+            var serverComponentDeserializer = CreateServerComponentDeserializer();
+
+            // Act & assert
+            Assert.False(serverComponentDeserializer.TryDeserializeComponentDescriptorCollection(markers, out var descriptors));
+            Assert.Empty(descriptors);
+        }
+
+        [Fact]
+        public void DoesNotParseMarkersWithUnknownComponentTypeName()
+        {
+            // Arrange
+            var missingUnknownComponentTypeMarker = CreateMarkers(typeof(TestComponent));
+            missingUnknownComponentTypeMarker[0].Descriptor = _protector.Protect(
+                SerializeComponent(typeof(TestComponent).Assembly.GetName().Name, "Unknown.Type"),
+                TimeSpan.FromSeconds(30));
+
+            var markers = SerializeMarkers(missingUnknownComponentTypeMarker);
+            var serverComponentDeserializer = CreateServerComponentDeserializer();
+
+            // Act & assert
+            Assert.False(serverComponentDeserializer.TryDeserializeComponentDescriptorCollection(markers, out var descriptors));
+            Assert.Empty(descriptors);
+        }
+
+        [Fact]
+        public void DoesNotParseMarkersWithInvalidDescriptorPayloads()
+        {
+            // Arrange
+            var invalidDescriptorMarker = CreateMarkers(typeof(TestComponent));
+            invalidDescriptorMarker[0].Descriptor = "nondataprotecteddata";
+
+            var markers = SerializeMarkers(invalidDescriptorMarker);
+            var serverComponentDeserializer = CreateServerComponentDeserializer();
+
+            // Act & assert
+            Assert.False(serverComponentDeserializer.TryDeserializeComponentDescriptorCollection(markers, out var descriptors));
+            Assert.Empty(descriptors);
+        }
+
+        private string SerializeComponent(string assembly, string type) =>
+            JsonSerializer.Serialize(
+                new ServerComponent(0, assembly, type, Guid.NewGuid()),
+                ServerComponentSerializationSettings.JsonSerializationOptions);
+
+        private ServerComponentDeserializer CreateServerComponentDeserializer()
+        {
+            return new ServerComponentDeserializer(
+                _ephemeralDataProtectionProvider,
+                NullLogger<ServerComponentDeserializer>.Instance,
+                new ServerComponentTypeCache());
+        }
+
+        private string SerializeMarkers(ServerComponentMarker[] markers) =>
+            JsonSerializer.Serialize(markers, ServerComponentSerializationSettings.JsonSerializationOptions);
+
+        private ServerComponentMarker[] CreateMarkers(params Type[] types)
+        {
+            var serializer = new ServerComponentSerializer(_ephemeralDataProtectionProvider);
+            var markers = new ServerComponentMarker[types.Length];
+            for (var i = 0; i < types.Length; i++)
+            {
+                markers[i] = serializer.SerializeInvocation(_invocationSequence, types[i], false);
+            }
+
+            return markers;
+        }
+
+        private ServerComponentMarker[] CreateMarkers(ServerComponentInvocationSequence sequence, params Type[] types)
+        {
+            var serializer = new ServerComponentSerializer(_ephemeralDataProtectionProvider);
+            var markers = new ServerComponentMarker[types.Length];
+            for (var i = 0; i < types.Length; i++)
+            {
+                markers[i] = serializer.SerializeInvocation(sequence, types[i], false);
+            }
+
+            return markers;
+        }
+
+        private class TestComponent : IComponent
+        {
+            public void Attach(RenderHandle renderHandle) => throw new NotImplementedException();
+
+            public Task SetParametersAsync(ParameterView parameters) => throw new NotImplementedException();
+        }
+    }
+}
diff --git a/src/Components/Server/test/Circuits/TestCircuitHost.cs b/src/Components/Server/test/Circuits/TestCircuitHost.cs
index e0a2e0bd54..1f3ea5450c 100644
--- a/src/Components/Server/test/Circuits/TestCircuitHost.cs
+++ b/src/Components/Server/test/Circuits/TestCircuitHost.cs
@@ -15,13 +15,13 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
 {
     internal class TestCircuitHost : CircuitHost
     {
-        private TestCircuitHost(string circuitId, IServiceScope scope, CircuitOptions options, CircuitClientProxy client, RemoteRenderer renderer, IReadOnlyList<ComponentDescriptor> descriptors, RemoteJSRuntime jsRuntime, CircuitHandler[] circuitHandlers, ILogger logger)
+        private TestCircuitHost(CircuitId circuitId, IServiceScope scope, CircuitOptions options, CircuitClientProxy client, RemoteRenderer renderer, IReadOnlyList<ComponentDescriptor> descriptors, RemoteJSRuntime jsRuntime, CircuitHandler[] circuitHandlers, ILogger logger)
             : base(circuitId, scope, options, client, renderer, descriptors, jsRuntime, circuitHandlers, logger)
         {
         }
 
         public static CircuitHost Create(
-            string circuitId = null,
+            CircuitId? circuitId = null,
             IServiceScope serviceScope = null,
             RemoteRenderer remoteRenderer = null,
             CircuitHandler[] handlers = null,
@@ -37,14 +37,13 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
                     serviceScope.ServiceProvider ?? Mock.Of<IServiceProvider>(),
                     NullLoggerFactory.Instance,
                     new CircuitOptions(),
-                    jsRuntime,
                     clientProxy,
                     NullLogger.Instance);
             }
 
             handlers = handlers ?? Array.Empty<CircuitHandler>();
             return new TestCircuitHost(
-                circuitId ?? Guid.NewGuid().ToString(),
+                circuitId is null ? new CircuitId(Guid.NewGuid().ToString(), Guid.NewGuid().ToString()) : circuitId.Value,
                 serviceScope,
                 new CircuitOptions(),
                 clientProxy,
diff --git a/src/Components/Server/test/ComponentEndpointRouteBuilderExtensionsTest.cs b/src/Components/Server/test/ComponentEndpointRouteBuilderExtensionsTest.cs
index 852ad62f0d..e0a6d8ff44 100644
--- a/src/Components/Server/test/ComponentEndpointRouteBuilderExtensionsTest.cs
+++ b/src/Components/Server/test/ComponentEndpointRouteBuilderExtensionsTest.cs
@@ -26,7 +26,7 @@ namespace Microsoft.AspNetCore.Components.Server.Tests
                 .UseRouting()
                 .UseEndpoints(endpoints =>
             {
-                endpoints.MapBlazorHub<MyComponent>("app", dispatchOptions => called = true);
+                endpoints.MapBlazorHub(dispatchOptions => called = true);
             }).Build();
 
             // Assert
@@ -45,7 +45,7 @@ namespace Microsoft.AspNetCore.Components.Server.Tests
                 .UseRouting()
                 .UseEndpoints(endpoints =>
                 {
-                    endpoints.MapBlazorHub(Mock.Of<IComponent>().GetType(),"app", "_blazor", dispatchOptions => called = true);
+                    endpoints.MapBlazorHub("_blazor", dispatchOptions => called = true);
                 }).Build();
 
             // Assert
diff --git a/src/Components/Components/test/ElementReferenceTest.cs b/src/Components/Server/test/ElementReferenceJsonConverterTest.cs
similarity index 52%
rename from src/Components/Components/test/ElementReferenceTest.cs
rename to src/Components/Server/test/ElementReferenceJsonConverterTest.cs
index 39c947aaf0..1fce318dd2 100644
--- a/src/Components/Components/test/ElementReferenceTest.cs
+++ b/src/Components/Server/test/ElementReferenceJsonConverterTest.cs
@@ -1,24 +1,32 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System.IO;
+using System.Text;
 using System.Text.Json;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Components
 {
-    public class ElementReferenceTest
+    public class ElementReferenceJsonConverterTest
     {
+        private readonly ElementReferenceJsonConverter Converter = new ElementReferenceJsonConverter();
+
         [Fact]
         public void Serializing_Works()
         {
             // Arrange
             var elementReference = ElementReference.CreateWithUniqueId();
             var expected = $"{{\"__internalId\":\"{elementReference.Id}\"}}";
+            var memoryStream = new MemoryStream();
+            var writer = new Utf8JsonWriter(memoryStream);
 
             // Act
-            var json = JsonSerializer.Serialize(elementReference, JsonSerializerOptionsProvider.Options);
+            Converter.Write(writer, elementReference, new JsonSerializerOptions());
+            writer.Flush();
 
             // Assert
+            var json = Encoding.UTF8.GetString(memoryStream.ToArray());
             Assert.Equal(expected, json);
         }
 
@@ -28,9 +36,12 @@ namespace Microsoft.AspNetCore.Components
             // Arrange
             var id = ElementReference.CreateWithUniqueId().Id;
             var json = $"{{\"__internalId\":\"{id}\"}}";
+            var bytes = Encoding.UTF8.GetBytes(json);
+            var reader = new Utf8JsonReader(bytes);
+            reader.Read();
 
             // Act
-            var elementReference = JsonSerializer.Deserialize<ElementReference>(json, JsonSerializerOptionsProvider.Options);
+            var elementReference = Converter.Read(ref reader, typeof(ElementReference), new JsonSerializerOptions());
 
             // Assert
             Assert.Equal(id, elementReference.Id);
@@ -45,9 +56,12 @@ namespace Microsoft.AspNetCore.Components
 @$"{{
     ""__internalId"": ""{id}""
 }}";
+            var bytes = Encoding.UTF8.GetBytes(json);
+            var reader = new Utf8JsonReader(bytes);
+            reader.Read();
 
             // Act
-            var elementReference = JsonSerializer.Deserialize<ElementReference>(json, JsonSerializerOptionsProvider.Options);
+            var elementReference = Converter.Read(ref reader, typeof(ElementReference), new JsonSerializerOptions());
 
             // Assert
             Assert.Equal(id, elementReference.Id);
@@ -58,9 +72,15 @@ namespace Microsoft.AspNetCore.Components
         {
             // Arrange
             var json = "{\"id\":\"some-value\"}";
+            var bytes = Encoding.UTF8.GetBytes(json);
 
             // Act
-            var ex = Assert.Throws<JsonException>(() => JsonSerializer.Deserialize<ElementReference>(json, JsonSerializerOptionsProvider.Options));
+            var ex = Assert.Throws<JsonException>(() =>
+            {
+                var reader = new Utf8JsonReader(bytes);
+                reader.Read();
+                Converter.Read(ref reader, typeof(ElementReference), new JsonSerializerOptions());
+            });
 
             // Assert
             Assert.Equal("Unexpected JSON property 'id'.", ex.Message);
@@ -71,9 +91,15 @@ namespace Microsoft.AspNetCore.Components
         {
             // Arrange
             var json = "{}";
+            var bytes = Encoding.UTF8.GetBytes(json);
 
             // Act
-            var ex = Assert.Throws<JsonException>(() => JsonSerializer.Deserialize<ElementReference>(json, JsonSerializerOptionsProvider.Options));
+            var ex = Assert.Throws<JsonException>(() =>
+            {
+                var reader = new Utf8JsonReader(bytes);
+                reader.Read();
+                Converter.Read(ref reader, typeof(ElementReference), new JsonSerializerOptions());
+            });
 
             // Assert
             Assert.Equal("__internalId is required.", ex.Message);
diff --git a/src/Components/Server/test/Microsoft.AspNetCore.Components.Server.Tests.csproj b/src/Components/Server/test/Microsoft.AspNetCore.Components.Server.Tests.csproj
index 9901e6f809..c6e294a63c 100644
--- a/src/Components/Server/test/Microsoft.AspNetCore.Components.Server.Tests.csproj
+++ b/src/Components/Server/test/Microsoft.AspNetCore.Components.Server.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
@@ -18,6 +18,9 @@
     <Compile Include="$(SignalRTestBase)MessagePackHubProtocolTestBase.cs" LinkBase="BlazorPack" />
     <Compile Include="$(SignalRTestBase)TestBinder.cs" LinkBase="BlazorPack" />
     <Compile Include="$(SignalRTestBase)TestHubMessageEqualityComparer.cs" LinkBase="BlazorPack" />
+
+    <Compile Include="$(RepoRoot)src\Mvc\Mvc.ViewFeatures\src\ServerComponentSerializer.cs" LinkBase="Mvc" />
+    <Compile Include="$(RepoRoot)src\Mvc\Mvc.ViewFeatures\src\ServerComponentInvocationSequence.cs" LinkBase="Mvc" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Components/Shared/src/ArrayBuilder.cs b/src/Components/Shared/src/ArrayBuilder.cs
index 2d751ffc0f..26bf5d0537 100644
--- a/src/Components/Shared/src/ArrayBuilder.cs
+++ b/src/Components/Shared/src/ArrayBuilder.cs
@@ -7,7 +7,7 @@ using System.Diagnostics;
 using System.Runtime.CompilerServices;
 
 #if COMPONENTS_SERVER
-namespace Microsoft.AspNetCore.Components.Web.Rendering
+namespace Microsoft.AspNetCore.Components.Server.Circuits
 #else
 namespace Microsoft.AspNetCore.Components.RenderTree
 #endif
diff --git a/src/Components/Shared/src/ElementReferenceJsonConverter.cs b/src/Components/Shared/src/ElementReferenceJsonConverter.cs
new file mode 100644
index 0000000000..465a688bf2
--- /dev/null
+++ b/src/Components/Shared/src/ElementReferenceJsonConverter.cs
@@ -0,0 +1,52 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Microsoft.AspNetCore.Components
+{
+    internal sealed class ElementReferenceJsonConverter : JsonConverter<ElementReference>
+    {
+        private static readonly JsonEncodedText IdProperty = JsonEncodedText.Encode("__internalId");
+
+        public override ElementReference Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            string id = null;
+            while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+            {
+                if (reader.TokenType == JsonTokenType.PropertyName)
+                {
+                    if (reader.ValueTextEquals(IdProperty.EncodedUtf8Bytes))
+                    {
+                        reader.Read();
+                        id = reader.GetString();
+                    }
+                    else
+                    {
+                        throw new JsonException($"Unexpected JSON property '{reader.GetString()}'.");
+                    }
+                }
+                else
+                {
+                    throw new JsonException($"Unexcepted JSON Token {reader.TokenType}.");
+                }
+            }
+
+            if (id is null)
+            {
+                throw new JsonException("__internalId is required.");
+            }
+
+            return new ElementReference(id);
+        }
+
+        public override void Write(Utf8JsonWriter writer, ElementReference value, JsonSerializerOptions options)
+        {
+            writer.WriteStartObject();
+            writer.WriteString(IdProperty, value.Id);
+            writer.WriteEndObject();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Components/Shared/src/WebEventData.cs b/src/Components/Shared/src/WebEventData.cs
index 07aafbddf2..c0d5824e53 100644
--- a/src/Components/Shared/src/WebEventData.cs
+++ b/src/Components/Shared/src/WebEventData.cs
@@ -3,7 +3,7 @@
 
 using System;
 using System.Text.Json;
-using Microsoft.AspNetCore.Components.Rendering;
+using Microsoft.AspNetCore.Components.RenderTree;
 
 namespace Microsoft.AspNetCore.Components.Web
 {
@@ -60,17 +60,17 @@ namespace Microsoft.AspNetCore.Components.Web
                 return eventArgsType switch
                 {
                     "change" => DeserializeChangeEventArgs(eventArgsJson),
-                    "clipboard" => Deserialize<UIClipboardEventArgs>(eventArgsJson),
-                    "drag" => Deserialize<UIDragEventArgs>(eventArgsJson),
-                    "error" => Deserialize<UIErrorEventArgs>(eventArgsJson),
-                    "focus" => Deserialize<UIFocusEventArgs>(eventArgsJson),
-                    "keyboard" => Deserialize<UIKeyboardEventArgs>(eventArgsJson),
-                    "mouse" => Deserialize<UIMouseEventArgs>(eventArgsJson),
-                    "pointer" => Deserialize<UIPointerEventArgs>(eventArgsJson),
-                    "progress" => Deserialize<UIProgressEventArgs>(eventArgsJson),
-                    "touch" => Deserialize<UITouchEventArgs>(eventArgsJson),
+                    "clipboard" => Deserialize<ClipboardEventArgs>(eventArgsJson),
+                    "drag" => Deserialize<DragEventArgs>(eventArgsJson),
+                    "error" => Deserialize<ErrorEventArgs>(eventArgsJson),
+                    "focus" => Deserialize<FocusEventArgs>(eventArgsJson),
+                    "keyboard" => Deserialize<KeyboardEventArgs>(eventArgsJson),
+                    "mouse" => Deserialize<MouseEventArgs>(eventArgsJson),
+                    "pointer" => Deserialize<PointerEventArgs>(eventArgsJson),
+                    "progress" => Deserialize<ProgressEventArgs>(eventArgsJson),
+                    "touch" => Deserialize<TouchEventArgs>(eventArgsJson),
                     "unknown" => EventArgs.Empty,
-                    "wheel" => Deserialize<UIWheelEventArgs>(eventArgsJson),
+                    "wheel" => Deserialize<WheelEventArgs>(eventArgsJson),
                     _ => throw new InvalidOperationException($"Unsupported event type '{eventArgsType}'. EventId: '{eventHandlerId}'."),
                 };
             }
diff --git a/src/Components/Web.JS/dist/Release/blazor.server.js b/src/Components/Web.JS/dist/Release/blazor.server.js
index 79e87de669..94d0b43055 100644
--- a/src/Components/Web.JS/dist/Release/blazor.server.js
+++ b/src/Components/Web.JS/dist/Release/blazor.server.js
@@ -12,4 +12,4 @@ var r=n(50),o=n(51),i=n(52);function a(){return c.TYPED_ARRAY_SUPPORT?2147483647
  * @author   Feross Aboukhadijeh <feross@feross.org> <http://feross.org>
  * @license  MIT
  */
-function r(e,t){if(e===t)return 0;for(var n=e.length,r=t.length,o=0,i=Math.min(n,r);o<i;++o)if(e[o]!==t[o]){n=e[o],r=t[o];break}return n<r?-1:r<n?1:0}function o(e){return t.Buffer&&"function"==typeof t.Buffer.isBuffer?t.Buffer.isBuffer(e):!(null==e||!e._isBuffer)}var i=n(35),a=Object.prototype.hasOwnProperty,s=Array.prototype.slice,c="foo"===function(){}.name;function u(e){return Object.prototype.toString.call(e)}function l(e){return!o(e)&&("function"==typeof t.ArrayBuffer&&("function"==typeof ArrayBuffer.isView?ArrayBuffer.isView(e):!!e&&(e instanceof DataView||!!(e.buffer&&e.buffer instanceof ArrayBuffer))))}var f=e.exports=v,h=/\s*function\s+([^\(\s]*)\s*/;function p(e){if(i.isFunction(e)){if(c)return e.name;var t=e.toString().match(h);return t&&t[1]}}function d(e,t){return"string"==typeof e?e.length<t?e:e.slice(0,t):e}function g(e){if(c||!i.isFunction(e))return i.inspect(e);var t=p(e);return"[Function"+(t?": "+t:"")+"]"}function y(e,t,n,r,o){throw new f.AssertionError({message:n,actual:e,expected:t,operator:r,stackStartFunction:o})}function v(e,t){e||y(e,!0,t,"==",f.ok)}function b(e,t,n,a){if(e===t)return!0;if(o(e)&&o(t))return 0===r(e,t);if(i.isDate(e)&&i.isDate(t))return e.getTime()===t.getTime();if(i.isRegExp(e)&&i.isRegExp(t))return e.source===t.source&&e.global===t.global&&e.multiline===t.multiline&&e.lastIndex===t.lastIndex&&e.ignoreCase===t.ignoreCase;if(null!==e&&"object"==typeof e||null!==t&&"object"==typeof t){if(l(e)&&l(t)&&u(e)===u(t)&&!(e instanceof Float32Array||e instanceof Float64Array))return 0===r(new Uint8Array(e.buffer),new Uint8Array(t.buffer));if(o(e)!==o(t))return!1;var c=(a=a||{actual:[],expected:[]}).actual.indexOf(e);return-1!==c&&c===a.expected.indexOf(t)||(a.actual.push(e),a.expected.push(t),function(e,t,n,r){if(null==e||null==t)return!1;if(i.isPrimitive(e)||i.isPrimitive(t))return e===t;if(n&&Object.getPrototypeOf(e)!==Object.getPrototypeOf(t))return!1;var o=m(e),a=m(t);if(o&&!a||!o&&a)return!1;if(o)return e=s.call(e),t=s.call(t),b(e,t,n);var c,u,l=S(e),f=S(t);if(l.length!==f.length)return!1;for(l.sort(),f.sort(),u=l.length-1;u>=0;u--)if(l[u]!==f[u])return!1;for(u=l.length-1;u>=0;u--)if(c=l[u],!b(e[c],t[c],n,r))return!1;return!0}(e,t,n,a))}return n?e===t:e==t}function m(e){return"[object Arguments]"==Object.prototype.toString.call(e)}function w(e,t){if(!e||!t)return!1;if("[object RegExp]"==Object.prototype.toString.call(t))return t.test(e);try{if(e instanceof t)return!0}catch(e){}return!Error.isPrototypeOf(t)&&!0===t.call({},e)}function E(e,t,n,r){var o;if("function"!=typeof t)throw new TypeError('"block" argument must be a function');"string"==typeof n&&(r=n,n=null),o=function(e){var t;try{e()}catch(e){t=e}return t}(t),r=(n&&n.name?" ("+n.name+").":".")+(r?" "+r:"."),e&&!o&&y(o,n,"Missing expected exception"+r);var a="string"==typeof r,s=!e&&o&&!n;if((!e&&i.isError(o)&&a&&w(o,n)||s)&&y(o,n,"Got unwanted exception"+r),e&&o&&n&&!w(o,n)||!e&&o)throw o}f.AssertionError=function(e){var t;this.name="AssertionError",this.actual=e.actual,this.expected=e.expected,this.operator=e.operator,e.message?(this.message=e.message,this.generatedMessage=!1):(this.message=d(g((t=this).actual),128)+" "+t.operator+" "+d(g(t.expected),128),this.generatedMessage=!0);var n=e.stackStartFunction||y;if(Error.captureStackTrace)Error.captureStackTrace(this,n);else{var r=new Error;if(r.stack){var o=r.stack,i=p(n),a=o.indexOf("\n"+i);if(a>=0){var s=o.indexOf("\n",a+1);o=o.substring(s+1)}this.stack=o}}},i.inherits(f.AssertionError,Error),f.fail=y,f.ok=v,f.equal=function(e,t,n){e!=t&&y(e,t,n,"==",f.equal)},f.notEqual=function(e,t,n){e==t&&y(e,t,n,"!=",f.notEqual)},f.deepEqual=function(e,t,n){b(e,t,!1)||y(e,t,n,"deepEqual",f.deepEqual)},f.deepStrictEqual=function(e,t,n){b(e,t,!0)||y(e,t,n,"deepStrictEqual",f.deepStrictEqual)},f.notDeepEqual=function(e,t,n){b(e,t,!1)&&y(e,t,n,"notDeepEqual",f.notDeepEqual)},f.notDeepStrictEqual=function e(t,n,r){b(t,n,!0)&&y(t,n,r,"notDeepStrictEqual",e)},f.strictEqual=function(e,t,n){e!==t&&y(e,t,n,"===",f.strictEqual)},f.notStrictEqual=function(e,t,n){e===t&&y(e,t,n,"!==",f.notStrictEqual)},f.throws=function(e,t,n){E(!0,e,t,n)},f.doesNotThrow=function(e,t,n){E(!1,e,t,n)},f.ifError=function(e){if(e)throw e};var S=Object.keys||function(e){var t=[];for(var n in e)a.call(e,n)&&t.push(n);return t}}).call(this,n(10))},function(e,t){e.exports=function(e){return e&&"object"==typeof e&&"function"==typeof e.copy&&"function"==typeof e.fill&&"function"==typeof e.readUInt8}},function(e,t){"function"==typeof Object.create?e.exports=function(e,t){e.super_=t,e.prototype=Object.create(t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}})}:e.exports=function(e,t){e.super_=t;var n=function(){};n.prototype=t.prototype,e.prototype=new n,e.prototype.constructor=e}},function(e,t,n){e.exports=n(11)},function(e,t){var n={}.toString;e.exports=Array.isArray||function(e){return"[object Array]"==n.call(e)}},function(e,t){},function(e,t,n){"use strict";var r=n(13).Buffer,o=n(60);e.exports=function(){function e(){!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),this.head=null,this.tail=null,this.length=0}return e.prototype.push=function(e){var t={data:e,next:null};this.length>0?this.tail.next=t:this.head=t,this.tail=t,++this.length},e.prototype.unshift=function(e){var t={data:e,next:this.head};0===this.length&&(this.tail=t),this.head=t,++this.length},e.prototype.shift=function(){if(0!==this.length){var e=this.head.data;return 1===this.length?this.head=this.tail=null:this.head=this.head.next,--this.length,e}},e.prototype.clear=function(){this.head=this.tail=null,this.length=0},e.prototype.join=function(e){if(0===this.length)return"";for(var t=this.head,n=""+t.data;t=t.next;)n+=e+t.data;return n},e.prototype.concat=function(e){if(0===this.length)return r.alloc(0);if(1===this.length)return this.head.data;for(var t,n,o,i=r.allocUnsafe(e>>>0),a=this.head,s=0;a;)t=a.data,n=i,o=s,t.copy(n,o),s+=a.data.length,a=a.next;return i},e}(),o&&o.inspect&&o.inspect.custom&&(e.exports.prototype[o.inspect.custom]=function(){var e=o.inspect({length:this.length});return this.constructor.name+" "+e})},function(e,t){},function(e,t,n){var r=n(5),o=r.Buffer;function i(e,t){for(var n in e)t[n]=e[n]}function a(e,t,n){return o(e,t,n)}o.from&&o.alloc&&o.allocUnsafe&&o.allocUnsafeSlow?e.exports=r:(i(r,t),t.Buffer=a),i(o,a),a.from=function(e,t,n){if("number"==typeof e)throw new TypeError("Argument must not be a number");return o(e,t,n)},a.alloc=function(e,t,n){if("number"!=typeof e)throw new TypeError("Argument must be a number");var r=o(e);return void 0!==t?"string"==typeof n?r.fill(t,n):r.fill(t):r.fill(0),r},a.allocUnsafe=function(e){if("number"!=typeof e)throw new TypeError("Argument must be a number");return o(e)},a.allocUnsafeSlow=function(e){if("number"!=typeof e)throw new TypeError("Argument must be a number");return r.SlowBuffer(e)}},function(e,t,n){(function(e){var r=void 0!==e&&e||"undefined"!=typeof self&&self||window,o=Function.prototype.apply;function i(e,t){this._id=e,this._clearFn=t}t.setTimeout=function(){return new i(o.call(setTimeout,r,arguments),clearTimeout)},t.setInterval=function(){return new i(o.call(setInterval,r,arguments),clearInterval)},t.clearTimeout=t.clearInterval=function(e){e&&e.close()},i.prototype.unref=i.prototype.ref=function(){},i.prototype.close=function(){this._clearFn.call(r,this._id)},t.enroll=function(e,t){clearTimeout(e._idleTimeoutId),e._idleTimeout=t},t.unenroll=function(e){clearTimeout(e._idleTimeoutId),e._idleTimeout=-1},t._unrefActive=t.active=function(e){clearTimeout(e._idleTimeoutId);var t=e._idleTimeout;t>=0&&(e._idleTimeoutId=setTimeout(function(){e._onTimeout&&e._onTimeout()},t))},n(63),t.setImmediate="undefined"!=typeof self&&self.setImmediate||void 0!==e&&e.setImmediate||this&&this.setImmediate,t.clearImmediate="undefined"!=typeof self&&self.clearImmediate||void 0!==e&&e.clearImmediate||this&&this.clearImmediate}).call(this,n(10))},function(e,t,n){(function(e,t){!function(e,n){"use strict";if(!e.setImmediate){var r,o,i,a,s,c=1,u={},l=!1,f=e.document,h=Object.getPrototypeOf&&Object.getPrototypeOf(e);h=h&&h.setTimeout?h:e,"[object process]"==={}.toString.call(e.process)?r=function(e){t.nextTick(function(){d(e)})}:!function(){if(e.postMessage&&!e.importScripts){var t=!0,n=e.onmessage;return e.onmessage=function(){t=!1},e.postMessage("","*"),e.onmessage=n,t}}()?e.MessageChannel?((i=new MessageChannel).port1.onmessage=function(e){d(e.data)},r=function(e){i.port2.postMessage(e)}):f&&"onreadystatechange"in f.createElement("script")?(o=f.documentElement,r=function(e){var t=f.createElement("script");t.onreadystatechange=function(){d(e),t.onreadystatechange=null,o.removeChild(t),t=null},o.appendChild(t)}):r=function(e){setTimeout(d,0,e)}:(a="setImmediate$"+Math.random()+"$",s=function(t){t.source===e&&"string"==typeof t.data&&0===t.data.indexOf(a)&&d(+t.data.slice(a.length))},e.addEventListener?e.addEventListener("message",s,!1):e.attachEvent("onmessage",s),r=function(t){e.postMessage(a+t,"*")}),h.setImmediate=function(e){"function"!=typeof e&&(e=new Function(""+e));for(var t=new Array(arguments.length-1),n=0;n<t.length;n++)t[n]=arguments[n+1];var o={callback:e,args:t};return u[c]=o,r(c),c++},h.clearImmediate=p}function p(e){delete u[e]}function d(e){if(l)setTimeout(d,0,e);else{var t=u[e];if(t){l=!0;try{!function(e){var t=e.callback,r=e.args;switch(r.length){case 0:t();break;case 1:t(r[0]);break;case 2:t(r[0],r[1]);break;case 3:t(r[0],r[1],r[2]);break;default:t.apply(n,r)}}(t)}finally{p(e),l=!1}}}}}("undefined"==typeof self?void 0===e?this:e:self)}).call(this,n(10),n(19))},function(e,t,n){(function(t){function n(e){try{if(!t.localStorage)return!1}catch(e){return!1}var n=t.localStorage[e];return null!=n&&"true"===String(n).toLowerCase()}e.exports=function(e,t){if(n("noDeprecation"))return e;var r=!1;return function(){if(!r){if(n("throwDeprecation"))throw new Error(t);n("traceDeprecation")?console.trace(t):console.warn(t),r=!0}return e.apply(this,arguments)}}}).call(this,n(10))},function(e,t,n){"use strict";var r=n(66).Transform,o=n(14),i=n(22);function a(e){(e=e||{}).objectMode=!0,e.highWaterMark=16,r.call(this,e),this._msgpack=e.msgpack}function s(e){if(!(this instanceof s))return(e=e||{}).msgpack=this,new s(e);a.call(this,e)}function c(e){if(!(this instanceof c))return(e=e||{}).msgpack=this,new c(e);a.call(this,e),this._chunks=i()}o(a,r),o(s,a),s.prototype._transform=function(e,t,n){var r=null;try{r=this._msgpack.encode(e).slice(0)}catch(e){return this.emit("error",e),n()}this.push(r),n()},o(c,a),c.prototype._transform=function(e,t,n){e&&this._chunks.append(e);try{var r=this._msgpack.decode(this._chunks);this.push(r)}catch(e){return void(e instanceof this._msgpack.IncompleteBufferError?n():this.emit("error",e))}this._chunks.length>0?this._transform(null,t,n):n()},e.exports.decoder=c,e.exports.encoder=s},function(e,t,n){(t=e.exports=n(36)).Stream=t,t.Readable=t,t.Writable=n(41),t.Duplex=n(11),t.Transform=n(42),t.PassThrough=n(67)},function(e,t,n){"use strict";e.exports=i;var r=n(42),o=n(20);function i(e){if(!(this instanceof i))return new i(e);r.call(this,e)}o.inherits=n(14),o.inherits(i,r),i.prototype._transform=function(e,t,n){n(null,e)}},function(e,t,n){var r=n(22);function o(e){Error.call(this),Error.captureStackTrace&&Error.captureStackTrace(this,this.constructor),this.name=this.constructor.name,this.message=e||"unable to decode"}n(35).inherits(o,Error),e.exports=function(e){return function(e){e instanceof r||(e=r().append(e));var t=i(e);if(t)return e.consume(t.bytesConsumed),t.value;throw new o};function t(e,t,n){return t>=n+e}function n(e,t){return{value:e,bytesConsumed:t}}function i(e,r){r=void 0===r?0:r;var o=e.length-r;if(o<=0)return null;var i,l,f,h=e.readUInt8(r),p=0;if(!function(e,t){var n=function(e){switch(e){case 196:return 2;case 197:return 3;case 198:return 5;case 199:return 3;case 200:return 4;case 201:return 6;case 202:return 5;case 203:return 9;case 204:return 2;case 205:return 3;case 206:return 5;case 207:return 9;case 208:return 2;case 209:return 3;case 210:return 5;case 211:return 9;case 212:return 3;case 213:return 4;case 214:return 6;case 215:return 10;case 216:return 18;case 217:return 2;case 218:return 3;case 219:return 5;case 222:return 3;default:return-1}}(e);return!(-1!==n&&t<n)}(h,o))return null;switch(h){case 192:return n(null,1);case 194:return n(!1,1);case 195:return n(!0,1);case 204:return n(p=e.readUInt8(r+1),2);case 205:return n(p=e.readUInt16BE(r+1),3);case 206:return n(p=e.readUInt32BE(r+1),5);case 207:for(f=7;f>=0;f--)p+=e.readUInt8(r+f+1)*Math.pow(2,8*(7-f));return n(p,9);case 208:return n(p=e.readInt8(r+1),2);case 209:return n(p=e.readInt16BE(r+1),3);case 210:return n(p=e.readInt32BE(r+1),5);case 211:return n(p=function(e,t){var n=128==(128&e[t]);if(n)for(var r=1,o=t+7;o>=t;o--){var i=(255^e[o])+r;e[o]=255&i,r=i>>8}var a=e.readUInt32BE(t+0),s=e.readUInt32BE(t+4);return(4294967296*a+s)*(n?-1:1)}(e.slice(r+1,r+9),0),9);case 202:return n(p=e.readFloatBE(r+1),5);case 203:return n(p=e.readDoubleBE(r+1),9);case 217:return t(i=e.readUInt8(r+1),o,2)?n(p=e.toString("utf8",r+2,r+2+i),2+i):null;case 218:return t(i=e.readUInt16BE(r+1),o,3)?n(p=e.toString("utf8",r+3,r+3+i),3+i):null;case 219:return t(i=e.readUInt32BE(r+1),o,5)?n(p=e.toString("utf8",r+5,r+5+i),5+i):null;case 196:return t(i=e.readUInt8(r+1),o,2)?n(p=e.slice(r+2,r+2+i),2+i):null;case 197:return t(i=e.readUInt16BE(r+1),o,3)?n(p=e.slice(r+3,r+3+i),3+i):null;case 198:return t(i=e.readUInt32BE(r+1),o,5)?n(p=e.slice(r+5,r+5+i),5+i):null;case 220:return o<3?null:(i=e.readUInt16BE(r+1),a(e,r,i,3));case 221:return o<5?null:(i=e.readUInt32BE(r+1),a(e,r,i,5));case 222:return i=e.readUInt16BE(r+1),s(e,r,i,3);case 223:throw new Error("map too big to decode in JS");case 212:return c(e,r,1);case 213:return c(e,r,2);case 214:return c(e,r,4);case 215:return c(e,r,8);case 216:return c(e,r,16);case 199:return i=e.readUInt8(r+1),l=e.readUInt8(r+2),t(i,o,3)?u(e,r,l,i,3):null;case 200:return i=e.readUInt16BE(r+1),l=e.readUInt8(r+3),t(i,o,4)?u(e,r,l,i,4):null;case 201:return i=e.readUInt32BE(r+1),l=e.readUInt8(r+5),t(i,o,6)?u(e,r,l,i,6):null}if(144==(240&h))return a(e,r,i=15&h,1);if(128==(240&h))return s(e,r,i=15&h,1);if(160==(224&h))return t(i=31&h,o,1)?n(p=e.toString("utf8",r+1,r+i+1),i+1):null;if(h>=224)return n(p=h-256,1);if(h<128)return n(h,1);throw new Error("not implemented yet")}function a(e,t,r,o){var a,s=[],c=0;for(t+=o,a=0;a<r;a++){var u=i(e,t);if(!u)return null;s.push(u.value),t+=u.bytesConsumed,c+=u.bytesConsumed}return n(s,o+c)}function s(e,t,r,o){var a,s={},c=0;for(t+=o,a=0;a<r;a++){var u=i(e,t);if(!u)return null;var l=i(e,t+=u.bytesConsumed);if(!l)return null;s[u.value]=l.value,t+=l.bytesConsumed,c+=u.bytesConsumed+l.bytesConsumed}return n(s,o+c)}function c(e,t,n){var r=e.readInt8(t+1);return u(e,t,r,n,2)}function u(t,r,o,i,a){var s,c;if(r+=a,o<0)switch(o){case-1:return function(e,t,r){var o,i;switch(i=0,t){case 4:o=e.readUInt32BE(0);break;case 8:var a=e.readUInt32BE(0),s=e.readUInt32BE(4);i=a/4,o=(3&a)*Math.pow(2,32)+s;break;case 12:throw new Error("timestamp 96 is not yet implemented")}var c=1e3*o+Math.round(i/1e6);return n(new Date(c),t+r)}(c=t.slice(r,r+i),i,a)}for(s=0;s<e.length;s++){if(o===e[s].type)return c=t.slice(r,r+i),n(e[s].decode(c),a+i)}throw new Error("unable to find ext type "+o)}},e.exports.IncompleteBufferError=o},function(e,t,n){"use strict";var r=n(13).Buffer,o=n(22),i=.1;function a(e,t){var n;return(n=r.allocUnsafe(5))[0]=202,n.writeFloatBE(e,1),(t||Math.abs(e-n.readFloatBE(1))>i)&&((n=r.allocUnsafe(9))[0]=203,n.writeDoubleBE(e,1)),n}e.exports=function(e,t,n,i){function s(c,u){var l,f,h;if(void 0===c)throw new Error("undefined is not encodable in msgpack!");if(null===c)(l=r.allocUnsafe(1))[0]=192;else if(!0===c)(l=r.allocUnsafe(1))[0]=195;else if(!1===c)(l=r.allocUnsafe(1))[0]=194;else if("string"==typeof c)(f=r.byteLength(c))<32?((l=r.allocUnsafe(1+f))[0]=160|f,f>0&&l.write(c,1)):f<=255&&!n?((l=r.allocUnsafe(2+f))[0]=217,l[1]=f,l.write(c,2)):f<=65535?((l=r.allocUnsafe(3+f))[0]=218,l.writeUInt16BE(f,1),l.write(c,3)):((l=r.allocUnsafe(5+f))[0]=219,l.writeUInt32BE(f,1),l.write(c,5));else if(c&&(c.readUInt32LE||c instanceof Uint8Array))c instanceof Uint8Array&&(c=r.from(c)),c.length<=255?((l=r.allocUnsafe(2))[0]=196,l[1]=c.length):c.length<=65535?((l=r.allocUnsafe(3))[0]=197,l.writeUInt16BE(c.length,1)):((l=r.allocUnsafe(5))[0]=198,l.writeUInt32BE(c.length,1)),l=o([l,c]);else if(Array.isArray(c))c.length<16?(l=r.allocUnsafe(1))[0]=144|c.length:c.length<65536?((l=r.allocUnsafe(3))[0]=220,l.writeUInt16BE(c.length,1)):((l=r.allocUnsafe(5))[0]=221,l.writeUInt32BE(c.length,1)),l=c.reduce(function(e,t){return e.append(s(t,!0)),e},o().append(l));else{if(!i&&"function"==typeof c.getDate)return function(e){var t,n=1*e,i=Math.floor(n/1e3),a=1e6*(n-1e3*i);if(a||i>4294967295){(t=new r(10))[0]=215,t[1]=-1;var s=4*a,c=i/Math.pow(2,32),u=s+c&4294967295,l=4294967295&i;t.writeInt32BE(u,2),t.writeInt32BE(l,6)}else(t=new r(6))[0]=214,t[1]=-1,t.writeUInt32BE(Math.floor(n/1e3),2);return o().append(t)}(c);if("object"==typeof c)l=function(t){var n,i,a=-1,s=[];for(n=0;n<e.length;n++)if(e[n].check(t)){i=e[n].encode(t);break}if(!i)return null;1==(a=i.length-1)?s.push(212):2===a?s.push(213):4===a?s.push(214):8===a?s.push(215):16===a?s.push(216):a<256?(s.push(199),s.push(a)):a<65536?(s.push(200),s.push(a>>8),s.push(255&a)):(s.push(201),s.push(a>>24),s.push(a>>16&255),s.push(a>>8&255),s.push(255&a));return o().append(r.from(s)).append(i)}(c)||function(e){var t,n,i=[],a=0;for(t in e)e.hasOwnProperty(t)&&void 0!==e[t]&&"function"!=typeof e[t]&&(++a,i.push(s(t,!0)),i.push(s(e[t],!0)));a<16?(n=r.allocUnsafe(1))[0]=128|a:((n=r.allocUnsafe(3))[0]=222,n.writeUInt16BE(a,1));return i.unshift(n),i.reduce(function(e,t){return e.append(t)},o())}(c);else if("number"==typeof c){if((h=c)!==Math.floor(h))return a(c,t);if(c>=0)if(c<128)(l=r.allocUnsafe(1))[0]=c;else if(c<256)(l=r.allocUnsafe(2))[0]=204,l[1]=c;else if(c<65536)(l=r.allocUnsafe(3))[0]=205,l.writeUInt16BE(c,1);else if(c<=4294967295)(l=r.allocUnsafe(5))[0]=206,l.writeUInt32BE(c,1);else{if(!(c<=9007199254740991))return a(c,!0);(l=r.allocUnsafe(9))[0]=207,function(e,t){for(var n=7;n>=0;n--)e[n+1]=255&t,t/=256}(l,c)}else if(c>=-32)(l=r.allocUnsafe(1))[0]=256+c;else if(c>=-128)(l=r.allocUnsafe(2))[0]=208,l.writeInt8(c,1);else if(c>=-32768)(l=r.allocUnsafe(3))[0]=209,l.writeInt16BE(c,1);else if(c>-214748365)(l=r.allocUnsafe(5))[0]=210,l.writeInt32BE(c,1);else{if(!(c>=-9007199254740991))return a(c,!0);(l=r.allocUnsafe(9))[0]=211,function(e,t,n){var r=n<0;r&&(n=Math.abs(n));var o=n%4294967296,i=n/4294967296;if(e.writeUInt32BE(Math.floor(i),t+0),e.writeUInt32BE(o,t+4),r)for(var a=1,s=t+7;s>=t;s--){var c=(255^e[s])+a;e[s]=255&c,a=c>>8}}(l,1,c)}}}if(!l)throw new Error("not implemented yet");return u?l:l.slice()}return s}},function(e,t,n){"use strict";var r=this&&this.__awaiter||function(e,t,n,r){return new(n||(n=Promise))(function(o,i){function a(e){try{c(r.next(e))}catch(e){i(e)}}function s(e){try{c(r.throw(e))}catch(e){i(e)}}function c(e){e.done?o(e.value):new n(function(t){t(e.value)}).then(a,s)}c((r=r.apply(e,t||[])).next())})},o=this&&this.__generator||function(e,t){var n,r,o,i,a={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return i={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(i[Symbol.iterator]=function(){return this}),i;function s(i){return function(s){return function(i){if(n)throw new TypeError("Generator is already executing.");for(;a;)try{if(n=1,r&&(o=2&i[0]?r.return:i[0]?r.throw||((o=r.return)&&o.call(r),0):r.next)&&!(o=o.call(r,i[1])).done)return o;switch(r=0,o&&(i=[2&i[0],o.value]),i[0]){case 0:case 1:o=i;break;case 4:return a.label++,{value:i[1],done:!1};case 5:a.label++,r=i[1],i=[0];continue;case 7:i=a.ops.pop(),a.trys.pop();continue;default:if(!(o=(o=a.trys).length>0&&o[o.length-1])&&(6===i[0]||2===i[0])){a=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]<o[3])){a.label=i[1];break}if(6===i[0]&&a.label<o[1]){a.label=o[1],o=i;break}if(o&&a.label<o[2]){a.label=o[2],a.ops.push(i);break}o[2]&&a.ops.pop(),a.trys.pop();continue}i=t.call(e,a)}catch(e){i=[6,e],r=0}finally{n=o=0}if(5&i[0])throw i[1];return{value:i[0]?i[1]:void 0,done:!0}}([i,s])}}};Object.defineProperty(t,"__esModule",{value:!0});var i=n(8),a=n(71),s=n(15),c=function(){function e(e,t){this.nextBatchId=2,this.browserRendererId=e,this.logger=t}return e.prototype.processBatch=function(e,t,n){return r(this,void 0,void 0,function(){var r;return o(this,function(o){switch(o.label){case 0:return e<this.nextBatchId?[4,this.completeBatch(n,e)]:[3,2];case 1:return o.sent(),this.logger.log(s.LogLevel.Debug,"Batch "+e+" already processed. Waiting for batch "+this.nextBatchId+"."),[2];case 2:return e>this.nextBatchId?this.fatalError?(this.logger.log(s.LogLevel.Debug,"Received a new batch "+e+" but errored out on a previous batch "+(this.nextBatchId-1)),[4,n.send("OnRenderCompleted",this.nextBatchId-1,this.fatalError.toString())]):[3,4]:[3,5];case 3:return o.sent(),[2];case 4:return this.logger.log(s.LogLevel.Debug,"Waiting for batch "+this.nextBatchId+". Batch "+e+" not processed."),[2];case 5:return o.trys.push([5,7,,8]),this.nextBatchId++,this.logger.log(s.LogLevel.Debug,"Applying batch "+e+"."),i.renderBatch(this.browserRendererId,new a.OutOfProcessRenderBatch(t)),[4,this.completeBatch(n,e)];case 6:return o.sent(),[3,8];case 7:throw r=o.sent(),this.fatalError=r.toString(),this.logger.log(s.LogLevel.Error,"There was an error applying batch "+e+"."),n.send("OnRenderCompleted",e,r.toString()),r;case 8:return[2]}})})},e.prototype.getLastBatchid=function(){return this.nextBatchId-1},e.prototype.completeBatch=function(e,t){return r(this,void 0,void 0,function(){return o(this,function(n){switch(n.label){case 0:return n.trys.push([0,2,,3]),[4,e.send("OnRenderCompleted",t,null)];case 1:return n.sent(),[3,3];case 2:return n.sent(),this.logger.log(s.LogLevel.Warning,"Failed to deliver completion notification for render '"+t+"'."),[3,3];case 3:return[2]}})})},e}();t.RenderQueue=c},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(72),o=Math.pow(2,32),i=Math.pow(2,21)-1,a=function(){function e(e){this.batchData=e;var t=new l(e);this.arrayRangeReader=new f(e),this.arrayBuilderSegmentReader=new h(e),this.diffReader=new s(e),this.editReader=new c(e,t),this.frameReader=new u(e,t)}return e.prototype.updatedComponents=function(){return p(this.batchData,this.batchData.length-20)},e.prototype.referenceFrames=function(){return p(this.batchData,this.batchData.length-16)},e.prototype.disposedComponentIds=function(){return p(this.batchData,this.batchData.length-12)},e.prototype.disposedEventHandlerIds=function(){return p(this.batchData,this.batchData.length-8)},e.prototype.updatedComponentsEntry=function(e,t){var n=e+4*t;return p(this.batchData,n)},e.prototype.referenceFramesEntry=function(e,t){return e+20*t},e.prototype.disposedComponentIdsEntry=function(e,t){var n=e+4*t;return p(this.batchData,n)},e.prototype.disposedEventHandlerIdsEntry=function(e,t){var n=e+8*t;return g(this.batchData,n)},e}();t.OutOfProcessRenderBatch=a;var s=function(){function e(e){this.batchDataUint8=e}return e.prototype.componentId=function(e){return p(this.batchDataUint8,e)},e.prototype.edits=function(e){return e+4},e.prototype.editsEntry=function(e,t){return e+16*t},e}(),c=function(){function e(e,t){this.batchDataUint8=e,this.stringReader=t}return e.prototype.editType=function(e){return p(this.batchDataUint8,e)},e.prototype.siblingIndex=function(e){return p(this.batchDataUint8,e+4)},e.prototype.newTreeIndex=function(e){return p(this.batchDataUint8,e+8)},e.prototype.moveToSiblingIndex=function(e){return p(this.batchDataUint8,e+8)},e.prototype.removedAttributeName=function(e){var t=p(this.batchDataUint8,e+12);return this.stringReader.readString(t)},e}(),u=function(){function e(e,t){this.batchDataUint8=e,this.stringReader=t}return e.prototype.frameType=function(e){return p(this.batchDataUint8,e)},e.prototype.subtreeLength=function(e){return p(this.batchDataUint8,e+4)},e.prototype.elementReferenceCaptureId=function(e){var t=p(this.batchDataUint8,e+4);return this.stringReader.readString(t)},e.prototype.componentId=function(e){return p(this.batchDataUint8,e+8)},e.prototype.elementName=function(e){var t=p(this.batchDataUint8,e+8);return this.stringReader.readString(t)},e.prototype.textContent=function(e){var t=p(this.batchDataUint8,e+4);return this.stringReader.readString(t)},e.prototype.markupContent=function(e){var t=p(this.batchDataUint8,e+4);return this.stringReader.readString(t)},e.prototype.attributeName=function(e){var t=p(this.batchDataUint8,e+4);return this.stringReader.readString(t)},e.prototype.attributeValue=function(e){var t=p(this.batchDataUint8,e+8);return this.stringReader.readString(t)},e.prototype.attributeEventHandlerId=function(e){return g(this.batchDataUint8,e+12)},e}(),l=function(){function e(e){this.batchDataUint8=e,this.stringTableStartIndex=p(e,e.length-4)}return e.prototype.readString=function(e){if(-1===e)return null;var t,n=p(this.batchDataUint8,this.stringTableStartIndex+4*e),o=function(e,t){for(var n=0,r=0,o=0;o<4;o++){var i=e[t+o];if(n|=(127&i)<<r,i<128)break;r+=7}return n}(this.batchDataUint8,n),i=n+((t=o)<128?1:t<16384?2:t<2097152?3:4),a=new Uint8Array(this.batchDataUint8.buffer,this.batchDataUint8.byteOffset+i,o);return r.decodeUtf8(a)},e}(),f=function(){function e(e){this.batchDataUint8=e}return e.prototype.count=function(e){return p(this.batchDataUint8,e)},e.prototype.values=function(e){return e+4},e}(),h=function(){function e(e){this.batchDataUint8=e}return e.prototype.offset=function(e){return 0},e.prototype.count=function(e){return p(this.batchDataUint8,e)},e.prototype.values=function(e){return e+4},e}();function p(e,t){return e[t]|e[t+1]<<8|e[t+2]<<16|e[t+3]<<24}function d(e,t){return e[t]+(e[t+1]<<8)+(e[t+2]<<16)+(e[t+3]<<24>>>0)}function g(e,t){var n=d(e,t+4);if(n>i)throw new Error("Cannot read uint64 with high order part "+n+", because the result would exceed Number.MAX_SAFE_INTEGER.");return n*o+d(e,t)}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r="function"==typeof TextDecoder?new TextDecoder("utf-8"):null;t.decodeUtf8=r?r.decode.bind(r):function(e){var t=0,n=e.length,r=[],o=[];for(;t<n;){var i=e[t++];if(0===i)break;if(0==(128&i))r.push(i);else if(192==(224&i)){var a=63&e[t++];r.push((31&i)<<6|a)}else if(224==(240&i)){var a=63&e[t++],s=63&e[t++];r.push((31&i)<<12|a<<6|s)}else if(240==(248&i)){var a=63&e[t++],s=63&e[t++],c=63&e[t++],u=(7&i)<<18|a<<12|s<<6|c;u>65535&&(u-=65536,r.push(u>>>10&1023|55296),u=56320|1023&u),r.push(u)}r.length>1024&&(o.push(String.fromCharCode.apply(null,r)),r.length=0)}return o.push(String.fromCharCode.apply(null,r)),o.join("")}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(15),o=function(){function e(){}return e.prototype.log=function(e,t){},e.instance=new e,e}();t.NullLogger=o;var i=function(){function e(e){this.minimumLogLevel=e}return e.prototype.log=function(e,t){if(e>=this.minimumLogLevel)switch(e){case r.LogLevel.Critical:case r.LogLevel.Error:console.error("["+(new Date).toISOString()+"] "+r.LogLevel[e]+": "+t);break;case r.LogLevel.Warning:console.warn("["+(new Date).toISOString()+"] "+r.LogLevel[e]+": "+t);break;case r.LogLevel.Information:console.info("["+(new Date).toISOString()+"] "+r.LogLevel[e]+": "+t);break;default:console.log("["+(new Date).toISOString()+"] "+r.LogLevel[e]+": "+t)}},e}();t.ConsoleLogger=i},function(e,t,n){"use strict";var r=this&&this.__awaiter||function(e,t,n,r){return new(n||(n=Promise))(function(o,i){function a(e){try{c(r.next(e))}catch(e){i(e)}}function s(e){try{c(r.throw(e))}catch(e){i(e)}}function c(e){e.done?o(e.value):new n(function(t){t(e.value)}).then(a,s)}c((r=r.apply(e,t||[])).next())})},o=this&&this.__generator||function(e,t){var n,r,o,i,a={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return i={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(i[Symbol.iterator]=function(){return this}),i;function s(i){return function(s){return function(i){if(n)throw new TypeError("Generator is already executing.");for(;a;)try{if(n=1,r&&(o=2&i[0]?r.return:i[0]?r.throw||((o=r.return)&&o.call(r),0):r.next)&&!(o=o.call(r,i[1])).done)return o;switch(r=0,o&&(i=[2&i[0],o.value]),i[0]){case 0:case 1:o=i;break;case 4:return a.label++,{value:i[1],done:!1};case 5:a.label++,r=i[1],i=[0];continue;case 7:i=a.ops.pop(),a.trys.pop();continue;default:if(!(o=(o=a.trys).length>0&&o[o.length-1])&&(6===i[0]||2===i[0])){a=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]<o[3])){a.label=i[1];break}if(6===i[0]&&a.label<o[1]){a.label=o[1],o=i;break}if(o&&a.label<o[2]){a.label=o[2],a.ops.push(i);break}o[2]&&a.ops.pop(),a.trys.pop();continue}i=t.call(e,a)}catch(e){i=[6,e],r=0}finally{n=o=0}if(5&i[0])throw i[1];return{value:i[0]?i[1]:void 0,done:!0}}([i,s])}}};Object.defineProperty(t,"__esModule",{value:!0});var i=n(21),a=function(){function e(e){this.circuitId=e}return e.prototype.reconnect=function(e){return e.invoke("ConnectCircuit",this.circuitId)},e}();t.CircuitDescriptor=a,t.startCircuit=function(e){return r(this,void 0,void 0,function(){var t;return o(this,function(n){switch(n.label){case 0:return[4,e.invoke("StartCircuit",i.internalFunctions.getBaseURI(),i.internalFunctions.getLocationHref())];case 1:if(t=n.sent())return[2,new a(t)];throw new Error("Circuit failed to start")}})})}},function(e,t,n){"use strict";var r=this&&this.__assign||function(){return(r=Object.assign||function(e){for(var t,n=1,r=arguments.length;n<r;n++)for(var o in t=arguments[n])Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);return e}).apply(this,arguments)};Object.defineProperty(t,"__esModule",{value:!0});var o=n(15);t.resolveOptions=function(e){var t=r({},i,e);return e&&e.reconnectionOptions&&(t.reconnectionOptions=r({},i.reconnectionOptions,e.reconnectionOptions)),t};var i={configureSignalR:function(e){},logLevel:o.LogLevel.Warning,reconnectionOptions:{maxRetries:5,retryIntervalMilliseconds:3e3,dialogId:"components-reconnect-modal"}}},function(e,t,n){"use strict";var r=this&&this.__awaiter||function(e,t,n,r){return new(n||(n=Promise))(function(o,i){function a(e){try{c(r.next(e))}catch(e){i(e)}}function s(e){try{c(r.throw(e))}catch(e){i(e)}}function c(e){e.done?o(e.value):new n(function(t){t(e.value)}).then(a,s)}c((r=r.apply(e,t||[])).next())})},o=this&&this.__generator||function(e,t){var n,r,o,i,a={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return i={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(i[Symbol.iterator]=function(){return this}),i;function s(i){return function(s){return function(i){if(n)throw new TypeError("Generator is already executing.");for(;a;)try{if(n=1,r&&(o=2&i[0]?r.return:i[0]?r.throw||((o=r.return)&&o.call(r),0):r.next)&&!(o=o.call(r,i[1])).done)return o;switch(r=0,o&&(i=[2&i[0],o.value]),i[0]){case 0:case 1:o=i;break;case 4:return a.label++,{value:i[1],done:!1};case 5:a.label++,r=i[1],i=[0];continue;case 7:i=a.ops.pop(),a.trys.pop();continue;default:if(!(o=(o=a.trys).length>0&&o[o.length-1])&&(6===i[0]||2===i[0])){a=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]<o[3])){a.label=i[1];break}if(6===i[0]&&a.label<o[1]){a.label=o[1],o=i;break}if(o&&a.label<o[2]){a.label=o[2],a.ops.push(i);break}o[2]&&a.ops.pop(),a.trys.pop();continue}i=t.call(e,a)}catch(e){i=[6,e],r=0}finally{n=o=0}if(5&i[0])throw i[1];return{value:i[0]?i[1]:void 0,done:!0}}([i,s])}}};Object.defineProperty(t,"__esModule",{value:!0});var i=n(77),a=n(78),s=n(15),c=function(){function e(e,t,n){this._currentReconnectionProcess=null,this._logger=e,this._reconnectionDisplay=t,this._reconnectCallback=n||function(){return window.Blazor.reconnect()}}return e.prototype.onConnectionDown=function(e,t){if(!this._reconnectionDisplay){var n=document.getElementById(e.dialogId);this._reconnectionDisplay=n?new a.UserSpecifiedDisplay(n):new i.DefaultReconnectDisplay(e.dialogId,document,this._logger)}this._currentReconnectionProcess||(this._currentReconnectionProcess=new u(e,this._logger,this._reconnectCallback,this._reconnectionDisplay))},e.prototype.onConnectionUp=function(){this._currentReconnectionProcess&&(this._currentReconnectionProcess.dispose(),this._currentReconnectionProcess=null)},e}();t.DefaultReconnectionHandler=c;var u=function(){function e(e,t,n,r){this.logger=t,this.reconnectCallback=n,this.isDisposed=!1,this.reconnectDisplay=r,this.reconnectDisplay.show(),this.attemptPeriodicReconnection(e)}return e.prototype.dispose=function(){this.isDisposed=!0,this.reconnectDisplay.hide()},e.prototype.attemptPeriodicReconnection=function(e){return r(this,void 0,void 0,function(){var t,n;return o(this,function(r){switch(r.label){case 0:t=0,r.label=1;case 1:return t<e.maxRetries?[4,this.delay(e.retryIntervalMilliseconds)]:[3,7];case 2:if(r.sent(),this.isDisposed)return[3,7];r.label=3;case 3:return r.trys.push([3,5,,6]),[4,this.reconnectCallback()];case 4:return r.sent()?[2]:(this.reconnectDisplay.rejected(),[2]);case 5:return n=r.sent(),this.logger.log(s.LogLevel.Error,n),[3,6];case 6:return t++,[3,1];case 7:return this.reconnectDisplay.failed(),[2]}})})},e.prototype.delay=function(e){return new Promise(function(t){return setTimeout(t,e)})},e}()},function(e,t,n){"use strict";var r=this&&this.__awaiter||function(e,t,n,r){return new(n||(n=Promise))(function(o,i){function a(e){try{c(r.next(e))}catch(e){i(e)}}function s(e){try{c(r.throw(e))}catch(e){i(e)}}function c(e){e.done?o(e.value):new n(function(t){t(e.value)}).then(a,s)}c((r=r.apply(e,t||[])).next())})},o=this&&this.__generator||function(e,t){var n,r,o,i,a={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return i={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(i[Symbol.iterator]=function(){return this}),i;function s(i){return function(s){return function(i){if(n)throw new TypeError("Generator is already executing.");for(;a;)try{if(n=1,r&&(o=2&i[0]?r.return:i[0]?r.throw||((o=r.return)&&o.call(r),0):r.next)&&!(o=o.call(r,i[1])).done)return o;switch(r=0,o&&(i=[2&i[0],o.value]),i[0]){case 0:case 1:o=i;break;case 4:return a.label++,{value:i[1],done:!1};case 5:a.label++,r=i[1],i=[0];continue;case 7:i=a.ops.pop(),a.trys.pop();continue;default:if(!(o=(o=a.trys).length>0&&o[o.length-1])&&(6===i[0]||2===i[0])){a=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]<o[3])){a.label=i[1];break}if(6===i[0]&&a.label<o[1]){a.label=o[1],o=i;break}if(o&&a.label<o[2]){a.label=o[2],a.ops.push(i);break}o[2]&&a.ops.pop(),a.trys.pop();continue}i=t.call(e,a)}catch(e){i=[6,e],r=0}finally{n=o=0}if(5&i[0])throw i[1];return{value:i[0]?i[1]:void 0,done:!0}}([i,s])}}};Object.defineProperty(t,"__esModule",{value:!0});var i=n(15),a=function(){function e(e,t,n){var a=this;this.document=t,this.logger=n,this.addedToDom=!1,this.modal=this.document.createElement("div"),this.modal.id=e;this.modal.style.cssText=["position: fixed","top: 0","right: 0","bottom: 0","left: 0","z-index: 1000","display: none","overflow: hidden","background-color: #fff","opacity: 0.8","text-align: center","font-weight: bold"].join(";"),this.modal.innerHTML='<h5 style="margin-top: 20px"></h5><button style="margin:5px auto 5px">Retry</button><p>Alternatively, <a href>reload</a></p>',this.message=this.modal.querySelector("h5"),this.button=this.modal.querySelector("button"),this.reloadParagraph=this.modal.querySelector("p"),this.button.addEventListener("click",function(){return r(a,void 0,void 0,function(){var e;return o(this,function(t){switch(t.label){case 0:this.show(),t.label=1;case 1:return t.trys.push([1,3,,4]),[4,window.Blazor.reconnect()];case 2:return t.sent()||this.rejected(),[3,4];case 3:return e=t.sent(),this.logger.log(i.LogLevel.Error,e),this.failed(),[3,4];case 4:return[2]}})})}),this.reloadParagraph.querySelector("a").addEventListener("click",function(){return location.reload()})}return e.prototype.show=function(){this.addedToDom||(this.addedToDom=!0,this.document.body.appendChild(this.modal)),this.modal.style.display="block",this.button.style.display="none",this.reloadParagraph.style.display="none",this.message.textContent="Attempting to reconnect to the server..."},e.prototype.hide=function(){this.modal.style.display="none"},e.prototype.failed=function(){this.button.style.display="block",this.reloadParagraph.style.display="none",this.message.innerHTML="Reconnection failed. Try <a href>reloading</a> the page if you're unable to reconnect."},e.prototype.rejected=function(){this.button.style.display="none",this.reloadParagraph.style.display="none",this.message.innerHTML="Could not reconnect to the server. <a href>Reload</a> the page to restore functionality."},e}();t.DefaultReconnectDisplay=a},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=function(){function e(e){this.dialog=e}return e.prototype.show=function(){this.removeClasses(),this.dialog.classList.add(e.ShowClassName)},e.prototype.hide=function(){this.removeClasses(),this.dialog.classList.add(e.HideClassName)},e.prototype.failed=function(){this.removeClasses(),this.dialog.classList.add(e.FailedClassName)},e.prototype.rejected=function(){this.removeClasses(),this.dialog.classList.add(e.RefusedClassName)},e.prototype.removeClasses=function(){this.dialog.classList.remove(e.ShowClassName,e.HideClassName,e.FailedClassName,e.RefusedClassName)},e.ShowClassName="components-reconnect-show",e.HideClassName="components-reconnect-hide",e.FailedClassName="components-reconnect-failed",e.RefusedClassName="components-reconnect-refused",e}();t.UserSpecifiedDisplay=r},function(e,t,n){"use strict";n.r(t);var r=n(5),o=n(12),i=n(2),a=function(){function e(){}return e.write=function(e){var t=e.byteLength||e.length,n=[];do{var r=127&t;(t>>=7)>0&&(r|=128),n.push(r)}while(t>0);t=e.byteLength||e.length;var o=new Uint8Array(n.length+t);return o.set(n,0),o.set(e,n.length),o.buffer},e.parse=function(e){for(var t=[],n=new Uint8Array(e),r=[0,7,14,21,28],o=0;o<e.byteLength;){var i=0,a=0,s=void 0;do{a|=(127&(s=n[o+i]))<<r[i],i++}while(i<Math.min(5,e.byteLength-o)&&0!=(128&s));if(0!=(128&s)&&i<5)throw new Error("Cannot read message size.");if(5===i&&s>7)throw new Error("Messages bigger than 2GB are not supported.");if(!(n.byteLength>=o+i+a))throw new Error("Incomplete message.");t.push(n.slice?n.slice(o+i,o+i+a):n.subarray(o+i,o+i+a)),o=o+i+a}return t},e}();var s=new Uint8Array([145,i.MessageType.Ping]),c=function(){function e(){this.name="messagepack",this.version=1,this.transferFormat=i.TransferFormat.Binary,this.errorResult=1,this.voidResult=2,this.nonVoidResult=3}return e.prototype.parseMessages=function(e,t){if(!(e instanceof r.Buffer||(n=e,n&&"undefined"!=typeof ArrayBuffer&&(n instanceof ArrayBuffer||n.constructor&&"ArrayBuffer"===n.constructor.name))))throw new Error("Invalid input for MessagePack hub protocol. Expected an ArrayBuffer or Buffer.");var n;null===t&&(t=i.NullLogger.instance);for(var o=[],s=0,c=a.parse(e);s<c.length;s++){var u=c[s],l=this.parseMessage(u,t);l&&o.push(l)}return o},e.prototype.writeMessage=function(e){switch(e.type){case i.MessageType.Invocation:return this.writeInvocation(e);case i.MessageType.StreamInvocation:return this.writeStreamInvocation(e);case i.MessageType.StreamItem:return this.writeStreamItem(e);case i.MessageType.Completion:return this.writeCompletion(e);case i.MessageType.Ping:return a.write(s);case i.MessageType.CancelInvocation:return this.writeCancelInvocation(e);default:throw new Error("Invalid message type.")}},e.prototype.parseMessage=function(e,t){if(0===e.length)throw new Error("Invalid payload.");var n=o().decode(r.Buffer.from(e));if(0===n.length||!(n instanceof Array))throw new Error("Invalid payload.");var a=n[0];switch(a){case i.MessageType.Invocation:return this.createInvocationMessage(this.readHeaders(n),n);case i.MessageType.StreamItem:return this.createStreamItemMessage(this.readHeaders(n),n);case i.MessageType.Completion:return this.createCompletionMessage(this.readHeaders(n),n);case i.MessageType.Ping:return this.createPingMessage(n);case i.MessageType.Close:return this.createCloseMessage(n);default:return t.log(i.LogLevel.Information,"Unknown message type '"+a+"' ignored."),null}},e.prototype.createCloseMessage=function(e){if(e.length<2)throw new Error("Invalid payload for Close message.");return{error:e[1],type:i.MessageType.Close}},e.prototype.createPingMessage=function(e){if(e.length<1)throw new Error("Invalid payload for Ping message.");return{type:i.MessageType.Ping}},e.prototype.createInvocationMessage=function(e,t){if(t.length<5)throw new Error("Invalid payload for Invocation message.");var n=t[2];return n?{arguments:t[4],headers:e,invocationId:n,streamIds:[],target:t[3],type:i.MessageType.Invocation}:{arguments:t[4],headers:e,streamIds:[],target:t[3],type:i.MessageType.Invocation}},e.prototype.createStreamItemMessage=function(e,t){if(t.length<4)throw new Error("Invalid payload for StreamItem message.");return{headers:e,invocationId:t[2],item:t[3],type:i.MessageType.StreamItem}},e.prototype.createCompletionMessage=function(e,t){if(t.length<4)throw new Error("Invalid payload for Completion message.");var n,r,o=t[3];if(o!==this.voidResult&&t.length<5)throw new Error("Invalid payload for Completion message.");switch(o){case this.errorResult:n=t[4];break;case this.nonVoidResult:r=t[4]}return{error:n,headers:e,invocationId:t[2],result:r,type:i.MessageType.Completion}},e.prototype.writeInvocation=function(e){var t=o().encode([i.MessageType.Invocation,e.headers||{},e.invocationId||null,e.target,e.arguments,e.streamIds]);return a.write(t.slice())},e.prototype.writeStreamInvocation=function(e){var t=o().encode([i.MessageType.StreamInvocation,e.headers||{},e.invocationId,e.target,e.arguments,e.streamIds]);return a.write(t.slice())},e.prototype.writeStreamItem=function(e){var t=o().encode([i.MessageType.StreamItem,e.headers||{},e.invocationId,e.item]);return a.write(t.slice())},e.prototype.writeCompletion=function(e){var t,n=o(),r=e.error?this.errorResult:e.result?this.nonVoidResult:this.voidResult;switch(r){case this.errorResult:t=n.encode([i.MessageType.Completion,e.headers||{},e.invocationId,r,e.error]);break;case this.voidResult:t=n.encode([i.MessageType.Completion,e.headers||{},e.invocationId,r]);break;case this.nonVoidResult:t=n.encode([i.MessageType.Completion,e.headers||{},e.invocationId,r,e.result])}return a.write(t.slice())},e.prototype.writeCancelInvocation=function(e){var t=o().encode([i.MessageType.CancelInvocation,e.headers||{},e.invocationId]);return a.write(t.slice())},e.prototype.readHeaders=function(e){var t=e[1];if("object"!=typeof t)throw new Error("Invalid headers.");return t},e}();n.d(t,"VERSION",function(){return u}),n.d(t,"MessagePackHubProtocol",function(){return c});var u="5.0.0-dev"}]);
\ No newline at end of file
+function r(e,t){if(e===t)return 0;for(var n=e.length,r=t.length,o=0,i=Math.min(n,r);o<i;++o)if(e[o]!==t[o]){n=e[o],r=t[o];break}return n<r?-1:r<n?1:0}function o(e){return t.Buffer&&"function"==typeof t.Buffer.isBuffer?t.Buffer.isBuffer(e):!(null==e||!e._isBuffer)}var i=n(35),s=Object.prototype.hasOwnProperty,a=Array.prototype.slice,c="foo"===function(){}.name;function u(e){return Object.prototype.toString.call(e)}function l(e){return!o(e)&&("function"==typeof t.ArrayBuffer&&("function"==typeof ArrayBuffer.isView?ArrayBuffer.isView(e):!!e&&(e instanceof DataView||!!(e.buffer&&e.buffer instanceof ArrayBuffer))))}var f=e.exports=v,h=/\s*function\s+([^\(\s]*)\s*/;function p(e){if(i.isFunction(e)){if(c)return e.name;var t=e.toString().match(h);return t&&t[1]}}function d(e,t){return"string"==typeof e?e.length<t?e:e.slice(0,t):e}function g(e){if(c||!i.isFunction(e))return i.inspect(e);var t=p(e);return"[Function"+(t?": "+t:"")+"]"}function y(e,t,n,r,o){throw new f.AssertionError({message:n,actual:e,expected:t,operator:r,stackStartFunction:o})}function v(e,t){e||y(e,!0,t,"==",f.ok)}function b(e,t,n,s){if(e===t)return!0;if(o(e)&&o(t))return 0===r(e,t);if(i.isDate(e)&&i.isDate(t))return e.getTime()===t.getTime();if(i.isRegExp(e)&&i.isRegExp(t))return e.source===t.source&&e.global===t.global&&e.multiline===t.multiline&&e.lastIndex===t.lastIndex&&e.ignoreCase===t.ignoreCase;if(null!==e&&"object"==typeof e||null!==t&&"object"==typeof t){if(l(e)&&l(t)&&u(e)===u(t)&&!(e instanceof Float32Array||e instanceof Float64Array))return 0===r(new Uint8Array(e.buffer),new Uint8Array(t.buffer));if(o(e)!==o(t))return!1;var c=(s=s||{actual:[],expected:[]}).actual.indexOf(e);return-1!==c&&c===s.expected.indexOf(t)||(s.actual.push(e),s.expected.push(t),function(e,t,n,r){if(null==e||null==t)return!1;if(i.isPrimitive(e)||i.isPrimitive(t))return e===t;if(n&&Object.getPrototypeOf(e)!==Object.getPrototypeOf(t))return!1;var o=m(e),s=m(t);if(o&&!s||!o&&s)return!1;if(o)return e=a.call(e),t=a.call(t),b(e,t,n);var c,u,l=S(e),f=S(t);if(l.length!==f.length)return!1;for(l.sort(),f.sort(),u=l.length-1;u>=0;u--)if(l[u]!==f[u])return!1;for(u=l.length-1;u>=0;u--)if(c=l[u],!b(e[c],t[c],n,r))return!1;return!0}(e,t,n,s))}return n?e===t:e==t}function m(e){return"[object Arguments]"==Object.prototype.toString.call(e)}function w(e,t){if(!e||!t)return!1;if("[object RegExp]"==Object.prototype.toString.call(t))return t.test(e);try{if(e instanceof t)return!0}catch(e){}return!Error.isPrototypeOf(t)&&!0===t.call({},e)}function E(e,t,n,r){var o;if("function"!=typeof t)throw new TypeError('"block" argument must be a function');"string"==typeof n&&(r=n,n=null),o=function(e){var t;try{e()}catch(e){t=e}return t}(t),r=(n&&n.name?" ("+n.name+").":".")+(r?" "+r:"."),e&&!o&&y(o,n,"Missing expected exception"+r);var s="string"==typeof r,a=!e&&o&&!n;if((!e&&i.isError(o)&&s&&w(o,n)||a)&&y(o,n,"Got unwanted exception"+r),e&&o&&n&&!w(o,n)||!e&&o)throw o}f.AssertionError=function(e){var t;this.name="AssertionError",this.actual=e.actual,this.expected=e.expected,this.operator=e.operator,e.message?(this.message=e.message,this.generatedMessage=!1):(this.message=d(g((t=this).actual),128)+" "+t.operator+" "+d(g(t.expected),128),this.generatedMessage=!0);var n=e.stackStartFunction||y;if(Error.captureStackTrace)Error.captureStackTrace(this,n);else{var r=new Error;if(r.stack){var o=r.stack,i=p(n),s=o.indexOf("\n"+i);if(s>=0){var a=o.indexOf("\n",s+1);o=o.substring(a+1)}this.stack=o}}},i.inherits(f.AssertionError,Error),f.fail=y,f.ok=v,f.equal=function(e,t,n){e!=t&&y(e,t,n,"==",f.equal)},f.notEqual=function(e,t,n){e==t&&y(e,t,n,"!=",f.notEqual)},f.deepEqual=function(e,t,n){b(e,t,!1)||y(e,t,n,"deepEqual",f.deepEqual)},f.deepStrictEqual=function(e,t,n){b(e,t,!0)||y(e,t,n,"deepStrictEqual",f.deepStrictEqual)},f.notDeepEqual=function(e,t,n){b(e,t,!1)&&y(e,t,n,"notDeepEqual",f.notDeepEqual)},f.notDeepStrictEqual=function e(t,n,r){b(t,n,!0)&&y(t,n,r,"notDeepStrictEqual",e)},f.strictEqual=function(e,t,n){e!==t&&y(e,t,n,"===",f.strictEqual)},f.notStrictEqual=function(e,t,n){e===t&&y(e,t,n,"!==",f.notStrictEqual)},f.throws=function(e,t,n){E(!0,e,t,n)},f.doesNotThrow=function(e,t,n){E(!1,e,t,n)},f.ifError=function(e){if(e)throw e};var S=Object.keys||function(e){var t=[];for(var n in e)s.call(e,n)&&t.push(n);return t}}).call(this,n(10))},function(e,t){e.exports=function(e){return e&&"object"==typeof e&&"function"==typeof e.copy&&"function"==typeof e.fill&&"function"==typeof e.readUInt8}},function(e,t){"function"==typeof Object.create?e.exports=function(e,t){e.super_=t,e.prototype=Object.create(t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}})}:e.exports=function(e,t){e.super_=t;var n=function(){};n.prototype=t.prototype,e.prototype=new n,e.prototype.constructor=e}},function(e,t,n){e.exports=n(11)},function(e,t){var n={}.toString;e.exports=Array.isArray||function(e){return"[object Array]"==n.call(e)}},function(e,t){},function(e,t,n){"use strict";var r=n(14).Buffer,o=n(60);e.exports=function(){function e(){!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),this.head=null,this.tail=null,this.length=0}return e.prototype.push=function(e){var t={data:e,next:null};this.length>0?this.tail.next=t:this.head=t,this.tail=t,++this.length},e.prototype.unshift=function(e){var t={data:e,next:this.head};0===this.length&&(this.tail=t),this.head=t,++this.length},e.prototype.shift=function(){if(0!==this.length){var e=this.head.data;return 1===this.length?this.head=this.tail=null:this.head=this.head.next,--this.length,e}},e.prototype.clear=function(){this.head=this.tail=null,this.length=0},e.prototype.join=function(e){if(0===this.length)return"";for(var t=this.head,n=""+t.data;t=t.next;)n+=e+t.data;return n},e.prototype.concat=function(e){if(0===this.length)return r.alloc(0);if(1===this.length)return this.head.data;for(var t,n,o,i=r.allocUnsafe(e>>>0),s=this.head,a=0;s;)t=s.data,n=i,o=a,t.copy(n,o),a+=s.data.length,s=s.next;return i},e}(),o&&o.inspect&&o.inspect.custom&&(e.exports.prototype[o.inspect.custom]=function(){var e=o.inspect({length:this.length});return this.constructor.name+" "+e})},function(e,t){},function(e,t,n){var r=n(6),o=r.Buffer;function i(e,t){for(var n in e)t[n]=e[n]}function s(e,t,n){return o(e,t,n)}o.from&&o.alloc&&o.allocUnsafe&&o.allocUnsafeSlow?e.exports=r:(i(r,t),t.Buffer=s),i(o,s),s.from=function(e,t,n){if("number"==typeof e)throw new TypeError("Argument must not be a number");return o(e,t,n)},s.alloc=function(e,t,n){if("number"!=typeof e)throw new TypeError("Argument must be a number");var r=o(e);return void 0!==t?"string"==typeof n?r.fill(t,n):r.fill(t):r.fill(0),r},s.allocUnsafe=function(e){if("number"!=typeof e)throw new TypeError("Argument must be a number");return o(e)},s.allocUnsafeSlow=function(e){if("number"!=typeof e)throw new TypeError("Argument must be a number");return r.SlowBuffer(e)}},function(e,t,n){(function(e){var r=void 0!==e&&e||"undefined"!=typeof self&&self||window,o=Function.prototype.apply;function i(e,t){this._id=e,this._clearFn=t}t.setTimeout=function(){return new i(o.call(setTimeout,r,arguments),clearTimeout)},t.setInterval=function(){return new i(o.call(setInterval,r,arguments),clearInterval)},t.clearTimeout=t.clearInterval=function(e){e&&e.close()},i.prototype.unref=i.prototype.ref=function(){},i.prototype.close=function(){this._clearFn.call(r,this._id)},t.enroll=function(e,t){clearTimeout(e._idleTimeoutId),e._idleTimeout=t},t.unenroll=function(e){clearTimeout(e._idleTimeoutId),e._idleTimeout=-1},t._unrefActive=t.active=function(e){clearTimeout(e._idleTimeoutId);var t=e._idleTimeout;t>=0&&(e._idleTimeoutId=setTimeout(function(){e._onTimeout&&e._onTimeout()},t))},n(63),t.setImmediate="undefined"!=typeof self&&self.setImmediate||void 0!==e&&e.setImmediate||this&&this.setImmediate,t.clearImmediate="undefined"!=typeof self&&self.clearImmediate||void 0!==e&&e.clearImmediate||this&&this.clearImmediate}).call(this,n(10))},function(e,t,n){(function(e,t){!function(e,n){"use strict";if(!e.setImmediate){var r,o,i,s,a,c=1,u={},l=!1,f=e.document,h=Object.getPrototypeOf&&Object.getPrototypeOf(e);h=h&&h.setTimeout?h:e,"[object process]"==={}.toString.call(e.process)?r=function(e){t.nextTick(function(){d(e)})}:!function(){if(e.postMessage&&!e.importScripts){var t=!0,n=e.onmessage;return e.onmessage=function(){t=!1},e.postMessage("","*"),e.onmessage=n,t}}()?e.MessageChannel?((i=new MessageChannel).port1.onmessage=function(e){d(e.data)},r=function(e){i.port2.postMessage(e)}):f&&"onreadystatechange"in f.createElement("script")?(o=f.documentElement,r=function(e){var t=f.createElement("script");t.onreadystatechange=function(){d(e),t.onreadystatechange=null,o.removeChild(t),t=null},o.appendChild(t)}):r=function(e){setTimeout(d,0,e)}:(s="setImmediate$"+Math.random()+"$",a=function(t){t.source===e&&"string"==typeof t.data&&0===t.data.indexOf(s)&&d(+t.data.slice(s.length))},e.addEventListener?e.addEventListener("message",a,!1):e.attachEvent("onmessage",a),r=function(t){e.postMessage(s+t,"*")}),h.setImmediate=function(e){"function"!=typeof e&&(e=new Function(""+e));for(var t=new Array(arguments.length-1),n=0;n<t.length;n++)t[n]=arguments[n+1];var o={callback:e,args:t};return u[c]=o,r(c),c++},h.clearImmediate=p}function p(e){delete u[e]}function d(e){if(l)setTimeout(d,0,e);else{var t=u[e];if(t){l=!0;try{!function(e){var t=e.callback,r=e.args;switch(r.length){case 0:t();break;case 1:t(r[0]);break;case 2:t(r[0],r[1]);break;case 3:t(r[0],r[1],r[2]);break;default:t.apply(n,r)}}(t)}finally{p(e),l=!1}}}}}("undefined"==typeof self?void 0===e?this:e:self)}).call(this,n(10),n(19))},function(e,t,n){(function(t){function n(e){try{if(!t.localStorage)return!1}catch(e){return!1}var n=t.localStorage[e];return null!=n&&"true"===String(n).toLowerCase()}e.exports=function(e,t){if(n("noDeprecation"))return e;var r=!1;return function(){if(!r){if(n("throwDeprecation"))throw new Error(t);n("traceDeprecation")?console.trace(t):console.warn(t),r=!0}return e.apply(this,arguments)}}}).call(this,n(10))},function(e,t,n){"use strict";var r=n(66).Transform,o=n(15),i=n(22);function s(e){(e=e||{}).objectMode=!0,e.highWaterMark=16,r.call(this,e),this._msgpack=e.msgpack}function a(e){if(!(this instanceof a))return(e=e||{}).msgpack=this,new a(e);s.call(this,e)}function c(e){if(!(this instanceof c))return(e=e||{}).msgpack=this,new c(e);s.call(this,e),this._chunks=i()}o(s,r),o(a,s),a.prototype._transform=function(e,t,n){var r=null;try{r=this._msgpack.encode(e).slice(0)}catch(e){return this.emit("error",e),n()}this.push(r),n()},o(c,s),c.prototype._transform=function(e,t,n){e&&this._chunks.append(e);try{var r=this._msgpack.decode(this._chunks);this.push(r)}catch(e){return void(e instanceof this._msgpack.IncompleteBufferError?n():this.emit("error",e))}this._chunks.length>0?this._transform(null,t,n):n()},e.exports.decoder=c,e.exports.encoder=a},function(e,t,n){(t=e.exports=n(36)).Stream=t,t.Readable=t,t.Writable=n(41),t.Duplex=n(11),t.Transform=n(42),t.PassThrough=n(67)},function(e,t,n){"use strict";e.exports=i;var r=n(42),o=n(20);function i(e){if(!(this instanceof i))return new i(e);r.call(this,e)}o.inherits=n(15),o.inherits(i,r),i.prototype._transform=function(e,t,n){n(null,e)}},function(e,t,n){var r=n(22);function o(e){Error.call(this),Error.captureStackTrace&&Error.captureStackTrace(this,this.constructor),this.name=this.constructor.name,this.message=e||"unable to decode"}n(35).inherits(o,Error),e.exports=function(e){return function(e){e instanceof r||(e=r().append(e));var t=i(e);if(t)return e.consume(t.bytesConsumed),t.value;throw new o};function t(e,t,n){return t>=n+e}function n(e,t){return{value:e,bytesConsumed:t}}function i(e,r){r=void 0===r?0:r;var o=e.length-r;if(o<=0)return null;var i,l,f,h=e.readUInt8(r),p=0;if(!function(e,t){var n=function(e){switch(e){case 196:return 2;case 197:return 3;case 198:return 5;case 199:return 3;case 200:return 4;case 201:return 6;case 202:return 5;case 203:return 9;case 204:return 2;case 205:return 3;case 206:return 5;case 207:return 9;case 208:return 2;case 209:return 3;case 210:return 5;case 211:return 9;case 212:return 3;case 213:return 4;case 214:return 6;case 215:return 10;case 216:return 18;case 217:return 2;case 218:return 3;case 219:return 5;case 222:return 3;default:return-1}}(e);return!(-1!==n&&t<n)}(h,o))return null;switch(h){case 192:return n(null,1);case 194:return n(!1,1);case 195:return n(!0,1);case 204:return n(p=e.readUInt8(r+1),2);case 205:return n(p=e.readUInt16BE(r+1),3);case 206:return n(p=e.readUInt32BE(r+1),5);case 207:for(f=7;f>=0;f--)p+=e.readUInt8(r+f+1)*Math.pow(2,8*(7-f));return n(p,9);case 208:return n(p=e.readInt8(r+1),2);case 209:return n(p=e.readInt16BE(r+1),3);case 210:return n(p=e.readInt32BE(r+1),5);case 211:return n(p=function(e,t){var n=128==(128&e[t]);if(n)for(var r=1,o=t+7;o>=t;o--){var i=(255^e[o])+r;e[o]=255&i,r=i>>8}var s=e.readUInt32BE(t+0),a=e.readUInt32BE(t+4);return(4294967296*s+a)*(n?-1:1)}(e.slice(r+1,r+9),0),9);case 202:return n(p=e.readFloatBE(r+1),5);case 203:return n(p=e.readDoubleBE(r+1),9);case 217:return t(i=e.readUInt8(r+1),o,2)?n(p=e.toString("utf8",r+2,r+2+i),2+i):null;case 218:return t(i=e.readUInt16BE(r+1),o,3)?n(p=e.toString("utf8",r+3,r+3+i),3+i):null;case 219:return t(i=e.readUInt32BE(r+1),o,5)?n(p=e.toString("utf8",r+5,r+5+i),5+i):null;case 196:return t(i=e.readUInt8(r+1),o,2)?n(p=e.slice(r+2,r+2+i),2+i):null;case 197:return t(i=e.readUInt16BE(r+1),o,3)?n(p=e.slice(r+3,r+3+i),3+i):null;case 198:return t(i=e.readUInt32BE(r+1),o,5)?n(p=e.slice(r+5,r+5+i),5+i):null;case 220:return o<3?null:(i=e.readUInt16BE(r+1),s(e,r,i,3));case 221:return o<5?null:(i=e.readUInt32BE(r+1),s(e,r,i,5));case 222:return i=e.readUInt16BE(r+1),a(e,r,i,3);case 223:throw new Error("map too big to decode in JS");case 212:return c(e,r,1);case 213:return c(e,r,2);case 214:return c(e,r,4);case 215:return c(e,r,8);case 216:return c(e,r,16);case 199:return i=e.readUInt8(r+1),l=e.readUInt8(r+2),t(i,o,3)?u(e,r,l,i,3):null;case 200:return i=e.readUInt16BE(r+1),l=e.readUInt8(r+3),t(i,o,4)?u(e,r,l,i,4):null;case 201:return i=e.readUInt32BE(r+1),l=e.readUInt8(r+5),t(i,o,6)?u(e,r,l,i,6):null}if(144==(240&h))return s(e,r,i=15&h,1);if(128==(240&h))return a(e,r,i=15&h,1);if(160==(224&h))return t(i=31&h,o,1)?n(p=e.toString("utf8",r+1,r+i+1),i+1):null;if(h>=224)return n(p=h-256,1);if(h<128)return n(h,1);throw new Error("not implemented yet")}function s(e,t,r,o){var s,a=[],c=0;for(t+=o,s=0;s<r;s++){var u=i(e,t);if(!u)return null;a.push(u.value),t+=u.bytesConsumed,c+=u.bytesConsumed}return n(a,o+c)}function a(e,t,r,o){var s,a={},c=0;for(t+=o,s=0;s<r;s++){var u=i(e,t);if(!u)return null;var l=i(e,t+=u.bytesConsumed);if(!l)return null;a[u.value]=l.value,t+=l.bytesConsumed,c+=u.bytesConsumed+l.bytesConsumed}return n(a,o+c)}function c(e,t,n){var r=e.readInt8(t+1);return u(e,t,r,n,2)}function u(t,r,o,i,s){var a,c;if(r+=s,o<0)switch(o){case-1:return function(e,t,r){var o,i;switch(i=0,t){case 4:o=e.readUInt32BE(0);break;case 8:var s=e.readUInt32BE(0),a=e.readUInt32BE(4);i=s/4,o=(3&s)*Math.pow(2,32)+a;break;case 12:throw new Error("timestamp 96 is not yet implemented")}var c=1e3*o+Math.round(i/1e6);return n(new Date(c),t+r)}(c=t.slice(r,r+i),i,s)}for(a=0;a<e.length;a++){if(o===e[a].type)return c=t.slice(r,r+i),n(e[a].decode(c),s+i)}throw new Error("unable to find ext type "+o)}},e.exports.IncompleteBufferError=o},function(e,t,n){"use strict";var r=n(14).Buffer,o=n(22),i=.1;function s(e,t){var n;return(n=r.allocUnsafe(5))[0]=202,n.writeFloatBE(e,1),(t||Math.abs(e-n.readFloatBE(1))>i)&&((n=r.allocUnsafe(9))[0]=203,n.writeDoubleBE(e,1)),n}e.exports=function(e,t,n,i){function a(c,u){var l,f,h;if(void 0===c)throw new Error("undefined is not encodable in msgpack!");if(null===c)(l=r.allocUnsafe(1))[0]=192;else if(!0===c)(l=r.allocUnsafe(1))[0]=195;else if(!1===c)(l=r.allocUnsafe(1))[0]=194;else if("string"==typeof c)(f=r.byteLength(c))<32?((l=r.allocUnsafe(1+f))[0]=160|f,f>0&&l.write(c,1)):f<=255&&!n?((l=r.allocUnsafe(2+f))[0]=217,l[1]=f,l.write(c,2)):f<=65535?((l=r.allocUnsafe(3+f))[0]=218,l.writeUInt16BE(f,1),l.write(c,3)):((l=r.allocUnsafe(5+f))[0]=219,l.writeUInt32BE(f,1),l.write(c,5));else if(c&&(c.readUInt32LE||c instanceof Uint8Array))c instanceof Uint8Array&&(c=r.from(c)),c.length<=255?((l=r.allocUnsafe(2))[0]=196,l[1]=c.length):c.length<=65535?((l=r.allocUnsafe(3))[0]=197,l.writeUInt16BE(c.length,1)):((l=r.allocUnsafe(5))[0]=198,l.writeUInt32BE(c.length,1)),l=o([l,c]);else if(Array.isArray(c))c.length<16?(l=r.allocUnsafe(1))[0]=144|c.length:c.length<65536?((l=r.allocUnsafe(3))[0]=220,l.writeUInt16BE(c.length,1)):((l=r.allocUnsafe(5))[0]=221,l.writeUInt32BE(c.length,1)),l=c.reduce(function(e,t){return e.append(a(t,!0)),e},o().append(l));else{if(!i&&"function"==typeof c.getDate)return function(e){var t,n=1*e,i=Math.floor(n/1e3),s=1e6*(n-1e3*i);if(s||i>4294967295){(t=new r(10))[0]=215,t[1]=-1;var a=4*s,c=i/Math.pow(2,32),u=a+c&4294967295,l=4294967295&i;t.writeInt32BE(u,2),t.writeInt32BE(l,6)}else(t=new r(6))[0]=214,t[1]=-1,t.writeUInt32BE(Math.floor(n/1e3),2);return o().append(t)}(c);if("object"==typeof c)l=function(t){var n,i,s=-1,a=[];for(n=0;n<e.length;n++)if(e[n].check(t)){i=e[n].encode(t);break}if(!i)return null;1==(s=i.length-1)?a.push(212):2===s?a.push(213):4===s?a.push(214):8===s?a.push(215):16===s?a.push(216):s<256?(a.push(199),a.push(s)):s<65536?(a.push(200),a.push(s>>8),a.push(255&s)):(a.push(201),a.push(s>>24),a.push(s>>16&255),a.push(s>>8&255),a.push(255&s));return o().append(r.from(a)).append(i)}(c)||function(e){var t,n,i=[],s=0;for(t in e)e.hasOwnProperty(t)&&void 0!==e[t]&&"function"!=typeof e[t]&&(++s,i.push(a(t,!0)),i.push(a(e[t],!0)));s<16?(n=r.allocUnsafe(1))[0]=128|s:((n=r.allocUnsafe(3))[0]=222,n.writeUInt16BE(s,1));return i.unshift(n),i.reduce(function(e,t){return e.append(t)},o())}(c);else if("number"==typeof c){if((h=c)!==Math.floor(h))return s(c,t);if(c>=0)if(c<128)(l=r.allocUnsafe(1))[0]=c;else if(c<256)(l=r.allocUnsafe(2))[0]=204,l[1]=c;else if(c<65536)(l=r.allocUnsafe(3))[0]=205,l.writeUInt16BE(c,1);else if(c<=4294967295)(l=r.allocUnsafe(5))[0]=206,l.writeUInt32BE(c,1);else{if(!(c<=9007199254740991))return s(c,!0);(l=r.allocUnsafe(9))[0]=207,function(e,t){for(var n=7;n>=0;n--)e[n+1]=255&t,t/=256}(l,c)}else if(c>=-32)(l=r.allocUnsafe(1))[0]=256+c;else if(c>=-128)(l=r.allocUnsafe(2))[0]=208,l.writeInt8(c,1);else if(c>=-32768)(l=r.allocUnsafe(3))[0]=209,l.writeInt16BE(c,1);else if(c>-214748365)(l=r.allocUnsafe(5))[0]=210,l.writeInt32BE(c,1);else{if(!(c>=-9007199254740991))return s(c,!0);(l=r.allocUnsafe(9))[0]=211,function(e,t,n){var r=n<0;r&&(n=Math.abs(n));var o=n%4294967296,i=n/4294967296;if(e.writeUInt32BE(Math.floor(i),t+0),e.writeUInt32BE(o,t+4),r)for(var s=1,a=t+7;a>=t;a--){var c=(255^e[a])+s;e[a]=255&c,s=c>>8}}(l,1,c)}}}if(!l)throw new Error("not implemented yet");return u?l:l.slice()}return a}},function(e,t,n){"use strict";var r=this&&this.__awaiter||function(e,t,n,r){return new(n||(n=Promise))(function(o,i){function s(e){try{c(r.next(e))}catch(e){i(e)}}function a(e){try{c(r.throw(e))}catch(e){i(e)}}function c(e){e.done?o(e.value):new n(function(t){t(e.value)}).then(s,a)}c((r=r.apply(e,t||[])).next())})},o=this&&this.__generator||function(e,t){var n,r,o,i,s={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return i={next:a(0),throw:a(1),return:a(2)},"function"==typeof Symbol&&(i[Symbol.iterator]=function(){return this}),i;function a(i){return function(a){return function(i){if(n)throw new TypeError("Generator is already executing.");for(;s;)try{if(n=1,r&&(o=2&i[0]?r.return:i[0]?r.throw||((o=r.return)&&o.call(r),0):r.next)&&!(o=o.call(r,i[1])).done)return o;switch(r=0,o&&(i=[2&i[0],o.value]),i[0]){case 0:case 1:o=i;break;case 4:return s.label++,{value:i[1],done:!1};case 5:s.label++,r=i[1],i=[0];continue;case 7:i=s.ops.pop(),s.trys.pop();continue;default:if(!(o=(o=s.trys).length>0&&o[o.length-1])&&(6===i[0]||2===i[0])){s=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]<o[3])){s.label=i[1];break}if(6===i[0]&&s.label<o[1]){s.label=o[1],o=i;break}if(o&&s.label<o[2]){s.label=o[2],s.ops.push(i);break}o[2]&&s.ops.pop(),s.trys.pop();continue}i=t.call(e,s)}catch(e){i=[6,e],r=0}finally{n=o=0}if(5&i[0])throw i[1];return{value:i[0]?i[1]:void 0,done:!0}}([i,a])}}};Object.defineProperty(t,"__esModule",{value:!0});var i=n(5),s=n(71),a=n(16),c=function(){function e(e,t){this.nextBatchId=2,this.browserRendererId=e,this.logger=t}return e.getOrCreate=function(t){return e.instance||(e.instance=new e(0,t)),this.instance},e.prototype.processBatch=function(e,t,n){return r(this,void 0,void 0,function(){var r;return o(this,function(o){switch(o.label){case 0:return e<this.nextBatchId?[4,this.completeBatch(n,e)]:[3,2];case 1:return o.sent(),this.logger.log(a.LogLevel.Debug,"Batch "+e+" already processed. Waiting for batch "+this.nextBatchId+"."),[2];case 2:return e>this.nextBatchId?this.fatalError?(this.logger.log(a.LogLevel.Debug,"Received a new batch "+e+" but errored out on a previous batch "+(this.nextBatchId-1)),[4,n.send("OnRenderCompleted",this.nextBatchId-1,this.fatalError.toString())]):[3,4]:[3,5];case 3:return o.sent(),[2];case 4:return this.logger.log(a.LogLevel.Debug,"Waiting for batch "+this.nextBatchId+". Batch "+e+" not processed."),[2];case 5:return o.trys.push([5,7,,8]),this.nextBatchId++,this.logger.log(a.LogLevel.Debug,"Applying batch "+e+"."),i.renderBatch(this.browserRendererId,new s.OutOfProcessRenderBatch(t)),[4,this.completeBatch(n,e)];case 6:return o.sent(),[3,8];case 7:throw r=o.sent(),this.fatalError=r.toString(),this.logger.log(a.LogLevel.Error,"There was an error applying batch "+e+"."),n.send("OnRenderCompleted",e,r.toString()),r;case 8:return[2]}})})},e.prototype.getLastBatchid=function(){return this.nextBatchId-1},e.prototype.completeBatch=function(e,t){return r(this,void 0,void 0,function(){return o(this,function(n){switch(n.label){case 0:return n.trys.push([0,2,,3]),[4,e.send("OnRenderCompleted",t,null)];case 1:return n.sent(),[3,3];case 2:return n.sent(),this.logger.log(a.LogLevel.Warning,"Failed to deliver completion notification for render '"+t+"'."),[3,3];case 3:return[2]}})})},e}();t.RenderQueue=c},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(72),o=Math.pow(2,32),i=Math.pow(2,21)-1,s=function(){function e(e){this.batchData=e;var t=new l(e);this.arrayRangeReader=new f(e),this.arrayBuilderSegmentReader=new h(e),this.diffReader=new a(e),this.editReader=new c(e,t),this.frameReader=new u(e,t)}return e.prototype.updatedComponents=function(){return p(this.batchData,this.batchData.length-20)},e.prototype.referenceFrames=function(){return p(this.batchData,this.batchData.length-16)},e.prototype.disposedComponentIds=function(){return p(this.batchData,this.batchData.length-12)},e.prototype.disposedEventHandlerIds=function(){return p(this.batchData,this.batchData.length-8)},e.prototype.updatedComponentsEntry=function(e,t){var n=e+4*t;return p(this.batchData,n)},e.prototype.referenceFramesEntry=function(e,t){return e+20*t},e.prototype.disposedComponentIdsEntry=function(e,t){var n=e+4*t;return p(this.batchData,n)},e.prototype.disposedEventHandlerIdsEntry=function(e,t){var n=e+8*t;return g(this.batchData,n)},e}();t.OutOfProcessRenderBatch=s;var a=function(){function e(e){this.batchDataUint8=e}return e.prototype.componentId=function(e){return p(this.batchDataUint8,e)},e.prototype.edits=function(e){return e+4},e.prototype.editsEntry=function(e,t){return e+16*t},e}(),c=function(){function e(e,t){this.batchDataUint8=e,this.stringReader=t}return e.prototype.editType=function(e){return p(this.batchDataUint8,e)},e.prototype.siblingIndex=function(e){return p(this.batchDataUint8,e+4)},e.prototype.newTreeIndex=function(e){return p(this.batchDataUint8,e+8)},e.prototype.moveToSiblingIndex=function(e){return p(this.batchDataUint8,e+8)},e.prototype.removedAttributeName=function(e){var t=p(this.batchDataUint8,e+12);return this.stringReader.readString(t)},e}(),u=function(){function e(e,t){this.batchDataUint8=e,this.stringReader=t}return e.prototype.frameType=function(e){return p(this.batchDataUint8,e)},e.prototype.subtreeLength=function(e){return p(this.batchDataUint8,e+4)},e.prototype.elementReferenceCaptureId=function(e){var t=p(this.batchDataUint8,e+4);return this.stringReader.readString(t)},e.prototype.componentId=function(e){return p(this.batchDataUint8,e+8)},e.prototype.elementName=function(e){var t=p(this.batchDataUint8,e+8);return this.stringReader.readString(t)},e.prototype.textContent=function(e){var t=p(this.batchDataUint8,e+4);return this.stringReader.readString(t)},e.prototype.markupContent=function(e){var t=p(this.batchDataUint8,e+4);return this.stringReader.readString(t)},e.prototype.attributeName=function(e){var t=p(this.batchDataUint8,e+4);return this.stringReader.readString(t)},e.prototype.attributeValue=function(e){var t=p(this.batchDataUint8,e+8);return this.stringReader.readString(t)},e.prototype.attributeEventHandlerId=function(e){return g(this.batchDataUint8,e+12)},e}(),l=function(){function e(e){this.batchDataUint8=e,this.stringTableStartIndex=p(e,e.length-4)}return e.prototype.readString=function(e){if(-1===e)return null;var t,n=p(this.batchDataUint8,this.stringTableStartIndex+4*e),o=function(e,t){for(var n=0,r=0,o=0;o<4;o++){var i=e[t+o];if(n|=(127&i)<<r,i<128)break;r+=7}return n}(this.batchDataUint8,n),i=n+((t=o)<128?1:t<16384?2:t<2097152?3:4),s=new Uint8Array(this.batchDataUint8.buffer,this.batchDataUint8.byteOffset+i,o);return r.decodeUtf8(s)},e}(),f=function(){function e(e){this.batchDataUint8=e}return e.prototype.count=function(e){return p(this.batchDataUint8,e)},e.prototype.values=function(e){return e+4},e}(),h=function(){function e(e){this.batchDataUint8=e}return e.prototype.offset=function(e){return 0},e.prototype.count=function(e){return p(this.batchDataUint8,e)},e.prototype.values=function(e){return e+4},e}();function p(e,t){return e[t]|e[t+1]<<8|e[t+2]<<16|e[t+3]<<24}function d(e,t){return e[t]+(e[t+1]<<8)+(e[t+2]<<16)+(e[t+3]<<24>>>0)}function g(e,t){var n=d(e,t+4);if(n>i)throw new Error("Cannot read uint64 with high order part "+n+", because the result would exceed Number.MAX_SAFE_INTEGER.");return n*o+d(e,t)}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r="function"==typeof TextDecoder?new TextDecoder("utf-8"):null;t.decodeUtf8=r?r.decode.bind(r):function(e){var t=0,n=e.length,r=[],o=[];for(;t<n;){var i=e[t++];if(0===i)break;if(0==(128&i))r.push(i);else if(192==(224&i)){var s=63&e[t++];r.push((31&i)<<6|s)}else if(224==(240&i)){var s=63&e[t++],a=63&e[t++];r.push((31&i)<<12|s<<6|a)}else if(240==(248&i)){var s=63&e[t++],a=63&e[t++],c=63&e[t++],u=(7&i)<<18|s<<12|a<<6|c;u>65535&&(u-=65536,r.push(u>>>10&1023|55296),u=56320|1023&u),r.push(u)}r.length>1024&&(o.push(String.fromCharCode.apply(null,r)),r.length=0)}return o.push(String.fromCharCode.apply(null,r)),o.join("")}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(16),o=function(){function e(){}return e.prototype.log=function(e,t){},e.instance=new e,e}();t.NullLogger=o;var i=function(){function e(e){this.minimumLogLevel=e}return e.prototype.log=function(e,t){if(e>=this.minimumLogLevel)switch(e){case r.LogLevel.Critical:case r.LogLevel.Error:console.error("["+(new Date).toISOString()+"] "+r.LogLevel[e]+": "+t);break;case r.LogLevel.Warning:console.warn("["+(new Date).toISOString()+"] "+r.LogLevel[e]+": "+t);break;case r.LogLevel.Information:console.info("["+(new Date).toISOString()+"] "+r.LogLevel[e]+": "+t);break;default:console.log("["+(new Date).toISOString()+"] "+r.LogLevel[e]+": "+t)}},e}();t.ConsoleLogger=i},function(e,t,n){"use strict";var r=this&&this.__awaiter||function(e,t,n,r){return new(n||(n=Promise))(function(o,i){function s(e){try{c(r.next(e))}catch(e){i(e)}}function a(e){try{c(r.throw(e))}catch(e){i(e)}}function c(e){e.done?o(e.value):new n(function(t){t(e.value)}).then(s,a)}c((r=r.apply(e,t||[])).next())})},o=this&&this.__generator||function(e,t){var n,r,o,i,s={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return i={next:a(0),throw:a(1),return:a(2)},"function"==typeof Symbol&&(i[Symbol.iterator]=function(){return this}),i;function a(i){return function(a){return function(i){if(n)throw new TypeError("Generator is already executing.");for(;s;)try{if(n=1,r&&(o=2&i[0]?r.return:i[0]?r.throw||((o=r.return)&&o.call(r),0):r.next)&&!(o=o.call(r,i[1])).done)return o;switch(r=0,o&&(i=[2&i[0],o.value]),i[0]){case 0:case 1:o=i;break;case 4:return s.label++,{value:i[1],done:!1};case 5:s.label++,r=i[1],i=[0];continue;case 7:i=s.ops.pop(),s.trys.pop();continue;default:if(!(o=(o=s.trys).length>0&&o[o.length-1])&&(6===i[0]||2===i[0])){s=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]<o[3])){s.label=i[1];break}if(6===i[0]&&s.label<o[1]){s.label=o[1],o=i;break}if(o&&s.label<o[2]){s.label=o[2],s.ops.push(i);break}o[2]&&s.ops.pop(),s.trys.pop();continue}i=t.call(e,s)}catch(e){i=[6,e],r=0}finally{n=o=0}if(5&i[0])throw i[1];return{value:i[0]?i[1]:void 0,done:!0}}([i,a])}}};Object.defineProperty(t,"__esModule",{value:!0});var i=n(21),s=n(13),a=function(){function e(e){this.circuitId=void 0,this.components=e}return e.prototype.reconnect=function(e){if(!this.circuitId)throw new Error("Circuit host not initialized.");return e.invoke("ConnectCircuit",this.circuitId)},e.prototype.initialize=function(e){if(this.circuitId)throw new Error("Circuit host '"+this.circuitId+"' already initialized.");this.circuitId=e},e.prototype.startCircuit=function(e){return r(this,void 0,void 0,function(){var t;return o(this,function(n){switch(n.label){case 0:return[4,e.invoke("StartCircuit",i.internalFunctions.getBaseURI(),i.internalFunctions.getLocationHref(),JSON.stringify(this.components.map(function(e){return e.toRecord()})))];case 1:return(t=n.sent())?(this.initialize(t),[2,!0]):[2,!1]}})})},e.prototype.resolveElement=function(e){var t=Number.parseInt(e);if(Number.isNaN(t))throw new Error("Invalid sequence number '"+e+"'.");return s.toLogicalRootCommentElement(this.components[t].start,this.components[t].end)},e}();t.CircuitDescriptor=a;var c=function(){function e(e,t,n,r,o){this.type=e,this.start=t,this.end=n,this.sequence=r,this.descriptor=o}return e.prototype.toRecord=function(){return{type:this.type,sequence:this.sequence,descriptor:this.descriptor}},e}();t.ComponentDescriptor=c,t.discoverComponents=function(e){for(var t=function e(t){if(!t.hasChildNodes())return[];for(var n=[],r=new h(t.childNodes);r.next()&&r.currentElement;){var o=l(r);if(o)n.push(o);else for(var i=e(r.currentElement),s=0;s<i.length;s++){var a=i[s];n.push(a)}}return n}(e),n=[],r=0;r<t.length;r++){var o=t[r],i=new c(o.type,o.start,o.end,o.sequence,o.descriptor);n.push(i)}return n};var u=/\W*Blazor:[^{]*(.*)$/;function l(e){var t=e.currentElement;if(t&&t.nodeType===Node.COMMENT_NODE&&t.textContent){var n=new RegExp(u).exec(t.textContent),r=n&&n[1];if(!r)return;try{return function(e,t,n){var r=JSON.parse(e),o=r.type,i=r.sequence,s=r.descriptor,a=r.prerenderId;if("server"!==o)throw new Error("Invalid component type '"+o+"'.");if(!s)throw new Error("descriptor must be defined when using a descriptor.");if(void 0===i)throw new Error("sequence must be defined when using a descriptor.");if(!Number.isInteger(i))throw new Error("Error parsing the sequence '"+i+"' for component '"+e+"'");if(a){var c=function(e,t){for(;t.next()&&t.currentElement;){var n=t.currentElement;if(n.nodeType===Node.COMMENT_NODE&&n.textContent){var r=new RegExp(u).exec(n.textContent),o=r&&r[1];if(o)return f(o,e),n}}return}(a,n);if(!c)throw new Error("Could not find an end component comment for '"+t+"'");return{type:o,sequence:i,descriptor:s,start:t,prerenderId:a,end:c}}return{type:o,sequence:i,descriptor:s,start:t}}(r,t,e)}catch(e){throw new Error("Found malformed component comment at "+t.textContent)}}}function f(e,t){var n=JSON.parse(e);if(1!==Object.keys(n).length)throw new Error("Invalid end of component comment: '"+e+"'");var r=n.prerenderId;if(!r)throw new Error("End of component comment must have a value for the prerendered property: '"+e+"'");if(r!==t)throw new Error("End of component comment prerendered property must match the start comment prerender id: '"+t+"', '"+r+"'")}var h=function(){function e(e){this.childNodes=e,this.currentIndex=-1,this.length=e.length}return e.prototype.next=function(){return this.currentIndex++,this.currentIndex<this.length?(this.currentElement=this.childNodes[this.currentIndex],!0):(this.currentElement=void 0,!1)},e}()},function(e,t,n){"use strict";var r=this&&this.__assign||function(){return(r=Object.assign||function(e){for(var t,n=1,r=arguments.length;n<r;n++)for(var o in t=arguments[n])Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);return e}).apply(this,arguments)};Object.defineProperty(t,"__esModule",{value:!0});var o=n(16);t.resolveOptions=function(e){var t=r({},i,e);return e&&e.reconnectionOptions&&(t.reconnectionOptions=r({},i.reconnectionOptions,e.reconnectionOptions)),t};var i={configureSignalR:function(e){},logLevel:o.LogLevel.Warning,reconnectionOptions:{maxRetries:5,retryIntervalMilliseconds:3e3,dialogId:"components-reconnect-modal"}}},function(e,t,n){"use strict";var r=this&&this.__awaiter||function(e,t,n,r){return new(n||(n=Promise))(function(o,i){function s(e){try{c(r.next(e))}catch(e){i(e)}}function a(e){try{c(r.throw(e))}catch(e){i(e)}}function c(e){e.done?o(e.value):new n(function(t){t(e.value)}).then(s,a)}c((r=r.apply(e,t||[])).next())})},o=this&&this.__generator||function(e,t){var n,r,o,i,s={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return i={next:a(0),throw:a(1),return:a(2)},"function"==typeof Symbol&&(i[Symbol.iterator]=function(){return this}),i;function a(i){return function(a){return function(i){if(n)throw new TypeError("Generator is already executing.");for(;s;)try{if(n=1,r&&(o=2&i[0]?r.return:i[0]?r.throw||((o=r.return)&&o.call(r),0):r.next)&&!(o=o.call(r,i[1])).done)return o;switch(r=0,o&&(i=[2&i[0],o.value]),i[0]){case 0:case 1:o=i;break;case 4:return s.label++,{value:i[1],done:!1};case 5:s.label++,r=i[1],i=[0];continue;case 7:i=s.ops.pop(),s.trys.pop();continue;default:if(!(o=(o=s.trys).length>0&&o[o.length-1])&&(6===i[0]||2===i[0])){s=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]<o[3])){s.label=i[1];break}if(6===i[0]&&s.label<o[1]){s.label=o[1],o=i;break}if(o&&s.label<o[2]){s.label=o[2],s.ops.push(i);break}o[2]&&s.ops.pop(),s.trys.pop();continue}i=t.call(e,s)}catch(e){i=[6,e],r=0}finally{n=o=0}if(5&i[0])throw i[1];return{value:i[0]?i[1]:void 0,done:!0}}([i,a])}}};Object.defineProperty(t,"__esModule",{value:!0});var i=n(77),s=n(78),a=n(16),c=function(){function e(e,t,n){this._currentReconnectionProcess=null,this._logger=e,this._reconnectionDisplay=t,this._reconnectCallback=n||function(){return window.Blazor.reconnect()}}return e.prototype.onConnectionDown=function(e,t){if(!this._reconnectionDisplay){var n=document.getElementById(e.dialogId);this._reconnectionDisplay=n?new s.UserSpecifiedDisplay(n):new i.DefaultReconnectDisplay(e.dialogId,document,this._logger)}this._currentReconnectionProcess||(this._currentReconnectionProcess=new u(e,this._logger,this._reconnectCallback,this._reconnectionDisplay))},e.prototype.onConnectionUp=function(){this._currentReconnectionProcess&&(this._currentReconnectionProcess.dispose(),this._currentReconnectionProcess=null)},e}();t.DefaultReconnectionHandler=c;var u=function(){function e(e,t,n,r){this.logger=t,this.reconnectCallback=n,this.isDisposed=!1,this.reconnectDisplay=r,this.reconnectDisplay.show(),this.attemptPeriodicReconnection(e)}return e.prototype.dispose=function(){this.isDisposed=!0,this.reconnectDisplay.hide()},e.prototype.attemptPeriodicReconnection=function(e){return r(this,void 0,void 0,function(){var t,n;return o(this,function(r){switch(r.label){case 0:t=0,r.label=1;case 1:return t<e.maxRetries?[4,this.delay(e.retryIntervalMilliseconds)]:[3,7];case 2:if(r.sent(),this.isDisposed)return[3,7];r.label=3;case 3:return r.trys.push([3,5,,6]),[4,this.reconnectCallback()];case 4:return r.sent()?[2]:(this.reconnectDisplay.rejected(),[2]);case 5:return n=r.sent(),this.logger.log(a.LogLevel.Error,n),[3,6];case 6:return t++,[3,1];case 7:return this.reconnectDisplay.failed(),[2]}})})},e.prototype.delay=function(e){return new Promise(function(t){return setTimeout(t,e)})},e}()},function(e,t,n){"use strict";var r=this&&this.__awaiter||function(e,t,n,r){return new(n||(n=Promise))(function(o,i){function s(e){try{c(r.next(e))}catch(e){i(e)}}function a(e){try{c(r.throw(e))}catch(e){i(e)}}function c(e){e.done?o(e.value):new n(function(t){t(e.value)}).then(s,a)}c((r=r.apply(e,t||[])).next())})},o=this&&this.__generator||function(e,t){var n,r,o,i,s={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return i={next:a(0),throw:a(1),return:a(2)},"function"==typeof Symbol&&(i[Symbol.iterator]=function(){return this}),i;function a(i){return function(a){return function(i){if(n)throw new TypeError("Generator is already executing.");for(;s;)try{if(n=1,r&&(o=2&i[0]?r.return:i[0]?r.throw||((o=r.return)&&o.call(r),0):r.next)&&!(o=o.call(r,i[1])).done)return o;switch(r=0,o&&(i=[2&i[0],o.value]),i[0]){case 0:case 1:o=i;break;case 4:return s.label++,{value:i[1],done:!1};case 5:s.label++,r=i[1],i=[0];continue;case 7:i=s.ops.pop(),s.trys.pop();continue;default:if(!(o=(o=s.trys).length>0&&o[o.length-1])&&(6===i[0]||2===i[0])){s=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]<o[3])){s.label=i[1];break}if(6===i[0]&&s.label<o[1]){s.label=o[1],o=i;break}if(o&&s.label<o[2]){s.label=o[2],s.ops.push(i);break}o[2]&&s.ops.pop(),s.trys.pop();continue}i=t.call(e,s)}catch(e){i=[6,e],r=0}finally{n=o=0}if(5&i[0])throw i[1];return{value:i[0]?i[1]:void 0,done:!0}}([i,a])}}};Object.defineProperty(t,"__esModule",{value:!0});var i=n(16),s=function(){function e(e,t,n){var s=this;this.document=t,this.logger=n,this.addedToDom=!1,this.modal=this.document.createElement("div"),this.modal.id=e;this.modal.style.cssText=["position: fixed","top: 0","right: 0","bottom: 0","left: 0","z-index: 1000","display: none","overflow: hidden","background-color: #fff","opacity: 0.8","text-align: center","font-weight: bold"].join(";"),this.modal.innerHTML='<h5 style="margin-top: 20px"></h5><button style="margin:5px auto 5px">Retry</button><p>Alternatively, <a href>reload</a></p>',this.message=this.modal.querySelector("h5"),this.button=this.modal.querySelector("button"),this.reloadParagraph=this.modal.querySelector("p"),this.button.addEventListener("click",function(){return r(s,void 0,void 0,function(){var e;return o(this,function(t){switch(t.label){case 0:this.show(),t.label=1;case 1:return t.trys.push([1,3,,4]),[4,window.Blazor.reconnect()];case 2:return t.sent()||this.rejected(),[3,4];case 3:return e=t.sent(),this.logger.log(i.LogLevel.Error,e),this.failed(),[3,4];case 4:return[2]}})})}),this.reloadParagraph.querySelector("a").addEventListener("click",function(){return location.reload()})}return e.prototype.show=function(){this.addedToDom||(this.addedToDom=!0,this.document.body.appendChild(this.modal)),this.modal.style.display="block",this.button.style.display="none",this.reloadParagraph.style.display="none",this.message.textContent="Attempting to reconnect to the server..."},e.prototype.hide=function(){this.modal.style.display="none"},e.prototype.failed=function(){this.button.style.display="block",this.reloadParagraph.style.display="none",this.message.innerHTML="Reconnection failed. Try <a href>reloading</a> the page if you're unable to reconnect.",this.message.querySelector("a").addEventListener("click",function(){return location.reload()})},e.prototype.rejected=function(){this.button.style.display="none",this.reloadParagraph.style.display="none",this.message.innerHTML="Could not reconnect to the server. <a href>Reload</a> the page to restore functionality.",this.message.querySelector("a").addEventListener("click",function(){return location.reload()})},e}();t.DefaultReconnectDisplay=s},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=function(){function e(e){this.dialog=e}return e.prototype.show=function(){this.removeClasses(),this.dialog.classList.add(e.ShowClassName)},e.prototype.hide=function(){this.removeClasses(),this.dialog.classList.add(e.HideClassName)},e.prototype.failed=function(){this.removeClasses(),this.dialog.classList.add(e.FailedClassName)},e.prototype.rejected=function(){this.removeClasses(),this.dialog.classList.add(e.RejectedClassName)},e.prototype.removeClasses=function(){this.dialog.classList.remove(e.ShowClassName,e.HideClassName,e.FailedClassName,e.RejectedClassName)},e.ShowClassName="components-reconnect-show",e.HideClassName="components-reconnect-hide",e.FailedClassName="components-reconnect-failed",e.RejectedClassName="components-reconnect-rejected",e}();t.UserSpecifiedDisplay=r},function(e,t,n){"use strict";n.r(t);var r=n(6),o=n(12),i=n(2),s=function(){function e(){}return e.write=function(e){var t=e.byteLength||e.length,n=[];do{var r=127&t;(t>>=7)>0&&(r|=128),n.push(r)}while(t>0);t=e.byteLength||e.length;var o=new Uint8Array(n.length+t);return o.set(n,0),o.set(e,n.length),o.buffer},e.parse=function(e){for(var t=[],n=new Uint8Array(e),r=[0,7,14,21,28],o=0;o<e.byteLength;){var i=0,s=0,a=void 0;do{s|=(127&(a=n[o+i]))<<r[i],i++}while(i<Math.min(5,e.byteLength-o)&&0!=(128&a));if(0!=(128&a)&&i<5)throw new Error("Cannot read message size.");if(5===i&&a>7)throw new Error("Messages bigger than 2GB are not supported.");if(!(n.byteLength>=o+i+s))throw new Error("Incomplete message.");t.push(n.slice?n.slice(o+i,o+i+s):n.subarray(o+i,o+i+s)),o=o+i+s}return t},e}();var a=new Uint8Array([145,i.MessageType.Ping]),c=function(){function e(){this.name="messagepack",this.version=1,this.transferFormat=i.TransferFormat.Binary,this.errorResult=1,this.voidResult=2,this.nonVoidResult=3}return e.prototype.parseMessages=function(e,t){if(!(e instanceof r.Buffer||(n=e,n&&"undefined"!=typeof ArrayBuffer&&(n instanceof ArrayBuffer||n.constructor&&"ArrayBuffer"===n.constructor.name))))throw new Error("Invalid input for MessagePack hub protocol. Expected an ArrayBuffer or Buffer.");var n;null===t&&(t=i.NullLogger.instance);for(var o=[],a=0,c=s.parse(e);a<c.length;a++){var u=c[a],l=this.parseMessage(u,t);l&&o.push(l)}return o},e.prototype.writeMessage=function(e){switch(e.type){case i.MessageType.Invocation:return this.writeInvocation(e);case i.MessageType.StreamInvocation:return this.writeStreamInvocation(e);case i.MessageType.StreamItem:return this.writeStreamItem(e);case i.MessageType.Completion:return this.writeCompletion(e);case i.MessageType.Ping:return s.write(a);case i.MessageType.CancelInvocation:return this.writeCancelInvocation(e);default:throw new Error("Invalid message type.")}},e.prototype.parseMessage=function(e,t){if(0===e.length)throw new Error("Invalid payload.");var n=o().decode(r.Buffer.from(e));if(0===n.length||!(n instanceof Array))throw new Error("Invalid payload.");var s=n[0];switch(s){case i.MessageType.Invocation:return this.createInvocationMessage(this.readHeaders(n),n);case i.MessageType.StreamItem:return this.createStreamItemMessage(this.readHeaders(n),n);case i.MessageType.Completion:return this.createCompletionMessage(this.readHeaders(n),n);case i.MessageType.Ping:return this.createPingMessage(n);case i.MessageType.Close:return this.createCloseMessage(n);default:return t.log(i.LogLevel.Information,"Unknown message type '"+s+"' ignored."),null}},e.prototype.createCloseMessage=function(e){if(e.length<2)throw new Error("Invalid payload for Close message.");return{error:e[1],type:i.MessageType.Close}},e.prototype.createPingMessage=function(e){if(e.length<1)throw new Error("Invalid payload for Ping message.");return{type:i.MessageType.Ping}},e.prototype.createInvocationMessage=function(e,t){if(t.length<5)throw new Error("Invalid payload for Invocation message.");var n=t[2];return n?{arguments:t[4],headers:e,invocationId:n,streamIds:[],target:t[3],type:i.MessageType.Invocation}:{arguments:t[4],headers:e,streamIds:[],target:t[3],type:i.MessageType.Invocation}},e.prototype.createStreamItemMessage=function(e,t){if(t.length<4)throw new Error("Invalid payload for StreamItem message.");return{headers:e,invocationId:t[2],item:t[3],type:i.MessageType.StreamItem}},e.prototype.createCompletionMessage=function(e,t){if(t.length<4)throw new Error("Invalid payload for Completion message.");var n,r,o=t[3];if(o!==this.voidResult&&t.length<5)throw new Error("Invalid payload for Completion message.");switch(o){case this.errorResult:n=t[4];break;case this.nonVoidResult:r=t[4]}return{error:n,headers:e,invocationId:t[2],result:r,type:i.MessageType.Completion}},e.prototype.writeInvocation=function(e){var t=o().encode([i.MessageType.Invocation,e.headers||{},e.invocationId||null,e.target,e.arguments,e.streamIds]);return s.write(t.slice())},e.prototype.writeStreamInvocation=function(e){var t=o().encode([i.MessageType.StreamInvocation,e.headers||{},e.invocationId,e.target,e.arguments,e.streamIds]);return s.write(t.slice())},e.prototype.writeStreamItem=function(e){var t=o().encode([i.MessageType.StreamItem,e.headers||{},e.invocationId,e.item]);return s.write(t.slice())},e.prototype.writeCompletion=function(e){var t,n=o(),r=e.error?this.errorResult:e.result?this.nonVoidResult:this.voidResult;switch(r){case this.errorResult:t=n.encode([i.MessageType.Completion,e.headers||{},e.invocationId,r,e.error]);break;case this.voidResult:t=n.encode([i.MessageType.Completion,e.headers||{},e.invocationId,r]);break;case this.nonVoidResult:t=n.encode([i.MessageType.Completion,e.headers||{},e.invocationId,r,e.result])}return s.write(t.slice())},e.prototype.writeCancelInvocation=function(e){var t=o().encode([i.MessageType.CancelInvocation,e.headers||{},e.invocationId]);return s.write(t.slice())},e.prototype.readHeaders=function(e){var t=e[1];if("object"!=typeof t)throw new Error("Invalid headers.");return t},e}();n.d(t,"VERSION",function(){return u}),n.d(t,"MessagePackHubProtocol",function(){return c});var u="5.0.0-dev"}]);
\ No newline at end of file
diff --git a/src/Components/Web.JS/dist/Release/blazor.webassembly.js b/src/Components/Web.JS/dist/Release/blazor.webassembly.js
index 4d485caeb7..67f79aee08 100644
--- a/src/Components/Web.JS/dist/Release/blazor.webassembly.js
+++ b/src/Components/Web.JS/dist/Release/blazor.webassembly.js
@@ -1 +1 @@
-!function(e){var t={};function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)n.d(r,o,function(t){return e[t]}.bind(null,o));return r},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="",n(n.s=45)}([,,,,,,,,function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),n(25),n(9);var r=n(26),o=n(17),a={},i=!1;function u(e,t,n){var o=a[e];o||(o=a[e]=new r.BrowserRenderer(e)),o.attachRootComponentToLogicalElement(n,t)}t.attachRootComponentToLogicalElement=u,t.attachRootComponentToElement=function(e,t,n){var r=document.querySelector(e);if(!r)throw new Error("Could not find any element matching selector '"+e+"'.");u(n||0,o.toLogicalElement(r,!0),t)},t.renderBatch=function(e,t){var n=a[e];if(!n)throw new Error("There is no browser renderer with ID "+e+".");for(var r=t.arrayRangeReader,o=t.updatedComponents(),u=r.values(o),l=r.count(o),s=t.referenceFrames(),c=r.values(s),f=t.diffReader,d=0;d<l;d++){var p=t.updatedComponentsEntry(u,d),m=f.componentId(p),h=f.edits(p);n.updateComponent(t,m,h,c)}var v=t.disposedComponentIds(),y=r.values(v),g=r.count(v);for(d=0;d<g;d++)m=t.disposedComponentIdsEntry(y,d),n.disposeComponent(m);var b=t.disposedEventHandlerIds(),w=r.values(b),E=r.count(b);for(d=0;d<E;d++){var S=t.disposedEventHandlerIdsEntry(w,d);n.disposeEventHandler(S)}i&&(i=!1,window.scrollTo&&window.scrollTo(0,0))},t.resetScrollAfterNextBatch=function(){i=!0}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.setPlatform=function(e){return t.platform=e,t.platform}},,,,,,,function(e,t,n){"use strict";var r;!function(e){window.DotNet=e;var t=[],n={},r={},o=1,a=null;function i(e){t.push(e)}function u(e,t){for(var n=[],r=2;r<arguments.length;r++)n[r-2]=arguments[r];return s(e,t,null,n)}function l(e,t,n,r){var o=c();if(o.invokeDotNetFromJS){var a=JSON.stringify(r,v),i=o.invokeDotNetFromJS(e,t,n,a);return i?d(i):null}throw new Error("The current dispatcher does not support synchronous calls from JS to .NET. Use invokeMethodAsync instead.")}function s(e,t,r,a){var i=o++,u=new Promise(function(e,t){n[i]={resolve:e,reject:t}});try{var l=JSON.stringify(a,v);c().beginInvokeDotNetFromJS(i,e,t,r,l)}catch(e){f(i,!1,e)}return u}function c(){if(null!==a)return a;throw new Error("No .NET call dispatcher has been set.")}function f(e,t,r){if(!n.hasOwnProperty(e))throw new Error("There is no pending async call with ID "+e+".");var o=n[e];delete n[e],t?o.resolve(r):o.reject(r)}function d(e){return e?JSON.parse(e,function(e,n){return t.reduce(function(t,n){return n(e,t)},n)}):null}function p(e){return e instanceof Error?e.message+"\n"+e.stack:e?e.toString():"null"}function m(e){if(r.hasOwnProperty(e))return r[e];var t,n=window,o="window";if(e.split(".").forEach(function(e){if(!(e in n))throw new Error("Could not find '"+e+"' in '"+o+"'.");t=n,n=n[e],o+="."+e}),n instanceof Function)return n=n.bind(t),r[e]=n,n;throw new Error("The value '"+o+"' is not a function.")}e.attachDispatcher=function(e){a=e},e.attachReviver=i,e.invokeMethod=function(e,t){for(var n=[],r=2;r<arguments.length;r++)n[r-2]=arguments[r];return l(e,t,null,n)},e.invokeMethodAsync=u,e.jsCallDispatcher={findJSFunction:m,invokeJSFromDotNet:function(e,t){var n=m(e).apply(null,d(t));return null==n?null:JSON.stringify(n,v)},beginInvokeJSFromDotNet:function(e,t,n){var r=new Promise(function(e){e(m(t).apply(null,d(n)))});e&&r.then(function(t){return c().endInvokeJSFromDotNet(e,!0,JSON.stringify([e,!0,t],v))},function(t){return c().endInvokeJSFromDotNet(e,!1,JSON.stringify([e,!1,p(t)]))})},endInvokeDotNetFromJS:function(e,t,n){var r=t?n:new Error(n);f(parseInt(e),t,r)}};var h=function(){function e(e){this._id=e}return e.prototype.invokeMethod=function(e){for(var t=[],n=1;n<arguments.length;n++)t[n-1]=arguments[n];return l(null,e,this._id,t)},e.prototype.invokeMethodAsync=function(e){for(var t=[],n=1;n<arguments.length;n++)t[n-1]=arguments[n];return s(null,e,this._id,t)},e.prototype.dispose=function(){u("Microsoft.JSInterop","DotNetDispatcher.ReleaseDotNetObject",this._id).catch(function(e){return console.error(e)})},e.prototype.serializeAsArg=function(){return{__dotNetObject:this._id}},e}();function v(e,t){return t instanceof h?t.serializeAsArg():t}i(function(e,t){return t&&"object"==typeof t&&t.hasOwnProperty("__dotNetObject")?new h(t.__dotNetObject):t})}(r||(r={}))},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=p("_blazorLogicalChildren"),o=p("_blazorLogicalParent"),a=p("_blazorLogicalEnd");function i(e,t){if(e.childNodes.length>0&&!t)throw new Error("New logical elements must start empty, or allowExistingContents must be true");return e[r]=[],e}function u(e,t,n){var a=e;if(e instanceof Comment&&(s(a)&&s(a).length>0))throw new Error("Not implemented: inserting non-empty logical container");if(l(a))throw new Error("Not implemented: moving existing logical children");var i=s(t);if(n<i.length){var u=i[n];u.parentNode.insertBefore(e,u),i.splice(n,0,a)}else d(e,t),i.push(a);a[o]=t,r in a||(a[r]=[])}function l(e){return e[o]||null}function s(e){return e[r]}function c(e){if(e instanceof Element)return e;if(e instanceof Comment)return e.parentNode;throw new Error("Not a valid logical element")}function f(e){var t=s(l(e));return t[Array.prototype.indexOf.call(t,e)+1]||null}function d(e,t){if(t instanceof Element)t.appendChild(e);else{if(!(t instanceof Comment))throw new Error("Cannot append node because the parent is not a valid logical element. Parent: "+t);var n=f(t);n?n.parentNode.insertBefore(e,n):d(e,l(t))}}function p(e){return"function"==typeof Symbol?Symbol():e}t.toLogicalRootCommentElement=function(e,t){if(!e.parentNode)throw new Error("Comment not connected to the DOM "+e.textContent);var n=e.parentNode,r=i(n,!0),u=s(r);return Array.from(n.childNodes).forEach(function(e){return u.push(e)}),e[o]=r,e[a]=t,i(t,!0),i(e,!0)},t.toLogicalElement=i,t.createAndInsertLogicalContainer=function(e,t){var n=document.createComment("!");return u(n,e,t),n},t.insertLogicalChild=u,t.removeLogicalChild=function e(t,n){var r=s(t).splice(n,1)[0];if(r instanceof Comment)for(var o=s(r);o.length>0;)e(r,0);var a=r;a.parentNode.removeChild(a)},t.getLogicalParent=l,t.getLogicalSiblingEnd=function(e){return e[a]||null},t.getLogicalChild=function(e,t){return s(e)[t]},t.isSvgElement=function(e){return"http://www.w3.org/2000/svg"===c(e).namespaceURI},t.getLogicalChildrenArray=s,t.permuteLogicalChildren=function(e,t){var n=s(e);t.forEach(function(e){e.moveRangeStart=n[e.fromSiblingIndex],e.moveRangeEnd=function e(t){if(t instanceof Element)return t;var n=f(t);if(n)return n.previousSibling;var r=l(t);return r instanceof Element?r.lastChild:e(r)}(e.moveRangeStart)}),t.forEach(function(t){var r=t.moveToBeforeMarker=document.createComment("marker"),o=n[t.toSiblingIndex+1];o?o.parentNode.insertBefore(r,o):d(r,e)}),t.forEach(function(e){for(var t=e.moveToBeforeMarker,n=t.parentNode,r=e.moveRangeStart,o=e.moveRangeEnd,a=r;a;){var i=a.nextSibling;if(n.insertBefore(a,t),a===o)break;a=i}n.removeChild(t)}),t.forEach(function(e){n[e.toSiblingIndex]=e.moveRangeStart})},t.getClosestDomElement=c},function(e,t,n){"use strict";var r;Object.defineProperty(t,"__esModule",{value:!0}),t.dispatchEvent=function(e,t){if(!r)throw new Error("eventDispatcher not initialized. Call 'setEventDispatcher' to configure it.");return r(e,t)},t.setEventDispatcher=function(e){r=e}},,,function(e,t,n){"use strict";var r=this&&this.__awaiter||function(e,t,n,r){return new(n||(n=Promise))(function(o,a){function i(e){try{l(r.next(e))}catch(e){a(e)}}function u(e){try{l(r.throw(e))}catch(e){a(e)}}function l(e){e.done?o(e.value):new n(function(t){t(e.value)}).then(i,u)}l((r=r.apply(e,t||[])).next())})},o=this&&this.__generator||function(e,t){var n,r,o,a,i={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return a={next:u(0),throw:u(1),return:u(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function u(a){return function(u){return function(a){if(n)throw new TypeError("Generator is already executing.");for(;i;)try{if(n=1,r&&(o=2&a[0]?r.return:a[0]?r.throw||((o=r.return)&&o.call(r),0):r.next)&&!(o=o.call(r,a[1])).done)return o;switch(r=0,o&&(a=[2&a[0],o.value]),a[0]){case 0:case 1:o=a;break;case 4:return i.label++,{value:a[1],done:!1};case 5:i.label++,r=a[1],a=[0];continue;case 7:a=i.ops.pop(),i.trys.pop();continue;default:if(!(o=(o=i.trys).length>0&&o[o.length-1])&&(6===a[0]||2===a[0])){i=0;continue}if(3===a[0]&&(!o||a[1]>o[0]&&a[1]<o[3])){i.label=a[1];break}if(6===a[0]&&i.label<o[1]){i.label=o[1],o=a;break}if(o&&i.label<o[2]){i.label=o[2],i.ops.push(a);break}o[2]&&i.ops.pop(),i.trys.pop();continue}a=t.call(e,i)}catch(e){a=[6,e],r=0}finally{n=o=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}([a,u])}}};Object.defineProperty(t,"__esModule",{value:!0}),n(16);var a,i=n(8),u=!1,l=!1,s=null;function c(e,t){var n=p(e);if(!t&&m(n))f(n,!1);else if(t&&location.href===e){var r=e+"?";history.replaceState(null,"",r),location.replace(e)}else location.href=e}function f(e,t){i.resetScrollAfterNextBatch(),history.pushState(null,"",e),d(t)}function d(e){return r(this,void 0,void 0,function(){return o(this,function(t){switch(t.label){case 0:return s?[4,s(location.href,e)]:[3,2];case 1:t.sent(),t.label=2;case 2:return[2]}})})}function p(e){return(a=a||document.createElement("a")).href=e,a.href}function m(e){var t,n=(t=document.baseURI).substr(0,t.lastIndexOf("/")+1);return e.startsWith(n)}t.internalFunctions={listenForNavigationEvents:function(e){if(l)return;s=e,l=!0,window.addEventListener("popstate",function(){return d(!1)})},enableNavigationInterception:function(){if(u)return;u=!0,document.addEventListener("click",function(e){if(0===e.button&&!function(e){return e.ctrlKey||e.shiftKey||e.altKey||e.metaKey}(e)){var t=function e(t,n){return t?t.tagName===n?t:e(t.parentElement,n):null}(e.target,"A");if(t&&t.hasAttribute("href")){var n=t.getAttribute("target"),r=!n||"_self"===n;if(!r)return;var o=t.getAttribute("href"),a=p(o);m(a)&&(e.preventDefault(),f(a,!0))}}})},navigateTo:c,getBaseURI:function(){return document.baseURI},getLocationHref:function(){return location.href}},t.navigateTo=c},,,function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(21),o=n(32),a=n(8);window.Blazor={navigateTo:r.navigateTo,_internal:{attachRootComponentToElement:a.attachRootComponentToElement,http:o.internalFunctions,navigationManager:r.internalFunctions}}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0})},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(27),o=n(28),a=n(17),i=n(31),u=n(18),l=document.createElement("template"),s=document.createElementNS("http://www.w3.org/2000/svg","g"),c={submit:!0},f={},d=function(){function e(e){var t=this;this.childComponentLocations={},this.browserRendererId=e,this.eventDelegator=new o.EventDelegator(function(e,n,r,o){!function(e,t,n,r,o){c[e.type]&&e.preventDefault();var a={browserRendererId:t,eventHandlerId:n,eventArgsType:r.type,eventFieldInfo:o};u.dispatchEvent(a,r.data)}(e,t.browserRendererId,n,r,o)})}return e.prototype.attachRootComponentToLogicalElement=function(e,t){this.attachComponentToElement(e,t),f[e]=t},e.prototype.updateComponent=function(e,t,n,r){var o=this.childComponentLocations[t];if(!o)throw new Error("No element is currently associated with component "+t);var i=f[t];if(i){var u=a.getLogicalSiblingEnd(i);delete f[t],u?function(e,t){var n=a.getLogicalParent(e);if(!n)throw new Error("Can't clear between nodes. The start node does not have a logical parent.");for(var r=a.getLogicalChildrenArray(n),o=r.indexOf(e)+1,i=r.indexOf(t),u=o;u<=i;u++)a.removeLogicalChild(n,o);e.textContent="!"}(i,u):function(e){var t;for(;t=e.firstChild;)e.removeChild(t)}(i)}var l=a.getClosestDomElement(o).ownerDocument,s=l&&l.activeElement;this.applyEdits(e,t,o,0,n,r),s instanceof HTMLElement&&l&&l.activeElement!==s&&s.focus()},e.prototype.disposeComponent=function(e){delete this.childComponentLocations[e]},e.prototype.disposeEventHandler=function(e){this.eventDelegator.removeListener(e)},e.prototype.attachComponentToElement=function(e,t){this.childComponentLocations[e]=t},e.prototype.applyEdits=function(e,t,n,o,i,u){for(var l,s=0,c=o,f=e.arrayBuilderSegmentReader,d=e.editReader,p=e.frameReader,m=f.values(i),h=f.offset(i),v=h+f.count(i),y=h;y<v;y++){var g=e.diffReader.editsEntry(m,y),b=d.editType(g);switch(b){case r.EditType.prependFrame:var w=d.newTreeIndex(g),E=e.referenceFramesEntry(u,w),S=d.siblingIndex(g);this.insertFrame(e,t,n,c+S,u,E,w);break;case r.EditType.removeFrame:S=d.siblingIndex(g);a.removeLogicalChild(n,c+S);break;case r.EditType.setAttribute:w=d.newTreeIndex(g),E=e.referenceFramesEntry(u,w),S=d.siblingIndex(g);if(!((_=a.getLogicalChild(n,c+S))instanceof Element))throw new Error("Cannot set attribute on non-element child");this.applyAttribute(e,t,_,E);break;case r.EditType.removeAttribute:var _;S=d.siblingIndex(g);if(!((_=a.getLogicalChild(n,c+S))instanceof HTMLElement))throw new Error("Cannot remove attribute from non-element child");var I=d.removedAttributeName(g);this.tryApplySpecialProperty(e,_,I,null)||_.removeAttribute(I);break;case r.EditType.updateText:w=d.newTreeIndex(g),E=e.referenceFramesEntry(u,w),S=d.siblingIndex(g);var C=a.getLogicalChild(n,c+S);if(!(C instanceof Text))throw new Error("Cannot set text content on non-text child");C.textContent=p.textContent(E);break;case r.EditType.updateMarkup:w=d.newTreeIndex(g),E=e.referenceFramesEntry(u,w),S=d.siblingIndex(g);a.removeLogicalChild(n,c+S),this.insertMarkup(e,n,c+S,E);break;case r.EditType.stepIn:S=d.siblingIndex(g);n=a.getLogicalChild(n,c+S),s++,c=0;break;case r.EditType.stepOut:n=a.getLogicalParent(n),c=0===--s?o:0;break;case r.EditType.permutationListEntry:(l=l||[]).push({fromSiblingIndex:c+d.siblingIndex(g),toSiblingIndex:c+d.moveToSiblingIndex(g)});break;case r.EditType.permutationListEnd:a.permuteLogicalChildren(n,l),l=void 0;break;default:throw new Error("Unknown edit type: "+b)}}},e.prototype.insertFrame=function(e,t,n,o,a,u,l){var s=e.frameReader,c=s.frameType(u);switch(c){case r.FrameType.element:return this.insertElement(e,t,n,o,a,u,l),1;case r.FrameType.text:return this.insertText(e,n,o,u),1;case r.FrameType.attribute:throw new Error("Attribute frames should only be present as leading children of element frames.");case r.FrameType.component:return this.insertComponent(e,n,o,u),1;case r.FrameType.region:return this.insertFrameRange(e,t,n,o,a,l+1,l+s.subtreeLength(u));case r.FrameType.elementReferenceCapture:if(n instanceof Element)return i.applyCaptureIdToElement(n,s.elementReferenceCaptureId(u)),0;throw new Error("Reference capture frames can only be children of element frames.");case r.FrameType.markup:return this.insertMarkup(e,n,o,u),1;default:throw new Error("Unknown frame type: "+c)}},e.prototype.insertElement=function(e,t,n,o,i,u,l){var s=e.frameReader,c=s.elementName(u),f="svg"===c||a.isSvgElement(n)?document.createElementNS("http://www.w3.org/2000/svg",c):document.createElement(c),d=a.toLogicalElement(f);a.insertLogicalChild(f,n,o);for(var p=l+s.subtreeLength(u),m=l+1;m<p;m++){var h=e.referenceFramesEntry(i,m);if(s.frameType(h)!==r.FrameType.attribute){this.insertFrameRange(e,t,d,0,i,m,p);break}this.applyAttribute(e,t,f,h)}if(f instanceof HTMLSelectElement&&"_blazorSelectValue"in f){var v=f._blazorSelectValue;f.value=v,delete f._blazorSelectValue}},e.prototype.insertComponent=function(e,t,n,r){var o=a.createAndInsertLogicalContainer(t,n),i=e.frameReader.componentId(r);this.attachComponentToElement(i,o)},e.prototype.insertText=function(e,t,n,r){var o=e.frameReader.textContent(r),i=document.createTextNode(o);a.insertLogicalChild(i,t,n)},e.prototype.insertMarkup=function(e,t,n,r){for(var o,i=a.createAndInsertLogicalContainer(t,n),u=e.frameReader.markupContent(r),c=(o=u,a.isSvgElement(t)?(s.innerHTML=o||" ",s):(l.innerHTML=o||" ",l.content)),f=0;c.firstChild;)a.insertLogicalChild(c.firstChild,i,f++)},e.prototype.applyAttribute=function(e,t,n,r){var o=e.frameReader,a=o.attributeName(r),i=(this.browserRendererId,o.attributeEventHandlerId(r));if(i){var u=a.substring(0,2),l=a.substring(2);if("on"!==u||!l)throw new Error("Attribute has nonzero event handler ID, but attribute name '"+a+"' does not start with 'on'.");this.eventDelegator.setListener(n,l,i,t)}else this.tryApplySpecialProperty(e,n,a,r)||n.setAttribute(a,o.attributeValue(r))},e.prototype.tryApplySpecialProperty=function(e,t,n,r){switch(n){case"value":return this.tryApplyValueProperty(e,t,r);case"checked":return this.tryApplyCheckedProperty(e,t,r);default:return!1}},e.prototype.tryApplyValueProperty=function(e,t,n){var r=e.frameReader;switch(t.tagName){case"INPUT":case"SELECT":case"TEXTAREA":var o=n?r.attributeValue(n):null;return t.value=o,"SELECT"===t.tagName&&(t._blazorSelectValue=o),!0;case"OPTION":(o=n?r.attributeValue(n):null)?t.setAttribute("value",o):t.removeAttribute("value");var a=this.findClosestAncestorSelectElement(t);return a&&"_blazorSelectValue"in a&&a._blazorSelectValue===o&&(this.tryApplyValueProperty(e,a,n),delete a._blazorSelectValue),!0;default:return!1}},e.prototype.tryApplyCheckedProperty=function(e,t,n){if("INPUT"===t.tagName){var r=n?e.frameReader.attributeValue(n):null;return t.checked=null!==r,!0}return!1},e.prototype.findClosestAncestorSelectElement=function(e){for(;e;){if(e instanceof HTMLSelectElement)return e;e=e.parentElement}return null},e.prototype.insertFrameRange=function(e,t,n,r,o,a,i){for(var u=r,l=a;l<i;l++){var s=e.referenceFramesEntry(o,l);r+=this.insertFrame(e,t,n,r,o,s,l),l+=p(e,s)}return r-u},e}();function p(e,t){var n=e.frameReader;switch(n.frameType(t)){case r.FrameType.component:case r.FrameType.element:case r.FrameType.region:return n.subtreeLength(t)-1;default:return 0}}t.BrowserRenderer=d},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),function(e){e[e.prependFrame=1]="prependFrame",e[e.removeFrame=2]="removeFrame",e[e.setAttribute=3]="setAttribute",e[e.removeAttribute=4]="removeAttribute",e[e.updateText=5]="updateText",e[e.stepIn=6]="stepIn",e[e.stepOut=7]="stepOut",e[e.updateMarkup=8]="updateMarkup",e[e.permutationListEntry=9]="permutationListEntry",e[e.permutationListEnd=10]="permutationListEnd"}(t.EditType||(t.EditType={})),function(e){e[e.element=1]="element",e[e.text=2]="text",e[e.attribute=3]="attribute",e[e.component=4]="component",e[e.region=5]="region",e[e.elementReferenceCapture=6]="elementReferenceCapture",e[e.markup=8]="markup"}(t.FrameType||(t.FrameType={}))},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r,o=n(29),a=n(30),i=(r={},["abort","blur","change","error","focus","load","loadend","loadstart","mouseenter","mouseleave","progress","reset","scroll","submit","unload","DOMNodeInsertedIntoDocument","DOMNodeRemovedFromDocument"].forEach(function(e){r[e]=!0}),r),u=function(){function e(t){this.onEvent=t;var n=++e.nextEventDelegatorId;this.eventsCollectionKey="_blazorEvents_"+n,this.eventInfoStore=new l(this.onGlobalEvent.bind(this))}return e.prototype.setListener=function(e,t,n,r){var o=e[this.eventsCollectionKey];if(o||(o=e[this.eventsCollectionKey]={}),o.hasOwnProperty(t)){var a=o[t];this.eventInfoStore.update(a.eventHandlerId,n)}else{var i={element:e,eventName:t,eventHandlerId:n,renderingComponentId:r};this.eventInfoStore.add(i),o[t]=i}},e.prototype.removeListener=function(e){var t=this.eventInfoStore.remove(e);if(t){var n=t.element;if(n.hasOwnProperty(this.eventsCollectionKey)){var r=n[this.eventsCollectionKey];delete r[t.eventName],0===Object.getOwnPropertyNames(r).length&&delete n[this.eventsCollectionKey]}}},e.prototype.onGlobalEvent=function(e){if(e.target instanceof Element)for(var t=e.target,n=null,r=i.hasOwnProperty(e.type);t;){if(t.hasOwnProperty(this.eventsCollectionKey)){var u=t[this.eventsCollectionKey];if(u.hasOwnProperty(e.type)){n||(n=o.EventForDotNet.fromDOMEvent(e));var l=u[e.type],s=a.EventFieldInfo.fromEvent(l.renderingComponentId,e);this.onEvent(e,l.eventHandlerId,n,s)}}t=r?null:t.parentElement}},e.nextEventDelegatorId=0,e}();t.EventDelegator=u;var l=function(){function e(e){this.globalListener=e,this.infosByEventHandlerId={},this.countByEventName={}}return e.prototype.add=function(e){if(this.infosByEventHandlerId[e.eventHandlerId])throw new Error("Event "+e.eventHandlerId+" is already tracked");this.infosByEventHandlerId[e.eventHandlerId]=e;var t=e.eventName;if(this.countByEventName.hasOwnProperty(t))this.countByEventName[t]++;else{this.countByEventName[t]=1;var n=i.hasOwnProperty(t);document.addEventListener(t,this.globalListener,n)}},e.prototype.update=function(e,t){if(this.infosByEventHandlerId.hasOwnProperty(t))throw new Error("Event "+t+" is already tracked");var n=this.infosByEventHandlerId[e];delete this.infosByEventHandlerId[e],n.eventHandlerId=t,this.infosByEventHandlerId[t]=n},e.prototype.remove=function(e){var t=this.infosByEventHandlerId[e];if(t){delete this.infosByEventHandlerId[e];var n=t.eventName;0==--this.countByEventName[n]&&(delete this.countByEventName[n],document.removeEventListener(n,this.globalListener))}return t},e}()},function(e,t,n){"use strict";var r=this&&this.__assign||function(){return(r=Object.assign||function(e){for(var t,n=1,r=arguments.length;n<r;n++)for(var o in t=arguments[n])Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);return e}).apply(this,arguments)};Object.defineProperty(t,"__esModule",{value:!0});var o=function(){function e(e,t){this.type=e,this.data=t}return e.fromDOMEvent=function(t){var n=t.target;switch(t.type){case"input":case"change":var o=function(e){return e&&"INPUT"===e.tagName&&"checkbox"===e.getAttribute("type")}(n)?!!n.checked:n.value;return new e("change",{type:t.type,value:o});case"copy":case"cut":case"paste":return new e("clipboard",{type:t.type});case"drag":case"dragend":case"dragenter":case"dragleave":case"dragover":case"dragstart":case"drop":return new e("drag",function(e){return r({},a(e),{dataTransfer:e.dataTransfer})}(t));case"focus":case"blur":case"focusin":case"focusout":return new e("focus",{type:t.type});case"keydown":case"keyup":case"keypress":return new e("keyboard",function(e){return{type:e.type,key:e.key,code:e.code,location:e.location,repeat:e.repeat,ctrlKey:e.ctrlKey,shiftKey:e.shiftKey,altKey:e.altKey,metaKey:e.metaKey}}(t));case"contextmenu":case"click":case"mouseover":case"mouseout":case"mousemove":case"mousedown":case"mouseup":case"dblclick":return new e("mouse",a(t));case"error":return new e("error",function(e){return{type:e.type,message:e.message,filename:e.filename,lineno:e.lineno,colno:e.colno}}(t));case"loadstart":case"timeout":case"abort":case"load":case"loadend":case"progress":return new e("progress",function(e){return{type:e.type,lengthComputable:e.lengthComputable,loaded:e.loaded,total:e.total}}(t));case"touchcancel":case"touchend":case"touchmove":case"touchenter":case"touchleave":case"touchstart":return new e("touch",function(e){function t(e){for(var t=[],n=0;n<e.length;n++){var r=e[n];t.push({identifier:r.identifier,clientX:r.clientX,clientY:r.clientY,screenX:r.screenX,screenY:r.screenY,pageX:r.pageX,pageY:r.pageY})}return t}return{type:e.type,detail:e.detail,touches:t(e.touches),targetTouches:t(e.targetTouches),changedTouches:t(e.changedTouches),ctrlKey:e.ctrlKey,shiftKey:e.shiftKey,altKey:e.altKey,metaKey:e.metaKey}}(t));case"gotpointercapture":case"lostpointercapture":case"pointercancel":case"pointerdown":case"pointerenter":case"pointerleave":case"pointermove":case"pointerout":case"pointerover":case"pointerup":return new e("pointer",function(e){return r({},a(e),{pointerId:e.pointerId,width:e.width,height:e.height,pressure:e.pressure,tiltX:e.tiltX,tiltY:e.tiltY,pointerType:e.pointerType,isPrimary:e.isPrimary})}(t));case"wheel":case"mousewheel":return new e("wheel",function(e){return r({},a(e),{deltaX:e.deltaX,deltaY:e.deltaY,deltaZ:e.deltaZ,deltaMode:e.deltaMode})}(t));default:return new e("unknown",{type:t.type})}},e}();function a(e){return{type:e.type,detail:e.detail,screenX:e.screenX,screenY:e.screenY,clientX:e.clientX,clientY:e.clientY,button:e.button,buttons:e.buttons,ctrlKey:e.ctrlKey,shiftKey:e.shiftKey,altKey:e.altKey,metaKey:e.metaKey}}t.EventForDotNet=o},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=function(){function e(e,t){this.componentId=e,this.fieldValue=t}return e.fromEvent=function(t,n){var r=n.target;if(r instanceof Element){var o=function(e){if(e instanceof HTMLInputElement)return e.type&&"checkbox"===e.type.toLowerCase()?{value:e.checked}:{value:e.value};if(e instanceof HTMLSelectElement||e instanceof HTMLTextAreaElement)return{value:e.value};return null}(r);if(o)return new e(t,o.value)}return null},e}();t.EventFieldInfo=r},function(e,t,n){"use strict";function r(e){return"_bl_"+e}Object.defineProperty(t,"__esModule",{value:!0}),t.applyCaptureIdToElement=function(e,t){e.setAttribute(r(t),"")};DotNet.attachReviver(function(e,t){return t&&"object"==typeof t&&t.hasOwnProperty("__internalId")&&"string"==typeof t.__internalId?(n=t.__internalId,o="["+r(n)+"]",document.querySelector(o)):t;var n,o})},function(e,t,n){"use strict";var r=this&&this.__awaiter||function(e,t,n,r){return new(n||(n=Promise))(function(o,a){function i(e){try{l(r.next(e))}catch(e){a(e)}}function u(e){try{l(r.throw(e))}catch(e){a(e)}}function l(e){e.done?o(e.value):new n(function(t){t(e.value)}).then(i,u)}l((r=r.apply(e,t||[])).next())})},o=this&&this.__generator||function(e,t){var n,r,o,a,i={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return a={next:u(0),throw:u(1),return:u(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function u(a){return function(u){return function(a){if(n)throw new TypeError("Generator is already executing.");for(;i;)try{if(n=1,r&&(o=2&a[0]?r.return:a[0]?r.throw||((o=r.return)&&o.call(r),0):r.next)&&!(o=o.call(r,a[1])).done)return o;switch(r=0,o&&(a=[2&a[0],o.value]),a[0]){case 0:case 1:o=a;break;case 4:return i.label++,{value:a[1],done:!1};case 5:i.label++,r=a[1],a=[0];continue;case 7:a=i.ops.pop(),i.trys.pop();continue;default:if(!(o=(o=i.trys).length>0&&o[o.length-1])&&(6===a[0]||2===a[0])){i=0;continue}if(3===a[0]&&(!o||a[1]>o[0]&&a[1]<o[3])){i.label=a[1];break}if(6===a[0]&&i.label<o[1]){i.label=o[1],o=a;break}if(o&&i.label<o[2]){i.label=o[2],i.ops.push(a);break}o[2]&&i.ops.pop(),i.trys.pop();continue}a=t.call(e,i)}catch(e){a=[6,e],r=0}finally{n=o=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}([a,u])}}};Object.defineProperty(t,"__esModule",{value:!0});var a,i,u=n(9),l="Microsoft.AspNetCore.Blazor",s=l+".Http",c="WebAssemblyHttpMessageHandler";function f(e,t,n,r){a||(a=u.platform.findMethod(l,s,c,"ReceiveResponse")),u.platform.callMethod(a,null,[u.platform.toDotNetString(e.toString()),t,n,r])}t.internalFunctions={sendAsync:function(e,t,n){return r(this,void 0,void 0,function(){var r,a,d,p,m;return o(this,function(o){switch(o.label){case 0:d=JSON.parse(u.platform.toJavaScriptString(n)),p=Object.assign({credentials:(h=d.requestInit).credentials,method:h.method,headers:h.headers.map(function(e){return[e.name,e.value]})},d.requestInitOverrides),t&&(p.body=u.platform.toUint8Array(t)),o.label=1;case 1:return o.trys.push([1,4,,5]),[4,fetch(d.requestUri,p)];case 2:return[4,(r=o.sent()).arrayBuffer()];case 3:return a=o.sent(),[3,5];case 4:return m=o.sent(),function(e,t){f(e,null,null,u.platform.toDotNetString(t))}(e,m.toString()),[2];case 5:return function(e,t,n){var r={statusCode:t.status,statusText:t.statusText,headers:[]};t.headers.forEach(function(e,t){r.headers.push({name:t,value:e})}),i||(i=u.platform.findMethod(l,s,c,"AllocateArray"));var o=u.platform.callMethod(i,null,[u.platform.toDotNetString(n.byteLength.toString())]);u.platform.toUint8Array(o).set(new Uint8Array(n)),f(e,u.platform.toDotNetString(JSON.stringify(r)),o,null)}(e,r,a),[2]}var h})})}}},function(e,t,n){"use strict";function r(e){var t=e.substring(e.lastIndexOf("/")+1),n=t.indexOf("?");return n<0?t:t.substring(0,n)}Object.defineProperty(t,"__esModule",{value:!0}),t.getFileNameFromUrl=r,t.getAssemblyNameFromUrl=function(e){return r(e).replace(/\.dll$/,"")}},function(e,t,n){"use strict";var r=this&&this.__awaiter||function(e,t,n,r){return new(n||(n=Promise))(function(o,a){function i(e){try{l(r.next(e))}catch(e){a(e)}}function u(e){try{l(r.throw(e))}catch(e){a(e)}}function l(e){e.done?o(e.value):new n(function(t){t(e.value)}).then(i,u)}l((r=r.apply(e,t||[])).next())})},o=this&&this.__generator||function(e,t){var n,r,o,a,i={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return a={next:u(0),throw:u(1),return:u(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function u(a){return function(u){return function(a){if(n)throw new TypeError("Generator is already executing.");for(;i;)try{if(n=1,r&&(o=2&a[0]?r.return:a[0]?r.throw||((o=r.return)&&o.call(r),0):r.next)&&!(o=o.call(r,a[1])).done)return o;switch(r=0,o&&(a=[2&a[0],o.value]),a[0]){case 0:case 1:o=a;break;case 4:return i.label++,{value:a[1],done:!1};case 5:i.label++,r=a[1],a=[0];continue;case 7:a=i.ops.pop(),i.trys.pop();continue;default:if(!(o=(o=i.trys).length>0&&o[o.length-1])&&(6===a[0]||2===a[0])){i=0;continue}if(3===a[0]&&(!o||a[1]>o[0]&&a[1]<o[3])){i.label=a[1];break}if(6===a[0]&&i.label<o[1]){i.label=o[1],o=a;break}if(o&&i.label<o[2]){i.label=o[2],i.ops.push(a);break}o[2]&&i.ops.pop(),i.trys.pop();continue}a=t.call(e,i)}catch(e){a=[6,e],r=0}finally{n=o=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}([a,u])}}};function a(e){return new Promise(function(t,n){e.onload=t,e.onerror=n,document.head.appendChild(e)})}Object.defineProperty(t,"__esModule",{value:!0}),t.fetchBootConfigAsync=function(){return r(this,void 0,void 0,function(){return o(this,function(e){switch(e.label){case 0:return[4,fetch("_framework/blazor.boot.json",{method:"Get",credentials:"include"})];case 1:return[2,e.sent().json()]}})})},t.loadEmbeddedResourcesAsync=function(e){var t=e.cssReferences.map(function(e){var t=document.createElement("link");return t.rel="stylesheet",t.href=e,a(t)}),n=e.jsReferences.map(function(e){var t=document.createElement("script");return t.src=e,a(t)});return Promise.all(t.concat(n))},t.shouldAutoStart=function(){return!(!document||!document.currentScript||"false"===document.currentScript.getAttribute("autostart"))}},,,,,,,,,,,function(e,t,n){"use strict";var r=this&&this.__awaiter||function(e,t,n,r){return new(n||(n=Promise))(function(o,a){function i(e){try{l(r.next(e))}catch(e){a(e)}}function u(e){try{l(r.throw(e))}catch(e){a(e)}}function l(e){e.done?o(e.value):new n(function(t){t(e.value)}).then(i,u)}l((r=r.apply(e,t||[])).next())})},o=this&&this.__generator||function(e,t){var n,r,o,a,i={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return a={next:u(0),throw:u(1),return:u(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function u(a){return function(u){return function(a){if(n)throw new TypeError("Generator is already executing.");for(;i;)try{if(n=1,r&&(o=2&a[0]?r.return:a[0]?r.throw||((o=r.return)&&o.call(r),0):r.next)&&!(o=o.call(r,a[1])).done)return o;switch(r=0,o&&(a=[2&a[0],o.value]),a[0]){case 0:case 1:o=a;break;case 4:return i.label++,{value:a[1],done:!1};case 5:i.label++,r=a[1],a=[0];continue;case 7:a=i.ops.pop(),i.trys.pop();continue;default:if(!(o=(o=i.trys).length>0&&o[o.length-1])&&(6===a[0]||2===a[0])){i=0;continue}if(3===a[0]&&(!o||a[1]>o[0]&&a[1]<o[3])){i.label=a[1];break}if(6===a[0]&&i.label<o[1]){i.label=o[1],o=a;break}if(o&&i.label<o[2]){i.label=o[2],i.ops.push(a);break}o[2]&&i.ops.pop(),i.trys.pop();continue}a=t.call(e,i)}catch(e){a=[6,e],r=0}finally{n=o=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}([a,u])}}};Object.defineProperty(t,"__esModule",{value:!0}),n(16),n(24);var a=n(9),i=n(46),u=n(33),l=n(8),s=n(48),c=n(34),f=n(18),d=!1;function p(e){return r(this,void 0,void 0,function(){var e,t,n,p,m,h,v=this;return o(this,function(y){switch(y.label){case 0:if(d)throw new Error("Blazor has already started.");return d=!0,f.setEventDispatcher(function(e,t){return DotNet.invokeMethodAsync("Microsoft.AspNetCore.Blazor","DispatchEvent",e,JSON.stringify(t))}),e=a.setPlatform(i.monoPlatform),window.Blazor.platform=e,window.Blazor._internal.renderBatch=function(e,t){l.renderBatch(e,new s.SharedMemoryRenderBatch(t))},window.Blazor._internal.navigationManager.listenForNavigationEvents(function(e,t){return r(v,void 0,void 0,function(){return o(this,function(n){switch(n.label){case 0:return[4,DotNet.invokeMethodAsync("Microsoft.AspNetCore.Blazor","NotifyLocationChanged",e,t)];case 1:return n.sent(),[2]}})})}),[4,c.fetchBootConfigAsync()];case 1:t=y.sent(),n=c.loadEmbeddedResourcesAsync(t),t.linkerEnabled||console.info("Blazor is running in dev mode without IL stripping. To make the bundle size significantly smaller, publish the application or see https://go.microsoft.com/fwlink/?linkid=870414"),p=[t.main].concat(t.assemblyReferences).map(function(e){return"_framework/_bin/"+e}),y.label=2;case 2:return y.trys.push([2,4,,5]),[4,e.start(p)];case 3:return y.sent(),[3,5];case 4:throw m=y.sent(),new Error("Failed to start platform. Reason: "+m);case 5:return[4,n];case 6:return y.sent(),h=u.getAssemblyNameFromUrl(t.main),e.callEntryPoint(h,t.entryPoint,[]),[2]}})})}window.Blazor.start=p,c.shouldAutoStart()&&p()},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r,o,a,i,u,l,s=n(33),c=n(47),f={},d={},p={},m="appBinDir",h=Math.pow(2,32),v=Math.pow(2,21)-1;function y(e,t,n){var a="["+e+"]"+t+"."+n,i=d[a];if(!i){if(!(i=o(function(e){var t=f[e];if(!t){if(!(t=r(e)))throw new Error('Could not find assembly "'+e+'"');f[e]=t}return t}(e),t,n)))throw new Error('Could not find type "'+n+'" in namespace "'+t+'" in assembly "'+e+'"');d[a]=i}return i}function g(e,t,n,r){var o="["+e+"]"+t+"."+n+"::"+r,i=p[o];if(!i){if(!(i=a(y(e,t,n),r,-1)))throw new Error('Could not find method "'+r+'" on type "'+t+"."+n+'"');p[o]=i}return i}t.monoPlatform={start:function(e){return new Promise(function(n,f){c.attachDebuggerHotkey(e),window.Browser={init:function(){}},window.Module=function(e,n,f){var d={},p=["DEBUGGING ENABLED"];return d.print=function(e){return p.indexOf(e)<0&&console.log("WASM: "+e)},d.printErr=function(e){return console.error("WASM: "+e)},d.preRun=[],d.postRun=[],d.preloadPlugins=[],d.locateFile=function(e){switch(e){case"mono.wasm":return"_framework/wasm/mono.wasm";default:return e}},d.preRun.push(function(){var t=Module.cwrap("mono_wasm_add_assembly",null,["string","number","number"]);r=Module.cwrap("mono_wasm_assembly_load","number",["string"]),o=Module.cwrap("mono_wasm_assembly_find_class","number",["number","string","string"]),a=Module.cwrap("mono_wasm_assembly_find_method","number",["number","string","number"]),i=Module.cwrap("mono_wasm_invoke_method","number",["number","number","number"]),u=Module.cwrap("mono_wasm_string_get_utf8","number",["number"]),l=Module.cwrap("mono_wasm_string_from_js","number",["string"]),MONO.loaded_files=[],e.forEach(function(e){var n=s.getFileNameFromUrl(e),r="blazor:"+n;addRunDependency(r),function(e){return new Promise(function(t,n){var r=new XMLHttpRequest;r.open("GET",e,!0),r.responseType="arraybuffer",r.onload=function(){if(200==r.status||0==r.status&&r.response){var e=new Uint8Array(r.response);t(e)}else n(r)},r.onerror=n,r.send(void 0)})}(e).then(function(o){var a,i=Module._malloc(o.length);new Uint8Array(Module.HEAPU8.buffer,i,o.length).set(o),t(n,i,o.length),MONO.loaded_files.push((a=e,b.href=a,b.href)),removeRunDependency(r)},function(e){e instanceof XMLHttpRequest&&404===e.status&&n.match(/\.pdb$/)||f(e),removeRunDependency(r)})})}),d.postRun.push(function(){var e,r,o;MONO.mono_wasm_setenv("MONO_URI_DOTNETRELATIVEORABSOLUTE","true"),Module.cwrap("mono_wasm_load_runtime",null,["string","number"])(m,c.hasDebuggingEnabled()?1:0),MONO.mono_wasm_runtime_is_ready=!0,e=g("Mono.WebAssembly.Interop","Mono.WebAssembly.Interop","MonoWebAssemblyJSRuntime","InvokeDotNet"),r=g("Mono.WebAssembly.Interop","Mono.WebAssembly.Interop","MonoWebAssemblyJSRuntime","BeginInvokeDotNet"),o=g("Mono.WebAssembly.Interop","Mono.WebAssembly.Interop","MonoWebAssemblyJSRuntime","EndInvokeJS"),DotNet.attachDispatcher({beginInvokeDotNetFromJS:function(e,n,o,a,i){if(!a&&!n)throw new Error("Either assemblyName or dotNetObjectId must have a non null value.");var u=a?a.toString():n;t.monoPlatform.callMethod(r,null,[e?t.monoPlatform.toDotNetString(e.toString()):null,t.monoPlatform.toDotNetString(u),t.monoPlatform.toDotNetString(o),t.monoPlatform.toDotNetString(i)])},endInvokeJSFromDotNet:function(e,n,r){t.monoPlatform.callMethod(o,null,[t.monoPlatform.toDotNetString(r)])},invokeDotNetFromJS:function(n,r,o,a){var i=t.monoPlatform.callMethod(e,null,[n?t.monoPlatform.toDotNetString(n):null,t.monoPlatform.toDotNetString(r),o?t.monoPlatform.toDotNetString(o.toString()):null,t.monoPlatform.toDotNetString(a)]);return i?t.monoPlatform.toJavaScriptString(i):null}}),n()}),d}(e,n,f),function(){if("undefined"==typeof WebAssembly||!WebAssembly.validate)throw new Error("This browser does not support WebAssembly.");var e=document.createElement("script");e.src="_framework/wasm/mono.js",e.defer=!0,document.body.appendChild(e)}()})},findMethod:g,callEntryPoint:function(e,n,r){var o=n.split("::");if(2!=o.length)throw new Error("Malformed entry point method name; could not resolve class name and method name.");var a=o[0],i=o[1],u=a.lastIndexOf("."),l=u>-1?a.substring(0,u):"",s=u>-1?a.substring(u+1):a,c=t.monoPlatform.findMethod(e,l,s,i);t.monoPlatform.callMethod(c,null,r)},callMethod:function(e,n,r){if(r.length>4)throw new Error("Currently, MonoPlatform supports passing a maximum of 4 arguments from JS to .NET. You tried to pass "+r.length+".");var o=Module.stackSave();try{for(var a=Module.stackAlloc(r.length),u=Module.stackAlloc(4),l=0;l<r.length;++l)Module.setValue(a+4*l,r[l],"i32");Module.setValue(u,0,"i32");var s=i(e,n,a,u);if(0!==Module.getValue(u,"i32"))throw new Error(t.monoPlatform.toJavaScriptString(s));return s}finally{Module.stackRestore(o)}},toJavaScriptString:function(e){var t=u(e),n=Module.UTF8ToString(t);return Module._free(t),n},toDotNetString:function(e){return l(e)},toUint8Array:function(e){var t=w(e),n=Module.getValue(t,"i32");return new Uint8Array(Module.HEAPU8.buffer,t+4,n)},getArrayLength:function(e){return Module.getValue(w(e),"i32")},getArrayEntryPtr:function(e,t,n){return w(e)+4+t*n},getObjectFieldsBaseAddress:function(e){return e+8},readInt16Field:function(e,t){return Module.getValue(e+(t||0),"i16")},readInt32Field:function(e,t){return Module.getValue(e+(t||0),"i32")},readUint64Field:function(e,t){var n=e+(t||0)>>2,r=Module.HEAPU32[n+1];if(r>v)throw new Error("Cannot read uint64 with high order part "+r+", because the result would exceed Number.MAX_SAFE_INTEGER.");return r*h+Module.HEAPU32[n]},readFloatField:function(e,t){return Module.getValue(e+(t||0),"float")},readObjectField:function(e,t){return Module.getValue(e+(t||0),"i32")},readStringField:function(e,n){var r=Module.getValue(e+(n||0),"i32");return 0===r?null:t.monoPlatform.toJavaScriptString(r)},readStructField:function(e,t){return e+(t||0)}};var b=document.createElement("a");function w(e){return e+12}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(33),o=window.chrome&&navigator.userAgent.indexOf("Edge")<0,a=!1;function i(){return a&&o}t.hasDebuggingEnabled=i,t.attachDebuggerHotkey=function(e){a=e.some(function(e){return/\.pdb$/.test(r.getFileNameFromUrl(e))});var t=navigator.platform.match(/^Mac/i)?"Cmd":"Alt";i()&&console.info("Debugging hotkey: Shift+"+t+"+D (when application has focus)"),document.addEventListener("keydown",function(e){var t;e.shiftKey&&(e.metaKey||e.altKey)&&"KeyD"===e.code&&(a?o?((t=document.createElement("a")).href="_framework/debug?url="+encodeURIComponent(location.href),t.target="_blank",t.rel="noopener noreferrer",t.click()):console.error("Currently, only Chrome is supported for debugging."):console.error("Cannot start debugging, because the application was not compiled with debugging enabled."))})}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(9),o=function(){function e(e){this.batchAddress=e,this.arrayRangeReader=a,this.arrayBuilderSegmentReader=i,this.diffReader=u,this.editReader=l,this.frameReader=s}return e.prototype.updatedComponents=function(){return r.platform.readStructField(this.batchAddress,0)},e.prototype.referenceFrames=function(){return r.platform.readStructField(this.batchAddress,a.structLength)},e.prototype.disposedComponentIds=function(){return r.platform.readStructField(this.batchAddress,2*a.structLength)},e.prototype.disposedEventHandlerIds=function(){return r.platform.readStructField(this.batchAddress,3*a.structLength)},e.prototype.updatedComponentsEntry=function(e,t){return c(e,t,u.structLength)},e.prototype.referenceFramesEntry=function(e,t){return c(e,t,s.structLength)},e.prototype.disposedComponentIdsEntry=function(e,t){var n=c(e,t,4);return r.platform.readInt32Field(n)},e.prototype.disposedEventHandlerIdsEntry=function(e,t){var n=c(e,t,8);return r.platform.readUint64Field(n)},e}();t.SharedMemoryRenderBatch=o;var a={structLength:8,values:function(e){return r.platform.readObjectField(e,0)},count:function(e){return r.platform.readInt32Field(e,4)}},i={structLength:12,values:function(e){var t=r.platform.readObjectField(e,0),n=r.platform.getObjectFieldsBaseAddress(t);return r.platform.readObjectField(n,0)},offset:function(e){return r.platform.readInt32Field(e,4)},count:function(e){return r.platform.readInt32Field(e,8)}},u={structLength:4+i.structLength,componentId:function(e){return r.platform.readInt32Field(e,0)},edits:function(e){return r.platform.readStructField(e,4)},editsEntry:function(e,t){return c(e,t,l.structLength)}},l={structLength:20,editType:function(e){return r.platform.readInt32Field(e,0)},siblingIndex:function(e){return r.platform.readInt32Field(e,4)},newTreeIndex:function(e){return r.platform.readInt32Field(e,8)},moveToSiblingIndex:function(e){return r.platform.readInt32Field(e,8)},removedAttributeName:function(e){return r.platform.readStringField(e,16)}},s={structLength:36,frameType:function(e){return r.platform.readInt16Field(e,4)},subtreeLength:function(e){return r.platform.readInt32Field(e,8)},elementReferenceCaptureId:function(e){return r.platform.readStringField(e,16)},componentId:function(e){return r.platform.readInt32Field(e,12)},elementName:function(e){return r.platform.readStringField(e,16)},textContent:function(e){return r.platform.readStringField(e,16)},markupContent:function(e){return r.platform.readStringField(e,16)},attributeName:function(e){return r.platform.readStringField(e,16)},attributeValue:function(e){return r.platform.readStringField(e,24)},attributeEventHandlerId:function(e){return r.platform.readUint64Field(e,8)}};function c(e,t,n){return r.platform.getArrayEntryPtr(e,t,n)}}]);
\ No newline at end of file
+!function(e){var t={};function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)n.d(r,o,function(t){return e[t]}.bind(null,o));return r},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="",n(n.s=45)}([,,,,,function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),n(25),n(9);var r=n(26),o=n(13),a={},i=!1;function u(e,t,n){var o=a[e];o||(o=a[e]=new r.BrowserRenderer(e)),o.attachRootComponentToLogicalElement(n,t)}t.attachRootComponentToLogicalElement=u,t.attachRootComponentToElement=function(e,t,n){var r=document.querySelector(e);if(!r)throw new Error("Could not find any element matching selector '"+e+"'.");u(n||0,o.toLogicalElement(r,!0),t)},t.renderBatch=function(e,t){var n=a[e];if(!n)throw new Error("There is no browser renderer with ID "+e+".");for(var r=t.arrayRangeReader,o=t.updatedComponents(),u=r.values(o),l=r.count(o),s=t.referenceFrames(),c=r.values(s),f=t.diffReader,d=0;d<l;d++){var p=t.updatedComponentsEntry(u,d),m=f.componentId(p),h=f.edits(p);n.updateComponent(t,m,h,c)}var v=t.disposedComponentIds(),y=r.values(v),g=r.count(v);for(d=0;d<g;d++)m=t.disposedComponentIdsEntry(y,d),n.disposeComponent(m);var b=t.disposedEventHandlerIds(),w=r.values(b),E=r.count(b);for(d=0;d<E;d++){var _=t.disposedEventHandlerIdsEntry(w,d);n.disposeEventHandler(_)}i&&(i=!1,window.scrollTo&&window.scrollTo(0,0))},t.resetScrollAfterNextBatch=function(){i=!0}},,,,function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.setPlatform=function(e){return t.platform=e,t.platform}},,,,function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=p("_blazorLogicalChildren"),o=p("_blazorLogicalParent"),a=p("_blazorLogicalEnd");function i(e,t){if(e.childNodes.length>0&&!t)throw new Error("New logical elements must start empty, or allowExistingContents must be true");return e[r]=[],e}function u(e,t,n){var a=e;if(e instanceof Comment&&(s(a)&&s(a).length>0))throw new Error("Not implemented: inserting non-empty logical container");if(l(a))throw new Error("Not implemented: moving existing logical children");var i=s(t);if(n<i.length){var u=i[n];u.parentNode.insertBefore(e,u),i.splice(n,0,a)}else d(e,t),i.push(a);a[o]=t,r in a||(a[r]=[])}function l(e){return e[o]||null}function s(e){return e[r]}function c(e){if(e instanceof Element)return e;if(e instanceof Comment)return e.parentNode;throw new Error("Not a valid logical element")}function f(e){var t=s(l(e));return t[Array.prototype.indexOf.call(t,e)+1]||null}function d(e,t){if(t instanceof Element)t.appendChild(e);else{if(!(t instanceof Comment))throw new Error("Cannot append node because the parent is not a valid logical element. Parent: "+t);var n=f(t);n?n.parentNode.insertBefore(e,n):d(e,l(t))}}function p(e){return"function"==typeof Symbol?Symbol():e}t.toLogicalRootCommentElement=function(e,t){if(!e.parentNode)throw new Error("Comment not connected to the DOM "+e.textContent);var n=e.parentNode,r=i(n,!0),u=s(r);return Array.from(n.childNodes).forEach(function(e){return u.push(e)}),e[o]=r,t&&(e[a]=t,i(t,!0)),i(e,!0)},t.toLogicalElement=i,t.createAndInsertLogicalContainer=function(e,t){var n=document.createComment("!");return u(n,e,t),n},t.insertLogicalChild=u,t.removeLogicalChild=function e(t,n){var r=s(t).splice(n,1)[0];if(r instanceof Comment)for(var o=s(r);o.length>0;)e(r,0);var a=r;a.parentNode.removeChild(a)},t.getLogicalParent=l,t.getLogicalSiblingEnd=function(e){return e[a]||null},t.getLogicalChild=function(e,t){return s(e)[t]},t.isSvgElement=function(e){return"http://www.w3.org/2000/svg"===c(e).namespaceURI},t.getLogicalChildrenArray=s,t.permuteLogicalChildren=function(e,t){var n=s(e);t.forEach(function(e){e.moveRangeStart=n[e.fromSiblingIndex],e.moveRangeEnd=function e(t){if(t instanceof Element)return t;var n=f(t);if(n)return n.previousSibling;var r=l(t);return r instanceof Element?r.lastChild:e(r)}(e.moveRangeStart)}),t.forEach(function(t){var r=t.moveToBeforeMarker=document.createComment("marker"),o=n[t.toSiblingIndex+1];o?o.parentNode.insertBefore(r,o):d(r,e)}),t.forEach(function(e){for(var t=e.moveToBeforeMarker,n=t.parentNode,r=e.moveRangeStart,o=e.moveRangeEnd,a=r;a;){var i=a.nextSibling;if(n.insertBefore(a,t),a===o)break;a=i}n.removeChild(t)}),t.forEach(function(e){n[e.toSiblingIndex]=e.moveRangeStart})},t.getClosestDomElement=c},,,,function(e,t,n){"use strict";var r;!function(e){window.DotNet=e;var t=[],n={},r={},o=1,a=null;function i(e){t.push(e)}function u(e,t,n,r){var o=s();if(o.invokeDotNetFromJS){var a=JSON.stringify(r,h),i=o.invokeDotNetFromJS(e,t,n,a);return i?f(i):null}throw new Error("The current dispatcher does not support synchronous calls from JS to .NET. Use invokeMethodAsync instead.")}function l(e,t,r,a){if(e&&r)throw new Error("For instance method calls, assemblyName should be null. Received '"+e+"'.");var i=o++,u=new Promise(function(e,t){n[i]={resolve:e,reject:t}});try{var l=JSON.stringify(a,h);s().beginInvokeDotNetFromJS(i,e,t,r,l)}catch(e){c(i,!1,e)}return u}function s(){if(null!==a)return a;throw new Error("No .NET call dispatcher has been set.")}function c(e,t,r){if(!n.hasOwnProperty(e))throw new Error("There is no pending async call with ID "+e+".");var o=n[e];delete n[e],t?o.resolve(r):o.reject(r)}function f(e){return e?JSON.parse(e,function(e,n){return t.reduce(function(t,n){return n(e,t)},n)}):null}function d(e){return e instanceof Error?e.message+"\n"+e.stack:e?e.toString():"null"}function p(e){if(r.hasOwnProperty(e))return r[e];var t,n=window,o="window";if(e.split(".").forEach(function(e){if(!(e in n))throw new Error("Could not find '"+e+"' in '"+o+"'.");t=n,n=n[e],o+="."+e}),n instanceof Function)return n=n.bind(t),r[e]=n,n;throw new Error("The value '"+o+"' is not a function.")}e.attachDispatcher=function(e){a=e},e.attachReviver=i,e.invokeMethod=function(e,t){for(var n=[],r=2;r<arguments.length;r++)n[r-2]=arguments[r];return u(e,t,null,n)},e.invokeMethodAsync=function(e,t){for(var n=[],r=2;r<arguments.length;r++)n[r-2]=arguments[r];return l(e,t,null,n)},e.jsCallDispatcher={findJSFunction:p,invokeJSFromDotNet:function(e,t){var n=p(e).apply(null,f(t));return null==n?null:JSON.stringify(n,h)},beginInvokeJSFromDotNet:function(e,t,n){var r=new Promise(function(e){e(p(t).apply(null,f(n)))});e&&r.then(function(t){return s().endInvokeJSFromDotNet(e,!0,JSON.stringify([e,!0,t],h))},function(t){return s().endInvokeJSFromDotNet(e,!1,JSON.stringify([e,!1,d(t)]))})},endInvokeDotNetFromJS:function(e,t,n){var r=t?n:new Error(n);c(parseInt(e),t,r)}};var m=function(){function e(e){this._id=e}return e.prototype.invokeMethod=function(e){for(var t=[],n=1;n<arguments.length;n++)t[n-1]=arguments[n];return u(null,e,this._id,t)},e.prototype.invokeMethodAsync=function(e){for(var t=[],n=1;n<arguments.length;n++)t[n-1]=arguments[n];return l(null,e,this._id,t)},e.prototype.dispose=function(){l(null,"__Dispose",this._id,null).catch(function(e){return console.error(e)})},e.prototype.serializeAsArg=function(){return{__dotNetObject:this._id}},e}();function h(e,t){return t instanceof m?t.serializeAsArg():t}i(function(e,t){return t&&"object"==typeof t&&t.hasOwnProperty("__dotNetObject")?new m(t.__dotNetObject):t})}(r||(r={}))},function(e,t,n){"use strict";var r;Object.defineProperty(t,"__esModule",{value:!0}),t.dispatchEvent=function(e,t){if(!r)throw new Error("eventDispatcher not initialized. Call 'setEventDispatcher' to configure it.");return r(e,t)},t.setEventDispatcher=function(e){r=e}},,,function(e,t,n){"use strict";var r=this&&this.__awaiter||function(e,t,n,r){return new(n||(n=Promise))(function(o,a){function i(e){try{l(r.next(e))}catch(e){a(e)}}function u(e){try{l(r.throw(e))}catch(e){a(e)}}function l(e){e.done?o(e.value):new n(function(t){t(e.value)}).then(i,u)}l((r=r.apply(e,t||[])).next())})},o=this&&this.__generator||function(e,t){var n,r,o,a,i={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return a={next:u(0),throw:u(1),return:u(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function u(a){return function(u){return function(a){if(n)throw new TypeError("Generator is already executing.");for(;i;)try{if(n=1,r&&(o=2&a[0]?r.return:a[0]?r.throw||((o=r.return)&&o.call(r),0):r.next)&&!(o=o.call(r,a[1])).done)return o;switch(r=0,o&&(a=[2&a[0],o.value]),a[0]){case 0:case 1:o=a;break;case 4:return i.label++,{value:a[1],done:!1};case 5:i.label++,r=a[1],a=[0];continue;case 7:a=i.ops.pop(),i.trys.pop();continue;default:if(!(o=(o=i.trys).length>0&&o[o.length-1])&&(6===a[0]||2===a[0])){i=0;continue}if(3===a[0]&&(!o||a[1]>o[0]&&a[1]<o[3])){i.label=a[1];break}if(6===a[0]&&i.label<o[1]){i.label=o[1],o=a;break}if(o&&i.label<o[2]){i.label=o[2],i.ops.push(a);break}o[2]&&i.ops.pop(),i.trys.pop();continue}a=t.call(e,i)}catch(e){a=[6,e],r=0}finally{n=o=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}([a,u])}}};Object.defineProperty(t,"__esModule",{value:!0}),n(17);var a,i=n(5),u=!1,l=!1,s=null;function c(e,t){var n=p(e);if(!t&&m(n))f(n,!1);else if(t&&location.href===e){var r=e+"?";history.replaceState(null,"",r),location.replace(e)}else location.href=e}function f(e,t){i.resetScrollAfterNextBatch(),history.pushState(null,"",e),d(t)}function d(e){return r(this,void 0,void 0,function(){return o(this,function(t){switch(t.label){case 0:return s?[4,s(location.href,e)]:[3,2];case 1:t.sent(),t.label=2;case 2:return[2]}})})}function p(e){return(a=a||document.createElement("a")).href=e,a.href}function m(e){var t,n=(t=document.baseURI).substr(0,t.lastIndexOf("/")+1);return e.startsWith(n)}t.internalFunctions={listenForNavigationEvents:function(e){if(s=e,l)return;l=!0,window.addEventListener("popstate",function(){return d(!1)})},enableNavigationInterception:function(){if(u)return;u=!0,document.addEventListener("click",function(e){if(0===e.button&&!function(e){return e.ctrlKey||e.shiftKey||e.altKey||e.metaKey}(e)){var t=function e(t,n){return t?t.tagName===n?t:e(t.parentElement,n):null}(e.target,"A");if(t&&t.hasAttribute("href")){var n=t.getAttribute("target"),r=!n||"_self"===n;if(!r)return;var o=t.getAttribute("href"),a=p(o);m(a)&&(e.preventDefault(),f(a,!0))}}})},navigateTo:c,getBaseURI:function(){return document.baseURI},getLocationHref:function(){return location.href}},t.navigateTo=c},,,function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(21),o=n(32),a=n(5);window.Blazor={navigateTo:r.navigateTo,_internal:{attachRootComponentToElement:a.attachRootComponentToElement,http:o.internalFunctions,navigationManager:r.internalFunctions}}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0})},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(27),o=n(28),a=n(13),i=n(31),u=n(18),l=document.createElement("template"),s=document.createElementNS("http://www.w3.org/2000/svg","g"),c={submit:!0},f={},d=function(){function e(e){var t=this;this.childComponentLocations={},this.browserRendererId=e,this.eventDelegator=new o.EventDelegator(function(e,n,r,o){!function(e,t,n,r,o){c[e.type]&&e.preventDefault();var a={browserRendererId:t,eventHandlerId:n,eventArgsType:r.type,eventFieldInfo:o};u.dispatchEvent(a,r.data)}(e,t.browserRendererId,n,r,o)})}return e.prototype.attachRootComponentToLogicalElement=function(e,t){this.attachComponentToElement(e,t),f[e]=t},e.prototype.updateComponent=function(e,t,n,r){var o=this.childComponentLocations[t];if(!o)throw new Error("No element is currently associated with component "+t);var i=f[t];if(i){var u=a.getLogicalSiblingEnd(i);delete f[t],u?function(e,t){var n=a.getLogicalParent(e);if(!n)throw new Error("Can't clear between nodes. The start node does not have a logical parent.");for(var r=a.getLogicalChildrenArray(n),o=r.indexOf(e)+1,i=r.indexOf(t),u=o;u<=i;u++)a.removeLogicalChild(n,o);e.textContent="!"}(i,u):function(e){var t;for(;t=e.firstChild;)e.removeChild(t)}(i)}var l=a.getClosestDomElement(o).ownerDocument,s=l&&l.activeElement;this.applyEdits(e,t,o,0,n,r),s instanceof HTMLElement&&l&&l.activeElement!==s&&s.focus()},e.prototype.disposeComponent=function(e){delete this.childComponentLocations[e]},e.prototype.disposeEventHandler=function(e){this.eventDelegator.removeListener(e)},e.prototype.attachComponentToElement=function(e,t){this.childComponentLocations[e]=t},e.prototype.applyEdits=function(e,t,n,o,i,u){for(var l,s=0,c=o,f=e.arrayBuilderSegmentReader,d=e.editReader,p=e.frameReader,m=f.values(i),h=f.offset(i),v=h+f.count(i),y=h;y<v;y++){var g=e.diffReader.editsEntry(m,y),b=d.editType(g);switch(b){case r.EditType.prependFrame:var w=d.newTreeIndex(g),E=e.referenceFramesEntry(u,w),_=d.siblingIndex(g);this.insertFrame(e,t,n,c+_,u,E,w);break;case r.EditType.removeFrame:_=d.siblingIndex(g);a.removeLogicalChild(n,c+_);break;case r.EditType.setAttribute:w=d.newTreeIndex(g),E=e.referenceFramesEntry(u,w),_=d.siblingIndex(g);if(!((S=a.getLogicalChild(n,c+_))instanceof Element))throw new Error("Cannot set attribute on non-element child");this.applyAttribute(e,t,S,E);break;case r.EditType.removeAttribute:var S;_=d.siblingIndex(g);if(!((S=a.getLogicalChild(n,c+_))instanceof HTMLElement))throw new Error("Cannot remove attribute from non-element child");var I=d.removedAttributeName(g);this.tryApplySpecialProperty(e,S,I,null)||S.removeAttribute(I);break;case r.EditType.updateText:w=d.newTreeIndex(g),E=e.referenceFramesEntry(u,w),_=d.siblingIndex(g);var C=a.getLogicalChild(n,c+_);if(!(C instanceof Text))throw new Error("Cannot set text content on non-text child");C.textContent=p.textContent(E);break;case r.EditType.updateMarkup:w=d.newTreeIndex(g),E=e.referenceFramesEntry(u,w),_=d.siblingIndex(g);a.removeLogicalChild(n,c+_),this.insertMarkup(e,n,c+_,E);break;case r.EditType.stepIn:_=d.siblingIndex(g);n=a.getLogicalChild(n,c+_),s++,c=0;break;case r.EditType.stepOut:n=a.getLogicalParent(n),c=0===--s?o:0;break;case r.EditType.permutationListEntry:(l=l||[]).push({fromSiblingIndex:c+d.siblingIndex(g),toSiblingIndex:c+d.moveToSiblingIndex(g)});break;case r.EditType.permutationListEnd:a.permuteLogicalChildren(n,l),l=void 0;break;default:throw new Error("Unknown edit type: "+b)}}},e.prototype.insertFrame=function(e,t,n,o,a,u,l){var s=e.frameReader,c=s.frameType(u);switch(c){case r.FrameType.element:return this.insertElement(e,t,n,o,a,u,l),1;case r.FrameType.text:return this.insertText(e,n,o,u),1;case r.FrameType.attribute:throw new Error("Attribute frames should only be present as leading children of element frames.");case r.FrameType.component:return this.insertComponent(e,n,o,u),1;case r.FrameType.region:return this.insertFrameRange(e,t,n,o,a,l+1,l+s.subtreeLength(u));case r.FrameType.elementReferenceCapture:if(n instanceof Element)return i.applyCaptureIdToElement(n,s.elementReferenceCaptureId(u)),0;throw new Error("Reference capture frames can only be children of element frames.");case r.FrameType.markup:return this.insertMarkup(e,n,o,u),1;default:throw new Error("Unknown frame type: "+c)}},e.prototype.insertElement=function(e,t,n,o,i,u,l){var s=e.frameReader,c=s.elementName(u),f="svg"===c||a.isSvgElement(n)?document.createElementNS("http://www.w3.org/2000/svg",c):document.createElement(c),d=a.toLogicalElement(f);a.insertLogicalChild(f,n,o);for(var p=l+s.subtreeLength(u),m=l+1;m<p;m++){var h=e.referenceFramesEntry(i,m);if(s.frameType(h)!==r.FrameType.attribute){this.insertFrameRange(e,t,d,0,i,m,p);break}this.applyAttribute(e,t,f,h)}if(f instanceof HTMLSelectElement&&"_blazorSelectValue"in f){var v=f._blazorSelectValue;f.value=v,delete f._blazorSelectValue}},e.prototype.insertComponent=function(e,t,n,r){var o=a.createAndInsertLogicalContainer(t,n),i=e.frameReader.componentId(r);this.attachComponentToElement(i,o)},e.prototype.insertText=function(e,t,n,r){var o=e.frameReader.textContent(r),i=document.createTextNode(o);a.insertLogicalChild(i,t,n)},e.prototype.insertMarkup=function(e,t,n,r){for(var o,i=a.createAndInsertLogicalContainer(t,n),u=e.frameReader.markupContent(r),c=(o=u,a.isSvgElement(t)?(s.innerHTML=o||" ",s):(l.innerHTML=o||" ",l.content)),f=0;c.firstChild;)a.insertLogicalChild(c.firstChild,i,f++)},e.prototype.applyAttribute=function(e,t,n,r){var o=e.frameReader,a=o.attributeName(r),i=(this.browserRendererId,o.attributeEventHandlerId(r));if(i){var u=a.substring(0,2),l=a.substring(2);if("on"!==u||!l)throw new Error("Attribute has nonzero event handler ID, but attribute name '"+a+"' does not start with 'on'.");this.eventDelegator.setListener(n,l,i,t)}else this.tryApplySpecialProperty(e,n,a,r)||n.setAttribute(a,o.attributeValue(r))},e.prototype.tryApplySpecialProperty=function(e,t,n,r){switch(n){case"value":return this.tryApplyValueProperty(e,t,r);case"checked":return this.tryApplyCheckedProperty(e,t,r);default:return!1}},e.prototype.tryApplyValueProperty=function(e,t,n){var r=e.frameReader;switch(t.tagName){case"INPUT":case"SELECT":case"TEXTAREA":var o=n?r.attributeValue(n):null;return t.value=o,"SELECT"===t.tagName&&(t._blazorSelectValue=o),!0;case"OPTION":(o=n?r.attributeValue(n):null)?t.setAttribute("value",o):t.removeAttribute("value");var a=this.findClosestAncestorSelectElement(t);return a&&"_blazorSelectValue"in a&&a._blazorSelectValue===o&&(this.tryApplyValueProperty(e,a,n),delete a._blazorSelectValue),!0;default:return!1}},e.prototype.tryApplyCheckedProperty=function(e,t,n){if("INPUT"===t.tagName){var r=n?e.frameReader.attributeValue(n):null;return t.checked=null!==r,!0}return!1},e.prototype.findClosestAncestorSelectElement=function(e){for(;e;){if(e instanceof HTMLSelectElement)return e;e=e.parentElement}return null},e.prototype.insertFrameRange=function(e,t,n,r,o,a,i){for(var u=r,l=a;l<i;l++){var s=e.referenceFramesEntry(o,l);r+=this.insertFrame(e,t,n,r,o,s,l),l+=p(e,s)}return r-u},e}();function p(e,t){var n=e.frameReader;switch(n.frameType(t)){case r.FrameType.component:case r.FrameType.element:case r.FrameType.region:return n.subtreeLength(t)-1;default:return 0}}t.BrowserRenderer=d},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),function(e){e[e.prependFrame=1]="prependFrame",e[e.removeFrame=2]="removeFrame",e[e.setAttribute=3]="setAttribute",e[e.removeAttribute=4]="removeAttribute",e[e.updateText=5]="updateText",e[e.stepIn=6]="stepIn",e[e.stepOut=7]="stepOut",e[e.updateMarkup=8]="updateMarkup",e[e.permutationListEntry=9]="permutationListEntry",e[e.permutationListEnd=10]="permutationListEnd"}(t.EditType||(t.EditType={})),function(e){e[e.element=1]="element",e[e.text=2]="text",e[e.attribute=3]="attribute",e[e.component=4]="component",e[e.region=5]="region",e[e.elementReferenceCapture=6]="elementReferenceCapture",e[e.markup=8]="markup"}(t.FrameType||(t.FrameType={}))},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r,o=n(29),a=n(30),i=(r={},["abort","blur","change","error","focus","load","loadend","loadstart","mouseenter","mouseleave","progress","reset","scroll","submit","unload","DOMNodeInsertedIntoDocument","DOMNodeRemovedFromDocument"].forEach(function(e){r[e]=!0}),r),u=function(){function e(t){this.onEvent=t;var n=++e.nextEventDelegatorId;this.eventsCollectionKey="_blazorEvents_"+n,this.eventInfoStore=new l(this.onGlobalEvent.bind(this))}return e.prototype.setListener=function(e,t,n,r){var o=e[this.eventsCollectionKey];if(o||(o=e[this.eventsCollectionKey]={}),o.hasOwnProperty(t)){var a=o[t];this.eventInfoStore.update(a.eventHandlerId,n)}else{var i={element:e,eventName:t,eventHandlerId:n,renderingComponentId:r};this.eventInfoStore.add(i),o[t]=i}},e.prototype.removeListener=function(e){var t=this.eventInfoStore.remove(e);if(t){var n=t.element;if(n.hasOwnProperty(this.eventsCollectionKey)){var r=n[this.eventsCollectionKey];delete r[t.eventName],0===Object.getOwnPropertyNames(r).length&&delete n[this.eventsCollectionKey]}}},e.prototype.onGlobalEvent=function(e){if(e.target instanceof Element)for(var t=e.target,n=null,r=i.hasOwnProperty(e.type);t;){if(t.hasOwnProperty(this.eventsCollectionKey)){var u=t[this.eventsCollectionKey];if(u.hasOwnProperty(e.type)){n||(n=o.EventForDotNet.fromDOMEvent(e));var l=u[e.type],s=a.EventFieldInfo.fromEvent(l.renderingComponentId,e);this.onEvent(e,l.eventHandlerId,n,s)}}t=r?null:t.parentElement}},e.nextEventDelegatorId=0,e}();t.EventDelegator=u;var l=function(){function e(e){this.globalListener=e,this.infosByEventHandlerId={},this.countByEventName={}}return e.prototype.add=function(e){if(this.infosByEventHandlerId[e.eventHandlerId])throw new Error("Event "+e.eventHandlerId+" is already tracked");this.infosByEventHandlerId[e.eventHandlerId]=e;var t=e.eventName;if(this.countByEventName.hasOwnProperty(t))this.countByEventName[t]++;else{this.countByEventName[t]=1;var n=i.hasOwnProperty(t);document.addEventListener(t,this.globalListener,n)}},e.prototype.update=function(e,t){if(this.infosByEventHandlerId.hasOwnProperty(t))throw new Error("Event "+t+" is already tracked");var n=this.infosByEventHandlerId[e];delete this.infosByEventHandlerId[e],n.eventHandlerId=t,this.infosByEventHandlerId[t]=n},e.prototype.remove=function(e){var t=this.infosByEventHandlerId[e];if(t){delete this.infosByEventHandlerId[e];var n=t.eventName;0==--this.countByEventName[n]&&(delete this.countByEventName[n],document.removeEventListener(n,this.globalListener))}return t},e}()},function(e,t,n){"use strict";var r=this&&this.__assign||function(){return(r=Object.assign||function(e){for(var t,n=1,r=arguments.length;n<r;n++)for(var o in t=arguments[n])Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);return e}).apply(this,arguments)};Object.defineProperty(t,"__esModule",{value:!0});var o=function(){function e(e,t){this.type=e,this.data=t}return e.fromDOMEvent=function(t){var n=t.target;switch(t.type){case"input":case"change":var o=function(e){return e&&"INPUT"===e.tagName&&"checkbox"===e.getAttribute("type")}(n)?!!n.checked:n.value;return new e("change",{type:t.type,value:o});case"copy":case"cut":case"paste":return new e("clipboard",{type:t.type});case"drag":case"dragend":case"dragenter":case"dragleave":case"dragover":case"dragstart":case"drop":return new e("drag",function(e){return r({},a(e),{dataTransfer:e.dataTransfer})}(t));case"focus":case"blur":case"focusin":case"focusout":return new e("focus",{type:t.type});case"keydown":case"keyup":case"keypress":return new e("keyboard",function(e){return{type:e.type,key:e.key,code:e.code,location:e.location,repeat:e.repeat,ctrlKey:e.ctrlKey,shiftKey:e.shiftKey,altKey:e.altKey,metaKey:e.metaKey}}(t));case"contextmenu":case"click":case"mouseover":case"mouseout":case"mousemove":case"mousedown":case"mouseup":case"dblclick":return new e("mouse",a(t));case"error":return new e("error",function(e){return{type:e.type,message:e.message,filename:e.filename,lineno:e.lineno,colno:e.colno}}(t));case"loadstart":case"timeout":case"abort":case"load":case"loadend":case"progress":return new e("progress",function(e){return{type:e.type,lengthComputable:e.lengthComputable,loaded:e.loaded,total:e.total}}(t));case"touchcancel":case"touchend":case"touchmove":case"touchenter":case"touchleave":case"touchstart":return new e("touch",function(e){function t(e){for(var t=[],n=0;n<e.length;n++){var r=e[n];t.push({identifier:r.identifier,clientX:r.clientX,clientY:r.clientY,screenX:r.screenX,screenY:r.screenY,pageX:r.pageX,pageY:r.pageY})}return t}return{type:e.type,detail:e.detail,touches:t(e.touches),targetTouches:t(e.targetTouches),changedTouches:t(e.changedTouches),ctrlKey:e.ctrlKey,shiftKey:e.shiftKey,altKey:e.altKey,metaKey:e.metaKey}}(t));case"gotpointercapture":case"lostpointercapture":case"pointercancel":case"pointerdown":case"pointerenter":case"pointerleave":case"pointermove":case"pointerout":case"pointerover":case"pointerup":return new e("pointer",function(e){return r({},a(e),{pointerId:e.pointerId,width:e.width,height:e.height,pressure:e.pressure,tiltX:e.tiltX,tiltY:e.tiltY,pointerType:e.pointerType,isPrimary:e.isPrimary})}(t));case"wheel":case"mousewheel":return new e("wheel",function(e){return r({},a(e),{deltaX:e.deltaX,deltaY:e.deltaY,deltaZ:e.deltaZ,deltaMode:e.deltaMode})}(t));default:return new e("unknown",{type:t.type})}},e}();function a(e){return{type:e.type,detail:e.detail,screenX:e.screenX,screenY:e.screenY,clientX:e.clientX,clientY:e.clientY,button:e.button,buttons:e.buttons,ctrlKey:e.ctrlKey,shiftKey:e.shiftKey,altKey:e.altKey,metaKey:e.metaKey}}t.EventForDotNet=o},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=function(){function e(e,t){this.componentId=e,this.fieldValue=t}return e.fromEvent=function(t,n){var r=n.target;if(r instanceof Element){var o=function(e){if(e instanceof HTMLInputElement)return e.type&&"checkbox"===e.type.toLowerCase()?{value:e.checked}:{value:e.value};if(e instanceof HTMLSelectElement||e instanceof HTMLTextAreaElement)return{value:e.value};return null}(r);if(o)return new e(t,o.value)}return null},e}();t.EventFieldInfo=r},function(e,t,n){"use strict";function r(e){return"_bl_"+e}Object.defineProperty(t,"__esModule",{value:!0}),t.applyCaptureIdToElement=function(e,t){e.setAttribute(r(t),"")};DotNet.attachReviver(function(e,t){return t&&"object"==typeof t&&t.hasOwnProperty("__internalId")&&"string"==typeof t.__internalId?(n=t.__internalId,o="["+r(n)+"]",document.querySelector(o)):t;var n,o})},function(e,t,n){"use strict";var r=this&&this.__awaiter||function(e,t,n,r){return new(n||(n=Promise))(function(o,a){function i(e){try{l(r.next(e))}catch(e){a(e)}}function u(e){try{l(r.throw(e))}catch(e){a(e)}}function l(e){e.done?o(e.value):new n(function(t){t(e.value)}).then(i,u)}l((r=r.apply(e,t||[])).next())})},o=this&&this.__generator||function(e,t){var n,r,o,a,i={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return a={next:u(0),throw:u(1),return:u(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function u(a){return function(u){return function(a){if(n)throw new TypeError("Generator is already executing.");for(;i;)try{if(n=1,r&&(o=2&a[0]?r.return:a[0]?r.throw||((o=r.return)&&o.call(r),0):r.next)&&!(o=o.call(r,a[1])).done)return o;switch(r=0,o&&(a=[2&a[0],o.value]),a[0]){case 0:case 1:o=a;break;case 4:return i.label++,{value:a[1],done:!1};case 5:i.label++,r=a[1],a=[0];continue;case 7:a=i.ops.pop(),i.trys.pop();continue;default:if(!(o=(o=i.trys).length>0&&o[o.length-1])&&(6===a[0]||2===a[0])){i=0;continue}if(3===a[0]&&(!o||a[1]>o[0]&&a[1]<o[3])){i.label=a[1];break}if(6===a[0]&&i.label<o[1]){i.label=o[1],o=a;break}if(o&&i.label<o[2]){i.label=o[2],i.ops.push(a);break}o[2]&&i.ops.pop(),i.trys.pop();continue}a=t.call(e,i)}catch(e){a=[6,e],r=0}finally{n=o=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}([a,u])}}};Object.defineProperty(t,"__esModule",{value:!0});var a,i,u=n(9),l="Microsoft.AspNetCore.Blazor",s=l+".Http",c="WebAssemblyHttpMessageHandler";function f(e,t,n,r){a||(a=u.platform.findMethod(l,s,c,"ReceiveResponse")),u.platform.callMethod(a,null,[u.platform.toDotNetString(e.toString()),t,n,r])}t.internalFunctions={sendAsync:function(e,t,n){return r(this,void 0,void 0,function(){var r,a,d,p,m;return o(this,function(o){switch(o.label){case 0:d=JSON.parse(u.platform.toJavaScriptString(n)),p=Object.assign({credentials:(h=d.requestInit).credentials,method:h.method,headers:h.headers.map(function(e){return[e.name,e.value]})},d.requestInitOverrides),t&&(p.body=u.platform.toUint8Array(t)),o.label=1;case 1:return o.trys.push([1,4,,5]),[4,fetch(d.requestUri,p)];case 2:return[4,(r=o.sent()).arrayBuffer()];case 3:return a=o.sent(),[3,5];case 4:return m=o.sent(),function(e,t){f(e,null,null,u.platform.toDotNetString(t))}(e,m.toString()),[2];case 5:return function(e,t,n){var r={statusCode:t.status,statusText:t.statusText,headers:[]};t.headers.forEach(function(e,t){r.headers.push({name:t,value:e})}),i||(i=u.platform.findMethod(l,s,c,"AllocateArray"));var o=u.platform.callMethod(i,null,[u.platform.toDotNetString(n.byteLength.toString())]);u.platform.toUint8Array(o).set(new Uint8Array(n)),f(e,u.platform.toDotNetString(JSON.stringify(r)),o,null)}(e,r,a),[2]}var h})})}}},function(e,t,n){"use strict";function r(e){var t=e.substring(e.lastIndexOf("/")+1),n=t.indexOf("?");return n<0?t:t.substring(0,n)}Object.defineProperty(t,"__esModule",{value:!0}),t.getFileNameFromUrl=r,t.getAssemblyNameFromUrl=function(e){return r(e).replace(/\.dll$/,"")}},function(e,t,n){"use strict";var r=this&&this.__awaiter||function(e,t,n,r){return new(n||(n=Promise))(function(o,a){function i(e){try{l(r.next(e))}catch(e){a(e)}}function u(e){try{l(r.throw(e))}catch(e){a(e)}}function l(e){e.done?o(e.value):new n(function(t){t(e.value)}).then(i,u)}l((r=r.apply(e,t||[])).next())})},o=this&&this.__generator||function(e,t){var n,r,o,a,i={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return a={next:u(0),throw:u(1),return:u(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function u(a){return function(u){return function(a){if(n)throw new TypeError("Generator is already executing.");for(;i;)try{if(n=1,r&&(o=2&a[0]?r.return:a[0]?r.throw||((o=r.return)&&o.call(r),0):r.next)&&!(o=o.call(r,a[1])).done)return o;switch(r=0,o&&(a=[2&a[0],o.value]),a[0]){case 0:case 1:o=a;break;case 4:return i.label++,{value:a[1],done:!1};case 5:i.label++,r=a[1],a=[0];continue;case 7:a=i.ops.pop(),i.trys.pop();continue;default:if(!(o=(o=i.trys).length>0&&o[o.length-1])&&(6===a[0]||2===a[0])){i=0;continue}if(3===a[0]&&(!o||a[1]>o[0]&&a[1]<o[3])){i.label=a[1];break}if(6===a[0]&&i.label<o[1]){i.label=o[1],o=a;break}if(o&&i.label<o[2]){i.label=o[2],i.ops.push(a);break}o[2]&&i.ops.pop(),i.trys.pop();continue}a=t.call(e,i)}catch(e){a=[6,e],r=0}finally{n=o=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}([a,u])}}};function a(e){return new Promise(function(t,n){e.onload=t,e.onerror=n,document.head.appendChild(e)})}Object.defineProperty(t,"__esModule",{value:!0}),t.fetchBootConfigAsync=function(){return r(this,void 0,void 0,function(){return o(this,function(e){switch(e.label){case 0:return[4,fetch("_framework/blazor.boot.json",{method:"Get",credentials:"include"})];case 1:return[2,e.sent().json()]}})})},t.loadEmbeddedResourcesAsync=function(e){var t=e.cssReferences.map(function(e){var t=document.createElement("link");return t.rel="stylesheet",t.href=e,a(t)}),n=e.jsReferences.map(function(e){var t=document.createElement("script");return t.src=e,a(t)});return Promise.all(t.concat(n))},t.shouldAutoStart=function(){return!(!document||!document.currentScript||"false"===document.currentScript.getAttribute("autostart"))}},,,,,,,,,,,function(e,t,n){"use strict";var r=this&&this.__awaiter||function(e,t,n,r){return new(n||(n=Promise))(function(o,a){function i(e){try{l(r.next(e))}catch(e){a(e)}}function u(e){try{l(r.throw(e))}catch(e){a(e)}}function l(e){e.done?o(e.value):new n(function(t){t(e.value)}).then(i,u)}l((r=r.apply(e,t||[])).next())})},o=this&&this.__generator||function(e,t){var n,r,o,a,i={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return a={next:u(0),throw:u(1),return:u(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function u(a){return function(u){return function(a){if(n)throw new TypeError("Generator is already executing.");for(;i;)try{if(n=1,r&&(o=2&a[0]?r.return:a[0]?r.throw||((o=r.return)&&o.call(r),0):r.next)&&!(o=o.call(r,a[1])).done)return o;switch(r=0,o&&(a=[2&a[0],o.value]),a[0]){case 0:case 1:o=a;break;case 4:return i.label++,{value:a[1],done:!1};case 5:i.label++,r=a[1],a=[0];continue;case 7:a=i.ops.pop(),i.trys.pop();continue;default:if(!(o=(o=i.trys).length>0&&o[o.length-1])&&(6===a[0]||2===a[0])){i=0;continue}if(3===a[0]&&(!o||a[1]>o[0]&&a[1]<o[3])){i.label=a[1];break}if(6===a[0]&&i.label<o[1]){i.label=o[1],o=a;break}if(o&&i.label<o[2]){i.label=o[2],i.ops.push(a);break}o[2]&&i.ops.pop(),i.trys.pop();continue}a=t.call(e,i)}catch(e){a=[6,e],r=0}finally{n=o=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}([a,u])}}};Object.defineProperty(t,"__esModule",{value:!0}),n(17),n(24);var a=n(9),i=n(46),u=n(33),l=n(5),s=n(48),c=n(34),f=n(18),d=!1;function p(e){return r(this,void 0,void 0,function(){var e,t,n,p,m,h,v=this;return o(this,function(y){switch(y.label){case 0:if(d)throw new Error("Blazor has already started.");return d=!0,f.setEventDispatcher(function(e,t){return DotNet.invokeMethodAsync("Microsoft.AspNetCore.Blazor","DispatchEvent",e,JSON.stringify(t))}),e=a.setPlatform(i.monoPlatform),window.Blazor.platform=e,window.Blazor._internal.renderBatch=function(e,t){l.renderBatch(e,new s.SharedMemoryRenderBatch(t))},window.Blazor._internal.navigationManager.listenForNavigationEvents(function(e,t){return r(v,void 0,void 0,function(){return o(this,function(n){switch(n.label){case 0:return[4,DotNet.invokeMethodAsync("Microsoft.AspNetCore.Blazor","NotifyLocationChanged",e,t)];case 1:return n.sent(),[2]}})})}),[4,c.fetchBootConfigAsync()];case 1:t=y.sent(),n=c.loadEmbeddedResourcesAsync(t),t.linkerEnabled||console.info("Blazor is running in dev mode without IL stripping. To make the bundle size significantly smaller, publish the application or see https://go.microsoft.com/fwlink/?linkid=870414"),p=[t.main].concat(t.assemblyReferences).map(function(e){return"_framework/_bin/"+e}),y.label=2;case 2:return y.trys.push([2,4,,5]),[4,e.start(p)];case 3:return y.sent(),[3,5];case 4:throw m=y.sent(),new Error("Failed to start platform. Reason: "+m);case 5:return[4,n];case 6:return y.sent(),h=u.getAssemblyNameFromUrl(t.main),e.callEntryPoint(h,t.entryPoint,[]),[2]}})})}window.Blazor.start=p,c.shouldAutoStart()&&p()},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r,o,a,i,u,l,s=n(33),c=n(47),f={},d={},p={},m="appBinDir",h=Math.pow(2,32),v=Math.pow(2,21)-1;function y(e,t,n){var a="["+e+"]"+t+"."+n,i=d[a];if(!i){if(!(i=o(function(e){var t=f[e];if(!t){if(!(t=r(e)))throw new Error('Could not find assembly "'+e+'"');f[e]=t}return t}(e),t,n)))throw new Error('Could not find type "'+n+'" in namespace "'+t+'" in assembly "'+e+'"');d[a]=i}return i}function g(e,t,n,r){var o="["+e+"]"+t+"."+n+"::"+r,i=p[o];if(!i){if(!(i=a(y(e,t,n),r,-1)))throw new Error('Could not find method "'+r+'" on type "'+t+"."+n+'"');p[o]=i}return i}t.monoPlatform={start:function(e){return new Promise(function(n,f){c.attachDebuggerHotkey(e),window.Browser={init:function(){}},window.Module=function(e,n,f){var d={},p=["DEBUGGING ENABLED"];return d.print=function(e){return p.indexOf(e)<0&&console.log("WASM: "+e)},d.printErr=function(e){return console.error("WASM: "+e)},d.preRun=[],d.postRun=[],d.preloadPlugins=[],d.locateFile=function(e){switch(e){case"mono.wasm":return"_framework/wasm/mono.wasm";default:return e}},d.preRun.push(function(){var t=Module.cwrap("mono_wasm_add_assembly",null,["string","number","number"]);r=Module.cwrap("mono_wasm_assembly_load","number",["string"]),o=Module.cwrap("mono_wasm_assembly_find_class","number",["number","string","string"]),a=Module.cwrap("mono_wasm_assembly_find_method","number",["number","string","number"]),i=Module.cwrap("mono_wasm_invoke_method","number",["number","number","number"]),u=Module.cwrap("mono_wasm_string_get_utf8","number",["number"]),l=Module.cwrap("mono_wasm_string_from_js","number",["string"]),MONO.loaded_files=[],e.forEach(function(e){var n=s.getFileNameFromUrl(e),r="blazor:"+n;addRunDependency(r),function(e){return new Promise(function(t,n){var r=new XMLHttpRequest;r.open("GET",e,!0),r.responseType="arraybuffer",r.onload=function(){if(200==r.status||0==r.status&&r.response){var e=new Uint8Array(r.response);t(e)}else n(r)},r.onerror=n,r.send(void 0)})}(e).then(function(o){var a,i=Module._malloc(o.length);new Uint8Array(Module.HEAPU8.buffer,i,o.length).set(o),t(n,i,o.length),MONO.loaded_files.push((a=e,b.href=a,b.href)),removeRunDependency(r)},function(e){e instanceof XMLHttpRequest&&404===e.status&&n.match(/\.pdb$/)||f(e),removeRunDependency(r)})})}),d.postRun.push(function(){var e,r,o;MONO.mono_wasm_setenv("MONO_URI_DOTNETRELATIVEORABSOLUTE","true"),Module.cwrap("mono_wasm_load_runtime",null,["string","number"])(m,c.hasDebuggingEnabled()?1:0),MONO.mono_wasm_runtime_is_ready=!0,e=g("Mono.WebAssembly.Interop","Mono.WebAssembly.Interop","MonoWebAssemblyJSRuntime","InvokeDotNet"),r=g("Mono.WebAssembly.Interop","Mono.WebAssembly.Interop","MonoWebAssemblyJSRuntime","BeginInvokeDotNet"),o=g("Mono.WebAssembly.Interop","Mono.WebAssembly.Interop","MonoWebAssemblyJSRuntime","EndInvokeJS"),DotNet.attachDispatcher({beginInvokeDotNetFromJS:function(e,n,o,a,i){if(!a&&!n)throw new Error("Either assemblyName or dotNetObjectId must have a non null value.");var u=a?a.toString():n;t.monoPlatform.callMethod(r,null,[e?t.monoPlatform.toDotNetString(e.toString()):null,t.monoPlatform.toDotNetString(u),t.monoPlatform.toDotNetString(o),t.monoPlatform.toDotNetString(i)])},endInvokeJSFromDotNet:function(e,n,r){t.monoPlatform.callMethod(o,null,[t.monoPlatform.toDotNetString(r)])},invokeDotNetFromJS:function(n,r,o,a){var i=t.monoPlatform.callMethod(e,null,[n?t.monoPlatform.toDotNetString(n):null,t.monoPlatform.toDotNetString(r),o?t.monoPlatform.toDotNetString(o.toString()):null,t.monoPlatform.toDotNetString(a)]);return i?t.monoPlatform.toJavaScriptString(i):null}}),n()}),d}(e,n,f),function(){if("undefined"==typeof WebAssembly||!WebAssembly.validate)throw new Error("This browser does not support WebAssembly.");var e=document.createElement("script");e.src="_framework/wasm/mono.js",e.defer=!0,document.body.appendChild(e)}()})},findMethod:g,callEntryPoint:function(e,n,r){var o=n.split("::");if(2!=o.length)throw new Error("Malformed entry point method name; could not resolve class name and method name.");var a=o[0],i=o[1],u=a.lastIndexOf("."),l=u>-1?a.substring(0,u):"",s=u>-1?a.substring(u+1):a,c=t.monoPlatform.findMethod(e,l,s,i);t.monoPlatform.callMethod(c,null,r)},callMethod:function(e,n,r){if(r.length>4)throw new Error("Currently, MonoPlatform supports passing a maximum of 4 arguments from JS to .NET. You tried to pass "+r.length+".");var o=Module.stackSave();try{for(var a=Module.stackAlloc(r.length),u=Module.stackAlloc(4),l=0;l<r.length;++l)Module.setValue(a+4*l,r[l],"i32");Module.setValue(u,0,"i32");var s=i(e,n,a,u);if(0!==Module.getValue(u,"i32"))throw new Error(t.monoPlatform.toJavaScriptString(s));return s}finally{Module.stackRestore(o)}},toJavaScriptString:function(e){var t=u(e),n=Module.UTF8ToString(t);return Module._free(t),n},toDotNetString:function(e){return l(e)},toUint8Array:function(e){var t=w(e),n=Module.getValue(t,"i32");return new Uint8Array(Module.HEAPU8.buffer,t+4,n)},getArrayLength:function(e){return Module.getValue(w(e),"i32")},getArrayEntryPtr:function(e,t,n){return w(e)+4+t*n},getObjectFieldsBaseAddress:function(e){return e+8},readInt16Field:function(e,t){return Module.getValue(e+(t||0),"i16")},readInt32Field:function(e,t){return Module.getValue(e+(t||0),"i32")},readUint64Field:function(e,t){var n=e+(t||0)>>2,r=Module.HEAPU32[n+1];if(r>v)throw new Error("Cannot read uint64 with high order part "+r+", because the result would exceed Number.MAX_SAFE_INTEGER.");return r*h+Module.HEAPU32[n]},readFloatField:function(e,t){return Module.getValue(e+(t||0),"float")},readObjectField:function(e,t){return Module.getValue(e+(t||0),"i32")},readStringField:function(e,n){var r=Module.getValue(e+(n||0),"i32");return 0===r?null:t.monoPlatform.toJavaScriptString(r)},readStructField:function(e,t){return e+(t||0)}};var b=document.createElement("a");function w(e){return e+12}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(33),o=window.chrome&&navigator.userAgent.indexOf("Edge")<0,a=!1;function i(){return a&&o}t.hasDebuggingEnabled=i,t.attachDebuggerHotkey=function(e){a=e.some(function(e){return/\.pdb$/.test(r.getFileNameFromUrl(e))});var t=navigator.platform.match(/^Mac/i)?"Cmd":"Alt";i()&&console.info("Debugging hotkey: Shift+"+t+"+D (when application has focus)"),document.addEventListener("keydown",function(e){var t;e.shiftKey&&(e.metaKey||e.altKey)&&"KeyD"===e.code&&(a?o?((t=document.createElement("a")).href="_framework/debug?url="+encodeURIComponent(location.href),t.target="_blank",t.rel="noopener noreferrer",t.click()):console.error("Currently, only Chrome is supported for debugging."):console.error("Cannot start debugging, because the application was not compiled with debugging enabled."))})}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(9),o=function(){function e(e){this.batchAddress=e,this.arrayRangeReader=a,this.arrayBuilderSegmentReader=i,this.diffReader=u,this.editReader=l,this.frameReader=s}return e.prototype.updatedComponents=function(){return r.platform.readStructField(this.batchAddress,0)},e.prototype.referenceFrames=function(){return r.platform.readStructField(this.batchAddress,a.structLength)},e.prototype.disposedComponentIds=function(){return r.platform.readStructField(this.batchAddress,2*a.structLength)},e.prototype.disposedEventHandlerIds=function(){return r.platform.readStructField(this.batchAddress,3*a.structLength)},e.prototype.updatedComponentsEntry=function(e,t){return c(e,t,u.structLength)},e.prototype.referenceFramesEntry=function(e,t){return c(e,t,s.structLength)},e.prototype.disposedComponentIdsEntry=function(e,t){var n=c(e,t,4);return r.platform.readInt32Field(n)},e.prototype.disposedEventHandlerIdsEntry=function(e,t){var n=c(e,t,8);return r.platform.readUint64Field(n)},e}();t.SharedMemoryRenderBatch=o;var a={structLength:8,values:function(e){return r.platform.readObjectField(e,0)},count:function(e){return r.platform.readInt32Field(e,4)}},i={structLength:12,values:function(e){var t=r.platform.readObjectField(e,0),n=r.platform.getObjectFieldsBaseAddress(t);return r.platform.readObjectField(n,0)},offset:function(e){return r.platform.readInt32Field(e,4)},count:function(e){return r.platform.readInt32Field(e,8)}},u={structLength:4+i.structLength,componentId:function(e){return r.platform.readInt32Field(e,0)},edits:function(e){return r.platform.readStructField(e,4)},editsEntry:function(e,t){return c(e,t,l.structLength)}},l={structLength:20,editType:function(e){return r.platform.readInt32Field(e,0)},siblingIndex:function(e){return r.platform.readInt32Field(e,4)},newTreeIndex:function(e){return r.platform.readInt32Field(e,8)},moveToSiblingIndex:function(e){return r.platform.readInt32Field(e,8)},removedAttributeName:function(e){return r.platform.readStringField(e,16)}},s={structLength:36,frameType:function(e){return r.platform.readInt16Field(e,4)},subtreeLength:function(e){return r.platform.readInt32Field(e,8)},elementReferenceCaptureId:function(e){return r.platform.readStringField(e,16)},componentId:function(e){return r.platform.readInt32Field(e,12)},elementName:function(e){return r.platform.readStringField(e,16)},textContent:function(e){return r.platform.readStringField(e,16)},markupContent:function(e){return r.platform.readStringField(e,16)},attributeName:function(e){return r.platform.readStringField(e,16)},attributeValue:function(e){return r.platform.readStringField(e,24)},attributeEventHandlerId:function(e){return r.platform.readUint64Field(e,8)}};function c(e,t,n){return r.platform.getArrayEntryPtr(e,t,n)}}]);
\ No newline at end of file
diff --git a/src/Components/Web.JS/package.json b/src/Components/Web.JS/package.json
index 327aaaafea..ca36ee9808 100644
--- a/src/Components/Web.JS/package.json
+++ b/src/Components/Web.JS/package.json
@@ -16,7 +16,7 @@
   "devDependencies": {
     "@aspnet/signalr": "link:../../SignalR/clients/ts/signalr",
     "@aspnet/signalr-protocol-msgpack": "link:../../SignalR/clients/ts/signalr-protocol-msgpack",
-    "@dotnet/jsinterop": "https://dotnet.myget.org/F/aspnetcore-dev/npm/@dotnet/jsinterop/-/@dotnet/jsinterop-3.0.0-preview8.19367.2.tgz",
+    "@dotnet/jsinterop": "https://dotnet.myget.org/F/aspnetcore-dev/npm/@dotnet/jsinterop/-/@dotnet/jsinterop-3.0.0-preview9.19415.3.tgz",
     "@types/emscripten": "0.0.31",
     "@types/jest": "^24.0.6",
     "@types/jsdom": "11.0.6",
diff --git a/src/Components/Web.JS/src/Boot.Server.ts b/src/Components/Web.JS/src/Boot.Server.ts
index d60891c8dc..dc2c8a0ae4 100644
--- a/src/Components/Web.JS/src/Boot.Server.ts
+++ b/src/Components/Web.JS/src/Boot.Server.ts
@@ -6,10 +6,11 @@ import { shouldAutoStart } from './BootCommon';
 import { RenderQueue } from './Platform/Circuits/RenderQueue';
 import { ConsoleLogger } from './Platform/Logging/Loggers';
 import { LogLevel, Logger } from './Platform/Logging/Logger';
-import { startCircuit } from './Platform/Circuits/CircuitManager';
+import { discoverComponents, CircuitDescriptor } from './Platform/Circuits/CircuitManager';
 import { setEventDispatcher } from './Rendering/RendererEventDispatcher';
 import { resolveOptions, BlazorOptions } from './Platform/Circuits/BlazorOptions';
 import { DefaultReconnectionHandler } from './Platform/Circuits/DefaultReconnectionHandler';
+import { attachRootComponentToLogicalElement } from './Rendering/Renderer';
 
 let renderingFailed = false;
 let started = false;
@@ -27,8 +28,15 @@ async function boot(userOptions?: Partial<BlazorOptions>): Promise<void> {
   options.reconnectionHandler = options.reconnectionHandler || window['Blazor'].defaultReconnectionHandler;
   logger.log(LogLevel.Information, 'Starting up blazor server-side application.');
 
-  const initialConnection = await initializeConnection(options, logger);
-  const circuit = await startCircuit(initialConnection);
+  const components = discoverComponents(document);
+  const circuit = new CircuitDescriptor(components);
+
+  const initialConnection = await initializeConnection(options, logger, circuit);
+  const circuitStarted = await circuit.startCircuit(initialConnection);
+  if (!circuitStarted) {
+    logger.log(LogLevel.Error, 'Failed to start the circuit.');
+    return;
+  }
 
   const reconnect = async (existingConnection?: signalR.HubConnection): Promise<boolean> => {
     if (renderingFailed) {
@@ -36,7 +44,7 @@ async function boot(userOptions?: Partial<BlazorOptions>): Promise<void> {
       return false;
     }
 
-    const reconnection = existingConnection || await initializeConnection(options, logger);
+    const reconnection = existingConnection || await initializeConnection(options, logger, circuit);
     if (!(await circuit.reconnect(reconnection))) {
       logger.log(LogLevel.Information, 'Reconnection attempt to the circuit was rejected by the server. This may indicate that the associated state is no longer available on the server.');
       return false;
@@ -51,7 +59,8 @@ async function boot(userOptions?: Partial<BlazorOptions>): Promise<void> {
     'unload',
     () => {
       const data = new FormData();
-      data.set('circuitId', circuit.circuitId);
+      const circuitId = circuit.circuitId!;
+      data.append('circuitId', circuitId);
       navigator.sendBeacon('_blazor/disconnect', data);
     },
     false
@@ -62,7 +71,7 @@ async function boot(userOptions?: Partial<BlazorOptions>): Promise<void> {
   logger.log(LogLevel.Information, 'Blazor server-side application started.');
 }
 
-async function initializeConnection(options: BlazorOptions, logger: Logger): Promise<signalR.HubConnection> {
+async function initializeConnection(options: BlazorOptions, logger: Logger, circuit: CircuitDescriptor): Promise<signalR.HubConnection> {
   const hubProtocol = new MessagePackHubProtocol();
   (hubProtocol as unknown as { name: string }).name = 'blazorpack';
 
@@ -83,10 +92,11 @@ async function initializeConnection(options: BlazorOptions, logger: Logger): Pro
     return connection.send('OnLocationChanged', uri, intercepted);
   });
 
+  connection.on('JS.AttachComponent', (componentId, selector) => attachRootComponentToLogicalElement(0, circuit.resolveElement(selector), componentId));
   connection.on('JS.BeginInvokeJS', DotNet.jsCallDispatcher.beginInvokeJSFromDotNet);
   connection.on('JS.EndInvokeDotNet', (args: string) => DotNet.jsCallDispatcher.endInvokeDotNetFromJS(...(JSON.parse(args) as [string, boolean, unknown])));
 
-  const renderQueue = new RenderQueue(/* renderer ID unused with remote renderer */ 0, logger);
+  const renderQueue = RenderQueue.getOrCreate(logger);
   connection.on('JS.RenderBatch', (batchId: number, batchData: Uint8Array) => {
     logger.log(LogLevel.Debug, `Received render batch with id ${batchId} and ${batchData.byteLength} bytes.`);
     renderQueue.processBatch(batchId, batchData, connection);
diff --git a/src/Components/Web.JS/src/Platform/Circuits/CircuitManager.ts b/src/Components/Web.JS/src/Platform/Circuits/CircuitManager.ts
index c99ec42f08..83cb767b83 100644
--- a/src/Components/Web.JS/src/Platform/Circuits/CircuitManager.ts
+++ b/src/Components/Web.JS/src/Platform/Circuits/CircuitManager.ts
@@ -1,22 +1,274 @@
 import { internalFunctions as navigationManagerFunctions } from '../../Services/NavigationManager';
+import { toLogicalRootCommentElement, LogicalElement } from '../../Rendering/LogicalElements';
 
 export class CircuitDescriptor {
-  public circuitId: string;
+  public circuitId?: string;
 
-  public constructor(circuitId: string) {
-    this.circuitId = circuitId;
+  public components: ComponentDescriptor[];
+
+  public constructor(components: ComponentDescriptor[]) {
+    this.circuitId = undefined;
+    this.components = components;
   }
 
   public reconnect(reconnection: signalR.HubConnection): Promise<boolean> {
+    if (!this.circuitId) {
+      throw new Error('Circuit host not initialized.');
+    }
+
     return reconnection.invoke<boolean>('ConnectCircuit', this.circuitId);
   }
+
+  public initialize(circuitId: string): void {
+    if (this.circuitId) {
+      throw new Error(`Circuit host '${this.circuitId}' already initialized.`);
+    }
+
+    this.circuitId = circuitId;
+  }
+
+  public async startCircuit(connection: signalR.HubConnection): Promise<boolean> {
+
+    const result = await connection.invoke<string>(
+      'StartCircuit',
+      navigationManagerFunctions.getBaseURI(),
+      navigationManagerFunctions.getLocationHref(),
+      JSON.stringify(this.components.map(c => c.toRecord()))
+    );
+
+    if (result) {
+      this.initialize(result);
+      return true;
+    } else {
+      return false;
+    }
+  }
+
+  public resolveElement(sequence: string): LogicalElement {
+    const parsedSequence = Number.parseInt(sequence);
+    if (!Number.isNaN(parsedSequence)) {
+      return toLogicalRootCommentElement(this.components[parsedSequence].start as Comment, this.components[parsedSequence].end as Comment);
+    } else {
+      throw new Error(`Invalid sequence number '${sequence}'.`);
+    }
+  }
 }
 
-export async function startCircuit(connection: signalR.HubConnection): Promise<CircuitDescriptor> {
-  const result = await connection.invoke<string>('StartCircuit', navigationManagerFunctions.getBaseURI(), navigationManagerFunctions.getLocationHref());
-  if (result) {
-    return new CircuitDescriptor(result);
-  } else {
-    throw new Error('Circuit failed to start');
+interface ComponentMarker {
+  type: string;
+  sequence: number;
+  descriptor: string;
+}
+
+export class ComponentDescriptor {
+  public type: string;
+
+  public start: Node;
+
+  public end?: Node;
+
+  public sequence: number;
+
+  public descriptor: string;
+
+  public constructor(type: string, start: Node, end: Node | undefined, sequence: number, descriptor: string) {
+    this.type = type;
+    this.start = start;
+    this.end = end;
+    this.sequence = sequence;
+    this.descriptor = descriptor;
+  }
+
+  public toRecord(): ComponentMarker {
+    const result = { type: this.type, sequence: this.sequence, descriptor: this.descriptor };
+    return result;
   }
 }
+
+export function discoverComponents(document: Document): ComponentDescriptor[] {
+  const componentComments = resolveComponentComments(document);
+  const discoveredComponents: ComponentDescriptor[] = [];
+  for (let i = 0; i < componentComments.length; i++) {
+    const componentComment = componentComments[i];
+    const entry = new ComponentDescriptor(
+      componentComment.type,
+      componentComment.start,
+      componentComment.end,
+      componentComment.sequence,
+      componentComment.descriptor,
+    );
+
+    discoveredComponents.push(entry);
+  }
+
+  return discoveredComponents;
+}
+
+
+interface ComponentComment {
+  type: 'server';
+  sequence: number;
+  descriptor: string;
+  start: Node;
+  end?: Node;
+  prerenderId?: string;
+}
+
+function resolveComponentComments(node: Node): ComponentComment[] {
+  if (!node.hasChildNodes()) {
+    return [];
+  }
+
+  const result: ComponentComment[] = [];
+  const childNodeIterator = new ComponentCommentIterator(node.childNodes);
+  while (childNodeIterator.next() && childNodeIterator.currentElement) {
+    const componentComment = getComponentComment(childNodeIterator);
+    if (componentComment) {
+      result.push(componentComment);
+    } else {
+      const childResults = resolveComponentComments(childNodeIterator.currentElement);
+      for (let j = 0; j < childResults.length; j++) {
+        const childResult = childResults[j];
+        result.push(childResult);
+      }
+    }
+  }
+
+  return result;
+}
+
+const blazorCommentRegularExpression = /\W*Blazor:[^{]*(.*)$/;
+
+function getComponentComment(commentNodeIterator: ComponentCommentIterator): ComponentComment | undefined {
+  const candidateStart = commentNodeIterator.currentElement;
+
+  if (!candidateStart || candidateStart.nodeType !== Node.COMMENT_NODE) {
+    return;
+  }
+  if (candidateStart.textContent) {
+    const componentStartComment = new RegExp(blazorCommentRegularExpression);
+    const definition = componentStartComment.exec(candidateStart.textContent);
+    const json = definition && definition[1];
+
+    if (json) {
+      try {
+        return createComponentComment(json, candidateStart, commentNodeIterator);
+      } catch (error) {
+        throw new Error(`Found malformed component comment at ${candidateStart.textContent}`);
+      }
+    } else {
+      return;
+    }
+  }
+}
+
+function createComponentComment(json: string, start: Node, iterator: ComponentCommentIterator): ComponentComment {
+  const payload = JSON.parse(json) as ComponentComment;
+  const { type, sequence, descriptor, prerenderId } = payload;
+  if (type !== 'server') {
+    throw new Error(`Invalid component type '${type}'.`);
+  }
+
+  if (!descriptor) {
+    throw new Error('descriptor must be defined when using a descriptor.');
+  }
+
+  if (sequence === undefined) {
+    throw new Error('sequence must be defined when using a descriptor.');
+  }
+
+  if (!Number.isInteger(sequence)) {
+    throw new Error(`Error parsing the sequence '${sequence}' for component '${json}'`);
+  }
+
+  if (!prerenderId) {
+    return {
+      type,
+      sequence: sequence,
+      descriptor,
+      start,
+    };
+  } else {
+    const end = getComponentEndComment(prerenderId, iterator);
+    if (!end) {
+      throw new Error(`Could not find an end component comment for '${start}'`);
+    }
+
+    return {
+      type,
+      sequence,
+      descriptor,
+      start,
+      prerenderId,
+      end,
+    };
+  }
+}
+
+function getComponentEndComment(prerenderedId: string, iterator: ComponentCommentIterator): ChildNode | undefined {
+  while (iterator.next() && iterator.currentElement) {
+    const node = iterator.currentElement;
+    if (node.nodeType !== Node.COMMENT_NODE) {
+      continue;
+    }
+    if (!node.textContent) {
+      continue;
+    }
+
+    const definition = new RegExp(blazorCommentRegularExpression).exec(node.textContent);
+    const json = definition && definition[1];
+    if (!json) {
+      continue;
+    }
+
+    validateEndComponentPayload(json, prerenderedId);
+
+    return node;
+  }
+
+  return undefined;
+}
+
+function validateEndComponentPayload(json: string, prerenderedId: string): void {
+  const payload = JSON.parse(json) as ComponentComment;
+  if (Object.keys(payload).length !== 1) {
+    throw new Error(`Invalid end of component comment: '${json}'`);
+  }
+  const prerenderedEndId = payload.prerenderId;
+  if (!prerenderedEndId) {
+    throw new Error(`End of component comment must have a value for the prerendered property: '${json}'`);
+  }
+  if (prerenderedEndId !== prerenderedId) {
+    throw new Error(`End of component comment prerendered property must match the start comment prerender id: '${prerenderedId}', '${prerenderedEndId}'`);
+  }
+}
+
+class ComponentCommentIterator {
+
+  private childNodes: NodeListOf<ChildNode>;
+
+  private currentIndex: number;
+
+  private length: number;
+
+  public currentElement: ChildNode | undefined;
+
+  public constructor(childNodes: NodeListOf<ChildNode>) {
+    this.childNodes = childNodes;
+    this.currentIndex = -1;
+    this.length = childNodes.length;
+  }
+
+  public next(): boolean {
+    this.currentIndex++;
+    if (this.currentIndex < this.length) {
+      this.currentElement = this.childNodes[this.currentIndex];
+      return true;
+    } else {
+      this.currentElement = undefined;
+      return false;
+    }
+  }
+}
+
+
diff --git a/src/Components/Web.JS/src/Platform/Circuits/DefaultReconnectDisplay.ts b/src/Components/Web.JS/src/Platform/Circuits/DefaultReconnectDisplay.ts
index ee3706bf7c..b8f755d8ac 100644
--- a/src/Components/Web.JS/src/Platform/Circuits/DefaultReconnectDisplay.ts
+++ b/src/Components/Web.JS/src/Platform/Circuits/DefaultReconnectDisplay.ts
@@ -77,11 +77,13 @@ export class DefaultReconnectDisplay implements ReconnectDisplay {
     this.button.style.display = 'block';
     this.reloadParagraph.style.display = 'none';
     this.message.innerHTML = 'Reconnection failed. Try <a href>reloading</a> the page if you\'re unable to reconnect.';
+    this.message.querySelector('a')!.addEventListener('click', () => location.reload());
   }
 
   rejected(): void {
     this.button.style.display = 'none';
     this.reloadParagraph.style.display = 'none';
     this.message.innerHTML = 'Could not reconnect to the server. <a href>Reload</a> the page to restore functionality.';
+    this.message.querySelector('a')!.addEventListener('click', () => location.reload());
   }
 }
diff --git a/src/Components/Web.JS/src/Platform/Circuits/RenderQueue.ts b/src/Components/Web.JS/src/Platform/Circuits/RenderQueue.ts
index 24c22a09ee..311df1b43e 100644
--- a/src/Components/Web.JS/src/Platform/Circuits/RenderQueue.ts
+++ b/src/Components/Web.JS/src/Platform/Circuits/RenderQueue.ts
@@ -4,6 +4,8 @@ import { Logger, LogLevel } from '../Logging/Logger';
 import { HubConnection } from '@aspnet/signalr';
 
 export class RenderQueue {
+  private static instance: RenderQueue;
+
   private nextBatchId = 2;
 
   private fatalError?: string;
@@ -17,6 +19,14 @@ export class RenderQueue {
     this.logger = logger;
   }
 
+  public static getOrCreate(logger: Logger): RenderQueue {
+    if (!RenderQueue.instance) {
+      RenderQueue.instance = new RenderQueue(0, logger);
+    }
+
+    return this.instance;
+  }
+
   public async processBatch(receivedBatchId: number, batchData: Uint8Array, connection: HubConnection): Promise<void> {
     if (receivedBatchId < this.nextBatchId) {
       // SignalR delivers messages in order, but it does not guarantee that the message gets delivered.
diff --git a/src/Components/Web.JS/src/Platform/Circuits/UserSpecifiedDisplay.ts b/src/Components/Web.JS/src/Platform/Circuits/UserSpecifiedDisplay.ts
index 28a2ae6bf4..30f08d2833 100644
--- a/src/Components/Web.JS/src/Platform/Circuits/UserSpecifiedDisplay.ts
+++ b/src/Components/Web.JS/src/Platform/Circuits/UserSpecifiedDisplay.ts
@@ -6,7 +6,7 @@ export class UserSpecifiedDisplay implements ReconnectDisplay {
 
   static readonly FailedClassName = 'components-reconnect-failed';
 
-  static readonly RefusedClassName = 'components-reconnect-refused';
+  static readonly RejectedClassName = 'components-reconnect-rejected';
 
   constructor(private dialog: HTMLElement) {
   }
@@ -25,13 +25,13 @@ export class UserSpecifiedDisplay implements ReconnectDisplay {
     this.removeClasses();
     this.dialog.classList.add(UserSpecifiedDisplay.FailedClassName);
   }
-  
+
   rejected(): void {
     this.removeClasses();
-    this.dialog.classList.add(UserSpecifiedDisplay.RefusedClassName);
+    this.dialog.classList.add(UserSpecifiedDisplay.RejectedClassName);
   }
 
   private removeClasses() {
-    this.dialog.classList.remove(UserSpecifiedDisplay.ShowClassName, UserSpecifiedDisplay.HideClassName, UserSpecifiedDisplay.FailedClassName, UserSpecifiedDisplay.RefusedClassName);
+    this.dialog.classList.remove(UserSpecifiedDisplay.ShowClassName, UserSpecifiedDisplay.HideClassName, UserSpecifiedDisplay.FailedClassName, UserSpecifiedDisplay.RejectedClassName);
   }
 }
diff --git a/src/Components/Web.JS/src/Rendering/LogicalElements.ts b/src/Components/Web.JS/src/Rendering/LogicalElements.ts
index dee2e78e25..577c815f58 100644
--- a/src/Components/Web.JS/src/Rendering/LogicalElements.ts
+++ b/src/Components/Web.JS/src/Rendering/LogicalElements.ts
@@ -46,7 +46,7 @@ export function toLogicalRootCommentElement(start: Comment, end: Comment): Logic
   // |- *div
   // |- *component
   // |- *footer
-  if (!start.parentNode){
+  if (!start.parentNode) {
     throw new Error(`Comment not connected to the DOM ${start.textContent}`);
   }
 
@@ -55,8 +55,11 @@ export function toLogicalRootCommentElement(start: Comment, end: Comment): Logic
   const children = getLogicalChildrenArray(parentLogicalElement);
   Array.from(parent.childNodes).forEach(n => children.push(n as unknown as LogicalElement));
   start[logicalParentPropname] = parentLogicalElement;
-  start[logicalEndSiblingPropname] = end;
-  toLogicalElement(end, /* allowExistingcontents */ true);
+  // We might not have an end comment in the case of non-prerendered components.
+  if (end) {
+    start[logicalEndSiblingPropname] = end;
+    toLogicalElement(end, /* allowExistingcontents */ true);
+  }
   return toLogicalElement(start, /* allowExistingContents */ true);
 }
 
diff --git a/src/Components/Web.JS/src/Services/NavigationManager.ts b/src/Components/Web.JS/src/Services/NavigationManager.ts
index 3da8d11bef..357729ee97 100644
--- a/src/Components/Web.JS/src/Services/NavigationManager.ts
+++ b/src/Components/Web.JS/src/Services/NavigationManager.ts
@@ -17,12 +17,12 @@ export const internalFunctions = {
 };
 
 function listenForNavigationEvents(callback: (uri: string, intercepted: boolean) => Promise<void>) {
+  notifyLocationChangedCallback = callback;
+
   if (hasRegisteredNavigationEventListeners) {
     return;
   }
 
-  notifyLocationChangedCallback = callback;
-
   hasRegisteredNavigationEventListeners = true;
   window.addEventListener('popstate', () => notifyLocationChanged(false));
 }
diff --git a/src/Components/Web.JS/yarn.lock b/src/Components/Web.JS/yarn.lock
index 48b8058558..6fcffaae8a 100644
--- a/src/Components/Web.JS/yarn.lock
+++ b/src/Components/Web.JS/yarn.lock
@@ -152,9 +152,9 @@
     exec-sh "^0.3.2"
     minimist "^1.2.0"
 
-"@dotnet/jsinterop@https://dotnet.myget.org/F/aspnetcore-dev/npm/@dotnet/jsinterop/-/@dotnet/jsinterop-3.0.0-preview8.19367.2.tgz":
-  version "3.0.0-preview8.19367.2"
-  resolved "https://dotnet.myget.org/F/aspnetcore-dev/npm/@dotnet/jsinterop/-/@dotnet/jsinterop-3.0.0-preview8.19367.2.tgz#885d87c9406ad0bbce878ff041d50342d03b2c86"
+"@dotnet/jsinterop@https://dotnet.myget.org/F/aspnetcore-dev/npm/@dotnet/jsinterop/-/@dotnet/jsinterop-3.0.0-preview9.19415.3.tgz":
+  version "3.0.0-preview9.19415.3"
+  resolved "https://dotnet.myget.org/F/aspnetcore-dev/npm/@dotnet/jsinterop/-/@dotnet/jsinterop-3.0.0-preview9.19415.3.tgz#f44f482897c612e8d174b8f6d8795d2cda75d643"
 
 "@jest/console@^24.7.1":
   version "24.7.1"
diff --git a/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.csproj b/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.csproj
index fc550472b7..cba25041e3 100644
--- a/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.csproj
+++ b/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.csproj
@@ -8,11 +8,13 @@
     <Reference Include="Microsoft.AspNetCore.Components"  />
     <Reference Include="Microsoft.AspNetCore.Components.Forms"  />
     <Reference Include="Microsoft.Extensions.DependencyInjection"  />
+    <Reference Include="Microsoft.JSInterop"  />
   </ItemGroup>
 <ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
     <Compile Include="Microsoft.AspNetCore.Components.Web.netcoreapp.cs" />
     <Reference Include="Microsoft.AspNetCore.Components"  />
     <Reference Include="Microsoft.AspNetCore.Components.Forms"  />
     <Reference Include="Microsoft.Extensions.DependencyInjection"  />
+    <Reference Include="Microsoft.JSInterop"  />
   </ItemGroup>
 </Project>
diff --git a/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.netcoreapp.cs b/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.netcoreapp.cs
index f6a30257c2..191e398a7c 100644
--- a/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.netcoreapp.cs
+++ b/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.netcoreapp.cs
@@ -3,28 +3,6 @@
 
 namespace Microsoft.AspNetCore.Components
 {
-    [Microsoft.AspNetCore.Components.BindElementAttribute("select", null, "value", "onchange")]
-    [Microsoft.AspNetCore.Components.BindElementAttribute("textarea", null, "value", "onchange")]
-    [Microsoft.AspNetCore.Components.BindInputElementAttribute("checkbox", null, "checked", "onchange", false, null)]
-    [Microsoft.AspNetCore.Components.BindInputElementAttribute("date", "value", "value", "onchange", true, "yyyy-MM-dd")]
-    [Microsoft.AspNetCore.Components.BindInputElementAttribute("date", null, "value", "onchange", true, "yyyy-MM-dd")]
-    [Microsoft.AspNetCore.Components.BindInputElementAttribute("number", "value", "value", "onchange", true, null)]
-    [Microsoft.AspNetCore.Components.BindInputElementAttribute("number", null, "value", "onchange", true, null)]
-    [Microsoft.AspNetCore.Components.BindInputElementAttribute("text", null, "value", "onchange", false, null)]
-    [Microsoft.AspNetCore.Components.BindInputElementAttribute(null, "value", "value", "onchange", false, null)]
-    [Microsoft.AspNetCore.Components.BindInputElementAttribute(null, null, "value", "onchange", false, null)]
-    public static partial class BindAttributes
-    {
-    }
-    [System.AttributeUsageAttribute(System.AttributeTargets.Class, AllowMultiple=true, Inherited=true)]
-    public sealed partial class BindElementAttribute : System.Attribute
-    {
-        public BindElementAttribute(string element, string suffix, string valueAttribute, string changeAttribute) { }
-        public string ChangeAttribute { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-        public string Element { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-        public string Suffix { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-        public string ValueAttribute { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-    }
     [System.AttributeUsageAttribute(System.AttributeTargets.Class, AllowMultiple=true, Inherited=true)]
     public sealed partial class BindInputElementAttribute : System.Attribute
     {
@@ -36,250 +14,6 @@ namespace Microsoft.AspNetCore.Components
         public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
         public string ValueAttribute { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
     }
-    public partial class DataTransfer
-    {
-        public DataTransfer() { }
-        public string DropEffect { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string EffectAllowed { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string[] Files { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public Microsoft.AspNetCore.Components.UIDataTransferItem[] Items { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string[] Types { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-    }
-    [System.AttributeUsageAttribute(System.AttributeTargets.Class, AllowMultiple=true, Inherited=true)]
-    public sealed partial class EventHandlerAttribute : System.Attribute
-    {
-        public EventHandlerAttribute(string attributeName, System.Type eventArgsType) { }
-        public string AttributeName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-        public System.Type EventArgsType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-    }
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onabort", typeof(Microsoft.AspNetCore.Components.UIProgressEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onactivate", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onbeforeactivate", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onbeforecopy", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onbeforecut", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onbeforedeactivate", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onbeforepaste", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onblur", typeof(Microsoft.AspNetCore.Components.UIFocusEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncanplay", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncanplaythrough", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onchange", typeof(Microsoft.AspNetCore.Components.ChangeEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onclick", typeof(Microsoft.AspNetCore.Components.UIMouseEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncontextmenu", typeof(Microsoft.AspNetCore.Components.UIMouseEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncopy", typeof(Microsoft.AspNetCore.Components.UIClipboardEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncuechange", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncut", typeof(Microsoft.AspNetCore.Components.UIClipboardEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondblclick", typeof(Microsoft.AspNetCore.Components.UIMouseEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondeactivate", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondrag", typeof(Microsoft.AspNetCore.Components.UIDragEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondragend", typeof(Microsoft.AspNetCore.Components.UIDragEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondragenter", typeof(Microsoft.AspNetCore.Components.UIDragEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondragleave", typeof(Microsoft.AspNetCore.Components.UIDragEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondragover", typeof(Microsoft.AspNetCore.Components.UIDragEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondragstart", typeof(Microsoft.AspNetCore.Components.UIDragEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondrop", typeof(Microsoft.AspNetCore.Components.UIDragEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondurationchange", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onemptied", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onended", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onerror", typeof(Microsoft.AspNetCore.Components.UIErrorEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onfocus", typeof(Microsoft.AspNetCore.Components.UIFocusEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onfocusin", typeof(Microsoft.AspNetCore.Components.UIFocusEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onfocusout", typeof(Microsoft.AspNetCore.Components.UIFocusEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onfullscreenchange", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onfullscreenerror", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ongotpointercapture", typeof(Microsoft.AspNetCore.Components.UIPointerEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oninput", typeof(Microsoft.AspNetCore.Components.ChangeEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oninvalid", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onkeydown", typeof(Microsoft.AspNetCore.Components.UIKeyboardEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onkeypress", typeof(Microsoft.AspNetCore.Components.UIKeyboardEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onkeyup", typeof(Microsoft.AspNetCore.Components.UIKeyboardEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onload", typeof(Microsoft.AspNetCore.Components.UIProgressEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onloadeddata", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onloadedmetadata", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onloadend", typeof(Microsoft.AspNetCore.Components.UIProgressEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onloadstart", typeof(Microsoft.AspNetCore.Components.UIProgressEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onlostpointercapture", typeof(Microsoft.AspNetCore.Components.UIPointerEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmousedown", typeof(Microsoft.AspNetCore.Components.UIMouseEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmousemove", typeof(Microsoft.AspNetCore.Components.UIMouseEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmouseout", typeof(Microsoft.AspNetCore.Components.UIMouseEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmouseover", typeof(Microsoft.AspNetCore.Components.UIMouseEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmouseup", typeof(Microsoft.AspNetCore.Components.UIMouseEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmousewheel", typeof(Microsoft.AspNetCore.Components.UIWheelEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpaste", typeof(Microsoft.AspNetCore.Components.UIClipboardEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpause", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onplay", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onplaying", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointercancel", typeof(Microsoft.AspNetCore.Components.UIPointerEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerdown", typeof(Microsoft.AspNetCore.Components.UIPointerEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerenter", typeof(Microsoft.AspNetCore.Components.UIPointerEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerleave", typeof(Microsoft.AspNetCore.Components.UIPointerEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerlockchange", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerlockerror", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointermove", typeof(Microsoft.AspNetCore.Components.UIPointerEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerout", typeof(Microsoft.AspNetCore.Components.UIPointerEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerover", typeof(Microsoft.AspNetCore.Components.UIPointerEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerup", typeof(Microsoft.AspNetCore.Components.UIPointerEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onprogress", typeof(Microsoft.AspNetCore.Components.UIProgressEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onratechange", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onreadystatechange", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onreset", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onscroll", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onseeked", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onseeking", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onselect", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onselectionchange", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onselectstart", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onstalled", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onstop", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onsubmit", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onsuspend", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontimeout", typeof(Microsoft.AspNetCore.Components.UIProgressEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontimeupdate", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchcancel", typeof(Microsoft.AspNetCore.Components.UITouchEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchend", typeof(Microsoft.AspNetCore.Components.UITouchEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchenter", typeof(Microsoft.AspNetCore.Components.UITouchEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchleave", typeof(Microsoft.AspNetCore.Components.UITouchEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchmove", typeof(Microsoft.AspNetCore.Components.UITouchEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchstart", typeof(Microsoft.AspNetCore.Components.UITouchEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onvolumechange", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onwaiting", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onwheel", typeof(Microsoft.AspNetCore.Components.UIWheelEventArgs))]
-    public static partial class EventHandlers
-    {
-    }
-    public partial class UIClipboardEventArgs : System.EventArgs
-    {
-        public UIClipboardEventArgs() { }
-        public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-    }
-    public partial class UIDataTransferItem
-    {
-        public UIDataTransferItem() { }
-        public string Kind { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-    }
-    public partial class UIDragEventArgs : Microsoft.AspNetCore.Components.UIMouseEventArgs
-    {
-        public UIDragEventArgs() { }
-        public Microsoft.AspNetCore.Components.DataTransfer DataTransfer { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-    }
-    public partial class UIErrorEventArgs : System.EventArgs
-    {
-        public UIErrorEventArgs() { }
-        public int Colno { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string Filename { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public int Lineno { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string Message { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-    }
-    public partial class UIFocusEventArgs : System.EventArgs
-    {
-        public UIFocusEventArgs() { }
-        public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-    }
-    public partial class UIKeyboardEventArgs : System.EventArgs
-    {
-        public UIKeyboardEventArgs() { }
-        public bool AltKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string Code { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public bool CtrlKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string Key { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public float Location { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public bool MetaKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public bool Repeat { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public bool ShiftKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-    }
-    public partial class UIMouseEventArgs : System.EventArgs
-    {
-        public UIMouseEventArgs() { }
-        public bool AltKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public long Button { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public long Buttons { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public double ClientX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public double ClientY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public bool CtrlKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public long Detail { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public bool MetaKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public double ScreenX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public double ScreenY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public bool ShiftKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-    }
-    public partial class UIPointerEventArgs : Microsoft.AspNetCore.Components.UIMouseEventArgs
-    {
-        public UIPointerEventArgs() { }
-        public float Height { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public bool IsPrimary { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public long PointerId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string PointerType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public float Pressure { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public float TiltX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public float TiltY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public float Width { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-    }
-    public partial class UIProgressEventArgs : System.EventArgs
-    {
-        public UIProgressEventArgs() { }
-        public bool LengthComputable { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public long Loaded { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public long Total { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-    }
-    public partial class UITouchEventArgs : System.EventArgs
-    {
-        public UITouchEventArgs() { }
-        public bool AltKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public Microsoft.AspNetCore.Components.UITouchPoint[] ChangedTouches { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public bool CtrlKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public long Detail { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public bool MetaKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public bool ShiftKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public Microsoft.AspNetCore.Components.UITouchPoint[] TargetTouches { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public Microsoft.AspNetCore.Components.UITouchPoint[] Touches { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-    }
-    public partial class UITouchPoint
-    {
-        public UITouchPoint() { }
-        public double ClientX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public double ClientY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public long Identifier { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public double PageX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public double PageY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public double ScreenX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public double ScreenY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-    }
-    public partial class UIWheelEventArgs : Microsoft.AspNetCore.Components.UIMouseEventArgs
-    {
-        public UIWheelEventArgs() { }
-        public long DeltaMode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public double DeltaX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public double DeltaY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public double DeltaZ { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-    }
-    public static partial class WebEventCallbackFactoryUIEventArgsExtensions
-    {
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIClipboardEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.UIClipboardEventArgs> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIDragEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.UIDragEventArgs> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIErrorEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.UIErrorEventArgs> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIFocusEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.UIFocusEventArgs> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIKeyboardEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.UIKeyboardEventArgs> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.UIMouseEventArgs> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIPointerEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.UIPointerEventArgs> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIProgressEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.UIProgressEventArgs> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UITouchEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.UITouchEventArgs> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIWheelEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.UIWheelEventArgs> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIClipboardEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.UIClipboardEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIDragEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.UIDragEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIErrorEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.UIErrorEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIFocusEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.UIFocusEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIKeyboardEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.UIKeyboardEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.UIMouseEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIPointerEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.UIPointerEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIProgressEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.UIProgressEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UITouchEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.UITouchEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIWheelEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.UIWheelEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
-    }
 }
 namespace Microsoft.AspNetCore.Components.Forms
 {
@@ -395,6 +129,17 @@ namespace Microsoft.AspNetCore.Components.Forms
         void System.IDisposable.Dispose() { }
     }
 }
+namespace Microsoft.AspNetCore.Components.RenderTree
+{
+    public sealed partial class WebEventDescriptor
+    {
+        public WebEventDescriptor() { }
+        public int BrowserRendererId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string EventArgsType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public Microsoft.AspNetCore.Components.RenderTree.EventFieldInfo EventFieldInfo { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public ulong EventHandlerId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+}
 namespace Microsoft.AspNetCore.Components.Routing
 {
     public partial class NavLink : Microsoft.AspNetCore.Components.ComponentBase, System.IDisposable
@@ -422,12 +167,254 @@ namespace Microsoft.AspNetCore.Components.Routing
 }
 namespace Microsoft.AspNetCore.Components.Web
 {
-    public sealed partial class WebEventDescriptor
+    [Microsoft.AspNetCore.Components.BindElementAttribute("select", null, "value", "onchange")]
+    [Microsoft.AspNetCore.Components.BindElementAttribute("textarea", null, "value", "onchange")]
+    [Microsoft.AspNetCore.Components.BindInputElementAttribute("checkbox", null, "checked", "onchange", false, null)]
+    [Microsoft.AspNetCore.Components.BindInputElementAttribute("date", "value", "value", "onchange", true, "yyyy-MM-dd")]
+    [Microsoft.AspNetCore.Components.BindInputElementAttribute("date", null, "value", "onchange", true, "yyyy-MM-dd")]
+    [Microsoft.AspNetCore.Components.BindInputElementAttribute("number", "value", "value", "onchange", true, null)]
+    [Microsoft.AspNetCore.Components.BindInputElementAttribute("number", null, "value", "onchange", true, null)]
+    [Microsoft.AspNetCore.Components.BindInputElementAttribute("text", null, "value", "onchange", false, null)]
+    [Microsoft.AspNetCore.Components.BindInputElementAttribute(null, "value", "value", "onchange", false, null)]
+    [Microsoft.AspNetCore.Components.BindInputElementAttribute(null, null, "value", "onchange", false, null)]
+    public static partial class BindAttributes
     {
-        public WebEventDescriptor() { }
-        public int BrowserRendererId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string EventArgsType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public Microsoft.AspNetCore.Components.Rendering.EventFieldInfo EventFieldInfo { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public ulong EventHandlerId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public partial class ClipboardEventArgs : System.EventArgs
+    {
+        public ClipboardEventArgs() { }
+        public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public partial class DataTransfer
+    {
+        public DataTransfer() { }
+        public string DropEffect { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string EffectAllowed { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string[] Files { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public Microsoft.AspNetCore.Components.Web.DataTransferItem[] Items { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string[] Types { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public partial class DataTransferItem
+    {
+        public DataTransferItem() { }
+        public string Kind { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public partial class DragEventArgs : Microsoft.AspNetCore.Components.Web.MouseEventArgs
+    {
+        public DragEventArgs() { }
+        public Microsoft.AspNetCore.Components.Web.DataTransfer DataTransfer { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public partial class ErrorEventArgs : System.EventArgs
+    {
+        public ErrorEventArgs() { }
+        public int Colno { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string Filename { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public int Lineno { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string Message { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onabort", typeof(Microsoft.AspNetCore.Components.Web.ProgressEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onactivate", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onbeforeactivate", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onbeforecopy", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onbeforecut", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onbeforedeactivate", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onbeforepaste", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onblur", typeof(Microsoft.AspNetCore.Components.Web.FocusEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncanplay", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncanplaythrough", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onchange", typeof(Microsoft.AspNetCore.Components.ChangeEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onclick", typeof(Microsoft.AspNetCore.Components.Web.MouseEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncontextmenu", typeof(Microsoft.AspNetCore.Components.Web.MouseEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncopy", typeof(Microsoft.AspNetCore.Components.Web.ClipboardEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncuechange", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncut", typeof(Microsoft.AspNetCore.Components.Web.ClipboardEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondblclick", typeof(Microsoft.AspNetCore.Components.Web.MouseEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondeactivate", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondrag", typeof(Microsoft.AspNetCore.Components.Web.DragEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondragend", typeof(Microsoft.AspNetCore.Components.Web.DragEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondragenter", typeof(Microsoft.AspNetCore.Components.Web.DragEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondragleave", typeof(Microsoft.AspNetCore.Components.Web.DragEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondragover", typeof(Microsoft.AspNetCore.Components.Web.DragEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondragstart", typeof(Microsoft.AspNetCore.Components.Web.DragEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondrop", typeof(Microsoft.AspNetCore.Components.Web.DragEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondurationchange", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onemptied", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onended", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onerror", typeof(Microsoft.AspNetCore.Components.Web.ErrorEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onfocus", typeof(Microsoft.AspNetCore.Components.Web.FocusEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onfocusin", typeof(Microsoft.AspNetCore.Components.Web.FocusEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onfocusout", typeof(Microsoft.AspNetCore.Components.Web.FocusEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onfullscreenchange", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onfullscreenerror", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ongotpointercapture", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oninput", typeof(Microsoft.AspNetCore.Components.ChangeEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oninvalid", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onkeydown", typeof(Microsoft.AspNetCore.Components.Web.KeyboardEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onkeypress", typeof(Microsoft.AspNetCore.Components.Web.KeyboardEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onkeyup", typeof(Microsoft.AspNetCore.Components.Web.KeyboardEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onload", typeof(Microsoft.AspNetCore.Components.Web.ProgressEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onloadeddata", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onloadedmetadata", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onloadend", typeof(Microsoft.AspNetCore.Components.Web.ProgressEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onloadstart", typeof(Microsoft.AspNetCore.Components.Web.ProgressEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onlostpointercapture", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmousedown", typeof(Microsoft.AspNetCore.Components.Web.MouseEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmousemove", typeof(Microsoft.AspNetCore.Components.Web.MouseEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmouseout", typeof(Microsoft.AspNetCore.Components.Web.MouseEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmouseover", typeof(Microsoft.AspNetCore.Components.Web.MouseEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmouseup", typeof(Microsoft.AspNetCore.Components.Web.MouseEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmousewheel", typeof(Microsoft.AspNetCore.Components.Web.WheelEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpaste", typeof(Microsoft.AspNetCore.Components.Web.ClipboardEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpause", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onplay", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onplaying", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointercancel", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerdown", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerenter", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerleave", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerlockchange", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerlockerror", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointermove", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerout", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerover", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerup", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onprogress", typeof(Microsoft.AspNetCore.Components.Web.ProgressEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onratechange", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onreadystatechange", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onreset", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onscroll", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onseeked", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onseeking", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onselect", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onselectionchange", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onselectstart", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onstalled", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onstop", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onsubmit", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onsuspend", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontimeout", typeof(Microsoft.AspNetCore.Components.Web.ProgressEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontimeupdate", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchcancel", typeof(Microsoft.AspNetCore.Components.Web.TouchEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchend", typeof(Microsoft.AspNetCore.Components.Web.TouchEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchenter", typeof(Microsoft.AspNetCore.Components.Web.TouchEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchleave", typeof(Microsoft.AspNetCore.Components.Web.TouchEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchmove", typeof(Microsoft.AspNetCore.Components.Web.TouchEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchstart", typeof(Microsoft.AspNetCore.Components.Web.TouchEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onvolumechange", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onwaiting", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onwheel", typeof(Microsoft.AspNetCore.Components.Web.WheelEventArgs))]
+    public static partial class EventHandlers
+    {
+    }
+    public partial class FocusEventArgs : System.EventArgs
+    {
+        public FocusEventArgs() { }
+        public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public partial class KeyboardEventArgs : System.EventArgs
+    {
+        public KeyboardEventArgs() { }
+        public bool AltKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string Code { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public bool CtrlKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string Key { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public float Location { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public bool MetaKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public bool Repeat { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public bool ShiftKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public partial class MouseEventArgs : System.EventArgs
+    {
+        public MouseEventArgs() { }
+        public bool AltKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public long Button { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public long Buttons { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double ClientX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double ClientY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public bool CtrlKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public long Detail { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public bool MetaKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double ScreenX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double ScreenY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public bool ShiftKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public partial class PointerEventArgs : Microsoft.AspNetCore.Components.Web.MouseEventArgs
+    {
+        public PointerEventArgs() { }
+        public float Height { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public bool IsPrimary { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public long PointerId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string PointerType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public float Pressure { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public float TiltX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public float TiltY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public float Width { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public partial class ProgressEventArgs : System.EventArgs
+    {
+        public ProgressEventArgs() { }
+        public bool LengthComputable { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public long Loaded { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public long Total { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public partial class TouchEventArgs : System.EventArgs
+    {
+        public TouchEventArgs() { }
+        public bool AltKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public Microsoft.AspNetCore.Components.Web.TouchPoint[] ChangedTouches { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public bool CtrlKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public long Detail { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public bool MetaKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public bool ShiftKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public Microsoft.AspNetCore.Components.Web.TouchPoint[] TargetTouches { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public Microsoft.AspNetCore.Components.Web.TouchPoint[] Touches { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public partial class TouchPoint
+    {
+        public TouchPoint() { }
+        public double ClientX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double ClientY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public long Identifier { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double PageX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double PageY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double ScreenX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double ScreenY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public static partial class WebEventCallbackFactoryEventArgsExtensions
+    {
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.ClipboardEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.Web.ClipboardEventArgs> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.DragEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.Web.DragEventArgs> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.ErrorEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.Web.ErrorEventArgs> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.FocusEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.Web.FocusEventArgs> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.KeyboardEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.Web.KeyboardEventArgs> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.MouseEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.Web.MouseEventArgs> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.PointerEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.Web.PointerEventArgs> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.ProgressEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.Web.ProgressEventArgs> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.TouchEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.Web.TouchEventArgs> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.WheelEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.Web.WheelEventArgs> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.ClipboardEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.Web.ClipboardEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.DragEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.Web.DragEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.ErrorEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.Web.ErrorEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.FocusEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.Web.FocusEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.KeyboardEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.Web.KeyboardEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.MouseEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.Web.MouseEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.PointerEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.Web.PointerEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.ProgressEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.Web.ProgressEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.TouchEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.Web.TouchEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.WheelEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.Web.WheelEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
+    }
+    public partial class WheelEventArgs : Microsoft.AspNetCore.Components.Web.MouseEventArgs
+    {
+        public WheelEventArgs() { }
+        public long DeltaMode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double DeltaX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double DeltaY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double DeltaZ { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
     }
 }
diff --git a/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.netstandard2.0.cs b/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.netstandard2.0.cs
index f6a30257c2..191e398a7c 100644
--- a/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.netstandard2.0.cs
+++ b/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.netstandard2.0.cs
@@ -3,28 +3,6 @@
 
 namespace Microsoft.AspNetCore.Components
 {
-    [Microsoft.AspNetCore.Components.BindElementAttribute("select", null, "value", "onchange")]
-    [Microsoft.AspNetCore.Components.BindElementAttribute("textarea", null, "value", "onchange")]
-    [Microsoft.AspNetCore.Components.BindInputElementAttribute("checkbox", null, "checked", "onchange", false, null)]
-    [Microsoft.AspNetCore.Components.BindInputElementAttribute("date", "value", "value", "onchange", true, "yyyy-MM-dd")]
-    [Microsoft.AspNetCore.Components.BindInputElementAttribute("date", null, "value", "onchange", true, "yyyy-MM-dd")]
-    [Microsoft.AspNetCore.Components.BindInputElementAttribute("number", "value", "value", "onchange", true, null)]
-    [Microsoft.AspNetCore.Components.BindInputElementAttribute("number", null, "value", "onchange", true, null)]
-    [Microsoft.AspNetCore.Components.BindInputElementAttribute("text", null, "value", "onchange", false, null)]
-    [Microsoft.AspNetCore.Components.BindInputElementAttribute(null, "value", "value", "onchange", false, null)]
-    [Microsoft.AspNetCore.Components.BindInputElementAttribute(null, null, "value", "onchange", false, null)]
-    public static partial class BindAttributes
-    {
-    }
-    [System.AttributeUsageAttribute(System.AttributeTargets.Class, AllowMultiple=true, Inherited=true)]
-    public sealed partial class BindElementAttribute : System.Attribute
-    {
-        public BindElementAttribute(string element, string suffix, string valueAttribute, string changeAttribute) { }
-        public string ChangeAttribute { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-        public string Element { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-        public string Suffix { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-        public string ValueAttribute { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-    }
     [System.AttributeUsageAttribute(System.AttributeTargets.Class, AllowMultiple=true, Inherited=true)]
     public sealed partial class BindInputElementAttribute : System.Attribute
     {
@@ -36,250 +14,6 @@ namespace Microsoft.AspNetCore.Components
         public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
         public string ValueAttribute { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
     }
-    public partial class DataTransfer
-    {
-        public DataTransfer() { }
-        public string DropEffect { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string EffectAllowed { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string[] Files { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public Microsoft.AspNetCore.Components.UIDataTransferItem[] Items { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string[] Types { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-    }
-    [System.AttributeUsageAttribute(System.AttributeTargets.Class, AllowMultiple=true, Inherited=true)]
-    public sealed partial class EventHandlerAttribute : System.Attribute
-    {
-        public EventHandlerAttribute(string attributeName, System.Type eventArgsType) { }
-        public string AttributeName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-        public System.Type EventArgsType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-    }
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onabort", typeof(Microsoft.AspNetCore.Components.UIProgressEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onactivate", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onbeforeactivate", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onbeforecopy", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onbeforecut", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onbeforedeactivate", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onbeforepaste", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onblur", typeof(Microsoft.AspNetCore.Components.UIFocusEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncanplay", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncanplaythrough", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onchange", typeof(Microsoft.AspNetCore.Components.ChangeEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onclick", typeof(Microsoft.AspNetCore.Components.UIMouseEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncontextmenu", typeof(Microsoft.AspNetCore.Components.UIMouseEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncopy", typeof(Microsoft.AspNetCore.Components.UIClipboardEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncuechange", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncut", typeof(Microsoft.AspNetCore.Components.UIClipboardEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondblclick", typeof(Microsoft.AspNetCore.Components.UIMouseEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondeactivate", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondrag", typeof(Microsoft.AspNetCore.Components.UIDragEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondragend", typeof(Microsoft.AspNetCore.Components.UIDragEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondragenter", typeof(Microsoft.AspNetCore.Components.UIDragEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondragleave", typeof(Microsoft.AspNetCore.Components.UIDragEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondragover", typeof(Microsoft.AspNetCore.Components.UIDragEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondragstart", typeof(Microsoft.AspNetCore.Components.UIDragEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondrop", typeof(Microsoft.AspNetCore.Components.UIDragEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondurationchange", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onemptied", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onended", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onerror", typeof(Microsoft.AspNetCore.Components.UIErrorEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onfocus", typeof(Microsoft.AspNetCore.Components.UIFocusEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onfocusin", typeof(Microsoft.AspNetCore.Components.UIFocusEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onfocusout", typeof(Microsoft.AspNetCore.Components.UIFocusEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onfullscreenchange", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onfullscreenerror", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ongotpointercapture", typeof(Microsoft.AspNetCore.Components.UIPointerEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oninput", typeof(Microsoft.AspNetCore.Components.ChangeEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oninvalid", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onkeydown", typeof(Microsoft.AspNetCore.Components.UIKeyboardEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onkeypress", typeof(Microsoft.AspNetCore.Components.UIKeyboardEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onkeyup", typeof(Microsoft.AspNetCore.Components.UIKeyboardEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onload", typeof(Microsoft.AspNetCore.Components.UIProgressEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onloadeddata", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onloadedmetadata", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onloadend", typeof(Microsoft.AspNetCore.Components.UIProgressEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onloadstart", typeof(Microsoft.AspNetCore.Components.UIProgressEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onlostpointercapture", typeof(Microsoft.AspNetCore.Components.UIPointerEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmousedown", typeof(Microsoft.AspNetCore.Components.UIMouseEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmousemove", typeof(Microsoft.AspNetCore.Components.UIMouseEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmouseout", typeof(Microsoft.AspNetCore.Components.UIMouseEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmouseover", typeof(Microsoft.AspNetCore.Components.UIMouseEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmouseup", typeof(Microsoft.AspNetCore.Components.UIMouseEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmousewheel", typeof(Microsoft.AspNetCore.Components.UIWheelEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpaste", typeof(Microsoft.AspNetCore.Components.UIClipboardEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpause", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onplay", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onplaying", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointercancel", typeof(Microsoft.AspNetCore.Components.UIPointerEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerdown", typeof(Microsoft.AspNetCore.Components.UIPointerEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerenter", typeof(Microsoft.AspNetCore.Components.UIPointerEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerleave", typeof(Microsoft.AspNetCore.Components.UIPointerEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerlockchange", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerlockerror", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointermove", typeof(Microsoft.AspNetCore.Components.UIPointerEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerout", typeof(Microsoft.AspNetCore.Components.UIPointerEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerover", typeof(Microsoft.AspNetCore.Components.UIPointerEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerup", typeof(Microsoft.AspNetCore.Components.UIPointerEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onprogress", typeof(Microsoft.AspNetCore.Components.UIProgressEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onratechange", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onreadystatechange", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onreset", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onscroll", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onseeked", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onseeking", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onselect", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onselectionchange", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onselectstart", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onstalled", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onstop", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onsubmit", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onsuspend", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontimeout", typeof(Microsoft.AspNetCore.Components.UIProgressEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontimeupdate", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchcancel", typeof(Microsoft.AspNetCore.Components.UITouchEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchend", typeof(Microsoft.AspNetCore.Components.UITouchEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchenter", typeof(Microsoft.AspNetCore.Components.UITouchEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchleave", typeof(Microsoft.AspNetCore.Components.UITouchEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchmove", typeof(Microsoft.AspNetCore.Components.UITouchEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchstart", typeof(Microsoft.AspNetCore.Components.UITouchEventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onvolumechange", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onwaiting", typeof(System.EventArgs))]
-    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onwheel", typeof(Microsoft.AspNetCore.Components.UIWheelEventArgs))]
-    public static partial class EventHandlers
-    {
-    }
-    public partial class UIClipboardEventArgs : System.EventArgs
-    {
-        public UIClipboardEventArgs() { }
-        public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-    }
-    public partial class UIDataTransferItem
-    {
-        public UIDataTransferItem() { }
-        public string Kind { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-    }
-    public partial class UIDragEventArgs : Microsoft.AspNetCore.Components.UIMouseEventArgs
-    {
-        public UIDragEventArgs() { }
-        public Microsoft.AspNetCore.Components.DataTransfer DataTransfer { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-    }
-    public partial class UIErrorEventArgs : System.EventArgs
-    {
-        public UIErrorEventArgs() { }
-        public int Colno { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string Filename { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public int Lineno { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string Message { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-    }
-    public partial class UIFocusEventArgs : System.EventArgs
-    {
-        public UIFocusEventArgs() { }
-        public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-    }
-    public partial class UIKeyboardEventArgs : System.EventArgs
-    {
-        public UIKeyboardEventArgs() { }
-        public bool AltKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string Code { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public bool CtrlKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string Key { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public float Location { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public bool MetaKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public bool Repeat { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public bool ShiftKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-    }
-    public partial class UIMouseEventArgs : System.EventArgs
-    {
-        public UIMouseEventArgs() { }
-        public bool AltKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public long Button { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public long Buttons { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public double ClientX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public double ClientY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public bool CtrlKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public long Detail { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public bool MetaKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public double ScreenX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public double ScreenY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public bool ShiftKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-    }
-    public partial class UIPointerEventArgs : Microsoft.AspNetCore.Components.UIMouseEventArgs
-    {
-        public UIPointerEventArgs() { }
-        public float Height { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public bool IsPrimary { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public long PointerId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string PointerType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public float Pressure { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public float TiltX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public float TiltY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public float Width { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-    }
-    public partial class UIProgressEventArgs : System.EventArgs
-    {
-        public UIProgressEventArgs() { }
-        public bool LengthComputable { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public long Loaded { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public long Total { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-    }
-    public partial class UITouchEventArgs : System.EventArgs
-    {
-        public UITouchEventArgs() { }
-        public bool AltKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public Microsoft.AspNetCore.Components.UITouchPoint[] ChangedTouches { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public bool CtrlKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public long Detail { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public bool MetaKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public bool ShiftKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public Microsoft.AspNetCore.Components.UITouchPoint[] TargetTouches { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public Microsoft.AspNetCore.Components.UITouchPoint[] Touches { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-    }
-    public partial class UITouchPoint
-    {
-        public UITouchPoint() { }
-        public double ClientX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public double ClientY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public long Identifier { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public double PageX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public double PageY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public double ScreenX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public double ScreenY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-    }
-    public partial class UIWheelEventArgs : Microsoft.AspNetCore.Components.UIMouseEventArgs
-    {
-        public UIWheelEventArgs() { }
-        public long DeltaMode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public double DeltaX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public double DeltaY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public double DeltaZ { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-    }
-    public static partial class WebEventCallbackFactoryUIEventArgsExtensions
-    {
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIClipboardEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.UIClipboardEventArgs> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIDragEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.UIDragEventArgs> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIErrorEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.UIErrorEventArgs> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIFocusEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.UIFocusEventArgs> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIKeyboardEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.UIKeyboardEventArgs> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.UIMouseEventArgs> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIPointerEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.UIPointerEventArgs> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIProgressEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.UIProgressEventArgs> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UITouchEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.UITouchEventArgs> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIWheelEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.UIWheelEventArgs> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIClipboardEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.UIClipboardEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIDragEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.UIDragEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIErrorEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.UIErrorEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIFocusEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.UIFocusEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIKeyboardEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.UIKeyboardEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIMouseEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.UIMouseEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIPointerEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.UIPointerEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIProgressEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.UIProgressEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UITouchEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.UITouchEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
-        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIWheelEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.UIWheelEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
-    }
 }
 namespace Microsoft.AspNetCore.Components.Forms
 {
@@ -395,6 +129,17 @@ namespace Microsoft.AspNetCore.Components.Forms
         void System.IDisposable.Dispose() { }
     }
 }
+namespace Microsoft.AspNetCore.Components.RenderTree
+{
+    public sealed partial class WebEventDescriptor
+    {
+        public WebEventDescriptor() { }
+        public int BrowserRendererId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string EventArgsType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public Microsoft.AspNetCore.Components.RenderTree.EventFieldInfo EventFieldInfo { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public ulong EventHandlerId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+}
 namespace Microsoft.AspNetCore.Components.Routing
 {
     public partial class NavLink : Microsoft.AspNetCore.Components.ComponentBase, System.IDisposable
@@ -422,12 +167,254 @@ namespace Microsoft.AspNetCore.Components.Routing
 }
 namespace Microsoft.AspNetCore.Components.Web
 {
-    public sealed partial class WebEventDescriptor
+    [Microsoft.AspNetCore.Components.BindElementAttribute("select", null, "value", "onchange")]
+    [Microsoft.AspNetCore.Components.BindElementAttribute("textarea", null, "value", "onchange")]
+    [Microsoft.AspNetCore.Components.BindInputElementAttribute("checkbox", null, "checked", "onchange", false, null)]
+    [Microsoft.AspNetCore.Components.BindInputElementAttribute("date", "value", "value", "onchange", true, "yyyy-MM-dd")]
+    [Microsoft.AspNetCore.Components.BindInputElementAttribute("date", null, "value", "onchange", true, "yyyy-MM-dd")]
+    [Microsoft.AspNetCore.Components.BindInputElementAttribute("number", "value", "value", "onchange", true, null)]
+    [Microsoft.AspNetCore.Components.BindInputElementAttribute("number", null, "value", "onchange", true, null)]
+    [Microsoft.AspNetCore.Components.BindInputElementAttribute("text", null, "value", "onchange", false, null)]
+    [Microsoft.AspNetCore.Components.BindInputElementAttribute(null, "value", "value", "onchange", false, null)]
+    [Microsoft.AspNetCore.Components.BindInputElementAttribute(null, null, "value", "onchange", false, null)]
+    public static partial class BindAttributes
     {
-        public WebEventDescriptor() { }
-        public int BrowserRendererId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string EventArgsType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public Microsoft.AspNetCore.Components.Rendering.EventFieldInfo EventFieldInfo { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public ulong EventHandlerId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public partial class ClipboardEventArgs : System.EventArgs
+    {
+        public ClipboardEventArgs() { }
+        public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public partial class DataTransfer
+    {
+        public DataTransfer() { }
+        public string DropEffect { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string EffectAllowed { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string[] Files { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public Microsoft.AspNetCore.Components.Web.DataTransferItem[] Items { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string[] Types { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public partial class DataTransferItem
+    {
+        public DataTransferItem() { }
+        public string Kind { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public partial class DragEventArgs : Microsoft.AspNetCore.Components.Web.MouseEventArgs
+    {
+        public DragEventArgs() { }
+        public Microsoft.AspNetCore.Components.Web.DataTransfer DataTransfer { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public partial class ErrorEventArgs : System.EventArgs
+    {
+        public ErrorEventArgs() { }
+        public int Colno { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string Filename { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public int Lineno { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string Message { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onabort", typeof(Microsoft.AspNetCore.Components.Web.ProgressEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onactivate", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onbeforeactivate", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onbeforecopy", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onbeforecut", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onbeforedeactivate", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onbeforepaste", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onblur", typeof(Microsoft.AspNetCore.Components.Web.FocusEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncanplay", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncanplaythrough", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onchange", typeof(Microsoft.AspNetCore.Components.ChangeEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onclick", typeof(Microsoft.AspNetCore.Components.Web.MouseEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncontextmenu", typeof(Microsoft.AspNetCore.Components.Web.MouseEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncopy", typeof(Microsoft.AspNetCore.Components.Web.ClipboardEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncuechange", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oncut", typeof(Microsoft.AspNetCore.Components.Web.ClipboardEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondblclick", typeof(Microsoft.AspNetCore.Components.Web.MouseEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondeactivate", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondrag", typeof(Microsoft.AspNetCore.Components.Web.DragEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondragend", typeof(Microsoft.AspNetCore.Components.Web.DragEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondragenter", typeof(Microsoft.AspNetCore.Components.Web.DragEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondragleave", typeof(Microsoft.AspNetCore.Components.Web.DragEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondragover", typeof(Microsoft.AspNetCore.Components.Web.DragEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondragstart", typeof(Microsoft.AspNetCore.Components.Web.DragEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondrop", typeof(Microsoft.AspNetCore.Components.Web.DragEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ondurationchange", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onemptied", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onended", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onerror", typeof(Microsoft.AspNetCore.Components.Web.ErrorEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onfocus", typeof(Microsoft.AspNetCore.Components.Web.FocusEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onfocusin", typeof(Microsoft.AspNetCore.Components.Web.FocusEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onfocusout", typeof(Microsoft.AspNetCore.Components.Web.FocusEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onfullscreenchange", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onfullscreenerror", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ongotpointercapture", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oninput", typeof(Microsoft.AspNetCore.Components.ChangeEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("oninvalid", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onkeydown", typeof(Microsoft.AspNetCore.Components.Web.KeyboardEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onkeypress", typeof(Microsoft.AspNetCore.Components.Web.KeyboardEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onkeyup", typeof(Microsoft.AspNetCore.Components.Web.KeyboardEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onload", typeof(Microsoft.AspNetCore.Components.Web.ProgressEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onloadeddata", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onloadedmetadata", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onloadend", typeof(Microsoft.AspNetCore.Components.Web.ProgressEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onloadstart", typeof(Microsoft.AspNetCore.Components.Web.ProgressEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onlostpointercapture", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmousedown", typeof(Microsoft.AspNetCore.Components.Web.MouseEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmousemove", typeof(Microsoft.AspNetCore.Components.Web.MouseEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmouseout", typeof(Microsoft.AspNetCore.Components.Web.MouseEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmouseover", typeof(Microsoft.AspNetCore.Components.Web.MouseEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmouseup", typeof(Microsoft.AspNetCore.Components.Web.MouseEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onmousewheel", typeof(Microsoft.AspNetCore.Components.Web.WheelEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpaste", typeof(Microsoft.AspNetCore.Components.Web.ClipboardEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpause", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onplay", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onplaying", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointercancel", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerdown", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerenter", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerleave", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerlockchange", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerlockerror", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointermove", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerout", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerover", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onpointerup", typeof(Microsoft.AspNetCore.Components.Web.PointerEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onprogress", typeof(Microsoft.AspNetCore.Components.Web.ProgressEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onratechange", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onreadystatechange", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onreset", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onscroll", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onseeked", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onseeking", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onselect", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onselectionchange", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onselectstart", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onstalled", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onstop", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onsubmit", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onsuspend", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontimeout", typeof(Microsoft.AspNetCore.Components.Web.ProgressEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontimeupdate", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchcancel", typeof(Microsoft.AspNetCore.Components.Web.TouchEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchend", typeof(Microsoft.AspNetCore.Components.Web.TouchEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchenter", typeof(Microsoft.AspNetCore.Components.Web.TouchEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchleave", typeof(Microsoft.AspNetCore.Components.Web.TouchEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchmove", typeof(Microsoft.AspNetCore.Components.Web.TouchEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("ontouchstart", typeof(Microsoft.AspNetCore.Components.Web.TouchEventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onvolumechange", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onwaiting", typeof(System.EventArgs))]
+    [Microsoft.AspNetCore.Components.EventHandlerAttribute("onwheel", typeof(Microsoft.AspNetCore.Components.Web.WheelEventArgs))]
+    public static partial class EventHandlers
+    {
+    }
+    public partial class FocusEventArgs : System.EventArgs
+    {
+        public FocusEventArgs() { }
+        public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public partial class KeyboardEventArgs : System.EventArgs
+    {
+        public KeyboardEventArgs() { }
+        public bool AltKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string Code { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public bool CtrlKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string Key { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public float Location { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public bool MetaKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public bool Repeat { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public bool ShiftKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public partial class MouseEventArgs : System.EventArgs
+    {
+        public MouseEventArgs() { }
+        public bool AltKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public long Button { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public long Buttons { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double ClientX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double ClientY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public bool CtrlKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public long Detail { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public bool MetaKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double ScreenX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double ScreenY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public bool ShiftKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public partial class PointerEventArgs : Microsoft.AspNetCore.Components.Web.MouseEventArgs
+    {
+        public PointerEventArgs() { }
+        public float Height { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public bool IsPrimary { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public long PointerId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string PointerType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public float Pressure { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public float TiltX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public float TiltY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public float Width { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public partial class ProgressEventArgs : System.EventArgs
+    {
+        public ProgressEventArgs() { }
+        public bool LengthComputable { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public long Loaded { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public long Total { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public partial class TouchEventArgs : System.EventArgs
+    {
+        public TouchEventArgs() { }
+        public bool AltKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public Microsoft.AspNetCore.Components.Web.TouchPoint[] ChangedTouches { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public bool CtrlKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public long Detail { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public bool MetaKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public bool ShiftKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public Microsoft.AspNetCore.Components.Web.TouchPoint[] TargetTouches { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public Microsoft.AspNetCore.Components.Web.TouchPoint[] Touches { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public partial class TouchPoint
+    {
+        public TouchPoint() { }
+        public double ClientX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double ClientY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public long Identifier { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double PageX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double PageY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double ScreenX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double ScreenY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+    }
+    public static partial class WebEventCallbackFactoryEventArgsExtensions
+    {
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.ClipboardEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.Web.ClipboardEventArgs> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.DragEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.Web.DragEventArgs> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.ErrorEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.Web.ErrorEventArgs> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.FocusEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.Web.FocusEventArgs> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.KeyboardEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.Web.KeyboardEventArgs> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.MouseEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.Web.MouseEventArgs> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.PointerEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.Web.PointerEventArgs> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.ProgressEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.Web.ProgressEventArgs> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.TouchEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.Web.TouchEventArgs> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.WheelEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<Microsoft.AspNetCore.Components.Web.WheelEventArgs> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.ClipboardEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.Web.ClipboardEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.DragEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.Web.DragEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.ErrorEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.Web.ErrorEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.FocusEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.Web.FocusEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.KeyboardEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.Web.KeyboardEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.MouseEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.Web.MouseEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.PointerEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.Web.PointerEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.ProgressEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.Web.ProgressEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.TouchEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.Web.TouchEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
+        public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.Web.WheelEventArgs> Create(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Func<Microsoft.AspNetCore.Components.Web.WheelEventArgs, System.Threading.Tasks.Task> callback) { throw null; }
+    }
+    public partial class WheelEventArgs : Microsoft.AspNetCore.Components.Web.MouseEventArgs
+    {
+        public WheelEventArgs() { }
+        public long DeltaMode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double DeltaX { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double DeltaY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public double DeltaZ { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
     }
 }
diff --git a/src/Components/Web/src/EventHandlers.cs b/src/Components/Web/src/EventHandlers.cs
deleted file mode 100644
index 8df8102278..0000000000
--- a/src/Components/Web/src/EventHandlers.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-
-namespace Microsoft.AspNetCore.Components
-{
-    /// <summary>
-    /// Holds <see cref="EventHandler"/> attributes to configure the mappings between event names and
-    /// event argument types.
-    /// </summary>
-
-    // Focus events
-    [EventHandler("onfocus", typeof(UIFocusEventArgs))]
-    [EventHandler("onblur", typeof(UIFocusEventArgs))]
-    [EventHandler("onfocusin", typeof(UIFocusEventArgs))]
-    [EventHandler("onfocusout", typeof(UIFocusEventArgs))]
-
-    // Mouse events
-    [EventHandler("onmouseover", typeof(UIMouseEventArgs))]
-    [EventHandler("onmouseout", typeof(UIMouseEventArgs))]
-    [EventHandler("onmousemove", typeof(UIMouseEventArgs))]
-    [EventHandler("onmousedown", typeof(UIMouseEventArgs))]
-    [EventHandler("onmouseup", typeof(UIMouseEventArgs))]
-    [EventHandler("onclick", typeof(UIMouseEventArgs))]
-    [EventHandler("ondblclick", typeof(UIMouseEventArgs))]
-    [EventHandler("onwheel", typeof(UIWheelEventArgs))]
-    [EventHandler("onmousewheel", typeof(UIWheelEventArgs))]
-    [EventHandler("oncontextmenu", typeof(UIMouseEventArgs))]
-
-    // Drag events
-    [EventHandler("ondrag", typeof(UIDragEventArgs))]
-    [EventHandler("ondragend", typeof(UIDragEventArgs))]
-    [EventHandler("ondragenter", typeof(UIDragEventArgs))]
-    [EventHandler("ondragleave", typeof(UIDragEventArgs))]
-    [EventHandler("ondragover", typeof(UIDragEventArgs))]
-    [EventHandler("ondragstart", typeof(UIDragEventArgs))]
-    [EventHandler("ondrop", typeof(UIDragEventArgs))]
-
-    // Keyboard events
-    [EventHandler("onkeydown", typeof(UIKeyboardEventArgs))]
-    [EventHandler("onkeyup", typeof(UIKeyboardEventArgs))]
-    [EventHandler("onkeypress", typeof(UIKeyboardEventArgs))]
-
-    // Input events
-    [EventHandler("onchange", typeof(ChangeEventArgs))]
-    [EventHandler("oninput", typeof(ChangeEventArgs))]
-    [EventHandler("oninvalid", typeof(EventArgs))]
-    [EventHandler("onreset", typeof(EventArgs))]
-    [EventHandler("onselect", typeof(EventArgs))]
-    [EventHandler("onselectstart", typeof(EventArgs))]
-    [EventHandler("onselectionchange", typeof(EventArgs))]
-    [EventHandler("onsubmit", typeof(EventArgs))]
-
-    // Clipboard events
-    [EventHandler("onbeforecopy", typeof(EventArgs))]
-    [EventHandler("onbeforecut", typeof(EventArgs))]
-    [EventHandler("onbeforepaste", typeof(EventArgs))]
-    [EventHandler("oncopy", typeof(UIClipboardEventArgs))]
-    [EventHandler("oncut", typeof(UIClipboardEventArgs))]
-    [EventHandler("onpaste", typeof(UIClipboardEventArgs))]
-
-    // Touch events
-    [EventHandler("ontouchcancel", typeof(UITouchEventArgs))]
-    [EventHandler("ontouchend", typeof(UITouchEventArgs))]
-    [EventHandler("ontouchmove", typeof(UITouchEventArgs))]
-    [EventHandler("ontouchstart", typeof(UITouchEventArgs))]
-    [EventHandler("ontouchenter", typeof(UITouchEventArgs))]
-    [EventHandler("ontouchleave", typeof(UITouchEventArgs))]
-
-    // Pointer events
-    [EventHandler("ongotpointercapture", typeof(UIPointerEventArgs))]
-    [EventHandler("onlostpointercapture", typeof(UIPointerEventArgs))]
-    [EventHandler("onpointercancel", typeof(UIPointerEventArgs))]
-    [EventHandler("onpointerdown", typeof(UIPointerEventArgs))]
-    [EventHandler("onpointerenter", typeof(UIPointerEventArgs))]
-    [EventHandler("onpointerleave", typeof(UIPointerEventArgs))]
-    [EventHandler("onpointermove", typeof(UIPointerEventArgs))]
-    [EventHandler("onpointerout", typeof(UIPointerEventArgs))]
-    [EventHandler("onpointerover", typeof(UIPointerEventArgs))]
-    [EventHandler("onpointerup", typeof(UIPointerEventArgs))]
-
-    // Media events
-    [EventHandler("oncanplay", typeof(EventArgs))]
-    [EventHandler("oncanplaythrough", typeof(EventArgs))]
-    [EventHandler("oncuechange", typeof(EventArgs))]
-    [EventHandler("ondurationchange", typeof(EventArgs))]
-    [EventHandler("onemptied", typeof(EventArgs))]
-    [EventHandler("onpause", typeof(EventArgs))]
-    [EventHandler("onplay", typeof(EventArgs))]
-    [EventHandler("onplaying", typeof(EventArgs))]
-    [EventHandler("onratechange", typeof(EventArgs))]
-    [EventHandler("onseeked", typeof(EventArgs))]
-    [EventHandler("onseeking", typeof(EventArgs))]
-    [EventHandler("onstalled", typeof(EventArgs))]
-    [EventHandler("onstop", typeof(EventArgs))]
-    [EventHandler("onsuspend", typeof(EventArgs))]
-    [EventHandler("ontimeupdate", typeof(EventArgs))]
-    [EventHandler("onvolumechange", typeof(EventArgs))]
-    [EventHandler("onwaiting", typeof(EventArgs))]
-
-    // Progress events
-    [EventHandler("onloadstart", typeof(UIProgressEventArgs))]
-    [EventHandler("ontimeout", typeof(UIProgressEventArgs))]
-    [EventHandler("onabort", typeof(UIProgressEventArgs))]
-    [EventHandler("onload", typeof(UIProgressEventArgs))]
-    [EventHandler("onloadend", typeof(UIProgressEventArgs))]
-    [EventHandler("onprogress", typeof(UIProgressEventArgs))]
-    [EventHandler("onerror", typeof(UIErrorEventArgs))]
-
-    // General events
-    [EventHandler("onactivate", typeof(EventArgs))]
-    [EventHandler("onbeforeactivate", typeof(EventArgs))]
-    [EventHandler("onbeforedeactivate", typeof(EventArgs))]
-    [EventHandler("ondeactivate", typeof(EventArgs))]
-    [EventHandler("onended", typeof(EventArgs))]
-    [EventHandler("onfullscreenchange", typeof(EventArgs))]
-    [EventHandler("onfullscreenerror", typeof(EventArgs))]
-    [EventHandler("onloadeddata", typeof(EventArgs))]
-    [EventHandler("onloadedmetadata", typeof(EventArgs))]
-    [EventHandler("onpointerlockchange", typeof(EventArgs))]
-    [EventHandler("onpointerlockerror", typeof(EventArgs))]
-    [EventHandler("onreadystatechange", typeof(EventArgs))]
-    [EventHandler("onscroll", typeof(EventArgs))]
-    public static class EventHandlers
-    {
-    }
-}
diff --git a/src/Components/Web/src/Microsoft.AspNetCore.Components.Web.csproj b/src/Components/Web/src/Microsoft.AspNetCore.Components.Web.csproj
index 99d9ea4b9a..02ae3157d2 100644
--- a/src/Components/Web/src/Microsoft.AspNetCore.Components.Web.csproj
+++ b/src/Components/Web/src/Microsoft.AspNetCore.Components.Web.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
@@ -14,10 +14,7 @@
     <Reference Include="Microsoft.AspNetCore.Components" />
     <Reference Include="Microsoft.AspNetCore.Components.Forms" />
     <Reference Include="Microsoft.Extensions.DependencyInjection" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Include="..\..\Shared\src\JsonSerializerOptionsProvider.cs" />
+    <Reference Include="Microsoft.JSInterop" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Components/Web/src/BindAttributes.cs b/src/Components/Web/src/Web/BindAttributes.cs
similarity index 97%
rename from src/Components/Web/src/BindAttributes.cs
rename to src/Components/Web/src/Web/BindAttributes.cs
index 91a1ee894c..ecff551b7c 100644
--- a/src/Components/Web/src/BindAttributes.cs
+++ b/src/Components/Web/src/Web/BindAttributes.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNetCore.Components
+namespace Microsoft.AspNetCore.Components.Web
 {
     /// <summary>
     /// Infrastructure for the discovery of <c>bind</c> attributes for markup elements.
diff --git a/src/Components/Web/src/UIClipboardEventArgs.cs b/src/Components/Web/src/Web/ClipboardEventArgs.cs
similarity index 82%
rename from src/Components/Web/src/UIClipboardEventArgs.cs
rename to src/Components/Web/src/Web/ClipboardEventArgs.cs
index 166d9221c1..11b8458d61 100644
--- a/src/Components/Web/src/UIClipboardEventArgs.cs
+++ b/src/Components/Web/src/Web/ClipboardEventArgs.cs
@@ -3,12 +3,12 @@
 
 using System;
 
-namespace Microsoft.AspNetCore.Components
+namespace Microsoft.AspNetCore.Components.Web
 {
     /// <summary>
     /// Supplies information about an clipboard event that is being raised.
     /// </summary>
-    public class UIClipboardEventArgs : EventArgs
+    public class ClipboardEventArgs : EventArgs
     {
         /// <summary>
         /// Gets or sets the type of the event.
diff --git a/src/Components/Web/src/DataTransfer.cs b/src/Components/Web/src/Web/DataTransfer.cs
similarity index 83%
rename from src/Components/Web/src/DataTransfer.cs
rename to src/Components/Web/src/Web/DataTransfer.cs
index 5cf8ee7dd8..e0fb9eb256 100644
--- a/src/Components/Web/src/DataTransfer.cs
+++ b/src/Components/Web/src/Web/DataTransfer.cs
@@ -1,11 +1,11 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNetCore.Components
+namespace Microsoft.AspNetCore.Components.Web
 {
     /// <summary>
     /// The <see cref="DataTransfer"/> object is used to hold the data that is being dragged during a drag and drop operation.
-    /// It may hold one or more <see cref="UIDataTransferItem"/>, each of one or more data types.
+    /// It may hold one or more <see cref="DataTransferItem"/>, each of one or more data types.
     /// For more information about drag and drop, see HTML Drag and Drop API.
     /// </summary>
     public class DataTransfer
@@ -29,9 +29,9 @@ namespace Microsoft.AspNetCore.Components
         public string[] Files { get; set; }
 
         /// <summary>
-        /// Gives a <see cref="UIDataTransferItem"/> array which is a list of all of the drag data.
+        /// Gives a <see cref="DataTransferItem"/> array which is a list of all of the drag data.
         /// </summary>
-        public UIDataTransferItem[] Items { get; set; }
+        public DataTransferItem[] Items { get; set; }
 
         /// <summary>
         /// An array of <see cref="string"/> giving the formats that were set in the dragstart event.
diff --git a/src/Components/Web/src/UIDataTransferItem.cs b/src/Components/Web/src/Web/DataTransferItem.cs
similarity index 72%
rename from src/Components/Web/src/UIDataTransferItem.cs
rename to src/Components/Web/src/Web/DataTransferItem.cs
index 1adc32dcf7..df4605ee69 100644
--- a/src/Components/Web/src/UIDataTransferItem.cs
+++ b/src/Components/Web/src/Web/DataTransferItem.cs
@@ -1,14 +1,14 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNetCore.Components
+namespace Microsoft.AspNetCore.Components.Web
 {
     /// <summary>
-    /// The <see cref="UIDataTransferItem"/> object represents one drag data item.
+    /// The <see cref="DataTransferItem"/> object represents one drag data item.
     /// During a drag operation, each drag event has a dataTransfer property which contains a list of drag data items.
-    /// Each item in the list is a <see cref="UIDataTransferItem"/> object.
+    /// Each item in the list is a <see cref="DataTransferItem"/> object.
     /// </summary>
-    public class UIDataTransferItem
+    public class DataTransferItem
     {
         /// <summary>
         /// The kind of drag data item, string or file
diff --git a/src/Components/Web/src/UIDragEventArgs.cs b/src/Components/Web/src/Web/DragEventArgs.cs
similarity index 84%
rename from src/Components/Web/src/UIDragEventArgs.cs
rename to src/Components/Web/src/Web/DragEventArgs.cs
index 483b1827e3..acabfa2561 100644
--- a/src/Components/Web/src/UIDragEventArgs.cs
+++ b/src/Components/Web/src/Web/DragEventArgs.cs
@@ -1,12 +1,12 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNetCore.Components
+namespace Microsoft.AspNetCore.Components.Web
 {
     /// <summary>
     /// Supplies information about an drag event that is being raised.
     /// </summary>
-    public class UIDragEventArgs : UIMouseEventArgs
+    public class DragEventArgs : MouseEventArgs
     {
         /// <summary>
         /// The data that underlies a drag-and-drop operation, known as the drag data store.
diff --git a/src/Components/Web/src/UIErrorEventArgs.cs b/src/Components/Web/src/Web/ErrorEventArgs.cs
similarity index 92%
rename from src/Components/Web/src/UIErrorEventArgs.cs
rename to src/Components/Web/src/Web/ErrorEventArgs.cs
index 6cf86b7553..0b2409301e 100644
--- a/src/Components/Web/src/UIErrorEventArgs.cs
+++ b/src/Components/Web/src/Web/ErrorEventArgs.cs
@@ -3,12 +3,12 @@
 
 using System;
 
-namespace Microsoft.AspNetCore.Components
+namespace Microsoft.AspNetCore.Components.Web
 {
     /// <summary>
     /// Supplies information about an error event that is being raised.
     /// </summary>
-    public class UIErrorEventArgs : EventArgs
+    public class ErrorEventArgs : EventArgs
     {
         /// <summary>
         /// Gets a a human-readable error message describing the problem.
diff --git a/src/Components/Web/src/Web/EventHandlers.cs b/src/Components/Web/src/Web/EventHandlers.cs
new file mode 100644
index 0000000000..46a6f8666c
--- /dev/null
+++ b/src/Components/Web/src/Web/EventHandlers.cs
@@ -0,0 +1,128 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Components.Web
+{
+    /// <summary>
+    /// Holds <see cref="EventHandler"/> attributes to configure the mappings between event names and
+    /// event argument types.
+    /// </summary>
+
+    // Focus events
+    [EventHandler("onfocus", typeof(FocusEventArgs))]
+    [EventHandler("onblur", typeof(FocusEventArgs))]
+    [EventHandler("onfocusin", typeof(FocusEventArgs))]
+    [EventHandler("onfocusout", typeof(FocusEventArgs))]
+
+    // Mouse events
+    [EventHandler("onmouseover", typeof(MouseEventArgs))]
+    [EventHandler("onmouseout", typeof(MouseEventArgs))]
+    [EventHandler("onmousemove", typeof(MouseEventArgs))]
+    [EventHandler("onmousedown", typeof(MouseEventArgs))]
+    [EventHandler("onmouseup", typeof(MouseEventArgs))]
+    [EventHandler("onclick", typeof(MouseEventArgs))]
+    [EventHandler("ondblclick", typeof(MouseEventArgs))]
+    [EventHandler("onwheel", typeof(WheelEventArgs))]
+    [EventHandler("onmousewheel", typeof(WheelEventArgs))]
+    [EventHandler("oncontextmenu", typeof(MouseEventArgs))]
+
+    // Drag events
+    [EventHandler("ondrag", typeof(DragEventArgs))]
+    [EventHandler("ondragend", typeof(DragEventArgs))]
+    [EventHandler("ondragenter", typeof(DragEventArgs))]
+    [EventHandler("ondragleave", typeof(DragEventArgs))]
+    [EventHandler("ondragover", typeof(DragEventArgs))]
+    [EventHandler("ondragstart", typeof(DragEventArgs))]
+    [EventHandler("ondrop", typeof(DragEventArgs))]
+
+    // Keyboard events
+    [EventHandler("onkeydown", typeof(KeyboardEventArgs))]
+    [EventHandler("onkeyup", typeof(KeyboardEventArgs))]
+    [EventHandler("onkeypress", typeof(KeyboardEventArgs))]
+
+    // Input events
+    [EventHandler("onchange", typeof(ChangeEventArgs))]
+    [EventHandler("oninput", typeof(ChangeEventArgs))]
+    [EventHandler("oninvalid", typeof(EventArgs))]
+    [EventHandler("onreset", typeof(EventArgs))]
+    [EventHandler("onselect", typeof(EventArgs))]
+    [EventHandler("onselectstart", typeof(EventArgs))]
+    [EventHandler("onselectionchange", typeof(EventArgs))]
+    [EventHandler("onsubmit", typeof(EventArgs))]
+
+    // Clipboard events
+    [EventHandler("onbeforecopy", typeof(EventArgs))]
+    [EventHandler("onbeforecut", typeof(EventArgs))]
+    [EventHandler("onbeforepaste", typeof(EventArgs))]
+    [EventHandler("oncopy", typeof(ClipboardEventArgs))]
+    [EventHandler("oncut", typeof(ClipboardEventArgs))]
+    [EventHandler("onpaste", typeof(ClipboardEventArgs))]
+
+    // Touch events
+    [EventHandler("ontouchcancel", typeof(TouchEventArgs))]
+    [EventHandler("ontouchend", typeof(TouchEventArgs))]
+    [EventHandler("ontouchmove", typeof(TouchEventArgs))]
+    [EventHandler("ontouchstart", typeof(TouchEventArgs))]
+    [EventHandler("ontouchenter", typeof(TouchEventArgs))]
+    [EventHandler("ontouchleave", typeof(TouchEventArgs))]
+
+    // Pointer events
+    [EventHandler("ongotpointercapture", typeof(PointerEventArgs))]
+    [EventHandler("onlostpointercapture", typeof(PointerEventArgs))]
+    [EventHandler("onpointercancel", typeof(PointerEventArgs))]
+    [EventHandler("onpointerdown", typeof(PointerEventArgs))]
+    [EventHandler("onpointerenter", typeof(PointerEventArgs))]
+    [EventHandler("onpointerleave", typeof(PointerEventArgs))]
+    [EventHandler("onpointermove", typeof(PointerEventArgs))]
+    [EventHandler("onpointerout", typeof(PointerEventArgs))]
+    [EventHandler("onpointerover", typeof(PointerEventArgs))]
+    [EventHandler("onpointerup", typeof(PointerEventArgs))]
+
+    // Media events
+    [EventHandler("oncanplay", typeof(EventArgs))]
+    [EventHandler("oncanplaythrough", typeof(EventArgs))]
+    [EventHandler("oncuechange", typeof(EventArgs))]
+    [EventHandler("ondurationchange", typeof(EventArgs))]
+    [EventHandler("onemptied", typeof(EventArgs))]
+    [EventHandler("onpause", typeof(EventArgs))]
+    [EventHandler("onplay", typeof(EventArgs))]
+    [EventHandler("onplaying", typeof(EventArgs))]
+    [EventHandler("onratechange", typeof(EventArgs))]
+    [EventHandler("onseeked", typeof(EventArgs))]
+    [EventHandler("onseeking", typeof(EventArgs))]
+    [EventHandler("onstalled", typeof(EventArgs))]
+    [EventHandler("onstop", typeof(EventArgs))]
+    [EventHandler("onsuspend", typeof(EventArgs))]
+    [EventHandler("ontimeupdate", typeof(EventArgs))]
+    [EventHandler("onvolumechange", typeof(EventArgs))]
+    [EventHandler("onwaiting", typeof(EventArgs))]
+
+    // Progress events
+    [EventHandler("onloadstart", typeof(ProgressEventArgs))]
+    [EventHandler("ontimeout", typeof(ProgressEventArgs))]
+    [EventHandler("onabort", typeof(ProgressEventArgs))]
+    [EventHandler("onload", typeof(ProgressEventArgs))]
+    [EventHandler("onloadend", typeof(ProgressEventArgs))]
+    [EventHandler("onprogress", typeof(ProgressEventArgs))]
+    [EventHandler("onerror", typeof(ErrorEventArgs))]
+
+    // General events
+    [EventHandler("onactivate", typeof(EventArgs))]
+    [EventHandler("onbeforeactivate", typeof(EventArgs))]
+    [EventHandler("onbeforedeactivate", typeof(EventArgs))]
+    [EventHandler("ondeactivate", typeof(EventArgs))]
+    [EventHandler("onended", typeof(EventArgs))]
+    [EventHandler("onfullscreenchange", typeof(EventArgs))]
+    [EventHandler("onfullscreenerror", typeof(EventArgs))]
+    [EventHandler("onloadeddata", typeof(EventArgs))]
+    [EventHandler("onloadedmetadata", typeof(EventArgs))]
+    [EventHandler("onpointerlockchange", typeof(EventArgs))]
+    [EventHandler("onpointerlockerror", typeof(EventArgs))]
+    [EventHandler("onreadystatechange", typeof(EventArgs))]
+    [EventHandler("onscroll", typeof(EventArgs))]
+    public static class EventHandlers
+    {
+    }
+}
diff --git a/src/Components/Web/src/UIFocusEventArgs.cs b/src/Components/Web/src/Web/FocusEventArgs.cs
similarity index 87%
rename from src/Components/Web/src/UIFocusEventArgs.cs
rename to src/Components/Web/src/Web/FocusEventArgs.cs
index b120e666a8..1d3979c153 100644
--- a/src/Components/Web/src/UIFocusEventArgs.cs
+++ b/src/Components/Web/src/Web/FocusEventArgs.cs
@@ -3,12 +3,12 @@
 
 using System;
 
-namespace Microsoft.AspNetCore.Components
+namespace Microsoft.AspNetCore.Components.Web
 {
     /// <summary>
     /// Supplies information about a focus event that is being raised.
     /// </summary>
-    public class UIFocusEventArgs : EventArgs
+    public class FocusEventArgs : EventArgs
     {
         // Not including support for 'relatedTarget' since we don't have a good way to represent it.
         // see: https://developer.mozilla.org/en-US/docs/Web/API/FocusEvent
diff --git a/src/Components/Web/src/UIKeyboardEventArgs.cs b/src/Components/Web/src/Web/KeyboardEventArgs.cs
similarity index 89%
rename from src/Components/Web/src/UIKeyboardEventArgs.cs
rename to src/Components/Web/src/Web/KeyboardEventArgs.cs
index fd66247dc4..f3870b8a31 100644
--- a/src/Components/Web/src/UIKeyboardEventArgs.cs
+++ b/src/Components/Web/src/Web/KeyboardEventArgs.cs
@@ -3,23 +3,23 @@
 
 using System;
 
-namespace Microsoft.AspNetCore.Components
+namespace Microsoft.AspNetCore.Components.Web
 {
     /// <summary>
     /// Supplies information about a keyboard event that is being raised.
     /// </summary>
-    public class UIKeyboardEventArgs : EventArgs
+    public class KeyboardEventArgs : EventArgs
     {
         /// <summary>
-        /// The key value of the key represented by the event. 
-        /// If the value has a printed representation, this attribute's value is the same as the char attribute. 
-        /// Otherwise, it's one of the key value strings specified in 'Key values'. 
+        /// The key value of the key represented by the event.
+        /// If the value has a printed representation, this attribute's value is the same as the char attribute.
+        /// Otherwise, it's one of the key value strings specified in 'Key values'.
         /// If the key can't be identified, this is the string "Unidentified"
         /// </summary>
         public string Key { get; set; }
 
         /// <summary>
-        /// Holds a string that identifies the physical key being pressed. 
+        /// Holds a string that identifies the physical key being pressed.
         /// The value is not affected by the current keyboard layout or modifier state, so a particular key will always return the same value.
         /// </summary>
         public string Code { get; set; }
diff --git a/src/Components/Web/src/UIMouseEventArgs.cs b/src/Components/Web/src/Web/MouseEventArgs.cs
similarity index 97%
rename from src/Components/Web/src/UIMouseEventArgs.cs
rename to src/Components/Web/src/Web/MouseEventArgs.cs
index da4d2a64ae..4f71ac44d9 100644
--- a/src/Components/Web/src/UIMouseEventArgs.cs
+++ b/src/Components/Web/src/Web/MouseEventArgs.cs
@@ -3,12 +3,12 @@
 
 using System;
 
-namespace Microsoft.AspNetCore.Components
+namespace Microsoft.AspNetCore.Components.Web
 {
     /// <summary>
     /// Supplies information about a mouse event that is being raised.
     /// </summary>
-    public class UIMouseEventArgs : EventArgs
+    public class MouseEventArgs : EventArgs
     {
         /// <summary>
         /// A count of consecutive clicks that happened in a short amount of time, incremented by one.
diff --git a/src/Components/Web/src/UIPointerEventArgs.cs b/src/Components/Web/src/Web/PointerEventArgs.cs
similarity index 95%
rename from src/Components/Web/src/UIPointerEventArgs.cs
rename to src/Components/Web/src/Web/PointerEventArgs.cs
index 348cfbefd5..97c84bf417 100644
--- a/src/Components/Web/src/UIPointerEventArgs.cs
+++ b/src/Components/Web/src/Web/PointerEventArgs.cs
@@ -1,12 +1,12 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNetCore.Components
+namespace Microsoft.AspNetCore.Components.Web
 {
     /// <summary>
     /// Supplies information about a pointer event that is being raised.
     /// </summary>
-    public class UIPointerEventArgs : UIMouseEventArgs
+    public class PointerEventArgs : MouseEventArgs
     {
         /// <summary>
         /// A unique identifier for the pointer causing the event.
diff --git a/src/Components/Web/src/UIProgressEventArgs.cs b/src/Components/Web/src/Web/ProgressEventArgs.cs
similarity index 87%
rename from src/Components/Web/src/UIProgressEventArgs.cs
rename to src/Components/Web/src/Web/ProgressEventArgs.cs
index e0273c665f..9c57c5d9dd 100644
--- a/src/Components/Web/src/UIProgressEventArgs.cs
+++ b/src/Components/Web/src/Web/ProgressEventArgs.cs
@@ -3,12 +3,12 @@
 
 using System;
 
-namespace Microsoft.AspNetCore.Components
+namespace Microsoft.AspNetCore.Components.Web
 {
     /// <summary>
     /// Supplies information about a progress event that is being raised.
     /// </summary>
-    public class UIProgressEventArgs : EventArgs
+    public class ProgressEventArgs : EventArgs
     {
         /// <summary>
         /// Whether or not the total size of the transfer is known.
@@ -23,7 +23,7 @@ namespace Microsoft.AspNetCore.Components
 
         /// <summary>
         /// The total number of bytes of content that will be transferred during the operation.
-        /// If the total size is unknown, this value is zero. 
+        /// If the total size is unknown, this value is zero.
         /// </summary>
         public long Total { get; set; }
 
diff --git a/src/Components/Web/src/UITouchEventArgs.cs b/src/Components/Web/src/Web/TouchEventArgs.cs
similarity index 78%
rename from src/Components/Web/src/UITouchEventArgs.cs
rename to src/Components/Web/src/Web/TouchEventArgs.cs
index 3be004b7f1..7cf086ac2e 100644
--- a/src/Components/Web/src/UITouchEventArgs.cs
+++ b/src/Components/Web/src/Web/TouchEventArgs.cs
@@ -3,12 +3,12 @@
 
 using System;
 
-namespace Microsoft.AspNetCore.Components
+namespace Microsoft.AspNetCore.Components.Web
 {
     /// <summary>
     /// Supplies information about a touch event that is being raised.
     /// </summary>
-    public class UITouchEventArgs : EventArgs
+    public class TouchEventArgs : EventArgs
     {
         /// <summary>
         /// A count of consecutive clicks that happened in a short amount of time, incremented by one.
@@ -16,14 +16,14 @@ namespace Microsoft.AspNetCore.Components
         public long Detail { get; set; }
 
         /// <summary>
-        /// A list of <see cref="UITouchPoint"/> for every point of contact currently touching the surface.
+        /// A list of <see cref="TouchPoint"/> for every point of contact currently touching the surface.
         /// </summary>
-        public UITouchPoint[] Touches { get; set; }
+        public TouchPoint[] Touches { get; set; }
 
         /// <summary>
-        /// A list of <see cref="UITouchPoint"/> for every point of contact that is touching the surface and started on the element that is the target of the current event.
+        /// A list of <see cref="TouchPoint"/> for every point of contact that is touching the surface and started on the element that is the target of the current event.
         /// </summary>
-        public UITouchPoint[] TargetTouches { get; set; }
+        public TouchPoint[] TargetTouches { get; set; }
 
         /// <summary>
         /// A list of Touches for every point of contact which contributed to the event.
@@ -31,7 +31,7 @@ namespace Microsoft.AspNetCore.Components
         /// For the touchmove event this must be a list of the touch points that have moved since the last event.
         /// For the touchend and touchcancel events this must be a list of the touch points that have just been removed from the surface.
         /// </summary>
-        public UITouchPoint[] ChangedTouches { get; set; }
+        public TouchPoint[] ChangedTouches { get; set; }
 
         /// <summary>
         /// true if the control key was down when the event was fired. false otherwise.
diff --git a/src/Components/Web/src/UITouchPoint.cs b/src/Components/Web/src/Web/TouchPoint.cs
similarity index 96%
rename from src/Components/Web/src/UITouchPoint.cs
rename to src/Components/Web/src/Web/TouchPoint.cs
index 9fe154f118..fd92762447 100644
--- a/src/Components/Web/src/UITouchPoint.cs
+++ b/src/Components/Web/src/Web/TouchPoint.cs
@@ -1,13 +1,13 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNetCore.Components
+namespace Microsoft.AspNetCore.Components.Web
 {
     /// <summary>
     /// Represents a single contact point on a touch-sensitive device.
     /// The contact point is commonly a finger or stylus and the device may be a touchscreen or trackpad.
     /// </summary>
-    public class UITouchPoint
+    public class TouchPoint
     {
         /// <summary>
         /// A unique identifier for this Touch object.
diff --git a/src/Components/Web/src/WebEventCallbackFactoryUIEventArgsExtensions.cs b/src/Components/Web/src/Web/WebEventCallbackFactoryEventArgsExtensions.cs
similarity index 73%
rename from src/Components/Web/src/WebEventCallbackFactoryUIEventArgsExtensions.cs
rename to src/Components/Web/src/Web/WebEventCallbackFactoryEventArgsExtensions.cs
index 02bb5d6d58..d7f7d01ae2 100644
--- a/src/Components/Web/src/WebEventCallbackFactoryUIEventArgsExtensions.cs
+++ b/src/Components/Web/src/Web/WebEventCallbackFactoryEventArgsExtensions.cs
@@ -4,12 +4,12 @@
 using System;
 using System.Threading.Tasks;
 
-namespace Microsoft.AspNetCore.Components
+namespace Microsoft.AspNetCore.Components.Web
 {
     /// <summary>
     /// Provides extension methods for <see cref="EventCallbackFactory"/> and <see cref="EventArgs"/> types.
     /// </summary>
-    public static class WebEventCallbackFactoryUIEventArgsExtensions
+    public static class WebEventCallbackFactoryEventArgsExtensions
     {
         /// <summary>
         /// Creates an <see cref="EventCallback"/> for the provided <paramref name="receiver"/> and
@@ -19,14 +19,14 @@ namespace Microsoft.AspNetCore.Components
         /// <param name="receiver">The event receiver.</param>
         /// <param name="callback">The event callback.</param>
         /// <returns>The <see cref="EventCallback"/>.</returns>
-        public static EventCallback<UIClipboardEventArgs> Create(this EventCallbackFactory factory, object receiver, Action<UIClipboardEventArgs> callback)
+        public static EventCallback<ClipboardEventArgs> Create(this EventCallbackFactory factory, object receiver, Action<ClipboardEventArgs> callback)
         {
             if (factory == null)
             {
                 throw new ArgumentNullException(nameof(factory));
             }
 
-            return factory.Create<UIClipboardEventArgs>(receiver, callback);
+            return factory.Create<ClipboardEventArgs>(receiver, callback);
         }
 
         /// <summary>
@@ -37,14 +37,14 @@ namespace Microsoft.AspNetCore.Components
         /// <param name="receiver">The event receiver.</param>
         /// <param name="callback">The event callback.</param>
         /// <returns>The <see cref="EventCallback"/>.</returns>
-        public static EventCallback<UIClipboardEventArgs> Create(this EventCallbackFactory factory, object receiver, Func<UIClipboardEventArgs, Task> callback)
+        public static EventCallback<ClipboardEventArgs> Create(this EventCallbackFactory factory, object receiver, Func<ClipboardEventArgs, Task> callback)
         {
             if (factory == null)
             {
                 throw new ArgumentNullException(nameof(factory));
             }
 
-            return factory.Create<UIClipboardEventArgs>(receiver, callback);
+            return factory.Create<ClipboardEventArgs>(receiver, callback);
         }
 
         /// <summary>
@@ -55,14 +55,14 @@ namespace Microsoft.AspNetCore.Components
         /// <param name="receiver">The event receiver.</param>
         /// <param name="callback">The event callback.</param>
         /// <returns>The <see cref="EventCallback"/>.</returns>
-        public static EventCallback<UIDragEventArgs> Create(this EventCallbackFactory factory, object receiver, Action<UIDragEventArgs> callback)
+        public static EventCallback<DragEventArgs> Create(this EventCallbackFactory factory, object receiver, Action<DragEventArgs> callback)
         {
             if (factory == null)
             {
                 throw new ArgumentNullException(nameof(factory));
             }
 
-            return factory.Create<UIDragEventArgs>(receiver, callback);
+            return factory.Create<DragEventArgs>(receiver, callback);
         }
 
         /// <summary>
@@ -73,14 +73,14 @@ namespace Microsoft.AspNetCore.Components
         /// <param name="receiver">The event receiver.</param>
         /// <param name="callback">The event callback.</param>
         /// <returns>The <see cref="EventCallback"/>.</returns>
-        public static EventCallback<UIDragEventArgs> Create(this EventCallbackFactory factory, object receiver, Func<UIDragEventArgs, Task> callback)
+        public static EventCallback<DragEventArgs> Create(this EventCallbackFactory factory, object receiver, Func<DragEventArgs, Task> callback)
         {
             if (factory == null)
             {
                 throw new ArgumentNullException(nameof(factory));
             }
 
-            return factory.Create<UIDragEventArgs>(receiver, callback);
+            return factory.Create<DragEventArgs>(receiver, callback);
         }
 
         /// <summary>
@@ -91,14 +91,14 @@ namespace Microsoft.AspNetCore.Components
         /// <param name="receiver">The event receiver.</param>
         /// <param name="callback">The event callback.</param>
         /// <returns>The <see cref="EventCallback"/>.</returns>
-        public static EventCallback<UIErrorEventArgs> Create(this EventCallbackFactory factory, object receiver, Action<UIErrorEventArgs> callback)
+        public static EventCallback<ErrorEventArgs> Create(this EventCallbackFactory factory, object receiver, Action<ErrorEventArgs> callback)
         {
             if (factory == null)
             {
                 throw new ArgumentNullException(nameof(factory));
             }
 
-            return factory.Create<UIErrorEventArgs>(receiver, callback);
+            return factory.Create<ErrorEventArgs>(receiver, callback);
         }
 
         /// <summary>
@@ -109,14 +109,14 @@ namespace Microsoft.AspNetCore.Components
         /// <param name="receiver">The event receiver.</param>
         /// <param name="callback">The event callback.</param>
         /// <returns>The <see cref="EventCallback"/>.</returns>
-        public static EventCallback<UIErrorEventArgs> Create(this EventCallbackFactory factory, object receiver, Func<UIErrorEventArgs, Task> callback)
+        public static EventCallback<ErrorEventArgs> Create(this EventCallbackFactory factory, object receiver, Func<ErrorEventArgs, Task> callback)
         {
             if (factory == null)
             {
                 throw new ArgumentNullException(nameof(factory));
             }
 
-            return factory.Create<UIErrorEventArgs>(receiver, callback);
+            return factory.Create<ErrorEventArgs>(receiver, callback);
         }
 
         /// <summary>
@@ -127,14 +127,14 @@ namespace Microsoft.AspNetCore.Components
         /// <param name="receiver">The event receiver.</param>
         /// <param name="callback">The event callback.</param>
         /// <returns>The <see cref="EventCallback"/>.</returns>
-        public static EventCallback<UIFocusEventArgs> Create(this EventCallbackFactory factory, object receiver, Action<UIFocusEventArgs> callback)
+        public static EventCallback<FocusEventArgs> Create(this EventCallbackFactory factory, object receiver, Action<FocusEventArgs> callback)
         {
             if (factory == null)
             {
                 throw new ArgumentNullException(nameof(factory));
             }
 
-            return factory.Create<UIFocusEventArgs>(receiver, callback);
+            return factory.Create<FocusEventArgs>(receiver, callback);
         }
 
         /// <summary>
@@ -145,14 +145,14 @@ namespace Microsoft.AspNetCore.Components
         /// <param name="receiver">The event receiver.</param>
         /// <param name="callback">The event callback.</param>
         /// <returns>The <see cref="EventCallback"/>.</returns>
-        public static EventCallback<UIFocusEventArgs> Create(this EventCallbackFactory factory, object receiver, Func<UIFocusEventArgs, Task> callback)
+        public static EventCallback<FocusEventArgs> Create(this EventCallbackFactory factory, object receiver, Func<FocusEventArgs, Task> callback)
         {
             if (factory == null)
             {
                 throw new ArgumentNullException(nameof(factory));
             }
 
-            return factory.Create<UIFocusEventArgs>(receiver, callback);
+            return factory.Create<FocusEventArgs>(receiver, callback);
         }
 
         /// <summary>
@@ -163,14 +163,14 @@ namespace Microsoft.AspNetCore.Components
         /// <param name="receiver">The event receiver.</param>
         /// <param name="callback">The event callback.</param>
         /// <returns>The <see cref="EventCallback"/>.</returns>
-        public static EventCallback<UIKeyboardEventArgs> Create(this EventCallbackFactory factory, object receiver, Action<UIKeyboardEventArgs> callback)
+        public static EventCallback<KeyboardEventArgs> Create(this EventCallbackFactory factory, object receiver, Action<KeyboardEventArgs> callback)
         {
             if (factory == null)
             {
                 throw new ArgumentNullException(nameof(factory));
             }
 
-            return factory.Create<UIKeyboardEventArgs>(receiver, callback);
+            return factory.Create<KeyboardEventArgs>(receiver, callback);
         }
 
         /// <summary>
@@ -181,14 +181,14 @@ namespace Microsoft.AspNetCore.Components
         /// <param name="receiver">The event receiver.</param>
         /// <param name="callback">The event callback.</param>
         /// <returns>The <see cref="EventCallback"/>.</returns>
-        public static EventCallback<UIKeyboardEventArgs> Create(this EventCallbackFactory factory, object receiver, Func<UIKeyboardEventArgs, Task> callback)
+        public static EventCallback<KeyboardEventArgs> Create(this EventCallbackFactory factory, object receiver, Func<KeyboardEventArgs, Task> callback)
         {
             if (factory == null)
             {
                 throw new ArgumentNullException(nameof(factory));
             }
 
-            return factory.Create<UIKeyboardEventArgs>(receiver, callback);
+            return factory.Create<KeyboardEventArgs>(receiver, callback);
         }
 
         /// <summary>
@@ -199,14 +199,14 @@ namespace Microsoft.AspNetCore.Components
         /// <param name="receiver">The event receiver.</param>
         /// <param name="callback">The event callback.</param>
         /// <returns>The <see cref="EventCallback"/>.</returns>
-        public static EventCallback<UIMouseEventArgs> Create(this EventCallbackFactory factory, object receiver, Action<UIMouseEventArgs> callback)
+        public static EventCallback<MouseEventArgs> Create(this EventCallbackFactory factory, object receiver, Action<MouseEventArgs> callback)
         {
             if (factory == null)
             {
                 throw new ArgumentNullException(nameof(factory));
             }
 
-            return factory.Create<UIMouseEventArgs>(receiver, callback);
+            return factory.Create<MouseEventArgs>(receiver, callback);
         }
 
         /// <summary>
@@ -217,14 +217,14 @@ namespace Microsoft.AspNetCore.Components
         /// <param name="receiver">The event receiver.</param>
         /// <param name="callback">The event callback.</param>
         /// <returns>The <see cref="EventCallback"/>.</returns>
-        public static EventCallback<UIMouseEventArgs> Create(this EventCallbackFactory factory, object receiver, Func<UIMouseEventArgs, Task> callback)
+        public static EventCallback<MouseEventArgs> Create(this EventCallbackFactory factory, object receiver, Func<MouseEventArgs, Task> callback)
         {
             if (factory == null)
             {
                 throw new ArgumentNullException(nameof(factory));
             }
 
-            return factory.Create<UIMouseEventArgs>(receiver, callback);
+            return factory.Create<MouseEventArgs>(receiver, callback);
         }
         /// <summary>
         /// Creates an <see cref="EventCallback"/> for the provided <paramref name="receiver"/> and
@@ -234,14 +234,14 @@ namespace Microsoft.AspNetCore.Components
         /// <param name="receiver">The event receiver.</param>
         /// <param name="callback">The event callback.</param>
         /// <returns>The <see cref="EventCallback"/>.</returns>
-        public static EventCallback<UIPointerEventArgs> Create(this EventCallbackFactory factory, object receiver, Action<UIPointerEventArgs> callback)
+        public static EventCallback<PointerEventArgs> Create(this EventCallbackFactory factory, object receiver, Action<PointerEventArgs> callback)
         {
             if (factory == null)
             {
                 throw new ArgumentNullException(nameof(factory));
             }
 
-            return factory.Create<UIPointerEventArgs>(receiver, callback);
+            return factory.Create<PointerEventArgs>(receiver, callback);
         }
 
         /// <summary>
@@ -252,14 +252,14 @@ namespace Microsoft.AspNetCore.Components
         /// <param name="receiver">The event receiver.</param>
         /// <param name="callback">The event callback.</param>
         /// <returns>The <see cref="EventCallback"/>.</returns>
-        public static EventCallback<UIPointerEventArgs> Create(this EventCallbackFactory factory, object receiver, Func<UIPointerEventArgs, Task> callback)
+        public static EventCallback<PointerEventArgs> Create(this EventCallbackFactory factory, object receiver, Func<PointerEventArgs, Task> callback)
         {
             if (factory == null)
             {
                 throw new ArgumentNullException(nameof(factory));
             }
 
-            return factory.Create<UIPointerEventArgs>(receiver, callback);
+            return factory.Create<PointerEventArgs>(receiver, callback);
         }
 
         /// <summary>
@@ -270,14 +270,14 @@ namespace Microsoft.AspNetCore.Components
         /// <param name="receiver">The event receiver.</param>
         /// <param name="callback">The event callback.</param>
         /// <returns>The <see cref="EventCallback"/>.</returns>
-        public static EventCallback<UIProgressEventArgs> Create(this EventCallbackFactory factory, object receiver, Action<UIProgressEventArgs> callback)
+        public static EventCallback<ProgressEventArgs> Create(this EventCallbackFactory factory, object receiver, Action<ProgressEventArgs> callback)
         {
             if (factory == null)
             {
                 throw new ArgumentNullException(nameof(factory));
             }
 
-            return factory.Create<UIProgressEventArgs>(receiver, callback);
+            return factory.Create<ProgressEventArgs>(receiver, callback);
         }
 
         /// <summary>
@@ -288,14 +288,14 @@ namespace Microsoft.AspNetCore.Components
         /// <param name="receiver">The event receiver.</param>
         /// <param name="callback">The event callback.</param>
         /// <returns>The <see cref="EventCallback"/>.</returns>
-        public static EventCallback<UIProgressEventArgs> Create(this EventCallbackFactory factory, object receiver, Func<UIProgressEventArgs, Task> callback)
+        public static EventCallback<ProgressEventArgs> Create(this EventCallbackFactory factory, object receiver, Func<ProgressEventArgs, Task> callback)
         {
             if (factory == null)
             {
                 throw new ArgumentNullException(nameof(factory));
             }
 
-            return factory.Create<UIProgressEventArgs>(receiver, callback);
+            return factory.Create<ProgressEventArgs>(receiver, callback);
         }
 
         /// <summary>
@@ -306,14 +306,14 @@ namespace Microsoft.AspNetCore.Components
         /// <param name="receiver">The event receiver.</param>
         /// <param name="callback">The event callback.</param>
         /// <returns>The <see cref="EventCallback"/>.</returns>
-        public static EventCallback<UITouchEventArgs> Create(this EventCallbackFactory factory, object receiver, Action<UITouchEventArgs> callback)
+        public static EventCallback<TouchEventArgs> Create(this EventCallbackFactory factory, object receiver, Action<TouchEventArgs> callback)
         {
             if (factory == null)
             {
                 throw new ArgumentNullException(nameof(factory));
             }
 
-            return factory.Create<UITouchEventArgs>(receiver, callback);
+            return factory.Create<TouchEventArgs>(receiver, callback);
         }
 
         /// <summary>
@@ -324,14 +324,14 @@ namespace Microsoft.AspNetCore.Components
         /// <param name="receiver">The event receiver.</param>
         /// <param name="callback">The event callback.</param>
         /// <returns>The <see cref="EventCallback"/>.</returns>
-        public static EventCallback<UITouchEventArgs> Create(this EventCallbackFactory factory, object receiver, Func<UITouchEventArgs, Task> callback)
+        public static EventCallback<TouchEventArgs> Create(this EventCallbackFactory factory, object receiver, Func<TouchEventArgs, Task> callback)
         {
             if (factory == null)
             {
                 throw new ArgumentNullException(nameof(factory));
             }
 
-            return factory.Create<UITouchEventArgs>(receiver, callback);
+            return factory.Create<TouchEventArgs>(receiver, callback);
         }
 
         /// <summary>
@@ -342,14 +342,14 @@ namespace Microsoft.AspNetCore.Components
         /// <param name="receiver">The event receiver.</param>
         /// <param name="callback">The event callback.</param>
         /// <returns>The <see cref="EventCallback"/>.</returns>
-        public static EventCallback<UIWheelEventArgs> Create(this EventCallbackFactory factory, object receiver, Action<UIWheelEventArgs> callback)
+        public static EventCallback<WheelEventArgs> Create(this EventCallbackFactory factory, object receiver, Action<WheelEventArgs> callback)
         {
             if (factory == null)
             {
                 throw new ArgumentNullException(nameof(factory));
             }
 
-            return factory.Create<UIWheelEventArgs>(receiver, callback);
+            return factory.Create<WheelEventArgs>(receiver, callback);
         }
 
         /// <summary>
@@ -360,14 +360,14 @@ namespace Microsoft.AspNetCore.Components
         /// <param name="receiver">The event receiver.</param>
         /// <param name="callback">The event callback.</param>
         /// <returns>The <see cref="EventCallback"/>.</returns>
-        public static EventCallback<UIWheelEventArgs> Create(this EventCallbackFactory factory, object receiver, Func<UIWheelEventArgs, Task> callback)
+        public static EventCallback<WheelEventArgs> Create(this EventCallbackFactory factory, object receiver, Func<WheelEventArgs, Task> callback)
         {
             if (factory == null)
             {
                 throw new ArgumentNullException(nameof(factory));
             }
 
-            return factory.Create<UIWheelEventArgs>(receiver, callback);
+            return factory.Create<WheelEventArgs>(receiver, callback);
         }
     }
 }
diff --git a/src/Components/Web/src/UIWheelEventArgs.cs b/src/Components/Web/src/Web/WheelEventArgs.cs
similarity index 83%
rename from src/Components/Web/src/UIWheelEventArgs.cs
rename to src/Components/Web/src/Web/WheelEventArgs.cs
index b73baa96f9..63d3ee1362 100644
--- a/src/Components/Web/src/UIWheelEventArgs.cs
+++ b/src/Components/Web/src/Web/WheelEventArgs.cs
@@ -1,12 +1,12 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNetCore.Components
+namespace Microsoft.AspNetCore.Components.Web
 {
     /// <summary>
     /// Supplies information about a mouse wheel event that is being raised.
     /// </summary>
-    public class UIWheelEventArgs : UIMouseEventArgs
+    public class WheelEventArgs : MouseEventArgs
     {
         /// <summary>
         /// The horizontal scroll amount.
@@ -24,7 +24,7 @@ namespace Microsoft.AspNetCore.Components
         public double DeltaZ { get; set; }
 
         /// <summary>
-        /// The unit of the delta values scroll amount. 
+        /// The unit of the delta values scroll amount.
         /// </summary>
         public long DeltaMode { get; set; }
     }
diff --git a/src/Components/Web/src/WebEventDescriptor.cs b/src/Components/Web/src/WebEventDescriptor.cs
index 7b32c9b8a9..621f0537ec 100644
--- a/src/Components/Web/src/WebEventDescriptor.cs
+++ b/src/Components/Web/src/WebEventDescriptor.cs
@@ -1,12 +1,11 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNetCore.Components.Rendering;
-
-namespace Microsoft.AspNetCore.Components.Web
+namespace Microsoft.AspNetCore.Components.RenderTree
 {
     /// <summary>
-    /// For framework use only.
+    /// Types in the Microsoft.AspNetCore.Components.RenderTree are not recommended for use outside
+    /// of the Blazor framework. These types will change in a future release.
     /// </summary>
     public sealed class WebEventDescriptor
     {
diff --git a/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj b/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj
index 8368521831..387bbbfb16 100644
--- a/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj
+++ b/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <!-- Shared testing infrastructure for running E2E tests using selenium -->
   <Import Project="$(SharedSourceRoot)E2ETesting\E2ETesting.props" />
@@ -51,4 +51,11 @@
   <!-- Shared testing infrastructure for running E2E tests using selenium -->
   <Import Project="$(SharedSourceRoot)E2ETesting\E2ETesting.targets" />
 
+  <ItemGroup>
+    <!-- Shared descriptor infrastructure with MVC -->
+    <Compile Include="$(RepoRoot)src\Shared\Components\ServerComponent.cs" />
+    <Compile Include="$(RepoRoot)src\Shared\Components\ServerComponentSerializationSettings.cs" />
+    <Compile Include="$(RepoRoot)src\Shared\Components\ServerComponentMarker.cs" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Components/test/E2ETest/ServerExecutionTests/CircuitGracefulTerminationTests.cs b/src/Components/test/E2ETest/ServerExecutionTests/CircuitGracefulTerminationTests.cs
index 188fae57d0..d392289944 100644
--- a/src/Components/test/E2ETest/ServerExecutionTests/CircuitGracefulTerminationTests.cs
+++ b/src/Components/test/E2ETest/ServerExecutionTests/CircuitGracefulTerminationTests.cs
@@ -68,9 +68,6 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
         {
             // Arrange & Act
             Browser.Close();
-            // Set to null so that other tests in this class can create a new browser if necessary so
-            // that tests don't fail when running together.
-
             await Task.WhenAny(Task.Delay(10000), GracefulDisconnectCompletionSource.Task);
 
             // Assert
diff --git a/src/Components/test/E2ETest/ServerExecutionTests/ComponentHubInvalidEventTest.cs b/src/Components/test/E2ETest/ServerExecutionTests/ComponentHubInvalidEventTest.cs
new file mode 100644
index 0000000000..8621107ec4
--- /dev/null
+++ b/src/Components/test/E2ETest/ServerExecutionTests/ComponentHubInvalidEventTest.cs
@@ -0,0 +1,138 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Text.Json;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Components.E2ETest;
+using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
+using Microsoft.AspNetCore.Components.RenderTree;
+using Microsoft.AspNetCore.Components.Web;
+using Microsoft.AspNetCore.SignalR.Client;
+using Microsoft.Extensions.Logging;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Microsoft.AspNetCore.Components.E2ETests.ServerExecutionTests
+{
+    public class ComponentHubInvalidEventTest : IgnitorTest<AspNetSiteServerFixture>
+    {
+        public ComponentHubInvalidEventTest(AspNetSiteServerFixture serverFixture, ITestOutputHelper output)
+            : base(serverFixture, output)
+        {
+        }
+
+        protected override void InitializeFixture(AspNetSiteServerFixture serverFixture)
+        {
+            serverFixture.BuildWebHostMethod = TestServer.Program.BuildWebHost;
+        }
+
+        protected async override Task InitializeAsync()
+        {
+            var rootUri = ServerFixture.RootUri;
+            Assert.True(await Client.ConnectAsync(new Uri(rootUri, "/subdir")), "Couldn't connect to the app");
+            Assert.Single(Batches);
+
+            await Client.SelectAsync("test-selector-select", "BasicTestApp.CounterComponent");
+            Assert.Equal(2, Batches.Count);
+        }
+
+        [Fact]
+        public async Task DispatchingAnInvalidEventArgument_DoesNotProduceWarnings()
+        {
+            // Arrange
+            var expectedError = $"There was an unhandled exception on the current circuit, so this circuit will be terminated. For more details turn on " +
+                $"detailed exceptions in 'CircuitOptions.DetailedErrors'. Bad input data.";
+
+            var eventDescriptor = Serialize(new WebEventDescriptor()
+            {
+                BrowserRendererId = 0,
+                EventHandlerId = 3,
+                EventArgsType = "mouse",
+            });
+
+            // Act
+            await Client.ExpectCircuitError(() => Client.HubConnection.SendAsync(
+                "DispatchBrowserEvent",
+                eventDescriptor,
+                "{sadfadsf]"));
+
+            // Assert
+            var actualError = Assert.Single(Errors);
+            Assert.Equal(expectedError, actualError);
+            Assert.DoesNotContain(Logs, l => l.LogLevel > LogLevel.Information);
+            Assert.Contains(Logs, l => (l.LogLevel, l.Exception?.Message) == (LogLevel.Debug, "There was an error parsing the event arguments. EventId: '3'."));
+        }
+
+        [Fact]
+        public async Task DispatchingAnInvalidEvent_DoesNotTriggerWarnings()
+        {
+            // Arrange
+            var expectedError = $"There was an unhandled exception on the current circuit, so this circuit will be terminated. For more details turn on " +
+                $"detailed exceptions in 'CircuitOptions.DetailedErrors'. Failed to dispatch event.";
+
+            var eventDescriptor = Serialize(new WebEventDescriptor()
+            {
+                BrowserRendererId = 0,
+                EventHandlerId = 1990,
+                EventArgsType = "mouse",
+            });
+
+            var eventArgs = new MouseEventArgs
+            {
+                Type = "click",
+                Detail = 1,
+                ScreenX = 47,
+                ScreenY = 258,
+                ClientX = 47,
+                ClientY = 155,
+            };
+
+            // Act
+            await Client.ExpectCircuitError(() => Client.HubConnection.SendAsync(
+                "DispatchBrowserEvent",
+                eventDescriptor,
+                Serialize(eventArgs)));
+
+            // Assert
+            var actualError = Assert.Single(Errors);
+            Assert.Equal(expectedError, actualError);
+            Assert.DoesNotContain(Logs, l => l.LogLevel > LogLevel.Information);
+            Assert.Contains(Logs, l => (l.LogLevel, l.Message, l.Exception?.Message) ==
+                (LogLevel.Debug,
+                "There was an error dispatching the event '1990' to the application.",
+                "There is no event handler associated with this event. EventId: '1990'. (Parameter 'eventHandlerId')"));
+        }
+
+        [Fact]
+        public async Task DispatchingAnInvalidRenderAcknowledgement_DoesNotTriggerWarnings()
+        {
+            // Arrange
+            var expectedError = $"There was an unhandled exception on the current circuit, so this circuit will be terminated. For more details turn on " +
+                $"detailed exceptions in 'CircuitOptions.DetailedErrors'. Failed to complete render batch '1846'.";
+
+
+            Client.ConfirmRenderBatch = false;
+            await Client.ClickAsync("counter");
+
+            // Act
+            await Client.ExpectCircuitError(() => Client.HubConnection.SendAsync(
+                "OnRenderCompleted",
+                1846,
+                null));
+
+            // Assert
+            var actualError = Assert.Single(Errors);
+            Assert.Equal(expectedError, actualError);
+            Assert.DoesNotContain(Logs, l => l.LogLevel > LogLevel.Information);
+
+            var entry = Assert.Single(Logs, l => l.EventId.Name == "OnRenderCompletedFailed");
+            Assert.Equal(LogLevel.Debug, entry.LogLevel);
+            Assert.Matches("Failed to complete render batch '1846' in circuit host '.*'\\.", entry.Message);
+            Assert.Equal("Received an acknowledgement for batch with id '1846' when the last batch produced was '4'.", entry.Exception.Message);
+        }
+
+        private string Serialize<T>(T browserEventDescriptor) =>
+            JsonSerializer.Serialize(browserEventDescriptor, TestJsonSerializerOptionsProvider.Options);
+    }
+}
diff --git a/src/Components/test/E2ETest/ServerExecutionTests/ComponentHubReliabilityTest.cs b/src/Components/test/E2ETest/ServerExecutionTests/ComponentHubReliabilityTest.cs
index afb29e3a05..8d770e64de 100644
--- a/src/Components/test/E2ETest/ServerExecutionTests/ComponentHubReliabilityTest.cs
+++ b/src/Components/test/E2ETest/ServerExecutionTests/ComponentHubReliabilityTest.cs
@@ -2,69 +2,31 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Data;
-using System.Text.RegularExpressions;
-using System.Diagnostics;
 using System.Text.Json;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Ignitor;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
+using Microsoft.AspNetCore.Components.RenderTree;
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.SignalR.Client;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Testing;
 using Xunit;
 using Xunit.Abstractions;
 
 namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
 {
-    public class ComponentHubReliabilityTest : IClassFixture<AspNetSiteServerFixture>, IDisposable
+    public class ComponentHubReliabilityTest : IgnitorTest<AspNetSiteServerFixture>
     {
-        private static readonly TimeSpan DefaultLatencyTimeout = TimeSpan.FromSeconds(Debugger.IsAttached ? 60 : 10);
-        private readonly AspNetSiteServerFixture _serverFixture;
-
         public ComponentHubReliabilityTest(AspNetSiteServerFixture serverFixture, ITestOutputHelper output)
+            : base(serverFixture, output)
         {
-            _serverFixture = serverFixture;
-            Output = output;
+        }
 
+        protected override void InitializeFixture(AspNetSiteServerFixture serverFixture)
+        {
             serverFixture.BuildWebHostMethod = TestServer.Program.BuildWebHost;
-            CreateDefaultConfiguration();
-        }
-
-        public BlazorClient Client { get; set; }
-        public ITestOutputHelper Output { get; set; }
-        private IList<Batch> Batches { get; set; } = new List<Batch>();
-        private IList<string> Errors { get; set; } = new List<string>();
-        private ConcurrentQueue<LogMessage> Logs { get; set; } = new ConcurrentQueue<LogMessage>();
-
-        public TestSink TestSink { get; set; }
-
-        private void CreateDefaultConfiguration()
-        {
-            Client = new BlazorClient() { DefaultLatencyTimeout = DefaultLatencyTimeout };
-            Client.RenderBatchReceived += (id, data) => Batches.Add(new Batch(id, data));
-            Client.OnCircuitError += (error) => Errors.Add(error);
-            Client.LoggerProvider = new XunitLoggerProvider(Output);
-            Client.FormatError = (error) =>
-            {
-                var logs = string.Join(Environment.NewLine, Logs);
-                return new Exception(error + Environment.NewLine + logs);
-            };
-
-            _ = _serverFixture.RootUri; // this is needed for the side-effects of getting the URI.
-            TestSink = _serverFixture.Host.Services.GetRequiredService<TestSink>();
-            TestSink.MessageLogged += LogMessages;
-        }
-
-        private void LogMessages(WriteContext context)
-        {
-            var log = new LogMessage(context.LogLevel, context.Message, context.Exception);
-            Logs.Enqueue(log);
-            Output.WriteLine(log.ToString());
         }
 
         [Fact]
@@ -72,16 +34,19 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
         {
             // Arrange
             var expectedError = "The circuit host '.*?' has already been initialized.";
-            var rootUri = _serverFixture.RootUri;
+            var rootUri = ServerFixture.RootUri;
             var baseUri = new Uri(rootUri, "/subdir");
-            Assert.True(await Client.ConnectAsync(baseUri, prerendered: false), "Couldn't connect to the app");
+            Assert.True(await Client.ConnectAsync(baseUri), "Couldn't connect to the app");
             Assert.Single(Batches);
 
+            var descriptors = await Client.GetPrerenderDescriptors(baseUri);
+
             // Act
             await Client.ExpectCircuitErrorAndDisconnect(() => Client.HubConnection.SendAsync(
                 "StartCircuit",
                 baseUri,
-                baseUri + "/home"));
+                baseUri + "/home",
+                descriptors));
 
             // Assert
             var actualError = Assert.Single(Errors);
@@ -94,12 +59,13 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
         {
             // Arrange
             var expectedError = "The uris provided are invalid.";
-            var rootUri = _serverFixture.RootUri;
+            var rootUri = ServerFixture.RootUri;
             var uri = new Uri(rootUri, "/subdir");
-            Assert.True(await Client.ConnectAsync(uri, prerendered: false, connectAutomatically: false), "Couldn't connect to the app");
+            Assert.True(await Client.ConnectAsync(uri, connectAutomatically: false), "Couldn't connect to the app");
+            var descriptors = await Client.GetPrerenderDescriptors(uri);
 
             // Act
-            await Client.ExpectCircuitErrorAndDisconnect(() => Client.HubConnection.SendAsync("StartCircuit", null, null));
+            await Client.ExpectCircuitErrorAndDisconnect(() => Client.HubConnection.SendAsync("StartCircuit", null, null, descriptors));
 
             // Assert
             var actualError = Assert.Single(Errors);
@@ -114,14 +80,15 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
         {
             // Arrange
             var expectedError = "The circuit failed to initialize.";
-            var rootUri = _serverFixture.RootUri;
+            var rootUri = ServerFixture.RootUri;
             var uri = new Uri(rootUri, "/subdir");
-            Assert.True(await Client.ConnectAsync(uri, prerendered: false, connectAutomatically: false), "Couldn't connect to the app");
+            Assert.True(await Client.ConnectAsync(uri, connectAutomatically: false), "Couldn't connect to the app");
+            var descriptors = await Client.GetPrerenderDescriptors(uri);
 
             // Act
             //
             // These are valid URIs by the BaseUri doesn't contain the Uri - so it fails to initialize.
-            await Client.ExpectCircuitErrorAndDisconnect(() => Client.HubConnection.SendAsync("StartCircuit", uri, "http://example.com"));
+            await Client.ExpectCircuitErrorAndDisconnect(() => Client.HubConnection.SendAsync("StartCircuit", uri, "http://example.com", descriptors));
 
             // Assert
             var actualError = Assert.Single(Errors);
@@ -134,9 +101,9 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
         {
             // Arrange
             var expectedError = "Circuit not initialized.";
-            var rootUri = _serverFixture.RootUri;
+            var rootUri = ServerFixture.RootUri;
             var baseUri = new Uri(rootUri, "/subdir");
-            Assert.True(await Client.ConnectAsync(baseUri, prerendered: false, connectAutomatically: false));
+            Assert.True(await Client.ConnectAsync(baseUri, connectAutomatically: false));
             Assert.Empty(Batches);
 
             // Act
@@ -160,9 +127,9 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
         {
             // Arrange
             var expectedError = "Circuit not initialized.";
-            var rootUri = _serverFixture.RootUri;
+            var rootUri = ServerFixture.RootUri;
             var baseUri = new Uri(rootUri, "/subdir");
-            Assert.True(await Client.ConnectAsync(baseUri, prerendered: false, connectAutomatically: false));
+            Assert.True(await Client.ConnectAsync(baseUri, connectAutomatically: false));
             Assert.Empty(Batches);
 
             // Act
@@ -184,9 +151,9 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
         {
             // Arrange
             var expectedError = "Circuit not initialized.";
-            var rootUri = _serverFixture.RootUri;
+            var rootUri = ServerFixture.RootUri;
             var baseUri = new Uri(rootUri, "/subdir");
-            Assert.True(await Client.ConnectAsync(baseUri, prerendered: false, connectAutomatically: false));
+            Assert.True(await Client.ConnectAsync(baseUri, connectAutomatically: false));
             Assert.Empty(Batches);
 
             // Act
@@ -202,126 +169,14 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
             Assert.Contains(Logs, l => (l.LogLevel, l.Message) == (LogLevel.Debug, "Call to 'DispatchBrowserEvent' received before the circuit host initialization"));
         }
 
-        private async Task GoToTestComponent(IList<Batch> batches)
-        {
-            var rootUri = _serverFixture.RootUri;
-            Assert.True(await Client.ConnectAsync(new Uri(rootUri, "/subdir"), prerendered: false), "Couldn't connect to the app");
-            Assert.Single(batches);
-
-            await Client.SelectAsync("test-selector-select", "BasicTestApp.CounterComponent");
-            Assert.Equal(2, batches.Count);
-        }
-
-        [Fact]
-        public async Task DispatchingAnInvalidEventArgument_DoesNotProduceWarnings()
-        {
-            // Arrange
-            var expectedError = $"There was an unhandled exception on the current circuit, so this circuit will be terminated. For more details turn on " +
-                $"detailed exceptions in 'CircuitOptions.DetailedErrors'. Bad input data.";
-
-            var eventDescriptor = Serialize(new WebEventDescriptor()
-            {
-                BrowserRendererId = 0,
-                EventHandlerId = 3,
-                EventArgsType = "mouse",
-            });
-
-            await GoToTestComponent(Batches);
-            Assert.Equal(2, Batches.Count);
-
-            // Act
-            await Client.ExpectCircuitError(() => Client.HubConnection.SendAsync(
-                "DispatchBrowserEvent",
-                eventDescriptor,
-                "{sadfadsf]"));
-
-            // Assert
-            var actualError = Assert.Single(Errors);
-            Assert.Equal(expectedError, actualError);
-            Assert.DoesNotContain(Logs, l => l.LogLevel > LogLevel.Information);
-            Assert.Contains(Logs, l => (l.LogLevel, l.Exception?.Message) == (LogLevel.Debug, "There was an error parsing the event arguments. EventId: '3'."));
-        }
-
-        [Fact]
-        public async Task DispatchingAnInvalidEvent_DoesNotTriggerWarnings()
-        {
-            // Arrange
-            var expectedError = $"There was an unhandled exception on the current circuit, so this circuit will be terminated. For more details turn on " +
-                $"detailed exceptions in 'CircuitOptions.DetailedErrors'. Failed to dispatch event.";
-
-            var eventDescriptor = Serialize(new WebEventDescriptor()
-            {
-                BrowserRendererId = 0,
-                EventHandlerId = 1990,
-                EventArgsType = "mouse",
-            });
-
-            var eventArgs = new UIMouseEventArgs
-            {
-                Type = "click",
-                Detail = 1,
-                ScreenX = 47,
-                ScreenY = 258,
-                ClientX = 47,
-                ClientY = 155,
-            };
-
-            await GoToTestComponent(Batches);
-            Assert.Equal(2, Batches.Count);
-
-            // Act
-            await Client.ExpectCircuitError(() => Client.HubConnection.SendAsync(
-                "DispatchBrowserEvent",
-                eventDescriptor,
-                Serialize(eventArgs)));
-
-            // Assert
-            var actualError = Assert.Single(Errors);
-            Assert.Equal(expectedError, actualError);
-            Assert.DoesNotContain(Logs, l => l.LogLevel > LogLevel.Information);
-            Assert.Contains(Logs, l => (l.LogLevel, l.Message, l.Exception?.Message) ==
-                (LogLevel.Debug,
-                "There was an error dispatching the event '1990' to the application.",
-                "There is no event handler associated with this event. EventId: '1990'. (Parameter 'eventHandlerId')"));
-        }
-
-        [Fact]
-        public async Task DispatchingAnInvalidRenderAcknowledgement_DoesNotTriggerWarnings()
-        {
-            // Arrange
-            var expectedError = $"There was an unhandled exception on the current circuit, so this circuit will be terminated. For more details turn on " +
-                $"detailed exceptions in 'CircuitOptions.DetailedErrors'. Failed to complete render batch '1846'.";
-
-            await GoToTestComponent(Batches);
-            Assert.Equal(2, Batches.Count);
-
-            Client.ConfirmRenderBatch = false;
-            await Client.ClickAsync("counter");
-
-            // Act
-            await Client.ExpectCircuitError(() => Client.HubConnection.SendAsync(
-                "OnRenderCompleted",
-                1846,
-                null));
-
-            // Assert
-            var actualError = Assert.Single(Errors);
-            Assert.Equal(expectedError, actualError);
-            Assert.DoesNotContain(Logs, l => l.LogLevel > LogLevel.Information);
-            Assert.Contains(Logs, l => (l.LogLevel, l.Message, l.Exception?.Message) ==
-                (LogLevel.Debug,
-                $"Failed to complete render batch '1846' in circuit host '{Client.CircuitId}'.",
-                "Received an acknowledgement for batch with id '1846' when the last batch produced was '4'."));
-        }
-
         [Fact]
         public async Task CannotInvokeOnRenderCompletedBeforeInitialization()
         {
             // Arrange
             var expectedError = "Circuit not initialized.";
-            var rootUri = _serverFixture.RootUri;
+            var rootUri = ServerFixture.RootUri;
             var baseUri = new Uri(rootUri, "/subdir");
-            Assert.True(await Client.ConnectAsync(baseUri, prerendered: false, connectAutomatically: false));
+            Assert.True(await Client.ConnectAsync(baseUri, connectAutomatically: false));
             Assert.Empty(Batches);
 
             // Act
@@ -342,9 +197,9 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
         {
             // Arrange
             var expectedError = "Circuit not initialized.";
-            var rootUri = _serverFixture.RootUri;
+            var rootUri = ServerFixture.RootUri;
             var baseUri = new Uri(rootUri, "/subdir");
-            Assert.True(await Client.ConnectAsync(baseUri, prerendered: false, connectAutomatically: false));
+            Assert.True(await Client.ConnectAsync(baseUri, connectAutomatically: false));
             Assert.Empty(Batches);
 
             // Act
@@ -368,9 +223,9 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
                 "For more details turn on detailed exceptions in 'CircuitOptions.DetailedErrors'. " +
                 "Location change to 'http://example.com' failed.";
 
-            var rootUri = _serverFixture.RootUri;
+            var rootUri = ServerFixture.RootUri;
             var baseUri = new Uri(rootUri, "/subdir");
-            Assert.True(await Client.ConnectAsync(baseUri, prerendered: false), "Couldn't connect to the app");
+            Assert.True(await Client.ConnectAsync(baseUri), "Couldn't connect to the app");
             Assert.Single(Batches);
 
             // Act
@@ -383,10 +238,10 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
             var actualError = Assert.Single(Errors);
             Assert.Equal(expectedError, actualError);
             Assert.DoesNotContain(Logs, l => l.LogLevel > LogLevel.Information);
-            Assert.Contains(Logs, l =>
-            {
-                return (l.LogLevel, l.Message) == (LogLevel.Debug, $"Location change to 'http://example.com' in circuit '{Client.CircuitId}' failed.");
-            });
+
+            var entry = Assert.Single(Logs, l => l.EventId.Name == "LocationChangeFailed");
+            Assert.Equal(LogLevel.Debug, entry.LogLevel);
+            Assert.Matches("Location change to 'http://example.com' in circuit '.*' failed\\.", entry.Message);
         }
 
         [Fact]
@@ -397,9 +252,9 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
                 "For more details turn on detailed exceptions in 'CircuitOptions.DetailedErrors'. " +
                 "Location change failed.";
 
-            var rootUri = _serverFixture.RootUri;
+            var rootUri = ServerFixture.RootUri;
             var baseUri = new Uri(rootUri, "/subdir");
-            Assert.True(await Client.ConnectAsync(baseUri, prerendered: false), "Couldn't connect to the app");
+            Assert.True(await Client.ConnectAsync(baseUri), "Couldn't connect to the app");
             Assert.Single(Batches);
 
             await Client.SelectAsync("test-selector-select", "BasicTestApp.NavigationFailureComponent");
@@ -413,10 +268,10 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
             // Assert
             var actualError = Assert.Single(Errors);
             Assert.Equal(expectedError, actualError);
-            Assert.Contains(Logs, l =>
-            {
-                return (l.LogLevel, l.Message) == (LogLevel.Error, $"Location change to '{new Uri(_serverFixture.RootUri,"/test")}' in circuit '{Client.CircuitId}' failed.");
-            });
+
+            var entry = Assert.Single(Logs, l => l.EventId.Name == "LocationChangeFailed");
+            Assert.Equal(LogLevel.Error, entry.LogLevel);
+            Assert.Matches($"Location change to '{new Uri(ServerFixture.RootUri, "/test")}' in circuit '.*' failed\\.", entry.Message);
         }
 
         [Theory]
@@ -431,9 +286,9 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
         {
             // Arrange
             var expectedError = "Unhandled exception in circuit .*";
-            var rootUri = _serverFixture.RootUri;
+            var rootUri = ServerFixture.RootUri;
             var baseUri = new Uri(rootUri, "/subdir");
-            Assert.True(await Client.ConnectAsync(baseUri, prerendered: false), "Couldn't connect to the app");
+            Assert.True(await Client.ConnectAsync(baseUri), "Couldn't connect to the app");
             Assert.Single(Batches);
 
             await Client.SelectAsync("test-selector-select", "BasicTestApp.ReliabilityComponent");
@@ -462,9 +317,9 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
         {
             // Arrange
             var expectedError = "Unhandled exception in circuit .*";
-            var rootUri = _serverFixture.RootUri;
+            var rootUri = ServerFixture.RootUri;
             var baseUri = new Uri(rootUri, "/subdir");
-            Assert.True(await Client.ConnectAsync(baseUri, prerendered: false), "Couldn't connect to the app");
+            Assert.True(await Client.ConnectAsync(baseUri), "Couldn't connect to the app");
             Assert.Single(Batches);
 
             await Client.SelectAsync("test-selector-select", "BasicTestApp.ReliabilityComponent");
@@ -488,45 +343,5 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
                 Logs,
                 e => LogLevel.Error == e.LogLevel && Regex.IsMatch(e.Message, expectedError));
         }
-
-        public void Dispose()
-        {
-            TestSink.MessageLogged -= LogMessages;
-        }
-
-        private string Serialize<T>(T browserEventDescriptor) =>
-            JsonSerializer.Serialize(browserEventDescriptor, TestJsonSerializerOptionsProvider.Options);
-
-        [DebuggerDisplay("{LogLevel.ToString(),nq} - {Message ?? \"null\",nq} - {Exception?.Message,nq}")]
-        private class LogMessage
-        {
-            public LogMessage(LogLevel logLevel, string message, Exception exception)
-            {
-                LogLevel = logLevel;
-                Message = message;
-                Exception = exception;
-            }
-
-            public LogLevel LogLevel { get; set; }
-            public string Message { get; set; }
-            public Exception Exception { get; set; }
-
-            public override string ToString()
-            {
-                return $"{LogLevel}: {Message}{(Exception != null ? Environment.NewLine : "")}{Exception}";
-            }
-        }
-
-        private class Batch
-        {
-            public Batch(int id, byte[] data)
-            {
-                Id = id;
-                Data = data;
-            }
-
-            public int Id { get; }
-            public byte[] Data { get; }
-        }
     }
 }
diff --git a/src/Components/test/E2ETest/ServerExecutionTests/IgnitorTest.cs b/src/Components/test/E2ETest/ServerExecutionTests/IgnitorTest.cs
new file mode 100644
index 0000000000..ed9cd36c68
--- /dev/null
+++ b/src/Components/test/E2ETest/ServerExecutionTests/IgnitorTest.cs
@@ -0,0 +1,131 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Threading.Tasks;
+using Ignitor;
+using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Testing;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Microsoft.AspNetCore.Components
+{
+    // Base class for Ignitor-based tests.
+    public abstract class IgnitorTest<TFixture> : IClassFixture<TFixture>, IAsyncLifetime
+        where TFixture : ServerFixture
+    {
+        private static readonly TimeSpan DefaultTimeout = Debugger.IsAttached ? TimeSpan.MaxValue : TimeSpan.FromSeconds(30);
+
+        protected IgnitorTest(TFixture serverFixture, ITestOutputHelper output)
+        {
+            ServerFixture = serverFixture;
+            Output = output;
+        }
+
+        protected BlazorClient Client { get; private set; }
+
+        protected ConcurrentQueue<LogMessage> Logs { get; } = new ConcurrentQueue<LogMessage>();
+
+        protected ITestOutputHelper Output { get; }
+
+        protected TFixture ServerFixture { get; }
+
+        protected TimeSpan Timeout { get; set; } = DefaultTimeout;
+
+        private TestSink TestSink { get; set; }
+
+        protected IReadOnlyCollection<CapturedRenderBatch> Batches => Client?.Operations?.Batches;
+
+        protected IReadOnlyCollection<string> DotNetCompletions => Client?.Operations?.DotNetCompletions;
+
+        protected IReadOnlyCollection<string> Errors => Client?.Operations?.Errors;
+
+        protected IReadOnlyCollection<CapturedJSInteropCall> JSInteropCalls => Client?.Operations?.JSInteropCalls;
+
+        // Called to initialize the fixture as part of InitializeAsync.
+        protected virtual void InitializeFixture(TFixture serverFixture)
+        {
+        }
+
+        async Task IAsyncLifetime.InitializeAsync()
+        {
+            Client = new BlazorClient()
+            {
+                CaptureOperations = true,
+                DefaultOperationTimeout = Timeout,
+            };
+            Client.LoggerProvider = new XunitLoggerProvider(Output);
+            Client.FormatError = (error) =>
+            {
+                var logs = string.Join(Environment.NewLine, Logs);
+                return new Exception(error + Environment.NewLine + logs);
+            };
+
+            InitializeFixture(ServerFixture);
+            _ = ServerFixture.RootUri; // This is needed for the side-effects of starting the server.
+
+            if (ServerFixture is WebHostServerFixture hostFixture)
+            {
+                TestSink = hostFixture.Host.Services.GetRequiredService<TestSink>();
+                TestSink.MessageLogged += TestSink_MessageLogged;
+            }
+
+            await InitializeAsync();
+        }
+
+        async Task IAsyncLifetime.DisposeAsync()
+        {
+            if (TestSink != null)
+            {
+                TestSink.MessageLogged -= TestSink_MessageLogged;
+            }
+
+            await DisposeAsync();
+        }
+
+        protected virtual Task InitializeAsync()
+        {
+            return Task.CompletedTask;
+        }
+
+        protected virtual Task DisposeAsync()
+        {
+            return Task.CompletedTask;
+        }
+
+        private void TestSink_MessageLogged(WriteContext context)
+        {
+            var log = new LogMessage(context.LogLevel, context.EventId, context.Message, context.Exception);
+            Logs.Enqueue(log);
+            Output.WriteLine(log.ToString());
+        }
+
+        [DebuggerDisplay("{LogLevel.ToString(),nq} - {Message ?? \"null\",nq} - {Exception?.Message,nq}")]
+        protected sealed class LogMessage
+        {
+            public LogMessage(LogLevel logLevel, EventId eventId, string message, Exception exception)
+            {
+                LogLevel = logLevel;
+                EventId = eventId;
+                Message = message;
+                Exception = exception;
+            }
+
+            public LogLevel LogLevel { get; set; }
+            public EventId EventId { get; set; }
+            public string Message { get; set; }
+            public Exception Exception { get; set; }
+
+            public override string ToString()
+            {
+                return $"{LogLevel}: {EventId} {Message}{(Exception != null ? Environment.NewLine : "")}{Exception}";
+            }
+        }
+    }
+}
diff --git a/src/Components/test/E2ETest/ServerExecutionTests/InteropReliabilityTests.cs b/src/Components/test/E2ETest/ServerExecutionTests/InteropReliabilityTests.cs
index 0e9b6568ef..a848669b78 100644
--- a/src/Components/test/E2ETest/ServerExecutionTests/InteropReliabilityTests.cs
+++ b/src/Components/test/E2ETest/ServerExecutionTests/InteropReliabilityTests.cs
@@ -2,18 +2,16 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Ignitor;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
-using Microsoft.AspNetCore.Components.Rendering;
+using Microsoft.AspNetCore.Components.RenderTree;
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.SignalR.Client;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Testing;
@@ -22,55 +20,26 @@ using Xunit.Abstractions;
 
 namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
 {
-    [Flaky("https://github.com/aspnet/AspNetCore/issues/13086", FlakyOn.All)]
-    public class InteropReliabilityTests : IClassFixture<AspNetSiteServerFixture>, IDisposable
+    public class InteropReliabilityTests : IgnitorTest<AspNetSiteServerFixture>
     {
-        private static readonly TimeSpan DefaultLatencyTimeout = TimeSpan.FromSeconds(30);
-        private readonly AspNetSiteServerFixture _serverFixture;
-
         public InteropReliabilityTests(AspNetSiteServerFixture serverFixture, ITestOutputHelper output)
+            : base(serverFixture, output)
         {
-            _serverFixture = serverFixture;
-            Output = output;
+        }
 
+        protected override void InitializeFixture(AspNetSiteServerFixture serverFixture)
+        {
             serverFixture.BuildWebHostMethod = TestServer.Program.BuildWebHost;
-            CreateDefaultConfiguration();
         }
 
-        public BlazorClient Client { get; set; }
-        public ITestOutputHelper Output { get; set; }
-        private IList<Batch> Batches { get; set; } = new List<Batch>();
-        private List<DotNetCompletion> DotNetCompletions = new List<DotNetCompletion>();
-        private List<JSInteropCall> JSInteropCalls = new List<JSInteropCall>();
-        private IList<string> Errors { get; set; } = new List<string>();
-        private ConcurrentQueue<LogMessage> Logs { get; set; } = new ConcurrentQueue<LogMessage>();
-
-        public TestSink TestSink { get; set; }
-
-        private void CreateDefaultConfiguration()
+        protected async override Task InitializeAsync()
         {
-            Client = new BlazorClient() { DefaultLatencyTimeout = DefaultLatencyTimeout };
-            Client.RenderBatchReceived += (id, data) => Batches.Add(new Batch(id, data));
-            Client.DotNetInteropCompletion += (method) => DotNetCompletions.Add(new DotNetCompletion(method));
-            Client.JSInterop += (asyncHandle, identifier, argsJson) => JSInteropCalls.Add(new JSInteropCall(asyncHandle, identifier, argsJson));
-            Client.OnCircuitError += (error) => Errors.Add(error);
-            Client.LoggerProvider = new XunitLoggerProvider(Output);
-            Client.FormatError = (error) =>
-            {
-                var logs = string.Join(Environment.NewLine, Logs);
-                return new Exception(error + Environment.NewLine + logs);
-            };
+            var rootUri = ServerFixture.RootUri;
+            Assert.True(await Client.ConnectAsync(new Uri(rootUri, "/subdir")), "Couldn't connect to the app");
+            Assert.Single(Batches);
 
-            _ = _serverFixture.RootUri; // this is needed for the side-effects of getting the URI.
-            TestSink = _serverFixture.Host.Services.GetRequiredService<TestSink>();
-            TestSink.MessageLogged += LogMessages;
-        }
-
-        private void LogMessages(WriteContext context)
-        {
-            var log = new LogMessage(context.LogLevel, context.Message, context.Exception);
-            Logs.Enqueue(log);
-            Output.WriteLine(log.ToString());
+            await Client.SelectAsync("test-selector-select", "BasicTestApp.ReliabilityComponent");
+            Assert.Equal(2, Batches.Count);
         }
 
         [Fact]
@@ -80,7 +49,6 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
             var expectedError = "[\"1\"," +
                 "false," +
                 "\"There was an exception invoking \\u0027WriteAllText\\u0027 on assembly \\u0027System.IO.FileSystem\\u0027. For more details turn on detailed exceptions in \\u0027CircuitOptions.DetailedErrors\\u0027\"]";
-            await GoToTestComponent(Batches);
 
             // Act
             await Client.InvokeDotNetMethod(
@@ -91,7 +59,7 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
                 JsonSerializer.Serialize(new[] { ".\\log.txt", "log" }));
 
             // Assert
-            Assert.Single(DotNetCompletions, c => c.Message == expectedError);
+            Assert.Single(DotNetCompletions, c => c == expectedError);
             await ValidateClientKeepsWorking(Client, Batches);
         }
 
@@ -103,8 +71,6 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
                 "false," +
                 "\"There was an exception invoking \\u0027MadeUpMethod\\u0027 on assembly \\u0027BasicTestApp\\u0027. For more details turn on detailed exceptions in \\u0027CircuitOptions.DetailedErrors\\u0027\"]";
 
-            await GoToTestComponent(Batches);
-
             // Act
             await Client.InvokeDotNetMethod(
                 "1",
@@ -114,7 +80,7 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
                 JsonSerializer.Serialize(new[] { ".\\log.txt", "log" }));
 
             // Assert
-            Assert.Single(DotNetCompletions, c => c.Message == expectedError);
+            Assert.Single(DotNetCompletions, c => c == expectedError);
             await ValidateClientKeepsWorking(Client, Batches);
         }
 
@@ -126,18 +92,16 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
                 "false," +
                 "\"There was an exception invoking \\u0027NotifyLocationChanged\\u0027 on assembly \\u0027Microsoft.AspNetCore.Components.Server\\u0027. For more details turn on detailed exceptions in \\u0027CircuitOptions.DetailedErrors\\u0027\"]";
 
-            await GoToTestComponent(Batches);
-
             // Act
             await Client.InvokeDotNetMethod(
                 "1",
                 "Microsoft.AspNetCore.Components.Server",
                 "NotifyLocationChanged",
                 null,
-                JsonSerializer.Serialize(new[] { _serverFixture.RootUri }));
+                JsonSerializer.Serialize(new[] { ServerFixture.RootUri }));
 
             // Assert
-            Assert.Single(DotNetCompletions, c => c.Message == expectedError);
+            Assert.Single(DotNetCompletions, c => c == expectedError);
             await ValidateClientKeepsWorking(Client, Batches);
         }
 
@@ -149,18 +113,16 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
                 "false," +
                 "\"There was an exception invoking \\u0027NotifyLocationChanged\\u0027 on assembly \\u0027\\u0027. For more details turn on detailed exceptions in \\u0027CircuitOptions.DetailedErrors\\u0027\"]";
 
-            await GoToTestComponent(Batches);
-
             // Act
             await Client.InvokeDotNetMethod(
                 "1",
                 "",
                 "NotifyLocationChanged",
                 null,
-                JsonSerializer.Serialize(new object[] { _serverFixture.RootUri + "counter", false }));
+                JsonSerializer.Serialize(new object[] { ServerFixture.RootUri + "counter", false }));
 
             // Assert
-            Assert.Single(DotNetCompletions, c => c.Message == expectedError);
+            Assert.Single(DotNetCompletions, c => c == expectedError);
             await ValidateClientKeepsWorking(Client, Batches);
         }
 
@@ -172,18 +134,16 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
                 "false," +
                 "\"There was an exception invoking \\u0027\\u0027 on assembly \\u0027Microsoft.AspNetCore.Components.Server\\u0027. For more details turn on detailed exceptions in \\u0027CircuitOptions.DetailedErrors\\u0027\"]";
 
-            await GoToTestComponent(Batches);
-
             // Act
             await Client.InvokeDotNetMethod(
                 "1",
                 "Microsoft.AspNetCore.Components.Server",
                 "",
                 null,
-                JsonSerializer.Serialize(new object[] { _serverFixture.RootUri + "counter", false }));
+                JsonSerializer.Serialize(new object[] { ServerFixture.RootUri + "counter", false }));
 
             // Assert
-            Assert.Single(DotNetCompletions, c => c.Message == expectedError);
+            Assert.Single(DotNetCompletions, c => c == expectedError);
 
             await ValidateClientKeepsWorking(Client, Batches);
         }
@@ -195,9 +155,7 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
             var expectedDotNetObjectRef = "[\"1\",true,{\"__dotNetObject\":1}]";
             var expectedError = "[\"1\"," +
                 "false," +
-                "\"There was an exception invoking \\u0027Reverse\\u0027 on assembly \\u0027\\u0027. For more details turn on detailed exceptions in \\u0027CircuitOptions.DetailedErrors\\u0027\"]";
-
-            await GoToTestComponent(Batches);
+                "\"There was an exception invoking \\u0027Reverse\\u0027. For more details turn on detailed exceptions in \\u0027CircuitOptions.DetailedErrors\\u0027\"]";
 
             // Act
             await Client.InvokeDotNetMethod(
@@ -207,7 +165,7 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
                 null,
                 JsonSerializer.Serialize(Array.Empty<object>()));
 
-            Assert.Single(DotNetCompletions, c => c.Message == expectedDotNetObjectRef);
+            Assert.Single(DotNetCompletions, c => c == expectedDotNetObjectRef);
 
             await Client.InvokeDotNetMethod(
                 "1",
@@ -217,7 +175,7 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
                 JsonSerializer.Serialize(Array.Empty<object>()));
 
             // Assert
-            Assert.Single(DotNetCompletions, c => c.Message == "[\"1\",true,\"tnatropmI\"]");
+            Assert.Single(DotNetCompletions, c => c == "[\"1\",true,\"tnatropmI\"]");
 
             await Client.InvokeDotNetMethod(
                 "1",
@@ -226,7 +184,7 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
                 3, // non existing ref
                 JsonSerializer.Serialize(Array.Empty<object>()));
 
-            Assert.Single(DotNetCompletions, c => c.Message == expectedError);
+            Assert.Single(DotNetCompletions, c => c == expectedError);
             await ValidateClientKeepsWorking(Client, Batches);
         }
 
@@ -239,8 +197,6 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
                 "false," +
                 "\"There was an exception invoking \\u0027ReceiveTrivial\\u0027 on assembly \\u0027BasicTestApp\\u0027. For more details turn on detailed exceptions in \\u0027CircuitOptions.DetailedErrors\\u0027\"]";
 
-            await GoToTestComponent(Batches);
-
             await Client.InvokeDotNetMethod(
                 "1",
                 "BasicTestApp",
@@ -248,7 +204,7 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
                 null,
                 JsonSerializer.Serialize(Array.Empty<object>()));
 
-            Assert.Single(DotNetCompletions, c => c.Message == expectedImportantDotNetObjectRef);
+            Assert.Single(DotNetCompletions, c => c == expectedImportantDotNetObjectRef);
 
             // Act
             await Client.InvokeDotNetMethod(
@@ -259,19 +215,16 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
                 JsonSerializer.Serialize(new object[] { new { __dotNetObject = 1 } }));
 
             // Assert
-            Assert.Single(DotNetCompletions, c => c.Message == expectedError);
+            Assert.Single(DotNetCompletions, c => c == expectedError);
             await ValidateClientKeepsWorking(Client, Batches);
         }
 
         [Fact]
-        [Flaky("https://github.com/aspnet/AspNetCore/issues/13086", FlakyOn.AzP.Windows)]
         public async Task ContinuesWorkingAfterInvalidAsyncReturnCallback()
         {
             // Arrange
             var expectedError = "An exception occurred executing JS interop: The JSON value could not be converted to System.Int32. Path: $ | LineNumber: 0 | BytePositionInLine: 3.. See InnerException for more details.";
 
-            await GoToTestComponent(Batches);
-
             // Act
             await Client.ClickAsync("triggerjsinterop-malformed");
 
@@ -279,11 +232,14 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
             Assert.NotEqual(default, call);
 
             var id = call.AsyncHandle;
-            await Client.HubConnection.InvokeAsync(
-                "EndInvokeJSFromDotNet",
-                id,
-                true,
-                $"[{id}, true, \"{{\"]");
+            await Client.ExpectRenderBatch(async () =>
+            {
+                await Client.HubConnection.InvokeAsync(
+                    "EndInvokeJSFromDotNet",
+                    id,
+                    true,
+                    $"[{id}, true, \"{{\"]");
+            });
 
             var text = Assert.Single(
                 Client.FindElementById("errormessage-malformed").Children.OfType<TextNode>(),
@@ -296,10 +252,6 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
         public async Task JSInteropCompletionSuccess()
         {
             // Arrange
-            await GoToTestComponent(Batches);
-            var sink = _serverFixture.Host.Services.GetRequiredService<TestSink>();
-            var logEvents = new List<(LogLevel logLevel, string)>();
-            sink.MessageLogged += (wc) => logEvents.Add((wc.LogLevel, wc.EventId.Name));
 
             // Act
             await Client.ClickAsync("triggerjsinterop-success");
@@ -308,27 +260,27 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
             Assert.NotEqual(default, call);
 
             var id = call.AsyncHandle;
-            await Client.HubConnection.InvokeAsync(
-                "EndInvokeJSFromDotNet",
-                id++,
-                true,
-                $"[{id}, true, null]");
+            await Client.ExpectRenderBatch(async () =>
+            {
+                await Client.HubConnection.InvokeAsync(
+                    "EndInvokeJSFromDotNet",
+                    id,
+                    true,
+                    $"[{id}, true, null]");
+            });
 
             Assert.Single(
                 Client.FindElementById("errormessage-success").Children.OfType<TextNode>(),
                 e => "" == e.TextContent);
 
-            Assert.Contains((LogLevel.Debug, "EndInvokeJSSucceeded"), logEvents);
+            var entry = Assert.Single(Logs, l => l.EventId.Name == "EndInvokeJSSucceeded");
+            Assert.Equal(LogLevel.Debug, entry.LogLevel);
         }
 
         [Fact]
         public async Task JSInteropThrowsInUserCode()
         {
             // Arrange
-            await GoToTestComponent(Batches);
-            var sink = _serverFixture.Host.Services.GetRequiredService<TestSink>();
-            var logEvents = new List<(LogLevel logLevel, string)>();
-            sink.MessageLogged += (wc) => logEvents.Add((wc.LogLevel, wc.EventId.Name));
 
             // Act
             await Client.ClickAsync("triggerjsinterop-failure");
@@ -350,9 +302,10 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
                 Client.FindElementById("errormessage-failure").Children.OfType<TextNode>(),
                 e => "There was an error invoking sendFailureCallbackReturn" == e.TextContent);
 
-            Assert.Contains((LogLevel.Debug, "EndInvokeJSFailed"), logEvents);
+            var entry = Assert.Single(Logs, l => l.EventId.Name == "EndInvokeJSFailed");
+            Assert.Equal(LogLevel.Debug, entry.LogLevel);
 
-            Assert.DoesNotContain(logEvents, m => m.logLevel > LogLevel.Information);
+            Assert.DoesNotContain(Logs, m => m.LogLevel > LogLevel.Information);
 
             await ValidateClientKeepsWorking(Client, Batches);
         }
@@ -361,10 +314,6 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
         public async Task MalformedJSInteropCallbackDisposesCircuit()
         {
             // Arrange
-            await GoToTestComponent(Batches);
-            var sink = _serverFixture.Host.Services.GetRequiredService<TestSink>();
-            var logEvents = new List<(LogLevel logLevel, string)>();
-            sink.MessageLogged += (wc) => logEvents.Add((wc.LogLevel, wc.EventId.Name));
 
             // Act
             await Client.ClickAsync("triggerjsinterop-malformed");
@@ -387,7 +336,8 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
                 Client.FindElementById("errormessage-malformed").Children.OfType<TextNode>(),
                 e => "" == e.TextContent);
 
-            Assert.Contains((LogLevel.Debug, "EndInvokeDispatchException"), logEvents);
+            var entry = Assert.Single(Logs, l => l.EventId.Name == "EndInvokeDispatchException");
+            Assert.Equal(LogLevel.Debug, entry.LogLevel);
 
             await Client.ExpectCircuitErrorAndDisconnect(async () =>
             {
@@ -403,8 +353,6 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
                 "false," +
                 "\"There was an exception invoking \\u0027NotifyLocationChanged\\u0027 on assembly \\u0027Microsoft.AspNetCore.Components.Server\\u0027. For more details turn on detailed exceptions in \\u0027CircuitOptions.DetailedErrors\\u0027\"]";
 
-            await GoToTestComponent(Batches);
-
             // Act
             await Client.InvokeDotNetMethod(
                 "1",
@@ -414,7 +362,7 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
                 "[ \"invalidPayload\"}");
 
             // Assert
-            Assert.Single(DotNetCompletions, c => c.Message == expectedError);
+            Assert.Single(DotNetCompletions, c => c == expectedError);
             await ValidateClientKeepsWorking(Client, Batches);
         }
 
@@ -426,8 +374,6 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
                 "false," +
                 "\"There was an exception invoking \\u0027ReceiveTrivial\\u0027 on assembly \\u0027BasicTestApp\\u0027. For more details turn on detailed exceptions in \\u0027CircuitOptions.DetailedErrors\\u0027\"]";
 
-            await GoToTestComponent(Batches);
-
             // Act
             await Client.InvokeDotNetMethod(
                 "1",
@@ -437,7 +383,7 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
                 "[ { \"data\": {\"}} ]");
 
             // Assert
-            Assert.Single(DotNetCompletions, c => c.Message == expectedError);
+            Assert.Single(DotNetCompletions, c => c == expectedError);
             await ValidateClientKeepsWorking(Client, Batches);
         }
 
@@ -445,10 +391,6 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
         public async Task DispatchingEventsWithInvalidPayloadsShutsDownCircuitGracefully()
         {
             // Arrange
-            await GoToTestComponent(Batches);
-            var sink = _serverFixture.Host.Services.GetRequiredService<TestSink>();
-            var logEvents = new List<(LogLevel logLevel, string)>();
-            sink.MessageLogged += (wc) => logEvents.Add((wc.LogLevel, wc.EventId.Name));
 
             // Act
             await Client.ExpectCircuitError(async () =>
@@ -459,9 +401,8 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
                 null);
             });
 
-            Assert.Contains(
-                (LogLevel.Debug, "DispatchEventFailedToParseEventData"),
-                logEvents);
+            var entry = Assert.Single(Logs, l => l.EventId.Name == "DispatchEventFailedToParseEventData");
+            Assert.Equal(LogLevel.Debug, entry.LogLevel);
 
             // Taking any other action will fail because the circuit is disposed.
             await Client.ExpectCircuitErrorAndDisconnect(async () =>
@@ -474,10 +415,6 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
         public async Task DispatchingEventsWithInvalidEventDescriptor()
         {
             // Arrange
-            await GoToTestComponent(Batches);
-            var sink = _serverFixture.Host.Services.GetRequiredService<TestSink>();
-            var logEvents = new List<(LogLevel logLevel, string)>();
-            sink.MessageLogged += (wc) => logEvents.Add((wc.LogLevel, wc.EventId.Name));
 
             // Act
             await Client.ExpectCircuitError(async () =>
@@ -488,9 +425,8 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
                 "{}");
             });
 
-            Assert.Contains(
-                (LogLevel.Debug, "DispatchEventFailedToParseEventData"),
-                logEvents);
+            var entry = Assert.Single(Logs, l => l.EventId.Name == "DispatchEventFailedToParseEventData");
+            Assert.Equal(LogLevel.Debug, entry.LogLevel);
 
             // Taking any other action will fail because the circuit is disposed.
             await Client.ExpectCircuitErrorAndDisconnect(async () =>
@@ -503,10 +439,6 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
         public async Task DispatchingEventsWithInvalidEventArgs()
         {
             // Arrange
-            await GoToTestComponent(Batches);
-            var sink = _serverFixture.Host.Services.GetRequiredService<TestSink>();
-            var logEvents = new List<(LogLevel logLevel, string eventIdName, Exception exception)>();
-            sink.MessageLogged += (wc) => logEvents.Add((wc.LogLevel, wc.EventId.Name, wc.Exception));
 
             // Act
             var browserDescriptor = new WebEventDescriptor()
@@ -525,9 +457,9 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
             });
 
             Assert.Contains(
-                logEvents,
-                e => e.eventIdName == "DispatchEventFailedToParseEventData" && e.logLevel == LogLevel.Debug &&
-                     e.exception.Message == "There was an error parsing the event arguments. EventId: '6'.");
+                Logs,
+                e => e.EventId.Name == "DispatchEventFailedToParseEventData" && e.LogLevel == LogLevel.Debug &&
+                     e.Exception.Message == "There was an error parsing the event arguments. EventId: '6'.");
 
             // Taking any other action will fail because the circuit is disposed.
             await Client.ExpectCircuitErrorAndDisconnect(async () =>
@@ -540,13 +472,9 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
         public async Task DispatchingEventsWithInvalidEventHandlerId()
         {
             // Arrange
-            await GoToTestComponent(Batches);
-            var sink = _serverFixture.Host.Services.GetRequiredService<TestSink>();
-            var logEvents = new List<(LogLevel logLevel, string eventIdName, Exception exception)>();
-            sink.MessageLogged += (wc) => logEvents.Add((wc.LogLevel, wc.EventId.Name, wc.Exception));
 
             // Act
-            var mouseEventArgs = new UIMouseEventArgs()
+            var mouseEventArgs = new MouseEventArgs()
             {
                 Type = "click",
                 Detail = 1
@@ -567,9 +495,9 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
             });
 
             Assert.Contains(
-                logEvents,
-                e => e.eventIdName == "DispatchEventFailedToDispatchEvent" && e.logLevel == LogLevel.Debug &&
-                     e.exception is ArgumentException ae && ae.Message.Contains("There is no event handler associated with this event. EventId: '1'."));
+                Logs,
+                e => e.EventId.Name == "DispatchEventFailedToDispatchEvent" && e.LogLevel == LogLevel.Debug &&
+                     e.Exception is ArgumentException ae && ae.Message.Contains("There is no event handler associated with this event. EventId: '1'."));
 
             // Taking any other action will fail because the circuit is disposed.
             await Client.ExpectCircuitErrorAndDisconnect(async () =>
@@ -582,19 +510,18 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
         public async Task EventHandlerThrowsSyncExceptionTerminatesTheCircuit()
         {
             // Arrange
-            await GoToTestComponent(Batches);
-            var sink = _serverFixture.Host.Services.GetRequiredService<TestSink>();
-            var logEvents = new List<(LogLevel logLevel, string eventIdName, Exception exception)>();
-            sink.MessageLogged += (wc) => logEvents.Add((wc.LogLevel, wc.EventId.Name, wc.Exception));
 
             // Act
-            await Client.ClickAsync("event-handler-throw-sync", expectRenderBatch: false);
+            await Client.ExpectCircuitError(async () =>
+            {
+                await Client.ClickAsync("event-handler-throw-sync", expectRenderBatch: false);
+            });
 
             Assert.Contains(
-                logEvents,
-                e => LogLevel.Error == e.logLevel &&
-                    "CircuitUnhandledException" == e.eventIdName &&
-                    "Handler threw an exception" == e.exception.Message);
+                Logs,
+                e => LogLevel.Error == e.LogLevel &&
+                    "CircuitUnhandledException" == e.EventId.Name &&
+                    "Handler threw an exception" == e.Exception.Message);
 
             // Now if you try to click again, you will get *forcibly* disconnected for trying to talk to
             // a circuit that's gone.
@@ -604,7 +531,7 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
             });
         }
 
-        private Task ValidateClientKeepsWorking(BlazorClient Client, IList<Batch> batches) =>
+        private Task ValidateClientKeepsWorking(BlazorClient Client, IReadOnlyCollection<CapturedRenderBatch> batches) =>
             ValidateClientKeepsWorking(Client, () => batches.Count);
 
         private async Task ValidateClientKeepsWorking(BlazorClient Client, Func<int> countAccessor)
@@ -614,75 +541,5 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
 
             Assert.Equal(currentBatches + 1, countAccessor());
         }
-
-        private async Task GoToTestComponent(IList<Batch> batches)
-        {
-            var rootUri = _serverFixture.RootUri;
-            Assert.True(await Client.ConnectAsync(new Uri(rootUri, "/subdir"), prerendered: false), "Couldn't connect to the app");
-            Assert.Single(batches);
-
-            await Client.SelectAsync("test-selector-select", "BasicTestApp.ReliabilityComponent");
-            Assert.Equal(2, batches.Count);
-        }
-
-        public void Dispose()
-        {
-            TestSink.MessageLogged -= LogMessages;
-        }
-
-        private class LogMessage
-        {
-            public LogMessage(LogLevel logLevel, string message, Exception exception)
-            {
-                LogLevel = logLevel;
-                Message = message;
-                Exception = exception;
-            }
-
-            public LogLevel LogLevel { get; set; }
-            public string Message { get; set; }
-            public Exception Exception { get; set; }
-
-            public override string ToString()
-            {
-                return $"{LogLevel}: {Message}{(Exception != null ? Environment.NewLine : "")}{Exception}";
-            }
-        }
-
-        private class Batch
-        {
-            public Batch(int id, byte[] data)
-            {
-                Id = id;
-                Data = data;
-            }
-
-            public int Id { get; }
-            public byte[] Data { get; }
-        }
-
-        private class DotNetCompletion
-        {
-            public DotNetCompletion(string message)
-            {
-                Message = message;
-            }
-
-            public string Message { get; }
-        }
-
-        private class JSInteropCall
-        {
-            public JSInteropCall(int asyncHandle, string identifier, string argsJson)
-            {
-                AsyncHandle = asyncHandle;
-                Identifier = identifier;
-                ArgsJson = argsJson;
-            }
-
-            public int AsyncHandle { get; }
-            public string Identifier { get; }
-            public string ArgsJson { get; }
-        }
     }
 }
diff --git a/src/Components/test/E2ETest/ServerExecutionTests/MultipleRootComponentsTest.cs b/src/Components/test/E2ETest/ServerExecutionTests/MultipleRootComponentsTest.cs
new file mode 100644
index 0000000000..6c516c6ec6
--- /dev/null
+++ b/src/Components/test/E2ETest/ServerExecutionTests/MultipleRootComponentsTest.cs
@@ -0,0 +1,82 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Linq;
+using System.Text.Json;
+using System.Text.RegularExpressions;
+using BasicTestApp;
+using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
+using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
+using Microsoft.AspNetCore.E2ETesting;
+using OpenQA.Selenium;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
+{
+    public class MultipleComponentsTest : BasicTestAppTestBase
+    {
+        private const string MarkerPattern = ".*?<!--Blazor:(.*?)-->.*?";
+
+        public MultipleComponentsTest(
+            BrowserFixture browserFixture,
+            ToggleExecutionModeServerFixture<Program> serverFixture,
+            ITestOutputHelper output)
+            : base(browserFixture, serverFixture.WithServerExecution(), output)
+        {
+        }
+
+        [Fact]
+        public void CanRenderMultipleRootComponents()
+        {
+            Navigate("/prerendered/multiple-components");
+
+            var greets = Browser.FindElements(By.CssSelector(".greet-wrapper .greet")).Select(e => e.Text).ToArray();
+
+            Assert.Equal(4, greets.Length); // 1 statically rendered + 3 prerendered
+            Assert.Single(greets, "Hello John");
+            Assert.Equal(3, greets.Where(g => string.Equals("Hello", g)).Count()); // 3 prerendered
+            var content = Browser.FindElement(By.Id("test-container")).GetAttribute("innerHTML");
+            var markers = ReadMarkers(content);
+            var componentSequence = markers.Select(m => m.Item1.PrerenderId != null).ToArray();
+            var expectedComponentSequence = new bool[]
+            {
+                // true means it was a prerendered component.
+                true,
+                false,
+                false,
+                false,
+                true,
+                false,
+                true,
+            };
+            Assert.Equal(expectedComponentSequence, componentSequence);
+
+            // Once connected, output changes
+            BeginInteractivity();
+
+            Browser.Exists(By.CssSelector("h3.interactive"));
+            var updatedGreets = Browser.FindElements(By.CssSelector(".greet-wrapper .greet")).Select(e => e.Text).ToArray();
+            Assert.Equal(7, updatedGreets.Where(g => string.Equals("Hello Alfred", g)).Count());
+        }
+
+        private (ServerComponentMarker, ServerComponentMarker)[] ReadMarkers(string content)
+        {
+            content = content.Replace("\r\n", "");
+            var matches = Regex.Matches(content, MarkerPattern);
+            var markers = matches.Select(s => JsonSerializer.Deserialize<ServerComponentMarker>(
+                s.Groups[1].Value,
+                ServerComponentSerializationSettings.JsonSerializationOptions));
+
+            var prerenderMarkers = markers.Where(m => m.PrerenderId != null).GroupBy(p => p.PrerenderId).Select(g => (g.First(), g.Skip(1).First())).ToArray();
+            var nonPrerenderMarkers = markers.Where(m => m.PrerenderId == null).Select(g => (g, (ServerComponentMarker)default)).ToArray();
+
+            return prerenderMarkers.Concat(nonPrerenderMarkers).OrderBy(m => m.Item1.Sequence).ToArray();
+        }
+
+        private void BeginInteractivity()
+        {
+            Browser.FindElement(By.Id("load-boot-script")).Click();
+        }
+    }
+}
diff --git a/src/Components/test/E2ETest/ServerExecutionTests/RemoteRendererBufferLimitTest.cs b/src/Components/test/E2ETest/ServerExecutionTests/RemoteRendererBufferLimitTest.cs
index 3ff526ce2d..d77d2e6572 100644
--- a/src/Components/test/E2ETest/ServerExecutionTests/RemoteRendererBufferLimitTest.cs
+++ b/src/Components/test/E2ETest/ServerExecutionTests/RemoteRendererBufferLimitTest.cs
@@ -2,56 +2,34 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
 using Ignitor;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Testing;
 using Xunit;
+using Xunit.Abstractions;
 
 namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
 {
-    public class RemoteRendererBufferLimitTest : IClassFixture<AspNetSiteServerFixture>, IDisposable
+    public class RemoteRendererBufferLimitTest : IgnitorTest<AspNetSiteServerFixture>
     {
-        private static readonly TimeSpan DefaultLatencyTimeout = Debugger.IsAttached ? TimeSpan.FromSeconds(60) : TimeSpan.FromMilliseconds(500);
-
-        private AspNetSiteServerFixture _serverFixture;
-
-        public RemoteRendererBufferLimitTest(AspNetSiteServerFixture serverFixture)
+        public RemoteRendererBufferLimitTest(AspNetSiteServerFixture serverFixture, ITestOutputHelper output)
+            : base(serverFixture, output)
         {
-            serverFixture.BuildWebHostMethod = TestServer.Program.BuildWebHost;
-            _serverFixture = serverFixture;
-
-            // Needed here for side-effects
-            _ = _serverFixture.RootUri;
-
-            Client = new BlazorClient() { DefaultLatencyTimeout = DefaultLatencyTimeout };
-            Client.RenderBatchReceived += (id, data) => Batches.Add(new Batch(id, data));
-
-            Sink = _serverFixture.Host.Services.GetRequiredService<TestSink>();
-            Sink.MessageLogged += LogMessages;
         }
 
-        public BlazorClient Client { get; set; }
-
-        private IList<Batch> Batches { get; set; } = new List<Batch>();
-
-        // We use a stack so that we can search the logs in reverse order
-        private ConcurrentStack<LogMessage> Logs { get; set; } = new ConcurrentStack<LogMessage>();
-
-        public TestSink Sink { get; private set; }
+        protected override void InitializeFixture(AspNetSiteServerFixture serverFixture)
+        {
+            serverFixture.BuildWebHostMethod = TestServer.Program.BuildWebHost;
+        }
 
         [Fact]
         public async Task DispatchedEventsWillKeepBeingProcessed_ButUpdatedWillBeDelayedUntilARenderIsAcknowledged()
         {
             // Arrange
-            var baseUri = new Uri(_serverFixture.RootUri, "/subdir");
-            Assert.True(await Client.ConnectAsync(baseUri, prerendered: false), "Couldn't connect to the app");
+            var baseUri = new Uri(ServerFixture.RootUri, "/subdir");
+            Assert.True(await Client.ConnectAsync(baseUri), "Couldn't connect to the app");
             Assert.Single(Batches);
 
             await Client.SelectAsync("test-selector-select", "BasicTestApp.LimitCounterComponent");
@@ -75,48 +53,11 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
             Client.ConfirmRenderBatch = true;
 
             // This will resume the render batches.
-            await Client.ExpectRenderBatch(() => Client.ConfirmBatch(Batches[^1].Id));
+            await Client.ExpectRenderBatch(() => Client.ConfirmBatch(Batches.Last().Id));
 
             // Assert
             Assert.Equal("12", ((TextNode)Client.FindElementById("the-count").Children.Single()).TextContent);
             Assert.Equal(fullCount + 1, Batches.Count);
         }
-
-        private void LogMessages(WriteContext context) => Logs.Push(new LogMessage(context.LogLevel, context.Message, context.Exception));
-
-        [DebuggerDisplay("{Message,nq}")]
-        private class LogMessage
-        {
-            public LogMessage(LogLevel logLevel, string message, Exception exception)
-            {
-                LogLevel = logLevel;
-                Message = message;
-                Exception = exception;
-            }
-
-            public LogLevel LogLevel { get; set; }
-            public string Message { get; set; }
-            public Exception Exception { get; set; }
-        }
-
-        private class Batch
-        {
-            public Batch(int id, byte[] data)
-            {
-                Id = id;
-                Data = data;
-            }
-
-            public int Id { get; }
-            public byte[] Data { get; }
-        }
-
-        public void Dispose()
-        {
-            if (Sink != null)
-            {
-                Sink.MessageLogged -= LogMessages;
-            }
-        }
     }
 }
diff --git a/src/Components/test/E2ETest/ServerExecutionTests/ServerAuthTest.cs b/src/Components/test/E2ETest/ServerExecutionTests/ServerAuthTest.cs
index 6bbdfbfa54..a596cbc036 100644
--- a/src/Components/test/E2ETest/ServerExecutionTests/ServerAuthTest.cs
+++ b/src/Components/test/E2ETest/ServerExecutionTests/ServerAuthTest.cs
@@ -20,7 +20,7 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
         {
         }
 
-        [Theory(Skip = "https://github.com/aspnet/AspNetCore/issues/12788")]
+        [Theory]
         [InlineData(null, null)]
         [InlineData(null, "Someone")]
         [InlineData("Someone", null)]
diff --git a/src/Components/test/E2ETest/ServerExecutionTests/ServerSideAppTest.cs b/src/Components/test/E2ETest/ServerExecutionTests/ServerSideAppTest.cs
index 4dba75b10c..8ee8f57678 100644
--- a/src/Components/test/E2ETest/ServerExecutionTests/ServerSideAppTest.cs
+++ b/src/Components/test/E2ETest/ServerExecutionTests/ServerSideAppTest.cs
@@ -138,7 +138,7 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
             }
         }
 
-        [Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/12788")]
+        [Fact]
         public void ReconnectUI()
         {
             Browser.FindElement(By.LinkText("Counter")).Click();
@@ -155,7 +155,7 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
                 .Until(driver => reconnectionDialog.GetCssValue("display") == "none");
         }
 
-        [Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/12788")]
+        [Fact]
         public void RendersContinueAfterReconnect()
         {
             Browser.FindElement(By.LinkText("Ticker")).Click();
diff --git a/src/Components/test/E2ETest/Tests/EventTest.cs b/src/Components/test/E2ETest/Tests/EventTest.cs
index 4e10c10219..3434d0c187 100644
--- a/src/Components/test/E2ETest/Tests/EventTest.cs
+++ b/src/Components/test/E2ETest/Tests/EventTest.cs
@@ -6,7 +6,6 @@ using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.E2ETesting;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using OpenQA.Selenium;
 using OpenQA.Selenium.Interactions;
 using Xunit;
diff --git a/src/Components/test/E2ETest/Tests/FormsTest.cs b/src/Components/test/E2ETest/Tests/FormsTest.cs
index ec0c5fcddf..f0a2a7b436 100644
--- a/src/Components/test/E2ETest/Tests/FormsTest.cs
+++ b/src/Components/test/E2ETest/Tests/FormsTest.cs
@@ -7,7 +7,6 @@ using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.E2ETesting;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using OpenQA.Selenium;
 using OpenQA.Selenium.Support.UI;
 using System;
diff --git a/src/Components/test/E2ETest/Tests/RoutingTest.cs b/src/Components/test/E2ETest/Tests/RoutingTest.cs
index dd161bc7a3..4937fa9df9 100644
--- a/src/Components/test/E2ETest/Tests/RoutingTest.cs
+++ b/src/Components/test/E2ETest/Tests/RoutingTest.cs
@@ -418,6 +418,15 @@ namespace Microsoft.AspNetCore.Components.E2ETest.Tests
             Assert.Equal("Oops, that component wasn't found!", app.FindElement(By.Id("test-info")).Text);
         }
 
+        [Fact]
+        public void RoutingToComponentOutsideMainAppWorksWithAdditionalAssemblySpecified()
+        {
+            SetUrlViaPushState("/routeablecomponentfrompackage.html");
+
+            var app = MountTestComponent<TestRouterWithAdditionalAssembly>();
+            Assert.Contains("This component, including the CSS and image required to produce its", app.FindElement(By.CssSelector("div.special-style")).Text);
+        }
+
         [Fact]
         public void ResetsScrollPositionWhenPerformingInternalNavigation_LinkClick()
         {
diff --git a/src/Components/test/Ignitor.Test/RenderBatchReaderTest.cs b/src/Components/test/Ignitor.Test/RenderBatchReaderTest.cs
index dbd46a0e16..a3165c48aa 100644
--- a/src/Components/test/Ignitor.Test/RenderBatchReaderTest.cs
+++ b/src/Components/test/Ignitor.Test/RenderBatchReaderTest.cs
@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Rendering;
 using Microsoft.AspNetCore.Components.RenderTree;
-using Microsoft.AspNetCore.Components.Web.Rendering;
+using Microsoft.AspNetCore.Components.Server.Circuits;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using Xunit;
diff --git a/src/Components/test/testassets/BasicTestApp/AsyncEventHandlerComponent.razor b/src/Components/test/testassets/BasicTestApp/AsyncEventHandlerComponent.razor
index 3b087ba437..a3faf11d11 100644
--- a/src/Components/test/testassets/BasicTestApp/AsyncEventHandlerComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/AsyncEventHandlerComponent.razor
@@ -10,7 +10,7 @@
 {
     TaskCompletionSource<object> _tcs;
     string state = "Stopped";
-    Task Tick(UIMouseEventArgs e)
+    Task Tick(MouseEventArgs e)
     {
         if (_tcs == null)
         {
@@ -27,7 +27,7 @@
         return Task.CompletedTask;
     }
 
-    void Tock(UIMouseEventArgs e)
+    void Tock(MouseEventArgs e)
     {
         _tcs.TrySetResult(null);
     }
diff --git a/src/Components/test/testassets/BasicTestApp/EventCallbackTest/ButtonComponent.razor b/src/Components/test/testassets/BasicTestApp/EventCallbackTest/ButtonComponent.razor
index 2aa00c2ed6..4dc6bb2281 100644
--- a/src/Components/test/testassets/BasicTestApp/EventCallbackTest/ButtonComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/EventCallbackTest/ButtonComponent.razor
@@ -6,7 +6,7 @@
     [Parameter] public EventCallback<int> CountChanged { get; set; }
     [Parameter] public string Text { get; set; }
 
-    Task OnClick(UIMouseEventArgs e)
+    Task OnClick(MouseEventArgs e)
     {
         Count++;
         return CountChanged.InvokeAsync(Count);
diff --git a/src/Components/test/testassets/BasicTestApp/EventCallbackTest/StronglyTypedButton.razor b/src/Components/test/testassets/BasicTestApp/EventCallbackTest/StronglyTypedButton.razor
index ca89f8a576..b3158c082b 100644
--- a/src/Components/test/testassets/BasicTestApp/EventCallbackTest/StronglyTypedButton.razor
+++ b/src/Components/test/testassets/BasicTestApp/EventCallbackTest/StronglyTypedButton.razor
@@ -2,6 +2,6 @@
 <button @onclick="OnClick">@Text</button>
 
 @code {
-    [Parameter] public EventCallback<UIMouseEventArgs> OnClick { get; set; }
+    [Parameter] public EventCallback<MouseEventArgs> OnClick { get; set; }
     [Parameter] public string Text { get; set; }
 }
diff --git a/src/Components/test/testassets/BasicTestApp/FocusEventComponent.razor b/src/Components/test/testassets/BasicTestApp/FocusEventComponent.razor
index eb1f014213..47876f8b02 100644
--- a/src/Components/test/testassets/BasicTestApp/FocusEventComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/FocusEventComponent.razor
@@ -20,25 +20,25 @@
 
     string message;
 
-    void OnFocus(UIFocusEventArgs e)
+    void OnFocus(FocusEventArgs e)
     {
         message += "onfocus,";
         StateHasChanged();
     }
 
-    void OnBlur(UIFocusEventArgs e)
+    void OnBlur(FocusEventArgs e)
     {
         message += "onblur,";
         StateHasChanged();
     }
 
-    void OnFocusIn(UIFocusEventArgs e)
+    void OnFocusIn(FocusEventArgs e)
     {
         message += "onfocusin,";
         StateHasChanged();
     }
 
-    void OnFocusOut(UIFocusEventArgs e)
+    void OnFocusOut(FocusEventArgs e)
     {
         message += "onfocusout,";
         StateHasChanged();
diff --git a/src/Components/test/testassets/BasicTestApp/Index.razor b/src/Components/test/testassets/BasicTestApp/Index.razor
index 5acfe91fa0..f7751abd82 100644
--- a/src/Components/test/testassets/BasicTestApp/Index.razor
+++ b/src/Components/test/testassets/BasicTestApp/Index.razor
@@ -61,6 +61,7 @@
         <option value="BasicTestApp.ReorderingFocusComponent">Reordering focus retention</option>
         <option value="BasicTestApp.RouterTest.NavigationManagerComponent">NavigationManager Test</option>
         <option value="BasicTestApp.RouterTest.TestRouter">Router</option>
+        <option value="BasicTestApp.RouterTest.TestRouterWithAdditionalAssembly">Router with additional assembly</option>
         <option value="BasicTestApp.SvgComponent">SVG</option>
         <option value="BasicTestApp.SvgWithChildComponent">SVG with child component</option>
         <option value="BasicTestApp.TextOnlyComponent">Plain text</option>
diff --git a/src/Components/test/testassets/BasicTestApp/InteropComponent.razor b/src/Components/test/testassets/BasicTestApp/InteropComponent.razor
index 0ce5137686..01504301dc 100644
--- a/src/Components/test/testassets/BasicTestApp/InteropComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/InteropComponent.razor
@@ -72,11 +72,11 @@
         var instanceMethodsTarget = new JavaScriptInterop();
 
         Console.WriteLine("Starting interop invocations.");
-        await JSRuntime.InvokeAsync<object>(
+        await JSRuntime.InvokeVoidAsync(
             "jsInteropTests.invokeDotNetInteropMethodsAsync",
             shouldSupportSyncInterop,
-            DotNetObjectRef.Create(testDTOTOPassByRef),
-            DotNetObjectRef.Create(instanceMethodsTarget));
+            DotNetObjectReference.Create(testDTOTOPassByRef),
+            DotNetObjectReference.Create(instanceMethodsTarget));
 
         if (shouldSupportSyncInterop)
         {
@@ -117,7 +117,7 @@
         var passDotNetObjectByRefArg = new PassDotNetObjectByRefArgs
         {
             StringValue = "My string",
-            TestDto = DotNetObjectRef.Create(passDotNetObjectByRef),
+            TestDto = DotNetObjectReference.Create(passDotNetObjectByRef),
         };
         var result = await JSRuntime.InvokeAsync<ReceiveDotNetObjectByRefArgs>("receiveDotNetObjectByRefAsync", passDotNetObjectByRefArg);
         ReceiveDotNetObjectByRefAsyncResult["stringValueUpper"] = result.StringValueUpper;
@@ -153,7 +153,7 @@
         var passDotNetObjectByRefArg = new PassDotNetObjectByRefArgs
         {
             StringValue = "My string",
-            TestDto = DotNetObjectRef.Create(passDotNetObjectByRef),
+            TestDto = DotNetObjectReference.Create(passDotNetObjectByRef),
         };
         var result = inProcRuntime.Invoke<ReceiveDotNetObjectByRefArgs>("receiveDotNetObjectByRef", passDotNetObjectByRefArg);
         ReceiveDotNetObjectByRefResult["stringValueUpper"] = result.StringValueUpper;
@@ -165,7 +165,7 @@
     {
         public string StringValue { get; set; }
 
-        public DotNetObjectRef<TestDTO> TestDto { get; set; }
+        public DotNetObjectReference<TestDTO> TestDto { get; set; }
     }
 
     public class ReceiveDotNetObjectByRefArgs
@@ -174,6 +174,6 @@
 
         public int TestDtoNonSerializedValue { get; set; }
 
-        public DotNetObjectRef<TestDTO> TestDto { get; set; }
+        public DotNetObjectReference<TestDTO> TestDto { get; set; }
     }
 }
diff --git a/src/Components/test/testassets/BasicTestApp/InteropTest/JavaScriptInterop.cs b/src/Components/test/testassets/BasicTestApp/InteropTest/JavaScriptInterop.cs
index f8b8c154e7..ee33e39b48 100644
--- a/src/Components/test/testassets/BasicTestApp/InteropTest/JavaScriptInterop.cs
+++ b/src/Components/test/testassets/BasicTestApp/InteropTest/JavaScriptInterop.cs
@@ -51,7 +51,7 @@ namespace BasicTestApp.InteropTest
         public static void VoidWithThreeParameters(
             ComplexParameter parameter1,
             byte parameter2,
-            DotNetObjectRef<TestDTO> parameter3)
+            DotNetObjectReference<TestDTO> parameter3)
         {
             Invocations[nameof(VoidWithThreeParameters)] = new object[] { parameter1, parameter2, parameter3.Value.GetNonSerializedValue() };
         }
@@ -60,7 +60,7 @@ namespace BasicTestApp.InteropTest
         public static void VoidWithFourParameters(
             ComplexParameter parameter1,
             byte parameter2,
-            DotNetObjectRef<TestDTO> parameter3,
+            DotNetObjectReference<TestDTO> parameter3,
             int parameter4)
         {
             Invocations[nameof(VoidWithFourParameters)] = new object[] { parameter1, parameter2, parameter3.Value.GetNonSerializedValue(), parameter4 };
@@ -70,7 +70,7 @@ namespace BasicTestApp.InteropTest
         public static void VoidWithFiveParameters(
             ComplexParameter parameter1,
             byte parameter2,
-            DotNetObjectRef<TestDTO> parameter3,
+            DotNetObjectReference<TestDTO> parameter3,
             int parameter4,
             long parameter5)
         {
@@ -81,7 +81,7 @@ namespace BasicTestApp.InteropTest
         public static void VoidWithSixParameters(
             ComplexParameter parameter1,
             byte parameter2,
-            DotNetObjectRef<TestDTO> parameter3,
+            DotNetObjectReference<TestDTO> parameter3,
             int parameter4,
             long parameter5,
             float parameter6)
@@ -93,7 +93,7 @@ namespace BasicTestApp.InteropTest
         public static void VoidWithSevenParameters(
             ComplexParameter parameter1,
             byte parameter2,
-            DotNetObjectRef<TestDTO> parameter3,
+            DotNetObjectReference<TestDTO> parameter3,
             int parameter4,
             long parameter5,
             float parameter6,
@@ -106,7 +106,7 @@ namespace BasicTestApp.InteropTest
         public static void VoidWithEightParameters(
             ComplexParameter parameter1,
             byte parameter2,
-            DotNetObjectRef<TestDTO> parameter3,
+            DotNetObjectReference<TestDTO> parameter3,
             int parameter4,
             long parameter5,
             float parameter6,
@@ -140,7 +140,7 @@ namespace BasicTestApp.InteropTest
         public static object[] EchoThreeParameters(
             ComplexParameter parameter1,
             byte parameter2,
-            DotNetObjectRef<TestDTO> parameter3)
+            DotNetObjectReference<TestDTO> parameter3)
         {
             return new object[] { parameter1, parameter2, parameter3.Value.GetNonSerializedValue() };
         }
@@ -149,7 +149,7 @@ namespace BasicTestApp.InteropTest
         public static object[] EchoFourParameters(
             ComplexParameter parameter1,
             byte parameter2,
-            DotNetObjectRef<TestDTO> parameter3,
+            DotNetObjectReference<TestDTO> parameter3,
             int parameter4)
         {
             return new object[] { parameter1, parameter2, parameter3.Value.GetNonSerializedValue(), parameter4 };
@@ -159,7 +159,7 @@ namespace BasicTestApp.InteropTest
         public static object[] EchoFiveParameters(
             ComplexParameter parameter1,
             byte parameter2,
-            DotNetObjectRef<TestDTO> parameter3,
+            DotNetObjectReference<TestDTO> parameter3,
             int parameter4,
             long parameter5)
         {
@@ -169,7 +169,7 @@ namespace BasicTestApp.InteropTest
         [JSInvokable]
         public static object[] EchoSixParameters(ComplexParameter parameter1,
             byte parameter2,
-            DotNetObjectRef<TestDTO> parameter3,
+            DotNetObjectReference<TestDTO> parameter3,
             int parameter4,
             long parameter5,
             float parameter6)
@@ -180,7 +180,7 @@ namespace BasicTestApp.InteropTest
         [JSInvokable]
         public static object[] EchoSevenParameters(ComplexParameter parameter1,
             byte parameter2,
-            DotNetObjectRef<TestDTO> parameter3,
+            DotNetObjectReference<TestDTO> parameter3,
             int parameter4,
             long parameter5,
             float parameter6,
@@ -193,7 +193,7 @@ namespace BasicTestApp.InteropTest
         public static object[] EchoEightParameters(
             ComplexParameter parameter1,
             byte parameter2,
-            DotNetObjectRef<TestDTO> parameter3,
+            DotNetObjectReference<TestDTO> parameter3,
             int parameter4,
             long parameter5,
             float parameter6,
@@ -230,7 +230,7 @@ namespace BasicTestApp.InteropTest
         public static Task VoidWithThreeParametersAsync(
             ComplexParameter parameter1,
             byte parameter2,
-            DotNetObjectRef<TestDTO> parameter3)
+            DotNetObjectReference<TestDTO> parameter3)
         {
             Invocations[nameof(VoidWithThreeParametersAsync)] = new object[] { parameter1, parameter2, parameter3.Value.GetNonSerializedValue() };
             return Task.CompletedTask;
@@ -240,7 +240,7 @@ namespace BasicTestApp.InteropTest
         public static Task VoidWithFourParametersAsync(
             ComplexParameter parameter1,
             byte parameter2,
-            DotNetObjectRef<TestDTO> parameter3,
+            DotNetObjectReference<TestDTO> parameter3,
             int parameter4)
         {
             Invocations[nameof(VoidWithFourParametersAsync)] = new object[] { parameter1, parameter2, parameter3.Value.GetNonSerializedValue(), parameter4 };
@@ -251,7 +251,7 @@ namespace BasicTestApp.InteropTest
         public static Task VoidWithFiveParametersAsync(
             ComplexParameter parameter1,
             byte parameter2,
-            DotNetObjectRef<TestDTO> parameter3,
+            DotNetObjectReference<TestDTO> parameter3,
             int parameter4,
             long parameter5)
         {
@@ -263,7 +263,7 @@ namespace BasicTestApp.InteropTest
         public static Task VoidWithSixParametersAsync(
             ComplexParameter parameter1,
             byte parameter2,
-            DotNetObjectRef<TestDTO> parameter3,
+            DotNetObjectReference<TestDTO> parameter3,
             int parameter4,
             long parameter5,
             float parameter6)
@@ -276,7 +276,7 @@ namespace BasicTestApp.InteropTest
         public static Task VoidWithSevenParametersAsync(
             ComplexParameter parameter1,
             byte parameter2,
-            DotNetObjectRef<TestDTO> parameter3,
+            DotNetObjectReference<TestDTO> parameter3,
             int parameter4,
             long parameter5,
             float parameter6,
@@ -290,7 +290,7 @@ namespace BasicTestApp.InteropTest
         public static Task VoidWithEightParametersAsync(
             ComplexParameter parameter1,
             byte parameter2,
-            DotNetObjectRef<TestDTO> parameter3,
+            DotNetObjectReference<TestDTO> parameter3,
             int parameter4,
             long parameter5,
             float parameter6,
@@ -325,7 +325,7 @@ namespace BasicTestApp.InteropTest
         public static Task<object[]> EchoThreeParametersAsync(
             ComplexParameter parameter1,
             byte parameter2,
-            DotNetObjectRef<TestDTO> parameter3)
+            DotNetObjectReference<TestDTO> parameter3)
         {
             return Task.FromResult(new object[] { parameter1, parameter2, parameter3.Value.GetNonSerializedValue() });
         }
@@ -334,7 +334,7 @@ namespace BasicTestApp.InteropTest
         public static Task<object[]> EchoFourParametersAsync(
             ComplexParameter parameter1,
             byte parameter2,
-            DotNetObjectRef<TestDTO> parameter3,
+            DotNetObjectReference<TestDTO> parameter3,
             int parameter4)
         {
             return Task.FromResult(new object[] { parameter1, parameter2, parameter3.Value.GetNonSerializedValue(), parameter4 });
@@ -344,7 +344,7 @@ namespace BasicTestApp.InteropTest
         public static Task<object[]> EchoFiveParametersAsync(
             ComplexParameter parameter1,
             byte parameter2,
-            DotNetObjectRef<TestDTO> parameter3,
+            DotNetObjectReference<TestDTO> parameter3,
             int parameter4,
             long parameter5)
         {
@@ -354,7 +354,7 @@ namespace BasicTestApp.InteropTest
         [JSInvokable]
         public static Task<object[]> EchoSixParametersAsync(ComplexParameter parameter1,
             byte parameter2,
-            DotNetObjectRef<TestDTO> parameter3,
+            DotNetObjectReference<TestDTO> parameter3,
             int parameter4,
             long parameter5,
             float parameter6)
@@ -366,7 +366,7 @@ namespace BasicTestApp.InteropTest
         public static Task<object[]> EchoSevenParametersAsync(
             ComplexParameter parameter1,
             byte parameter2,
-            DotNetObjectRef<TestDTO> parameter3,
+            DotNetObjectReference<TestDTO> parameter3,
             int parameter4,
             long parameter5,
             float parameter6,
@@ -379,7 +379,7 @@ namespace BasicTestApp.InteropTest
         public static Task<object[]> EchoEightParametersAsync(
             ComplexParameter parameter1,
             byte parameter2,
-            DotNetObjectRef<TestDTO> parameter3,
+            DotNetObjectReference<TestDTO> parameter3,
             int parameter4,
             long parameter5,
             float parameter6,
@@ -390,26 +390,26 @@ namespace BasicTestApp.InteropTest
         }
 
         [JSInvokable]
-        public static Dictionary<string, DotNetObjectRef<TestDTO>> ReturnDotNetObjectByRef()
+        public static Dictionary<string, DotNetObjectReference<TestDTO>> ReturnDotNetObjectByRef()
         {
-            return new Dictionary<string, DotNetObjectRef<TestDTO>>
+            return new Dictionary<string, DotNetObjectReference<TestDTO>>
             {
-                { "Some sync instance", DotNetObjectRef.Create(new TestDTO(1000)) }
+                { "Some sync instance", DotNetObjectReference.Create(new TestDTO(1000)) }
             };
         }
 
         [JSInvokable]
-        public static async Task<Dictionary<string, DotNetObjectRef<TestDTO>>> ReturnDotNetObjectByRefAsync()
+        public static async Task<Dictionary<string, DotNetObjectReference<TestDTO>>> ReturnDotNetObjectByRefAsync()
         {
             await Task.Yield();
-            return new Dictionary<string, DotNetObjectRef<TestDTO>>
+            return new Dictionary<string, DotNetObjectReference<TestDTO>>
             {
-                { "Some async instance", DotNetObjectRef.Create(new TestDTO(1001)) }
+                { "Some async instance", DotNetObjectReference.Create(new TestDTO(1001)) }
             };
         }
 
         [JSInvokable]
-        public static int ExtractNonSerializedValue(DotNetObjectRef<TestDTO> objectByRef)
+        public static int ExtractNonSerializedValue(DotNetObjectReference<TestDTO> objectByRef)
         {
             return objectByRef.Value.GetNonSerializedValue();
         }
@@ -425,7 +425,7 @@ namespace BasicTestApp.InteropTest
                 ThisTypeName = GetType().Name,
                 StringValueUpper = input.StringValue.ToUpperInvariant(),
                 IncomingByRef = input.DTOByRef.Value.GetNonSerializedValue(),
-                OutgoingByRef = DotNetObjectRef.Create(new TestDTO(1234)),
+                OutgoingByRef = DotNetObjectReference.Create(new TestDTO(1234)),
             };
         }
 
@@ -441,7 +441,7 @@ namespace BasicTestApp.InteropTest
                 ThisTypeName = GetType().Name,
                 StringValueUpper = input.StringValue.ToUpperInvariant(),
                 IncomingByRef = input.DTOByRef.Value.GetNonSerializedValue(),
-                OutgoingByRef = DotNetObjectRef.Create(new TestDTO(1234)),
+                OutgoingByRef = DotNetObjectReference.Create(new TestDTO(1234)),
             };
         }
 
@@ -449,7 +449,7 @@ namespace BasicTestApp.InteropTest
         {
             public string StringValue { get; set; }
 
-            public DotNetObjectRef<TestDTO> DTOByRef { get; set; }
+            public DotNetObjectReference<TestDTO> DTOByRef { get; set; }
         }
 
         public class InstanceMethodOutput
@@ -460,7 +460,7 @@ namespace BasicTestApp.InteropTest
 
             public int IncomingByRef { get; set; }
 
-            public DotNetObjectRef<TestDTO> OutgoingByRef { get; set; }
+            public DotNetObjectReference<TestDTO> OutgoingByRef { get; set; }
         }
     }
 }
diff --git a/src/Components/test/testassets/BasicTestApp/KeyPressEventComponent.razor b/src/Components/test/testassets/BasicTestApp/KeyPressEventComponent.razor
index 16396ba1eb..dd96e41d51 100644
--- a/src/Components/test/testassets/BasicTestApp/KeyPressEventComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/KeyPressEventComponent.razor
@@ -11,7 +11,7 @@ Type here: <input @onkeypress=OnKeyPressed />
 @code {
     List<string> keysPressed = new List<string>();
 
-    void OnKeyPressed(UIKeyboardEventArgs eventArgs)
+    void OnKeyPressed(KeyboardEventArgs eventArgs)
     {
         Console.WriteLine(JsonSerializer.Serialize(eventArgs));
         keysPressed.Add(eventArgs.Key);
diff --git a/src/Components/test/testassets/BasicTestApp/LongRunningInterop.razor b/src/Components/test/testassets/BasicTestApp/LongRunningInterop.razor
index 3a0283797e..81479decd4 100644
--- a/src/Components/test/testassets/BasicTestApp/LongRunningInterop.razor
+++ b/src/Components/test/testassets/BasicTestApp/LongRunningInterop.razor
@@ -33,10 +33,10 @@
         try
         {
             using var cancellationTokenSource = new System.Threading.CancellationTokenSource(TimeSpan.FromSeconds(1));
-            await JSRuntime.InvokeAsync<object>(
+            await JSRuntime.InvokeVoidAsync(
                 "asyncFunctionTakesLongerThanDefaultTimeoutToResolve",
-                Array.Empty<object>(),
-                cancellationTokenSource.Token);
+                cancellationTokenSource.Token,
+                Array.Empty<object>());
         }
         catch (TaskCanceledException)
         {
diff --git a/src/Components/test/testassets/BasicTestApp/MouseEventComponent.razor b/src/Components/test/testassets/BasicTestApp/MouseEventComponent.razor
index 8655090143..a9356c80e0 100644
--- a/src/Components/test/testassets/BasicTestApp/MouseEventComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/MouseEventComponent.razor
@@ -35,63 +35,63 @@
 
     string message;
 
-    void OnMouseOver(UIMouseEventArgs e)
+    void OnMouseOver(MouseEventArgs e)
     {
         DumpEvent(e);
         message += "onmouseover,";
         StateHasChanged();
     }
 
-    void OnMouseOut(UIMouseEventArgs e)
+    void OnMouseOut(MouseEventArgs e)
     {
         DumpEvent(e);
         message += "onmouseout,";
         StateHasChanged();
     }
 
-    void OnMouseMove(UIMouseEventArgs e)
+    void OnMouseMove(MouseEventArgs e)
     {
         DumpEvent(e);
         message += "onmousemove,";
         StateHasChanged();
     }
 
-    void OnMouseDown(UIMouseEventArgs e)
+    void OnMouseDown(MouseEventArgs e)
     {
         DumpEvent(e);
         message += "onmousedown,";
         StateHasChanged();
     }
 
-    void OnMouseUp(UIMouseEventArgs e)
+    void OnMouseUp(MouseEventArgs e)
     {
         DumpEvent(e);
         message += "onmouseup,";
         StateHasChanged();
     }
 
-    void OnPointerDown(UIPointerEventArgs e)
+    void OnPointerDown(PointerEventArgs e)
     {
         DumpEvent(e);
         message += "onpointerdown";
         StateHasChanged();
     }
 
-    void OnDragStart(UIDragEventArgs e)
+    void OnDragStart(DragEventArgs e)
     {
         DumpEvent(e);
         message += "ondragstart,";
         StateHasChanged();
     }
 
-    void OnDrop(UIDragEventArgs e)
+    void OnDrop(DragEventArgs e)
     {
         DumpEvent(e);
         message += "ondrop,";
         StateHasChanged();
     }
 
-    void DumpEvent(UIMouseEventArgs e)
+    void DumpEvent(MouseEventArgs e)
     {
         Console.WriteLine(JsonSerializer.Serialize(e));
     }
diff --git a/src/Components/test/testassets/BasicTestApp/MultipleComponents/GreeterComponent.razor b/src/Components/test/testassets/BasicTestApp/MultipleComponents/GreeterComponent.razor
new file mode 100644
index 0000000000..cd64d86f66
--- /dev/null
+++ b/src/Components/test/testassets/BasicTestApp/MultipleComponents/GreeterComponent.razor
@@ -0,0 +1,19 @@
+<div class="greet-wrapper">
+    <h3 class="@interactive">Greeter component</h3>
+    <p class="greet">Hello @Name</p>
+</div>
+@code{
+    [Parameter] public string Name { get; set; }
+
+    private string interactive = "";
+
+    protected override void OnAfterRender(bool firstRender)
+    {
+        if (firstRender)
+        {
+            Name = "Alfred";
+            interactive = "interactive";
+            StateHasChanged();
+        }
+    }
+}
diff --git a/src/Components/test/testassets/BasicTestApp/RouterTest/NavigationManagerComponent.razor b/src/Components/test/testassets/BasicTestApp/RouterTest/NavigationManagerComponent.razor
index f0c93e6674..c5e422cce1 100644
--- a/src/Components/test/testassets/BasicTestApp/RouterTest/NavigationManagerComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/RouterTest/NavigationManagerComponent.razor
@@ -1,6 +1,8 @@
-@inject NavigationManager NavigationManager
-@inject Microsoft.JSInterop.IJSRuntime JSRuntime
+@using Microsoft.JSInterop
 @using Microsoft.AspNetCore.Components.Routing
+
+@inject IJSRuntime JSRuntime
+@inject NavigationManager NavigationManager
 @implements IDisposable
 
 <button @onclick="Navigate">Navigate</button>
@@ -29,7 +31,6 @@
 
     async Task Navigate()
     {
-        await JSRuntime.InvokeAsync<object>("navigationManagerNavigate");
+        await JSRuntime.InvokeVoidAsync("navigationManagerNavigate");
     }
 }
-
diff --git a/src/Components/test/testassets/BasicTestApp/RouterTest/TestRouterWithAdditionalAssembly.razor b/src/Components/test/testassets/BasicTestApp/RouterTest/TestRouterWithAdditionalAssembly.razor
new file mode 100644
index 0000000000..c69f08f8c3
--- /dev/null
+++ b/src/Components/test/testassets/BasicTestApp/RouterTest/TestRouterWithAdditionalAssembly.razor
@@ -0,0 +1,11 @@
+@using Microsoft.AspNetCore.Components.Routing
+<Router AppAssembly="@typeof(BasicTestApp.Program).Assembly" AdditionalAssemblies="@(new[] { typeof(TestContentPackage.RouteableComponentFromPackage).Assembly, })">
+    <Found Context="routeData">
+        <RouteView RouteData="@routeData" />
+    </Found>
+    <NotFound>
+        <LayoutView Layout="@typeof(RouterTestLayout)">
+            <div id="test-info">Oops, that component wasn't found!</div>
+        </LayoutView>
+    </NotFound>
+</Router>
diff --git a/src/Components/test/testassets/BasicTestApp/ServerReliability/JSInterop.cs b/src/Components/test/testassets/BasicTestApp/ServerReliability/JSInterop.cs
index f8a858d4f4..628e0a5dca 100644
--- a/src/Components/test/testassets/BasicTestApp/ServerReliability/JSInterop.cs
+++ b/src/Components/test/testassets/BasicTestApp/ServerReliability/JSInterop.cs
@@ -6,13 +6,13 @@ namespace BasicTestApp.ServerReliability
     public class JSInterop
     {
         [JSInvokable]
-        public static DotNetObjectRef<ImportantInformation> CreateImportant()
+        public static DotNetObjectReference<ImportantInformation> CreateImportant()
         {
-            return DotNetObjectRef.Create(new ImportantInformation());
+            return DotNetObjectReference.Create(new ImportantInformation());
         }
 
         [JSInvokable]
-        public static string ReceiveTrivial(DotNetObjectRef<TrivialInformation> information)
+        public static string ReceiveTrivial(DotNetObjectReference<TrivialInformation> information)
         {
             return information.Value.Message;
         }
diff --git a/src/Components/test/testassets/BasicTestApp/ServerReliability/ReliabilityComponent.razor b/src/Components/test/testassets/BasicTestApp/ServerReliability/ReliabilityComponent.razor
index 8557fa95c0..13256fb7bc 100644
--- a/src/Components/test/testassets/BasicTestApp/ServerReliability/ReliabilityComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/ServerReliability/ReliabilityComponent.razor
@@ -77,7 +77,7 @@
 {
     int currentCount = 0;
     string errorMalformed = "";
-    string errorSuccess = "";
+    string errorSuccess = "(this will be cleared)";
     string errorFailure = "";
     bool showConstructorThrow;
     bool showAttachThrow;
@@ -116,6 +116,10 @@
             var result = await JSRuntime.InvokeAsync<object>(
                 "sendSuccessCallbackReturn",
                 Array.Empty<object>());
+
+            // Make sure we trigger a render when the interop call completes.
+            // The test uses a render to synchronize.
+            errorSuccess = "";
         }
         catch (Exception e)
         {
diff --git a/src/Components/test/testassets/BasicTestApp/TouchEventComponent.razor b/src/Components/test/testassets/BasicTestApp/TouchEventComponent.razor
index 40bfa1ebc5..b9bbec0e21 100644
--- a/src/Components/test/testassets/BasicTestApp/TouchEventComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/TouchEventComponent.razor
@@ -25,7 +25,7 @@
 
     string message;
 
-    void OnTouch(UITouchEventArgs e)
+    void OnTouch(TouchEventArgs e)
     {
         message += e.Type;
         Console.WriteLine(JsonSerializer.Serialize(e));
diff --git a/src/Components/test/testassets/BasicTestApp/_Imports.razor b/src/Components/test/testassets/BasicTestApp/_Imports.razor
new file mode 100644
index 0000000000..66ebfa5d18
--- /dev/null
+++ b/src/Components/test/testassets/BasicTestApp/_Imports.razor
@@ -0,0 +1 @@
+@using Microsoft.AspNetCore.Components.Web
diff --git a/src/Components/test/testassets/BasicTestApp/wwwroot/index.html b/src/Components/test/testassets/BasicTestApp/wwwroot/index.html
index c8a61e5503..27f0299673 100644
--- a/src/Components/test/testassets/BasicTestApp/wwwroot/index.html
+++ b/src/Components/test/testassets/BasicTestApp/wwwroot/index.html
@@ -30,6 +30,11 @@
             // Load either blazor.webassembly.js or blazor.server.js depending
             // on the hash part of the URL. This is just to give a way for the
             // test runner to make the selection.
+            if (location.hash === '#server') {
+                location.hash = '';
+                document.cookie = '__blazor_execution_mode=server';
+                location.reload();
+            }
             var src = location.hash === '#server'
                 ? 'blazor.server.js'
                 : 'blazor.webassembly.js';
diff --git a/src/Components/test/testassets/ComponentsApp.App/_Imports.razor b/src/Components/test/testassets/ComponentsApp.App/_Imports.razor
index 7fd67c6932..11fdd2ca05 100644
--- a/src/Components/test/testassets/ComponentsApp.App/_Imports.razor
+++ b/src/Components/test/testassets/ComponentsApp.App/_Imports.razor
@@ -1,4 +1,5 @@
 @using System.Net.Http
 @using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
 @using ComponentsApp.App
 @using ComponentsApp.App.Shared
diff --git a/src/Components/test/testassets/ComponentsApp.Server/ComponentsApp.Server.csproj b/src/Components/test/testassets/ComponentsApp.Server/ComponentsApp.Server.csproj
index d69c9e4949..d960dfa01d 100644
--- a/src/Components/test/testassets/ComponentsApp.Server/ComponentsApp.Server.csproj
+++ b/src/Components/test/testassets/ComponentsApp.Server/ComponentsApp.Server.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
diff --git a/src/Components/test/testassets/ComponentsApp.Server/Pages/_Host.cshtml b/src/Components/test/testassets/ComponentsApp.Server/Pages/_Host.cshtml
index 39dc3104d8..77d00063ca 100644
--- a/src/Components/test/testassets/ComponentsApp.Server/Pages/_Host.cshtml
+++ b/src/Components/test/testassets/ComponentsApp.Server/Pages/_Host.cshtml
@@ -12,8 +12,7 @@
     <link href="css/site.css" rel="stylesheet" />
 </head>
 <body>
-    <app>@(await Html.RenderComponentAsync<App>(new { Name = "Guest" }))</app>
-
+    <app>@(await Html.RenderComponentAsync<App>(RenderMode.Server))</app>    
     <script src="_framework/blazor.server.js" autostart="false"></script>
     <script>
         Blazor.start({
diff --git a/src/Components/test/testassets/ComponentsApp.Server/Startup.cs b/src/Components/test/testassets/ComponentsApp.Server/Startup.cs
index 073b79447b..4afe6012d2 100644
--- a/src/Components/test/testassets/ComponentsApp.Server/Startup.cs
+++ b/src/Components/test/testassets/ComponentsApp.Server/Startup.cs
@@ -38,7 +38,7 @@ namespace ComponentsApp.Server
             {
                 endpoints.MapRazorPages();
                 endpoints.MapControllers();
-                endpoints.MapBlazorHub<ComponentsApp.App.App>("app");
+                endpoints.MapBlazorHub();
                 endpoints.MapFallbackToPage("/_Host");
             });
         }
diff --git a/src/Components/test/testassets/Ignitor/BlazorClient.cs b/src/Components/test/testassets/Ignitor/BlazorClient.cs
index fa4e45f248..3f96604574 100644
--- a/src/Components/test/testassets/Ignitor/BlazorClient.cs
+++ b/src/Components/test/testassets/Ignitor/BlazorClient.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using System.Linq;
 using System.Net.Http;
 using System.Text.Json;
 using System.Text.RegularExpressions;
@@ -17,6 +18,8 @@ namespace Ignitor
 {
     public class BlazorClient
     {
+        private const string MarkerPattern = ".*?<!--Blazor:(.*?)-->.*?";
+
         public BlazorClient()
         {
             CancellationTokenSource = new CancellationTokenSource();
@@ -28,7 +31,20 @@ namespace Ignitor
             });
         }
 
-        public TimeSpan? DefaultLatencyTimeout { get; set; } = TimeSpan.FromMilliseconds(500);
+        public TimeSpan? DefaultConnectionTimeout { get; set; } = TimeSpan.FromSeconds(10);
+        public TimeSpan? DefaultOperationTimeout { get; set; } = TimeSpan.FromMilliseconds(500);
+
+        /// <summary>
+        /// Gets or sets a value that determines whether the client will capture data such
+        /// as render batches, interop calls, and errors for later inspection.
+        /// </summary>
+        public bool CaptureOperations { get; set; }
+
+        /// <summary>
+        /// Gets the collections of operation results that are captured when <see cref="CaptureOperations"/>
+        /// is true.
+        /// </summary>
+        public Operations Operations { get; private set; }
 
         public Func<string, Exception> FormatError { get; set; }
 
@@ -38,23 +54,23 @@ namespace Ignitor
 
         private TaskCompletionSource<object> TaskCompletionSource { get; }
 
-        private CancellableOperation NextBatchReceived { get; set; }
+        private CancellableOperation<CapturedRenderBatch> NextBatchReceived { get; set; }
 
-        private CancellableOperation NextErrorReceived { get; set; }
+        private CancellableOperation<string> NextErrorReceived { get; set; }
 
-        private CancellableOperation NextDisconnect { get; set; }
+        private CancellableOperation<Exception> NextDisconnect { get; set; }
 
-        private CancellableOperation NextJSInteropReceived { get; set; }
+        private CancellableOperation<CapturedJSInteropCall> NextJSInteropReceived { get; set; }
 
-        private CancellableOperation NextDotNetInteropCompletionReceived { get; set; }
+        private CancellableOperation<string> NextDotNetInteropCompletionReceived { get; set; }
 
         public ILoggerProvider LoggerProvider { get; set; }
 
         public bool ConfirmRenderBatch { get; set; } = true;
 
-        public event Action<int, string, string> JSInterop;
+        public event Action<CapturedJSInteropCall> JSInterop;
 
-        public event Action<int, byte[]> RenderBatchReceived;
+        public event Action<CapturedRenderBatch> RenderBatchReceived;
 
         public event Action<string> DotNetInteropCompletion;
 
@@ -64,66 +80,66 @@ namespace Ignitor
 
         public ElementHive Hive { get; set; } = new ElementHive();
 
-        public bool ImplicitWait => DefaultLatencyTimeout != null;
+        public bool ImplicitWait => DefaultOperationTimeout != null;
 
         public HubConnection HubConnection { get; set; }
 
-        public Task PrepareForNextBatch(TimeSpan? timeout)
+        public Task<CapturedRenderBatch> PrepareForNextBatch(TimeSpan? timeout)
         {
             if (NextBatchReceived?.Completion != null)
             {
                 throw new InvalidOperationException("Invalid state previous task not completed");
             }
 
-            NextBatchReceived = new CancellableOperation(timeout);
+            NextBatchReceived = new CancellableOperation<CapturedRenderBatch>(timeout);
 
             return NextBatchReceived.Completion.Task;
         }
 
-        public Task PrepareForNextJSInterop(TimeSpan? timeout)
+        public Task<CapturedJSInteropCall> PrepareForNextJSInterop(TimeSpan? timeout)
         {
             if (NextJSInteropReceived?.Completion != null)
             {
                 throw new InvalidOperationException("Invalid state previous task not completed");
             }
 
-            NextJSInteropReceived = new CancellableOperation(timeout);
+            NextJSInteropReceived = new CancellableOperation<CapturedJSInteropCall>(timeout);
 
             return NextJSInteropReceived.Completion.Task;
         }
 
-        public Task PrepareForNextDotNetInterop(TimeSpan? timeout)
+        public Task<string> PrepareForNextDotNetInterop(TimeSpan? timeout)
         {
             if (NextDotNetInteropCompletionReceived?.Completion != null)
             {
                 throw new InvalidOperationException("Invalid state previous task not completed");
             }
 
-            NextDotNetInteropCompletionReceived = new CancellableOperation(timeout);
+            NextDotNetInteropCompletionReceived = new CancellableOperation<string>(timeout);
 
             return NextDotNetInteropCompletionReceived.Completion.Task;
         }
 
-        public Task PrepareForNextCircuitError(TimeSpan? timeout)
+        public Task<string> PrepareForNextCircuitError(TimeSpan? timeout)
         {
             if (NextErrorReceived?.Completion != null)
             {
                 throw new InvalidOperationException("Invalid state previous task not completed");
             }
 
-            NextErrorReceived = new CancellableOperation(timeout);
+            NextErrorReceived = new CancellableOperation<string>(timeout);
 
             return NextErrorReceived.Completion.Task;
         }
 
-        public Task PrepareForNextDisconnect(TimeSpan? timeout)
+        public Task<Exception> PrepareForNextDisconnect(TimeSpan? timeout)
         {
             if (NextDisconnect?.Completion != null)
             {
                 throw new InvalidOperationException("Invalid state previous task not completed");
             }
 
-            NextDisconnect = new CancellableOperation(timeout);
+            NextDisconnect = new CancellableOperation<Exception>(timeout);
 
             return NextDisconnect.Completion.Task;
         }
@@ -154,118 +170,165 @@ namespace Ignitor
             return ExpectRenderBatch(() => elementNode.SelectAsync(HubConnection, value));
         }
 
-        public async Task ExpectRenderBatch(Func<Task> action, TimeSpan? timeout = null)
+        public async Task<CapturedRenderBatch> ExpectRenderBatch(Func<Task> action, TimeSpan? timeout = null)
         {
             var task = WaitForRenderBatch(timeout);
             await action();
-            await task;
+            return await task;
         }
 
-        public async Task ExpectJSInterop(Func<Task> action, TimeSpan? timeout = null)
+        public async Task<CapturedJSInteropCall> ExpectJSInterop(Func<Task> action, TimeSpan? timeout = null)
         {
             var task = WaitForJSInterop(timeout);
             await action();
-            await task;
+            return await task;
         }
 
-        public async Task ExpectDotNetInterop(Func<Task> action, TimeSpan? timeout = null)
+        public async Task<string> ExpectDotNetInterop(Func<Task> action, TimeSpan? timeout = null)
         {
             var task = WaitForDotNetInterop(timeout);
             await action();
-            await task;
+            return await task;
         }
 
-        public async Task ExpectCircuitError(Func<Task> action, TimeSpan? timeout = null)
+        public async Task<string> ExpectCircuitError(Func<Task> action, TimeSpan? timeout = null)
         {
             var task = WaitForCircuitError(timeout);
             await action();
-            await task;
+            return await task;
         }
 
-        public async Task ExpectCircuitErrorAndDisconnect(Func<Task> action, TimeSpan? timeout = null)
-        {
-            // NOTE: timeout is used for each operation individually.
-            await ExpectDisconnect(async () =>
-            {
-                await ExpectCircuitError(action, timeout);
-            }, timeout);
-        }
-
-        public async Task ExpectDisconnect(Func<Task> action, TimeSpan? timeout = null)
+        public async Task<Exception> ExpectDisconnect(Func<Task> action, TimeSpan? timeout = null)
         {
             var task = WaitForDisconnect(timeout);
             await action();
-            await task;
+            return await task;
         }
 
-        private Task WaitForRenderBatch(TimeSpan? timeout = null)
+        public async Task<(string error, Exception exception)> ExpectCircuitErrorAndDisconnect(Func<Task> action, TimeSpan? timeout = null)
+        {
+            string error = null;
+
+            // NOTE: timeout is used for each operation individually.
+            var exception = await ExpectDisconnect(async () =>
+            {
+                error = await ExpectCircuitError(action, timeout);
+            }, timeout);
+
+            return (error, exception);
+        }
+
+        private async Task<CapturedRenderBatch> WaitForRenderBatch(TimeSpan? timeout = null)
         {
             if (ImplicitWait)
             {
-                if (DefaultLatencyTimeout == null && timeout == null)
+                if (DefaultOperationTimeout == null && timeout == null)
                 {
                     throw new InvalidOperationException("Implicit wait without DefaultLatencyTimeout is not allowed.");
                 }
 
-                return PrepareForNextBatch(timeout ?? DefaultLatencyTimeout);
+                try
+                {
+                    return await PrepareForNextBatch(timeout ?? DefaultOperationTimeout);
+                }
+                catch (OperationCanceledException)
+                {
+                    throw FormatError("Timed out while waiting for batch.");
+                }
             }
 
-            return Task.CompletedTask;
+            return null;
         }
 
-        private async Task WaitForJSInterop(TimeSpan? timeout = null)
+        private async Task<CapturedJSInteropCall> WaitForJSInterop(TimeSpan? timeout = null)
         {
             if (ImplicitWait)
             {
-                if (DefaultLatencyTimeout == null && timeout == null)
+                if (DefaultOperationTimeout == null && timeout == null)
                 {
                     throw new InvalidOperationException("Implicit wait without DefaultLatencyTimeout is not allowed.");
                 }
 
-                await PrepareForNextJSInterop(timeout ?? DefaultLatencyTimeout);
+                try
+                {
+                    return await PrepareForNextJSInterop(timeout ?? DefaultOperationTimeout);
+                }
+                catch (OperationCanceledException)
+                {
+                    throw FormatError("Timed out while waiting for JS Interop.");
+                }
             }
+
+            return null;
         }
 
-        private async Task WaitForDotNetInterop(TimeSpan? timeout = null)
+        private async Task<string> WaitForDotNetInterop(TimeSpan? timeout = null)
         {
             if (ImplicitWait)
             {
-                if (DefaultLatencyTimeout == null && timeout == null)
+                if (DefaultOperationTimeout == null && timeout == null)
                 {
                     throw new InvalidOperationException("Implicit wait without DefaultLatencyTimeout is not allowed.");
                 }
 
-                await PrepareForNextDotNetInterop(timeout ?? DefaultLatencyTimeout);
+                try
+                {
+                    return await PrepareForNextDotNetInterop(timeout ?? DefaultOperationTimeout);
+                }
+                catch (OperationCanceledException)
+                {
+                    throw FormatError("Timed out while waiting for .NET interop.");
+                }
             }
+
+            return null;
         }
 
-        private async Task WaitForCircuitError(TimeSpan? timeout = null)
+        private async Task<string> WaitForCircuitError(TimeSpan? timeout = null)
         {
             if (ImplicitWait)
             {
-                if (DefaultLatencyTimeout == null && timeout == null)
+                if (DefaultOperationTimeout == null && timeout == null)
                 {
                     throw new InvalidOperationException("Implicit wait without DefaultLatencyTimeout is not allowed.");
                 }
 
-                await PrepareForNextCircuitError(timeout ?? DefaultLatencyTimeout);
-            }
-        }
-
-        private async Task WaitForDisconnect(TimeSpan? timeout = null)
-        {
-            if (ImplicitWait)
-            {
-                if (DefaultLatencyTimeout == null && timeout == null)
+                try
                 {
-                    throw new InvalidOperationException("Implicit wait without DefaultLatencyTimeout is not allowed.");
+                    return await PrepareForNextCircuitError(timeout ?? DefaultOperationTimeout);
+                }
+                catch (OperationCanceledException)
+                {
+                    throw FormatError("Timed out while waiting for circuit error.");
                 }
             }
 
-            await PrepareForNextDisconnect(timeout ?? DefaultLatencyTimeout);
+            return null;
         }
 
-        public async Task<bool> ConnectAsync(Uri uri, bool prerendered, bool connectAutomatically = true)
+        private async Task<Exception> WaitForDisconnect(TimeSpan? timeout = null)
+        {
+            if (ImplicitWait)
+            {
+                if (DefaultOperationTimeout == null && timeout == null)
+                {
+                    throw new InvalidOperationException("Implicit wait without DefaultLatencyTimeout is not allowed.");
+                }
+
+                try
+                {
+                    return await PrepareForNextDisconnect(timeout ?? DefaultOperationTimeout);
+                }
+                catch (OperationCanceledException)
+                {
+                    throw FormatError("Timed out while waiting for disconnect.");
+                }
+            }
+
+            return null;
+        }
+
+        public async Task<bool> ConnectAsync(Uri uri, bool connectAutomatically = true)
         {
             var builder = new HubConnectionBuilder();
             builder.Services.TryAddEnumerable(ServiceDescriptor.Singleton<IHubProtocol, IgnitorMessagePackHubProtocol>());
@@ -288,53 +351,54 @@ namespace Ignitor
             HubConnection.On<string>("JS.Error", OnError);
             HubConnection.Closed += OnClosedAsync;
 
+            if (CaptureOperations)
+            {
+                Operations = new Operations();
+            }
+
             if (!connectAutomatically)
             {
                 return true;
             }
 
-            // Now everything is registered so we can start the circuit.
-            if (prerendered)
-            {
-                CircuitId = await GetPrerenderedCircuitIdAsync(uri);
-                var result = false;
-                await ExpectRenderBatch(async () => result = await HubConnection.InvokeAsync<bool>("ConnectCircuit", CircuitId));
-                return result;
-            }
-            else
-            {
-                await ExpectRenderBatch(
-                    async () => CircuitId = await HubConnection.InvokeAsync<string>("StartCircuit", uri, uri),
-                    TimeSpan.FromSeconds(10));
-                return CircuitId != null;
-            }
+            var descriptors = await GetPrerenderDescriptors(uri);
+            await ExpectRenderBatch(
+                async () => CircuitId = await HubConnection.InvokeAsync<string>("StartCircuit", uri, uri, descriptors),
+                DefaultConnectionTimeout);
+            return CircuitId != null;
         }
 
-        private void OnEndInvokeDotNet(string completion)
+        private void OnEndInvokeDotNet(string message)
         {
-            DotNetInteropCompletion?.Invoke(completion);
+            Operations?.DotNetCompletions.Enqueue(message);
+            DotNetInteropCompletion?.Invoke(message);
 
             NextDotNetInteropCompletionReceived?.Completion?.TrySetResult(null);
         }
 
         private void OnBeginInvokeJS(int asyncHandle, string identifier, string argsJson)
         {
-            JSInterop?.Invoke(asyncHandle, identifier, argsJson);
+            var call = new CapturedJSInteropCall(asyncHandle, identifier, argsJson);
+            Operations?.JSInteropCalls.Enqueue(call);
+            JSInterop?.Invoke(call);
 
             NextJSInteropReceived?.Completion?.TrySetResult(null);
         }
 
-        private void OnRenderBatch(int batchId, byte[] batchData)
+        private void OnRenderBatch(int id, byte[] data)
         {
-            RenderBatchReceived?.Invoke(batchId, batchData);
+            var capturedBatch = new CapturedRenderBatch(id, data);
 
-            var batch = RenderBatchReader.Read(batchData);
+            Operations?.Batches.Enqueue(capturedBatch);
+            RenderBatchReceived?.Invoke(capturedBatch);
+
+            var batch = RenderBatchReader.Read(data);
 
             Hive.Update(batch);
 
             if (ConfirmRenderBatch)
             {
-                _ = ConfirmBatch(batchId);
+                _ = ConfirmBatch(id);
             }
 
             NextBatchReceived?.Completion?.TrySetResult(null);
@@ -347,8 +411,12 @@ namespace Ignitor
 
         private void OnError(string error)
         {
+            Operations?.Errors.Enqueue(error);
             OnCircuitError?.Invoke(error);
 
+            // If we get an error, forcibly terminate anything else we're waiting for. These
+            // tests should only encounter errors in specific situations, and this ensures that
+            // we fail with a good message.
             var exception = FormatError?.Invoke(error) ?? new Exception(error);
             NextBatchReceived?.Completion?.TrySetException(exception);
             NextDotNetInteropCompletionReceived?.Completion.TrySetException(exception);
@@ -391,17 +459,16 @@ namespace Ignitor
             await ExpectDotNetInterop(() => HubConnection.InvokeAsync("BeginInvokeDotNetFromJS", callId?.ToString(), assemblyName, methodIdentifier, dotNetObjectId ?? 0, argsJson));
         }
 
-        private static async Task<string> GetPrerenderedCircuitIdAsync(Uri uri)
+        public async Task<string> GetPrerenderDescriptors(Uri uri)
         {
             var httpClient = new HttpClient();
+            httpClient.DefaultRequestHeaders.TryAddWithoutValidation("Cookie", "__blazor_execution_mode=server");
             var response = await httpClient.GetAsync(uri);
+            response.EnsureSuccessStatusCode();
             var content = await response.Content.ReadAsStringAsync();
 
-            // <!-- M.A.C.Component:{"circuitId":"CfDJ8KZCIaqnXmdF...PVd6VVzfnmc1","rendererId":"0","componentId":"0"} -->
-            var match = Regex.Match(content, $"{Regex.Escape("<!-- M.A.C.Component:")}(.+?){Regex.Escape(" -->")}");
-            var json = JsonDocument.Parse(match.Groups[1].Value);
-            var circuitId = json.RootElement.GetProperty("circuitId").GetString();
-            return circuitId;
+            var match = ReadMarkers(content);
+            return $"[{string.Join(", ", match)}]";
         }
 
         public void Cancel()
@@ -420,7 +487,7 @@ namespace Ignitor
             return element;
         }
 
-        private class CancellableOperation
+        private class CancellableOperation<TResult>
         {
             public CancellableOperation(TimeSpan? timeout)
             {
@@ -428,24 +495,32 @@ namespace Ignitor
                 Initialize();
             }
 
+            public TimeSpan? Timeout { get; }
+
+            public TaskCompletionSource<TResult> Completion { get; set; }
+
+            public CancellationTokenSource Cancellation { get; set; }
+
+            public CancellationTokenRegistration CancellationRegistration { get; set; }
+
             private void Initialize()
             {
-                Completion = new TaskCompletionSource<object>(TaskContinuationOptions.RunContinuationsAsynchronously);
+                Completion = new TaskCompletionSource<TResult>(TaskContinuationOptions.RunContinuationsAsynchronously);
                 Completion.Task.ContinueWith(
                     (task, state) =>
                     {
-                        var operation = (CancellableOperation)state;
+                        var operation = (CancellableOperation<TResult>)state;
                         operation.Dispose();
                     },
                     this,
                     TaskContinuationOptions.ExecuteSynchronously); // We need to execute synchronously to clean-up before anything else continues
-                if (Timeout != null)
+                if (Timeout != null && Timeout != System.Threading.Timeout.InfiniteTimeSpan && Timeout != TimeSpan.MaxValue)
                 {
                     Cancellation = new CancellationTokenSource(Timeout.Value);
                     CancellationRegistration = Cancellation.Token.Register(
                         (self) =>
                         {
-                            var operation = (CancellableOperation)self;
+                            var operation = (CancellableOperation<TResult>)self;
                             operation.Completion.TrySetCanceled(operation.Cancellation.Token);
                             operation.Cancellation.Dispose();
                             operation.CancellationRegistration.Dispose();
@@ -460,14 +535,23 @@ namespace Ignitor
                 Cancellation.Dispose();
                 CancellationRegistration.Dispose();
             }
+        }
 
-            public TimeSpan? Timeout { get; }
+        private string[] ReadMarkers(string content)
+        {
+            content = content.Replace("\r\n", "").Replace("\n", "");
+            var matches = Regex.Matches(content, MarkerPattern);
+            var markers = matches.Select(s => (value: s.Groups[1].Value, parsed: JsonDocument.Parse(s.Groups[1].Value)))
+                .Where(s =>
+                {
+                    var markerType = s.parsed.RootElement.GetProperty("type");
+                    return markerType.ValueKind != JsonValueKind.Undefined && markerType.GetString() == "server";
+                })
+                .OrderBy(p => p.parsed.RootElement.GetProperty("sequence").GetInt32())
+                .Select(p => p.value)
+                .ToArray();
 
-            public TaskCompletionSource<object> Completion { get; set; }
-
-            public CancellationTokenSource Cancellation { get; set; }
-
-            public CancellationTokenRegistration CancellationRegistration { get; set; }
+            return markers;
         }
     }
 }
diff --git a/src/Components/test/testassets/Ignitor/CapturedJSInteropCall.cs b/src/Components/test/testassets/Ignitor/CapturedJSInteropCall.cs
new file mode 100644
index 0000000000..4af491a58a
--- /dev/null
+++ b/src/Components/test/testassets/Ignitor/CapturedJSInteropCall.cs
@@ -0,0 +1,19 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Ignitor
+{
+    public class CapturedJSInteropCall
+    {
+        public CapturedJSInteropCall(int asyncHandle, string identifier, string argsJson)
+        {
+            AsyncHandle = asyncHandle;
+            Identifier = identifier;
+            ArgsJson = argsJson;
+        }
+
+        public int AsyncHandle { get; }
+        public string Identifier { get; }
+        public string ArgsJson { get; }
+    }
+}
diff --git a/src/Components/test/testassets/Ignitor/CapturedRenderBatch.cs b/src/Components/test/testassets/Ignitor/CapturedRenderBatch.cs
new file mode 100644
index 0000000000..df2de87e9f
--- /dev/null
+++ b/src/Components/test/testassets/Ignitor/CapturedRenderBatch.cs
@@ -0,0 +1,17 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Ignitor
+{
+    public class CapturedRenderBatch
+    {
+        public CapturedRenderBatch(int id, byte[] data)
+        {
+            Id = id;
+            Data = data;
+        }
+
+        public int Id { get; }
+        public byte[] Data { get; }
+    }
+}
diff --git a/src/Components/test/testassets/Ignitor/ElementNode.cs b/src/Components/test/testassets/Ignitor/ElementNode.cs
index 527f4b30c5..d97197619d 100644
--- a/src/Components/test/testassets/Ignitor/ElementNode.cs
+++ b/src/Components/test/testassets/Ignitor/ElementNode.cs
@@ -7,6 +7,7 @@ using System.Text.Json;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Rendering;
+using Microsoft.AspNetCore.Components.RenderTree;
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.SignalR.Client;
 
@@ -97,7 +98,7 @@ namespace Ignitor
                 throw new InvalidOperationException("Element does not have a click event.");
             }
 
-            var mouseEventArgs = new UIMouseEventArgs()
+            var mouseEventArgs = new MouseEventArgs()
             {
                 Type = clickEventDescriptor.EventName,
                 Detail = 1
diff --git a/src/Components/test/testassets/Ignitor/Operations.cs b/src/Components/test/testassets/Ignitor/Operations.cs
new file mode 100644
index 0000000000..4dcf8798b5
--- /dev/null
+++ b/src/Components/test/testassets/Ignitor/Operations.cs
@@ -0,0 +1,18 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Collections.Concurrent;
+
+namespace Ignitor
+{
+    public sealed class Operations
+    {
+        public ConcurrentQueue<CapturedRenderBatch> Batches { get; } = new ConcurrentQueue<CapturedRenderBatch>();
+
+        public ConcurrentQueue<string> DotNetCompletions { get; } = new ConcurrentQueue<string>();
+
+        public ConcurrentQueue<string> Errors { get; } = new ConcurrentQueue<string>();
+
+        public ConcurrentQueue<CapturedJSInteropCall> JSInteropCalls { get; } = new ConcurrentQueue<CapturedJSInteropCall>();
+    }
+}
diff --git a/src/Components/test/testassets/Ignitor/Program.cs b/src/Components/test/testassets/Ignitor/Program.cs
index 8d7d60d663..43486d490e 100644
--- a/src/Components/test/testassets/Ignitor/Program.cs
+++ b/src/Components/test/testassets/Ignitor/Program.cs
@@ -2,10 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using System.Net.Http;
-using System.Runtime.InteropServices;
-using System.Text.Json;
-using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.SignalR.Client;
@@ -38,9 +34,9 @@ namespace Ignitor
             var done = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             // Click the counter button 1000 times
-            client.RenderBatchReceived += (int batchId, byte[] data) =>
+            client.RenderBatchReceived += (batch) =>
             {
-                if (batchId < 1000)
+                if (batch.Id < 1000)
                 {
                     var _ = client.ClickAsync("thecounter");
                 }
@@ -50,14 +46,14 @@ namespace Ignitor
                 }
             };
 
-            await client.ConnectAsync(uri, prerendered: true);
+            await client.ConnectAsync(uri);
             await done.Task;
 
             return 0;
         }
 
-        private static void OnJSInterop(int callId, string identifier, string argsJson) =>
-            Console.WriteLine("JS Invoke: " + identifier + " (" + argsJson + ")");
+        private static void OnJSInterop(CapturedJSInteropCall call) =>
+            Console.WriteLine("JS Invoke: " + call.Identifier + " (" + call.ArgsJson + ")");
 
         public Program()
         {
diff --git a/src/Components/test/testassets/TestContentPackage/MyPrompt.cs b/src/Components/test/testassets/TestContentPackage/MyPrompt.cs
index 8cddeba8c5..fa5ee44ecd 100644
--- a/src/Components/test/testassets/TestContentPackage/MyPrompt.cs
+++ b/src/Components/test/testassets/TestContentPackage/MyPrompt.cs
@@ -5,7 +5,7 @@ namespace TestContentPackage
 {
     public static class MyPrompt
     {
-        public static Task<string> Show(IJSRuntime jsRuntime, string message)
+        public static ValueTask<string> Show(IJSRuntime jsRuntime, string message)
         {
             return jsRuntime.InvokeAsync<string>(
                 "TestContentPackage.showPrompt", // Keep in sync with identifiers in the.js file
diff --git a/src/Components/test/testassets/TestContentPackage/_Imports.razor b/src/Components/test/testassets/TestContentPackage/_Imports.razor
new file mode 100644
index 0000000000..66ebfa5d18
--- /dev/null
+++ b/src/Components/test/testassets/TestContentPackage/_Imports.razor
@@ -0,0 +1 @@
+@using Microsoft.AspNetCore.Components.Web
diff --git a/src/Components/test/testassets/TestServer/Pages/MultipleComponents.cshtml b/src/Components/test/testassets/TestServer/Pages/MultipleComponents.cshtml
new file mode 100644
index 0000000000..28bab23e1c
--- /dev/null
+++ b/src/Components/test/testassets/TestServer/Pages/MultipleComponents.cshtml
@@ -0,0 +1,55 @@
+@page "/multiple-components"
+@using BasicTestApp.MultipleComponents;
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Multiple component entry points</title>
+    <base href="~/" />
+    @* This page is used to validate the ability to render multiple root components in a blazor server-side application.
+    *@
+</head>
+<body>
+    <div id="test-container">
+        @(await Html.RenderComponentAsync<GreeterComponent>(RenderMode.ServerPrerendered))
+        @(await Html.RenderComponentAsync<GreeterComponent>(RenderMode.Server))
+        @(await Html.RenderComponentAsync<GreeterComponent>(RenderMode.Static, new { Name = "John" }))
+        @(await Html.RenderComponentAsync<GreeterComponent>(RenderMode.Server))
+        <div id="container">
+            <p>Some content before</p>
+            @(await Html.RenderComponentAsync<GreeterComponent>(RenderMode.Server))
+            <p>Some content between</p>
+            @(await Html.RenderComponentAsync<GreeterComponent>(RenderMode.ServerPrerendered))
+            <p>Some content after</p>
+            <div id="nested-an-extra-level">
+                <p>Some content before</p>
+                @(await Html.RenderComponentAsync<GreeterComponent>(RenderMode.Server))
+                @(await Html.RenderComponentAsync<GreeterComponent>(RenderMode.ServerPrerendered))
+                <p>Some content after</p>
+            </div>
+        </div>
+    </div>
+
+    @*
+        So that E2E tests can make assertions about both the prerendered and
+        interactive states, we only load the .js file when told to.
+    *@
+    <hr />
+
+    <button id="load-boot-script" onclick="start()">Load boot script</button>
+
+    <script src="_framework/blazor.server.js" autostart="false"></script>
+    <script>
+        // Used by InteropOnInitializationComponent
+        function setElementValue(element, newValue) {
+            element.value = newValue;
+            return element.value;
+        }
+
+        function start() {
+            Blazor.start({
+                logLevel: 1 // LogLevel.Debug
+            });
+        }
+    </script>
+</body>
+</html>
diff --git a/src/Components/test/testassets/TestServer/Pages/PrerenderedHost.cshtml b/src/Components/test/testassets/TestServer/Pages/PrerenderedHost.cshtml
index e422b3c28d..1ba6f2f1c9 100644
--- a/src/Components/test/testassets/TestServer/Pages/PrerenderedHost.cshtml
+++ b/src/Components/test/testassets/TestServer/Pages/PrerenderedHost.cshtml
@@ -7,7 +7,7 @@
     <base href="~/" />
 </head>
 <body>
-    <app>@(await Html.RenderComponentAsync<TestRouter>())</app>
+    <app>@(await Html.RenderComponentAsync<TestRouter>(RenderMode.ServerPrerendered))</app>
 
     @*
         So that E2E tests can make assertions about both the prerendered and
diff --git a/src/Components/test/testassets/TestServer/Pages/_ServerHost.cshtml b/src/Components/test/testassets/TestServer/Pages/_ServerHost.cshtml
new file mode 100644
index 0000000000..668123d6f9
--- /dev/null
+++ b/src/Components/test/testassets/TestServer/Pages/_ServerHost.cshtml
@@ -0,0 +1,39 @@
+@page ""
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>Basic test app</title>
+    <base href="~/" />
+    <link href="style.css" rel="stylesheet" />
+
+    <!-- Used by ExternalContentPackage -->
+    <link href="_content/TestContentPackage/styles.css" rel="stylesheet" />
+</head>
+<body>
+    <root>@(await Html.RenderComponentAsync<BasicTestApp.Index>(RenderMode.Server))</root>
+
+    <!-- Used for testing interop scenarios between JS and .NET -->
+    <script src="js/jsinteroptests.js"></script>
+
+    <script>
+        // Used by ElementRefComponent
+        function setElementValue(element, newValue) {
+            element.value = newValue;
+            return element.value;
+        }
+
+        function navigationManagerNavigate() {
+            Blazor.navigateTo('/subdir/some-path');
+        }
+    </script>
+
+    <script src="_framework/blazor.server.js"></script>
+
+    <!-- Used by ExternalContentPackage -->
+    <script src="_content/TestContentPackage/prompt.js"></script>
+    <script>
+        console.log('Blazor server-side');
+    </script>
+</body>
+</html>
diff --git a/src/Components/test/testassets/TestServer/Startup.cs b/src/Components/test/testassets/TestServer/Startup.cs
index 4aba67f9f9..4012408864 100644
--- a/src/Components/test/testassets/TestServer/Startup.cs
+++ b/src/Components/test/testassets/TestServer/Startup.cs
@@ -1,10 +1,7 @@
 using System.Threading.Tasks;
-using BasicTestApp;
-using BasicTestApp.RouterTest;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Localization;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -82,16 +79,30 @@ namespace TestServer
                     options.RequestCultureProviders.Add(new CookieRequestCultureProvider());
 
                     // We want the default to be en-US so that the tests for bind can work consistently.
-                    options.SetDefaultCulture("en-US"); 
+                    options.SetDefaultCulture("en-US");
                 });
 
-                app.UseRouting();
+                app.MapWhen(ctx => ctx.Request.Cookies.TryGetValue("__blazor_execution_mode", out var value) && value == "server",
+                    child =>
+                    {
+                        child.UseRouting();
+                        child.UseEndpoints(childEndpoints =>
+                        {
+                            childEndpoints.MapBlazorHub();
+                            childEndpoints.MapFallbackToPage("/_ServerHost");
+                        });
+                    });
 
-                app.UseEndpoints(endpoints =>
-                {
-                    endpoints.MapBlazorHub(typeof(Index), selector: "root");
-                    endpoints.MapFallbackToClientSideBlazor<BasicTestApp.Startup>("index.html");
-                });
+                app.MapWhen(ctx => !ctx.Request.Query.ContainsKey("__blazor_execution_mode"),
+                    child =>
+                    {
+                        child.UseRouting();
+                        child.UseEndpoints(childEndpoints =>
+                        {
+                            childEndpoints.MapBlazorHub();
+                            childEndpoints.MapFallbackToClientSideBlazor<BasicTestApp.Startup>("index.html");
+                        });
+                    });
             });
 
             // Separately, mount a prerendered server-side Blazor app on /prerendered
@@ -103,7 +114,7 @@ namespace TestServer
                 app.UseEndpoints(endpoints =>
                 {
                     endpoints.MapFallbackToPage("/PrerenderedHost");
-                    endpoints.MapBlazorHub<TestRouter>(selector: "app");
+                    endpoints.MapBlazorHub();
                 });
             });
 
diff --git a/src/Components/test/testassets/TestServer/appsettings.json b/src/Components/test/testassets/TestServer/appsettings.json
index d49b185e5d..c21fbf38e5 100644
--- a/src/Components/test/testassets/TestServer/appsettings.json
+++ b/src/Components/test/testassets/TestServer/appsettings.json
@@ -2,7 +2,7 @@
   "Logging": {
     "IncludeScopes": false,
     "LogLevel": {
-      "Microsoft.AspNetCore.Components": "Debug"
+      "Microsoft.AspNetCore.Components": "Trace"
     },
     "Debug": {
       "LogLevel": {
diff --git a/src/DataProtection/Cryptography.Internal/test/Cng/BCryptUtilTests.cs b/src/DataProtection/Cryptography.Internal/test/Cng/BCryptUtilTests.cs
index 286bca18f4..d5f78e0d22 100644
--- a/src/DataProtection/Cryptography.Internal/test/Cng/BCryptUtilTests.cs
+++ b/src/DataProtection/Cryptography.Internal/test/Cng/BCryptUtilTests.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Linq;
 using Microsoft.AspNetCore.DataProtection.Test.Shared;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Cryptography.Cng
diff --git a/src/DataProtection/Cryptography.Internal/test/Cng/CachedAlgorithmHandlesTests.cs b/src/DataProtection/Cryptography.Internal/test/Cng/CachedAlgorithmHandlesTests.cs
index de601a12d5..a591b08ccc 100644
--- a/src/DataProtection/Cryptography.Internal/test/Cng/CachedAlgorithmHandlesTests.cs
+++ b/src/DataProtection/Cryptography.Internal/test/Cng/CachedAlgorithmHandlesTests.cs
@@ -5,7 +5,7 @@ using System;
 using System.Text;
 using Microsoft.AspNetCore.Cryptography.SafeHandles;
 using Microsoft.AspNetCore.DataProtection.Test.Shared;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Cryptography.Cng
diff --git a/src/DataProtection/Cryptography.KeyDerivation/test/Pbkdf2Tests.cs b/src/DataProtection/Cryptography.KeyDerivation/test/Pbkdf2Tests.cs
index 295dc819c4..aa96359dc8 100644
--- a/src/DataProtection/Cryptography.KeyDerivation/test/Pbkdf2Tests.cs
+++ b/src/DataProtection/Cryptography.KeyDerivation/test/Pbkdf2Tests.cs
@@ -5,7 +5,7 @@ using System;
 using System.Text;
 using Microsoft.AspNetCore.Cryptography.KeyDerivation.PBKDF2;
 using Microsoft.AspNetCore.DataProtection.Test.Shared;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Cryptography.KeyDerivation
diff --git a/src/DataProtection/DataProtection/src/KeyManagement/Internal/DefaultKeyResolution.cs b/src/DataProtection/DataProtection/src/KeyManagement/Internal/DefaultKeyResolution.cs
index 1c4170607b..83dbf61096 100644
--- a/src/DataProtection/DataProtection/src/KeyManagement/Internal/DefaultKeyResolution.cs
+++ b/src/DataProtection/DataProtection/src/KeyManagement/Internal/DefaultKeyResolution.cs
@@ -5,6 +5,10 @@ using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption;
 
 namespace Microsoft.AspNetCore.DataProtection.KeyManagement.Internal
 {
+    /// <summary>
+    /// This API supports infrastructure and is not intended to be used
+    /// directly from your code. This API may change or be removed in future releases.
+    /// </summary>
     public struct DefaultKeyResolution
     {
         /// <summary>
diff --git a/src/DataProtection/DataProtection/src/KeyManagement/Internal/ICacheableKeyRingProvider.cs b/src/DataProtection/DataProtection/src/KeyManagement/Internal/ICacheableKeyRingProvider.cs
index 367080f2b8..7c41388532 100644
--- a/src/DataProtection/DataProtection/src/KeyManagement/Internal/ICacheableKeyRingProvider.cs
+++ b/src/DataProtection/DataProtection/src/KeyManagement/Internal/ICacheableKeyRingProvider.cs
@@ -5,6 +5,10 @@ using System;
 
 namespace Microsoft.AspNetCore.DataProtection.KeyManagement.Internal
 {
+    /// <summary>
+    /// This API supports infrastructure and is not intended to be used
+    /// directly from your code. This API may change or be removed in future releases.
+    /// </summary>
     public interface ICacheableKeyRingProvider
     {
         CacheableKeyRing GetCacheableKeyRing(DateTimeOffset now);
diff --git a/src/DataProtection/DataProtection/src/KeyManagement/Internal/IInternalXmlKeyManager.cs b/src/DataProtection/DataProtection/src/KeyManagement/Internal/IInternalXmlKeyManager.cs
index 9ebaa4c63c..6c7d015213 100644
--- a/src/DataProtection/DataProtection/src/KeyManagement/Internal/IInternalXmlKeyManager.cs
+++ b/src/DataProtection/DataProtection/src/KeyManagement/Internal/IInternalXmlKeyManager.cs
@@ -7,6 +7,10 @@ using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationM
 
 namespace Microsoft.AspNetCore.DataProtection.KeyManagement.Internal
 {
+    /// <summary>
+    /// This API supports infrastructure and is not intended to be used
+    /// directly from your code. This API may change or be removed in future releases.
+    /// </summary>
     public interface IInternalXmlKeyManager
     {
         IKey CreateNewKey(Guid keyId, DateTimeOffset creationDate, DateTimeOffset activationDate, DateTimeOffset expirationDate);
diff --git a/src/DataProtection/DataProtection/src/KeyManagement/Internal/IKeyRingProvider.cs b/src/DataProtection/DataProtection/src/KeyManagement/Internal/IKeyRingProvider.cs
index 3a507f1250..67bc44776e 100644
--- a/src/DataProtection/DataProtection/src/KeyManagement/Internal/IKeyRingProvider.cs
+++ b/src/DataProtection/DataProtection/src/KeyManagement/Internal/IKeyRingProvider.cs
@@ -3,6 +3,10 @@
 
 namespace Microsoft.AspNetCore.DataProtection.KeyManagement.Internal
 {
+    /// <summary>
+    /// This API supports infrastructure and is not intended to be used
+    /// directly from your code. This API may change or be removed in future releases.
+    /// </summary>
     public interface IKeyRingProvider
     {
         IKeyRing GetCurrentKeyRing();
diff --git a/src/DataProtection/DataProtection/test/AuthenticatedEncryption/CngCbcAuthenticatedEncryptorFactoryTest.cs b/src/DataProtection/DataProtection/test/AuthenticatedEncryption/CngCbcAuthenticatedEncryptorFactoryTest.cs
index 2b13d7990c..734f4ad4e0 100644
--- a/src/DataProtection/DataProtection/test/AuthenticatedEncryption/CngCbcAuthenticatedEncryptorFactoryTest.cs
+++ b/src/DataProtection/DataProtection/test/AuthenticatedEncryption/CngCbcAuthenticatedEncryptorFactoryTest.cs
@@ -5,7 +5,7 @@ using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationM
 using Microsoft.AspNetCore.DataProtection.Cng;
 using Microsoft.AspNetCore.DataProtection.KeyManagement;
 using Microsoft.AspNetCore.DataProtection.Test.Shared;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.Logging.Abstractions;
 using Moq;
 using Xunit;
diff --git a/src/DataProtection/DataProtection/test/AuthenticatedEncryption/CngGcmAuthenticatedEncryptorFactoryTest.cs b/src/DataProtection/DataProtection/test/AuthenticatedEncryption/CngGcmAuthenticatedEncryptorFactoryTest.cs
index e641705f3a..2a6fbcf307 100644
--- a/src/DataProtection/DataProtection/test/AuthenticatedEncryption/CngGcmAuthenticatedEncryptorFactoryTest.cs
+++ b/src/DataProtection/DataProtection/test/AuthenticatedEncryption/CngGcmAuthenticatedEncryptorFactoryTest.cs
@@ -5,7 +5,7 @@ using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationM
 using Microsoft.AspNetCore.DataProtection.Cng;
 using Microsoft.AspNetCore.DataProtection.KeyManagement;
 using Microsoft.AspNetCore.DataProtection.Test.Shared;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.Logging.Abstractions;
 using Moq;
 using Xunit;
diff --git a/src/DataProtection/DataProtection/test/AuthenticatedEncryption/ConfigurationModel/AuthenticatedEncryptorDescriptorTests.cs b/src/DataProtection/DataProtection/test/AuthenticatedEncryption/ConfigurationModel/AuthenticatedEncryptorDescriptorTests.cs
index 0bed1de2e4..c268589b27 100644
--- a/src/DataProtection/DataProtection/test/AuthenticatedEncryption/ConfigurationModel/AuthenticatedEncryptorDescriptorTests.cs
+++ b/src/DataProtection/DataProtection/test/AuthenticatedEncryption/ConfigurationModel/AuthenticatedEncryptorDescriptorTests.cs
@@ -11,7 +11,7 @@ using Microsoft.AspNetCore.DataProtection.Cng;
 using Microsoft.AspNetCore.DataProtection.KeyManagement;
 using Microsoft.AspNetCore.DataProtection.Managed;
 using Microsoft.AspNetCore.DataProtection.Test.Shared;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.Logging.Abstractions;
 using Xunit;
 
diff --git a/src/DataProtection/DataProtection/test/AuthenticatedEncryption/ConfigurationModel/CngCbcAuthenticatedEncryptorDescriptorDeserializerTests.cs b/src/DataProtection/DataProtection/test/AuthenticatedEncryption/ConfigurationModel/CngCbcAuthenticatedEncryptorDescriptorDeserializerTests.cs
index eb61aaa676..483567e815 100644
--- a/src/DataProtection/DataProtection/test/AuthenticatedEncryption/ConfigurationModel/CngCbcAuthenticatedEncryptorDescriptorDeserializerTests.cs
+++ b/src/DataProtection/DataProtection/test/AuthenticatedEncryption/ConfigurationModel/CngCbcAuthenticatedEncryptorDescriptorDeserializerTests.cs
@@ -6,7 +6,7 @@ using System.Xml.Linq;
 using Microsoft.AspNetCore.Cryptography;
 using Microsoft.AspNetCore.DataProtection.KeyManagement;
 using Microsoft.AspNetCore.DataProtection.Test.Shared;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.Logging.Abstractions;
 using Xunit;
 
diff --git a/src/DataProtection/DataProtection/test/AuthenticatedEncryption/ConfigurationModel/CngGcmAuthenticatedEncryptorDescriptorDeserializerTests.cs b/src/DataProtection/DataProtection/test/AuthenticatedEncryption/ConfigurationModel/CngGcmAuthenticatedEncryptorDescriptorDeserializerTests.cs
index 05845dfde0..ca81db5846 100644
--- a/src/DataProtection/DataProtection/test/AuthenticatedEncryption/ConfigurationModel/CngGcmAuthenticatedEncryptorDescriptorDeserializerTests.cs
+++ b/src/DataProtection/DataProtection/test/AuthenticatedEncryption/ConfigurationModel/CngGcmAuthenticatedEncryptorDescriptorDeserializerTests.cs
@@ -6,7 +6,7 @@ using System.Xml.Linq;
 using Microsoft.AspNetCore.Cryptography;
 using Microsoft.AspNetCore.DataProtection.KeyManagement;
 using Microsoft.AspNetCore.DataProtection.Test.Shared;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.Logging.Abstractions;
 using Xunit;
 
diff --git a/src/DataProtection/DataProtection/test/Cng/CbcAuthenticatedEncryptorTests.cs b/src/DataProtection/DataProtection/test/Cng/CbcAuthenticatedEncryptorTests.cs
index 97e7d7a96d..c2c4b260e3 100644
--- a/src/DataProtection/DataProtection/test/Cng/CbcAuthenticatedEncryptorTests.cs
+++ b/src/DataProtection/DataProtection/test/Cng/CbcAuthenticatedEncryptorTests.cs
@@ -7,7 +7,7 @@ using System.Security.Cryptography;
 using System.Text;
 using Microsoft.AspNetCore.Cryptography.Cng;
 using Microsoft.AspNetCore.DataProtection.Test.Shared;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.DataProtection.Cng
diff --git a/src/DataProtection/DataProtection/test/Cng/CngAuthenticatedEncryptorBaseTests.cs b/src/DataProtection/DataProtection/test/Cng/CngAuthenticatedEncryptorBaseTests.cs
index dd439785f4..ef0b405dab 100644
--- a/src/DataProtection/DataProtection/test/Cng/CngAuthenticatedEncryptorBaseTests.cs
+++ b/src/DataProtection/DataProtection/test/Cng/CngAuthenticatedEncryptorBaseTests.cs
@@ -3,7 +3,7 @@
 
 using System;
 using Microsoft.AspNetCore.DataProtection.Test.Shared;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Moq;
 using Xunit;
 
diff --git a/src/DataProtection/DataProtection/test/Cng/GcmAuthenticatedEncryptorTests.cs b/src/DataProtection/DataProtection/test/Cng/GcmAuthenticatedEncryptorTests.cs
index b01058e5b4..2a5b3d465f 100644
--- a/src/DataProtection/DataProtection/test/Cng/GcmAuthenticatedEncryptorTests.cs
+++ b/src/DataProtection/DataProtection/test/Cng/GcmAuthenticatedEncryptorTests.cs
@@ -7,7 +7,7 @@ using System.Security.Cryptography;
 using System.Text;
 using Microsoft.AspNetCore.Cryptography.Cng;
 using Microsoft.AspNetCore.DataProtection.Test.Shared;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.DataProtection.Cng
diff --git a/src/DataProtection/DataProtection/test/ContainerUtilsTests.cs b/src/DataProtection/DataProtection/test/ContainerUtilsTests.cs
index 413202e737..f9e97ea8ab 100644
--- a/src/DataProtection/DataProtection/test/ContainerUtilsTests.cs
+++ b/src/DataProtection/DataProtection/test/ContainerUtilsTests.cs
@@ -3,7 +3,7 @@
 
 using System.IO;
 using Microsoft.AspNetCore.DataProtection.Internal;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.DataProtection.Test
diff --git a/src/DataProtection/DataProtection/test/Internal/KeyManagementOptionsSetupTest.cs b/src/DataProtection/DataProtection/test/Internal/KeyManagementOptionsSetupTest.cs
index ae49c7edab..1f6d8570d7 100644
--- a/src/DataProtection/DataProtection/test/Internal/KeyManagementOptionsSetupTest.cs
+++ b/src/DataProtection/DataProtection/test/Internal/KeyManagementOptionsSetupTest.cs
@@ -9,7 +9,7 @@ using System.Xml.Linq;
 using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption;
 using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel;
 using Microsoft.AspNetCore.DataProtection.KeyManagement;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Win32;
 using Xunit;
diff --git a/src/DataProtection/DataProtection/test/Managed/ManagedAuthenticatedEncryptorTests.cs b/src/DataProtection/DataProtection/test/Managed/ManagedAuthenticatedEncryptorTests.cs
index d279f73cf6..a908c3e85e 100644
--- a/src/DataProtection/DataProtection/test/Managed/ManagedAuthenticatedEncryptorTests.cs
+++ b/src/DataProtection/DataProtection/test/Managed/ManagedAuthenticatedEncryptorTests.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
 using Microsoft.AspNetCore.DataProtection.Test.Shared;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.DataProtection.Managed
diff --git a/src/DataProtection/DataProtection/test/RegistryPolicyResolverTests.cs b/src/DataProtection/DataProtection/test/RegistryPolicyResolverTests.cs
index d10fd872cd..51759f3eb2 100644
--- a/src/DataProtection/DataProtection/test/RegistryPolicyResolverTests.cs
+++ b/src/DataProtection/DataProtection/test/RegistryPolicyResolverTests.cs
@@ -10,7 +10,7 @@ using System.Xml.Linq;
 using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel;
 using Microsoft.AspNetCore.DataProtection.Internal;
 using Microsoft.AspNetCore.DataProtection.KeyManagement;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Logging;
diff --git a/src/DataProtection/DataProtection/test/Repositories/FileSystemXmlRepositoryTests.cs b/src/DataProtection/DataProtection/test/Repositories/FileSystemXmlRepositoryTests.cs
index 4bc2e10171..8099f04c15 100644
--- a/src/DataProtection/DataProtection/test/Repositories/FileSystemXmlRepositoryTests.cs
+++ b/src/DataProtection/DataProtection/test/Repositories/FileSystemXmlRepositoryTests.cs
@@ -6,7 +6,7 @@ using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Xml.Linq;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Xunit;
diff --git a/src/DataProtection/DataProtection/test/Repositories/RegistryXmlRepositoryTests.cs b/src/DataProtection/DataProtection/test/Repositories/RegistryXmlRepositoryTests.cs
index 11f0060ca3..47a94db5ec 100644
--- a/src/DataProtection/DataProtection/test/Repositories/RegistryXmlRepositoryTests.cs
+++ b/src/DataProtection/DataProtection/test/Repositories/RegistryXmlRepositoryTests.cs
@@ -5,7 +5,7 @@ using System;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Xml.Linq;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Win32;
 using Xunit;
diff --git a/src/DataProtection/DataProtection/test/SP800_108/SP800_108Tests.cs b/src/DataProtection/DataProtection/test/SP800_108/SP800_108Tests.cs
index 871ca83f5b..6ae923cade 100644
--- a/src/DataProtection/DataProtection/test/SP800_108/SP800_108Tests.cs
+++ b/src/DataProtection/DataProtection/test/SP800_108/SP800_108Tests.cs
@@ -5,7 +5,7 @@ using System;
 using System.Security.Cryptography;
 using System.Text;
 using Microsoft.AspNetCore.DataProtection.Test.Shared;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.DataProtection.SP800_108
diff --git a/src/DataProtection/DataProtection/test/XmlEncryption/DpapiNGXmlEncryptionTests.cs b/src/DataProtection/DataProtection/test/XmlEncryption/DpapiNGXmlEncryptionTests.cs
index 6b16c638a8..1c7e3c40c7 100644
--- a/src/DataProtection/DataProtection/test/XmlEncryption/DpapiNGXmlEncryptionTests.cs
+++ b/src/DataProtection/DataProtection/test/XmlEncryption/DpapiNGXmlEncryptionTests.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Xml.Linq;
 using Microsoft.AspNetCore.DataProtection.Test.Shared;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.Logging.Abstractions;
 using Xunit;
 
diff --git a/src/DataProtection/DataProtection/test/XmlEncryption/DpapiXmlEncryptionTests.cs b/src/DataProtection/DataProtection/test/XmlEncryption/DpapiXmlEncryptionTests.cs
index c6b4aa208a..22a6c30947 100644
--- a/src/DataProtection/DataProtection/test/XmlEncryption/DpapiXmlEncryptionTests.cs
+++ b/src/DataProtection/DataProtection/test/XmlEncryption/DpapiXmlEncryptionTests.cs
@@ -5,7 +5,6 @@ using System;
 using System.Xml.Linq;
 using Microsoft.AspNetCore.DataProtection.Test.Shared;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Logging.Abstractions;
 using Xunit;
 
diff --git a/src/DataProtection/Extensions/test/DataProtectionProviderTests.cs b/src/DataProtection/Extensions/test/DataProtectionProviderTests.cs
index ec1f26ef50..965f472d28 100644
--- a/src/DataProtection/Extensions/test/DataProtectionProviderTests.cs
+++ b/src/DataProtection/Extensions/test/DataProtectionProviderTests.cs
@@ -11,7 +11,6 @@ using Microsoft.AspNetCore.DataProtection.KeyManagement;
 using Microsoft.AspNetCore.DataProtection.Repositories;
 using Microsoft.AspNetCore.DataProtection.Test.Shared;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
diff --git a/src/DataProtection/Extensions/test/X509StoreIsAvailableAttribute.cs b/src/DataProtection/Extensions/test/X509StoreIsAvailableAttribute.cs
index 2181b4c24f..28196fb747 100644
--- a/src/DataProtection/Extensions/test/X509StoreIsAvailableAttribute.cs
+++ b/src/DataProtection/Extensions/test/X509StoreIsAvailableAttribute.cs
@@ -3,7 +3,7 @@
 
 using System;
 using System.Security.Cryptography.X509Certificates;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 
 namespace Microsoft.AspNetCore.DataProtection
 {
diff --git a/src/DataProtection/StackExchangeRedis/test/DataProtectionRedisTests.cs b/src/DataProtection/StackExchangeRedis/test/DataProtectionRedisTests.cs
index a204050ad1..0a61c753f1 100644
--- a/src/DataProtection/StackExchangeRedis/test/DataProtectionRedisTests.cs
+++ b/src/DataProtection/StackExchangeRedis/test/DataProtectionRedisTests.cs
@@ -7,7 +7,6 @@ using System.Threading.Tasks;
 using System.Xml;
 using System.Xml.Linq;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Moq;
 using StackExchange.Redis;
 using Xunit;
diff --git a/src/DataProtection/StackExchangeRedis/test/TestRedisServerIsAvailableAttribute.cs b/src/DataProtection/StackExchangeRedis/test/TestRedisServerIsAvailableAttribute.cs
index 04857c494b..48b14bb708 100644
--- a/src/DataProtection/StackExchangeRedis/test/TestRedisServerIsAvailableAttribute.cs
+++ b/src/DataProtection/StackExchangeRedis/test/TestRedisServerIsAvailableAttribute.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using System;
 
 namespace Microsoft.AspNetCore.DataProtection
diff --git a/src/DataProtection/shared/test/ConditionalRunTestOnlyWindows8OrLaterAttribute.cs b/src/DataProtection/shared/test/ConditionalRunTestOnlyWindows8OrLaterAttribute.cs
index d5ef4730f6..0311e43a12 100644
--- a/src/DataProtection/shared/test/ConditionalRunTestOnlyWindows8OrLaterAttribute.cs
+++ b/src/DataProtection/shared/test/ConditionalRunTestOnlyWindows8OrLaterAttribute.cs
@@ -3,7 +3,7 @@
 
 using System;
 using Microsoft.AspNetCore.Cryptography.Cng;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 
 namespace Microsoft.AspNetCore.DataProtection.Test.Shared
 {
diff --git a/src/DataProtection/shared/test/ConditionalRunTestOnlyWindowsAttribute.cs b/src/DataProtection/shared/test/ConditionalRunTestOnlyWindowsAttribute.cs
index 5033b3e38e..28ff2c6d83 100644
--- a/src/DataProtection/shared/test/ConditionalRunTestOnlyWindowsAttribute.cs
+++ b/src/DataProtection/shared/test/ConditionalRunTestOnlyWindowsAttribute.cs
@@ -3,7 +3,7 @@
 
 using System;
 using Microsoft.AspNetCore.Cryptography.Cng;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 
 namespace Microsoft.AspNetCore.DataProtection.Test.Shared
 {
diff --git a/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/WebHostFunctionalTests.cs b/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/WebHostFunctionalTests.cs
index 81cbc14d56..da51bb4a3c 100644
--- a/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/WebHostFunctionalTests.cs
+++ b/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/WebHostFunctionalTests.cs
@@ -8,7 +8,7 @@ using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Testing;
 using Xunit;
diff --git a/src/Features/JsonPatch/src/Internal/ConversionResult.cs b/src/Features/JsonPatch/src/Internal/ConversionResult.cs
index 77181eb18d..cf602ebf0e 100644
--- a/src/Features/JsonPatch/src/Internal/ConversionResult.cs
+++ b/src/Features/JsonPatch/src/Internal/ConversionResult.cs
@@ -3,6 +3,10 @@
 
 namespace Microsoft.AspNetCore.JsonPatch.Internal
 {
+    /// <summary>
+    /// This API supports infrastructure and is not intended to be used
+    /// directly from your code. This API may change or be removed in future releases.
+    /// </summary>
     public class ConversionResult
     {
         public ConversionResult(bool canBeConverted, object convertedInstance)
@@ -14,4 +18,4 @@ namespace Microsoft.AspNetCore.JsonPatch.Internal
         public bool CanBeConverted { get; }
         public object ConvertedInstance { get; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Features/JsonPatch/src/Internal/ConversionResultProvider.cs b/src/Features/JsonPatch/src/Internal/ConversionResultProvider.cs
index 3d0b6cc979..8a717bb0ed 100644
--- a/src/Features/JsonPatch/src/Internal/ConversionResultProvider.cs
+++ b/src/Features/JsonPatch/src/Internal/ConversionResultProvider.cs
@@ -7,6 +7,10 @@ using Newtonsoft.Json;
 
 namespace Microsoft.AspNetCore.JsonPatch.Internal
 {
+    /// <summary>
+    /// This API supports infrastructure and is not intended to be used
+    /// directly from your code. This API may change or be removed in future releases.
+    /// </summary>
     public static class ConversionResultProvider
     {
         public static ConversionResult ConvertTo(object value, Type typeToConvertTo)
diff --git a/src/Features/JsonPatch/src/Internal/DictionaryAdapterOfTU.cs b/src/Features/JsonPatch/src/Internal/DictionaryAdapterOfTU.cs
index be2bbffd86..8ab6acc0c9 100644
--- a/src/Features/JsonPatch/src/Internal/DictionaryAdapterOfTU.cs
+++ b/src/Features/JsonPatch/src/Internal/DictionaryAdapterOfTU.cs
@@ -8,6 +8,10 @@ using Newtonsoft.Json.Serialization;
 
 namespace Microsoft.AspNetCore.JsonPatch.Internal
 {
+    /// <summary>
+    /// This API supports infrastructure and is not intended to be used
+    /// directly from your code. This API may change or be removed in future releases.
+    /// </summary>
     public class DictionaryAdapter<TKey, TValue> : IAdapter
     {
         public virtual bool TryAdd(
diff --git a/src/Features/JsonPatch/src/Internal/DynamicObjectAdapter.cs b/src/Features/JsonPatch/src/Internal/DynamicObjectAdapter.cs
index 5b3d7d8bdd..64298bc414 100644
--- a/src/Features/JsonPatch/src/Internal/DynamicObjectAdapter.cs
+++ b/src/Features/JsonPatch/src/Internal/DynamicObjectAdapter.cs
@@ -13,6 +13,10 @@ using CSharpBinder = Microsoft.CSharp.RuntimeBinder;
 
 namespace Microsoft.AspNetCore.JsonPatch.Internal
 {
+    /// <summary>
+    /// This API supports infrastructure and is not intended to be used
+    /// directly from your code. This API may change or be removed in future releases.
+    /// </summary>
     public class DynamicObjectAdapter : IAdapter
     {
         public virtual bool TryAdd(
diff --git a/src/Features/JsonPatch/src/Internal/IAdapter.cs b/src/Features/JsonPatch/src/Internal/IAdapter.cs
index ec28131f7d..061b9a37bd 100644
--- a/src/Features/JsonPatch/src/Internal/IAdapter.cs
+++ b/src/Features/JsonPatch/src/Internal/IAdapter.cs
@@ -5,6 +5,10 @@ using Newtonsoft.Json.Serialization;
 
 namespace Microsoft.AspNetCore.JsonPatch.Internal
 {
+    /// <summary>
+    /// This API supports infrastructure and is not intended to be used
+    /// directly from your code. This API may change or be removed in future releases.
+    /// </summary>
     public interface IAdapter
     {
         bool TryTraverse(
diff --git a/src/Features/JsonPatch/src/Internal/ListAdapter.cs b/src/Features/JsonPatch/src/Internal/ListAdapter.cs
index 18b4acf217..a23dd7a4ad 100644
--- a/src/Features/JsonPatch/src/Internal/ListAdapter.cs
+++ b/src/Features/JsonPatch/src/Internal/ListAdapter.cs
@@ -11,6 +11,10 @@ using Newtonsoft.Json.Serialization;
 
 namespace Microsoft.AspNetCore.JsonPatch.Internal
 {
+    /// <summary>
+    /// This API supports infrastructure and is not intended to be used
+    /// directly from your code. This API may change or be removed in future releases.
+    /// </summary>
     public class ListAdapter : IAdapter
     {
         public virtual bool TryAdd(
@@ -318,6 +322,10 @@ namespace Microsoft.AspNetCore.JsonPatch.Internal
             }
         }
 
+        /// <summary>
+        /// This API supports infrastructure and is not intended to be used
+        /// directly from your code. This API may change or be removed in future releases.
+        /// </summary>
         protected readonly struct PositionInfo
         {
             public PositionInfo(PositionType type, int index)
@@ -330,6 +338,10 @@ namespace Microsoft.AspNetCore.JsonPatch.Internal
             public int Index { get; }
         }
 
+        /// <summary>
+        /// This API supports infrastructure and is not intended to be used
+        /// directly from your code. This API may change or be removed in future releases.
+        /// </summary>
         protected enum PositionType
         {
             Index, // valid index
@@ -338,6 +350,10 @@ namespace Microsoft.AspNetCore.JsonPatch.Internal
             OutOfBounds
         }
 
+        /// <summary>
+        /// This API supports infrastructure and is not intended to be used
+        /// directly from your code. This API may change or be removed in future releases.
+        /// </summary>
         protected enum OperationType
         {
             Add,
diff --git a/src/Features/JsonPatch/src/Internal/ObjectVisitor.cs b/src/Features/JsonPatch/src/Internal/ObjectVisitor.cs
index 6cb4d7450c..750331d159 100644
--- a/src/Features/JsonPatch/src/Internal/ObjectVisitor.cs
+++ b/src/Features/JsonPatch/src/Internal/ObjectVisitor.cs
@@ -7,6 +7,10 @@ using Newtonsoft.Json.Serialization;
 
 namespace Microsoft.AspNetCore.JsonPatch.Internal
 {
+    /// <summary>
+    /// This API supports infrastructure and is not intended to be used
+    /// directly from your code. This API may change or be removed in future releases.
+    /// </summary>
     public class ObjectVisitor
     {
         private readonly IAdapterFactory _adapterFactory;
@@ -30,7 +34,7 @@ namespace Microsoft.AspNetCore.JsonPatch.Internal
         /// <param name="contractResolver">The <see cref="IContractResolver"/>.</param>
         /// <param name="adapterFactory">The <see cref="IAdapterFactory"/> to use when creating adaptors.</param>
         public ObjectVisitor(ParsedPath path, IContractResolver contractResolver, IAdapterFactory adapterFactory)
-        { 
+        {
             _path = path;
             _contractResolver = contractResolver ?? throw new ArgumentNullException(nameof(contractResolver));
             _adapterFactory = adapterFactory ?? throw new ArgumentNullException(nameof(adapterFactory));
@@ -55,7 +59,7 @@ namespace Microsoft.AspNetCore.JsonPatch.Internal
                     adapter = null;
                     return false;
                 }
-                
+
                 // If we hit a null on an interior segment then we need to stop traversing.
                 if (next == null)
                 {
diff --git a/src/Features/JsonPatch/src/Internal/ParsedPath.cs b/src/Features/JsonPatch/src/Internal/ParsedPath.cs
index bff5fd9188..70f3ea98e9 100644
--- a/src/Features/JsonPatch/src/Internal/ParsedPath.cs
+++ b/src/Features/JsonPatch/src/Internal/ParsedPath.cs
@@ -8,6 +8,10 @@ using System.Text;
 
 namespace Microsoft.AspNetCore.JsonPatch.Internal
 {
+    /// <summary>
+    /// This API supports infrastructure and is not intended to be used
+    /// directly from your code. This API may change or be removed in future releases.
+    /// </summary>
     public readonly struct ParsedPath
     {
         private static readonly string[] Empty = null;
diff --git a/src/Features/JsonPatch/src/Internal/PocoAdapter.cs b/src/Features/JsonPatch/src/Internal/PocoAdapter.cs
index 5ba3e5587b..fea5c5922e 100644
--- a/src/Features/JsonPatch/src/Internal/PocoAdapter.cs
+++ b/src/Features/JsonPatch/src/Internal/PocoAdapter.cs
@@ -10,6 +10,10 @@ using Newtonsoft.Json.Serialization;
 
 namespace Microsoft.AspNetCore.JsonPatch.Internal
 {
+    /// <summary>
+    /// This API supports infrastructure and is not intended to be used
+    /// directly from your code. This API may change or be removed in future releases.
+    /// </summary>
     public class PocoAdapter : IAdapter
     {
         public virtual bool TryAdd(
diff --git a/src/Framework/test/TargetingPackTests.cs b/src/Framework/test/TargetingPackTests.cs
index 648311b98f..8222092260 100644
--- a/src/Framework/test/TargetingPackTests.cs
+++ b/src/Framework/test/TargetingPackTests.cs
@@ -34,9 +34,6 @@ namespace Microsoft.AspNetCore
             IEnumerable<string> dlls = Directory.GetFiles(_targetingPackRoot, "*.dll", SearchOption.AllDirectories);
             Assert.NotEmpty(dlls);
 
-            // Workaround https://github.com/aspnet/AspNetCore/issues/11206
-            dlls = dlls.Where(d => !d.Contains("System.IO.Pipelines"));
-
             Assert.All(dlls, path =>
             {
                 var assemblyName = AssemblyName.GetAssemblyName(path);
diff --git a/src/Hosting/Hosting/test/Internal/HostingEventSourceTests.cs b/src/Hosting/Hosting/test/Internal/HostingEventSourceTests.cs
index 47a661eff7..2e66f62818 100644
--- a/src/Hosting/Hosting/test/Internal/HostingEventSourceTests.cs
+++ b/src/Hosting/Hosting/test/Internal/HostingEventSourceTests.cs
@@ -9,7 +9,6 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Internal;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Hosting
diff --git a/src/Hosting/Hosting/test/WebHostTests.cs b/src/Hosting/Hosting/test/WebHostTests.cs
index 7b0665341a..c1499accff 100644
--- a/src/Hosting/Hosting/test/WebHostTests.cs
+++ b/src/Hosting/Hosting/test/WebHostTests.cs
@@ -15,7 +15,6 @@ using Microsoft.AspNetCore.Hosting.Server.Features;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
diff --git a/src/Hosting/Server.IntegrationTesting/ref/Microsoft.AspNetCore.Server.IntegrationTesting.netcoreapp.cs b/src/Hosting/Server.IntegrationTesting/ref/Microsoft.AspNetCore.Server.IntegrationTesting.netcoreapp.cs
index 2ac7060782..a7552d9f95 100644
--- a/src/Hosting/Server.IntegrationTesting/ref/Microsoft.AspNetCore.Server.IntegrationTesting.netcoreapp.cs
+++ b/src/Hosting/Server.IntegrationTesting/ref/Microsoft.AspNetCore.Server.IntegrationTesting.netcoreapp.cs
@@ -184,7 +184,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
         None = 0,
     }
     [System.AttributeUsageAttribute(System.AttributeTargets.Method, AllowMultiple=true)]
-    public partial class SkipIfEnvironmentVariableNotEnabledAttribute : System.Attribute, Microsoft.AspNetCore.Testing.xunit.ITestCondition
+    public partial class SkipIfEnvironmentVariableNotEnabledAttribute : System.Attribute, Microsoft.AspNetCore.Testing.ITestCondition
     {
         public SkipIfEnvironmentVariableNotEnabledAttribute(string environmentVariableName) { }
         public string AdditionalInfo { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
@@ -192,14 +192,14 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
         public string SkipReason { get { throw null; } }
     }
     [System.AttributeUsageAttribute(System.AttributeTargets.Assembly | System.AttributeTargets.Class | System.AttributeTargets.Method)]
-    public sealed partial class SkipIfIISExpressSchemaMissingInProcessAttribute : System.Attribute, Microsoft.AspNetCore.Testing.xunit.ITestCondition
+    public sealed partial class SkipIfIISExpressSchemaMissingInProcessAttribute : System.Attribute, Microsoft.AspNetCore.Testing.ITestCondition
     {
         public SkipIfIISExpressSchemaMissingInProcessAttribute() { }
         public bool IsMet { get { throw null; } }
         public string SkipReason { get { throw null; } }
     }
     [System.AttributeUsageAttribute(System.AttributeTargets.Method, AllowMultiple=false)]
-    public partial class SkipOn32BitOSAttribute : System.Attribute, Microsoft.AspNetCore.Testing.xunit.ITestCondition
+    public partial class SkipOn32BitOSAttribute : System.Attribute, Microsoft.AspNetCore.Testing.ITestCondition
     {
         public SkipOn32BitOSAttribute() { }
         public bool IsMet { get { throw null; } }
diff --git a/src/Hosting/Server.IntegrationTesting/src/xunit/SkipIfEnvironmentVariableNotEnabled.cs b/src/Hosting/Server.IntegrationTesting/src/xunit/SkipIfEnvironmentVariableNotEnabled.cs
index 8d54d6ac70..caed568f63 100644
--- a/src/Hosting/Server.IntegrationTesting/src/xunit/SkipIfEnvironmentVariableNotEnabled.cs
+++ b/src/Hosting/Server.IntegrationTesting/src/xunit/SkipIfEnvironmentVariableNotEnabled.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 
 namespace Microsoft.AspNetCore.Server.IntegrationTesting
 {
diff --git a/src/Hosting/Server.IntegrationTesting/src/xunit/SkipIfIISExpressSchemaMissingInProcessAttribute.cs b/src/Hosting/Server.IntegrationTesting/src/xunit/SkipIfIISExpressSchemaMissingInProcessAttribute.cs
index ecadf4522a..321b2f7de0 100644
--- a/src/Hosting/Server.IntegrationTesting/src/xunit/SkipIfIISExpressSchemaMissingInProcessAttribute.cs
+++ b/src/Hosting/Server.IntegrationTesting/src/xunit/SkipIfIISExpressSchemaMissingInProcessAttribute.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 
 namespace Microsoft.AspNetCore.Server.IntegrationTesting
 {
diff --git a/src/Hosting/Server.IntegrationTesting/src/xunit/SkipOn32BitOSAttribute.cs b/src/Hosting/Server.IntegrationTesting/src/xunit/SkipOn32BitOSAttribute.cs
index 066eb729c6..0557a7dada 100644
--- a/src/Hosting/Server.IntegrationTesting/src/xunit/SkipOn32BitOSAttribute.cs
+++ b/src/Hosting/Server.IntegrationTesting/src/xunit/SkipOn32BitOSAttribute.cs
@@ -3,7 +3,7 @@
 
 using System;
 using System.Runtime.InteropServices;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 
 namespace Microsoft.AspNetCore.Server.IntegrationTesting
 {
diff --git a/src/Hosting/TestHost/test/TestClientTests.cs b/src/Hosting/TestHost/test/TestClientTests.cs
index 84689708a0..322ab54a6f 100644
--- a/src/Hosting/TestHost/test/TestClientTests.cs
+++ b/src/Hosting/TestHost/test/TestClientTests.cs
@@ -13,7 +13,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Xunit;
diff --git a/src/Hosting/WindowsServices/test/Properties/AssemblyInfo.cs b/src/Hosting/WindowsServices/test/Properties/AssemblyInfo.cs
index 1dc44dd221..fe8e681ca7 100644
--- a/src/Hosting/WindowsServices/test/Properties/AssemblyInfo.cs
+++ b/src/Hosting/WindowsServices/test/Properties/AssemblyInfo.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 [assembly: OSSkipCondition(OperatingSystems.MacOSX)]
diff --git a/src/Hosting/WindowsServices/test/WebHostServiceTests.cs b/src/Hosting/WindowsServices/test/WebHostServiceTests.cs
index 10bc54cfe2..933c12a138 100644
--- a/src/Hosting/WindowsServices/test/WebHostServiceTests.cs
+++ b/src/Hosting/WindowsServices/test/WebHostServiceTests.cs
@@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Hosting.WindowsServices;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 using Microsoft.Extensions.Hosting;
 
diff --git a/src/Hosting/test/FunctionalTests/ShutdownTests.cs b/src/Hosting/test/FunctionalTests/ShutdownTests.cs
index 8629a4446f..46007e6a99 100644
--- a/src/Hosting/test/FunctionalTests/ShutdownTests.cs
+++ b/src/Hosting/test/FunctionalTests/ShutdownTests.cs
@@ -8,7 +8,6 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Logging.Testing;
 using Xunit;
 using Xunit.Abstractions;
@@ -25,7 +24,7 @@ namespace Microsoft.AspNetCore.Hosting.FunctionalTests
 
         public ShutdownTests(ITestOutputHelper output) : base(output) { }
 
-        [ConditionalFact]
+        [ConditionalFact(Skip = "https://github.com/aspnet/AspNetCore-Internal/issues/2577")]
         [OSSkipCondition(OperatingSystems.Windows)]
         [OSSkipCondition(OperatingSystems.MacOSX)]
         [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2577", FlakyOn.All)]
diff --git a/src/Hosting/test/FunctionalTests/WebHostBuilderTests.cs b/src/Hosting/test/FunctionalTests/WebHostBuilderTests.cs
index c86616097f..8747a75f26 100644
--- a/src/Hosting/test/FunctionalTests/WebHostBuilderTests.cs
+++ b/src/Hosting/test/FunctionalTests/WebHostBuilderTests.cs
@@ -6,7 +6,6 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Logging.Testing;
 using Xunit;
 using Xunit.Abstractions;
diff --git a/src/Http/WebUtilities/src/FormPipeReader.cs b/src/Http/WebUtilities/src/FormPipeReader.cs
index e82a0bf9c4..b0a7d4684c 100644
--- a/src/Http/WebUtilities/src/FormPipeReader.cs
+++ b/src/Http/WebUtilities/src/FormPipeReader.cs
@@ -252,6 +252,8 @@ namespace Microsoft.AspNetCore.WebUtilities
                 {
                     ParseFormValuesFast(keyValuePair.FirstSpan, ref accumulator, isFinalBlock: true, out var segmentConsumed);
                     Debug.Assert(segmentConsumed == keyValuePair.FirstSpan.Length);
+                    consumedBytes = sequenceReader.Consumed;
+                    consumed = sequenceReader.Position;
                     continue;
                 }
 
diff --git a/src/Http/WebUtilities/test/FormPipeReaderTests.cs b/src/Http/WebUtilities/test/FormPipeReaderTests.cs
index 6c6a6a42bc..58d3af12d5 100644
--- a/src/Http/WebUtilities/test/FormPipeReaderTests.cs
+++ b/src/Http/WebUtilities/test/FormPipeReaderTests.cs
@@ -184,6 +184,7 @@ namespace Microsoft.AspNetCore.WebUtilities
             var formReader = new FormPipeReader(null, encoding);
 
             formReader.ParseFormValues(ref readOnlySequence, ref accumulator, isFinalBlock: true);
+            Assert.True(readOnlySequence.IsEmpty);
 
             Assert.Equal(2, accumulator.KeyCount);
             var dict = accumulator.GetResults();
@@ -201,6 +202,7 @@ namespace Microsoft.AspNetCore.WebUtilities
 
             var formReader = new FormPipeReader(null, encoding);
             formReader.ParseFormValues(ref readOnlySequence, ref accumulator, isFinalBlock: true);
+            Assert.True(readOnlySequence.IsEmpty);
 
             Assert.Equal(3, accumulator.KeyCount);
             var dict = accumulator.GetResults();
@@ -219,6 +221,7 @@ namespace Microsoft.AspNetCore.WebUtilities
 
             var formReader = new FormPipeReader(null, encoding);
             formReader.ParseFormValues(ref readOnlySequence, ref accumulator, isFinalBlock: true);
+            Assert.True(readOnlySequence.IsEmpty);
 
             Assert.Equal(3, accumulator.KeyCount);
             var dict = accumulator.GetResults();
@@ -237,6 +240,7 @@ namespace Microsoft.AspNetCore.WebUtilities
 
             var formReader = new FormPipeReader(null, encoding);
             formReader.ParseFormValues(ref readOnlySequence, ref accumulator, isFinalBlock: true);
+            Assert.True(readOnlySequence.IsEmpty);
 
             Assert.Equal(2, accumulator.KeyCount);
             var dict = accumulator.GetResults();
@@ -254,6 +258,7 @@ namespace Microsoft.AspNetCore.WebUtilities
 
             var formReader = new FormPipeReader(null, encoding);
             formReader.ParseFormValues(ref readOnlySequence, ref accumulator, isFinalBlock: true);
+            Assert.True(readOnlySequence.IsEmpty);
 
             Assert.Equal(3, accumulator.KeyCount);
             var dict = accumulator.GetResults();
@@ -272,6 +277,7 @@ namespace Microsoft.AspNetCore.WebUtilities
 
             var formReader = new FormPipeReader(null, encoding);
             formReader.ParseFormValues(ref readOnlySequence, ref accumulator, isFinalBlock: true);
+            Assert.True(readOnlySequence.IsEmpty);
 
             Assert.Equal(3, accumulator.KeyCount);
             var dict = accumulator.GetResults();
@@ -290,6 +296,7 @@ namespace Microsoft.AspNetCore.WebUtilities
 
             var formReader = new FormPipeReader(null, encoding);
             formReader.ParseFormValues(ref readOnlySequence, ref accumulator, isFinalBlock: true);
+            Assert.True(readOnlySequence.IsEmpty);
 
             Assert.Equal(2, accumulator.KeyCount);
             var dict = accumulator.GetResults();
@@ -297,6 +304,23 @@ namespace Microsoft.AspNetCore.WebUtilities
             Assert.Equal("wow", dict["\"%-.<>\\^_`{|}"]);
         }
 
+        [Fact]
+        public void TryParseFormValues_MultiSegmentFastPathWorks()
+        {
+            var readOnlySequence = ReadOnlySequenceFactory.CreateSegments(Encoding.UTF8.GetBytes("foo=bar&"), Encoding.UTF8.GetBytes("baz=boo"));
+
+            KeyValueAccumulator accumulator = default;
+
+            var formReader = new FormPipeReader(null);
+            formReader.ParseFormValues(ref readOnlySequence, ref accumulator, isFinalBlock: true);
+            Assert.True(readOnlySequence.IsEmpty);
+
+            Assert.Equal(2, accumulator.KeyCount);
+            var dict = accumulator.GetResults();
+            Assert.Equal("bar", dict["foo"]);
+            Assert.Equal("boo", dict["baz"]);
+        }
+
         [Fact]
         public void TryParseFormValues_ExceedKeyLengthThrows()
         {
@@ -411,6 +435,7 @@ namespace Microsoft.AspNetCore.WebUtilities
             };
 
             formReader.ParseFormValues(ref readOnlySequence, ref accumulator, isFinalBlock: true);
+            Assert.True(readOnlySequence.IsEmpty);
 
             IDictionary<string, StringValues> values = accumulator.GetResults();
             Assert.Contains("fo", values);
@@ -431,6 +456,7 @@ namespace Microsoft.AspNetCore.WebUtilities
             };
 
             formReader.ParseFormValues(ref readOnlySequence, ref accumulator, isFinalBlock: true);
+            Assert.True(readOnlySequence.IsEmpty);
 
             IDictionary<string, StringValues> values = accumulator.GetResults();
             Assert.Contains("fo", values);
diff --git a/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/ConfigureSigningCredentialsTests.cs b/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/ConfigureSigningCredentialsTests.cs
index 0fb9d68e00..a72e128237 100644
--- a/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/ConfigureSigningCredentialsTests.cs
+++ b/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/ConfigureSigningCredentialsTests.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Security.Cryptography.X509Certificates;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.Configuration;
 using Microsoft.IdentityModel.Tokens;
 using Xunit;
diff --git a/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/SigningKeysLoaderTests.cs b/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/SigningKeysLoaderTests.cs
index 20bd91c88f..ced72bd9cc 100644
--- a/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/SigningKeysLoaderTests.cs
+++ b/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/SigningKeysLoaderTests.cs
@@ -6,7 +6,7 @@ using System;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Security.Cryptography.X509Certificates;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Configuration
diff --git a/src/Identity/EntityFrameworkCore/ref/Microsoft.AspNetCore.Identity.EntityFrameworkCore.netstandard2.1.cs b/src/Identity/EntityFrameworkCore/ref/Microsoft.AspNetCore.Identity.EntityFrameworkCore.netstandard2.1.cs
new file mode 100644
index 0000000000..17b2093144
--- /dev/null
+++ b/src/Identity/EntityFrameworkCore/ref/Microsoft.AspNetCore.Identity.EntityFrameworkCore.netstandard2.1.cs
@@ -0,0 +1,222 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore
+{
+    public partial class IdentityDbContext : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityDbContext<Microsoft.AspNetCore.Identity.IdentityUser, Microsoft.AspNetCore.Identity.IdentityRole, string>
+    {
+        protected IdentityDbContext() { }
+        public IdentityDbContext(Microsoft.EntityFrameworkCore.DbContextOptions options) { }
+    }
+    public partial class IdentityDbContext<TUser> : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityDbContext<TUser, Microsoft.AspNetCore.Identity.IdentityRole, string> where TUser : Microsoft.AspNetCore.Identity.IdentityUser
+    {
+        protected IdentityDbContext() { }
+        public IdentityDbContext(Microsoft.EntityFrameworkCore.DbContextOptions options) { }
+    }
+    public partial class IdentityDbContext<TUser, TRole, TKey> : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityDbContext<TUser, TRole, TKey, Microsoft.AspNetCore.Identity.IdentityUserClaim<TKey>, Microsoft.AspNetCore.Identity.IdentityUserRole<TKey>, Microsoft.AspNetCore.Identity.IdentityUserLogin<TKey>, Microsoft.AspNetCore.Identity.IdentityRoleClaim<TKey>, Microsoft.AspNetCore.Identity.IdentityUserToken<TKey>> where TUser : Microsoft.AspNetCore.Identity.IdentityUser<TKey> where TRole : Microsoft.AspNetCore.Identity.IdentityRole<TKey> where TKey : System.IEquatable<TKey>
+    {
+        protected IdentityDbContext() { }
+        public IdentityDbContext(Microsoft.EntityFrameworkCore.DbContextOptions options) { }
+    }
+    public abstract partial class IdentityDbContext<TUser, TRole, TKey, TUserClaim, TUserRole, TUserLogin, TRoleClaim, TUserToken> : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserContext<TUser, TKey, TUserClaim, TUserLogin, TUserToken> where TUser : Microsoft.AspNetCore.Identity.IdentityUser<TKey> where TRole : Microsoft.AspNetCore.Identity.IdentityRole<TKey> where TKey : System.IEquatable<TKey> where TUserClaim : Microsoft.AspNetCore.Identity.IdentityUserClaim<TKey> where TUserRole : Microsoft.AspNetCore.Identity.IdentityUserRole<TKey> where TUserLogin : Microsoft.AspNetCore.Identity.IdentityUserLogin<TKey> where TRoleClaim : Microsoft.AspNetCore.Identity.IdentityRoleClaim<TKey> where TUserToken : Microsoft.AspNetCore.Identity.IdentityUserToken<TKey>
+    {
+        protected IdentityDbContext() { }
+        public IdentityDbContext(Microsoft.EntityFrameworkCore.DbContextOptions options) { }
+        public virtual Microsoft.EntityFrameworkCore.DbSet<TRoleClaim> RoleClaims { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public virtual Microsoft.EntityFrameworkCore.DbSet<TRole> Roles { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public virtual Microsoft.EntityFrameworkCore.DbSet<TUserRole> UserRoles { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        protected override void OnModelCreating(Microsoft.EntityFrameworkCore.ModelBuilder builder) { }
+    }
+    public partial class IdentityUserContext<TUser> : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserContext<TUser, string> where TUser : Microsoft.AspNetCore.Identity.IdentityUser
+    {
+        protected IdentityUserContext() { }
+        public IdentityUserContext(Microsoft.EntityFrameworkCore.DbContextOptions options) { }
+    }
+    public partial class IdentityUserContext<TUser, TKey> : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserContext<TUser, TKey, Microsoft.AspNetCore.Identity.IdentityUserClaim<TKey>, Microsoft.AspNetCore.Identity.IdentityUserLogin<TKey>, Microsoft.AspNetCore.Identity.IdentityUserToken<TKey>> where TUser : Microsoft.AspNetCore.Identity.IdentityUser<TKey> where TKey : System.IEquatable<TKey>
+    {
+        protected IdentityUserContext() { }
+        public IdentityUserContext(Microsoft.EntityFrameworkCore.DbContextOptions options) { }
+    }
+    public abstract partial class IdentityUserContext<TUser, TKey, TUserClaim, TUserLogin, TUserToken> : Microsoft.EntityFrameworkCore.DbContext where TUser : Microsoft.AspNetCore.Identity.IdentityUser<TKey> where TKey : System.IEquatable<TKey> where TUserClaim : Microsoft.AspNetCore.Identity.IdentityUserClaim<TKey> where TUserLogin : Microsoft.AspNetCore.Identity.IdentityUserLogin<TKey> where TUserToken : Microsoft.AspNetCore.Identity.IdentityUserToken<TKey>
+    {
+        protected IdentityUserContext() { }
+        public IdentityUserContext(Microsoft.EntityFrameworkCore.DbContextOptions options) { }
+        public virtual Microsoft.EntityFrameworkCore.DbSet<TUserClaim> UserClaims { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public virtual Microsoft.EntityFrameworkCore.DbSet<TUserLogin> UserLogins { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public virtual Microsoft.EntityFrameworkCore.DbSet<TUser> Users { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public virtual Microsoft.EntityFrameworkCore.DbSet<TUserToken> UserTokens { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        protected override void OnModelCreating(Microsoft.EntityFrameworkCore.ModelBuilder builder) { }
+    }
+    public partial class RoleStore<TRole> : Microsoft.AspNetCore.Identity.EntityFrameworkCore.RoleStore<TRole, Microsoft.EntityFrameworkCore.DbContext, string> where TRole : Microsoft.AspNetCore.Identity.IdentityRole<string>
+    {
+        public RoleStore(Microsoft.EntityFrameworkCore.DbContext context, Microsoft.AspNetCore.Identity.IdentityErrorDescriber describer = null) : base (default(Microsoft.EntityFrameworkCore.DbContext), default(Microsoft.AspNetCore.Identity.IdentityErrorDescriber)) { }
+    }
+    public partial class RoleStore<TRole, TContext> : Microsoft.AspNetCore.Identity.EntityFrameworkCore.RoleStore<TRole, TContext, string> where TRole : Microsoft.AspNetCore.Identity.IdentityRole<string> where TContext : Microsoft.EntityFrameworkCore.DbContext
+    {
+        public RoleStore(TContext context, Microsoft.AspNetCore.Identity.IdentityErrorDescriber describer = null) : base (default(TContext), default(Microsoft.AspNetCore.Identity.IdentityErrorDescriber)) { }
+    }
+    public partial class RoleStore<TRole, TContext, TKey> : Microsoft.AspNetCore.Identity.EntityFrameworkCore.RoleStore<TRole, TContext, TKey, Microsoft.AspNetCore.Identity.IdentityUserRole<TKey>, Microsoft.AspNetCore.Identity.IdentityRoleClaim<TKey>>, Microsoft.AspNetCore.Identity.IQueryableRoleStore<TRole>, Microsoft.AspNetCore.Identity.IRoleClaimStore<TRole>, Microsoft.AspNetCore.Identity.IRoleStore<TRole>, System.IDisposable where TRole : Microsoft.AspNetCore.Identity.IdentityRole<TKey> where TContext : Microsoft.EntityFrameworkCore.DbContext where TKey : System.IEquatable<TKey>
+    {
+        public RoleStore(TContext context, Microsoft.AspNetCore.Identity.IdentityErrorDescriber describer = null) : base (default(TContext), default(Microsoft.AspNetCore.Identity.IdentityErrorDescriber)) { }
+    }
+    public partial class RoleStore<TRole, TContext, TKey, TUserRole, TRoleClaim> : Microsoft.AspNetCore.Identity.IQueryableRoleStore<TRole>, Microsoft.AspNetCore.Identity.IRoleClaimStore<TRole>, Microsoft.AspNetCore.Identity.IRoleStore<TRole>, System.IDisposable where TRole : Microsoft.AspNetCore.Identity.IdentityRole<TKey> where TContext : Microsoft.EntityFrameworkCore.DbContext where TKey : System.IEquatable<TKey> where TUserRole : Microsoft.AspNetCore.Identity.IdentityUserRole<TKey>, new() where TRoleClaim : Microsoft.AspNetCore.Identity.IdentityRoleClaim<TKey>, new()
+    {
+        public RoleStore(TContext context, Microsoft.AspNetCore.Identity.IdentityErrorDescriber describer = null) { }
+        public bool AutoSaveChanges { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public virtual TContext Context { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public Microsoft.AspNetCore.Identity.IdentityErrorDescriber ErrorDescriber { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public virtual System.Linq.IQueryable<TRole> Roles { get { throw null; } }
+        public virtual System.Threading.Tasks.Task AddClaimAsync(TRole role, System.Security.Claims.Claim claim, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual TKey ConvertIdFromString(string id) { throw null; }
+        public virtual string ConvertIdToString(TKey id) { throw null; }
+        [System.Diagnostics.DebuggerStepThroughAttribute]
+        public virtual System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.IdentityResult> CreateAsync(TRole role, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected virtual TRoleClaim CreateRoleClaim(TRole role, System.Security.Claims.Claim claim) { throw null; }
+        [System.Diagnostics.DebuggerStepThroughAttribute]
+        public virtual System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.IdentityResult> DeleteAsync(TRole role, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public void Dispose() { }
+        public virtual System.Threading.Tasks.Task<TRole> FindByIdAsync(string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<TRole> FindByNameAsync(string normalizedName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        [System.Diagnostics.DebuggerStepThroughAttribute]
+        public virtual System.Threading.Tasks.Task<System.Collections.Generic.IList<System.Security.Claims.Claim>> GetClaimsAsync(TRole role, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<string> GetNormalizedRoleNameAsync(TRole role, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<string> GetRoleIdAsync(TRole role, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<string> GetRoleNameAsync(TRole role, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        [System.Diagnostics.DebuggerStepThroughAttribute]
+        public virtual System.Threading.Tasks.Task RemoveClaimAsync(TRole role, System.Security.Claims.Claim claim, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task SetNormalizedRoleNameAsync(TRole role, string normalizedName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task SetRoleNameAsync(TRole role, string roleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected void ThrowIfDisposed() { }
+        [System.Diagnostics.DebuggerStepThroughAttribute]
+        public virtual System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.IdentityResult> UpdateAsync(TRole role, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class UserOnlyStore<TUser> : Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, Microsoft.EntityFrameworkCore.DbContext, string> where TUser : Microsoft.AspNetCore.Identity.IdentityUser<string>, new()
+    {
+        public UserOnlyStore(Microsoft.EntityFrameworkCore.DbContext context, Microsoft.AspNetCore.Identity.IdentityErrorDescriber describer = null) : base (default(Microsoft.EntityFrameworkCore.DbContext), default(Microsoft.AspNetCore.Identity.IdentityErrorDescriber)) { }
+    }
+    public partial class UserOnlyStore<TUser, TContext> : Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, string> where TUser : Microsoft.AspNetCore.Identity.IdentityUser<string> where TContext : Microsoft.EntityFrameworkCore.DbContext
+    {
+        public UserOnlyStore(TContext context, Microsoft.AspNetCore.Identity.IdentityErrorDescriber describer = null) : base (default(TContext), default(Microsoft.AspNetCore.Identity.IdentityErrorDescriber)) { }
+    }
+    public partial class UserOnlyStore<TUser, TContext, TKey> : Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore<TUser, TContext, TKey, Microsoft.AspNetCore.Identity.IdentityUserClaim<TKey>, Microsoft.AspNetCore.Identity.IdentityUserLogin<TKey>, Microsoft.AspNetCore.Identity.IdentityUserToken<TKey>> where TUser : Microsoft.AspNetCore.Identity.IdentityUser<TKey> where TContext : Microsoft.EntityFrameworkCore.DbContext where TKey : System.IEquatable<TKey>
+    {
+        public UserOnlyStore(TContext context, Microsoft.AspNetCore.Identity.IdentityErrorDescriber describer = null) : base (default(TContext), default(Microsoft.AspNetCore.Identity.IdentityErrorDescriber)) { }
+    }
+    public partial class UserOnlyStore<TUser, TContext, TKey, TUserClaim, TUserLogin, TUserToken> : Microsoft.AspNetCore.Identity.UserStoreBase<TUser, TKey, TUserClaim, TUserLogin, TUserToken>, Microsoft.AspNetCore.Identity.IProtectedUserStore<TUser>, Microsoft.AspNetCore.Identity.IQueryableUserStore<TUser>, Microsoft.AspNetCore.Identity.IUserAuthenticationTokenStore<TUser>, Microsoft.AspNetCore.Identity.IUserAuthenticatorKeyStore<TUser>, Microsoft.AspNetCore.Identity.IUserClaimStore<TUser>, Microsoft.AspNetCore.Identity.IUserEmailStore<TUser>, Microsoft.AspNetCore.Identity.IUserLockoutStore<TUser>, Microsoft.AspNetCore.Identity.IUserLoginStore<TUser>, Microsoft.AspNetCore.Identity.IUserPasswordStore<TUser>, Microsoft.AspNetCore.Identity.IUserPhoneNumberStore<TUser>, Microsoft.AspNetCore.Identity.IUserSecurityStampStore<TUser>, Microsoft.AspNetCore.Identity.IUserStore<TUser>, Microsoft.AspNetCore.Identity.IUserTwoFactorRecoveryCodeStore<TUser>, Microsoft.AspNetCore.Identity.IUserTwoFactorStore<TUser>, System.IDisposable where TUser : Microsoft.AspNetCore.Identity.IdentityUser<TKey> where TContext : Microsoft.EntityFrameworkCore.DbContext where TKey : System.IEquatable<TKey> where TUserClaim : Microsoft.AspNetCore.Identity.IdentityUserClaim<TKey>, new() where TUserLogin : Microsoft.AspNetCore.Identity.IdentityUserLogin<TKey>, new() where TUserToken : Microsoft.AspNetCore.Identity.IdentityUserToken<TKey>, new()
+    {
+        public UserOnlyStore(TContext context, Microsoft.AspNetCore.Identity.IdentityErrorDescriber describer = null) : base (default(Microsoft.AspNetCore.Identity.IdentityErrorDescriber)) { }
+        public bool AutoSaveChanges { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public virtual TContext Context { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        protected Microsoft.EntityFrameworkCore.DbSet<TUserClaim> UserClaims { get { throw null; } }
+        protected Microsoft.EntityFrameworkCore.DbSet<TUserLogin> UserLogins { get { throw null; } }
+        public override System.Linq.IQueryable<TUser> Users { get { throw null; } }
+        protected Microsoft.EntityFrameworkCore.DbSet<TUser> UsersSet { get { throw null; } }
+        protected Microsoft.EntityFrameworkCore.DbSet<TUserToken> UserTokens { get { throw null; } }
+        public override System.Threading.Tasks.Task AddClaimsAsync(TUser user, System.Collections.Generic.IEnumerable<System.Security.Claims.Claim> claims, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.Task AddLoginAsync(TUser user, Microsoft.AspNetCore.Identity.UserLoginInfo login, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected override System.Threading.Tasks.Task AddUserTokenAsync(TUserToken token) { throw null; }
+        [System.Diagnostics.DebuggerStepThroughAttribute]
+        public override System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.IdentityResult> CreateAsync(TUser user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        [System.Diagnostics.DebuggerStepThroughAttribute]
+        public override System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.IdentityResult> DeleteAsync(TUser user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.Task<TUser> FindByEmailAsync(string normalizedEmail, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.Task<TUser> FindByIdAsync(string userId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        [System.Diagnostics.DebuggerStepThroughAttribute]
+        public override System.Threading.Tasks.Task<TUser> FindByLoginAsync(string loginProvider, string providerKey, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.Task<TUser> FindByNameAsync(string normalizedUserName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected override System.Threading.Tasks.Task<TUserToken> FindTokenAsync(TUser user, string loginProvider, string name, System.Threading.CancellationToken cancellationToken) { throw null; }
+        protected override System.Threading.Tasks.Task<TUser> FindUserAsync(TKey userId, System.Threading.CancellationToken cancellationToken) { throw null; }
+        protected override System.Threading.Tasks.Task<TUserLogin> FindUserLoginAsync(string loginProvider, string providerKey, System.Threading.CancellationToken cancellationToken) { throw null; }
+        protected override System.Threading.Tasks.Task<TUserLogin> FindUserLoginAsync(TKey userId, string loginProvider, string providerKey, System.Threading.CancellationToken cancellationToken) { throw null; }
+        [System.Diagnostics.DebuggerStepThroughAttribute]
+        public override System.Threading.Tasks.Task<System.Collections.Generic.IList<System.Security.Claims.Claim>> GetClaimsAsync(TUser user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        [System.Diagnostics.DebuggerStepThroughAttribute]
+        public override System.Threading.Tasks.Task<System.Collections.Generic.IList<Microsoft.AspNetCore.Identity.UserLoginInfo>> GetLoginsAsync(TUser user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        [System.Diagnostics.DebuggerStepThroughAttribute]
+        public override System.Threading.Tasks.Task<System.Collections.Generic.IList<TUser>> GetUsersForClaimAsync(System.Security.Claims.Claim claim, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        [System.Diagnostics.DebuggerStepThroughAttribute]
+        public override System.Threading.Tasks.Task RemoveClaimsAsync(TUser user, System.Collections.Generic.IEnumerable<System.Security.Claims.Claim> claims, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        [System.Diagnostics.DebuggerStepThroughAttribute]
+        public override System.Threading.Tasks.Task RemoveLoginAsync(TUser user, string loginProvider, string providerKey, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected override System.Threading.Tasks.Task RemoveUserTokenAsync(TUserToken token) { throw null; }
+        [System.Diagnostics.DebuggerStepThroughAttribute]
+        public override System.Threading.Tasks.Task ReplaceClaimAsync(TUser user, System.Security.Claims.Claim claim, System.Security.Claims.Claim newClaim, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected System.Threading.Tasks.Task SaveChanges(System.Threading.CancellationToken cancellationToken) { throw null; }
+        [System.Diagnostics.DebuggerStepThroughAttribute]
+        public override System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.IdentityResult> UpdateAsync(TUser user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class UserStore : Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<Microsoft.AspNetCore.Identity.IdentityUser<string>>
+    {
+        public UserStore(Microsoft.EntityFrameworkCore.DbContext context, Microsoft.AspNetCore.Identity.IdentityErrorDescriber describer = null) : base (default(Microsoft.EntityFrameworkCore.DbContext), default(Microsoft.AspNetCore.Identity.IdentityErrorDescriber)) { }
+    }
+    public partial class UserStore<TUser> : Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, Microsoft.AspNetCore.Identity.IdentityRole, Microsoft.EntityFrameworkCore.DbContext, string> where TUser : Microsoft.AspNetCore.Identity.IdentityUser<string>, new()
+    {
+        public UserStore(Microsoft.EntityFrameworkCore.DbContext context, Microsoft.AspNetCore.Identity.IdentityErrorDescriber describer = null) : base (default(Microsoft.EntityFrameworkCore.DbContext), default(Microsoft.AspNetCore.Identity.IdentityErrorDescriber)) { }
+    }
+    public partial class UserStore<TUser, TRole, TContext> : Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, string> where TUser : Microsoft.AspNetCore.Identity.IdentityUser<string> where TRole : Microsoft.AspNetCore.Identity.IdentityRole<string> where TContext : Microsoft.EntityFrameworkCore.DbContext
+    {
+        public UserStore(TContext context, Microsoft.AspNetCore.Identity.IdentityErrorDescriber describer = null) : base (default(TContext), default(Microsoft.AspNetCore.Identity.IdentityErrorDescriber)) { }
+    }
+    public partial class UserStore<TUser, TRole, TContext, TKey> : Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<TUser, TRole, TContext, TKey, Microsoft.AspNetCore.Identity.IdentityUserClaim<TKey>, Microsoft.AspNetCore.Identity.IdentityUserRole<TKey>, Microsoft.AspNetCore.Identity.IdentityUserLogin<TKey>, Microsoft.AspNetCore.Identity.IdentityUserToken<TKey>, Microsoft.AspNetCore.Identity.IdentityRoleClaim<TKey>> where TUser : Microsoft.AspNetCore.Identity.IdentityUser<TKey> where TRole : Microsoft.AspNetCore.Identity.IdentityRole<TKey> where TContext : Microsoft.EntityFrameworkCore.DbContext where TKey : System.IEquatable<TKey>
+    {
+        public UserStore(TContext context, Microsoft.AspNetCore.Identity.IdentityErrorDescriber describer = null) : base (default(TContext), default(Microsoft.AspNetCore.Identity.IdentityErrorDescriber)) { }
+    }
+    public partial class UserStore<TUser, TRole, TContext, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim> : Microsoft.AspNetCore.Identity.UserStoreBase<TUser, TRole, TKey, TUserClaim, TUserRole, TUserLogin, TUserToken, TRoleClaim>, Microsoft.AspNetCore.Identity.IProtectedUserStore<TUser>, Microsoft.AspNetCore.Identity.IUserStore<TUser>, System.IDisposable where TUser : Microsoft.AspNetCore.Identity.IdentityUser<TKey> where TRole : Microsoft.AspNetCore.Identity.IdentityRole<TKey> where TContext : Microsoft.EntityFrameworkCore.DbContext where TKey : System.IEquatable<TKey> where TUserClaim : Microsoft.AspNetCore.Identity.IdentityUserClaim<TKey>, new() where TUserRole : Microsoft.AspNetCore.Identity.IdentityUserRole<TKey>, new() where TUserLogin : Microsoft.AspNetCore.Identity.IdentityUserLogin<TKey>, new() where TUserToken : Microsoft.AspNetCore.Identity.IdentityUserToken<TKey>, new() where TRoleClaim : Microsoft.AspNetCore.Identity.IdentityRoleClaim<TKey>, new()
+    {
+        public UserStore(TContext context, Microsoft.AspNetCore.Identity.IdentityErrorDescriber describer = null) : base (default(Microsoft.AspNetCore.Identity.IdentityErrorDescriber)) { }
+        public bool AutoSaveChanges { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+        public virtual TContext Context { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+        public override System.Linq.IQueryable<TUser> Users { get { throw null; } }
+        public override System.Threading.Tasks.Task AddClaimsAsync(TUser user, System.Collections.Generic.IEnumerable<System.Security.Claims.Claim> claims, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.Task AddLoginAsync(TUser user, Microsoft.AspNetCore.Identity.UserLoginInfo login, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        [System.Diagnostics.DebuggerStepThroughAttribute]
+        public override System.Threading.Tasks.Task AddToRoleAsync(TUser user, string normalizedRoleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected override System.Threading.Tasks.Task AddUserTokenAsync(TUserToken token) { throw null; }
+        [System.Diagnostics.DebuggerStepThroughAttribute]
+        public override System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.IdentityResult> CreateAsync(TUser user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        [System.Diagnostics.DebuggerStepThroughAttribute]
+        public override System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.IdentityResult> DeleteAsync(TUser user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.Task<TUser> FindByEmailAsync(string normalizedEmail, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.Task<TUser> FindByIdAsync(string userId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        [System.Diagnostics.DebuggerStepThroughAttribute]
+        public override System.Threading.Tasks.Task<TUser> FindByLoginAsync(string loginProvider, string providerKey, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.Task<TUser> FindByNameAsync(string normalizedUserName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected override System.Threading.Tasks.Task<TRole> FindRoleAsync(string normalizedRoleName, System.Threading.CancellationToken cancellationToken) { throw null; }
+        protected override System.Threading.Tasks.Task<TUserToken> FindTokenAsync(TUser user, string loginProvider, string name, System.Threading.CancellationToken cancellationToken) { throw null; }
+        protected override System.Threading.Tasks.Task<TUser> FindUserAsync(TKey userId, System.Threading.CancellationToken cancellationToken) { throw null; }
+        protected override System.Threading.Tasks.Task<TUserLogin> FindUserLoginAsync(string loginProvider, string providerKey, System.Threading.CancellationToken cancellationToken) { throw null; }
+        protected override System.Threading.Tasks.Task<TUserLogin> FindUserLoginAsync(TKey userId, string loginProvider, string providerKey, System.Threading.CancellationToken cancellationToken) { throw null; }
+        protected override System.Threading.Tasks.Task<TUserRole> FindUserRoleAsync(TKey userId, TKey roleId, System.Threading.CancellationToken cancellationToken) { throw null; }
+        [System.Diagnostics.DebuggerStepThroughAttribute]
+        public override System.Threading.Tasks.Task<System.Collections.Generic.IList<System.Security.Claims.Claim>> GetClaimsAsync(TUser user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        [System.Diagnostics.DebuggerStepThroughAttribute]
+        public override System.Threading.Tasks.Task<System.Collections.Generic.IList<Microsoft.AspNetCore.Identity.UserLoginInfo>> GetLoginsAsync(TUser user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        [System.Diagnostics.DebuggerStepThroughAttribute]
+        public override System.Threading.Tasks.Task<System.Collections.Generic.IList<string>> GetRolesAsync(TUser user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        [System.Diagnostics.DebuggerStepThroughAttribute]
+        public override System.Threading.Tasks.Task<System.Collections.Generic.IList<TUser>> GetUsersForClaimAsync(System.Security.Claims.Claim claim, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        [System.Diagnostics.DebuggerStepThroughAttribute]
+        public override System.Threading.Tasks.Task<System.Collections.Generic.IList<TUser>> GetUsersInRoleAsync(string normalizedRoleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        [System.Diagnostics.DebuggerStepThroughAttribute]
+        public override System.Threading.Tasks.Task<bool> IsInRoleAsync(TUser user, string normalizedRoleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        [System.Diagnostics.DebuggerStepThroughAttribute]
+        public override System.Threading.Tasks.Task RemoveClaimsAsync(TUser user, System.Collections.Generic.IEnumerable<System.Security.Claims.Claim> claims, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        [System.Diagnostics.DebuggerStepThroughAttribute]
+        public override System.Threading.Tasks.Task RemoveFromRoleAsync(TUser user, string normalizedRoleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        [System.Diagnostics.DebuggerStepThroughAttribute]
+        public override System.Threading.Tasks.Task RemoveLoginAsync(TUser user, string loginProvider, string providerKey, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected override System.Threading.Tasks.Task RemoveUserTokenAsync(TUserToken token) { throw null; }
+        [System.Diagnostics.DebuggerStepThroughAttribute]
+        public override System.Threading.Tasks.Task ReplaceClaimAsync(TUser user, System.Security.Claims.Claim claim, System.Security.Claims.Claim newClaim, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected System.Threading.Tasks.Task SaveChanges(System.Threading.CancellationToken cancellationToken) { throw null; }
+        [System.Diagnostics.DebuggerStepThroughAttribute]
+        public override System.Threading.Tasks.Task<Microsoft.AspNetCore.Identity.IdentityResult> UpdateAsync(TUser user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+}
+namespace Microsoft.Extensions.DependencyInjection
+{
+    public static partial class IdentityEntityFrameworkBuilderExtensions
+    {
+        public static Microsoft.AspNetCore.Identity.IdentityBuilder AddEntityFrameworkStores<TContext>(this Microsoft.AspNetCore.Identity.IdentityBuilder builder) where TContext : Microsoft.EntityFrameworkCore.DbContext { throw null; }
+    }
+}
diff --git a/src/Identity/EntityFrameworkCore/test/EF.Test/CustomPocoTest.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/CustomPocoTest.cs
index 736451d58a..1e8a665892 100644
--- a/src/Identity/EntityFrameworkCore/test/EF.Test/CustomPocoTest.cs
+++ b/src/Identity/EntityFrameworkCore/test/EF.Test/CustomPocoTest.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.EntityFrameworkCore;
 using Xunit;
 
diff --git a/src/Identity/EntityFrameworkCore/test/EF.Test/DefaultPocoTest.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/DefaultPocoTest.cs
index d0aa5dbcb0..7d16e21ea0 100644
--- a/src/Identity/EntityFrameworkCore/test/EF.Test/DefaultPocoTest.cs
+++ b/src/Identity/EntityFrameworkCore/test/EF.Test/DefaultPocoTest.cs
@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Identity.Test;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.Extensions.Configuration;
diff --git a/src/Identity/EntityFrameworkCore/test/EF.Test/MaxKeyLengthSchemaTest.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/MaxKeyLengthSchemaTest.cs
index 3a8a8b38a4..74dc233acc 100644
--- a/src/Identity/EntityFrameworkCore/test/EF.Test/MaxKeyLengthSchemaTest.cs
+++ b/src/Identity/EntityFrameworkCore/test/EF.Test/MaxKeyLengthSchemaTest.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Data.Sqlite;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Diagnostics;
@@ -46,7 +46,7 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test
                 {
                 }
         }
-        
+
         [ConditionalFact]
         public void EnsureDefaultSchema()
         {
diff --git a/src/Identity/EntityFrameworkCore/test/EF.Test/SqlStoreOnlyUsersTestBase.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/SqlStoreOnlyUsersTestBase.cs
index ee7e762019..25136f3f94 100644
--- a/src/Identity/EntityFrameworkCore/test/EF.Test/SqlStoreOnlyUsersTestBase.cs
+++ b/src/Identity/EntityFrameworkCore/test/EF.Test/SqlStoreOnlyUsersTestBase.cs
@@ -7,7 +7,7 @@ using System.Linq.Expressions;
 using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Identity.Test;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Data.Sqlite;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
diff --git a/src/Identity/EntityFrameworkCore/test/EF.Test/SqlStoreTestBase.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/SqlStoreTestBase.cs
index 14ab7db642..09dbe0b9b1 100644
--- a/src/Identity/EntityFrameworkCore/test/EF.Test/SqlStoreTestBase.cs
+++ b/src/Identity/EntityFrameworkCore/test/EF.Test/SqlStoreTestBase.cs
@@ -7,7 +7,7 @@ using System.Linq.Expressions;
 using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Identity.Test;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Data.Sqlite;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
diff --git a/src/Identity/EntityFrameworkCore/test/EF.Test/UserOnlyCustomContextTest.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/UserOnlyCustomContextTest.cs
index 28ab8e21c1..9852edc6d7 100644
--- a/src/Identity/EntityFrameworkCore/test/EF.Test/UserOnlyCustomContextTest.cs
+++ b/src/Identity/EntityFrameworkCore/test/EF.Test/UserOnlyCustomContextTest.cs
@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Identity.Test;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.Extensions.Configuration;
diff --git a/src/Identity/EntityFrameworkCore/test/EF.Test/UserOnlyTest.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/UserOnlyTest.cs
index 364226f665..0cd5c40fd8 100644
--- a/src/Identity/EntityFrameworkCore/test/EF.Test/UserOnlyTest.cs
+++ b/src/Identity/EntityFrameworkCore/test/EF.Test/UserOnlyTest.cs
@@ -5,7 +5,7 @@ using System;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Identity.Test;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.Extensions.Configuration;
diff --git a/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreTest.cs b/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreTest.cs
index 6839a0c71e..022e54b778 100644
--- a/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreTest.cs
+++ b/src/Identity/EntityFrameworkCore/test/EF.Test/UserStoreTest.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Linq.Expressions;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Identity.Test;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using Xunit;
diff --git a/src/Identity/Specification.Tests/src/UserManagerSpecificationTests.cs b/src/Identity/Specification.Tests/src/UserManagerSpecificationTests.cs
index 9b743e4cf9..cdf5fd5072 100644
--- a/src/Identity/Specification.Tests/src/UserManagerSpecificationTests.cs
+++ b/src/Identity/Specification.Tests/src/UserManagerSpecificationTests.cs
@@ -8,7 +8,6 @@ using System.Linq.Expressions;
 using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Xunit;
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V4/_Layout.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/_Layout.cshtml
index ef570db19f..21f5ba6ee3 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V4/_Layout.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V4/_Layout.cshtml
@@ -56,7 +56,14 @@
     </div>
     <footer class="footer border-top pl-3 text-muted">
         <div class="container">
-        &copy; @DateTime.Now.Year - @Environment.ApplicationName - <a asp-area="" asp-page="Privacy">Privacy</a>
+        &copy; @DateTime.Now.Year - @Environment.ApplicationName -
+            @{
+                var foundPrivacy = Url.Page("/Privacy", new { area = "" });
+            }
+            @if (foundPrivacy != null)
+            {
+                <a asp-area="" asp-page="/Privacy">Privacy</a>
+            }
         </div>
     </footer>
 
diff --git a/src/Identity/test/Identity.FunctionalTests/Properties/AssemblyInfo.cs b/src/Identity/test/Identity.FunctionalTests/Properties/AssemblyInfo.cs
index f8a194b9d1..c451ef1452 100644
--- a/src/Identity/test/Identity.FunctionalTests/Properties/AssemblyInfo.cs
+++ b/src/Identity/test/Identity.FunctionalTests/Properties/AssemblyInfo.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 // Caused OOM test issues with file watcher. See https://github.com/aspnet/Identity/issues/1926
diff --git a/src/Identity/test/Identity.Test/IdentityUIScriptsTest.cs b/src/Identity/test/Identity.Test/IdentityUIScriptsTest.cs
index d6217cedff..68f9091c79 100644
--- a/src/Identity/test/Identity.Test/IdentityUIScriptsTest.cs
+++ b/src/Identity/test/Identity.Test/IdentityUIScriptsTest.cs
@@ -9,10 +9,8 @@ using System.IO;
 using System.Linq;
 using System.Net.Http;
 using System.Security.Cryptography;
-using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
 using Xunit.Abstractions;
 using System.Reflection;
@@ -27,7 +25,7 @@ namespace Microsoft.AspNetCore.Identity.Test
         public IdentityUIScriptsTest(ITestOutputHelper output)
         {
             _output = output;
-            _httpClient = new HttpClient(new RetryHandler(new HttpClientHandler() { }));
+            _httpClient = new HttpClient(new RetryHandler(new HttpClientHandler() { }, output, TimeSpan.FromSeconds(1), 5));
         }
 
         public static IEnumerable<object[]> ScriptWithIntegrityData
@@ -189,25 +187,5 @@ namespace Microsoft.AspNetCore.Identity.Test
 
             throw new InvalidOperationException($"Solution root could not be located using application root {applicationPath}.");
         }
-
-        class RetryHandler : DelegatingHandler
-        {
-            public RetryHandler(HttpMessageHandler innerHandler) : base(innerHandler) { }
-
-            protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
-            {
-                HttpResponseMessage result = null;
-                for (var i = 0; i < 10; i++)
-                {
-                    result = await base.SendAsync(request, cancellationToken);
-                    if (result.IsSuccessStatusCode)
-                    {
-                        return result;
-                    }
-                    await Task.Delay(1000);
-                }
-                return result;
-            }
-        }
     }
 }
diff --git a/src/Identity/test/Identity.Test/RetryHandler.cs b/src/Identity/test/Identity.Test/RetryHandler.cs
new file mode 100644
index 0000000000..f17446d0d3
--- /dev/null
+++ b/src/Identity/test/Identity.Test/RetryHandler.cs
@@ -0,0 +1,65 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using Xunit.Abstractions;
+
+namespace Microsoft.AspNetCore.Identity.Test
+{
+    internal class RetryHandler : DelegatingHandler
+        {
+            private readonly ITestOutputHelper _output;
+            private readonly int _maxRetries;
+            private TimeSpan _waitIntervalBeforeRetry;
+
+            public RetryHandler(
+                HttpClientHandler httpClientHandler,
+                ITestOutputHelper output,
+                TimeSpan initialWaitTime,
+                int maxAttempts) : base(httpClientHandler)
+            {
+                _waitIntervalBeforeRetry = initialWaitTime;
+                _output = output;
+                _maxRetries = maxAttempts;
+            }
+
+            protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
+            {
+                HttpResponseMessage result = null;
+                var url = request.RequestUri;
+                var method = request.Method;
+
+                for (var i = 0; i < _maxRetries; i++)
+                {
+                    try
+                    {
+                        _output.WriteLine($"Sending request '{method} - {url}' {i+1} attempt.");
+                        result = await base.SendAsync(request, cancellationToken);
+                        if (result.IsSuccessStatusCode)
+                        {
+                            return result;
+                        }
+                        else
+                        {
+                            _output.WriteLine($"Request '{method} - {url}' failed with {result.StatusCode}.");
+                        }
+                    }
+                    catch (Exception e)
+                    {
+                        _output.WriteLine($"Request '{method} - {url}' failed with {e.ToString()}");
+                    }
+                    finally
+                    {
+                        await Task.Delay(_waitIntervalBeforeRetry, cancellationToken);
+                        _waitIntervalBeforeRetry = _waitIntervalBeforeRetry * 2;
+                    }
+                }
+                
+                // Try one last time to show the actual error.
+                return await base.SendAsync(request, cancellationToken);
+            }
+        }
+}
diff --git a/src/Middleware/CORS/test/FunctionalTests/CorsMiddlewareFunctionalTest.cs b/src/Middleware/CORS/test/FunctionalTests/CorsMiddlewareFunctionalTest.cs
index 224edf8b18..043fef17e6 100644
--- a/src/Middleware/CORS/test/FunctionalTests/CorsMiddlewareFunctionalTest.cs
+++ b/src/Middleware/CORS/test/FunctionalTests/CorsMiddlewareFunctionalTest.cs
@@ -8,7 +8,6 @@ using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Testing;
 using Xunit;
diff --git a/src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/DatabaseErrorPageMiddlewareTest.cs b/src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
index 71412914ef..630c34e7cf 100644
--- a/src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
+++ b/src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
@@ -13,7 +13,7 @@ using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests.Helpe
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.TestHost;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.Extensions.DependencyInjection;
diff --git a/src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/MigrationsEndPointMiddlewareTest.cs b/src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/MigrationsEndPointMiddlewareTest.cs
index 522fec2f90..d77826fda4 100644
--- a/src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/MigrationsEndPointMiddlewareTest.cs
+++ b/src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/MigrationsEndPointMiddlewareTest.cs
@@ -12,7 +12,7 @@ using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests.Helpe
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.TestHost;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
diff --git a/src/Middleware/Diagnostics/test/FunctionalTests/DatabaseErrorPageSampleTest.cs b/src/Middleware/Diagnostics/test/FunctionalTests/DatabaseErrorPageSampleTest.cs
index f985dc7360..1c33557e53 100644
--- a/src/Middleware/Diagnostics/test/FunctionalTests/DatabaseErrorPageSampleTest.cs
+++ b/src/Middleware/Diagnostics/test/FunctionalTests/DatabaseErrorPageSampleTest.cs
@@ -4,7 +4,7 @@
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Diagnostics.FunctionalTests
diff --git a/src/Middleware/HealthChecks/test/testassets/HealthChecksSample/HealthChecksSample.csproj b/src/Middleware/HealthChecks/test/testassets/HealthChecksSample/HealthChecksSample.csproj
index 666a826a58..6547dc7232 100644
--- a/src/Middleware/HealthChecks/test/testassets/HealthChecksSample/HealthChecksSample.csproj
+++ b/src/Middleware/HealthChecks/test/testassets/HealthChecksSample/HealthChecksSample.csproj
@@ -8,13 +8,13 @@
     <Reference Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" />
     <Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
     <Reference Include="Microsoft.AspNetCore.StaticFiles" />
+    <Reference Include="Microsoft.Data.SqlClient" />
     <Reference Include="Microsoft.EntityFrameworkCore.Sqlite" />
     <Reference Include="Microsoft.Extensions.Configuration.CommandLine" />
     <Reference Include="Microsoft.Extensions.Configuration.Json" />
     <Reference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" />
     <Reference Include="Microsoft.Extensions.Logging.Console" />
     <Reference Include="Newtonsoft.Json" />
-    <Reference Include="System.Data.SqlClient" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Middleware/HealthChecks/test/testassets/HealthChecksSample/SqlConnectionHealthCheck.cs b/src/Middleware/HealthChecks/test/testassets/HealthChecksSample/SqlConnectionHealthCheck.cs
index fcc135ad1e..61af395cb3 100644
--- a/src/Middleware/HealthChecks/test/testassets/HealthChecksSample/SqlConnectionHealthCheck.cs
+++ b/src/Middleware/HealthChecks/test/testassets/HealthChecksSample/SqlConnectionHealthCheck.cs
@@ -1,5 +1,5 @@
 using System.Data.Common;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 
 namespace HealthChecksSample
 {
diff --git a/src/Middleware/HttpsPolicy/src/HttpsRedirectionMiddleware.cs b/src/Middleware/HttpsPolicy/src/HttpsRedirectionMiddleware.cs
index 1e860a0e87..021a030e17 100644
--- a/src/Middleware/HttpsPolicy/src/HttpsRedirectionMiddleware.cs
+++ b/src/Middleware/HttpsPolicy/src/HttpsRedirectionMiddleware.cs
@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
@@ -15,9 +15,10 @@ namespace Microsoft.AspNetCore.HttpsPolicy
 {
     public class HttpsRedirectionMiddleware
     {
+        private const int PortNotFound = -1;
+
         private readonly RequestDelegate _next;
-        private bool _portEvaluated = false;
-        private int? _httpsPort;
+        private readonly Lazy<int> _httpsPort;
         private readonly int _statusCode;
 
         private readonly IServerAddressesFeature _serverAddressesFeature;
@@ -42,8 +43,14 @@ namespace Microsoft.AspNetCore.HttpsPolicy
                 throw new ArgumentNullException(nameof(options));
             }
             var httpsRedirectionOptions = options.Value;
-            _httpsPort = httpsRedirectionOptions.HttpsPort;
-            _portEvaluated = _httpsPort.HasValue;
+            if (httpsRedirectionOptions.HttpsPort.HasValue)
+            {
+                _httpsPort = new Lazy<int>(() => httpsRedirectionOptions.HttpsPort.Value);
+            }
+            else
+            {
+                _httpsPort = new Lazy<int>(TryGetHttpsPort);
+            }
             _statusCode = httpsRedirectionOptions.RedirectStatusCode;
             _logger = loggerFactory.CreateLogger<HttpsRedirectionMiddleware>();
         }
@@ -70,7 +77,13 @@ namespace Microsoft.AspNetCore.HttpsPolicy
         /// <returns></returns>
         public Task Invoke(HttpContext context)
         {
-            if (context.Request.IsHttps || !TryGetHttpsPort(out var port))
+            if (context.Request.IsHttps)
+            {
+                return _next(context);
+            }
+
+            var port = _httpsPort.Value;
+            if (port == PortNotFound)
             {
                 return _next(context);
             }
@@ -101,7 +114,8 @@ namespace Microsoft.AspNetCore.HttpsPolicy
             return Task.CompletedTask;
         }
 
-        private bool TryGetHttpsPort(out int port)
+        //  Returns PortNotFound (-1) if we were unable to determine the port.
+        private int TryGetHttpsPort()
         {
             // The IServerAddressesFeature will not be ready until the middleware is Invoked,
             // Order for finding the HTTPS port:
@@ -109,59 +123,47 @@ namespace Microsoft.AspNetCore.HttpsPolicy
             // 2. HTTPS_PORT environment variable
             // 3. IServerAddressesFeature
             // 4. Fail if not set
-
-            port = -1;
-
-            if (_portEvaluated)
+            var nullablePort = _config.GetValue<int?>("HTTPS_PORT");
+            if (nullablePort.HasValue)
             {
-                port = _httpsPort ?? port;
-                return _httpsPort.HasValue;
-            }
-            _portEvaluated = true;
-
-            _httpsPort = _config.GetValue<int?>("HTTPS_PORT");
-            if (_httpsPort.HasValue)
-            {
-                port = _httpsPort.Value;
+                var port = nullablePort.Value;
                 _logger.PortLoadedFromConfig(port);
-                return true;
+                return port;
             }
 
             if (_serverAddressesFeature == null)
             {
                 _logger.FailedToDeterminePort();
-                return false;
+                return PortNotFound;
             }
 
-            int? httpsPort = null;
             foreach (var address in _serverAddressesFeature.Addresses)
             {
                 var bindingAddress = BindingAddress.Parse(address);
                 if (bindingAddress.Scheme.Equals("https", StringComparison.OrdinalIgnoreCase))
                 {
                     // If we find multiple different https ports specified, throw
-                    if (httpsPort.HasValue && httpsPort != bindingAddress.Port)
+                    if (nullablePort.HasValue && nullablePort != bindingAddress.Port)
                     {
                         _logger.FailedMultiplePorts();
-                        return false;
+                        return PortNotFound;
                     }
                     else
                     {
-                        httpsPort = bindingAddress.Port;
+                        nullablePort = bindingAddress.Port;
                     }
                 }
             }
 
-            if (httpsPort.HasValue)
+            if (nullablePort.HasValue)
             {
-                _httpsPort = httpsPort;
-                port = _httpsPort.Value;
+                var port = nullablePort.Value;
                 _logger.PortFromServer(port);
-                return true;
+                return port;
             }
 
             _logger.FailedToDeterminePort();
-            return false;
+            return PortNotFound;
         }
     }
 }
diff --git a/src/Middleware/Localization/testassets/LocalizationWebsite/StartupResourcesInClassLibrary.cs b/src/Middleware/Localization/testassets/LocalizationWebsite/StartupResourcesInClassLibrary.cs
index 092d09a37b..6cab0c27c6 100644
--- a/src/Middleware/Localization/testassets/LocalizationWebsite/StartupResourcesInClassLibrary.cs
+++ b/src/Middleware/Localization/testassets/LocalizationWebsite/StartupResourcesInClassLibrary.cs
@@ -39,7 +39,7 @@ namespace LocalizationWebsite
             });
 
             var noAttributeStringLocalizer = stringLocalizerFactory.Create(typeof(ResourcesClassLibraryNoAttribute.Model));
-            var withAttributeStringLocalizer = stringLocalizerFactory.Create(typeof(ResourcesClassLibraryWithAttribute.Model));
+            var withAttributeStringLocalizer = stringLocalizerFactory.Create(typeof(Alternate.Namespace.Model));
 
             var noAttributeAssembly = typeof(ResourcesClassLibraryNoAttribute.Model).GetTypeInfo().Assembly;
             var noAttributeName = new AssemblyName(noAttributeAssembly.FullName).Name;
@@ -47,10 +47,10 @@ namespace LocalizationWebsite
                 nameof(ResourcesClassLibraryNoAttribute.Model),
                 noAttributeName);
 
-            var withAttributeAssembly = typeof(ResourcesClassLibraryWithAttribute.Model).GetTypeInfo().Assembly;
+            var withAttributeAssembly = typeof(Alternate.Namespace.Model).GetTypeInfo().Assembly;
             var withAttributeName = new AssemblyName(withAttributeAssembly.FullName).Name;
             var withAttributeNameStringLocalizer = stringLocalizerFactory.Create(
-                nameof(ResourcesClassLibraryWithAttribute.Model),
+                nameof(Alternate.Namespace.Model),
                 withAttributeName);
 
             app.Run(async (context) =>
diff --git a/src/Middleware/Localization/testassets/ResourcesClassLibraryWithAttribute/Model.cs b/src/Middleware/Localization/testassets/ResourcesClassLibraryWithAttribute/Model.cs
index c6ca99afa8..b1ff90f523 100644
--- a/src/Middleware/Localization/testassets/ResourcesClassLibraryWithAttribute/Model.cs
+++ b/src/Middleware/Localization/testassets/ResourcesClassLibraryWithAttribute/Model.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved. 
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace ResourcesClassLibraryWithAttribute
+namespace Alternate.Namespace
 {
     public class Model
     {
diff --git a/src/Middleware/StaticFiles/test/FunctionalTests/StaticFileMiddlewareTests.cs b/src/Middleware/StaticFiles/test/FunctionalTests/StaticFileMiddlewareTests.cs
index 68a5514ccb..f90c79ca12 100644
--- a/src/Middleware/StaticFiles/test/FunctionalTests/StaticFileMiddlewareTests.cs
+++ b/src/Middleware/StaticFiles/test/FunctionalTests/StaticFileMiddlewareTests.cs
@@ -17,7 +17,6 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.AspNetCore.Server.IntegrationTesting.Common;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Testing;
 using Xunit;
diff --git a/src/Middleware/StaticFiles/test/UnitTests/DefaultFilesMiddlewareTests.cs b/src/Middleware/StaticFiles/test/UnitTests/DefaultFilesMiddlewareTests.cs
index 9207ae844d..08e86714a4 100644
--- a/src/Middleware/StaticFiles/test/UnitTests/DefaultFilesMiddlewareTests.cs
+++ b/src/Middleware/StaticFiles/test/UnitTests/DefaultFilesMiddlewareTests.cs
@@ -11,7 +11,7 @@ using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.AspNetCore.TestHost;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.FileProviders;
 using Xunit;
diff --git a/src/Middleware/StaticFiles/test/UnitTests/DirectoryBrowserMiddlewareTests.cs b/src/Middleware/StaticFiles/test/UnitTests/DirectoryBrowserMiddlewareTests.cs
index 8cf6d0c34c..5a39ec3ef9 100644
--- a/src/Middleware/StaticFiles/test/UnitTests/DirectoryBrowserMiddlewareTests.cs
+++ b/src/Middleware/StaticFiles/test/UnitTests/DirectoryBrowserMiddlewareTests.cs
@@ -11,7 +11,7 @@ using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.TestHost;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.FileProviders;
 using Xunit;
diff --git a/src/Middleware/StaticFiles/test/UnitTests/StaticFileMiddlewareTests.cs b/src/Middleware/StaticFiles/test/UnitTests/StaticFileMiddlewareTests.cs
index 1f585e899b..a91ac3efce 100644
--- a/src/Middleware/StaticFiles/test/UnitTests/StaticFileMiddlewareTests.cs
+++ b/src/Middleware/StaticFiles/test/UnitTests/StaticFileMiddlewareTests.cs
@@ -14,7 +14,7 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.TestHost;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.FileProviders;
 using Moq;
 using Xunit;
diff --git a/src/Middleware/WebSockets/test/ConformanceTests/AutobahnTests.cs b/src/Middleware/WebSockets/test/ConformanceTests/AutobahnTests.cs
index dcce55d223..708e31bf7d 100644
--- a/src/Middleware/WebSockets/test/ConformanceTests/AutobahnTests.cs
+++ b/src/Middleware/WebSockets/test/ConformanceTests/AutobahnTests.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.AspNetCore.WebSockets.ConformanceTest.Autobahn;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Testing;
diff --git a/src/Middleware/WebSockets/test/ConformanceTests/SkipIfWsTestNotPresentAttribute.cs b/src/Middleware/WebSockets/test/ConformanceTests/SkipIfWsTestNotPresentAttribute.cs
index be2d7729a2..6402aedaec 100644
--- a/src/Middleware/WebSockets/test/ConformanceTests/SkipIfWsTestNotPresentAttribute.cs
+++ b/src/Middleware/WebSockets/test/ConformanceTests/SkipIfWsTestNotPresentAttribute.cs
@@ -1,5 +1,5 @@
 using System;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.AspNetCore.WebSockets.ConformanceTest.Autobahn;
 
 namespace Microsoft.AspNetCore.WebSockets.ConformanceTest
diff --git a/src/Middleware/WebSockets/test/UnitTests/WebSocketMiddlewareTests.cs b/src/Middleware/WebSockets/test/UnitTests/WebSocketMiddlewareTests.cs
index a997c88214..89e815a75a 100644
--- a/src/Middleware/WebSockets/test/UnitTests/WebSocketMiddlewareTests.cs
+++ b/src/Middleware/WebSockets/test/UnitTests/WebSocketMiddlewareTests.cs
@@ -9,7 +9,6 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Logging.Testing;
 using Microsoft.Net.Http.Headers;
 using Xunit;
diff --git a/src/MusicStore/test/MusicStore.E2ETests/Common/DbUtils.cs b/src/MusicStore/test/MusicStore.E2ETests/Common/DbUtils.cs
index 22d4a65cd0..9d6030badd 100644
--- a/src/MusicStore/test/MusicStore.E2ETests/Common/DbUtils.cs
+++ b/src/MusicStore/test/MusicStore.E2ETests/Common/DbUtils.cs
@@ -1,6 +1,6 @@
 using System;
-using System.Data.SqlClient;
 using Microsoft.AspNetCore.Testing;
+using Microsoft.Data.SqlClient;
 using Microsoft.Extensions.Logging;
 
 namespace E2ETests
@@ -52,4 +52,4 @@ namespace E2ETests
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/MusicStore/test/MusicStore.E2ETests/DotnetRunTests.cs b/src/MusicStore/test/MusicStore.E2ETests/DotnetRunTests.cs
index 51217ca069..ed7fb66de9 100644
--- a/src/MusicStore/test/MusicStore.E2ETests/DotnetRunTests.cs
+++ b/src/MusicStore/test/MusicStore.E2ETests/DotnetRunTests.cs
@@ -4,7 +4,7 @@
 using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Testing;
 using Xunit;
diff --git a/src/MusicStore/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj b/src/MusicStore/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj
index a16ba8be15..09854d0428 100644
--- a/src/MusicStore/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj
+++ b/src/MusicStore/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj
@@ -26,16 +26,16 @@
     <Reference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" />
     <Reference Include="Microsoft.AspNetCore.Identity" />
     <Reference Include="Microsoft.AspNetCore.WebUtilities" />
+    <Reference Include="Microsoft.Data.SqlClient" />
     <Reference Include="Microsoft.Extensions.CommandLineUtils.Sources" />
     <Reference Include="Microsoft.Extensions.Configuration.Binder" />
     <Reference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
     <Reference Include="Microsoft.Extensions.Configuration.Json" />
     <Reference Include="Microsoft.Extensions.Configuration.UserSecrets" />
-    <Reference Include="Microsoft.Extensions.Logging.Console" />
-    <Reference Include="Microsoft.Extensions.Logging" />
     <Reference Include="Microsoft.Extensions.Logging.Abstractions" />
+    <Reference Include="Microsoft.Extensions.Logging.Console" />
     <Reference Include="Microsoft.Extensions.Logging.Testing" />
-    <Reference Include="System.Data.SqlClient" />
+    <Reference Include="Microsoft.Extensions.Logging" />
   </ItemGroup>
 
 </Project>
diff --git a/src/MusicStore/test/MusicStore.E2ETests/NtlmAuthentationTest.cs b/src/MusicStore/test/MusicStore.E2ETests/NtlmAuthentationTest.cs
index d958b8f9a5..ee2973fe1b 100644
--- a/src/MusicStore/test/MusicStore.E2ETests/NtlmAuthentationTest.cs
+++ b/src/MusicStore/test/MusicStore.E2ETests/NtlmAuthentationTest.cs
@@ -5,7 +5,7 @@ using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.AspNetCore.Server.IntegrationTesting.IIS;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Testing;
 using Xunit;
diff --git a/src/MusicStore/test/MusicStore.E2ETests/OpenIdConnectTests.cs b/src/MusicStore/test/MusicStore.E2ETests/OpenIdConnectTests.cs
index 57459c6b74..5e59c33c38 100644
--- a/src/MusicStore/test/MusicStore.E2ETests/OpenIdConnectTests.cs
+++ b/src/MusicStore/test/MusicStore.E2ETests/OpenIdConnectTests.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Testing;
 using Xunit;
diff --git a/src/MusicStore/test/MusicStore.E2ETests/PublishAndRunTests.cs b/src/MusicStore/test/MusicStore.E2ETests/PublishAndRunTests.cs
index b0789dcf85..d0760c261f 100644
--- a/src/MusicStore/test/MusicStore.E2ETests/PublishAndRunTests.cs
+++ b/src/MusicStore/test/MusicStore.E2ETests/PublishAndRunTests.cs
@@ -4,7 +4,7 @@ using System.IO;
 using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Testing;
 using Xunit;
diff --git a/src/MusicStore/test/MusicStore.E2ETests/SmokeTests.cs b/src/MusicStore/test/MusicStore.E2ETests/SmokeTests.cs
index dd7ec94695..26d8cd2771 100644
--- a/src/MusicStore/test/MusicStore.E2ETests/SmokeTests.cs
+++ b/src/MusicStore/test/MusicStore.E2ETests/SmokeTests.cs
@@ -4,7 +4,7 @@ using System.IO;
 using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Testing;
 using Xunit;
diff --git a/src/MusicStore/test/MusicStore.E2ETests/SmokeTestsOnNanoServer.cs b/src/MusicStore/test/MusicStore.E2ETests/SmokeTestsOnNanoServer.cs
index dfede1b24d..490d2148ce 100644
--- a/src/MusicStore/test/MusicStore.E2ETests/SmokeTestsOnNanoServer.cs
+++ b/src/MusicStore/test/MusicStore.E2ETests/SmokeTestsOnNanoServer.cs
@@ -4,7 +4,7 @@ using System.IO;
 using System.IO.Compression;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging.Testing;
 using Xunit;
diff --git a/src/MusicStore/test/MusicStore.E2ETests/StoreSmokeTests.cs b/src/MusicStore/test/MusicStore.E2ETests/StoreSmokeTests.cs
index fb3fdb8df5..5995c16391 100644
--- a/src/MusicStore/test/MusicStore.E2ETests/StoreSmokeTests.cs
+++ b/src/MusicStore/test/MusicStore.E2ETests/StoreSmokeTests.cs
@@ -6,7 +6,7 @@ using System.IO;
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Testing;
 using Xunit;
diff --git a/src/Mvc/Extensions.ApiDescription.Server/src/build/Microsoft.Extensions.ApiDescription.Server.targets b/src/Mvc/Extensions.ApiDescription.Server/src/build/Microsoft.Extensions.ApiDescription.Server.targets
deleted file mode 100644
index e461887906..0000000000
--- a/src/Mvc/Extensions.ApiDescription.Server/src/build/Microsoft.Extensions.ApiDescription.Server.targets
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project>
-  <PropertyGroup Condition=" '$(OpenApiGenerateDocuments)' == '' ">
-    <OpenApiGenerateDocuments
-        Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(TargetFrameworkVersion.TrimStart(&quot;vV&quot;))' &lt; '2.1' ">false</OpenApiGenerateDocuments>
-    <OpenApiGenerateDocuments Condition=" '$(OpenApiGenerateDocuments)' == '' ">true</OpenApiGenerateDocuments>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_OpenApiDocumentsCache>$(BaseIntermediateOutputPath)$(MSBuildProjectName).OpenApiFiles.cache</_OpenApiDocumentsCache>
-    <OpenApiGenerateDocumentsOnBuild
-        Condition=" '$(OpenApiGenerateDocumentsOnBuild)' == '' ">$(OpenApiGenerateDocuments)</OpenApiGenerateDocumentsOnBuild>
-  </PropertyGroup>
-
-  <ItemGroup Condition=" '$(OpenApiGenerateDocuments)' == 'true' ">
-    <ProjectCapability Include="OpenApiGenerateDocuments" />
-  </ItemGroup>
-
-  <Target Name="OpenApiGetDocuments" Returns="@(_OpenApiProjectDocuments)">
-    <Error Text="OpenAPI document generation is disabled. Add '&lt;OpenApiGenerateDocuments>true&lt;/OpenApiGenerateDocuments>' to the project."
-        Condition=" '$(OpenApiGenerateDocuments)' != 'true' " />
-
-    <ReadLinesFromFile File="$(_OpenApiDocumentsCache)">
-      <Output TaskParameter="Lines" ItemName="_OpenApiProjectDocuments" />
-    </ReadLinesFromFile>
-
-    <Warning Text="Application does not have any registered documents. Update its 'Startup' class to register a document."
-        Condition=" '@(_OpenApiProjectDocuments)' == '' " />
-  </Target>
-
-  <Target Name="GenerateOpenApiDocuments"
-      Condition=" '$(OpenApiGenerateDocuments)' == 'true' "
-      Inputs="$(TargetPath)"
-      Outputs="$(_OpenApiDocumentsCache)">
-    <Error Text="OpenAPI document generation is not supported when targeting netcoreapp2.0 or earlier. Disable the feature or move to a later target framework."
-        Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(TargetFrameworkVersion.TrimStart(&quot;vV&quot;))' &lt; '2.1' " />
-
-    <PropertyGroup>
-      <_Command>dotnet "$(MSBuildThisFileDirectory)/../tools/dotnet-getdocument.dll" --assembly "$(TargetPath)"</_Command>
-      <_Command>$(_Command) --file-list "$(_OpenApiDocumentsCache)" --framework "$(TargetFrameworkMoniker)"</_Command>
-      <_Command>$(_Command) --output "$(OpenApiDocumentsDirectory.TrimEnd('\'))" --project "$(MSBuildProjectName)"</_Command>
-      <_Command Condition=" '$(ProjectAssetsFile)' != '' ">$(_Command) --assets-file "$(ProjectAssetsFile)"</_Command>
-      <_Command Condition=" '$(PlatformTarget)' != '' ">$(_Command) --platform "$(PlatformTarget)"</_Command>
-      <_Command Condition=" '$(PlatformTarget)' == '' AND '$(Platform)' != '' ">$(_Command) --platform "$(Platform)"</_Command>
-      <_Command Condition=" '$(RuntimeIdentifier)' != '' ">$(_Command) --runtime "$(RuntimeIdentifier)"</_Command>
-      <_Command>$(_Command) $(OpenApiGenerateDocumentsOptions)</_Command>
-    </PropertyGroup>
-
-    <Message Importance="high" Text="%0AGenerateOpenApiDocuments:" />
-    <Message Importance="high" Text="  $(_Command)" />
-    <Exec Command="$(_Command)" />
-  </Target>
-
-  <!-- Unless this is an inner build or default timing is disabled, tie document retrieval into the build. -->
-
-  <Target Name="_GenerateOpenApiDocuments"
-      AfterTargets="Build"
-      Condition=" '$(OpenApiGenerateDocumentsOnBuild)' == 'true' AND ('$(TargetFramework)' == '' OR '$(TargetFrameworks)' == '') "
-      DependsOnTargets="GenerateOpenApiDocuments" />
-</Project>
diff --git a/src/Mvc/GetDocumentInsider/src/AnsiConsole.cs b/src/Mvc/GetDocumentInsider/src/AnsiConsole.cs
deleted file mode 100644
index 306b4ff452..0000000000
--- a/src/Mvc/GetDocumentInsider/src/AnsiConsole.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-
-namespace Microsoft.Extensions.ApiDescription.Tool
-{
-    internal class AnsiConsole
-    {
-        public static readonly AnsiTextWriter _out = new AnsiTextWriter(Console.Out);
-
-        public static void WriteLine(string text)
-            => _out.WriteLine(text);
-    }
-}
diff --git a/src/Mvc/GetDocumentInsider/src/AnsiConstants.cs b/src/Mvc/GetDocumentInsider/src/AnsiConstants.cs
deleted file mode 100644
index b54e15b751..0000000000
--- a/src/Mvc/GetDocumentInsider/src/AnsiConstants.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-namespace Microsoft.Extensions.ApiDescription.Tool
-{
-    internal static class AnsiConstants
-    {
-        public const string Reset = "\x1b[22m\x1b[39m";
-        public const string Bold = "\x1b[1m";
-        public const string Dark = "\x1b[22m";
-        public const string Black = "\x1b[30m";
-        public const string Red = "\x1b[31m";
-        public const string Green = "\x1b[32m";
-        public const string Yellow = "\x1b[33m";
-        public const string Blue = "\x1b[34m";
-        public const string Magenta = "\x1b[35m";
-        public const string Cyan = "\x1b[36m";
-        public const string Gray = "\x1b[37m";
-    }
-}
diff --git a/src/Mvc/GetDocumentInsider/src/AnsiTextWriter.cs b/src/Mvc/GetDocumentInsider/src/AnsiTextWriter.cs
deleted file mode 100644
index 066f711e27..0000000000
--- a/src/Mvc/GetDocumentInsider/src/AnsiTextWriter.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Text.RegularExpressions;
-
-namespace Microsoft.Extensions.ApiDescription.Tool
-{
-    internal class AnsiTextWriter
-    {
-        private readonly TextWriter _writer;
-
-        public AnsiTextWriter(TextWriter writer) => _writer = writer;
-
-        public void WriteLine(string text)
-        {
-            Interpret(text);
-            _writer.Write(Environment.NewLine);
-        }
-
-        private void Interpret(string value)
-        {
-            var matches = Regex.Matches(value, "\x1b\\[([0-9]+)?m");
-
-            var start = 0;
-            foreach (Match match in matches)
-            {
-                var length = match.Index - start;
-                if (length != 0)
-                {
-                    _writer.Write(value.Substring(start, length));
-                }
-
-                Apply(match.Groups[1].Value);
-
-                start = match.Index + match.Length;
-            }
-
-            if (start != value.Length)
-            {
-                _writer.Write(value.Substring(start));
-            }
-        }
-
-        private static void Apply(string parameter)
-        {
-            switch (parameter)
-            {
-                case "1":
-                    ApplyBold();
-                    break;
-
-                case "22":
-                    ResetBold();
-                    break;
-
-                case "30":
-                    ApplyColor(ConsoleColor.Black);
-                    break;
-
-                case "31":
-                    ApplyColor(ConsoleColor.DarkRed);
-                    break;
-
-                case "32":
-                    ApplyColor(ConsoleColor.DarkGreen);
-                    break;
-
-                case "33":
-                    ApplyColor(ConsoleColor.DarkYellow);
-                    break;
-
-                case "34":
-                    ApplyColor(ConsoleColor.DarkBlue);
-                    break;
-
-                case "35":
-                    ApplyColor(ConsoleColor.DarkMagenta);
-                    break;
-
-                case "36":
-                    ApplyColor(ConsoleColor.DarkCyan);
-                    break;
-
-                case "37":
-                    ApplyColor(ConsoleColor.Gray);
-                    break;
-
-                case "39":
-                    ResetColor();
-                    break;
-
-                default:
-                    Debug.Fail("Unsupported parameter: " + parameter);
-                    break;
-            }
-        }
-
-        private static void ApplyBold()
-            => Console.ForegroundColor = (ConsoleColor)((int)Console.ForegroundColor | 8);
-
-        private static void ResetBold()
-            => Console.ForegroundColor = (ConsoleColor)((int)Console.ForegroundColor & 7);
-
-        private static void ApplyColor(ConsoleColor color)
-        {
-            var wasBold = ((int)Console.ForegroundColor & 8) != 0;
-
-            Console.ForegroundColor = color;
-
-            if (wasBold)
-            {
-                ApplyBold();
-            }
-        }
-
-        private static void ResetColor()
-        {
-            var wasBold = ((int)Console.ForegroundColor & 8) != 0;
-
-            Console.ResetColor();
-
-            if (wasBold)
-            {
-                ApplyBold();
-            }
-        }
-    }
-}
diff --git a/src/Mvc/GetDocumentInsider/src/CommandLineUtils/CommandArgument.cs b/src/Mvc/GetDocumentInsider/src/CommandLineUtils/CommandArgument.cs
deleted file mode 100644
index 3346ea0ecb..0000000000
--- a/src/Mvc/GetDocumentInsider/src/CommandLineUtils/CommandArgument.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Microsoft.DotNet.Cli.CommandLine
-{
-    internal class CommandArgument
-    {
-        public CommandArgument() => Values = new List<string>();
-
-        public string Name { get; set; }
-        public string Description { get; set; }
-        public List<string> Values { get; private set; }
-        public bool MultipleValues { get; set; }
-        public string Value => Values.FirstOrDefault();
-    }
-}
diff --git a/src/Mvc/GetDocumentInsider/src/CommandLineUtils/CommandLineApplication.cs b/src/Mvc/GetDocumentInsider/src/CommandLineUtils/CommandLineApplication.cs
deleted file mode 100644
index facbb68ad0..0000000000
--- a/src/Mvc/GetDocumentInsider/src/CommandLineUtils/CommandLineApplication.cs
+++ /dev/null
@@ -1,604 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Microsoft.DotNet.Cli.CommandLine
-{
-    internal class CommandLineApplication
-    {
-        private enum ParseOptionResult
-        {
-            Succeeded,
-            ShowHelp,
-            ShowVersion,
-            UnexpectedArgs,
-        }
-
-        // Indicates whether the parser should throw an exception when it runs into an unexpected argument.
-        // If this field is set to false, the parser will stop parsing when it sees an unexpected argument, and all
-        // remaining arguments, including the first unexpected argument, will be stored in RemainingArguments property.
-        private readonly bool _throwOnUnexpectedArg;
-
-        public CommandLineApplication(bool throwOnUnexpectedArg = true)
-        {
-            _throwOnUnexpectedArg = throwOnUnexpectedArg;
-            Options = new List<CommandOption>();
-            Arguments = new List<CommandArgument>();
-            Commands = new List<CommandLineApplication>();
-            RemainingArguments = new List<string>();
-            Invoke = () => 0;
-        }
-
-        public CommandLineApplication Parent { get; set; }
-        public string Name { get; set; }
-        public string FullName { get; set; }
-        public string Syntax { get; set; }
-        public string Description { get; set; }
-        public List<CommandOption> Options { get; private set; }
-        public CommandOption OptionHelp { get; private set; }
-        public CommandOption OptionVersion { get; private set; }
-        public List<CommandArgument> Arguments { get; private set; }
-        public List<string> RemainingArguments { get; private set; }
-        public bool IsShowingInformation { get; protected set; }  // Is showing help or version?
-        public Func<int> Invoke { get; set; }
-        public Func<string> LongVersionGetter { get; set; }
-        public Func<string> ShortVersionGetter { get; set; }
-        public List<CommandLineApplication> Commands { get; private set; }
-        public bool HandleResponseFiles { get; set; }
-        public bool AllowArgumentSeparator { get; set; }
-        public bool HandleRemainingArguments { get; set; }
-        public string ArgumentSeparatorHelpText { get; set; }
-
-        public CommandLineApplication Command(string name, bool throwOnUnexpectedArg = true)
-            => Command(name, _ => { }, throwOnUnexpectedArg);
-
-        public CommandLineApplication Command(string name, Action<CommandLineApplication> configuration,
-            bool throwOnUnexpectedArg = true)
-        {
-            var command = new CommandLineApplication(throwOnUnexpectedArg) { Name = name, Parent = this };
-            Commands.Add(command);
-            configuration(command);
-            return command;
-        }
-
-        public CommandOption Option(string template, string description, CommandOptionType optionType)
-            => Option(template, description, optionType, _ => { });
-
-        public CommandOption Option(string template, string description, CommandOptionType optionType, Action<CommandOption> configuration)
-        {
-            var option = new CommandOption(template, optionType) { Description = description };
-            Options.Add(option);
-            configuration(option);
-            return option;
-        }
-
-        public CommandArgument Argument(string name, string description, bool multipleValues = false)
-            => Argument(name, description, _ => { }, multipleValues);
-
-        public CommandArgument Argument(string name, string description, Action<CommandArgument> configuration, bool multipleValues = false)
-        {
-            var lastArg = Arguments.LastOrDefault();
-            if (lastArg != null && lastArg.MultipleValues)
-            {
-                var message = string.Format("The last argument '{0}' accepts multiple values. No more argument can be added.",
-                    lastArg.Name);
-                throw new InvalidOperationException(message);
-            }
-
-            var argument = new CommandArgument { Name = name, Description = description, MultipleValues = multipleValues };
-            Arguments.Add(argument);
-            configuration(argument);
-            return argument;
-        }
-
-        public void OnExecute(Func<int> invoke) => Invoke = invoke;
-
-        public void OnExecute(Func<Task<int>> invoke) => Invoke = () => invoke().Result;
-
-        public int Execute(params string[] args)
-        {
-            var command = this;
-            IEnumerator<CommandArgument> arguments = null;
-
-            if (HandleResponseFiles)
-            {
-                args = ExpandResponseFiles(args).ToArray();
-            }
-
-            for (var index = 0; index < args.Length; index++)
-            {
-                var arg = args[index];
-
-                var isLongOption = arg.StartsWith("--");
-                if (isLongOption || arg.StartsWith("-"))
-                {
-                    var result = ParseOption(isLongOption, command, args, ref index, out var option);
-                    if (result == ParseOptionResult.ShowHelp)
-                    {
-                        command.ShowHelp();
-                        return 0;
-                    }
-                    else if (result == ParseOptionResult.ShowVersion)
-                    {
-                        command.ShowVersion();
-                        return 0;
-                    }
-                }
-                else
-                {
-                    var subcommand = ParseSubCommand(arg, command);
-                    if (subcommand != null)
-                    {
-                        command = subcommand;
-                    }
-                    else
-                    {
-                        if (arguments == null)
-                        {
-                            arguments = new CommandArgumentEnumerator(command.Arguments.GetEnumerator());
-                        }
-
-                        if (arguments.MoveNext())
-                        {
-                            arguments.Current.Values.Add(arg);
-                        }
-                        else
-                        {
-                            HandleUnexpectedArg(command, args, index, argTypeName: "command or argument");
-                        }
-                    }
-                }
-            }
-
-            return command.Invoke();
-        }
-
-        private ParseOptionResult ParseOption(
-            bool isLongOption,
-            CommandLineApplication command,
-            string[] args,
-            ref int index,
-            out CommandOption option)
-        {
-            option = null;
-            var result = ParseOptionResult.Succeeded;
-            var arg = args[index];
-
-            var optionPrefixLength = isLongOption ? 2 : 1;
-            var optionComponents = arg.Substring(optionPrefixLength).Split(new[] { ':', '=' }, 2);
-            var optionName = optionComponents[0];
-
-            if (isLongOption)
-            {
-                option = command.Options.SingleOrDefault(
-                    opt => string.Equals(opt.LongName, optionName, StringComparison.Ordinal));
-            }
-            else
-            {
-                option = command.Options.SingleOrDefault(
-                    opt => string.Equals(opt.ShortName, optionName, StringComparison.Ordinal));
-
-                if (option == null)
-                {
-                    option = command.Options.SingleOrDefault(
-                        opt => string.Equals(opt.SymbolName, optionName, StringComparison.Ordinal));
-                }
-            }
-
-            if (option == null)
-            {
-                if (isLongOption && string.IsNullOrEmpty(optionName) &&
-                    !command._throwOnUnexpectedArg && AllowArgumentSeparator)
-                {
-                    // a stand-alone "--" is the argument separator, so skip it and
-                    // handle the rest of the args as unexpected args
-                    index++;
-                }
-
-                HandleUnexpectedArg(command, args, index, argTypeName: "option");
-                result = ParseOptionResult.UnexpectedArgs;
-            }
-            else if (command.OptionHelp == option)
-            {
-                result = ParseOptionResult.ShowHelp;
-            }
-            else if (command.OptionVersion == option)
-            {
-                result = ParseOptionResult.ShowVersion;
-            }
-            else
-            {
-                if (optionComponents.Length == 2)
-                {
-                    if (!option.TryParse(optionComponents[1]))
-                    {
-                        command.ShowHint();
-                        throw new CommandParsingException(command,
-                            $"Unexpected value '{optionComponents[1]}' for option '{optionName}'");
-                    }
-                }
-                else
-                {
-                    if (option.OptionType == CommandOptionType.NoValue ||
-                        option.OptionType == CommandOptionType.BoolValue)
-                    {
-                        // No value is needed for this option
-                        option.TryParse(null);
-                    }
-                    else
-                    {
-                        index++;
-                        arg = args[index];
-                        if (!option.TryParse(arg))
-                        {
-                            command.ShowHint();
-                            throw new CommandParsingException(command, $"Unexpected value '{arg}' for option '{optionName}'");
-
-                        }
-                    }
-                }
-            }
-
-            return result;
-        }
-
-        private static CommandLineApplication ParseSubCommand(string arg, CommandLineApplication command)
-        {
-            foreach (var subcommand in command.Commands)
-            {
-                if (string.Equals(subcommand.Name, arg, StringComparison.OrdinalIgnoreCase))
-                {
-                    return subcommand;
-                }
-            }
-
-            return null;
-        }
-
-        // Helper method that adds a help option
-        public CommandOption HelpOption(string template)
-        {
-            // Help option is special because we stop parsing once we see it
-            // So we store it separately for further use
-            OptionHelp = Option(template, "Show help information", CommandOptionType.NoValue);
-
-            return OptionHelp;
-        }
-
-        public CommandOption VersionOption(string template,
-                                           string shortFormVersion,
-                                           string longFormVersion = null)
-        {
-            if (longFormVersion == null)
-            {
-                return VersionOption(template, () => shortFormVersion);
-            }
-            else
-            {
-                return VersionOption(template, () => shortFormVersion, () => longFormVersion);
-            }
-        }
-
-        // Helper method that adds a version option
-        public CommandOption VersionOption(string template,
-                                           Func<string> shortFormVersionGetter,
-                                           Func<string> longFormVersionGetter = null)
-        {
-            // Version option is special because we stop parsing once we see it
-            // So we store it separately for further use
-            OptionVersion = Option(template, "Show version information", CommandOptionType.NoValue);
-            ShortVersionGetter = shortFormVersionGetter;
-            LongVersionGetter = longFormVersionGetter ?? shortFormVersionGetter;
-
-            return OptionVersion;
-        }
-
-        // Show short hint that reminds users to use help option
-        public void ShowHint()
-        {
-            if (OptionHelp != null)
-            {
-                Console.WriteLine(string.Format("Specify --{0} for a list of available options and commands.", OptionHelp.LongName));
-            }
-        }
-
-        // Show full help
-        public void ShowHelp(string commandName = null)
-        {
-            var headerBuilder = new StringBuilder("Usage:");
-            var usagePrefixLength = headerBuilder.Length;
-            for (var cmd = this; cmd != null; cmd = cmd.Parent)
-            {
-                cmd.IsShowingInformation = true;
-                if (cmd != this && cmd.Arguments.Any())
-                {
-                    var args = string.Join(" ", cmd.Arguments.Select(arg => arg.Name));
-                    headerBuilder.Insert(usagePrefixLength, string.Format(" {0} {1}", cmd.Name, args));
-                }
-                else
-                {
-                    headerBuilder.Insert(usagePrefixLength, string.Format(" {0}", cmd.Name));
-                }
-            }
-
-            CommandLineApplication target;
-
-            if (commandName == null || string.Equals(Name, commandName, StringComparison.OrdinalIgnoreCase))
-            {
-                target = this;
-            }
-            else
-            {
-                target = Commands.SingleOrDefault(cmd => string.Equals(cmd.Name, commandName, StringComparison.OrdinalIgnoreCase));
-
-                if (target != null)
-                {
-                    headerBuilder.AppendFormat(" {0}", commandName);
-                }
-                else
-                {
-                    // The command name is invalid so don't try to show help for something that doesn't exist
-                    target = this;
-                }
-
-            }
-
-            var optionsBuilder = new StringBuilder();
-            var commandsBuilder = new StringBuilder();
-            var argumentsBuilder = new StringBuilder();
-            var argumentSeparatorBuilder = new StringBuilder();
-
-            var maxArgLen = 0;
-            for (var cmd = target; cmd != null; cmd = cmd.Parent)
-            {
-                if (cmd.Arguments.Any())
-                {
-                    if (cmd == target)
-                    {
-                        headerBuilder.Append(" [arguments]");
-                    }
-
-                    if (argumentsBuilder.Length == 0)
-                    {
-                        argumentsBuilder.AppendLine();
-                        argumentsBuilder.AppendLine("Arguments:");
-                    }
-
-                    maxArgLen = Math.Max(maxArgLen, MaxArgumentLength(cmd.Arguments));
-                }
-            }
-
-            for (var cmd = target; cmd != null; cmd = cmd.Parent)
-            {
-                if (cmd.Arguments.Any())
-                {
-                    var outputFormat = "  {0}{1}";
-                    foreach (var arg in cmd.Arguments)
-                    {
-                        argumentsBuilder.AppendFormat(
-                            outputFormat,
-                            arg.Name.PadRight(maxArgLen + 2),
-                            arg.Description);
-                        argumentsBuilder.AppendLine();
-                    }
-                }
-            }
-
-            if (target.Options.Any())
-            {
-                headerBuilder.Append(" [options]");
-
-                optionsBuilder.AppendLine();
-                optionsBuilder.AppendLine("Options:");
-                var maxOptLen = MaxOptionTemplateLength(target.Options);
-                var outputFormat = string.Format("  {{0, -{0}}}{{1}}", maxOptLen + 2);
-                foreach (var opt in target.Options)
-                {
-                    optionsBuilder.AppendFormat(outputFormat, opt.Template, opt.Description);
-                    optionsBuilder.AppendLine();
-                }
-            }
-
-            if (target.Commands.Any())
-            {
-                headerBuilder.Append(" [command]");
-
-                commandsBuilder.AppendLine();
-                commandsBuilder.AppendLine("Commands:");
-                var maxCmdLen = MaxCommandLength(target.Commands);
-                var outputFormat = string.Format("  {{0, -{0}}}{{1}}", maxCmdLen + 2);
-                foreach (var cmd in target.Commands.OrderBy(c => c.Name))
-                {
-                    commandsBuilder.AppendFormat(outputFormat, cmd.Name, cmd.Description);
-                    commandsBuilder.AppendLine();
-                }
-
-                if (OptionHelp != null)
-                {
-                    commandsBuilder.AppendLine();
-                    commandsBuilder.AppendFormat("Use \"{0} [command] --help\" for more information about a command.", Name);
-                    commandsBuilder.AppendLine();
-                }
-            }
-
-            if (target.AllowArgumentSeparator || target.HandleRemainingArguments)
-            {
-                if (target.AllowArgumentSeparator)
-                {
-                    headerBuilder.Append(" [[--] <arg>...]]");
-                }
-                else
-                {
-                    headerBuilder.Append(" [args]");
-                }
-
-                if (!string.IsNullOrEmpty(target.ArgumentSeparatorHelpText))
-                {
-                    argumentSeparatorBuilder.AppendLine();
-                    argumentSeparatorBuilder.AppendLine("Args:");
-                    argumentSeparatorBuilder.AppendLine($"  {target.ArgumentSeparatorHelpText}");
-                    argumentSeparatorBuilder.AppendLine();
-                }
-            }
-
-            headerBuilder.AppendLine();
-
-            var nameAndVersion = new StringBuilder();
-            nameAndVersion.AppendLine(GetFullNameAndVersion());
-            nameAndVersion.AppendLine();
-
-            Console.Write("{0}{1}{2}{3}{4}{5}", nameAndVersion, headerBuilder, argumentsBuilder, optionsBuilder, commandsBuilder, argumentSeparatorBuilder);
-        }
-
-        public void ShowVersion()
-        {
-            for (var cmd = this; cmd != null; cmd = cmd.Parent)
-            {
-                cmd.IsShowingInformation = true;
-            }
-
-            Console.WriteLine(FullName);
-            Console.WriteLine(LongVersionGetter());
-        }
-
-        public string GetFullNameAndVersion()
-            => ShortVersionGetter == null ? FullName : string.Format("{0} {1}", FullName, ShortVersionGetter());
-
-        public void ShowRootCommandFullNameAndVersion()
-        {
-            var rootCmd = this;
-            while (rootCmd.Parent != null)
-            {
-                rootCmd = rootCmd.Parent;
-            }
-
-            Console.WriteLine(rootCmd.GetFullNameAndVersion());
-            Console.WriteLine();
-        }
-
-        private static int MaxOptionTemplateLength(IEnumerable<CommandOption> options)
-        {
-            var maxLen = 0;
-            foreach (var opt in options)
-            {
-                maxLen = opt.Template.Length > maxLen ? opt.Template.Length : maxLen;
-            }
-            return maxLen;
-        }
-
-        private static int MaxCommandLength(IEnumerable<CommandLineApplication> commands)
-        {
-            var maxLen = 0;
-            foreach (var cmd in commands)
-            {
-                maxLen = cmd.Name.Length > maxLen ? cmd.Name.Length : maxLen;
-            }
-            return maxLen;
-        }
-
-        private static int MaxArgumentLength(IEnumerable<CommandArgument> arguments)
-        {
-            var maxLen = 0;
-            foreach (var arg in arguments)
-            {
-                maxLen = arg.Name.Length > maxLen ? arg.Name.Length : maxLen;
-            }
-            return maxLen;
-        }
-
-        private static void HandleUnexpectedArg(CommandLineApplication command, string[] args, int index, string argTypeName)
-        {
-            if (command._throwOnUnexpectedArg)
-            {
-                command.ShowHint();
-                throw new CommandParsingException(command, $"Unrecognized {argTypeName} '{args[index]}'");
-            }
-            else
-            {
-                command.RemainingArguments.Add(args[index]);
-            }
-        }
-
-        private IEnumerable<string> ExpandResponseFiles(IEnumerable<string> args)
-        {
-            foreach (var arg in args)
-            {
-                if (!arg.StartsWith("@", StringComparison.Ordinal))
-                {
-                    yield return arg;
-                }
-                else
-                {
-                    var fileName = arg.Substring(1);
-
-                    var responseFileArguments = ParseResponseFile(fileName);
-
-                    // ParseResponseFile can suppress expanding this response file by
-                    // returning null. In that case, we'll treat the response
-                    // file token as a regular argument.
-
-                    if (responseFileArguments == null)
-                    {
-                        yield return arg;
-                    }
-                    else
-                    {
-                        foreach (var responseFileArgument in responseFileArguments)
-                        {
-                            yield return responseFileArgument.Trim();
-                        }
-                    }
-                }
-            }
-        }
-
-        private IEnumerable<string> ParseResponseFile(string fileName)
-        {
-            if (!HandleResponseFiles)
-            {
-                return null;
-            }
-
-            if (!File.Exists(fileName))
-            {
-                throw new InvalidOperationException($"Response file '{fileName}' doesn't exist.");
-            }
-
-            return File.ReadLines(fileName);
-        }
-
-        private class CommandArgumentEnumerator : IEnumerator<CommandArgument>
-        {
-            private readonly IEnumerator<CommandArgument> _enumerator;
-
-            public CommandArgumentEnumerator(IEnumerator<CommandArgument> enumerator) => _enumerator = enumerator;
-
-            public CommandArgument Current => _enumerator.Current;
-
-            object IEnumerator.Current => Current;
-
-            public void Dispose() => _enumerator.Dispose();
-
-            public bool MoveNext()
-            {
-                if (Current == null || !Current.MultipleValues)
-                {
-                    return _enumerator.MoveNext();
-                }
-
-                // If current argument allows multiple values, we don't move forward and
-                // all later values will be added to current CommandArgument.Values
-                return true;
-            }
-
-            public void Reset() => _enumerator.Reset();
-        }
-    }
-}
diff --git a/src/Mvc/GetDocumentInsider/src/CommandLineUtils/CommandLineApplicationExtensions.cs b/src/Mvc/GetDocumentInsider/src/CommandLineUtils/CommandLineApplicationExtensions.cs
deleted file mode 100644
index 1c43455ee1..0000000000
--- a/src/Mvc/GetDocumentInsider/src/CommandLineUtils/CommandLineApplicationExtensions.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-namespace Microsoft.DotNet.Cli.CommandLine
-{
-    internal static class CommandLineApplicationExtensions
-    {
-        public static CommandOption Option(this CommandLineApplication command, string template, string description)
-            => command.Option(
-                template,
-                description,
-                template.IndexOf('<') != -1
-                    ? template.EndsWith(">...")
-                        ? CommandOptionType.MultipleValue
-                        : CommandOptionType.SingleValue
-                    : CommandOptionType.NoValue);
-    }
-}
diff --git a/src/Mvc/GetDocumentInsider/src/CommandLineUtils/CommandOption.cs b/src/Mvc/GetDocumentInsider/src/CommandLineUtils/CommandOption.cs
deleted file mode 100644
index 5ba4b78ae3..0000000000
--- a/src/Mvc/GetDocumentInsider/src/CommandLineUtils/CommandOption.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Microsoft.DotNet.Cli.CommandLine
-{
-    internal class CommandOption
-    {
-        public CommandOption(string template, CommandOptionType optionType)
-        {
-            Template = template;
-            OptionType = optionType;
-            Values = new List<string>();
-
-            foreach (var part in Template.Split(new[] { ' ', '|' }, StringSplitOptions.RemoveEmptyEntries))
-            {
-                if (part.StartsWith("--"))
-                {
-                    LongName = part.Substring(2);
-                }
-                else if (part.StartsWith("-"))
-                {
-                    var optName = part.Substring(1);
-
-                    // If there is only one char and it is not an English letter, it is a symbol option (e.g. "-?")
-                    if (optName.Length == 1 && !IsEnglishLetter(optName[0]))
-                    {
-                        SymbolName = optName;
-                    }
-                    else
-                    {
-                        ShortName = optName;
-                    }
-                }
-                else if (part.StartsWith("<") && part.EndsWith(">"))
-                {
-                    ValueName = part.Substring(1, part.Length - 2);
-                }
-                else if (optionType == CommandOptionType.MultipleValue && part.StartsWith("<") && part.EndsWith(">..."))
-                {
-                    ValueName = part.Substring(1, part.Length - 5);
-                }
-                else
-                {
-                    throw new ArgumentException($"Invalid template pattern '{template}'", nameof(template));
-                }
-            }
-
-            if (string.IsNullOrEmpty(LongName) && string.IsNullOrEmpty(ShortName) && string.IsNullOrEmpty(SymbolName))
-            {
-                throw new ArgumentException($"Invalid template pattern '{template}'", nameof(template));
-            }
-        }
-
-        public string Template { get; set; }
-        public string ShortName { get; set; }
-        public string LongName { get; set; }
-        public string SymbolName { get; set; }
-        public string ValueName { get; set; }
-        public string Description { get; set; }
-        public List<string> Values { get; private set; }
-        public bool? BoolValue { get; private set; }
-        public CommandOptionType OptionType { get; private set; }
-
-        public bool TryParse(string value)
-        {
-            switch (OptionType)
-            {
-                case CommandOptionType.MultipleValue:
-                    Values.Add(value);
-                    break;
-                case CommandOptionType.SingleValue:
-                    if (Values.Any())
-                    {
-                        return false;
-                    }
-                    Values.Add(value);
-                    break;
-                case CommandOptionType.BoolValue:
-                    if (Values.Any())
-                    {
-                        return false;
-                    }
-
-                    if (value == null)
-                    {
-                        // add null to indicate that the option was present, but had no value
-                        Values.Add(null);
-                        BoolValue = true;
-                    }
-                    else
-                    {
-                        if (!bool.TryParse(value, out var boolValue))
-                        {
-                            return false;
-                        }
-
-                        Values.Add(value);
-                        BoolValue = boolValue;
-                    }
-                    break;
-                case CommandOptionType.NoValue:
-                    if (value != null)
-                    {
-                        return false;
-                    }
-                    // Add a value to indicate that this option was specified
-                    Values.Add("on");
-                    break;
-                default:
-                    break;
-            }
-            return true;
-        }
-
-        public bool HasValue() => Values.Any();
-
-        public string Value() => HasValue() ? Values[0] : null;
-
-        private static bool IsEnglishLetter(char c) => (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
-    }
-}
diff --git a/src/Mvc/GetDocumentInsider/src/CommandLineUtils/CommandOptionType.cs b/src/Mvc/GetDocumentInsider/src/CommandLineUtils/CommandOptionType.cs
deleted file mode 100644
index 5f7d37f029..0000000000
--- a/src/Mvc/GetDocumentInsider/src/CommandLineUtils/CommandOptionType.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-namespace Microsoft.DotNet.Cli.CommandLine
-{
-    internal enum CommandOptionType
-    {
-        MultipleValue,
-        SingleValue,
-        BoolValue,
-        NoValue
-    }
-}
diff --git a/src/Mvc/GetDocumentInsider/src/CommandLineUtils/CommandParsingException.cs b/src/Mvc/GetDocumentInsider/src/CommandLineUtils/CommandParsingException.cs
deleted file mode 100644
index c735ecbf12..0000000000
--- a/src/Mvc/GetDocumentInsider/src/CommandLineUtils/CommandParsingException.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-
-namespace Microsoft.DotNet.Cli.CommandLine
-{
-    internal class CommandParsingException : Exception
-    {
-        public CommandParsingException(CommandLineApplication command, string message)
-            : base(message) => Command = command;
-
-        public CommandLineApplication Command { get; }
-    }
-}
diff --git a/src/Mvc/GetDocumentInsider/src/Commands/CommandBase.cs b/src/Mvc/GetDocumentInsider/src/Commands/CommandBase.cs
deleted file mode 100644
index b5eddd978c..0000000000
--- a/src/Mvc/GetDocumentInsider/src/Commands/CommandBase.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using Microsoft.DotNet.Cli.CommandLine;
-
-namespace Microsoft.Extensions.ApiDescription.Tool.Commands
-{
-    internal abstract class CommandBase
-    {
-        public virtual void Configure(CommandLineApplication command)
-        {
-            var verbose = command.Option("-v|--verbose", Resources.VerboseDescription);
-            var noColor = command.Option("--no-color", Resources.NoColorDescription);
-            var prefixOutput = command.Option("--prefix-output", Resources.PrefixDescription);
-
-            command.HandleResponseFiles = true;
-
-            command.OnExecute(
-                () =>
-                {
-                    Reporter.IsVerbose = verbose.HasValue();
-                    Reporter.NoColor = noColor.HasValue();
-                    Reporter.PrefixOutput = prefixOutput.HasValue();
-
-                    Validate();
-
-                    return Execute();
-                });
-        }
-
-        protected virtual void Validate()
-        {
-        }
-
-        protected virtual int Execute() => 0;
-    }
-}
diff --git a/src/Mvc/GetDocumentInsider/src/ProductInfo.cs b/src/Mvc/GetDocumentInsider/src/ProductInfo.cs
deleted file mode 100644
index c57bc65d10..0000000000
--- a/src/Mvc/GetDocumentInsider/src/ProductInfo.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Reflection;
-
-namespace Microsoft.Extensions.ApiDescription.Tool
-{
-    internal static class ProductInfo
-    {
-        public static string GetVersion()
-            => typeof(ProductInfo)
-                .Assembly
-                .GetCustomAttribute<AssemblyInformationalVersionAttribute>()
-                .InformationalVersion;
-    }
-}
diff --git a/src/Mvc/GetDocumentInsider/src/Program.cs b/src/Mvc/GetDocumentInsider/src/Program.cs
deleted file mode 100644
index 8f39235b70..0000000000
--- a/src/Mvc/GetDocumentInsider/src/Program.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Text;
-using Microsoft.DotNet.Cli.CommandLine;
-using Microsoft.Extensions.ApiDescription.Tool.Commands;
-
-namespace Microsoft.Extensions.ApiDescription.Tool
-{
-    internal static class Program
-    {
-        private static int Main(string[] args)
-        {
-            if (Console.IsOutputRedirected)
-            {
-                Console.OutputEncoding = Encoding.UTF8;
-            }
-
-            var app = new CommandLineApplication()
-            {
-                FullName = Resources.CommandFullName,
-                Name = Resources.CommandFullName,
-            };
-
-            new GetDocumentCommand().Configure(app);
-
-            try
-            {
-                return app.Execute(args);
-            }
-            catch (Exception ex)
-            {
-                if (ex is CommandException || ex is CommandParsingException)
-                {
-                    Reporter.WriteVerbose(ex.ToString());
-                }
-                else
-                {
-                    Reporter.WriteInformation(ex.ToString());
-                }
-
-                Reporter.WriteError(ex.Message);
-
-                return 1;
-            }
-        }
-    }
-}
diff --git a/src/Mvc/GetDocumentInsider/src/Reporter.cs b/src/Mvc/GetDocumentInsider/src/Reporter.cs
deleted file mode 100644
index 9a589fcc67..0000000000
--- a/src/Mvc/GetDocumentInsider/src/Reporter.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Linq;
-using static Microsoft.Extensions.ApiDescription.Tool.AnsiConstants;
-
-namespace Microsoft.Extensions.ApiDescription.Tool
-{
-    internal static class Reporter
-    {
-        public static bool IsVerbose { get; set; }
-        public static bool NoColor { get; set; }
-        public static bool PrefixOutput { get; set; }
-
-        public static string Colorize(string value, Func<string, string> colorizeFunc)
-            => NoColor ? value : colorizeFunc(value);
-
-        public static void WriteError(string message)
-            => WriteLine(Prefix("error:   ", Colorize(message, x => Bold + Red + x + Reset)));
-
-        public static void WriteWarning(string message)
-            => WriteLine(Prefix("warn:    ", Colorize(message, x => Bold + Yellow + x + Reset)));
-
-        public static void WriteInformation(string message)
-            => WriteLine(Prefix("info:    ", message));
-
-        public static void WriteData(string message)
-            => WriteLine(Prefix("data:    ", Colorize(message, x => Bold + Gray + x + Reset)));
-
-        public static void WriteVerbose(string message)
-        {
-            if (IsVerbose)
-            {
-                WriteLine(Prefix("verbose: ", Colorize(message, x => Bold + Black + x + Reset)));
-            }
-        }
-
-        private static string Prefix(string prefix, string value)
-            => PrefixOutput
-                ? string.Join(
-                    Environment.NewLine,
-                    value.Split(new[] { Environment.NewLine }, StringSplitOptions.None).Select(l => prefix + l))
-                : value;
-
-        private static void WriteLine(string value)
-        {
-            if (NoColor)
-            {
-                Console.WriteLine(value);
-            }
-            else
-            {
-                AnsiConsole.WriteLine(value);
-            }
-        }
-    }
-}
diff --git a/src/Mvc/Mvc.Analyzers/test/Infrastructure/MvcTestSource.cs b/src/Mvc/Mvc.Analyzers/test/Infrastructure/MvcTestSource.cs
index 8b304a0f94..244bd263a1 100644
--- a/src/Mvc/Mvc.Analyzers/test/Infrastructure/MvcTestSource.cs
+++ b/src/Mvc/Mvc.Analyzers/test/Infrastructure/MvcTestSource.cs
@@ -5,7 +5,6 @@ using System;
 using System.IO;
 using Microsoft.AspNetCore.Analyzer.Testing;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 
 namespace Microsoft.AspNetCore.Mvc
 {
diff --git a/src/Mvc/Mvc.Api.Analyzers/test/Infrastructure/MvcTestSource.cs b/src/Mvc/Mvc.Api.Analyzers/test/Infrastructure/MvcTestSource.cs
index 6548f4306b..95510e5e46 100644
--- a/src/Mvc/Mvc.Api.Analyzers/test/Infrastructure/MvcTestSource.cs
+++ b/src/Mvc/Mvc.Api.Analyzers/test/Infrastructure/MvcTestSource.cs
@@ -5,7 +5,6 @@ using System;
 using System.IO;
 using Microsoft.AspNetCore.Analyzer.Testing;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 
 namespace Microsoft.AspNetCore.Mvc
 {
diff --git a/src/Mvc/Mvc.Core/test/FileResultTest.cs b/src/Mvc/Mvc.Core/test/FileResultTest.cs
index 3b517db4f1..674026b5f1 100644
--- a/src/Mvc/Mvc.Core/test/FileResultTest.cs
+++ b/src/Mvc/Mvc.Core/test/FileResultTest.cs
@@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.Abstractions;
 using Microsoft.AspNetCore.Mvc.Infrastructure;
 using Microsoft.AspNetCore.Routing;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
diff --git a/src/Mvc/Mvc.Core/test/Formatters/SystemTextJsonInputFormatterTest.cs b/src/Mvc/Mvc.Core/test/Formatters/SystemTextJsonInputFormatterTest.cs
index 411725c7a9..d6af5e8f72 100644
--- a/src/Mvc/Mvc.Core/test/Formatters/SystemTextJsonInputFormatterTest.cs
+++ b/src/Mvc/Mvc.Core/test/Formatters/SystemTextJsonInputFormatterTest.cs
@@ -88,7 +88,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters
 
         internal override string ReadAsync_AddsModelValidationErrorsToModelState_Expected => "$.Age";
 
-        internal override string JsonFormatter_EscapedKeys_Expected => "$[0]['It\\u0022s a key']";
+        internal override string JsonFormatter_EscapedKeys_Expected => "$[0]['It\"s a key']";
 
         internal override string JsonFormatter_EscapedKeys_Bracket_Expected => "$[0]['It[s a key']";
 
diff --git a/src/Mvc/Mvc.Core/test/ModelBinding/Binders/FloatingPointTypeModelBinderTestOfT.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/FloatingPointTypeModelBinderTestOfT.cs
index f27ec0d102..7cf48f1334 100644
--- a/src/Mvc/Mvc.Core/test/ModelBinding/Binders/FloatingPointTypeModelBinderTestOfT.cs
+++ b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/FloatingPointTypeModelBinderTestOfT.cs
@@ -5,7 +5,6 @@ using System;
 using System.Globalization;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
diff --git a/src/Mvc/Mvc.Core/test/ModelBinding/Validation/DefaultObjectValidatorTests.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Validation/DefaultObjectValidatorTests.cs
index 15d225a3da..b1a5254e02 100644
--- a/src/Mvc/Mvc.Core/test/ModelBinding/Validation/DefaultObjectValidatorTests.cs
+++ b/src/Mvc/Mvc.Core/test/ModelBinding/Validation/DefaultObjectValidatorTests.cs
@@ -12,7 +12,6 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.Infrastructure;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.DependencyInjection;
 using Moq;
 using Xunit;
diff --git a/src/Mvc/Mvc.DataAnnotations/src/DataAnnotationsMetadataProvider.cs b/src/Mvc/Mvc.DataAnnotations/src/DataAnnotationsMetadataProvider.cs
index e63b02edce..0e975e697f 100644
--- a/src/Mvc/Mvc.DataAnnotations/src/DataAnnotationsMetadataProvider.cs
+++ b/src/Mvc/Mvc.DataAnnotations/src/DataAnnotationsMetadataProvider.cs
@@ -333,7 +333,7 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations
             var contextAttributes = context.Attributes;
             var contextAttributesCount = contextAttributes.Count;
             var attributes = new List<object>(contextAttributesCount);
-            
+
             for (var i = 0; i < contextAttributesCount; i++)
             {
                 var attribute = contextAttributes[i];
@@ -367,15 +367,15 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations
                 else if (context.Key.MetadataKind == ModelMetadataKind.Property)
                 {
                     addInferredRequiredAttribute = IsNullableReferenceType(
-                        context.Key.ContainerType, 
-                        member: null, 
+                        context.Key.ContainerType,
+                        member: null,
                         context.PropertyAttributes);
                 }
                 else if (context.Key.MetadataKind == ModelMetadataKind.Parameter)
                 {
                     addInferredRequiredAttribute = IsNullableReferenceType(
-                        context.Key.ParameterInfo?.Member.ReflectedType, 
-                        context.Key.ParameterInfo.Member, 
+                        context.Key.ParameterInfo?.Member.ReflectedType,
+                        context.Key.ParameterInfo.Member,
                         context.ParameterAttributes);
                 }
                 else
@@ -494,6 +494,15 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations
 
         internal static bool IsNullableBasedOnContext(Type containingType, MemberInfo member)
         {
+            // For generic types, inspecting the nullability requirement additionally requires
+            // inspecting the nullability constraint on generic type parameters. This is fairly non-triviial
+            // so we'll just avoid calculating it. Users should still be able to apply an explicit [Required]
+            // attribute on these members.
+            if (containingType.IsGenericType)
+            {
+                return false;
+            }
+
             // The [Nullable] and [NullableContext] attributes are not inherited.
             //
             // The [NullableContext] attribute can appear on a method or on the module.
@@ -516,7 +525,7 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations
                 }
 
                 type = type.DeclaringType;
-            } 
+            }
             while (type != null);
 
             // If we don't find the attribute on the declaring type then repeat at the module level
diff --git a/src/Mvc/Mvc.DataAnnotations/test/CompareAttributeAdapterTest.cs b/src/Mvc/Mvc.DataAnnotations/test/CompareAttributeAdapterTest.cs
index 5750769245..4c4449065d 100644
--- a/src/Mvc/Mvc.DataAnnotations/test/CompareAttributeAdapterTest.cs
+++ b/src/Mvc/Mvc.DataAnnotations/test/CompareAttributeAdapterTest.cs
@@ -6,7 +6,6 @@ using System.ComponentModel.DataAnnotations;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Localization;
 using Moq;
 using Xunit;
diff --git a/src/Mvc/Mvc.DataAnnotations/test/DataAnnotationsMetadataProviderTest.cs b/src/Mvc/Mvc.DataAnnotations/test/DataAnnotationsMetadataProviderTest.cs
index 677c452d2d..f93ad363cc 100644
--- a/src/Mvc/Mvc.DataAnnotations/test/DataAnnotationsMetadataProviderTest.cs
+++ b/src/Mvc/Mvc.DataAnnotations/test/DataAnnotationsMetadataProviderTest.cs
@@ -1339,6 +1339,38 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations
             Assert.True(result);
         }
 
+        [Fact]
+        public void IsNullableReferenceType_ReturnsFalse_ForKeyValuePairWithoutNullableConstraints()
+        {
+            // Arrange
+            var type = typeof(KeyValuePair<string, object>);
+            var property = type.GetProperty(nameof(KeyValuePair<string, object>.Key));
+
+            // Act
+            var result = DataAnnotationsMetadataProvider.IsNullableReferenceType(type, member: null, property.GetCustomAttributes(inherit: true));
+
+            // Assert
+            Assert.False(result);
+        }
+
+#nullable enable
+        [Fact]
+        public void IsNullableReferenceType_ReturnsTrue_ForKeyValuePairWithNullableConstraints()
+        {
+            // Arrange
+            var type = typeof(KeyValuePair<string, object>);
+            var property = type.GetProperty(nameof(KeyValuePair<string, object>.Key))!;
+
+            // Act
+            var result = DataAnnotationsMetadataProvider.IsNullableReferenceType(type, member: null, property.GetCustomAttributes(inherit: true));
+
+            // Assert
+            // While we'd like for result to be 'true', we don't have a very good way of actually calculating it correctly.
+            // This test is primarily here to document the behavior.
+            Assert.False(result);
+        }
+#nullable restore
+
         [Fact]
         public void IsNonNullable_FindsNullableProperty()
         {
diff --git a/src/Mvc/Mvc.Formatters.Xml/test/XmlAssertTest.cs b/src/Mvc/Mvc.Formatters.Xml/test/XmlAssertTest.cs
index c63dececd6..6820645bd8 100644
--- a/src/Mvc/Mvc.Formatters.Xml/test/XmlAssertTest.cs
+++ b/src/Mvc/Mvc.Formatters.Xml/test/XmlAssertTest.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
 using Xunit.Sdk;
 
diff --git a/src/Mvc/Mvc.Formatters.Xml/test/XmlDataContractSerializerOutputFormatterTest.cs b/src/Mvc/Mvc.Formatters.Xml/test/XmlDataContractSerializerOutputFormatterTest.cs
index d94970348f..c0c688374d 100644
--- a/src/Mvc/Mvc.Formatters.Xml/test/XmlDataContractSerializerOutputFormatterTest.cs
+++ b/src/Mvc/Mvc.Formatters.Xml/test/XmlDataContractSerializerOutputFormatterTest.cs
@@ -9,7 +9,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Xml;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Testing;
diff --git a/src/Mvc/Mvc.Formatters.Xml/test/XmlSerializerInputFormatterTest.cs b/src/Mvc/Mvc.Formatters.Xml/test/XmlSerializerInputFormatterTest.cs
index e37ee32ca3..27b6fd72f9 100644
--- a/src/Mvc/Mvc.Formatters.Xml/test/XmlSerializerInputFormatterTest.cs
+++ b/src/Mvc/Mvc.Formatters.Xml/test/XmlSerializerInputFormatterTest.cs
@@ -13,7 +13,6 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Moq;
 using Xunit;
 
diff --git a/src/Mvc/Mvc.Razor/test/LanguageViewLocationExpanderTest.cs b/src/Mvc/Mvc.Razor/test/LanguageViewLocationExpanderTest.cs
index e31e66c3e5..bacd54ff6c 100644
--- a/src/Mvc/Mvc.Razor/test/LanguageViewLocationExpanderTest.cs
+++ b/src/Mvc/Mvc.Razor/test/LanguageViewLocationExpanderTest.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Mvc.Razor
@@ -133,8 +133,8 @@ namespace Microsoft.AspNetCore.Mvc.Razor
         {
             // Arrange
             var viewLocationExpanderContext = new ViewLocationExpanderContext(
-                new ActionContext(), 
-                "testView", 
+                new ActionContext(),
+                "testView",
                 "test-controller",
                 "",
                 null,
@@ -158,8 +158,8 @@ namespace Microsoft.AspNetCore.Mvc.Razor
         {
             // Arrange
             var viewLocationExpanderContext = new ViewLocationExpanderContext(
-                new ActionContext(), 
-                "testView", 
+                new ActionContext(),
+                "testView",
                 "test-controller",
                 "test-area",
                 null,
@@ -186,8 +186,8 @@ namespace Microsoft.AspNetCore.Mvc.Razor
         {
             // Arrange
             var viewLocationExpanderContext = new ViewLocationExpanderContext(
-                new ActionContext(), 
-                "testView", 
+                new ActionContext(),
+                "testView",
                 "test-controller",
                 "test-area",
                 null,
diff --git a/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj b/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj
index 6ec8a61c79..b6c9f4916c 100644
--- a/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj
+++ b/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj
@@ -7,11 +7,12 @@
     <Compile Include="Microsoft.AspNetCore.Mvc.ViewFeatures.netcoreapp.cs" />
     <Reference Include="Microsoft.AspNetCore.Mvc.Core"  />
     <Reference Include="Microsoft.AspNetCore.Mvc.DataAnnotations"  />
+    <Reference Include="Microsoft.AspNetCore.DataProtection.Extensions"  />
     <Reference Include="Microsoft.AspNetCore.Antiforgery"  />
     <Reference Include="Microsoft.AspNetCore.Diagnostics.Abstractions"  />
     <Reference Include="Microsoft.AspNetCore.Html.Abstractions"  />
     <Reference Include="Microsoft.Extensions.WebEncoders"  />
-    <Reference Include="Microsoft.AspNetCore.Components"  />
     <Reference Include="Microsoft.AspNetCore.Components.Authorization"  />
+    <Reference Include="Microsoft.AspNetCore.Components.Web"  />
   </ItemGroup>
 </Project>
diff --git a/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.netcoreapp.cs b/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.netcoreapp.cs
index 9125dacce4..d607693165 100644
--- a/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.netcoreapp.cs
+++ b/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.netcoreapp.cs
@@ -330,9 +330,9 @@ namespace Microsoft.AspNetCore.Mvc.Rendering
     }
     public static partial class HtmlHelperComponentExtensions
     {
-        public static System.Threading.Tasks.Task<Microsoft.AspNetCore.Html.IHtmlContent> RenderComponentAsync<TComponent>(this Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper htmlHelper) where TComponent : Microsoft.AspNetCore.Components.IComponent { throw null; }
+        public static System.Threading.Tasks.Task<Microsoft.AspNetCore.Html.IHtmlContent> RenderComponentAsync<TComponent>(this Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper htmlHelper, Microsoft.AspNetCore.Mvc.Rendering.RenderMode renderMode) where TComponent : Microsoft.AspNetCore.Components.IComponent { throw null; }
         [System.Diagnostics.DebuggerStepThroughAttribute]
-        public static System.Threading.Tasks.Task<Microsoft.AspNetCore.Html.IHtmlContent> RenderComponentAsync<TComponent>(this Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper htmlHelper, object parameters) where TComponent : Microsoft.AspNetCore.Components.IComponent { throw null; }
+        public static System.Threading.Tasks.Task<Microsoft.AspNetCore.Html.IHtmlContent> RenderComponentAsync<TComponent>(this Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper htmlHelper, Microsoft.AspNetCore.Mvc.Rendering.RenderMode renderMode, object parameters) where TComponent : Microsoft.AspNetCore.Components.IComponent { throw null; }
     }
     public static partial class HtmlHelperDisplayExtensions
     {
@@ -616,6 +616,12 @@ namespace Microsoft.AspNetCore.Mvc.Rendering
         public void EndForm() { }
         protected virtual void GenerateEndForm() { }
     }
+    public enum RenderMode
+    {
+        Static = 1,
+        Server = 2,
+        ServerPrerendered = 3,
+    }
     public partial class SelectList : Microsoft.AspNetCore.Mvc.Rendering.MultiSelectList
     {
         public SelectList(System.Collections.IEnumerable items) : base (default(System.Collections.IEnumerable)) { }
diff --git a/src/Mvc/Mvc.ViewFeatures/src/DependencyInjection/MvcViewFeaturesMvcCoreBuilderExtensions.cs b/src/Mvc/Mvc.ViewFeatures/src/DependencyInjection/MvcViewFeaturesMvcCoreBuilderExtensions.cs
index 7bd517c1f1..7b17edbe29 100644
--- a/src/Mvc/Mvc.ViewFeatures/src/DependencyInjection/MvcViewFeaturesMvcCoreBuilderExtensions.cs
+++ b/src/Mvc/Mvc.ViewFeatures/src/DependencyInjection/MvcViewFeaturesMvcCoreBuilderExtensions.cs
@@ -175,6 +175,9 @@ namespace Microsoft.Extensions.DependencyInjection
 
             services.TryAddSingleton<IJsonHelper, SystemTextJsonHelper>();
 
+            // Component services for Blazor server-side interop
+            services.TryAddSingleton<ServerComponentSerializer>();
+
             //
             // View Components
             //
diff --git a/src/Mvc/Mvc.ViewFeatures/src/HtmlHelperComponentExtensions.cs b/src/Mvc/Mvc.ViewFeatures/src/HtmlHelperComponentExtensions.cs
index 8c7c2c551f..0d8a336b8d 100644
--- a/src/Mvc/Mvc.ViewFeatures/src/HtmlHelperComponentExtensions.cs
+++ b/src/Mvc/Mvc.ViewFeatures/src/HtmlHelperComponentExtensions.cs
@@ -5,6 +5,7 @@ using System;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.AspNetCore.Mvc.ViewFeatures.RazorComponents;
 using Microsoft.Extensions.DependencyInjection;
@@ -16,19 +17,22 @@ namespace Microsoft.AspNetCore.Mvc.Rendering
     /// </summary>
     public static class HtmlHelperComponentExtensions
     {
+        private static readonly object ComponentSequenceKey = new object();
+
         /// <summary>
         /// Renders the <typeparamref name="TComponent"/> <see cref="IComponent"/>.
         /// </summary>
         /// <param name="htmlHelper">The <see cref="IHtmlHelper"/>.</param>
+        /// <param name="renderMode">The <see cref="RenderMode"/> for the component.</param>
         /// <returns>The HTML produced by the rendered <typeparamref name="TComponent"/>.</returns>
-        public static Task<IHtmlContent> RenderComponentAsync<TComponent>(this IHtmlHelper htmlHelper) where TComponent : IComponent
+        public static Task<IHtmlContent> RenderComponentAsync<TComponent>(this IHtmlHelper htmlHelper, RenderMode renderMode) where TComponent : IComponent
         {
             if (htmlHelper == null)
             {
                 throw new ArgumentNullException(nameof(htmlHelper));
             }
 
-            return htmlHelper.RenderComponentAsync<TComponent>(null);
+            return htmlHelper.RenderComponentAsync<TComponent>(renderMode, null);
         }
 
         /// <summary>
@@ -37,9 +41,11 @@ namespace Microsoft.AspNetCore.Mvc.Rendering
         /// <param name="htmlHelper">The <see cref="IHtmlHelper"/>.</param>
         /// <param name="parameters">An <see cref="object"/> containing the parameters to pass
         /// to the component.</param>
+        /// <param name="renderMode">The <see cref="RenderMode"/> for the component.</param>
         /// <returns>The HTML produced by the rendered <typeparamref name="TComponent"/>.</returns>
         public static async Task<IHtmlContent> RenderComponentAsync<TComponent>(
             this IHtmlHelper htmlHelper,
+            RenderMode renderMode,
             object parameters) where TComponent : IComponent
         {
             if (htmlHelper == null)
@@ -47,20 +53,84 @@ namespace Microsoft.AspNetCore.Mvc.Rendering
                 throw new ArgumentNullException(nameof(htmlHelper));
             }
 
-            var httpContext = htmlHelper.ViewContext.HttpContext;
-            var serviceProvider = httpContext.RequestServices;
-            var prerenderer = serviceProvider.GetRequiredService<StaticComponentRenderer>();
+            var context = htmlHelper.ViewContext.HttpContext;
+            return renderMode switch
+            {
+                RenderMode.Server => NonPrerenderedServerComponent(context, GetOrCreateInvocationId(htmlHelper.ViewContext), typeof(TComponent), GetParametersCollection(parameters)),
+                RenderMode.ServerPrerendered => await PrerenderedServerComponentAsync(context, GetOrCreateInvocationId(htmlHelper.ViewContext), typeof(TComponent), GetParametersCollection(parameters)),
+                RenderMode.Static => await StaticComponentAsync(context, typeof(TComponent), GetParametersCollection(parameters)),
+                _ => throw new ArgumentException("Invalid render mode", nameof(renderMode)),
+            };
+        }
 
-            var parametersCollection = parameters == null ?
+        private static ServerComponentInvocationSequence GetOrCreateInvocationId(ViewContext viewContext)
+        {
+            if (!viewContext.Items.TryGetValue(ComponentSequenceKey, out var result))
+            {
+                result = new ServerComponentInvocationSequence();
+                viewContext.Items[ComponentSequenceKey] = result;
+            }
+
+            return (ServerComponentInvocationSequence)result;
+        }
+
+        private static ParameterView GetParametersCollection(object parameters) => parameters == null ?
                 ParameterView.Empty :
                 ParameterView.FromDictionary(HtmlHelper.ObjectToDictionary(parameters));
 
+        private static async Task<IHtmlContent> StaticComponentAsync(HttpContext context, Type type, ParameterView parametersCollection)
+        {
+            var serviceProvider = context.RequestServices;
+            var prerenderer = serviceProvider.GetRequiredService<StaticComponentRenderer>();
+
+
             var result = await prerenderer.PrerenderComponentAsync(
                 parametersCollection,
-                httpContext,
-                typeof(TComponent));
+                context,
+                type);
 
             return new ComponentHtmlContent(result);
         }
+
+        private static async Task<IHtmlContent> PrerenderedServerComponentAsync(HttpContext context, ServerComponentInvocationSequence invocationId, Type type, ParameterView parametersCollection)
+        {
+            if (parametersCollection.GetEnumerator().MoveNext())
+            {
+                throw new InvalidOperationException("Prerendering server components with parameters is not supported.");
+            }
+
+            var serviceProvider = context.RequestServices;
+            var prerenderer = serviceProvider.GetRequiredService<StaticComponentRenderer>();
+            var invocationSerializer = serviceProvider.GetRequiredService<ServerComponentSerializer>();
+
+            var currentInvocation = invocationSerializer.SerializeInvocation(
+                invocationId,
+                type,
+                prerendered: true);
+
+            var result = await prerenderer.PrerenderComponentAsync(
+                parametersCollection,
+                context,
+                type);
+
+            return new ComponentHtmlContent(
+                invocationSerializer.GetPreamble(currentInvocation),
+                result,
+                invocationSerializer.GetEpilogue(currentInvocation));
+        }
+
+        private static IHtmlContent NonPrerenderedServerComponent(HttpContext context, ServerComponentInvocationSequence invocationId, Type type, ParameterView parametersCollection)
+        {
+            if (parametersCollection.GetEnumerator().MoveNext())
+            {
+                throw new InvalidOperationException("Server components with parameters are not supported.");
+            }
+
+            var serviceProvider = context.RequestServices;
+            var invocationSerializer = serviceProvider.GetRequiredService<ServerComponentSerializer>();
+            var currentInvocation = invocationSerializer.SerializeInvocation(invocationId, type, prerendered: false);
+
+            return new ComponentHtmlContent(invocationSerializer.GetPreamble(currentInvocation));
+        }
     }
 }
diff --git a/src/Mvc/Mvc.ViewFeatures/src/Infrastructure/ComponentHtmlContent.cs b/src/Mvc/Mvc.ViewFeatures/src/Infrastructure/ComponentHtmlContent.cs
index d91e80d123..2059740020 100644
--- a/src/Mvc/Mvc.ViewFeatures/src/Infrastructure/ComponentHtmlContent.cs
+++ b/src/Mvc/Mvc.ViewFeatures/src/Infrastructure/ComponentHtmlContent.cs
@@ -1,26 +1,30 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Text.Encodings.Web;
 using Microsoft.AspNetCore.Html;
-using Microsoft.AspNetCore.Http;
 
 namespace Microsoft.AspNetCore.Mvc.ViewFeatures
 {
     internal class ComponentHtmlContent : IHtmlContent
     {
+        private readonly IEnumerable<string> _preamble;
         private readonly IEnumerable<string> _componentResult;
+        private readonly IEnumerable<string> _epilogue;
 
         public ComponentHtmlContent(IEnumerable<string> componentResult)
-        {
-            _componentResult = componentResult;
-        }
+            : this(Array.Empty<string>(), componentResult, Array.Empty<string>()) { }
+
+        public ComponentHtmlContent(IEnumerable<string> preamble, IEnumerable<string> componentResult, IEnumerable<string> epilogue) =>
+            (_preamble, _componentResult, _epilogue) = (preamble, componentResult, epilogue);
 
         public void WriteTo(TextWriter writer, HtmlEncoder encoder)
         {
-            foreach (var element in _componentResult)
+            foreach (var element in _preamble.Concat(_componentResult).Concat(_epilogue))
             {
                 writer.Write(element);
             }
diff --git a/src/Mvc/Mvc.ViewFeatures/src/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj b/src/Mvc/Mvc.ViewFeatures/src/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj
index a0077e64d5..c2e56ea415 100644
--- a/src/Mvc/Mvc.ViewFeatures/src/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj
+++ b/src/Mvc/Mvc.ViewFeatures/src/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj
@@ -1,11 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Description>ASP.NET Core MVC view rendering features. Contains common types used in most MVC applications as well as view rendering features such as view engines, views, view components, and HTML helpers.
-Commonly used types:
-Microsoft.AspNetCore.Mvc.Controller
-Microsoft.AspNetCore.Mvc.ValidateAntiForgeryTokenAttribute
-Microsoft.AspNetCore.Mvc.ViewComponent</Description>
+    <Description>
+      ASP.NET Core MVC view rendering features. Contains common types used in most MVC applications as well as view rendering features such as view engines, views, view components, and HTML helpers.
+      Commonly used types:
+      Microsoft.AspNetCore.Mvc.Controller
+      Microsoft.AspNetCore.Mvc.ValidateAntiForgeryTokenAttribute
+      Microsoft.AspNetCore.Mvc.ViewComponent
+    </Description>
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -17,13 +19,20 @@ Microsoft.AspNetCore.Mvc.ViewComponent</Description>
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.Mvc.Core" />
     <Reference Include="Microsoft.AspNetCore.Mvc.DataAnnotations" />
+    <Reference Include="Microsoft.AspNetCore.DataProtection.Extensions" />
 
     <Reference Include="Microsoft.AspNetCore.Antiforgery" />
     <Reference Include="Microsoft.AspNetCore.Diagnostics.Abstractions" />
     <Reference Include="Microsoft.AspNetCore.Html.Abstractions" />
     <Reference Include="Microsoft.Extensions.WebEncoders" />
-    <Reference Include="Microsoft.AspNetCore.Components" />
     <Reference Include="Microsoft.AspNetCore.Components.Authorization" />
+    <Reference Include="Microsoft.AspNetCore.Components.Web" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="$(RepoRoot)src\Shared\Components\ServerComponentSerializationSettings.cs" />
+    <Compile Include="$(RepoRoot)src\Shared\Components\ServerComponentMarker.cs" />
+    <Compile Include="$(RepoRoot)src\Shared\Components\ServerComponent.cs" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Mvc/Mvc.ViewFeatures/src/RazorComponents/UnsupportedJavaScriptRuntime.cs b/src/Mvc/Mvc.ViewFeatures/src/RazorComponents/UnsupportedJavaScriptRuntime.cs
index eae107dbe2..bcb36c37a0 100644
--- a/src/Mvc/Mvc.ViewFeatures/src/RazorComponents/UnsupportedJavaScriptRuntime.cs
+++ b/src/Mvc/Mvc.ViewFeatures/src/RazorComponents/UnsupportedJavaScriptRuntime.cs
@@ -11,14 +11,14 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures
 {
     internal class UnsupportedJavaScriptRuntime : IJSRuntime
     {
-        public Task<T> InvokeAsync<T>(string identifier, params object[] args)
+        public ValueTask<TValue> InvokeAsync<TValue>(string identifier, CancellationToken cancellationToken, object[] args)
         {
             throw new InvalidOperationException("JavaScript interop calls cannot be issued during server-side prerendering, because the page has not yet loaded in the browser. Prerendered components must wrap any JavaScript interop calls in conditional logic to ensure those interop calls are not attempted during prerendering.");
         }
 
-        public Task<TValue> InvokeAsync<TValue>(string identifier, IEnumerable<object> args, CancellationToken cancellationToken = default)
+        ValueTask<TValue> IJSRuntime.InvokeAsync<TValue>(string identifier, object[] args)
         {
             throw new InvalidOperationException("JavaScript interop calls cannot be issued during server-side prerendering, because the page has not yet loaded in the browser. Prerendered components must wrap any JavaScript interop calls in conditional logic to ensure those interop calls are not attempted during prerendering.");
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Mvc/Mvc.ViewFeatures/src/RenderMode.cs b/src/Mvc/Mvc.ViewFeatures/src/RenderMode.cs
new file mode 100644
index 0000000000..f6816e68ff
--- /dev/null
+++ b/src/Mvc/Mvc.ViewFeatures/src/RenderMode.cs
@@ -0,0 +1,34 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.AspNetCore.Mvc.Rendering
+{
+    /// <summary>
+    /// Describes the render mode of the component.
+    /// </summary>
+    /// <remarks>
+    /// The rendering mode determines how the component gets rendered on the page. It configures whether the component
+    /// is prerendered into the page or not and whether it simply renders static HTML on the page or if it includes the necessary
+    /// information to bootstrap a Blazor application from the user agent.
+    /// </remarks>
+    public enum RenderMode
+    {
+        /// <summary>
+        /// Renders the component into static HTML.
+        /// </summary>
+        Static = 1,
+
+        /// <summary>
+        /// Renders a marker for a Blazor server-side application. This doesn't include any output from the component.
+        /// When the user-agent starts, it uses this marker to bootstrap a blazor application.
+        /// </summary>
+        Server = 2,
+
+        /// <summary>
+        /// Renders the component into static HTML and includes a marker for a Blazor server-side application.
+        /// When the user-agent starts, it uses this marker to bootstrap a blazor application.
+        /// </summary>
+        ServerPrerendered = 3,
+
+    }
+}
diff --git a/src/Mvc/Mvc.ViewFeatures/src/Rendering/ViewContext.cs b/src/Mvc/Mvc.ViewFeatures/src/Rendering/ViewContext.cs
index b5069c7ca6..ac2d6c48c9 100644
--- a/src/Mvc/Mvc.ViewFeatures/src/Rendering/ViewContext.cs
+++ b/src/Mvc/Mvc.ViewFeatures/src/Rendering/ViewContext.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using System.Collections.Generic;
 using System.IO;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.ViewEngines;
@@ -16,6 +17,7 @@ namespace Microsoft.AspNetCore.Mvc.Rendering
     {
         private FormContext _formContext;
         private DynamicViewData _viewBag;
+        private Dictionary<object, object> _items;
 
         /// <summary>
         /// Creates an empty <see cref="ViewContext"/>.
@@ -137,6 +139,9 @@ namespace Microsoft.AspNetCore.Mvc.Rendering
             ViewData = viewData;
             TempData = viewContext.TempData;
             Writer = writer;
+
+            // The dictionary needs to be initialized at this point so that child viewcontexts share the same underlying storage;
+            _items = viewContext.Items;
         }
 
         /// <summary>
@@ -232,6 +237,11 @@ namespace Microsoft.AspNetCore.Mvc.Rendering
         /// </remarks>
         public string ExecutingFilePath { get; set; }
 
+        /// <summary>
+        /// Gets a key/value collection that can be used to share data within the scope of this view execution.
+        /// </summary>
+        internal Dictionary<object, object> Items => _items ??= new Dictionary<object, object>();
+
         public FormContext GetFormContextForClientValidation()
         {
             return ClientValidationEnabled ? FormContext : null;
diff --git a/src/Mvc/Mvc.ViewFeatures/src/ServerComponentInvocationSequence.cs b/src/Mvc/Mvc.ViewFeatures/src/ServerComponentInvocationSequence.cs
new file mode 100644
index 0000000000..5227352d18
--- /dev/null
+++ b/src/Mvc/Mvc.ViewFeatures/src/ServerComponentInvocationSequence.cs
@@ -0,0 +1,26 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Security.Cryptography;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    // Used to produce a monotonically increasing sequence starting at 0 that is unique for the scope of the top-level page/view/component being rendered.
+    internal class ServerComponentInvocationSequence
+    {
+        private int _sequence;
+
+        public ServerComponentInvocationSequence()
+        {
+            Span<byte> bytes = stackalloc byte[16];
+            RandomNumberGenerator.Fill(bytes);
+            Value = new Guid(bytes);
+            _sequence = -1;
+        }
+
+        public Guid Value { get; }
+
+        public int Next() => ++_sequence;
+    }
+}
diff --git a/src/Mvc/Mvc.ViewFeatures/src/ServerComponentSerializer.cs b/src/Mvc/Mvc.ViewFeatures/src/ServerComponentSerializer.cs
new file mode 100644
index 0000000000..6e116c6bb1
--- /dev/null
+++ b/src/Mvc/Mvc.ViewFeatures/src/ServerComponentSerializer.cs
@@ -0,0 +1,90 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.DataProtection;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+    // See the details of the component serialization protocol in ServerComponentDeserializer.cs on the Components solution.
+    internal class ServerComponentSerializer
+    {
+        private readonly ITimeLimitedDataProtector _dataProtector;
+
+        public ServerComponentSerializer(IDataProtectionProvider dataProtectionProvider) =>
+            _dataProtector = dataProtectionProvider
+                .CreateProtector(ServerComponentSerializationSettings.DataProtectionProviderPurpose)
+                .ToTimeLimitedDataProtector();
+
+        public ServerComponentMarker SerializeInvocation(ServerComponentInvocationSequence invocationId, Type type, bool prerendered)
+        {
+            var (sequence, serverComponent) = CreateSerializedServerComponent(invocationId, type);
+            return prerendered ? ServerComponentMarker.Prerendered(sequence, serverComponent) : ServerComponentMarker.NonPrerendered(sequence, serverComponent);
+        }
+
+        private (int sequence, string payload) CreateSerializedServerComponent(
+            ServerComponentInvocationSequence invocationId,
+            Type rootComponent)
+        {
+            var sequence = invocationId.Next();
+
+            var serverComponent = new ServerComponent(
+                sequence,
+                rootComponent.Assembly.GetName().Name,
+                rootComponent.FullName,
+                invocationId.Value);
+
+            var serializedServerComponent = JsonSerializer.Serialize(serverComponent, ServerComponentSerializationSettings.JsonSerializationOptions);
+            return (serverComponent.Sequence, _dataProtector.Protect(serializedServerComponent, ServerComponentSerializationSettings.DataExpiration));
+        }
+
+        internal IEnumerable<string> GetPreamble(ServerComponentMarker record)
+        {
+            var serializedStartRecord = JsonSerializer.Serialize(
+                record,
+                ServerComponentSerializationSettings.JsonSerializationOptions);
+
+            if (record.PrerenderId != null)
+            {
+                return PrerenderedStart(serializedStartRecord);
+            }
+            else
+            {
+                return NonPrerenderedSequence(serializedStartRecord);
+            }
+
+            static IEnumerable<string> PrerenderedStart(string startRecord)
+            {
+                yield return "<!--Blazor:";
+                yield return startRecord;
+                yield return "-->";
+            }
+
+            static IEnumerable<string> NonPrerenderedSequence(string record)
+            {
+                yield return "<!--Blazor:";
+                yield return record;
+                yield return "-->";
+            }
+        }
+
+        internal IEnumerable<string> GetEpilogue(ServerComponentMarker record)
+        {
+            var serializedStartRecord = JsonSerializer.Serialize(
+                record.GetEndRecord(),
+                ServerComponentSerializationSettings.JsonSerializationOptions);
+
+            return PrerenderEnd(serializedStartRecord);
+
+            static IEnumerable<string> PrerenderEnd(string endRecord)
+            {
+                yield return "<!--Blazor:";
+                yield return endRecord;
+                yield return "-->";
+            }
+        }
+    }
+}
diff --git a/src/Mvc/Mvc.ViewFeatures/test/HtmlHelperComponentExtensionsTests.cs b/src/Mvc/Mvc.ViewFeatures/test/HtmlHelperComponentExtensionsTests.cs
index 3947f3fd5a..413f0c2fb1 100644
--- a/src/Mvc/Mvc.ViewFeatures/test/HtmlHelperComponentExtensionsTests.cs
+++ b/src/Mvc/Mvc.ViewFeatures/test/HtmlHelperComponentExtensionsTests.cs
@@ -4,9 +4,12 @@
 using System;
 using System.IO;
 using System.Text.Encodings.Web;
+using System.Text.Json;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Rendering;
+using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Mvc.Rendering;
@@ -23,6 +26,11 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Test
 {
     public class HtmlHelperComponentExtensionsTests
     {
+        private const string PrerenderedServerComponentPattern = "^<!--Blazor:(?<preamble>.*?)-->(?<content>.+?)<!--Blazor:(?<epilogue>.*?)-->$";
+        private const string ServerComponentPattern = "^<!--Blazor:(.*?)-->$";
+
+        private static readonly IDataProtectionProvider _dataprotectorProvider = new EphemeralDataProtectionProvider();
+
         [Fact]
         public async Task CanRender_ParameterlessComponent()
         {
@@ -31,7 +39,7 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Test
             var writer = new StringWriter();
 
             // Act
-            var result = await helper.RenderComponentAsync<TestComponent>();
+            var result = await helper.RenderComponentAsync<TestComponent>(RenderMode.Static);
             result.WriteTo(writer, HtmlEncoder.Default);
             var content = writer.ToString();
 
@@ -39,6 +47,126 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Test
             Assert.Equal("<h1>Hello world!</h1>", content);
         }
 
+        [Fact]
+        public async Task CanRender_ParameterlessComponent_ServerMode()
+        {
+            // Arrange
+            var helper = CreateHelper();
+            var writer = new StringWriter();
+            var protector = _dataprotectorProvider.CreateProtector(ServerComponentSerializationSettings.DataProtectionProviderPurpose)
+                .ToTimeLimitedDataProtector();
+
+            // Act
+            var result = await helper.RenderComponentAsync<TestComponent>(RenderMode.Server);
+            result.WriteTo(writer, HtmlEncoder.Default);
+            var content = writer.ToString();
+            var match = Regex.Match(content, ServerComponentPattern);
+
+            // Assert
+            Assert.True(match.Success);
+            var marker = JsonSerializer.Deserialize<ServerComponentMarker>(match.Groups[1].Value, ServerComponentSerializationSettings.JsonSerializationOptions);
+            Assert.Equal(0, marker.Sequence);
+            Assert.Null(marker.PrerenderId);
+            Assert.NotNull(marker.Descriptor);
+            Assert.Equal("server", marker.Type);
+
+            var unprotectedServerComponent = protector.Unprotect(marker.Descriptor);
+            var serverComponent = JsonSerializer.Deserialize<ServerComponent>(unprotectedServerComponent, ServerComponentSerializationSettings.JsonSerializationOptions);
+            Assert.Equal(0, serverComponent.Sequence);
+            Assert.Equal(typeof(TestComponent).Assembly.GetName().Name, serverComponent.AssemblyName);
+            Assert.Equal(typeof(TestComponent).FullName, serverComponent.TypeName);
+            Assert.NotEqual(Guid.Empty, serverComponent.InvocationId);
+        }
+
+        [Fact]
+        public async Task CanPrerender_ParameterlessComponent_ServerMode()
+        {
+            // Arrange
+            var helper = CreateHelper();
+            var writer = new StringWriter();
+            var protector = _dataprotectorProvider.CreateProtector(ServerComponentSerializationSettings.DataProtectionProviderPurpose)
+                .ToTimeLimitedDataProtector();
+
+            // Act
+            var result = await helper.RenderComponentAsync<TestComponent>(RenderMode.ServerPrerendered);
+            result.WriteTo(writer, HtmlEncoder.Default);
+            var content = writer.ToString();
+            var match = Regex.Match(content, PrerenderedServerComponentPattern, RegexOptions.Multiline);
+
+            // Assert
+            Assert.True(match.Success);
+            var preamble = match.Groups["preamble"].Value;
+            var preambleMarker = JsonSerializer.Deserialize<ServerComponentMarker>(preamble, ServerComponentSerializationSettings.JsonSerializationOptions);
+            Assert.Equal(0, preambleMarker.Sequence);
+            Assert.NotNull(preambleMarker.PrerenderId);
+            Assert.NotNull(preambleMarker.Descriptor);
+            Assert.Equal("server", preambleMarker.Type);
+
+            var unprotectedServerComponent = protector.Unprotect(preambleMarker.Descriptor);
+            var serverComponent = JsonSerializer.Deserialize<ServerComponent>(unprotectedServerComponent, ServerComponentSerializationSettings.JsonSerializationOptions);
+            Assert.NotEqual(default, serverComponent);
+            Assert.Equal(0, serverComponent.Sequence);
+            Assert.Equal(typeof(TestComponent).Assembly.GetName().Name, serverComponent.AssemblyName);
+            Assert.Equal(typeof(TestComponent).FullName, serverComponent.TypeName);
+            Assert.NotEqual(Guid.Empty, serverComponent.InvocationId);
+
+            var prerenderedContent = match.Groups["content"].Value;
+            Assert.Equal("<h1>Hello world!</h1>", prerenderedContent);
+
+            var epilogue = match.Groups["epilogue"].Value;
+            var epilogueMarker = JsonSerializer.Deserialize<ServerComponentMarker>(epilogue, ServerComponentSerializationSettings.JsonSerializationOptions);
+            Assert.Equal(preambleMarker.PrerenderId, epilogueMarker.PrerenderId);
+            Assert.Null(epilogueMarker.Sequence);
+            Assert.Null(epilogueMarker.Descriptor);
+            Assert.Null(epilogueMarker.Type);
+        }
+
+        [Fact]
+        public async Task CanRenderMultipleServerComponents()
+        {
+            // Arrange
+            var helper = CreateHelper();
+            var firstWriter = new StringWriter();
+            var secondWriter = new StringWriter();
+            var protector = _dataprotectorProvider.CreateProtector(ServerComponentSerializationSettings.DataProtectionProviderPurpose)
+                .ToTimeLimitedDataProtector();
+
+            // Act
+            var firstResult = await helper.RenderComponentAsync<TestComponent>(RenderMode.ServerPrerendered);
+            firstResult.WriteTo(firstWriter, HtmlEncoder.Default);
+            var firstComponent = firstWriter.ToString();
+            var firstMatch = Regex.Match(firstComponent, PrerenderedServerComponentPattern, RegexOptions.Multiline);
+
+            var secondResult = await helper.RenderComponentAsync<TestComponent>(RenderMode.Server);
+            secondResult.WriteTo(secondWriter, HtmlEncoder.Default);
+            var secondComponent = secondWriter.ToString();
+            var secondMatch = Regex.Match(secondComponent, ServerComponentPattern);
+
+            // Assert
+            Assert.True(firstMatch.Success);
+            var preamble = firstMatch.Groups["preamble"].Value;
+            var preambleMarker = JsonSerializer.Deserialize<ServerComponentMarker>(preamble, ServerComponentSerializationSettings.JsonSerializationOptions);
+            Assert.Equal(0, preambleMarker.Sequence);
+            Assert.NotNull(preambleMarker.Descriptor);
+
+            var unprotectedFirstServerComponent = protector.Unprotect(preambleMarker.Descriptor);
+            var firstServerComponent = JsonSerializer.Deserialize<ServerComponent>(unprotectedFirstServerComponent, ServerComponentSerializationSettings.JsonSerializationOptions);
+            Assert.Equal(0, firstServerComponent.Sequence);
+            Assert.NotEqual(Guid.Empty, firstServerComponent.InvocationId);
+
+            Assert.True(secondMatch.Success);
+            var marker = secondMatch.Groups[1].Value;
+            var markerMarker = JsonSerializer.Deserialize<ServerComponentMarker>(marker, ServerComponentSerializationSettings.JsonSerializationOptions);
+            Assert.Equal(1, markerMarker.Sequence);
+            Assert.NotNull(markerMarker.Descriptor);
+
+            var unprotectedSecondServerComponent = protector.Unprotect(markerMarker.Descriptor);
+            var secondServerComponent = JsonSerializer.Deserialize<ServerComponent>(unprotectedSecondServerComponent, ServerComponentSerializationSettings.JsonSerializationOptions);
+            Assert.Equal(1, secondServerComponent.Sequence);
+
+            Assert.Equal(firstServerComponent.InvocationId, secondServerComponent.InvocationId);
+        }
+
         [Fact]
         public async Task CanRender_ComponentWithParametersObject()
         {
@@ -47,10 +175,12 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Test
             var writer = new StringWriter();
 
             // Act
-            var result = await helper.RenderComponentAsync<GreetingComponent>(new
-            {
-                Name = "Steve"
-            });
+            var result = await helper.RenderComponentAsync<GreetingComponent>(
+                RenderMode.Static,
+                new
+                {
+                    Name = "Steve"
+                });
             result.WriteTo(writer, HtmlEncoder.Default);
             var content = writer.ToString();
 
@@ -58,6 +188,44 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Test
             Assert.Equal("<p>Hello Steve!</p>", content);
         }
 
+        [Theory]
+        [InlineData(RenderMode.Server, "Server components with parameters are not supported.")]
+        [InlineData(RenderMode.ServerPrerendered, "Prerendering server components with parameters is not supported.")]
+        public async Task ComponentWithParametersObject_ThrowsInvalidOperationExceptionForServerRenderModes(
+            RenderMode renderMode,
+            string expectedMessage)
+        {
+            // Arrange
+            var helper = CreateHelper();
+            var writer = new StringWriter();
+
+            // Act & Assert
+            var result = await Assert.ThrowsAsync<InvalidOperationException>(() => helper.RenderComponentAsync<GreetingComponent>(
+                renderMode,
+                new
+                {
+                    Name = "Steve"
+                }));
+            Assert.Equal(expectedMessage, result.Message);
+        }
+
+        [Fact]
+        public async Task ComponentWithInvalidRenderMode_Throws()
+        {
+            // Arrange
+            var helper = CreateHelper();
+            var writer = new StringWriter();
+
+            // Act & Assert
+            var result = await Assert.ThrowsAsync<ArgumentException>(() => helper.RenderComponentAsync<GreetingComponent>(
+                default,
+                new
+                {
+                    Name = "Steve"
+                }));
+            Assert.Equal("renderMode", result.ParamName);
+        }
+
         [Fact]
         public async Task RenderComponent_DoesNotInvokeOnAfterRenderInComponent()
         {
@@ -67,10 +235,13 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Test
 
             // Act
             var state = new OnAfterRenderState();
-            var result = await helper.RenderComponentAsync<OnAfterRenderComponent>(new
-            {
-                State = state
-            });
+            var result = await helper.RenderComponentAsync<OnAfterRenderComponent>(
+                RenderMode.Static,
+                new
+                {
+                    State = state
+                });
+
             result.WriteTo(writer, HtmlEncoder.Default);
 
             // Assert
@@ -85,10 +256,12 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Test
             var helper = CreateHelper();
 
             // Act & Assert
-            var exception = await Assert.ThrowsAsync<InvalidOperationException>(() => helper.RenderComponentAsync<ExceptionComponent>(new
-            {
-                IsAsync = false
-            }));
+            var exception = await Assert.ThrowsAsync<InvalidOperationException>(() => helper.RenderComponentAsync<ExceptionComponent>(
+                RenderMode.Static,
+                new
+                {
+                    IsAsync = false
+                }));
 
             // Assert
             Assert.Equal("Threw an exception synchronously", exception.Message);
@@ -101,10 +274,12 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Test
             var helper = CreateHelper();
 
             // Act & Assert
-            var exception = await Assert.ThrowsAsync<InvalidOperationException>(() => helper.RenderComponentAsync<ExceptionComponent>(new
-            {
-                IsAsync = true
-            }));
+            var exception = await Assert.ThrowsAsync<InvalidOperationException>(() => helper.RenderComponentAsync<ExceptionComponent>(
+                RenderMode.Static,
+                new
+                {
+                    IsAsync = true
+                }));
 
             // Assert
             Assert.Equal("Threw an exception asynchronously", exception.Message);
@@ -117,10 +292,13 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Test
             var helper = CreateHelper();
 
             // Act & Assert
-            var exception = await Assert.ThrowsAsync<InvalidOperationException>(() => helper.RenderComponentAsync<ExceptionComponent>(new
-            {
-                JsInterop = true
-            }));
+            var exception = await Assert.ThrowsAsync<InvalidOperationException>(() => helper.RenderComponentAsync<ExceptionComponent>(
+                RenderMode.Static,
+                new
+                {
+                    JsInterop = true
+                }
+            ));
 
             // Assert
             Assert.Equal("JavaScript interop calls cannot be issued during server-side prerendering, " +
@@ -146,10 +324,12 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Test
             var writer = new StringWriter();
 
             // Act
-            var exception = await Assert.ThrowsAsync<InvalidOperationException>(() => helper.RenderComponentAsync<RedirectComponent>(new
-            {
-                RedirectUri = "http://localhost/redirect"
-            }));
+            var exception = await Assert.ThrowsAsync<InvalidOperationException>(() => helper.RenderComponentAsync<RedirectComponent>(
+                RenderMode.Static,
+                new
+                {
+                    RedirectUri = "http://localhost/redirect"
+                }));
 
             Assert.Equal("A navigation command was attempted during prerendering after the server already started sending the response. " +
                             "Navigation commands can not be issued during server-side prerendering after the response from the server has started. Applications must buffer the" +
@@ -170,10 +350,12 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Test
             var helper = CreateHelper(ctx);
 
             // Act
-            await helper.RenderComponentAsync<RedirectComponent>(new
-            {
-                RedirectUri = "http://localhost/redirect"
-            });
+            await helper.RenderComponentAsync<RedirectComponent>(
+                RenderMode.Static,
+                new
+                {
+                    RedirectUri = "http://localhost/redirect"
+                });
 
             // Assert
             Assert.Equal(302, ctx.Response.StatusCode);
@@ -230,7 +412,7 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Test
 </table>";
 
             // Act
-            var result = await helper.RenderComponentAsync<AsyncComponent>();
+            var result = await helper.RenderComponentAsync<AsyncComponent>(RenderMode.Static);
             result.WriteTo(writer, HtmlEncoder.Default);
             var content = writer.ToString();
 
@@ -242,6 +424,8 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Test
         {
             var services = new ServiceCollection();
             services.AddSingleton(HtmlEncoder.Default);
+            services.AddSingleton<ServerComponentSerializer>();
+            services.AddSingleton(_dataprotectorProvider);
             services.AddSingleton<IJSRuntime, UnsupportedJavaScriptRuntime>();
             services.AddSingleton<NavigationManager, HttpNavigationManager>();
             services.AddSingleton<StaticComponentRenderer>();
diff --git a/src/Mvc/Mvc.sln b/src/Mvc/Mvc.sln
index 930dd5e685..e848546fbb 100644
--- a/src/Mvc/Mvc.sln
+++ b/src/Mvc/Mvc.sln
@@ -81,12 +81,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mvc.Api.Analyzers.Test", "M
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Api.Analyzers", "Mvc.Api.Analyzers\src\Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj", "{3B550487-10E4-4E6D-9CEF-B1B4CA1253DA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-getdocument", "dotnet-getdocument\src\dotnet-getdocument.csproj", "{4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GetDocumentInsider", "GetDocumentInsider\src\GetDocumentInsider.csproj", "{2F683CF8-B055-46AE-BF83-9D1307F8D45F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.ApiDescription.Client", "Extensions.ApiDescription.Client\src\Microsoft.Extensions.ApiDescription.Client.csproj", "{34E3C302-B767-40C8-B538-3EE2BD4000C4}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_dependencies", "_dependencies", "{5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Html.Abstractions", "..\Html\Abstractions\src\Microsoft.AspNetCore.Html.Abstractions.csproj", "{0930C2EA-FA36-4EDF-A571-215765D1F2C7}"
@@ -275,8 +269,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc.Analyzers", "Mvc.Analyz
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc.Api.Analyzers", "Mvc.Api.Analyzers", "{49887FD5-2E52-4567-929E-9151DC88E4D4}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions.ApiDescription.Client", "Extensions.ApiDescription.Client", "{62CF82C1-B75D-4041-A7E9-EF39FF7B885F}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Core.TestCommon", "shared\Mvc.Core.TestCommon\Microsoft.AspNetCore.Mvc.Core.TestCommon.csproj", "{2906BF70-82BE-4427-870A-E87281D01008}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc.NewtonsoftJson", "Mvc.NewtonsoftJson", "{25C08DED-1C7D-4C6D-B1CC-F340C1B21DE7}"
@@ -315,10 +307,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorBuildWebSite.Precompil
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SignalR.Protocols.Json", "..\SignalR\common\Protocols.Json\src\Microsoft.AspNetCore.SignalR.Protocols.Json.csproj", "{637119E8-5BBB-4FC7-A372-DAF38FF5EBD9}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions.ApiDescription.Server", "Extensions.ApiDescription.Server", "{C15AA245-9E54-4FD6-90FF-B46F47779C46}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.ApiDescription.Server", "Extensions.ApiDescription.Server\src\Microsoft.Extensions.ApiDescription.Server.csproj", "{D7CF2A1E-A29E-45AB-9C2A-CD6C3BAE54F2}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Metadata", "..\Http\Metadata\src\Microsoft.AspNetCore.Metadata.csproj", "{464195B3-022A-4D19-9104-8C66CC882D67}"
 EndProject
 Global
@@ -649,42 +637,6 @@ Global
 		{3B550487-10E4-4E6D-9CEF-B1B4CA1253DA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3B550487-10E4-4E6D-9CEF-B1B4CA1253DA}.Release|x86.ActiveCfg = Release|Any CPU
 		{3B550487-10E4-4E6D-9CEF-B1B4CA1253DA}.Release|x86.Build.0 = Release|Any CPU
-		{4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Debug|x86.Build.0 = Debug|Any CPU
-		{4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Release|x86.ActiveCfg = Release|Any CPU
-		{4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Release|x86.Build.0 = Release|Any CPU
-		{2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Debug|x86.Build.0 = Debug|Any CPU
-		{2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Release|x86.ActiveCfg = Release|Any CPU
-		{2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Release|x86.Build.0 = Release|Any CPU
-		{34E3C302-B767-40C8-B538-3EE2BD4000C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{34E3C302-B767-40C8-B538-3EE2BD4000C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{34E3C302-B767-40C8-B538-3EE2BD4000C4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{34E3C302-B767-40C8-B538-3EE2BD4000C4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{34E3C302-B767-40C8-B538-3EE2BD4000C4}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{34E3C302-B767-40C8-B538-3EE2BD4000C4}.Debug|x86.Build.0 = Debug|Any CPU
-		{34E3C302-B767-40C8-B538-3EE2BD4000C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{34E3C302-B767-40C8-B538-3EE2BD4000C4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{34E3C302-B767-40C8-B538-3EE2BD4000C4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{34E3C302-B767-40C8-B538-3EE2BD4000C4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{34E3C302-B767-40C8-B538-3EE2BD4000C4}.Release|x86.ActiveCfg = Release|Any CPU
-		{34E3C302-B767-40C8-B538-3EE2BD4000C4}.Release|x86.Build.0 = Release|Any CPU
 		{0930C2EA-FA36-4EDF-A571-215765D1F2C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0930C2EA-FA36-4EDF-A571-215765D1F2C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0930C2EA-FA36-4EDF-A571-215765D1F2C7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -1789,30 +1741,6 @@ Global
 		{A8C3066F-E80D-4E03-9962-741B551B8FBC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A8C3066F-E80D-4E03-9962-741B551B8FBC}.Release|x86.ActiveCfg = Release|Any CPU
 		{A8C3066F-E80D-4E03-9962-741B551B8FBC}.Release|x86.Build.0 = Release|Any CPU
-		{6D6489E5-48BD-4F9B-9EEE-22AEEA1E1890}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6D6489E5-48BD-4F9B-9EEE-22AEEA1E1890}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6D6489E5-48BD-4F9B-9EEE-22AEEA1E1890}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6D6489E5-48BD-4F9B-9EEE-22AEEA1E1890}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6D6489E5-48BD-4F9B-9EEE-22AEEA1E1890}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6D6489E5-48BD-4F9B-9EEE-22AEEA1E1890}.Debug|x86.Build.0 = Debug|Any CPU
-		{6D6489E5-48BD-4F9B-9EEE-22AEEA1E1890}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6D6489E5-48BD-4F9B-9EEE-22AEEA1E1890}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6D6489E5-48BD-4F9B-9EEE-22AEEA1E1890}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{6D6489E5-48BD-4F9B-9EEE-22AEEA1E1890}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{6D6489E5-48BD-4F9B-9EEE-22AEEA1E1890}.Release|x86.ActiveCfg = Release|Any CPU
-		{6D6489E5-48BD-4F9B-9EEE-22AEEA1E1890}.Release|x86.Build.0 = Release|Any CPU
-		{C6F3BCE6-1EFD-4360-932B-B98573E78926}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C6F3BCE6-1EFD-4360-932B-B98573E78926}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C6F3BCE6-1EFD-4360-932B-B98573E78926}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C6F3BCE6-1EFD-4360-932B-B98573E78926}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C6F3BCE6-1EFD-4360-932B-B98573E78926}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C6F3BCE6-1EFD-4360-932B-B98573E78926}.Debug|x86.Build.0 = Debug|Any CPU
-		{C6F3BCE6-1EFD-4360-932B-B98573E78926}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C6F3BCE6-1EFD-4360-932B-B98573E78926}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C6F3BCE6-1EFD-4360-932B-B98573E78926}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{C6F3BCE6-1EFD-4360-932B-B98573E78926}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{C6F3BCE6-1EFD-4360-932B-B98573E78926}.Release|x86.ActiveCfg = Release|Any CPU
-		{C6F3BCE6-1EFD-4360-932B-B98573E78926}.Release|x86.Build.0 = Release|Any CPU
 		{637119E8-5BBB-4FC7-A372-DAF38FF5EBD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{637119E8-5BBB-4FC7-A372-DAF38FF5EBD9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{637119E8-5BBB-4FC7-A372-DAF38FF5EBD9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -1825,18 +1753,6 @@ Global
 		{637119E8-5BBB-4FC7-A372-DAF38FF5EBD9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{637119E8-5BBB-4FC7-A372-DAF38FF5EBD9}.Release|x86.ActiveCfg = Release|Any CPU
 		{637119E8-5BBB-4FC7-A372-DAF38FF5EBD9}.Release|x86.Build.0 = Release|Any CPU
-		{D7CF2A1E-A29E-45AB-9C2A-CD6C3BAE54F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D7CF2A1E-A29E-45AB-9C2A-CD6C3BAE54F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D7CF2A1E-A29E-45AB-9C2A-CD6C3BAE54F2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D7CF2A1E-A29E-45AB-9C2A-CD6C3BAE54F2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D7CF2A1E-A29E-45AB-9C2A-CD6C3BAE54F2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D7CF2A1E-A29E-45AB-9C2A-CD6C3BAE54F2}.Debug|x86.Build.0 = Debug|Any CPU
-		{D7CF2A1E-A29E-45AB-9C2A-CD6C3BAE54F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D7CF2A1E-A29E-45AB-9C2A-CD6C3BAE54F2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D7CF2A1E-A29E-45AB-9C2A-CD6C3BAE54F2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{D7CF2A1E-A29E-45AB-9C2A-CD6C3BAE54F2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{D7CF2A1E-A29E-45AB-9C2A-CD6C3BAE54F2}.Release|x86.ActiveCfg = Release|Any CPU
-		{D7CF2A1E-A29E-45AB-9C2A-CD6C3BAE54F2}.Release|x86.Build.0 = Release|Any CPU
 		{464195B3-022A-4D19-9104-8C66CC882D67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{464195B3-022A-4D19-9104-8C66CC882D67}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{464195B3-022A-4D19-9104-8C66CC882D67}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -1883,7 +1799,6 @@ Global
 		{51E3E785-A9D1-4196-BAFE-A17FF4304B89} = {75A3249D-E8DB-42F1-9B4E-1DCC662856A0}
 		{DD7B9F20-354C-4D9E-8C8A-8AE6E7595A87} = {49887FD5-2E52-4567-929E-9151DC88E4D4}
 		{3B550487-10E4-4E6D-9CEF-B1B4CA1253DA} = {49887FD5-2E52-4567-929E-9151DC88E4D4}
-		{34E3C302-B767-40C8-B538-3EE2BD4000C4} = {62CF82C1-B75D-4041-A7E9-EF39FF7B885F}
 		{0930C2EA-FA36-4EDF-A571-215765D1F2C7} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
 		{A273BAAB-DA92-401D-B781-ADA9E3B7717C} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
 		{E07B7D3A-1D4D-4644-84C2-06FEDB64885B} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
@@ -1976,10 +1891,7 @@ Global
 		{F85D8F0C-2300-4021-B5C4-A245D94FF419} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
 		{F99CAC82-C96E-41F4-AA28-1BBBD09C447A} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
 		{A8C3066F-E80D-4E03-9962-741B551B8FBC} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
-		{6D6489E5-48BD-4F9B-9EEE-22AEEA1E1890} = {45CE788D-4B69-4F83-981C-F43D8F15B0F1}
-		{C6F3BCE6-1EFD-4360-932B-B98573E78926} = {45CE788D-4B69-4F83-981C-F43D8F15B0F1}
 		{637119E8-5BBB-4FC7-A372-DAF38FF5EBD9} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
-		{D7CF2A1E-A29E-45AB-9C2A-CD6C3BAE54F2} = {C15AA245-9E54-4FD6-90FF-B46F47779C46}
 		{464195B3-022A-4D19-9104-8C66CC882D67} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/Mvc/MvcNoDeps.slnf b/src/Mvc/MvcNoDeps.slnf
index 893051ba9c..81504646da 100644
--- a/src/Mvc/MvcNoDeps.slnf
+++ b/src/Mvc/MvcNoDeps.slnf
@@ -2,70 +2,70 @@
   "solution": {
     "path": "Mvc.sln",
     "projects": [
-       "test\\WebSites\\BasicWebSite\\BasicWebSite.csproj",
-       "test\\WebSites\\RoutingWebSite\\Mvc.RoutingWebSite.csproj",
-       "test\\WebSites\\RazorWebSite\\RazorWebSite.csproj",
-       "test\\WebSites\\FormatterWebSite\\FormatterWebSite.csproj",
-       "test\\WebSites\\ApiExplorerWebSite\\ApiExplorerWebSite.csproj",
-       "test\\WebSites\\VersioningWebSite\\VersioningWebSite.csproj",
-       "test\\WebSites\\TagHelpersWebSite\\TagHelpersWebSite.csproj",
-       "test\\WebSites\\FilesWebSite\\FilesWebSite.csproj",
-       "test\\WebSites\\ApplicationModelWebSite\\ApplicationModelWebSite.csproj",
-       "test\\WebSites\\HtmlGenerationWebSite\\HtmlGenerationWebSite.csproj",
-       "test\\WebSites\\ErrorPageMiddlewareWebSite\\ErrorPageMiddlewareWebSite.csproj",
-       "test\\WebSites\\XmlFormattersWebSite\\XmlFormattersWebSite.csproj",
-       "test\\WebSites\\ControllersFromServicesWebSite\\ControllersFromServicesWebSite.csproj",
-       "test\\WebSites\\ControllersFromServicesClassLibrary\\ControllersFromServicesClassLibrary.csproj",
-       "test\\WebSites\\CorsWebSite\\CorsWebSite.csproj",
-       "samples\\MvcSandbox\\MvcSandbox.csproj",
-       "test\\WebSites\\SimpleWebSite\\SimpleWebSite.csproj",
-       "test\\WebSites\\SecurityWebSite\\SecurityWebSite.csproj",
-       "test\\WebSites\\RazorPagesWebSite\\RazorPagesWebSite.csproj",
-       "benchmarks\\Microsoft.AspNetCore.Mvc.Performance\\Microsoft.AspNetCore.Mvc.Performance.csproj",
-       "test\\WebSites\\RazorBuildWebSite\\RazorBuildWebSite.csproj",
-       "test\\WebSites\\RazorBuildWebSite.Views\\RazorBuildWebSite.Views.csproj",
-       "Mvc.Analyzers\\src\\Microsoft.AspNetCore.Mvc.Analyzers.csproj",
-       "Mvc.Analyzers\\test\\Mvc.Analyzers.Test.csproj",
-       "test\\WebSites\\RazorPagesClassLibrary\\RazorPagesClassLibrary.csproj",
-       "shared\\Mvc.Views.TestCommon\\Microsoft.AspNetCore.Mvc.Views.TestCommon.csproj",
-       "Mvc.Api.Analyzers\\test\\Mvc.Api.Analyzers.Test.csproj",
-       "Mvc.Api.Analyzers\\src\\Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj",
-       "test\\WebSites\\GenericHostWebSite\\GenericHostWebSite.csproj",
-       "Mvc\\src\\Microsoft.AspNetCore.Mvc.csproj",
-       "Mvc\\test\\Microsoft.AspNetCore.Mvc.Test.csproj",
-       "Mvc.Abstractions\\src\\Microsoft.AspNetCore.Mvc.Abstractions.csproj",
-       "Mvc.Abstractions\\test\\Microsoft.AspNetCore.Mvc.Abstractions.Test.csproj",
-       "Mvc.ApiExplorer\\src\\Microsoft.AspNetCore.Mvc.ApiExplorer.csproj",
-       "Mvc.ApiExplorer\\test\\Microsoft.AspNetCore.Mvc.ApiExplorer.Test.csproj",
-       "Mvc.Core\\src\\Microsoft.AspNetCore.Mvc.Core.csproj",
-       "Mvc.Core\\test\\Microsoft.AspNetCore.Mvc.Core.Test.csproj",
-       "Mvc.Cors\\src\\Microsoft.AspNetCore.Mvc.Cors.csproj",
-       "Mvc.Cors\\test\\Microsoft.AspNetCore.Mvc.Cors.Test.csproj",
-       "Mvc.DataAnnotations\\src\\Microsoft.AspNetCore.Mvc.DataAnnotations.csproj",
-       "Mvc.DataAnnotations\\test\\Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj",
-       "Mvc.Formatters.Json\\src\\Microsoft.AspNetCore.Mvc.Formatters.Json.csproj",
-       "Mvc.Formatters.Xml\\src\\Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj",
-       "Mvc.Formatters.Xml\\test\\Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.csproj",
-       "Mvc.Localization\\src\\Microsoft.AspNetCore.Mvc.Localization.csproj",
-       "Mvc.Localization\\test\\Microsoft.AspNetCore.Mvc.Localization.Test.csproj",
-       "Mvc.Razor\\src\\Microsoft.AspNetCore.Mvc.Razor.csproj",
-       "Mvc.Razor\\test\\Microsoft.AspNetCore.Mvc.Razor.Test.csproj",
-       "Mvc.RazorPages\\src\\Microsoft.AspNetCore.Mvc.RazorPages.csproj",
-       "Mvc.RazorPages\\test\\Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj",
-       "Mvc.TagHelpers\\src\\Microsoft.AspNetCore.Mvc.TagHelpers.csproj",
-       "Mvc.TagHelpers\\test\\Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj",
-       "Mvc.ViewFeatures\\src\\Microsoft.AspNetCore.Mvc.ViewFeatures.csproj",
-       "Mvc.ViewFeatures\\test\\Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj",
-       "test\\Mvc.FunctionalTests\\Microsoft.AspNetCore.Mvc.FunctionalTests.csproj",
-       "test\\Mvc.IntegrationTests\\Microsoft.AspNetCore.Mvc.IntegrationTests.csproj",
-       "shared\\Mvc.TestDiagnosticListener\\Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj",
-       "Mvc.Testing\\src\\Microsoft.AspNetCore.Mvc.Testing.csproj",
-       "shared\\Mvc.Core.TestCommon\\Microsoft.AspNetCore.Mvc.Core.TestCommon.csproj",
-       "Mvc.NewtonsoftJson\\src\\Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj",
-       "Mvc.NewtonsoftJson\\test\\Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test.csproj",
-       "Mvc.Razor.RuntimeCompilation\\src\\Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj",
-       "Mvc.Razor.RuntimeCompilation\\test\\Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test.csproj",
-       "test\\WebSites\\RazorBuildWebSite.PrecompiledViews\\RazorBuildWebSite.PrecompiledViews.csproj"
+      "Mvc.Abstractions\\src\\Microsoft.AspNetCore.Mvc.Abstractions.csproj",
+      "Mvc.Abstractions\\test\\Microsoft.AspNetCore.Mvc.Abstractions.Test.csproj",
+      "Mvc.Analyzers\\src\\Microsoft.AspNetCore.Mvc.Analyzers.csproj",
+      "Mvc.Analyzers\\test\\Mvc.Analyzers.Test.csproj",
+      "Mvc.Api.Analyzers\\src\\Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj",
+      "Mvc.Api.Analyzers\\test\\Mvc.Api.Analyzers.Test.csproj",
+      "Mvc.ApiExplorer\\src\\Microsoft.AspNetCore.Mvc.ApiExplorer.csproj",
+      "Mvc.ApiExplorer\\test\\Microsoft.AspNetCore.Mvc.ApiExplorer.Test.csproj",
+      "Mvc.Core\\src\\Microsoft.AspNetCore.Mvc.Core.csproj",
+      "Mvc.Core\\test\\Microsoft.AspNetCore.Mvc.Core.Test.csproj",
+      "Mvc.Cors\\src\\Microsoft.AspNetCore.Mvc.Cors.csproj",
+      "Mvc.Cors\\test\\Microsoft.AspNetCore.Mvc.Cors.Test.csproj",
+      "Mvc.DataAnnotations\\src\\Microsoft.AspNetCore.Mvc.DataAnnotations.csproj",
+      "Mvc.DataAnnotations\\test\\Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj",
+      "Mvc.Formatters.Json\\src\\Microsoft.AspNetCore.Mvc.Formatters.Json.csproj",
+      "Mvc.Formatters.Xml\\src\\Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj",
+      "Mvc.Formatters.Xml\\test\\Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.csproj",
+      "Mvc.Localization\\src\\Microsoft.AspNetCore.Mvc.Localization.csproj",
+      "Mvc.Localization\\test\\Microsoft.AspNetCore.Mvc.Localization.Test.csproj",
+      "Mvc.NewtonsoftJson\\src\\Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj",
+      "Mvc.NewtonsoftJson\\test\\Microsoft.AspNetCore.Mvc.NewtonsoftJson.Test.csproj",
+      "Mvc.Razor.RuntimeCompilation\\src\\Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj",
+      "Mvc.Razor.RuntimeCompilation\\test\\Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test.csproj",
+      "Mvc.RazorPages\\src\\Microsoft.AspNetCore.Mvc.RazorPages.csproj",
+      "Mvc.RazorPages\\test\\Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj",
+      "Mvc.Razor\\src\\Microsoft.AspNetCore.Mvc.Razor.csproj",
+      "Mvc.Razor\\test\\Microsoft.AspNetCore.Mvc.Razor.Test.csproj",
+      "Mvc.TagHelpers\\src\\Microsoft.AspNetCore.Mvc.TagHelpers.csproj",
+      "Mvc.TagHelpers\\test\\Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj",
+      "Mvc.Testing\\src\\Microsoft.AspNetCore.Mvc.Testing.csproj",
+      "Mvc.ViewFeatures\\src\\Microsoft.AspNetCore.Mvc.ViewFeatures.csproj",
+      "Mvc.ViewFeatures\\test\\Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj",
+      "Mvc\\src\\Microsoft.AspNetCore.Mvc.csproj",
+      "Mvc\\test\\Microsoft.AspNetCore.Mvc.Test.csproj",
+      "benchmarks\\Microsoft.AspNetCore.Mvc.Performance\\Microsoft.AspNetCore.Mvc.Performance.csproj",
+      "samples\\MvcSandbox\\MvcSandbox.csproj",
+      "shared\\Mvc.Core.TestCommon\\Microsoft.AspNetCore.Mvc.Core.TestCommon.csproj",
+      "shared\\Mvc.TestDiagnosticListener\\Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj",
+      "shared\\Mvc.Views.TestCommon\\Microsoft.AspNetCore.Mvc.Views.TestCommon.csproj",
+      "test\\Mvc.FunctionalTests\\Microsoft.AspNetCore.Mvc.FunctionalTests.csproj",
+      "test\\Mvc.IntegrationTests\\Microsoft.AspNetCore.Mvc.IntegrationTests.csproj",
+      "test\\WebSites\\ApiExplorerWebSite\\ApiExplorerWebSite.csproj",
+      "test\\WebSites\\ApplicationModelWebSite\\ApplicationModelWebSite.csproj",
+      "test\\WebSites\\BasicWebSite\\BasicWebSite.csproj",
+      "test\\WebSites\\ControllersFromServicesClassLibrary\\ControllersFromServicesClassLibrary.csproj",
+      "test\\WebSites\\ControllersFromServicesWebSite\\ControllersFromServicesWebSite.csproj",
+      "test\\WebSites\\CorsWebSite\\CorsWebSite.csproj",
+      "test\\WebSites\\ErrorPageMiddlewareWebSite\\ErrorPageMiddlewareWebSite.csproj",
+      "test\\WebSites\\FilesWebSite\\FilesWebSite.csproj",
+      "test\\WebSites\\FormatterWebSite\\FormatterWebSite.csproj",
+      "test\\WebSites\\GenericHostWebSite\\GenericHostWebSite.csproj",
+      "test\\WebSites\\HtmlGenerationWebSite\\HtmlGenerationWebSite.csproj",
+      "test\\WebSites\\RazorBuildWebSite.PrecompiledViews\\RazorBuildWebSite.PrecompiledViews.csproj",
+      "test\\WebSites\\RazorBuildWebSite.Views\\RazorBuildWebSite.Views.csproj",
+      "test\\WebSites\\RazorBuildWebSite\\RazorBuildWebSite.csproj",
+      "test\\WebSites\\RazorPagesClassLibrary\\RazorPagesClassLibrary.csproj",
+      "test\\WebSites\\RazorPagesWebSite\\RazorPagesWebSite.csproj",
+      "test\\WebSites\\RazorWebSite\\RazorWebSite.csproj",
+      "test\\WebSites\\RoutingWebSite\\Mvc.RoutingWebSite.csproj",
+      "test\\WebSites\\SecurityWebSite\\SecurityWebSite.csproj",
+      "test\\WebSites\\SimpleWebSite\\SimpleWebSite.csproj",
+      "test\\WebSites\\TagHelpersWebSite\\TagHelpersWebSite.csproj",
+      "test\\WebSites\\VersioningWebSite\\VersioningWebSite.csproj",
+      "test\\WebSites\\XmlFormattersWebSite\\XmlFormattersWebSite.csproj"
     ]
   }
-}
+}
\ No newline at end of file
diff --git a/src/Mvc/dotnet-getdocument/src/Exe.cs b/src/Mvc/dotnet-getdocument/src/Exe.cs
deleted file mode 100644
index 68df26cc31..0000000000
--- a/src/Mvc/dotnet-getdocument/src/Exe.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Text;
-
-namespace Microsoft.Extensions.ApiDescription.Tool
-{
-    internal static class Exe
-    {
-        public static int Run(
-            string executable,
-            IReadOnlyList<string> args,
-            string workingDirectory = null,
-            bool interceptOutput = false)
-        {
-            var arguments = ToArguments(args);
-
-            Reporter.WriteVerbose(executable + " " + arguments);
-
-            var startInfo = new ProcessStartInfo
-            {
-                FileName = executable,
-                Arguments = arguments,
-                UseShellExecute = false,
-                RedirectStandardOutput = interceptOutput
-            };
-            if (workingDirectory != null)
-            {
-                startInfo.WorkingDirectory = workingDirectory;
-            }
-
-            using (var process = Process.Start(startInfo))
-            {
-                if (interceptOutput)
-                {
-                    string line;
-                    while ((line = process.StandardOutput.ReadLine()) != null)
-                    {
-                        Reporter.WriteVerbose(line);
-                    }
-                }
-
-                // Follow precedent set in Razor integration tests and ensure process events and output are complete.
-                // https://github.com/aspnet/Razor/blob/d719920fdcc7d1db3a6f74cd5404d66fa098f057/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/MSBuildProcessManager.cs#L91-L102
-                // Timeout is double how long the inside man waits for the IDocumentProcessor to wrap up.
-                if (!process.WaitForExit((int)(TimeSpan.FromMinutes(2).TotalMilliseconds)))
-                {
-                    process.Kill();
-
-                    // Should be unreachable in almost every case.
-                    throw new TimeoutException($"Process {executable} timed out after 2 minutes.");
-                }
-
-                process.WaitForExit();
-
-                return process.ExitCode;
-            }
-        }
-
-        private static string ToArguments(IReadOnlyList<string> args)
-        {
-            var builder = new StringBuilder();
-            for (var i = 0; i < args.Count; i++)
-            {
-                if (i != 0)
-                {
-                    builder.Append(" ");
-                }
-
-                if (args[i].IndexOf(' ') == -1)
-                {
-                    builder.Append(args[i]);
-
-                    continue;
-                }
-
-                builder.Append("\"");
-
-                var pendingBackslashes = 0;
-                for (var j = 0; j < args[i].Length; j++)
-                {
-                    switch (args[i][j])
-                    {
-                        case '\"':
-                            if (pendingBackslashes != 0)
-                            {
-                                builder.Append('\\', pendingBackslashes * 2);
-                                pendingBackslashes = 0;
-                            }
-                            builder.Append("\\\"");
-                            break;
-
-                        case '\\':
-                            pendingBackslashes++;
-                            break;
-
-                        default:
-                            if (pendingBackslashes != 0)
-                            {
-                                if (pendingBackslashes == 1)
-                                {
-                                    builder.Append("\\");
-                                }
-                                else
-                                {
-                                    builder.Append('\\', pendingBackslashes * 2);
-                                }
-
-                                pendingBackslashes = 0;
-                            }
-
-                            builder.Append(args[i][j]);
-                            break;
-                    }
-                }
-
-                if (pendingBackslashes != 0)
-                {
-                    builder.Append('\\', pendingBackslashes * 2);
-                }
-
-                builder.Append("\"");
-            }
-
-            return builder.ToString();
-        }
-    }
-}
diff --git a/src/Mvc/dotnet-getdocument/src/Program.cs b/src/Mvc/dotnet-getdocument/src/Program.cs
deleted file mode 100644
index cef1648689..0000000000
--- a/src/Mvc/dotnet-getdocument/src/Program.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.DotNet.Cli.CommandLine;
-using Microsoft.Extensions.ApiDescription.Tool.Commands;
-
-namespace Microsoft.Extensions.ApiDescription.Tool
-{
-    internal static class Program
-    {
-        private static int Main(string[] args)
-        {
-            var app = new CommandLineApplication(throwOnUnexpectedArg: false)
-            {
-                FullName = Resources.CommandFullName,
-                Name = Resources.CommandFullName,
-            };
-
-            new InvokeCommand().Configure(app);
-
-            try
-            {
-                return app.Execute(args);
-            }
-            catch (Exception ex)
-            {
-                if (ex is CommandException || ex is CommandParsingException)
-                {
-                    Reporter.WriteVerbose(ex.ToString());
-                }
-                else
-                {
-                    Reporter.WriteInformation(ex.ToString());
-                }
-
-                Reporter.WriteError(ex.Message);
-
-                return 1;
-            }
-        }
-    }
-}
diff --git a/src/Mvc/samples/MvcSandbox/Components/_Imports.razor b/src/Mvc/samples/MvcSandbox/Components/_Imports.razor
new file mode 100644
index 0000000000..2b9557ce5a
--- /dev/null
+++ b/src/Mvc/samples/MvcSandbox/Components/_Imports.razor
@@ -0,0 +1 @@
+@using Microsoft.AspNetCore.Components.Web
\ No newline at end of file
diff --git a/src/Mvc/samples/MvcSandbox/Pages/Components.cshtml b/src/Mvc/samples/MvcSandbox/Pages/Components.cshtml
index a0bde342d6..cdafd22f68 100644
--- a/src/Mvc/samples/MvcSandbox/Pages/Components.cshtml
+++ b/src/Mvc/samples/MvcSandbox/Pages/Components.cshtml
@@ -15,7 +15,7 @@
     <link href="css/site.css" rel="stylesheet" />
 </head>
 <body>
-    <app>@(await Html.RenderComponentAsync<MvcSandbox.Components.App>())</app>
+    <app>@(await Html.RenderComponentAsync<MvcSandbox.Components.App>(RenderMode.Static))</app>
 
     <script src="_framework/components.server.js"></script>
 </body>
diff --git a/src/Mvc/samples/MvcSandbox/Startup.cs b/src/Mvc/samples/MvcSandbox/Startup.cs
index b9e84b62b3..778e19d8db 100644
--- a/src/Mvc/samples/MvcSandbox/Startup.cs
+++ b/src/Mvc/samples/MvcSandbox/Startup.cs
@@ -69,7 +69,7 @@ namespace MvcSandbox
 
                 builder.MapControllers();
                 builder.MapRazorPages();
-                builder.MapBlazorHub<MvcSandbox.Components.App>("app");
+                builder.MapBlazorHub();
                 builder.MapFallbackToPage("/Components");
             });
         }
diff --git a/src/Mvc/test/Mvc.FunctionalTests/ApiExplorerTest.cs b/src/Mvc/test/Mvc.FunctionalTests/ApiExplorerTest.cs
index 93c89ecd54..01ad31343f 100644
--- a/src/Mvc/test/Mvc.FunctionalTests/ApiExplorerTest.cs
+++ b/src/Mvc/test/Mvc.FunctionalTests/ApiExplorerTest.cs
@@ -11,7 +11,7 @@ using System.Threading.Tasks;
 using ApiExplorerWebSite;
 using Microsoft.AspNetCore.Mvc.Formatters;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Newtonsoft.Json;
 using Xunit;
 
diff --git a/src/Mvc/test/Mvc.FunctionalTests/ConsumesAttributeTestsBase.cs b/src/Mvc/test/Mvc.FunctionalTests/ConsumesAttributeTestsBase.cs
index 9836ff8dff..902e43df33 100644
--- a/src/Mvc/test/Mvc.FunctionalTests/ConsumesAttributeTestsBase.cs
+++ b/src/Mvc/test/Mvc.FunctionalTests/ConsumesAttributeTestsBase.cs
@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 using BasicWebSite.Models;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc.Infrastructure;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Newtonsoft.Json;
 using Xunit;
 
diff --git a/src/Mvc/test/Mvc.FunctionalTests/ContentNegotiationTest.cs b/src/Mvc/test/Mvc.FunctionalTests/ContentNegotiationTest.cs
index 6e516407c1..0bd4638c22 100644
--- a/src/Mvc/test/Mvc.FunctionalTests/ContentNegotiationTest.cs
+++ b/src/Mvc/test/Mvc.FunctionalTests/ContentNegotiationTest.cs
@@ -10,7 +10,7 @@ using System.Text;
 using System.Threading.Tasks;
 using BasicWebSite.Models;
 using Microsoft.AspNetCore.Mvc.Formatters.Xml;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Newtonsoft.Json;
 using Xunit;
 
diff --git a/src/Mvc/test/Mvc.FunctionalTests/DoNotRespectBrowserAcceptHeaderTests.cs b/src/Mvc/test/Mvc.FunctionalTests/DoNotRespectBrowserAcceptHeaderTests.cs
index b446613c26..fb682a5e08 100644
--- a/src/Mvc/test/Mvc.FunctionalTests/DoNotRespectBrowserAcceptHeaderTests.cs
+++ b/src/Mvc/test/Mvc.FunctionalTests/DoNotRespectBrowserAcceptHeaderTests.cs
@@ -6,7 +6,7 @@ using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.Formatters.Xml;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Mvc.FunctionalTests
diff --git a/src/Mvc/test/Mvc.FunctionalTests/FileResultTests.cs b/src/Mvc/test/Mvc.FunctionalTests/FileResultTests.cs
index 35a57dbbe5..059c4875bd 100644
--- a/src/Mvc/test/Mvc.FunctionalTests/FileResultTests.cs
+++ b/src/Mvc/test/Mvc.FunctionalTests/FileResultTests.cs
@@ -5,7 +5,7 @@ using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Mvc.FunctionalTests
diff --git a/src/Mvc/test/Mvc.FunctionalTests/FlushPointTest.cs b/src/Mvc/test/Mvc.FunctionalTests/FlushPointTest.cs
index 7ae51e5b8a..a83adcd54a 100644
--- a/src/Mvc/test/Mvc.FunctionalTests/FlushPointTest.cs
+++ b/src/Mvc/test/Mvc.FunctionalTests/FlushPointTest.cs
@@ -4,7 +4,6 @@
 using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Mvc.FunctionalTests
diff --git a/src/Mvc/test/Mvc.FunctionalTests/InputFormatterTests.cs b/src/Mvc/test/Mvc.FunctionalTests/InputFormatterTests.cs
index 48b1f1aaa5..699c1010f1 100644
--- a/src/Mvc/test/Mvc.FunctionalTests/InputFormatterTests.cs
+++ b/src/Mvc/test/Mvc.FunctionalTests/InputFormatterTests.cs
@@ -6,7 +6,7 @@ using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
 using FormatterWebSite.Models;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Xunit;
diff --git a/src/Mvc/test/Mvc.FunctionalTests/InputObjectValidationTests.cs b/src/Mvc/test/Mvc.FunctionalTests/InputObjectValidationTests.cs
index 97290f7278..5db204c8be 100644
--- a/src/Mvc/test/Mvc.FunctionalTests/InputObjectValidationTests.cs
+++ b/src/Mvc/test/Mvc.FunctionalTests/InputObjectValidationTests.cs
@@ -10,7 +10,7 @@ using System.Threading.Tasks;
 using FormatterWebSite;
 using FormatterWebSite.Models;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Newtonsoft.Json;
 using Xunit;
 
diff --git a/src/Mvc/test/Mvc.FunctionalTests/TempDataInCookiesUsingCookieConsentTest.cs b/src/Mvc/test/Mvc.FunctionalTests/TempDataInCookiesUsingCookieConsentTest.cs
index 988773214f..8b9a5759bf 100644
--- a/src/Mvc/test/Mvc.FunctionalTests/TempDataInCookiesUsingCookieConsentTest.cs
+++ b/src/Mvc/test/Mvc.FunctionalTests/TempDataInCookiesUsingCookieConsentTest.cs
@@ -9,7 +9,6 @@ using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Net.Http.Headers;
 using Xunit;
 
diff --git a/src/Mvc/test/Mvc.FunctionalTests/XmlDataContractSerializerFormattersWrappingTest.cs b/src/Mvc/test/Mvc.FunctionalTests/XmlDataContractSerializerFormattersWrappingTest.cs
index 8c60b18e82..b971302842 100644
--- a/src/Mvc/test/Mvc.FunctionalTests/XmlDataContractSerializerFormattersWrappingTest.cs
+++ b/src/Mvc/test/Mvc.FunctionalTests/XmlDataContractSerializerFormattersWrappingTest.cs
@@ -11,7 +11,7 @@ using System.Xml.Linq;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc.Formatters.Xml;
 using Microsoft.AspNetCore.Mvc.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using XmlFormattersWebSite;
 using Xunit;
 
@@ -272,7 +272,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
                 await response.AssertStatusCodeAsync(HttpStatusCode.BadRequest);
                 var content = await response.Content.ReadAsStringAsync();
                 var root = XDocument.Parse(content).Root;
-                
+
                 Assert.Equal("400", root.Element(root.Name.Namespace.GetName("status"))?.Value);
                 Assert.Equal("One or more validation errors occurred.", root.Element(root.Name.Namespace.GetName("title"))?.Value);
                 var mvcErrors = root.Element(root.Name.Namespace.GetName("MVC-Errors"));
diff --git a/src/Mvc/test/Mvc.FunctionalTests/XmlOutputFormatterTests.cs b/src/Mvc/test/Mvc.FunctionalTests/XmlOutputFormatterTests.cs
index f453e84741..5935ab7d0a 100644
--- a/src/Mvc/test/Mvc.FunctionalTests/XmlOutputFormatterTests.cs
+++ b/src/Mvc/test/Mvc.FunctionalTests/XmlOutputFormatterTests.cs
@@ -6,7 +6,7 @@ using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.Formatters.Xml;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Mvc.FunctionalTests
diff --git a/src/Mvc/test/Mvc.FunctionalTests/XmlSerializerInputFormatterTests.cs b/src/Mvc/test/Mvc.FunctionalTests/XmlSerializerInputFormatterTests.cs
index 2f9cb57cba..826905b790 100644
--- a/src/Mvc/test/Mvc.FunctionalTests/XmlSerializerInputFormatterTests.cs
+++ b/src/Mvc/test/Mvc.FunctionalTests/XmlSerializerInputFormatterTests.cs
@@ -5,7 +5,7 @@ using System.Net;
 using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Mvc.FunctionalTests
diff --git a/src/Mvc/test/Mvc.IntegrationTests/CollectionModelBinderIntegrationTest.cs b/src/Mvc/test/Mvc.IntegrationTests/CollectionModelBinderIntegrationTest.cs
index ebe8c73ce9..34a0e4fca8 100644
--- a/src/Mvc/test/Mvc.IntegrationTests/CollectionModelBinderIntegrationTest.cs
+++ b/src/Mvc/test/Mvc.IntegrationTests/CollectionModelBinderIntegrationTest.cs
@@ -1126,6 +1126,105 @@ namespace Microsoft.AspNetCore.Mvc.IntegrationTests
             Assert.Equal(expectedMessage, exception.Message);
         }
 
+        [Fact]
+        public async Task CollectionModelBinder_CollectionOfSimpleTypes_DoesNotResultInValidationError()
+        {
+            // Regression test for https://github.com/aspnet/AspNetCore/issues/13512
+            // Arrange
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Collection<string>),
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request =>
+                {
+                    request.QueryString = new QueryString("?[0]=hello&[1]=");
+                });
+
+            var modelState = testContext.ModelState;
+            var metadata = testContext.MetadataProvider.GetMetadataForType(parameter.ParameterType);
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder(testContext);
+
+            // Act
+            var result = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelState.IsValid);
+            Assert.Equal(0, modelState.ErrorCount);
+
+            Assert.True(result.IsModelSet);
+            var model = Assert.IsType<Collection<string>>(result.Model);
+            Assert.Collection(
+                model,
+                item => Assert.Equal("hello", item),
+                item => Assert.Null(item));
+
+            Assert.Collection(
+                modelState,
+                kvp =>
+                {
+                    Assert.Equal("[0]", kvp.Key);
+                    Assert.Equal(ModelValidationState.Valid, kvp.Value.ValidationState);
+                },
+                kvp =>
+                {
+                    Assert.Equal("[1]", kvp.Key);
+                    Assert.Equal(ModelValidationState.Valid, kvp.Value.ValidationState);
+                });
+        }
+
+        [Fact]
+        public async Task CollectionModelBinder_CollectionOfNonNullableTypes_AppliesImplicitRequired()
+        {
+            // Arrange
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Collection<string>),
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(
+                request =>
+                {
+                    request.QueryString = new QueryString("?[0]=hello&[1]=");
+                });
+
+            var modelState = testContext.ModelState;
+            var metadata = testContext.MetadataProvider.GetMetadataForType(parameter.ParameterType);
+            var valueProvider = await CompositeValueProvider.CreateAsync(testContext);
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder(testContext);
+
+            // Act
+            var result = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelState.IsValid);
+            Assert.Equal(0, modelState.ErrorCount);
+
+            Assert.True(result.IsModelSet);
+            var model = Assert.IsType<Collection<string>>(result.Model);
+            Assert.Collection(
+                model,
+                item => Assert.Equal("hello", item),
+                item => Assert.Null(item));
+
+            Assert.Collection(
+                modelState,
+                kvp =>
+                {
+                    Assert.Equal("[0]", kvp.Key);
+                    Assert.Equal(ModelValidationState.Valid, kvp.Value.ValidationState);
+                },
+                kvp =>
+                {
+                    Assert.Equal("[1]", kvp.Key);
+                    Assert.Equal(ModelValidationState.Valid, kvp.Value.ValidationState);
+                });
+        }
+
         private class ClosedGenericCollection : Collection<string>
         {
         }
diff --git a/src/Mvc/test/Mvc.IntegrationTests/DictionaryModelBinderIntegrationTest.cs b/src/Mvc/test/Mvc.IntegrationTests/DictionaryModelBinderIntegrationTest.cs
index e48a33586f..5bdcafa6c5 100644
--- a/src/Mvc/test/Mvc.IntegrationTests/DictionaryModelBinderIntegrationTest.cs
+++ b/src/Mvc/test/Mvc.IntegrationTests/DictionaryModelBinderIntegrationTest.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.Abstractions;
@@ -1162,6 +1163,211 @@ namespace Microsoft.AspNetCore.Mvc.IntegrationTests
             Assert.Equal(expectedMessage, exception.Message);
         }
 
+        [Fact]
+        public async Task DictionaryModelBinder_DictionaryOfSimpleType_NullValue_DoesNotResultInRequiredValidation()
+        {
+            // Regression test for https://github.com/aspnet/AspNetCore/issues/13512
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Dictionary<string, string>)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?parameter[key0]=");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Dictionary<string, string>>(modelBindingResult.Model);
+            Assert.Collection(
+                model.OrderBy(kvp => kvp.Key),
+                kvp =>
+                {
+                    Assert.Equal("key0", kvp.Key);
+                    Assert.Null(kvp.Value);
+                });
+
+            Assert.Collection(
+                modelState.OrderBy(kvp => kvp.Key),
+                kvp =>
+                {
+                    Assert.Equal("parameter[key0]", kvp.Key);
+                    Assert.Equal(ModelValidationState.Valid, kvp.Value.ValidationState);
+                });
+            Assert.Equal(0, modelState.ErrorCount);
+            Assert.True(modelState.IsValid);
+        }
+
+#nullable enable
+        public class NonNullPerson
+        {
+            public int Age { get; set; }
+
+            // This should be implicitly required
+            public string Name { get; set; } = default!;
+        }
+#nullable restore
+
+        [Fact]
+        public async Task DictionaryModelBinder_ValuesIsNonNullableType_AppliesImplicitRequired()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Dictionary<string, NonNullPerson>)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?parameter[key0].Age=&parameter[key0].Name=name0&parameter[key1].Age=27&parameter[key1].Name=");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Dictionary<string, NonNullPerson>>(modelBindingResult.Model);
+            Assert.Collection(
+                model.OrderBy(kvp => kvp.Key),
+                kvp =>
+                {
+                    Assert.Equal("key0", kvp.Key);
+                    var person = kvp.Value;
+                    Assert.Equal(0, person.Age);
+                    Assert.Equal("name0", person.Name);
+                },
+                kvp =>
+                {
+                    Assert.Equal("key1", kvp.Key);
+                    var person = kvp.Value;
+                    Assert.Equal(27, person.Age);
+                    Assert.Null(person.Name);
+                });
+
+            Assert.Collection(
+                modelState.OrderBy(kvp => kvp.Key),
+                kvp =>
+                {
+                    Assert.Equal("parameter[key0].Age", kvp.Key);
+                    Assert.Equal(ModelValidationState.Invalid, kvp.Value.ValidationState);
+                    Assert.Equal("The value '' is invalid.", Assert.Single(kvp.Value.Errors).ErrorMessage);
+                },
+                kvp =>
+                {
+                    Assert.Equal("parameter[key0].Name", kvp.Key);
+                    Assert.Equal(ModelValidationState.Valid, kvp.Value.ValidationState);
+                },
+                kvp =>
+                {
+                    Assert.Equal("parameter[key1].Age", kvp.Key);
+                    Assert.Equal(ModelValidationState.Valid, kvp.Value.ValidationState);
+                },
+                kvp =>
+                {
+                    Assert.Equal("parameter[key1].Name", kvp.Key);
+                    Assert.Equal(ModelValidationState.Invalid, kvp.Value.ValidationState);
+                    Assert.Equal("The Name field is required.", Assert.Single(kvp.Value.Errors).ErrorMessage);
+                });
+            Assert.Equal(2, modelState.ErrorCount);
+            Assert.False(modelState.IsValid);
+        }
+
+#nullable enable
+        public class NonNullPersonWithRequiredProperties
+        {
+            public int Age { get; set; }
+
+            [Required]
+            public string? Name { get; set; }
+        }
+#nullable restore
+
+        [Fact]
+        public async Task DictionaryModelBinder_ValuesNullableTypeWithRequiredAttributes_AppliesValidation()
+        {
+            // Arrange
+            var parameterBinder = ModelBindingTestHelper.GetParameterBinder();
+            var parameter = new ParameterDescriptor()
+            {
+                Name = "parameter",
+                ParameterType = typeof(Dictionary<string, NonNullPersonWithRequiredProperties>)
+            };
+
+            var testContext = ModelBindingTestHelper.GetTestContext(request =>
+            {
+                request.QueryString = new QueryString("?parameter[key0].Age=&parameter[key0].Name=name0&parameter[key1].Age=27&parameter[key1].Name=");
+            });
+
+            var modelState = testContext.ModelState;
+
+            // Act
+            var modelBindingResult = await parameterBinder.BindModelAsync(parameter, testContext);
+
+            // Assert
+            Assert.True(modelBindingResult.IsModelSet);
+
+            var model = Assert.IsType<Dictionary<string, NonNullPersonWithRequiredProperties>>(modelBindingResult.Model);
+            Assert.Collection(
+                model.OrderBy(kvp => kvp.Key),
+                kvp =>
+                {
+                    Assert.Equal("key0", kvp.Key);
+                    var person = kvp.Value;
+                    Assert.Equal(0, person.Age);
+                    Assert.Equal("name0", person.Name);
+                },
+                kvp =>
+                {
+                    Assert.Equal("key1", kvp.Key);
+                    var person = kvp.Value;
+                    Assert.Equal(27, person.Age);
+                    Assert.Null(person.Name);
+                });
+
+            Assert.Collection(
+                modelState.OrderBy(kvp => kvp.Key),
+                kvp =>
+                {
+                    Assert.Equal("parameter[key0].Age", kvp.Key);
+                    Assert.Equal(ModelValidationState.Invalid, kvp.Value.ValidationState);
+                    Assert.Equal("The value '' is invalid.", Assert.Single(kvp.Value.Errors).ErrorMessage);
+                },
+                kvp =>
+                {
+                    Assert.Equal("parameter[key0].Name", kvp.Key);
+                    Assert.Equal(ModelValidationState.Valid, kvp.Value.ValidationState);
+                },
+                kvp =>
+                {
+                    Assert.Equal("parameter[key1].Age", kvp.Key);
+                    Assert.Equal(ModelValidationState.Valid, kvp.Value.ValidationState);
+                },
+                kvp =>
+                {
+                    Assert.Equal("parameter[key1].Name", kvp.Key);
+                    Assert.Equal(ModelValidationState.Invalid, kvp.Value.ValidationState);
+                    Assert.Equal("The Name field is required.", Assert.Single(kvp.Value.Errors).ErrorMessage);
+                });
+            Assert.Equal(2, modelState.ErrorCount);
+            Assert.False(modelState.IsValid);
+        }
+
         private class ClosedGenericDictionary : Dictionary<string, string>
         {
         }
diff --git a/src/Mvc/test/WebSites/BasicWebSite/BasicWebSite.csproj b/src/Mvc/test/WebSites/BasicWebSite/BasicWebSite.csproj
index 2d1f5ee528..f8ef3662b2 100644
--- a/src/Mvc/test/WebSites/BasicWebSite/BasicWebSite.csproj
+++ b/src/Mvc/test/WebSites/BasicWebSite/BasicWebSite.csproj
@@ -15,6 +15,7 @@
     <Reference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" />
 
     <Reference Include="Microsoft.AspNetCore.Authentication" />
+    <Reference Include="Microsoft.AspNetCore.Components.Web" />
     <Reference Include="Microsoft.AspNetCore.Localization.Routing" />
     <Reference Include="Microsoft.AspNetCore.Server.IISIntegration" />
     <Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
diff --git a/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/_Imports.razor b/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/_Imports.razor
new file mode 100644
index 0000000000..2b9557ce5a
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/_Imports.razor
@@ -0,0 +1 @@
+@using Microsoft.AspNetCore.Components.Web
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/RazorComponents/Index.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/RazorComponents/Index.cshtml
index eb6313927b..5a0cc0d839 100644
--- a/src/Mvc/test/WebSites/BasicWebSite/Views/RazorComponents/Index.cshtml
+++ b/src/Mvc/test/WebSites/BasicWebSite/Views/RazorComponents/Index.cshtml
@@ -1,8 +1,8 @@
 @using BasicWebSite.RazorComponents;
 
 <h1>Razor components</h1>
-<div id="Greetings">@(await Html.RenderComponentAsync<Greetings>())</div>
+<div id="Greetings">@(await Html.RenderComponentAsync<Greetings>(RenderMode.Static))</div>
 
-<div id="FetchData">@(await Html.RenderComponentAsync<FetchData>(new { StartDate = new DateTime(2019, 01, 15) }))</div>
+<div id="FetchData">@(await Html.RenderComponentAsync<FetchData>(RenderMode.Static, new { StartDate = new DateTime(2019, 01, 15) }))</div>
 
-<div id="Routing">@(await Html.RenderComponentAsync<RouterContainer>())</div>
\ No newline at end of file
+<div id="Routing">@(await Html.RenderComponentAsync<RouterContainer>(RenderMode.Static))</div>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/RazorComponents/Navigation.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/RazorComponents/Navigation.cshtml
index f86d702054..422dc2d2b2 100644
--- a/src/Mvc/test/WebSites/BasicWebSite/Views/RazorComponents/Navigation.cshtml
+++ b/src/Mvc/test/WebSites/BasicWebSite/Views/RazorComponents/Navigation.cshtml
@@ -1,3 +1,3 @@
 @using BasicWebSite.RazorComponents;
 <h1>Navigation components</h1>
-<div id="Navigation">@(await Html.RenderComponentAsync<NavigationComponent>())</div>
\ No newline at end of file
+<div id="Navigation">@(await Html.RenderComponentAsync<NavigationComponent>(RenderMode.Static))</div>
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/App.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/App.razor
index 4280307834..d6d7170bf2 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/App.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/App.razor
@@ -1,14 +1,22 @@
 <Router AppAssembly="@typeof(Program).Assembly">
     <Found Context="routeData">
-@*#if (OrganizationalAuth || IndividualAuth)
+@*#if (!NoAuth)
         <AuthorizeRouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
 #else
         <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
 #endif*@
     </Found>
     <NotFound>
+@*#if (!NoAuth)
+        <CascadingAuthenticationState>
+            <LayoutView Layout="@typeof(MainLayout)">
+                <p>Sorry, there's nothing at this address.</p>
+            </LayoutView>
+        </CascadingAuthenticationState>
+#else
         <LayoutView Layout="@typeof(MainLayout)">
             <p>Sorry, there's nothing at this address.</p>
         </LayoutView>
+#endif*@
     </NotFound>
 </Router>
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/_Host.cshtml b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/_Host.cshtml
index 98f2f5a5b0..0f2f4649a6 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/_Host.cshtml
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/_Host.cshtml
@@ -14,8 +14,7 @@
 </head>
 <body>
     <app>
-        @* Remove the following line of code to disable prerendering *@
-        @(await Html.RenderComponentAsync<App>())
+        @(await Html.RenderComponentAsync<App>(RenderMode.ServerPrerendered))
     </app>
 
     <script src="_framework/blazor.server.js"></script>
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Startup.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Startup.cs
index d081a6df8f..9996e5e40d 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Startup.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Startup.cs
@@ -170,7 +170,7 @@ namespace BlazorServerWeb_CSharp
 #if (OrganizationalAuth || IndividualAuth)
                 endpoints.MapControllers();
 #endif
-                endpoints.MapBlazorHub<App>(selector: "app");
+                endpoints.MapBlazorHub();
                 endpoints.MapFallbackToPage("/_Host");
             });
         }
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/_Imports.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/_Imports.razor
index 4830194af8..4fe5a889de 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/_Imports.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/_Imports.razor
@@ -3,6 +3,7 @@
 @using Microsoft.AspNetCore.Components.Authorization
 @using Microsoft.AspNetCore.Components.Forms
 @using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
 @using Microsoft.JSInterop
 @using BlazorServerWeb_CSharp
 @using BlazorServerWeb_CSharp.Shared
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/template.json
index 27dad15b4c..d99bc528b9 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/template.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/template.json
@@ -31,6 +31,7 @@
         {
           "condition": "(SupportPagesAndViews)",
           "exclude": [
+            "_Imports.razor",
             "Component1.razor",
             "ExampleJsInterop.cs",
             "wwwroot/**"
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/Component1.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/Component1.razor
index 3c16c3c6d2..00fd7fa0b7 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/Component1.razor
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/Component1.razor
@@ -1,3 +1,3 @@
 <div class="my-component">
-    This Blazor component is defined in the <strong>RazorClassLibrary-CSharp</strong> package.
+    This Blazor component is defined in the <strong>Company.RazorClassLibrary1</strong> package.
 </div>
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/ExampleJsInterop.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/ExampleJsInterop.cs
index 81bea2832e..4e5efbbcdf 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/ExampleJsInterop.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/ExampleJsInterop.cs
@@ -1,11 +1,11 @@
 using Microsoft.JSInterop;
 using System.Threading.Tasks;
 
-namespace RazorClassLibrary_CSharp
+namespace Company.RazorClassLibrary1
 {
     public class ExampleJsInterop
     {
-        public static Task<string> Prompt(IJSRuntime jsRuntime, string message)
+        public static ValueTask<string> Prompt(IJSRuntime jsRuntime, string message)
         {
             // Implemented in exampleJsInterop.js
             return jsRuntime.InvokeAsync<string>(
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/_Imports.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/_Imports.razor
new file mode 100644
index 0000000000..77285129da
--- /dev/null
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/_Imports.razor
@@ -0,0 +1 @@
+@using Microsoft.AspNetCore.Components.Web
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_Layout.cshtml b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_Layout.cshtml
index 03faa34a5d..ccc07b30f6 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_Layout.cshtml
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_Layout.cshtml
@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>@ViewData["Title"] - Company.WebApplication1</title>
-    <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" />
+    <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
     <link rel="stylesheet" href="~/css/site.css" />
 </head>
 <body>
@@ -46,8 +46,8 @@
         </div>
     </footer>
 
-    <script src="~/lib/jquery/dist/jquery.js"></script>
-    <script src="~/lib/bootstrap/dist/js/bootstrap.bundle.js"></script>
+    <script src="~/lib/jquery/dist/jquery.min.js"></script>
+    <script src="~/lib/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
     <script src="~/js/site.js" asp-append-version="true"></script>
 
     @RenderSection("Scripts", required: false)
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_ValidationScriptsPartial.cshtml b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_ValidationScriptsPartial.cshtml
index 21638b6044..5a16d80a9a 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_ValidationScriptsPartial.cshtml
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_ValidationScriptsPartial.cshtml
@@ -1,2 +1,2 @@
-<script src="~/lib/jquery-validation/dist/jquery.validate.js"></script>
-<script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js"></script>
+<script src="~/lib/jquery-validation/dist/jquery.validate.min.js"></script>
+<script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"></script>
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_Layout.cshtml b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_Layout.cshtml
index d8d08c1a35..892d6b9b5d 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_Layout.cshtml
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_Layout.cshtml
@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>@ViewData["Title"] - Company.WebApplication1</title>
-    <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" />
+    <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
     <link rel="stylesheet" href="~/css/site.css" />
 </head>
 <body>
@@ -45,8 +45,8 @@
             &copy; copyrightYear - Company.WebApplication1 - <a asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>
         </div>
     </footer>
-    <script src="~/lib/jquery/dist/jquery.js"></script>
-    <script src="~/lib/bootstrap/dist/js/bootstrap.bundle.js"></script>
+    <script src="~/lib/jquery/dist/jquery.min.js"></script>
+    <script src="~/lib/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
     <script src="~/js/site.js" asp-append-version="true"></script>
     @RenderSection("Scripts", required: false)
 </body>
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_ValidationScriptsPartial.cshtml b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_ValidationScriptsPartial.cshtml
index 754029c03a..5a16d80a9a 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_ValidationScriptsPartial.cshtml
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_ValidationScriptsPartial.cshtml
@@ -1,2 +1,2 @@
-<script src="~/lib/jquery-validation/dist/jquery.validate.js"></script>
-<script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js"></script>
\ No newline at end of file
+<script src="~/lib/jquery-validation/dist/jquery.validate.min.js"></script>
+<script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"></script>
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/Views/Shared/_Layout.cshtml b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/Views/Shared/_Layout.cshtml
index e4a016e02e..6dbe6964a7 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/Views/Shared/_Layout.cshtml
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/Views/Shared/_Layout.cshtml
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>@ViewData["Title"] - Company.WebApplication1</title>
 
-    <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" />
+    <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
     <link rel="stylesheet" href="~/css/site.css" />
 </head>
 <body>
@@ -42,8 +42,8 @@
         </div>
     </footer>
 
-    <script src="~/lib/jquery/dist/jquery.js"></script>
-    <script src="~/lib/bootstrap/dist/js/bootstrap.bundle.js"></script>
+    <script src="~/lib/jquery/dist/jquery.min.js"></script>
+    <script src="~/lib/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
 
     <script src="~/js/site.js" asp-append-version="true"></script>
 
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/Views/Shared/_ValidationScriptsPartial.cshtml b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/Views/Shared/_ValidationScriptsPartial.cshtml
index bc03630978..010de00023 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/Views/Shared/_ValidationScriptsPartial.cshtml
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/Views/Shared/_ValidationScriptsPartial.cshtml
@@ -1,3 +1,3 @@
-<script src="~/lib/jquery-validation/dist/jquery.validate.js"></script>
-<script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js"></script>
+<script src="~/lib/jquery-validation/dist/jquery.validate.min.js"></script>
+<script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"></script>
 
diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in b/src/ProjectTemplates/Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in
index d674e304cd..621db9e5b6 100644
--- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in
+++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in
@@ -61,6 +61,7 @@
       <ResolvedFileToPublish Include="@(DistFiles->'%(FullPath)')" Exclude="@(ResolvedFileToPublish)">
         <RelativePath>%(DistFiles.Identity)</RelativePath>
         <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+        <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
       </ResolvedFileToPublish>
     </ItemGroup>
   </Target>
diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/React-CSharp.csproj.in b/src/ProjectTemplates/Web.Spa.ProjectTemplates/React-CSharp.csproj.in
index 087f141b11..69925a032f 100644
--- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/React-CSharp.csproj.in
+++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/React-CSharp.csproj.in
@@ -56,6 +56,7 @@
       <ResolvedFileToPublish Include="@(DistFiles->'%(FullPath)')" Exclude="@(ResolvedFileToPublish)">
         <RelativePath>%(DistFiles.Identity)</RelativePath>
         <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+        <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
       </ResolvedFileToPublish>
     </ItemGroup>
   </Target>
diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in b/src/ProjectTemplates/Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in
index 9ccab92e8b..0d361bd2e4 100644
--- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in
+++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in
@@ -45,6 +45,7 @@
       <ResolvedFileToPublish Include="@(DistFiles->'%(FullPath)')" Exclude="@(ResolvedFileToPublish)">
         <RelativePath>%(DistFiles.Identity)</RelativePath>
         <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+        <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
       </ResolvedFileToPublish>
     </ItemGroup>
   </Target>
diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/api-authorization/authorize.service.ts b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/api-authorization/authorize.service.ts
index ce9e28bfa3..cf6e33cfda 100644
--- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/api-authorization/authorize.service.ts
+++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/api-authorization/authorize.service.ts
@@ -121,6 +121,10 @@ export class AuthorizeService {
 
   public async signOut(state: any): Promise<IAuthenticationResult> {
     try {
+      if (this.popUpDisabled) {
+        throw new Error('Popup disabled. Change \'authorize.service.ts:AuthorizeService.popupDisabled\' to false to enable it.');
+      }
+
       await this.ensureUserManagerInitialized();
       await this.userManager.signoutPopup(this.createArguments());
       this.userSubject.next(null);
diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/ClientApp/src/components/api-authorization/AuthorizeService.js b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/ClientApp/src/components/api-authorization/AuthorizeService.js
index 8987f3fa83..87cfa82e86 100644
--- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/ClientApp/src/components/api-authorization/AuthorizeService.js
+++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/ClientApp/src/components/api-authorization/AuthorizeService.js
@@ -98,6 +98,10 @@ export class AuthorizeService {
     async signOut(state) {
         await this.ensureUserManagerInitialized();
         try {
+            if (this._popUpDisabled) {
+                throw new Error('Popup disabled. Change \'AuthorizeService.js:AuthorizeService._popupDisabled\' to false to enable it.')
+            }
+
             await this.userManager.signoutPopup(this.createArguments());
             this.updateState(undefined);
             return this.success(state);
diff --git a/src/ProjectTemplates/test/BlazorServerTemplateTest.cs b/src/ProjectTemplates/test/BlazorServerTemplateTest.cs
index be98fadc9c..a0b8f6cc60 100644
--- a/src/ProjectTemplates/test/BlazorServerTemplateTest.cs
+++ b/src/ProjectTemplates/test/BlazorServerTemplateTest.cs
@@ -6,7 +6,6 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.E2ETesting;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using OpenQA.Selenium;
 using Templates.Test.Helpers;
 using Xunit;
diff --git a/src/ProjectTemplates/test/MvcTemplateTest.cs b/src/ProjectTemplates/test/MvcTemplateTest.cs
index 7f5cfcdf5c..3384fc65e0 100644
--- a/src/ProjectTemplates/test/MvcTemplateTest.cs
+++ b/src/ProjectTemplates/test/MvcTemplateTest.cs
@@ -9,7 +9,6 @@ using System.Linq;
 using Xunit;
 using Xunit.Abstractions;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 
 namespace Templates.Test
 {
diff --git a/src/ProjectTemplates/test/RazorPagesTemplateTest.cs b/src/ProjectTemplates/test/RazorPagesTemplateTest.cs
index decd4998f3..d2e36aa31a 100644
--- a/src/ProjectTemplates/test/RazorPagesTemplateTest.cs
+++ b/src/ProjectTemplates/test/RazorPagesTemplateTest.cs
@@ -5,7 +5,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Templates.Test.Helpers;
 using Xunit;
 using Xunit.Abstractions;
diff --git a/src/ProjectTemplates/test/SpaTemplateTest/AngularTemplateTest.cs b/src/ProjectTemplates/test/SpaTemplateTest/AngularTemplateTest.cs
index 340a0d5fb9..e1d5db1338 100644
--- a/src/ProjectTemplates/test/SpaTemplateTest/AngularTemplateTest.cs
+++ b/src/ProjectTemplates/test/SpaTemplateTest/AngularTemplateTest.cs
@@ -4,7 +4,6 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.E2ETesting;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Templates.Test.Helpers;
 using Xunit;
 using Xunit.Abstractions;
diff --git a/src/ProjectTemplates/test/SpaTemplateTest/ReactTemplateTest.cs b/src/ProjectTemplates/test/SpaTemplateTest/ReactTemplateTest.cs
index 54670b04b5..469e87acd5 100644
--- a/src/ProjectTemplates/test/SpaTemplateTest/ReactTemplateTest.cs
+++ b/src/ProjectTemplates/test/SpaTemplateTest/ReactTemplateTest.cs
@@ -4,7 +4,6 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.E2ETesting;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Templates.Test.Helpers;
 using Xunit;
 using Xunit.Abstractions;
diff --git a/src/ProjectTemplates/test/SpaTemplateTest/SpaTemplateTestBase.cs b/src/ProjectTemplates/test/SpaTemplateTest/SpaTemplateTestBase.cs
index 74a67f1d2c..e2e2013329 100644
--- a/src/ProjectTemplates/test/SpaTemplateTest/SpaTemplateTestBase.cs
+++ b/src/ProjectTemplates/test/SpaTemplateTest/SpaTemplateTestBase.cs
@@ -6,7 +6,6 @@ using System.IO;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
-using System.Runtime.InteropServices;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.E2ETesting;
@@ -96,6 +95,11 @@ namespace Templates.Test.SpaTemplateTest
                 }
             }
 
+            if (template == "react" || template == "reactredux")
+            {
+                await CleanupReactClientAppBuildFolder(clientAppSubdirPath);
+            }
+
             using (var aspNetProcess = Project.StartBuiltProjectAsync())
             {
                 Assert.False(
@@ -144,6 +148,35 @@ namespace Templates.Test.SpaTemplateTest
             }
         }
 
+        private async Task CleanupReactClientAppBuildFolder(string clientAppSubdirPath)
+        {
+            ProcessEx testResult = null;
+            int? testResultExitCode = null;
+            for (int i = 0; i < 3; i++)
+            {
+                try
+                {
+                    testResult = await ProcessEx.RunViaShellAsync(Output, clientAppSubdirPath, "npx rimraf ./build");
+                    testResultExitCode = testResult.ExitCode;
+                    if (testResultExitCode == 0)
+                    {
+                        return;
+                    }
+                }
+                catch
+                {
+                }
+                finally
+                {
+                    testResult.Dispose();
+                }
+
+                await Task.Delay(3000);
+            }
+
+            Assert.True(testResultExitCode == 0, ErrorMessages.GetFailedProcessMessage("npx rimraf ./build", Project, testResult));
+        }
+
         private void ValidatePackageJson(string clientAppSubdirPath)
         {
             Assert.True(File.Exists(Path.Combine(clientAppSubdirPath, "package.json")), "Missing a package.json");
diff --git a/src/ProjectTemplates/test/template-baselines.json b/src/ProjectTemplates/test/template-baselines.json
index 48b625bc37..d934d8b545 100644
--- a/src/ProjectTemplates/test/template-baselines.json
+++ b/src/ProjectTemplates/test/template-baselines.json
@@ -878,6 +878,7 @@
         "wwwroot/background.png",
         "wwwroot/exampleJsInterop.js",
         "wwwroot/styles.css",
+        "_Imports.razor",
         "Component1.razor",
         "ExampleJsInterop.cs"
       ]
diff --git a/src/Security/Authentication/Negotiate/test/Negotiate.FunctionalTest/CrossMachineTests.cs b/src/Security/Authentication/Negotiate/test/Negotiate.FunctionalTest/CrossMachineTests.cs
index 0bfed42c03..4d2a9e63d9 100644
--- a/src/Security/Authentication/Negotiate/test/Negotiate.FunctionalTest/CrossMachineTests.cs
+++ b/src/Security/Authentication/Negotiate/test/Negotiate.FunctionalTest/CrossMachineTests.cs
@@ -7,7 +7,7 @@ using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http.Extensions;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Authentication.Negotiate
diff --git a/src/Security/Authentication/Negotiate/test/Negotiate.FunctionalTest/NegotiateHandlerFunctionalTests.cs b/src/Security/Authentication/Negotiate/test/Negotiate.FunctionalTest/NegotiateHandlerFunctionalTests.cs
index 9d881cee38..5d6ddad1c4 100644
--- a/src/Security/Authentication/Negotiate/test/Negotiate.FunctionalTest/NegotiateHandlerFunctionalTests.cs
+++ b/src/Security/Authentication/Negotiate/test/Negotiate.FunctionalTest/NegotiateHandlerFunctionalTests.cs
@@ -13,7 +13,7 @@ using Microsoft.AspNetCore.Hosting.Server;
 using Microsoft.AspNetCore.Hosting.Server.Features;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Routing;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Net.Http.Headers;
@@ -253,7 +253,7 @@ namespace Microsoft.AspNetCore.Authentication.Negotiate
                         app.UseRouting();
                         app.UseAuthentication();
                         app.UseEndpoints(ConfigureEndpoints);
-                    });                
+                    });
                 });
 
             return builder.StartAsync();
diff --git a/src/Security/Authentication/test/CertificateTests.cs b/src/Security/Authentication/test/CertificateTests.cs
index a5a2d0294d..fc4d189a1f 100644
--- a/src/Security/Authentication/test/CertificateTests.cs
+++ b/src/Security/Authentication/test/CertificateTests.cs
@@ -13,7 +13,7 @@ using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.TestHost;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.DependencyInjection;
 using Xunit;
 
diff --git a/src/Security/Authentication/test/CookieTests.cs b/src/Security/Authentication/test/CookieTests.cs
index 7e66070b48..439c2cccc4 100644
--- a/src/Security/Authentication/test/CookieTests.cs
+++ b/src/Security/Authentication/test/CookieTests.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.TestHost;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Xunit;
@@ -1452,7 +1452,7 @@ namespace Microsoft.AspNetCore.Authentication.Cookies
                         {
                             res.StatusCode = 200;
                         }
-                        else if (req.Path == new PathString("/forbid")) // Simulate forbidden 
+                        else if (req.Path == new PathString("/forbid")) // Simulate forbidden
                         {
                             await context.ForbidAsync(CookieAuthenticationDefaults.AuthenticationScheme);
                         }
diff --git a/src/Security/Authentication/test/SecureDataFormatTests.cs b/src/Security/Authentication/test/SecureDataFormatTests.cs
index a30da3b91b..f29439c883 100644
--- a/src/Security/Authentication/test/SecureDataFormatTests.cs
+++ b/src/Security/Authentication/test/SecureDataFormatTests.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Text;
 using Microsoft.AspNetCore.DataProtection;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.DependencyInjection;
 using Xunit;
 
diff --git a/src/Security/Authentication/test/TicketSerializerTests.cs b/src/Security/Authentication/test/TicketSerializerTests.cs
index a1e58743b6..ad2fdd3903 100644
--- a/src/Security/Authentication/test/TicketSerializerTests.cs
+++ b/src/Security/Authentication/test/TicketSerializerTests.cs
@@ -6,7 +6,7 @@ using System.IO;
 using System.Linq;
 using System.Security.Claims;
 using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Authentication
diff --git a/src/Servers/HttpSys/test/FunctionalTests/AuthenticationTests.cs b/src/Servers/HttpSys/test/FunctionalTests/AuthenticationTests.cs
index 4e8679b193..be66db9655 100644
--- a/src/Servers/HttpSys/test/FunctionalTests/AuthenticationTests.cs
+++ b/src/Servers/HttpSys/test/FunctionalTests/AuthenticationTests.cs
@@ -9,7 +9,6 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.HttpSys
diff --git a/src/Servers/HttpSys/test/FunctionalTests/HttpsTests.cs b/src/Servers/HttpSys/test/FunctionalTests/HttpsTests.cs
index 414414e0e4..09d6f2a084 100644
--- a/src/Servers/HttpSys/test/FunctionalTests/HttpsTests.cs
+++ b/src/Servers/HttpSys/test/FunctionalTests/HttpsTests.cs
@@ -13,7 +13,6 @@ using Microsoft.AspNetCore.Connections.Features;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.HttpSys
diff --git a/src/Servers/HttpSys/test/FunctionalTests/Listener/RequestBodyTests.cs b/src/Servers/HttpSys/test/FunctionalTests/Listener/RequestBodyTests.cs
index 8e438141ef..6a7d29d654 100644
--- a/src/Servers/HttpSys/test/FunctionalTests/Listener/RequestBodyTests.cs
+++ b/src/Servers/HttpSys/test/FunctionalTests/Listener/RequestBodyTests.cs
@@ -10,7 +10,6 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.HttpSys.Listener
diff --git a/src/Servers/HttpSys/test/FunctionalTests/Listener/RequestHeaderTests.cs b/src/Servers/HttpSys/test/FunctionalTests/Listener/RequestHeaderTests.cs
index 76a43ee8ba..60d0d98df6 100644
--- a/src/Servers/HttpSys/test/FunctionalTests/Listener/RequestHeaderTests.cs
+++ b/src/Servers/HttpSys/test/FunctionalTests/Listener/RequestHeaderTests.cs
@@ -7,7 +7,7 @@ using System.Net.Http;
 using System.Net.Sockets;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.Primitives;
 using Xunit;
 
diff --git a/src/Servers/HttpSys/test/FunctionalTests/Listener/RequestTests.cs b/src/Servers/HttpSys/test/FunctionalTests/Listener/RequestTests.cs
index 908b3f21c9..e70dc78173 100644
--- a/src/Servers/HttpSys/test/FunctionalTests/Listener/RequestTests.cs
+++ b/src/Servers/HttpSys/test/FunctionalTests/Listener/RequestTests.cs
@@ -7,7 +7,7 @@ using System.Net.Http;
 using System.Net.Sockets;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.Logging;
 using Xunit;
 
diff --git a/src/Servers/HttpSys/test/FunctionalTests/Listener/ResponseBodyTests.cs b/src/Servers/HttpSys/test/FunctionalTests/Listener/ResponseBodyTests.cs
index 068261ecc8..6f22a0e49a 100644
--- a/src/Servers/HttpSys/test/FunctionalTests/Listener/ResponseBodyTests.cs
+++ b/src/Servers/HttpSys/test/FunctionalTests/Listener/ResponseBodyTests.cs
@@ -10,7 +10,6 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.HttpSys.Listener
diff --git a/src/Servers/HttpSys/test/FunctionalTests/Listener/ResponseHeaderTests.cs b/src/Servers/HttpSys/test/FunctionalTests/Listener/ResponseHeaderTests.cs
index 0d1ced7bf2..fdbed28a78 100644
--- a/src/Servers/HttpSys/test/FunctionalTests/Listener/ResponseHeaderTests.cs
+++ b/src/Servers/HttpSys/test/FunctionalTests/Listener/ResponseHeaderTests.cs
@@ -8,7 +8,7 @@ using System.Net;
 using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.Primitives;
 using Xunit;
 
diff --git a/src/Servers/HttpSys/test/FunctionalTests/Listener/ServerTests.cs b/src/Servers/HttpSys/test/FunctionalTests/Listener/ServerTests.cs
index 0cdaeabd37..f00518a2db 100644
--- a/src/Servers/HttpSys/test/FunctionalTests/Listener/ServerTests.cs
+++ b/src/Servers/HttpSys/test/FunctionalTests/Listener/ServerTests.cs
@@ -10,7 +10,6 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.HttpSys.Listener
diff --git a/src/Servers/HttpSys/test/FunctionalTests/MessagePumpTests.cs b/src/Servers/HttpSys/test/FunctionalTests/MessagePumpTests.cs
index faddf29f71..f9b4d81209 100644
--- a/src/Servers/HttpSys/test/FunctionalTests/MessagePumpTests.cs
+++ b/src/Servers/HttpSys/test/FunctionalTests/MessagePumpTests.cs
@@ -6,7 +6,7 @@ using System.Threading;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Hosting.Server.Features;
 using Microsoft.AspNetCore.HttpSys.Internal;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Xunit;
diff --git a/src/Servers/HttpSys/test/FunctionalTests/OSDontSkipConditionAttribute.cs b/src/Servers/HttpSys/test/FunctionalTests/OSDontSkipConditionAttribute.cs
index c657240a3e..ee257df989 100644
--- a/src/Servers/HttpSys/test/FunctionalTests/OSDontSkipConditionAttribute.cs
+++ b/src/Servers/HttpSys/test/FunctionalTests/OSDontSkipConditionAttribute.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;
 
-namespace Microsoft.AspNetCore.Testing.xunit
+namespace Microsoft.AspNetCore.Testing
 {
     // Skip except on a specific OS and version
     [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class | AttributeTargets.Assembly, AllowMultiple = true)]
diff --git a/src/Servers/HttpSys/test/FunctionalTests/OpaqueUpgradeTests.cs b/src/Servers/HttpSys/test/FunctionalTests/OpaqueUpgradeTests.cs
index 24144bf04a..b722f3ab1f 100644
--- a/src/Servers/HttpSys/test/FunctionalTests/OpaqueUpgradeTests.cs
+++ b/src/Servers/HttpSys/test/FunctionalTests/OpaqueUpgradeTests.cs
@@ -11,7 +11,6 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.HttpSys
diff --git a/src/Servers/HttpSys/test/FunctionalTests/Properties/AssemblyInfo.cs b/src/Servers/HttpSys/test/FunctionalTests/Properties/AssemblyInfo.cs
index 0d585d3063..f8154a4df7 100644
--- a/src/Servers/HttpSys/test/FunctionalTests/Properties/AssemblyInfo.cs
+++ b/src/Servers/HttpSys/test/FunctionalTests/Properties/AssemblyInfo.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 [assembly: OSSkipCondition(OperatingSystems.MacOSX)]
diff --git a/src/Servers/HttpSys/test/FunctionalTests/RequestBodyLimitTests.cs b/src/Servers/HttpSys/test/FunctionalTests/RequestBodyLimitTests.cs
index bfeb4f42b9..fa4ae52632 100644
--- a/src/Servers/HttpSys/test/FunctionalTests/RequestBodyLimitTests.cs
+++ b/src/Servers/HttpSys/test/FunctionalTests/RequestBodyLimitTests.cs
@@ -8,7 +8,7 @@ using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http.Features;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.HttpSys
diff --git a/src/Servers/HttpSys/test/FunctionalTests/RequestBodyTests.cs b/src/Servers/HttpSys/test/FunctionalTests/RequestBodyTests.cs
index b7a18867d9..9c67acf6c6 100644
--- a/src/Servers/HttpSys/test/FunctionalTests/RequestBodyTests.cs
+++ b/src/Servers/HttpSys/test/FunctionalTests/RequestBodyTests.cs
@@ -10,7 +10,7 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http.Features;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.HttpSys
diff --git a/src/Servers/HttpSys/test/FunctionalTests/RequestHeaderTests.cs b/src/Servers/HttpSys/test/FunctionalTests/RequestHeaderTests.cs
index aa0829c6fa..4b84aea3e8 100644
--- a/src/Servers/HttpSys/test/FunctionalTests/RequestHeaderTests.cs
+++ b/src/Servers/HttpSys/test/FunctionalTests/RequestHeaderTests.cs
@@ -7,7 +7,7 @@ using System.Net.Http;
 using System.Net.Sockets;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.Primitives;
 using Xunit;
 
diff --git a/src/Servers/HttpSys/test/FunctionalTests/RequestTests.cs b/src/Servers/HttpSys/test/FunctionalTests/RequestTests.cs
index f987ffe8b1..4a62beb07e 100644
--- a/src/Servers/HttpSys/test/FunctionalTests/RequestTests.cs
+++ b/src/Servers/HttpSys/test/FunctionalTests/RequestTests.cs
@@ -14,7 +14,7 @@ using Microsoft.AspNetCore.Hosting.Server;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.HttpSys.Internal;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Xunit;
diff --git a/src/Servers/HttpSys/test/FunctionalTests/ResponseBodyTests.cs b/src/Servers/HttpSys/test/FunctionalTests/ResponseBodyTests.cs
index ddec412308..4a45a81a5d 100644
--- a/src/Servers/HttpSys/test/FunctionalTests/ResponseBodyTests.cs
+++ b/src/Servers/HttpSys/test/FunctionalTests/ResponseBodyTests.cs
@@ -12,7 +12,6 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.HttpSys
diff --git a/src/Servers/HttpSys/test/FunctionalTests/ResponseCachingTests.cs b/src/Servers/HttpSys/test/FunctionalTests/ResponseCachingTests.cs
index f5fe7592ed..bda37a76c5 100644
--- a/src/Servers/HttpSys/test/FunctionalTests/ResponseCachingTests.cs
+++ b/src/Servers/HttpSys/test/FunctionalTests/ResponseCachingTests.cs
@@ -10,7 +10,6 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.HttpSys.FunctionalTests
diff --git a/src/Servers/HttpSys/test/FunctionalTests/ResponseHeaderTests.cs b/src/Servers/HttpSys/test/FunctionalTests/ResponseHeaderTests.cs
index 66bb91a087..629b689a6d 100644
--- a/src/Servers/HttpSys/test/FunctionalTests/ResponseHeaderTests.cs
+++ b/src/Servers/HttpSys/test/FunctionalTests/ResponseHeaderTests.cs
@@ -9,7 +9,7 @@ using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http.Features;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.Primitives;
 using Xunit;
 
diff --git a/src/Servers/HttpSys/test/FunctionalTests/ResponseSendFileTests.cs b/src/Servers/HttpSys/test/FunctionalTests/ResponseSendFileTests.cs
index afe8a41063..1bda0ddee1 100644
--- a/src/Servers/HttpSys/test/FunctionalTests/ResponseSendFileTests.cs
+++ b/src/Servers/HttpSys/test/FunctionalTests/ResponseSendFileTests.cs
@@ -13,7 +13,6 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.HttpSys
@@ -55,7 +54,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys
                 Assert.True(await appThrew.Task.TimeoutAfter(TimeSpan.FromSeconds(10)));
             }
         }
-        
+
         [ConditionalFact]
         public async Task ResponseSendFile_NoHeaders_DefaultsToChunked()
         {
diff --git a/src/Servers/HttpSys/test/FunctionalTests/ResponseTests.cs b/src/Servers/HttpSys/test/FunctionalTests/ResponseTests.cs
index 455ac93377..be72995dd5 100644
--- a/src/Servers/HttpSys/test/FunctionalTests/ResponseTests.cs
+++ b/src/Servers/HttpSys/test/FunctionalTests/ResponseTests.cs
@@ -9,7 +9,6 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.HttpSys
diff --git a/src/Servers/HttpSys/test/FunctionalTests/ServerTests.cs b/src/Servers/HttpSys/test/FunctionalTests/ServerTests.cs
index b4ffb1ac22..bc096b7b20 100644
--- a/src/Servers/HttpSys/test/FunctionalTests/ServerTests.cs
+++ b/src/Servers/HttpSys/test/FunctionalTests/ServerTests.cs
@@ -12,7 +12,6 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.HttpSys
diff --git a/src/Servers/IIS/IIS/src/Core/IISHttpContext.FeatureCollection.cs b/src/Servers/IIS/IIS/src/Core/IISHttpContext.FeatureCollection.cs
index 3cac26f1c6..cab956dd0a 100644
--- a/src/Servers/IIS/IIS/src/Core/IISHttpContext.FeatureCollection.cs
+++ b/src/Servers/IIS/IIS/src/Core/IISHttpContext.FeatureCollection.cs
@@ -312,6 +312,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Core
                 throw new InvalidOperationException(CoreStrings.UpgradeCannotBeCalledMultipleTimes);
             }
 
+            MaxRequestBodySize = null;
             _wasUpgraded = true;
 
             StatusCode = StatusCodes.Status101SwitchingProtocols;
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/AppOfflineTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/AppOfflineTests.cs
index eb6f2a07cc..4bd29675ae 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/AppOfflineTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/AppOfflineTests.cs
@@ -11,7 +11,6 @@ using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
 using Microsoft.AspNetCore.Server.IIS.FunctionalTests;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Logging;
 using Xunit;
 using Microsoft.AspNetCore.Server.IntegrationTesting.IIS;
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/BasicAuthTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/BasicAuthTests.cs
index be08967f61..36520369a6 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/BasicAuthTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/BasicAuthTests.cs
@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.AspNetCore.Server.IntegrationTesting.IIS;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/ClientCertificateTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/ClientCertificateTests.cs
index 6f96b6590c..6d39a56921 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/ClientCertificateTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/ClientCertificateTests.cs
@@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Server.IIS.FunctionalTests;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.AspNetCore.Server.IntegrationTesting.Common;
 using Microsoft.AspNetCore.Server.IntegrationTesting.IIS;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.Logging;
 using Xunit;
 
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/ClientDisconnectStress.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/ClientDisconnectStress.cs
index 6d1f30e386..b72dda791e 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/ClientDisconnectStress.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/ClientDisconnectStress.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/CommonStartupTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/CommonStartupTests.cs
index a5415c1c00..38f4dae818 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/CommonStartupTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/CommonStartupTests.cs
@@ -5,7 +5,7 @@ using System.Net;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/CompressionTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/CompressionTests.cs
index 4727058341..3b45649159 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/CompressionTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/CompressionTests.cs
@@ -7,7 +7,7 @@ using System.Net.Http.Headers;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/ConfigurationChangeTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/ConfigurationChangeTests.cs
index e26445110b..386b749747 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/ConfigurationChangeTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/ConfigurationChangeTests.cs
@@ -11,7 +11,6 @@ using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.AspNetCore.Server.IntegrationTesting.IIS;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Logging;
 using Xunit;
 
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/HttpsTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/HttpsTests.cs
index dbe00a720f..8e3251570b 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/HttpsTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/HttpsTests.cs
@@ -11,7 +11,7 @@ using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.AspNetCore.Server.IntegrationTesting.Common;
 using Microsoft.AspNetCore.Server.IntegrationTesting.IIS;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs
index 409e403872..4026166b59 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ClientDisconnectTests.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.Logging;
 using Xunit;
 
@@ -76,7 +76,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess
             for (var j = 0; j < 20; j++)
             {
                 // Windows has a max connection limit of 10 for the IIS server,
-                // so setting limit fairly low. 
+                // so setting limit fairly low.
                 const int numRequests = 5;
                 async Task RunRequests()
                 {
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/CompressionTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/CompressionTests.cs
index e5ace9fb3c..7930228820 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/CompressionTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/CompressionTests.cs
@@ -7,7 +7,7 @@ using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs
index 2fb0c53a9a..7f8d003eb7 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/EnvironmentVariableTests.cs
@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ErrorPagesTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ErrorPagesTests.cs
index 474d662481..a1d540a8b3 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ErrorPagesTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ErrorPagesTests.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.AspNetCore.Server.IntegrationTesting.IIS;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/EventLogTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/EventLogTests.cs
index 461cc9a344..4ce5cef67b 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/EventLogTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/EventLogTests.cs
@@ -3,7 +3,7 @@
 
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/FeatureCollectionTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/FeatureCollectionTests.cs
index badbe2d5f0..e93716fab4 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/FeatureCollectionTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/FeatureCollectionTests.cs
@@ -3,7 +3,7 @@
 
 using System;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/FrebTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/FrebTests.cs
index 2e3d7f4aa8..2e2866e98e 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/FrebTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/FrebTests.cs
@@ -11,7 +11,6 @@ using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.AspNetCore.Server.IntegrationTesting.IIS;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Testing;
 using Xunit;
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/HelloWorldTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/HelloWorldTests.cs
index 42c4f2d076..8491794287 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/HelloWorldTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/HelloWorldTests.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/HostingEnvironmentTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/HostingEnvironmentTests.cs
index 3a5f1e81f5..75271153e0 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/HostingEnvironmentTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/HostingEnvironmentTests.cs
@@ -4,7 +4,7 @@
 using System;
 using System.IO;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/InvalidReadWriteOperationTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/InvalidReadWriteOperationTests.cs
index 270dff4d50..8c2487df2c 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/InvalidReadWriteOperationTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/InvalidReadWriteOperationTests.cs
@@ -3,7 +3,7 @@
 
 using System.Net.Http;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/LargeResponseBodyTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/LargeResponseBodyTests.cs
index ce0491fe6a..758200e657 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/LargeResponseBodyTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/LargeResponseBodyTests.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/LogPipeTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/LogPipeTests.cs
index cd322b4cfa..0b5b5a7333 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/LogPipeTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/LogPipeTests.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.AspNetCore.Server.IntegrationTesting.IIS;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/MaxRequestBodySizeTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/MaxRequestBodySizeTests.cs
index 8f5a80a569..ce112e28b2 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/MaxRequestBodySizeTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/MaxRequestBodySizeTests.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.AspNetCore.Server.IntegrationTesting.IIS;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess
@@ -49,7 +49,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess
 
             var result = await deploymentResult.HttpClient.PostAsync("/ReadRequestBody", new StringContent("test"));
 
-            // IIS returns a 404 instead of a 413... 
+            // IIS returns a 404 instead of a 413...
             Assert.Equal(HttpStatusCode.NotFound, result.StatusCode);
         }
 
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/RequestTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/RequestTests.cs
index 033efc37dc..e959baf4ef 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/RequestTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/RequestTests.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Net.Sockets;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess
@@ -50,6 +50,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess
         }
 
         [ConditionalTheory]
+        [RequiresNewHandler]
         [InlineData("/RequestPath/a/b/../c", "/a/c")]
         [InlineData("/RequestPath/a/b/./c", "/a/b/c")]
         public async Task Request_WithNavigation_Removed(string input, string expectedPath)
@@ -60,6 +61,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess
         }
 
         [ConditionalTheory]
+        [RequiresNewHandler]
         [InlineData("/RequestPath/a/b/%2E%2E/c", "/a/c")]
         [InlineData("/RequestPath/a/b/%2E/c", "/a/b/c")]
         public async Task Request_WithEscapedNavigation_Removed(string input, string expectedPath)
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ResponseBodyTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ResponseBodyTests.cs
index 55f1462404..d45024441e 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ResponseBodyTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ResponseBodyTests.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ResponseHeaderTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ResponseHeaderTests.cs
index 50675e5746..951d771108 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ResponseHeaderTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ResponseHeaderTests.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Net.Http.Headers;
 using Xunit;
 
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ResponseInvalidOrderingTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ResponseInvalidOrderingTests.cs
index 7a29f027bc..00091a59ad 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ResponseInvalidOrderingTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ResponseInvalidOrderingTests.cs
@@ -3,7 +3,7 @@
 
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ServerVariablesTest.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ServerVariablesTest.cs
index a7091b3094..a079a64933 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ServerVariablesTest.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ServerVariablesTest.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ShutdownTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ShutdownTests.cs
index 398d0bfb25..89deedee17 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ShutdownTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/ShutdownTests.cs
@@ -6,7 +6,7 @@ using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
 using Microsoft.AspNetCore.Server.IntegrationTesting.IIS;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs
index f7d6390e6d..cb7fc11d29 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/StartupExceptionTests.cs
@@ -5,7 +5,7 @@ using System.Net;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
 using Microsoft.AspNetCore.Server.IntegrationTesting.IIS;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/StartupTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/StartupTests.cs
index 0f07df6515..d3aecfc29c 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/StartupTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/StartupTests.cs
@@ -16,7 +16,6 @@ using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.AspNetCore.Server.IntegrationTesting.IIS;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Win32;
 using Xunit;
 
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs
index d1cb8eac4f..034cc48fd7 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/LogFileTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/LogFileTests.cs
index a4194fa3ed..ffde811027 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/LogFileTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/LogFileTests.cs
@@ -8,7 +8,6 @@ using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.AspNetCore.Server.IntegrationTesting.IIS;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/MultiApplicationTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/MultiApplicationTests.cs
index 50b19b5061..eb94b683f1 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/MultiApplicationTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/MultiApplicationTests.cs
@@ -9,7 +9,7 @@ using System.Xml.Linq;
 using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.AspNetCore.Server.IntegrationTesting.IIS;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs
index 1726699ece..df160cb44c 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs
@@ -10,7 +10,7 @@ using System.Threading.Tasks;
 using Xunit;
 using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.OutOfProcess
 {
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/OutOfProcess/GlobalVersionTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/OutOfProcess/GlobalVersionTests.cs
index a7f0c1b753..7837d47dce 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/OutOfProcess/GlobalVersionTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/OutOfProcess/GlobalVersionTests.cs
@@ -10,7 +10,7 @@ using System.Xml.Linq;
 using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.AspNetCore.Server.IntegrationTesting.IIS;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.OutOfProcess
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs
index 9bcdbfc442..2054011422 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs
@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.AspNetCore.Server.IntegrationTesting.IIS;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.OutOfProcess
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/RequiresNewHandler.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/RequiresNewHandler.cs
index 051c995e5a..c779a48eba 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/RequiresNewHandler.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/RequiresNewHandler.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
 {
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/RequiresNewShim.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/RequiresNewShim.cs
index fa1c2c993f..d347969de7 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/RequiresNewShim.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/RequiresNewShim.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
 {
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/ServerAbortTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/ServerAbortTests.cs
index d4c5a3c615..7f0601332b 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/ServerAbortTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/ServerAbortTests.cs
@@ -6,7 +6,7 @@ using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/SkipIfNotAdminAttribute.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/SkipIfNotAdminAttribute.cs
index 56f99a1784..f1010b24d0 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/SkipIfNotAdminAttribute.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/SkipIfNotAdminAttribute.cs
@@ -3,7 +3,7 @@
 
 using System;
 using System.Security.Principal;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
 {
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/SkipVSTSAttribute.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/SkipVSTSAttribute.cs
index b29b253056..3d1e082677 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/SkipVSTSAttribute.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/SkipVSTSAttribute.cs
@@ -3,7 +3,7 @@
 
 using System;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
 {
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/RequiresEnvironmentVariableAttribute.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/RequiresEnvironmentVariableAttribute.cs
index a082a61c92..b7a8a83ed2 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/RequiresEnvironmentVariableAttribute.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/RequiresEnvironmentVariableAttribute.cs
@@ -3,7 +3,7 @@
 
 using System;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
 {
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/SkipIfDebugAttribute.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/SkipIfDebugAttribute.cs
index e88406e88e..d2b4ad0702 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/SkipIfDebugAttribute.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/SkipIfDebugAttribute.cs
@@ -3,7 +3,7 @@
 
 using System;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
 {
@@ -13,7 +13,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
         public bool IsMet =>
         #if DEBUG
             false;
-        #else 
+        #else
             true;
         #endif
 
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/WindowsAuthTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/WindowsAuthTests.cs
index 3f12d1e0d1..e22f96dadc 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/WindowsAuthTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/WindowsAuthTests.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.AspNetCore.Server.IntegrationTesting.IIS;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
diff --git a/src/Servers/IIS/IIS/test/IIS.NewHandler.FunctionalTests/NewHandlerTests.cs b/src/Servers/IIS/IIS/test/IIS.NewHandler.FunctionalTests/NewHandlerTests.cs
index ba2c2c7b4e..4a669d3bca 100644
--- a/src/Servers/IIS/IIS/test/IIS.NewHandler.FunctionalTests/NewHandlerTests.cs
+++ b/src/Servers/IIS/IIS/test/IIS.NewHandler.FunctionalTests/NewHandlerTests.cs
@@ -3,7 +3,7 @@
 
 using System.Diagnostics;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 using Xunit.Sdk;
 
diff --git a/src/Servers/IIS/IIS/test/IIS.NewShim.FunctionalTests/ForwardsCompatibilityTests.cs b/src/Servers/IIS/IIS/test/IIS.NewShim.FunctionalTests/ForwardsCompatibilityTests.cs
index 0b18a40f9c..e8b2099de3 100644
--- a/src/Servers/IIS/IIS/test/IIS.NewShim.FunctionalTests/ForwardsCompatibilityTests.cs
+++ b/src/Servers/IIS/IIS/test/IIS.NewShim.FunctionalTests/ForwardsCompatibilityTests.cs
@@ -3,7 +3,7 @@
 
 using System.Diagnostics;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 using Xunit.Sdk;
 
diff --git a/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/ApplicationInitializationTests.cs b/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/ApplicationInitializationTests.cs
index 33abf9e22e..359da2e897 100644
--- a/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/ApplicationInitializationTests.cs
+++ b/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/ApplicationInitializationTests.cs
@@ -11,7 +11,6 @@ using Microsoft.AspNetCore.Server.IIS.FunctionalTests;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.AspNetCore.Server.IntegrationTesting.IIS;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
diff --git a/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/Inprocess/StdOutRedirectionTests.cs b/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/Inprocess/StdOutRedirectionTests.cs
index 1d59259189..6565a83b2f 100644
--- a/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/Inprocess/StdOutRedirectionTests.cs
+++ b/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/Inprocess/StdOutRedirectionTests.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
 using Microsoft.AspNetCore.Server.IntegrationTesting.IIS;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
diff --git a/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/RequiresIISAttribute.cs b/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/RequiresIISAttribute.cs
index 395ddc3a37..fad488d484 100644
--- a/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/RequiresIISAttribute.cs
+++ b/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/RequiresIISAttribute.cs
@@ -7,7 +7,7 @@ using System.Linq;
 using System.Runtime.InteropServices;
 using System.Security.Principal;
 using System.Xml.Linq;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Win32;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
diff --git a/src/Servers/IIS/IIS/test/IIS.Tests/ClientDisconnectTests.cs b/src/Servers/IIS/IIS/test/IIS.Tests/ClientDisconnectTests.cs
index 4418bb63c1..b662fd4732 100644
--- a/src/Servers/IIS/IIS/test/IIS.Tests/ClientDisconnectTests.cs
+++ b/src/Servers/IIS/IIS/test/IIS.Tests/ClientDisconnectTests.cs
@@ -7,7 +7,6 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Connections;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Testing;
 using Xunit;
diff --git a/src/Servers/IIS/IIS/test/IIS.Tests/ConnectionIdFeatureTests.cs b/src/Servers/IIS/IIS/test/IIS.Tests/ConnectionIdFeatureTests.cs
index 74773e1067..8efb9601a3 100644
--- a/src/Servers/IIS/IIS/test/IIS.Tests/ConnectionIdFeatureTests.cs
+++ b/src/Servers/IIS/IIS/test/IIS.Tests/ConnectionIdFeatureTests.cs
@@ -3,7 +3,7 @@
 
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http.Features;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
diff --git a/src/Servers/IIS/IIS/test/IIS.Tests/HttpBodyControlFeatureTests.cs b/src/Servers/IIS/IIS/test/IIS.Tests/HttpBodyControlFeatureTests.cs
index 68f357be0f..981a3e6d45 100644
--- a/src/Servers/IIS/IIS/test/IIS.Tests/HttpBodyControlFeatureTests.cs
+++ b/src/Servers/IIS/IIS/test/IIS.Tests/HttpBodyControlFeatureTests.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http.Features;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
diff --git a/src/Servers/IIS/IIS/test/IIS.Tests/MaxRequestBodySizeTests.cs b/src/Servers/IIS/IIS/test/IIS.Tests/MaxRequestBodySizeTests.cs
index 2408a8efa2..8bac31d82c 100644
--- a/src/Servers/IIS/IIS/test/IIS.Tests/MaxRequestBodySizeTests.cs
+++ b/src/Servers/IIS/IIS/test/IIS.Tests/MaxRequestBodySizeTests.cs
@@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Server.IIS;
 using Microsoft.AspNetCore.Server.IIS.FunctionalTests;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.Logging.Testing;
 using Xunit;
 
diff --git a/src/Servers/IIS/IIS/test/IIS.Tests/ResponseAbortTests.cs b/src/Servers/IIS/IIS/test/IIS.Tests/ResponseAbortTests.cs
index e467dd1c6c..4b59d31298 100644
--- a/src/Servers/IIS/IIS/test/IIS.Tests/ResponseAbortTests.cs
+++ b/src/Servers/IIS/IIS/test/IIS.Tests/ResponseAbortTests.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Connections;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
diff --git a/src/Servers/IIS/IIS/test/IIS.Tests/TestServerTest.cs b/src/Servers/IIS/IIS/test/IIS.Tests/TestServerTest.cs
index 37254c7248..e350d679c2 100644
--- a/src/Servers/IIS/IIS/test/IIS.Tests/TestServerTest.cs
+++ b/src/Servers/IIS/IIS/test/IIS.Tests/TestServerTest.cs
@@ -3,7 +3,7 @@
 
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.Logging.Testing;
 using Xunit;
 
diff --git a/src/Servers/IIS/IIS/test/IIS.Tests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs b/src/Servers/IIS/IIS/test/IIS.Tests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs
index 2f2e694167..f78d24e1a7 100644
--- a/src/Servers/IIS/IIS/test/IIS.Tests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs
+++ b/src/Servers/IIS/IIS/test/IIS.Tests/Utilities/SkipIfHostableWebCoreNotAvailibleAttribute.cs
@@ -3,7 +3,7 @@
 
 using System;
 using System.IO;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
 {
diff --git a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/AppOfflineIISExpressTests.cs b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/AppOfflineIISExpressTests.cs
index 9c8d065ee0..685a145f47 100644
--- a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/AppOfflineIISExpressTests.cs
+++ b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/AppOfflineIISExpressTests.cs
@@ -5,7 +5,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
 using Microsoft.AspNetCore.Server.IIS.FunctionalTests;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess
diff --git a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs
index ac6e702fca..d5eb68a7a2 100644
--- a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs
+++ b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/AuthenticationTests.cs
@@ -6,7 +6,7 @@ using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
 using Microsoft.AspNetCore.Server.IntegrationTesting.IIS;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess
diff --git a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/IISExpressShutdownTests.cs b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/IISExpressShutdownTests.cs
index 0aa5b2fedf..b39eabff4f 100644
--- a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/IISExpressShutdownTests.cs
+++ b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/IISExpressShutdownTests.cs
@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.AspNetCore.Server.IntegrationTesting.IIS;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
diff --git a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/WebSocketTests.cs b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/WebSocketTests.cs
index f69b205b3d..1ebc0981bd 100644
--- a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/WebSocketTests.cs
+++ b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/InProcess/WebSocketTests.cs
@@ -7,7 +7,7 @@ using System.Net.WebSockets;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
diff --git a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/OutOfProcess/MultipleAppTests.cs b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/OutOfProcess/MultipleAppTests.cs
index 471096e166..30ad380eb1 100644
--- a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/OutOfProcess/MultipleAppTests.cs
+++ b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/OutOfProcess/MultipleAppTests.cs
@@ -8,7 +8,7 @@ using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
diff --git a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs
index a3b5a640a6..c63c777c80 100644
--- a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs
+++ b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.AspNetCore.Server.IntegrationTesting.IIS;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 using Xunit.Abstractions;
 
diff --git a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/RequiresIISAttribute.cs b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/RequiresIISAttribute.cs
index 958e86dd11..e014e5e054 100644
--- a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/RequiresIISAttribute.cs
+++ b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/RequiresIISAttribute.cs
@@ -3,7 +3,7 @@
 
 using System;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
 {
diff --git a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs
index 9a1d0208bc..6188b4d05e 100644
--- a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs
+++ b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/UpgradeFeatureDetectionTests.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.AspNetCore.Server.IntegrationTesting.IIS;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Startup.WebSockets.cs b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Startup.WebSockets.cs
index b7986cb87b..b0ed64a938 100644
--- a/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Startup.WebSockets.cs
+++ b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Startup.WebSockets.cs
@@ -98,6 +98,7 @@ namespace TestSite
 
             // Upgrade the connection
             Stream opaqueTransport = await upgradeFeature.UpgradeAsync();
+            Assert.Null(context.Features.Get<IHttpMaxRequestBodySizeFeature>().MaxRequestBodySize);
 
             // Get the WebSocket object
             var ws = WebSocket.CreateFromStream(opaqueTransport, isServer: true, subProtocol: null, keepAliveInterval: TimeSpan.FromMinutes(2));
diff --git a/src/Servers/Kestrel/Core/src/Internal/Http2/Http2MessageBody.cs b/src/Servers/Kestrel/Core/src/Internal/Http2/Http2MessageBody.cs
index 7edd167138..7dad036475 100644
--- a/src/Servers/Kestrel/Core/src/Internal/Http2/Http2MessageBody.cs
+++ b/src/Servers/Kestrel/Core/src/Internal/Http2/Http2MessageBody.cs
@@ -69,11 +69,23 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2
 
         public override bool TryRead(out ReadResult readResult)
         {
-            var result = _context.RequestBodyPipe.Reader.TryRead(out readResult);
-            _readResult = readResult;
-            CountBytesRead(readResult.Buffer.Length);
+            TryStart();
 
-            return result;
+            var hasResult = _context.RequestBodyPipe.Reader.TryRead(out readResult);
+
+            if (hasResult)
+            {
+                _readResult = readResult;
+
+                CountBytesRead(readResult.Buffer.Length);
+
+                if (readResult.IsCompleted)
+                {
+                    TryStop();
+                }
+            }
+
+            return hasResult;
         }
 
         public override async ValueTask<ReadResult> ReadAsync(CancellationToken cancellationToken = default)
diff --git a/src/Servers/Kestrel/Core/src/ListenOptionsHttpsExtensions.cs b/src/Servers/Kestrel/Core/src/ListenOptionsHttpsExtensions.cs
index e3d411e087..d664fa5ee0 100644
--- a/src/Servers/Kestrel/Core/src/ListenOptionsHttpsExtensions.cs
+++ b/src/Servers/Kestrel/Core/src/ListenOptionsHttpsExtensions.cs
@@ -216,15 +216,15 @@ namespace Microsoft.AspNetCore.Hosting
         {
             var loggerFactory = listenOptions.KestrelServerOptions?.ApplicationServices.GetRequiredService<ILoggerFactory>() ?? NullLoggerFactory.Instance;
 
-            // Set the list of protocols from listen options
-            httpsOptions.HttpProtocols = listenOptions.Protocols;
             listenOptions.IsTls = true;
-
             listenOptions.Use(next =>
             {
+                // Set the list of protocols from listen options
+                httpsOptions.HttpProtocols = listenOptions.Protocols;
                 var middleware = new HttpsConnectionMiddleware(next, httpsOptions, loggerFactory);
                 return middleware.OnConnectionAsync;
             });
+
             return listenOptions;
         }
     }
diff --git a/src/Servers/Kestrel/Core/test/AddressBinderTests.cs b/src/Servers/Kestrel/Core/test/AddressBinderTests.cs
index ea34412975..79366d276e 100644
--- a/src/Servers/Kestrel/Core/test/AddressBinderTests.cs
+++ b/src/Servers/Kestrel/Core/test/AddressBinderTests.cs
@@ -13,7 +13,6 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Server.Kestrel.Core.Internal;
 using Microsoft.AspNetCore.Server.Kestrel.Https;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using Xunit;
diff --git a/src/Servers/Kestrel/Core/test/ConcurrentPipeWriterTests.cs b/src/Servers/Kestrel/Core/test/ConcurrentPipeWriterTests.cs
index b76c887a44..645f0538f9 100644
--- a/src/Servers/Kestrel/Core/test/ConcurrentPipeWriterTests.cs
+++ b/src/Servers/Kestrel/Core/test/ConcurrentPipeWriterTests.cs
@@ -24,39 +24,54 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
                     new TaskCompletionSource<FlushResult>(TaskCreationOptions.RunContinuationsAsynchronously),
                 };
 
+                var sync = new object();
                 var mockPipeWriter = new MockPipeWriter(pipeWriterFlushTcsArray);
+                var concurrentPipeWriter = new ConcurrentPipeWriter(mockPipeWriter, diagnosticPool, sync);
 
-                // No need to pass in a real sync object since all the calls in this test are passthrough.
-                var concurrentPipeWriter = new ConcurrentPipeWriter(mockPipeWriter, diagnosticPool, new object());
+                ValueTask<FlushResult> flushTask;
 
-                var memory = concurrentPipeWriter.GetMemory();
-                Assert.Equal(1, mockPipeWriter.GetMemoryCallCount);
+                lock (sync)
+                {
+                    var memory = concurrentPipeWriter.GetMemory();
+                    Assert.Equal(1, mockPipeWriter.GetMemoryCallCount);
 
-                concurrentPipeWriter.Advance(memory.Length);
-                Assert.Equal(1, mockPipeWriter.AdvanceCallCount);
+                    concurrentPipeWriter.Advance(memory.Length);
+                    Assert.Equal(1, mockPipeWriter.AdvanceCallCount);
 
-                var flushTask0 = concurrentPipeWriter.FlushAsync();
-                Assert.Equal(1, mockPipeWriter.FlushCallCount);
+                    flushTask = concurrentPipeWriter.FlushAsync();
+                    Assert.Equal(1, mockPipeWriter.FlushCallCount);
 
-                pipeWriterFlushTcsArray[0].SetResult(default);
+                    pipeWriterFlushTcsArray[0].SetResult(default);
+                }
 
-                await flushTask0.DefaultTimeout();
+                await flushTask.DefaultTimeout();
 
-                memory = concurrentPipeWriter.GetMemory();
-                Assert.Equal(2, mockPipeWriter.GetMemoryCallCount);
+                lock (sync)
+                {
+                    var memory = concurrentPipeWriter.GetMemory();
+                    Assert.Equal(2, mockPipeWriter.GetMemoryCallCount);
 
-                concurrentPipeWriter.Advance(memory.Length);
-                Assert.Equal(2, mockPipeWriter.AdvanceCallCount);
+                    concurrentPipeWriter.Advance(memory.Length);
+                    Assert.Equal(2, mockPipeWriter.AdvanceCallCount);
 
-                var flushTask1 = concurrentPipeWriter.FlushAsync();
-                Assert.Equal(2, mockPipeWriter.FlushCallCount);
+                    flushTask = concurrentPipeWriter.FlushAsync();
+                    Assert.Equal(2, mockPipeWriter.FlushCallCount);
 
-                pipeWriterFlushTcsArray[1].SetResult(default);
+                    pipeWriterFlushTcsArray[1].SetResult(default);
+                }
 
-                await flushTask1.DefaultTimeout();
+                await flushTask.DefaultTimeout();
 
                 var completeEx = new Exception();
-                await concurrentPipeWriter.CompleteAsync(completeEx).DefaultTimeout();
+                ValueTask completeTask;
+
+                lock (sync)
+                {
+                    completeTask = concurrentPipeWriter.CompleteAsync(completeEx);
+                }
+
+                await completeTask.DefaultTimeout();
+
                 Assert.Same(completeEx, mockPipeWriter.CompleteException);
             }
         }
diff --git a/src/Servers/Kestrel/Kestrel/test/GeneratedCodeTests.cs b/src/Servers/Kestrel/Kestrel/test/GeneratedCodeTests.cs
index 3177677b01..67969b30f5 100644
--- a/src/Servers/Kestrel/Kestrel/test/GeneratedCodeTests.cs
+++ b/src/Servers/Kestrel/Kestrel/test/GeneratedCodeTests.cs
@@ -6,7 +6,6 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
diff --git a/src/Servers/Kestrel/Kestrel/test/KestrelConfigurationBuilderTests.cs b/src/Servers/Kestrel/Kestrel/test/KestrelConfigurationBuilderTests.cs
index b65417cb28..95fac16c7b 100644
--- a/src/Servers/Kestrel/Kestrel/test/KestrelConfigurationBuilderTests.cs
+++ b/src/Servers/Kestrel/Kestrel/test/KestrelConfigurationBuilderTests.cs
@@ -10,7 +10,6 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
 using Microsoft.AspNetCore.Server.Kestrel.Https;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.FileProviders;
diff --git a/src/Servers/Kestrel/Transport.Libuv/test/LibuvTransportTests.cs b/src/Servers/Kestrel/Transport.Libuv/test/LibuvTransportTests.cs
index f2b4159667..13595d51ae 100644
--- a/src/Servers/Kestrel/Transport.Libuv/test/LibuvTransportTests.cs
+++ b/src/Servers/Kestrel/Transport.Libuv/test/LibuvTransportTests.cs
@@ -16,7 +16,6 @@ using Microsoft.AspNetCore.Server.Kestrel.Core.Internal;
 using Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Internal;
 using Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests.TestHelpers;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests
diff --git a/src/Servers/Kestrel/shared/test/TransportTestHelpers/HostNameIsReachableAttribute.cs b/src/Servers/Kestrel/shared/test/TransportTestHelpers/HostNameIsReachableAttribute.cs
index 5a83bd7c3f..b489a110fb 100644
--- a/src/Servers/Kestrel/shared/test/TransportTestHelpers/HostNameIsReachableAttribute.cs
+++ b/src/Servers/Kestrel/shared/test/TransportTestHelpers/HostNameIsReachableAttribute.cs
@@ -5,7 +5,7 @@ using System;
 using System.Net;
 using System.Net.Sockets;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 
 namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
 {
diff --git a/src/Servers/Kestrel/shared/test/TransportTestHelpers/IPv6ScopeIdPresentConditionAttribute.cs b/src/Servers/Kestrel/shared/test/TransportTestHelpers/IPv6ScopeIdPresentConditionAttribute.cs
index a1bab723cf..a01d00f769 100644
--- a/src/Servers/Kestrel/shared/test/TransportTestHelpers/IPv6ScopeIdPresentConditionAttribute.cs
+++ b/src/Servers/Kestrel/shared/test/TransportTestHelpers/IPv6ScopeIdPresentConditionAttribute.cs
@@ -5,7 +5,7 @@ using System;
 using System.Linq;
 using System.Net.NetworkInformation;
 using System.Net.Sockets;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 
 namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
 {
diff --git a/src/Servers/Kestrel/shared/test/TransportTestHelpers/IPv6SupportedConditionAttribute.cs b/src/Servers/Kestrel/shared/test/TransportTestHelpers/IPv6SupportedConditionAttribute.cs
index 815a271825..9744e67122 100644
--- a/src/Servers/Kestrel/shared/test/TransportTestHelpers/IPv6SupportedConditionAttribute.cs
+++ b/src/Servers/Kestrel/shared/test/TransportTestHelpers/IPv6SupportedConditionAttribute.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Net;
 using System.Net.Sockets;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 
 namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
 {
diff --git a/src/Servers/Kestrel/test/BindTests/AddressRegistrationTests.cs b/src/Servers/Kestrel/test/BindTests/AddressRegistrationTests.cs
index cac577355b..205bdbbe5f 100644
--- a/src/Servers/Kestrel/test/BindTests/AddressRegistrationTests.cs
+++ b/src/Servers/Kestrel/test/BindTests/AddressRegistrationTests.cs
@@ -18,7 +18,6 @@ using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
 using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
@@ -47,9 +46,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
             await RegisterAddresses_Success(addressInput, testUrl);
         }
 
-        [Theory]
+        [ConditionalTheory]
         [MemberData(nameof(AddressRegistrationDataIPv4Port5000Default))]
-        [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2711", FlakyOn.AzP.All)]
+        [SkipOnCI]
         public async Task RegisterAddresses_IPv4Port5000Default_Success(string addressInput, string testUrl)
         {
             if (!CanBindToEndpoint(IPAddress.Loopback, 5000))
@@ -60,9 +59,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
             await RegisterAddresses_Success(addressInput, testUrl, 5000);
         }
 
-        [Theory]
+        [ConditionalTheory]
         [MemberData(nameof(AddressRegistrationDataIPv4Port80))]
-        [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2711", FlakyOn.AzP.All)]
+        [SkipOnCI]
         public async Task RegisterAddresses_IPv4Port80_Success(string addressInput, string testUrl)
         {
             if (!CanBindToEndpoint(IPAddress.Loopback, 80))
@@ -416,8 +415,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
             }
         }
 
-        [Fact]
-        [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2711", FlakyOn.AzP.All)]
+        [ConditionalFact]
+        [SkipOnCI]
         public Task DefaultsServerAddress_BindsToIPv4()
         {
             if (!CanBindToEndpoint(IPAddress.Loopback, 5000))
@@ -430,7 +429,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
 
         [ConditionalFact]
         [IPv6SupportedCondition]
-        [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2711", FlakyOn.AzP.All)]
+        [SkipOnCI]
         public Task DefaultsServerAddress_BindsToIPv6()
         {
             if (!CanBindToEndpoint(IPAddress.Loopback, 5000) || !CanBindToEndpoint(IPAddress.IPv6Loopback, 5000))
@@ -441,8 +440,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
             return RegisterDefaultServerAddresses_Success(new[] { "http://127.0.0.1:5000", "http://[::1]:5000" });
         }
 
-        [Fact]
-        [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2711", FlakyOn.AzP.All)]
+        [ConditionalFact]
+        [SkipOnCI]
         public Task DefaultsServerAddress_BindsToIPv4WithHttps()
         {
             if (!CanBindToEndpoint(IPAddress.Loopback, 5000) || !CanBindToEndpoint(IPAddress.Loopback, 5001))
@@ -456,7 +455,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
 
         [ConditionalFact]
         [IPv6SupportedCondition]
-        [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/1756", FlakyOn.AzP.All)]
+        [SkipOnCI]
         public Task DefaultsServerAddress_BindsToIPv6WithHttps()
         {
             if (!CanBindToEndpoint(IPAddress.Loopback, 5000) || !CanBindToEndpoint(IPAddress.IPv6Loopback, 5000)
diff --git a/src/Servers/Kestrel/test/FunctionalTests/Http2/HandshakeTests.cs b/src/Servers/Kestrel/test/FunctionalTests/Http2/HandshakeTests.cs
index c24898ff28..52e9d0f0c9 100644
--- a/src/Servers/Kestrel/test/FunctionalTests/Http2/HandshakeTests.cs
+++ b/src/Servers/Kestrel/test/FunctionalTests/Http2/HandshakeTests.cs
@@ -12,7 +12,6 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
 using Microsoft.AspNetCore.Server.Kestrel.Core.Features;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Logging.Testing;
 using Xunit;
 
diff --git a/src/Servers/Kestrel/test/FunctionalTests/Http2/ShutdownTests.cs b/src/Servers/Kestrel/test/FunctionalTests/Http2/ShutdownTests.cs
index e521d2133b..47e3288be5 100644
--- a/src/Servers/Kestrel/test/FunctionalTests/Http2/ShutdownTests.cs
+++ b/src/Servers/Kestrel/test/FunctionalTests/Http2/ShutdownTests.cs
@@ -15,7 +15,6 @@ using Microsoft.AspNetCore.Server.Kestrel.Core;
 using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2;
 using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Logging.Testing;
 using Moq;
 using Xunit;
diff --git a/src/Servers/Kestrel/test/FunctionalTests/MaxRequestBufferSizeTests.cs b/src/Servers/Kestrel/test/FunctionalTests/MaxRequestBufferSizeTests.cs
index ee7088ba14..f1ed973b5b 100644
--- a/src/Servers/Kestrel/test/FunctionalTests/MaxRequestBufferSizeTests.cs
+++ b/src/Servers/Kestrel/test/FunctionalTests/MaxRequestBufferSizeTests.cs
@@ -14,7 +14,6 @@ using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Logging.Testing;
 using Xunit;
 
diff --git a/src/Servers/Kestrel/test/FunctionalTests/RequestTests.cs b/src/Servers/Kestrel/test/FunctionalTests/RequestTests.cs
index 218a0db408..6e4a5b8803 100644
--- a/src/Servers/Kestrel/test/FunctionalTests/RequestTests.cs
+++ b/src/Servers/Kestrel/test/FunctionalTests/RequestTests.cs
@@ -21,7 +21,6 @@ using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
 using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Testing;
 using Moq;
diff --git a/src/Servers/Kestrel/test/FunctionalTests/ResponseTests.cs b/src/Servers/Kestrel/test/FunctionalTests/ResponseTests.cs
index 770ac5a1be..14cea7f48a 100644
--- a/src/Servers/Kestrel/test/FunctionalTests/ResponseTests.cs
+++ b/src/Servers/Kestrel/test/FunctionalTests/ResponseTests.cs
@@ -23,7 +23,6 @@ using Microsoft.AspNetCore.Server.Kestrel.Https;
 using Microsoft.AspNetCore.Server.Kestrel.Https.Internal;
 using Microsoft.AspNetCore.Server.Kestrel.Tests;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Testing;
 using Microsoft.Extensions.Primitives;
diff --git a/src/Servers/Kestrel/test/FunctionalTests/UnixDomainSocketsTests.cs b/src/Servers/Kestrel/test/FunctionalTests/UnixDomainSocketsTests.cs
index 02ff378b17..d34ced5292 100644
--- a/src/Servers/Kestrel/test/FunctionalTests/UnixDomainSocketsTests.cs
+++ b/src/Servers/Kestrel/test/FunctionalTests/UnixDomainSocketsTests.cs
@@ -13,7 +13,6 @@ using Microsoft.AspNetCore.Connections;
 using Microsoft.AspNetCore.Connections.Features;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Testing;
 using Xunit;
diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/ConnectionLimitTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/ConnectionLimitTests.cs
index e08fffc659..43c92b0121 100644
--- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/ConnectionLimitTests.cs
+++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/ConnectionLimitTests.cs
@@ -13,7 +13,6 @@ using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure;
 using Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests.TestTransport;
 using Microsoft.AspNetCore.Server.Kestrel.Tests;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Logging.Testing;
 using Xunit;
 
diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2StreamTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2StreamTests.cs
index 95495a3986..c74f321a51 100644
--- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2StreamTests.cs
+++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2StreamTests.cs
@@ -16,7 +16,7 @@ using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Server.Kestrel.Core.Features;
 using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2;
 using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.HPack;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.Logging;
 using Microsoft.Net.Http.Headers;
 using Xunit;
diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TimeoutTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TimeoutTests.cs
index cb41f2c2e5..23e8374e6f 100644
--- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TimeoutTests.cs
+++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TimeoutTests.cs
@@ -10,7 +10,6 @@ using Microsoft.AspNetCore.Server.Kestrel.Core.Features;
 using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2;
 using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Logging.Testing;
 using Microsoft.Net.Http.Headers;
 using Moq;
diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/TlsTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/TlsTests.cs
index 3cabcbc35c..1c78af53bf 100644
--- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/TlsTests.cs
+++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/TlsTests.cs
@@ -16,7 +16,6 @@ using Microsoft.AspNetCore.Server.Kestrel.Core.Features;
 using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2;
 using Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests.TestTransport;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Logging.Testing;
 using Xunit;
 
diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpConnectionManagerTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpConnectionManagerTests.cs
index 2fc83d668e..3a72e0d2be 100644
--- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpConnectionManagerTests.cs
+++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpConnectionManagerTests.cs
@@ -8,7 +8,6 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure;
 using Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests.TestTransport;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Testing;
 using Moq;
diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsConnectionMiddlewareTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsConnectionMiddlewareTests.cs
index fd35fa722e..45e21934be 100644
--- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsConnectionMiddlewareTests.cs
+++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsConnectionMiddlewareTests.cs
@@ -21,7 +21,6 @@ using Microsoft.AspNetCore.Server.Kestrel.Https;
 using Microsoft.AspNetCore.Server.Kestrel.Https.Internal;
 using Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests.TestTransport;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Logging.Testing;
 using Xunit;
 
@@ -590,6 +589,41 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests
             Assert.Equal(CoreStrings.FormatInvalidServerCertificateEku(cert.Thumbprint), ex.Message);
         }
 
+        [ConditionalTheory]
+        [InlineData(HttpProtocols.Http1)]
+        [InlineData(HttpProtocols.Http2)]
+        [InlineData(HttpProtocols.Http1AndHttp2)]
+        [OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Missing SslStream ALPN support: https://github.com/dotnet/corefx/issues/30492")]
+        [SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/10428", Queues = "Debian.8.Amd64.Open")] // Debian 8 uses OpenSSL 1.0.1 which does not support HTTP/2
+        [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win81)]
+        public async Task ListenOptionsProtolsCanBeSetAfterUseHttps(HttpProtocols httpProtocols)
+        {
+            void ConfigureListenOptions(ListenOptions listenOptions)
+            {
+                listenOptions.UseHttps(_x509Certificate2);
+                listenOptions.Protocols = httpProtocols;
+            }
+
+            await using var server = new TestServer(context => Task.CompletedTask, new TestServiceContext(LoggerFactory), ConfigureListenOptions);
+            using var connection = server.CreateConnection();
+
+            var sslOptions = new SslClientAuthenticationOptions
+            {
+                TargetHost = "localhost",
+                EnabledSslProtocols = SslProtocols.Tls12 | SslProtocols.Tls11,
+                ApplicationProtocols = new List<SslApplicationProtocol> { SslApplicationProtocol.Http11, SslApplicationProtocol.Http2 },
+            };
+
+            using var stream = OpenSslStream(connection.Stream);
+            await stream.AuthenticateAsClientAsync(sslOptions);
+
+            Assert.Equal(
+                httpProtocols.HasFlag(HttpProtocols.Http2) ?
+                    SslApplicationProtocol.Http2 :
+                    SslApplicationProtocol.Http11,
+                stream.NegotiatedApplicationProtocol);
+        }
+
         private static async Task App(HttpContext httpContext)
         {
             var request = httpContext.Request;
@@ -613,8 +647,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests
 
         /// <summary>
         /// SslStream is used to ensure the certificate is actually passed to the server
-        /// HttpClient might not send the certificate because it is invalid or it doesn't match any 
-        /// of the certificate authorities sent by the server in the SSL handshake. 
+        /// HttpClient might not send the certificate because it is invalid or it doesn't match any
+        /// of the certificate authorities sent by the server in the SSL handshake.
         /// </summary>
         private static SslStream OpenSslStreamWithCert(Stream rawStream, X509Certificate2 clientCertificate = null)
         {
diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/LoggingConnectionMiddlewareTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/LoggingConnectionMiddlewareTests.cs
index a93bf2b8a0..753e05814a 100644
--- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/LoggingConnectionMiddlewareTests.cs
+++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/LoggingConnectionMiddlewareTests.cs
@@ -6,7 +6,6 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests.TestTransport;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Logging.Testing;
 using Xunit;
 
diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestTests.cs
index 8e9414f519..09bd4db501 100644
--- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestTests.cs
+++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestTests.cs
@@ -17,7 +17,6 @@ using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http;
 using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure;
 using Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests.TestTransport;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Testing;
 using Xunit;
diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/ResponseTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/ResponseTests.cs
index dc942b3a8d..7dba5e52a3 100644
--- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/ResponseTests.cs
+++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/ResponseTests.cs
@@ -19,7 +19,6 @@ using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http;
 using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure;
 using Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests.TestTransport;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Testing;
diff --git a/src/Servers/Kestrel/test/Interop.FunctionalTests/ChromeTests.cs b/src/Servers/Kestrel/test/Interop.FunctionalTests/ChromeTests.cs
index 64710cc3ed..de82af3a98 100644
--- a/src/Servers/Kestrel/test/Interop.FunctionalTests/ChromeTests.cs
+++ b/src/Servers/Kestrel/test/Interop.FunctionalTests/ChromeTests.cs
@@ -11,7 +11,6 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Testing;
 using OpenQA.Selenium.Chrome;
diff --git a/src/Servers/Kestrel/test/Interop.FunctionalTests/H2SpecTests.cs b/src/Servers/Kestrel/test/Interop.FunctionalTests/H2SpecTests.cs
index c4f69c423a..2c5f39382d 100644
--- a/src/Servers/Kestrel/test/Interop.FunctionalTests/H2SpecTests.cs
+++ b/src/Servers/Kestrel/test/Interop.FunctionalTests/H2SpecTests.cs
@@ -11,7 +11,6 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Logging.Testing;
 using Xunit;
 using Xunit.Abstractions;
diff --git a/src/Servers/Kestrel/test/Interop.FunctionalTests/HttpClientHttp2InteropTests.cs b/src/Servers/Kestrel/test/Interop.FunctionalTests/HttpClientHttp2InteropTests.cs
index dbb4b24c7d..234c127379 100644
--- a/src/Servers/Kestrel/test/Interop.FunctionalTests/HttpClientHttp2InteropTests.cs
+++ b/src/Servers/Kestrel/test/Interop.FunctionalTests/HttpClientHttp2InteropTests.cs
@@ -15,7 +15,6 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging.Testing;
 using Xunit;
diff --git a/src/Servers/Kestrel/test/Interop.FunctionalTests/SkipIfChromeUnavailableAttribute.cs b/src/Servers/Kestrel/test/Interop.FunctionalTests/SkipIfChromeUnavailableAttribute.cs
index e01609be00..b7101b9076 100644
--- a/src/Servers/Kestrel/test/Interop.FunctionalTests/SkipIfChromeUnavailableAttribute.cs
+++ b/src/Servers/Kestrel/test/Interop.FunctionalTests/SkipIfChromeUnavailableAttribute.cs
@@ -4,7 +4,7 @@
 using System;
 using System.IO;
 using System.Runtime.InteropServices;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 
 namespace Interop.FunctionalTests
 {
diff --git a/src/Servers/Kestrel/test/Interop.FunctionalTests/Utilities.cs b/src/Servers/Kestrel/test/Interop.FunctionalTests/Utilities.cs
index c754e87605..a8223118a0 100644
--- a/src/Servers/Kestrel/test/Interop.FunctionalTests/Utilities.cs
+++ b/src/Servers/Kestrel/test/Interop.FunctionalTests/Utilities.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 
 namespace Interop.FunctionalTests
 {
diff --git a/src/Servers/Kestrel/test/Libuv.FunctionalTests/ListenHandleTests.cs b/src/Servers/Kestrel/test/Libuv.FunctionalTests/ListenHandleTests.cs
index 4d3790e049..672e55dc7d 100644
--- a/src/Servers/Kestrel/test/Libuv.FunctionalTests/ListenHandleTests.cs
+++ b/src/Servers/Kestrel/test/Libuv.FunctionalTests/ListenHandleTests.cs
@@ -6,7 +6,6 @@ using System.Net.Sockets;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Logging.Testing;
 
 namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
diff --git a/src/Servers/test/FunctionalTests/HelloWorldTest.cs b/src/Servers/test/FunctionalTests/HelloWorldTest.cs
index fc8eeca4eb..cf20b9d617 100644
--- a/src/Servers/test/FunctionalTests/HelloWorldTest.cs
+++ b/src/Servers/test/FunctionalTests/HelloWorldTest.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Testing;
 using Xunit;
diff --git a/src/Servers/test/FunctionalTests/NtlmAuthenticationTest.cs b/src/Servers/test/FunctionalTests/NtlmAuthenticationTest.cs
index 30af90259b..75ef46207a 100644
--- a/src/Servers/test/FunctionalTests/NtlmAuthenticationTest.cs
+++ b/src/Servers/test/FunctionalTests/NtlmAuthenticationTest.cs
@@ -5,7 +5,7 @@ using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Testing;
 using Xunit;
diff --git a/src/Servers/test/FunctionalTests/ResponseCompressionTests.cs b/src/Servers/test/FunctionalTests/ResponseCompressionTests.cs
index 63b97406e6..e441343521 100644
--- a/src/Servers/test/FunctionalTests/ResponseCompressionTests.cs
+++ b/src/Servers/test/FunctionalTests/ResponseCompressionTests.cs
@@ -12,7 +12,7 @@ using System.Threading.Tasks;
 using System.Xml.Linq;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.AspNetCore.Server.IntegrationTesting.IIS;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Testing;
 using Microsoft.Net.Http.Headers;
diff --git a/src/Servers/test/FunctionalTests/ResponseTests.cs b/src/Servers/test/FunctionalTests/ResponseTests.cs
index 141975ee47..904ec52b7a 100644
--- a/src/Servers/test/FunctionalTests/ResponseTests.cs
+++ b/src/Servers/test/FunctionalTests/ResponseTests.cs
@@ -8,7 +8,7 @@ using System.Net.Http;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Testing;
 using Microsoft.Net.Http.Headers;
diff --git a/src/Shared/Components/ServerComponent.cs b/src/Shared/Components/ServerComponent.cs
new file mode 100644
index 0000000000..2fb241842f
--- /dev/null
+++ b/src/Shared/Components/ServerComponent.cs
@@ -0,0 +1,32 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Components
+{
+    // The DTO that we data-protect and include into any
+    // generated component marker and that allows the client
+    // to bootstrap a blazor server-side application.
+    internal struct ServerComponent
+    {
+        public ServerComponent(
+            int sequence,
+            string assemblyName,
+            string typeName,
+            Guid invocationId) =>
+            (Sequence, AssemblyName, TypeName, InvocationId) = (sequence, assemblyName, typeName, invocationId);
+
+        // The order in which this component was rendered
+        public int Sequence { get; set; }
+
+        // The assembly name for the rendered component.
+        public string AssemblyName { get; set; }
+
+        // The type name of the component.
+        public string TypeName { get; set; }
+
+        // An id that uniquely identifies all components generated as part of a single HTTP response.
+        public Guid InvocationId { get; set; }
+    }
+}
diff --git a/src/Shared/Components/ServerComponentMarker.cs b/src/Shared/Components/ServerComponentMarker.cs
new file mode 100644
index 0000000000..6bfee523a6
--- /dev/null
+++ b/src/Shared/Components/ServerComponentMarker.cs
@@ -0,0 +1,60 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Components
+{
+    // Represents the serialized invocation to a component.
+    // We serialize this marker into a comment in the generated
+    // HTML.
+    internal struct ServerComponentMarker
+    {
+        public const string ServerMarkerType = "server";
+
+        private ServerComponentMarker(string type, string descriptor, int? sequence, string prerenderId) : this()
+        {
+            Type = type;
+            PrerenderId = prerenderId;
+            Descriptor = descriptor;
+            Sequence = sequence;
+        }
+
+        // The order in which this component was rendered/produced
+        // on the server. It matches the number on the descriptor
+        // and is used to prevent an infinite amount of components
+        // from being rendered from the client-side.
+        public int? Sequence { get; set; }
+
+        // The marker type. Right now "server" is the only valid value.
+        public string Type { get; set; }
+
+        // A string to allow the clients to differentiate between prerendered
+        // and non prerendered components and to uniquely identify start and end
+        // markers in prererendered components.
+        public string PrerenderId { get; set; }
+
+        // A data-protected payload that allows the server to validate the legitimacy
+        // of the invocation.
+        public string Descriptor { get; set; }
+
+        // Creates a marker for a prerendered component.
+        public static ServerComponentMarker Prerendered(int sequence, string descriptor) =>
+            new ServerComponentMarker(ServerMarkerType, descriptor, sequence, Guid.NewGuid().ToString("N"));
+
+        // Creates a marker for a non prerendered component
+        public static ServerComponentMarker NonPrerendered(int sequence, string descriptor) =>
+            new ServerComponentMarker(ServerMarkerType, descriptor, sequence, null);
+
+        // Creates the end marker for a prerendered component.
+        public ServerComponentMarker GetEndRecord()
+        {
+            if (PrerenderId == null)
+            {
+                throw new InvalidOperationException("Can't get an end record for non-prerendered components.");
+            }
+
+            return new ServerComponentMarker(null, null, null, PrerenderId);
+        }
+    }
+}
diff --git a/src/Shared/Components/ServerComponentSerializationSettings.cs b/src/Shared/Components/ServerComponentSerializationSettings.cs
new file mode 100644
index 0000000000..7aabb013b5
--- /dev/null
+++ b/src/Shared/Components/ServerComponentSerializationSettings.cs
@@ -0,0 +1,26 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Text.Json;
+
+namespace Microsoft.AspNetCore.Components
+{
+    internal static class ServerComponentSerializationSettings
+    {
+        public const string DataProtectionProviderPurpose = "Microsoft.AspNetCore.Components.ComponentDescriptorSerializer,V1";
+
+        public static readonly JsonSerializerOptions JsonSerializationOptions =
+            new JsonSerializerOptions
+            {
+                PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+                PropertyNameCaseInsensitive = true,
+                IgnoreNullValues = true
+            };
+
+        // This setting is not configurable, but realistically we don't expect an app to take more than 30 seconds from when
+        // it got rendrered to when the circuit got started, and having an expiration on the serialized server-components helps
+        // prevent old payloads from being replayed.
+        public static readonly TimeSpan DataExpiration = TimeSpan.FromMinutes(5);
+    }
+}
diff --git a/src/Shared/E2ETesting/BrowserTestBase.cs b/src/Shared/E2ETesting/BrowserTestBase.cs
index 325509bdb9..5650feb3d3 100644
--- a/src/Shared/E2ETesting/BrowserTestBase.cs
+++ b/src/Shared/E2ETesting/BrowserTestBase.cs
@@ -58,6 +58,13 @@ namespace Microsoft.AspNetCore.E2ETesting
         }
 
         public virtual async Task InitializeAsync(string isolationContext)
+        {
+            await InitializeBrowser(isolationContext);
+
+            InitializeAsyncCore();
+        }
+
+        protected async Task InitializeBrowser(string isolationContext)
         {
             await _semaphore.WaitAsync(TimeSpan.FromMinutes(30));
             _semaphoreHeld = true;
@@ -67,8 +74,6 @@ namespace Microsoft.AspNetCore.E2ETesting
             _logs.Value = logs;
 
             Browser = browser;
-
-            InitializeAsyncCore();
         }
 
         protected virtual void InitializeAsyncCore()
diff --git a/src/Shared/Process/ProcessExtensions.cs b/src/Shared/Process/ProcessExtensions.cs
index c6cbd1f970..5fbefcdb24 100644
--- a/src/Shared/Process/ProcessExtensions.cs
+++ b/src/Shared/Process/ProcessExtensions.cs
@@ -1,8 +1,9 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Diagnostics;
 using System.IO;
 using System.Runtime.InteropServices;
@@ -41,42 +42,56 @@ namespace Microsoft.Extensions.Internal
 
         private static void GetAllChildIdsUnix(int parentId, ISet<int> children, TimeSpan timeout)
         {
-            RunProcessAndWaitForExit(
-                "pgrep",
-                $"-P {parentId}",
-                timeout,
-                out var stdout);
-
-            if (!string.IsNullOrEmpty(stdout))
+            try
             {
-                using (var reader = new StringReader(stdout))
-                {
-                    while (true)
-                    {
-                        var text = reader.ReadLine();
-                        if (text == null)
-                        {
-                            return;
-                        }
+                RunProcessAndWaitForExit(
+                    "pgrep",
+                    $"-P {parentId}",
+                    timeout,
+                    out var stdout);
 
-                        if (int.TryParse(text, out var id))
+                if (!string.IsNullOrEmpty(stdout))
+                {
+                    using (var reader = new StringReader(stdout))
+                    {
+                        while (true)
                         {
-                            children.Add(id);
-                            // Recursively get the children
-                            GetAllChildIdsUnix(id, children, timeout);
+                            var text = reader.ReadLine();
+                            if (text == null)
+                            {
+                                return;
+                            }
+
+                            if (int.TryParse(text, out var id))
+                            {
+                                children.Add(id);
+                                // Recursively get the children
+                                GetAllChildIdsUnix(id, children, timeout);
+                            }
                         }
                     }
                 }
             }
+            catch (Win32Exception ex) when (ex.Message.Contains("No such file or directory"))
+            {
+                // This probably means that pgrep isn't installed. Nothing to be done?
+            }
         }
 
         private static void KillProcessUnix(int processId, TimeSpan timeout)
         {
-            RunProcessAndWaitForExit(
-                "kill",
-                $"-TERM {processId}",
-                timeout,
-                out var stdout);
+            try
+            {
+                RunProcessAndWaitForExit(
+                    "kill",
+                    $"-TERM {processId}",
+                    timeout,
+                    out var stdout);
+            }
+            catch (Win32Exception ex) when (ex.Message.Contains("No such file or directory"))
+            {
+                // This probably means that the process is already dead
+            }
         }
 
         private static void RunProcessAndWaitForExit(string fileName, string arguments, TimeSpan timeout, out string stdout)
diff --git a/src/SignalR/clients/csharp/Client/test/FunctionalTests/HubConnectionTests.cs b/src/SignalR/clients/csharp/Client/test/FunctionalTests/HubConnectionTests.cs
index fbbc78a2ea..5d40dcaf70 100644
--- a/src/SignalR/clients/csharp/Client/test/FunctionalTests/HubConnectionTests.cs
+++ b/src/SignalR/clients/csharp/Client/test/FunctionalTests/HubConnectionTests.cs
@@ -14,7 +14,7 @@ using Microsoft.AspNetCore.Http.Connections;
 using Microsoft.AspNetCore.Http.Connections.Client;
 using Microsoft.AspNetCore.SignalR.Protocol;
 using Microsoft.AspNetCore.SignalR.Tests;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Testing;
diff --git a/src/SignalR/clients/ts/FunctionalTests/SignalR.Client.FunctionalTestApp.csproj b/src/SignalR/clients/ts/FunctionalTests/SignalR.Client.FunctionalTestApp.csproj
index ee110b37c8..91fc9b870d 100644
--- a/src/SignalR/clients/ts/FunctionalTests/SignalR.Client.FunctionalTestApp.csproj
+++ b/src/SignalR/clients/ts/FunctionalTests/SignalR.Client.FunctionalTestApp.csproj
@@ -54,24 +54,4 @@
     <TypeScriptCompile Include="ts\WebWorkerTests.ts" />
   </ItemGroup>
 
-  <Target Name="ClientBuild" BeforeTargets="AfterBuild">
-      <ItemGroup>
-        <MsgPack5Files Include="$(MSBuildThisFileDirectory)../signalr-protocol-msgpack/node_modules/msgpack5/dist/*.js" />
-      </ItemGroup>
-      <Copy SourceFiles="@(MsgPack5Files)" DestinationFolder="$(MSBuildProjectDirectory)/wwwroot/lib/msgpack5" />
-      <ItemGroup>
-        <JasmineFiles Include="$(MSBuildThisFileDirectory)node_modules/jasmine-core/lib/jasmine-core/*.js" />
-        <JasmineFiles Include="$(MSBuildThisFileDirectory)node_modules/jasmine-core/lib/jasmine-core/*.css" />
-      </ItemGroup>
-      <Copy SourceFiles="@(JasmineFiles)" DestinationFolder="$(MSBuildProjectDirectory)/wwwroot/lib/jasmine" />
-
-      <ItemGroup>
-        <SignalRJSBrowserClientFiles Include="$(MSBuildThisFileDirectory)node_modules/@microsoft/signalr/dist/browser/*" />
-        <SignalRJSBrowserClientFiles Include="$(MSBuildThisFileDirectory)node_modules/@microsoft/signalr-protocol-msgpack/dist/browser/*" />
-        <SignalRJSWebWorkerClientFiles Include="$(MSBuildThisFileDirectory)node_modules/@microsoft/signalr/dist/webworker/*" />
-      </ItemGroup>
-      <Copy SourceFiles="@(SignalRJSBrowserClientFiles)" DestinationFolder="$(MSBuildThisFileDirectory)/wwwroot/lib/signalr" />
-      <Copy SourceFiles="@(SignalRJSWebWorkerClientFiles)" DestinationFolder="$(MSBuildThisFileDirectory)/wwwroot/lib/signalr-webworker" />
- </Target>
-
 </Project>
diff --git a/src/SignalR/clients/ts/FunctionalTests/SignalR.Npm.FunctionalTests.npmproj b/src/SignalR/clients/ts/FunctionalTests/SignalR.Npm.FunctionalTests.npmproj
index f80aec5ee8..f90738b447 100644
--- a/src/SignalR/clients/ts/FunctionalTests/SignalR.Npm.FunctionalTests.npmproj
+++ b/src/SignalR/clients/ts/FunctionalTests/SignalR.Npm.FunctionalTests.npmproj
@@ -42,4 +42,24 @@
           WorkingDirectory="$(RepoRoot)src/SignalR/clients/ts/FunctionalTests" />
   </Target>
 
+  <Target Name="ClientBuild" AfterTargets="Build">
+    <ItemGroup>
+      <MsgPack5Files Include="$(MSBuildThisFileDirectory)../signalr-protocol-msgpack/node_modules/msgpack5/dist/*.js" />
+    </ItemGroup>
+    <Copy SourceFiles="@(MsgPack5Files)" DestinationFolder="$(MSBuildProjectDirectory)/wwwroot/lib/msgpack5" />
+    <ItemGroup>
+      <JasmineFiles Include="$(MSBuildThisFileDirectory)node_modules/jasmine-core/lib/jasmine-core/*.js" />
+      <JasmineFiles Include="$(MSBuildThisFileDirectory)node_modules/jasmine-core/lib/jasmine-core/*.css" />
+    </ItemGroup>
+    <Copy SourceFiles="@(JasmineFiles)" DestinationFolder="$(MSBuildProjectDirectory)/wwwroot/lib/jasmine" />
+
+    <ItemGroup>
+      <SignalRJSBrowserClientFiles Include="$(MSBuildThisFileDirectory)node_modules/@microsoft/signalr/dist/browser/*" />
+      <SignalRJSBrowserClientFiles Include="$(MSBuildThisFileDirectory)node_modules/@microsoft/signalr-protocol-msgpack/dist/browser/*" />
+      <SignalRJSWebWorkerClientFiles Include="$(MSBuildThisFileDirectory)node_modules/@microsoft/signalr/dist/webworker/*" />
+    </ItemGroup>
+    <Copy SourceFiles="@(SignalRJSBrowserClientFiles)" DestinationFolder="$(MSBuildThisFileDirectory)/wwwroot/lib/signalr" />
+    <Copy SourceFiles="@(SignalRJSWebWorkerClientFiles)" DestinationFolder="$(MSBuildThisFileDirectory)/wwwroot/lib/signalr-webworker" />
+  </Target>
+
 </Project>
diff --git a/src/SignalR/clients/ts/FunctionalTests/package.json b/src/SignalR/clients/ts/FunctionalTests/package.json
index cbf6183851..85b58b4e28 100644
--- a/src/SignalR/clients/ts/FunctionalTests/package.json
+++ b/src/SignalR/clients/ts/FunctionalTests/package.json
@@ -43,7 +43,7 @@
     "build:inner": "yarn run build:lint && yarn run build:webpack",
     "build:lint": "node ../common/node_modules/tslint/bin/tslint -c ../tslint.json -p ./tsconfig.json",
     "build:webpack": "node ../common/node_modules/webpack-cli/bin/cli.js",
-    "pretest": "yarn run build && dotnet build SignalR.Client.FunctionalTestApp.csproj",
+    "pretest": "yarn run build && dotnet build SignalR.Npm.FunctionalTests.npmproj",
     "test": "tsc --noEmit && yarn run test:local",
     "test:inner": "yarn run build:inner && ts-node --project ./scripts/tsconfig.json ./scripts/run-tests.ts",
     "test:local": "yarn run pretest && ts-node --project ./scripts/tsconfig.json ./scripts/run-tests.ts",
diff --git a/src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts b/src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts
index 01c40ddfb0..ad6f65db08 100644
--- a/src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts
+++ b/src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts
@@ -171,9 +171,6 @@ const configFile = sauce ?
     path.resolve(__dirname, "karma.local.conf.js");
 debug(`Loading Karma config file: ${configFile}`);
 
-// Workaround for 'wd' not installing correctly. https://github.com/karma-runner/karma-sauce-launcher/issues/117
-exec("node ../node_modules/wd/scripts/build-browser-scripts.js");
-
 // Gross but it works
 process.env.ASPNETCORE_SIGNALR_TEST_ALL_BROWSERS = allBrowsers ? "true" : null;
 const config = (karma as any).config.parseConfig(configFile);
@@ -197,6 +194,19 @@ if (sauce) {
     }
 }
 
+// Workaround for 'wd' not installing correctly. https://github.com/karma-runner/karma-sauce-launcher/issues/117
+function ensureWdInstalled() {
+    return new Promise((resolve, reject) => {
+        exec(`node ${__dirname}/../node_modules/wd/scripts/build-browser-scripts.js`, { timeout: 30000 }, (error: any, stdout, stderr) => {
+            if (error) {
+                console.log(error.message);
+                reject(error);
+            }
+            resolve();
+        });
+    });
+}
+
 function runKarma(karmaConfig) {
     return new Promise<number>((resolve, reject) => {
         const server = new karma.Server(karmaConfig, (exitCode: number) => {
@@ -289,6 +299,8 @@ function runJest(httpsUrl: string, httpUrl: string) {
 
         debug(`Functional Test Server has started at ${httpsUrl} and ${httpUrl}`);
 
+        await ensureWdInstalled();
+
         // Start karma server
         const conf = {
             ...config,
diff --git a/src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs b/src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs
index fe5ae6dda8..6e28f47cc6 100644
--- a/src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs
+++ b/src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs
@@ -22,7 +22,6 @@ using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Internal;
 using Microsoft.AspNetCore.SignalR.Tests;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Testing;
diff --git a/src/SignalR/common/Http.Connections/test/MapConnectionHandlerTests.cs b/src/SignalR/common/Http.Connections/test/MapConnectionHandlerTests.cs
index 1b5716c01c..68e086c560 100644
--- a/src/SignalR/common/Http.Connections/test/MapConnectionHandlerTests.cs
+++ b/src/SignalR/common/Http.Connections/test/MapConnectionHandlerTests.cs
@@ -16,7 +16,7 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Hosting.Server.Features;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.AspNetCore.SignalR.Tests;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Xunit;
diff --git a/src/SignalR/common/testassets/Tests.Utils/WebSocketsSupportedConditionAttribute.cs b/src/SignalR/common/testassets/Tests.Utils/WebSocketsSupportedConditionAttribute.cs
index 581597bef4..cdf6739995 100644
--- a/src/SignalR/common/testassets/Tests.Utils/WebSocketsSupportedConditionAttribute.cs
+++ b/src/SignalR/common/testassets/Tests.Utils/WebSocketsSupportedConditionAttribute.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using System.Text;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 
 namespace Microsoft.AspNetCore.SignalR.Tests
 {
diff --git a/src/SignalR/server/Core/src/Internal/DefaultHubProtocolResolver.cs b/src/SignalR/server/Core/src/Internal/DefaultHubProtocolResolver.cs
index 5475fd3f07..546a2f988b 100644
--- a/src/SignalR/server/Core/src/Internal/DefaultHubProtocolResolver.cs
+++ b/src/SignalR/server/Core/src/Internal/DefaultHubProtocolResolver.cs
@@ -23,13 +23,12 @@ namespace Microsoft.AspNetCore.SignalR.Internal
             _logger = logger ?? NullLogger<DefaultHubProtocolResolver>.Instance;
             _availableProtocols = new Dictionary<string, IHubProtocol>(StringComparer.OrdinalIgnoreCase);
 
-            // We might get duplicates in _hubProtocols, but we're going to check it and overwrite in just a sec.
-            _hubProtocols = availableProtocols.ToList();
-            foreach (var protocol in _hubProtocols)
+            foreach (var protocol in availableProtocols)
             {
                 Log.RegisteredSignalRProtocol(_logger, protocol.Name, protocol.GetType());
                 _availableProtocols[protocol.Name] = protocol;
             }
+            _hubProtocols = _availableProtocols.Values.ToList();
         }
 
         public virtual IHubProtocol GetProtocol(string protocolName, IReadOnlyList<string> supportedProtocols)
diff --git a/src/SignalR/server/SignalR/test/DefaultTransportFactoryTests.cs b/src/SignalR/server/SignalR/test/DefaultTransportFactoryTests.cs
index 11fdab9749..f4d5a17830 100644
--- a/src/SignalR/server/SignalR/test/DefaultTransportFactoryTests.cs
+++ b/src/SignalR/server/SignalR/test/DefaultTransportFactoryTests.cs
@@ -6,7 +6,7 @@ using System.Net.Http;
 using Microsoft.AspNetCore.Http.Connections;
 using Microsoft.AspNetCore.Http.Connections.Client;
 using Microsoft.AspNetCore.Http.Connections.Client.Internal;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.Logging;
 using Xunit;
 
diff --git a/src/SignalR/server/SignalR/test/EndToEndTests.cs b/src/SignalR/server/SignalR/test/EndToEndTests.cs
index f4d1815b26..afd93d2c42 100644
--- a/src/SignalR/server/SignalR/test/EndToEndTests.cs
+++ b/src/SignalR/server/SignalR/test/EndToEndTests.cs
@@ -15,7 +15,6 @@ using Microsoft.AspNetCore.Http.Connections.Client;
 using Microsoft.AspNetCore.Http.Connections.Client.Internal;
 using Microsoft.AspNetCore.SignalR.Client;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Testing;
diff --git a/src/SignalR/server/SignalR/test/Internal/DefaultHubProtocolResolverTests.cs b/src/SignalR/server/SignalR/test/Internal/DefaultHubProtocolResolverTests.cs
index ae18f59b66..418385ff0c 100644
--- a/src/SignalR/server/SignalR/test/Internal/DefaultHubProtocolResolverTests.cs
+++ b/src/SignalR/server/SignalR/test/Internal/DefaultHubProtocolResolverTests.cs
@@ -84,6 +84,22 @@ namespace Microsoft.AspNetCore.SignalR.Common.Protocol.Tests
             Assert.Same(jsonProtocol2, resolvedProtocol);
         }
 
+        [Fact]
+        public void AllProtocolsOnlyReturnsLatestOfSameType()
+        {
+            var jsonProtocol1 = new NewtonsoftJsonHubProtocol();
+            var jsonProtocol2 = new NewtonsoftJsonHubProtocol();
+            var resolver = new DefaultHubProtocolResolver(new[] {
+                jsonProtocol1,
+                jsonProtocol2
+            }, NullLogger<DefaultHubProtocolResolver>.Instance);
+
+            var hubProtocols = resolver.AllProtocols;
+            Assert.Equal(1, hubProtocols.Count);
+
+            Assert.Same(jsonProtocol2, hubProtocols[0]);
+        }
+
         public static IEnumerable<object[]> HubProtocolNames => HubProtocolHelpers.AllProtocols.Select(p => new object[] {p.Name});
     }
 }
diff --git a/src/SignalR/server/SignalR/test/WebSocketsTransportTests.cs b/src/SignalR/server/SignalR/test/WebSocketsTransportTests.cs
index 3d3cc1da9b..c40be2b320 100644
--- a/src/SignalR/server/SignalR/test/WebSocketsTransportTests.cs
+++ b/src/SignalR/server/SignalR/test/WebSocketsTransportTests.cs
@@ -12,7 +12,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Connections;
 using Microsoft.AspNetCore.Http.Connections.Client;
 using Microsoft.AspNetCore.Http.Connections.Client.Internal;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Moq;
 using Xunit;
 
diff --git a/src/SignalR/server/StackExchangeRedis/test/RedisEndToEnd.cs b/src/SignalR/server/StackExchangeRedis/test/RedisEndToEnd.cs
index b214afaeca..2893ed4add 100644
--- a/src/SignalR/server/StackExchangeRedis/test/RedisEndToEnd.cs
+++ b/src/SignalR/server/StackExchangeRedis/test/RedisEndToEnd.cs
@@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Http.Connections;
 using Microsoft.AspNetCore.SignalR.Client;
 using Microsoft.AspNetCore.SignalR.Protocol;
 using Microsoft.AspNetCore.SignalR.Tests;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Xunit;
diff --git a/src/SignalR/server/StackExchangeRedis/test/SkipIfDockerNotPresentAttribute.cs b/src/SignalR/server/StackExchangeRedis/test/SkipIfDockerNotPresentAttribute.cs
index bf6c9ad91a..e4e22b2d7d 100644
--- a/src/SignalR/server/StackExchangeRedis/test/SkipIfDockerNotPresentAttribute.cs
+++ b/src/SignalR/server/StackExchangeRedis/test/SkipIfDockerNotPresentAttribute.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 
 namespace Microsoft.AspNetCore.SignalR.StackExchangeRedis.Tests
 {
diff --git a/src/SiteExtensions/build.cmd b/src/SiteExtensions/build.cmd
index af51ba3dd6..a69a02aa75 100644
--- a/src/SiteExtensions/build.cmd
+++ b/src/SiteExtensions/build.cmd
@@ -10,9 +10,9 @@ IF %ERRORLEVEL% NEQ 0 (
 )
 
 ECHO Building LoggingBranch
-REM Remove /p:DisablePackageAssetsCache=true /p:DisableTransitiveFrameworkReferences=true which workarounds dotnet store and publish behaviour changes in preview 6
-CALL %RepoRoot%\build.cmd -forceCoreMsbuild -arch x64 -projects %~dp0LoggingBranch\LB.csproj /p:DisablePackageAssetsCache=true /p:DisableTransitiveFrameworkReferences=true /bl:artifacts/log/SiteExtensions-LoggingBranch-x64.binlog %*
-CALL %RepoRoot%\build.cmd -forceCoreMsbuild -arch x86 -projects %~dp0LoggingBranch\LB.csproj /p:DisablePackageAssetsCache=true /p:DisableTransitiveFrameworkReferences=true /bl:artifacts/log/SiteExtensions-LoggingBranch-x86.binlog %*
+REM /p:DisableTransitiveFrameworkReferences=true is needed to prevent SDK from picking up transitive references to Microsoft.AspNetCore.App as framework references https://github.com/dotnet/sdk/pull/3221
+CALL %RepoRoot%\build.cmd -forceCoreMsbuild -arch x64 -projects %~dp0LoggingBranch\LB.csproj /p:DisableTransitiveFrameworkReferences=true /bl:artifacts/log/SiteExtensions-LoggingBranch-x64.binlog %*
+CALL %RepoRoot%\build.cmd -forceCoreMsbuild -arch x86 -projects %~dp0LoggingBranch\LB.csproj /p:DisableTransitiveFrameworkReferences=true /bl:artifacts/log/SiteExtensions-LoggingBranch-x86.binlog %*
 
 IF %ERRORLEVEL% NEQ 0 (
    EXIT /b %ErrorLevel%
diff --git a/src/Tools/Extensions.ApiDescription.Client/README.md b/src/Tools/Extensions.ApiDescription.Client/README.md
new file mode 100644
index 0000000000..d268f30e3e
--- /dev/null
+++ b/src/Tools/Extensions.ApiDescription.Client/README.md
@@ -0,0 +1,7 @@
+# Microsoft.Extensions.ApiDescription.Client
+
+MSBuild glue for OpenAPI code generation.
+
+## How To Use
+
+See partner packages such as [NSwag.ApiDescription.Client](https://www.nuget.org/packages/NSwag.ApiDescription.Client/) for intended use.
diff --git a/src/Mvc/Extensions.ApiDescription.Client/src/CSharpIdentifier.cs b/src/Tools/Extensions.ApiDescription.Client/src/CSharpIdentifier.cs
similarity index 97%
rename from src/Mvc/Extensions.ApiDescription.Client/src/CSharpIdentifier.cs
rename to src/Tools/Extensions.ApiDescription.Client/src/CSharpIdentifier.cs
index b1ee4f7c0c..c7d2d13e49 100644
--- a/src/Mvc/Extensions.ApiDescription.Client/src/CSharpIdentifier.cs
+++ b/src/Tools/Extensions.ApiDescription.Client/src/CSharpIdentifier.cs
@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Globalization;
diff --git a/src/Mvc/Extensions.ApiDescription.Client/src/GetCurrentItems.cs b/src/Tools/Extensions.ApiDescription.Client/src/GetCurrentOpenApiReference.cs
similarity index 89%
rename from src/Mvc/Extensions.ApiDescription.Client/src/GetCurrentItems.cs
rename to src/Tools/Extensions.ApiDescription.Client/src/GetCurrentOpenApiReference.cs
index 975e716d64..c413ddb939 100644
--- a/src/Mvc/Extensions.ApiDescription.Client/src/GetCurrentItems.cs
+++ b/src/Tools/Extensions.ApiDescription.Client/src/GetCurrentOpenApiReference.cs
@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.Build.Framework;
@@ -9,7 +9,7 @@ namespace Microsoft.Extensions.ApiDescription.Client
     /// <summary>
     /// Restore <see cref="ITaskItem"/>s from given property value.
     /// </summary>
-    public class GetCurrentItems : Task
+    public class GetCurrentOpenApiReference : Task
     {
         /// <summary>
         /// The property value to deserialize.
diff --git a/src/Mvc/Extensions.ApiDescription.Client/src/GetFileReferenceMetadata.cs b/src/Tools/Extensions.ApiDescription.Client/src/GetOpenApiReferenceMetadata.cs
similarity index 95%
rename from src/Mvc/Extensions.ApiDescription.Client/src/GetFileReferenceMetadata.cs
rename to src/Tools/Extensions.ApiDescription.Client/src/GetOpenApiReferenceMetadata.cs
index 2b0447c590..b7894e0bf0 100644
--- a/src/Mvc/Extensions.ApiDescription.Client/src/GetFileReferenceMetadata.cs
+++ b/src/Tools/Extensions.ApiDescription.Client/src/GetOpenApiReferenceMetadata.cs
@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
@@ -13,7 +13,7 @@ namespace Microsoft.Extensions.ApiDescription.Client
     /// Adds or corrects ClassName, FirstForGenerator, Namespace, and OutputPath metadata in OpenApiReference items.
     /// Also stores final metadata as SerializedMetadata.
     /// </summary>
-    public class GetFileReferenceMetadata : Task
+    public class GetOpenApiReferenceMetadata : Task
     {
         private const string TypeScriptLanguageName = "TypeScript";
 
@@ -63,8 +63,7 @@ namespace Microsoft.Extensions.ApiDescription.Client
                         "OpenApiReference" :
                         "OpenApiProjectReference";
 
-                    Log.LogError(
-                        Resources.FormatInvalidEmptyMetadataValue("CodeGenerator", "OpenApiReference", item.ItemSpec));
+                    Log.LogError(Resources.FormatInvalidEmptyMetadataValue("CodeGenerator", type, item.ItemSpec));
                     continue;
                 }
 
diff --git a/src/Mvc/Extensions.ApiDescription.Client/src/MetadataSerializer.cs b/src/Tools/Extensions.ApiDescription.Client/src/MetadataSerializer.cs
similarity index 100%
rename from src/Mvc/Extensions.ApiDescription.Client/src/MetadataSerializer.cs
rename to src/Tools/Extensions.ApiDescription.Client/src/MetadataSerializer.cs
diff --git a/src/Mvc/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.csproj b/src/Tools/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.csproj
similarity index 79%
rename from src/Mvc/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.csproj
rename to src/Tools/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.csproj
index 7abe5134b7..c50a0115fa 100644
--- a/src/Mvc/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.csproj
+++ b/src/Tools/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <!-- Do not complain about lack of lib folder. -->
     <NoPackageAnalysis>true</NoPackageAnalysis>
@@ -7,9 +7,9 @@
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
     <PackageId>$(MSBuildProjectName)</PackageId>
-    <PackageTags>Build Tasks;MSBuild;Swagger;Open API;code generation; Web API client</PackageTags>
+    <PackageTags>Build Tasks;MSBuild;Swagger;OpenAPI;code generation;Web API client;service reference</PackageTags>
     <IsShippingPackage>true</IsShippingPackage>
-    <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <DevelopmentDependency>true</DevelopmentDependency>
     <HasReferenceAssembly>false</HasReferenceAssembly>
   </PropertyGroup>
diff --git a/src/Mvc/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.nuspec b/src/Tools/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.nuspec
similarity index 72%
rename from src/Mvc/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.nuspec
rename to src/Tools/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.nuspec
index ec5b1d5ffc..23d654d168 100644
--- a/src/Mvc/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.nuspec
+++ b/src/Tools/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.nuspec
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata minClientVersion="2.8">
     $CommonMetadataElements$
@@ -7,7 +7,6 @@
   <files>
     <file src="build\*" target="build" />
     <file src="buildMultiTargeting\*" target="buildMultiTargeting" />
-    <file src="$baseOutputPath$\$configuration$\net461\Microsoft.Extensions.ApiDescription.Client.*" target="tasks\net461" />
     <file src="$baseOutputPath$\$configuration$\netstandard2.0\Microsoft.Extensions.ApiDescription.Client.*" target="tasks\netstandard2.0" />
   </files>
 </package>
diff --git a/src/Tools/Extensions.ApiDescription.Client/src/Properties/AssemblyInfo.cs b/src/Tools/Extensions.ApiDescription.Client/src/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..5d2f75d233
--- /dev/null
+++ b/src/Tools/Extensions.ApiDescription.Client/src/Properties/AssemblyInfo.cs
@@ -0,0 +1,6 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("Microsoft.Extensions.ApiDescription.Client.Tests, PublicKey = 0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
diff --git a/src/Mvc/Extensions.ApiDescription.Client/src/Resources.resx b/src/Tools/Extensions.ApiDescription.Client/src/Resources.resx
similarity index 100%
rename from src/Mvc/Extensions.ApiDescription.Client/src/Resources.resx
rename to src/Tools/Extensions.ApiDescription.Client/src/Resources.resx
diff --git a/src/Mvc/Extensions.ApiDescription.Client/src/build/Microsoft.Extensions.ApiDescription.Client.props b/src/Tools/Extensions.ApiDescription.Client/src/build/Microsoft.Extensions.ApiDescription.Client.props
similarity index 84%
rename from src/Mvc/Extensions.ApiDescription.Client/src/build/Microsoft.Extensions.ApiDescription.Client.props
rename to src/Tools/Extensions.ApiDescription.Client/src/build/Microsoft.Extensions.ApiDescription.Client.props
index 1212cc91fb..957121063d 100644
--- a/src/Mvc/Extensions.ApiDescription.Client/src/build/Microsoft.Extensions.ApiDescription.Client.props
+++ b/src/Tools/Extensions.ApiDescription.Client/src/build/Microsoft.Extensions.ApiDescription.Client.props
@@ -1,15 +1,10 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
 <Project>
   <PropertyGroup>
-    <_ApiDescriptionClientAssemblyTarget
-        Condition="'$(MSBuildRuntimeType)' == 'Core'">netstandard2.0</_ApiDescriptionClientAssemblyTarget>
-    <_ApiDescriptionClientAssemblyTarget
-        Condition="'$(MSBuildRuntimeType)' != 'Core'">net461</_ApiDescriptionClientAssemblyTarget>
-    <_ApiDescriptionClientAssemblyPath>$(MSBuildThisFileDirectory)/../tasks/$(_ApiDescriptionClientAssemblyTarget)/Microsoft.Extensions.ApiDescription.Client.dll</_ApiDescriptionClientAssemblyPath>
-    <_ApiDescriptionClientAssemblyTarget />
+    <_ApiDescriptionClientAssemblyPath>$(MSBuildThisFileDirectory)/../tasks/netstandard2.0/Microsoft.Extensions.ApiDescription.Client.dll</_ApiDescriptionClientAssemblyPath>
   </PropertyGroup>
-  <UsingTask TaskName="GetCurrentItems" AssemblyFile="$(_ApiDescriptionClientAssemblyPath)" />
-  <UsingTask TaskName="GetFileReferenceMetadata" AssemblyFile="$(_ApiDescriptionClientAssemblyPath)" />
+  <UsingTask TaskName="GetCurrentOpenApiReference" AssemblyFile="$(_ApiDescriptionClientAssemblyPath)" />
+  <UsingTask TaskName="GetOpenApiReferenceMetadata" AssemblyFile="$(_ApiDescriptionClientAssemblyPath)" />
 
   <!--
     Settings users may update as they see fit.
@@ -39,7 +34,7 @@
 
     <!--
       If 'true' (the default), build projects referenced in @(OpenApiProjectReference) items before retrieving that
-      project's Open API documents list (or generating code). If 'false', ensure the referenced projects build before
+      project's OpenAPI documents list (or generating code). If 'false', ensure the referenced projects build before
       this one in the solution or through other means. IDEs may be confused about the project dependency graph in this
       case.
     -->
@@ -47,7 +42,7 @@
         Condition="'$(OpenApiBuildReferencedProjects)' == ''">true</OpenApiBuildReferencedProjects>
 
     <!--
-      Default folder to place code generated from Open API documents. Value is interpreted relative to the project
+      Default folder to place code generated from OpenAPI documents. Value is interpreted relative to the project
       folder, unless already an absolute path. Part of the default %(OutputPath) metadata of @(OpenApiReference) and
       @(OpenApiProjectReference) items.
     -->
@@ -98,6 +93,13 @@
 
     <!-- OpenApiProjectReference items may include all OpenApiReference metadata. -->
     <OpenApiProjectReference>
+      <!--
+        Semicolon-separated list of global properties to remove in a @(ProjectReference) item created for this
+        @(OpenApiProjectReference). These properties, along with Configuration, Platform, RuntimeIdentifier and
+        TargetFrameworks, are also removed when invoking the 'OpenApiGetDocuments' target in the referenced project.
+      -->
+      <GlobalPropertiesToRemove>TargetFramework</GlobalPropertiesToRemove>
+
       <!--
         Name of the class to generate. Defaults to match filename in %(OutputPath). To avoid compilation errors,
         override only if the referenced project has a single registered document.
diff --git a/src/Mvc/Extensions.ApiDescription.Client/src/build/Microsoft.Extensions.ApiDescription.Client.targets b/src/Tools/Extensions.ApiDescription.Client/src/build/Microsoft.Extensions.ApiDescription.Client.targets
similarity index 91%
rename from src/Mvc/Extensions.ApiDescription.Client/src/build/Microsoft.Extensions.ApiDescription.Client.targets
rename to src/Tools/Extensions.ApiDescription.Client/src/build/Microsoft.Extensions.ApiDescription.Client.targets
index b74e55c5a9..af590565c6 100644
--- a/src/Mvc/Extensions.ApiDescription.Client/src/build/Microsoft.Extensions.ApiDescription.Client.targets
+++ b/src/Tools/Extensions.ApiDescription.Client/src/build/Microsoft.Extensions.ApiDescription.Client.targets
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
 <Project>
   <!-- Internal settings. Not intended for customization. -->
   <PropertyGroup>
@@ -25,7 +25,6 @@
       @(OpenApiProjectReference) items.
     -->
     <ProjectReference Include="@(OpenApiProjectReference)" Exclude="@(ProjectReference)">
-      <GlobalPropertiesToRemove>TargetFramework</GlobalPropertiesToRemove>
       <Private>false</Private>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
@@ -44,12 +43,14 @@
         BuildInParallel="$(BuildInParallel)"
         Projects="@(OpenApiProjectReference)"
         RebaseOutputs="true"
-        RemoveProperties="Configuration;Platform;RuntimeIdentifier;TargetFramework;TargetFrameworks">
+        RemoveProperties="RuntimeIdentifier;TargetFrameworks;%(OpenApiProjectReference.GlobalPropertiesToRemove)">
       <Output TaskParameter="TargetOutputs" ItemName="_Temporary" />
     </MSBuild>
 
     <ItemGroup>
-      <OpenApiReference Include="@(_Temporary)" Exclude="@(OpenApiReference)" RemoveMetadata="FullConfiguration" />
+      <OpenApiReference Include="@(_Temporary)" Exclude="@(OpenApiReference)" RemoveMetadata="FullConfiguration">
+        <SourceProject>%(_Temporary.OriginalItemSpec)</SourceProject>
+      </OpenApiReference>
       <_Temporary Remove="@(_Temporary)" />
     </ItemGroup>
   </Target>
@@ -61,12 +62,12 @@
       <_Temporary Remove="@(_Temporary)" />
     </ItemGroup>
 
-    <GetFileReferenceMetadata Inputs="@(OpenApiReference)"
+    <GetOpenApiReferenceMetadata Inputs="@(OpenApiReference)"
         Extension="$(DefaultLanguageSourceExtension)"
         Namespace="$(RootNamespace)"
         OutputDirectory="$(OpenApiCodeDirectory)">
       <Output TaskParameter="Outputs" ItemName="_Temporary" />
-    </GetFileReferenceMetadata>
+    </GetOpenApiReferenceMetadata>
 
     <ItemGroup>
       <OpenApiReference Remove="@(OpenApiReference)" />
@@ -76,9 +77,9 @@
   </Target>
 
   <Target Name="_GetCurrentOpenApiReference">
-    <GetCurrentItems Input="$(GeneratorMetadata)">
+    <GetCurrentOpenApiReference Input="$(GeneratorMetadata)">
       <Output TaskParameter="Outputs" ItemName="CurrentOpenApiReference" />
-    </GetCurrentItems>
+    </GetCurrentOpenApiReference>
   </Target>
 
   <Target Name="_InnerGenerateOpenApiCode" DependsOnTargets="_GetCurrentOpenApiReference;$(GeneratorTarget)" />
@@ -87,6 +88,8 @@
       Condition="$(OpenApiGenerateCodeAtDesignTime) OR ('$(DesignTimeBuild)' != 'true' AND '$(BuildingProject)' == 'true')"
       Inputs="@(OpenApiReference)"
       Outputs="%(OutputPath)">
+    <Error Condition="!Exists('%(OpenApiReference.FullPath)')" Text="Input OpenAPI file %(Identity) does not exist." />
+
     <MSBuild Projects="$(MSBuildProjectFullPath)"
         BuildInParallel="$(BuildInParallel)"
         Properties="GeneratorTargetPath=%(OpenApiReference.OutputPath);GeneratorTarget=Generate%(CodeGenerator);GeneratorMetadata=%(SerializedMetadata)"
@@ -130,7 +133,7 @@
       </Compile>
 
       <FileWrites Exclude="@(FileWrites)"
-          Include="@(_Files);@(_Directories -> '%(Identity)/**/*.ts;%(Identity)/**/*.tsx;%(Identity)/**/*.$(DefaultLanguageSourceExtension)'" />
+          Include="@(_Files);@(_Directories -> '%(Identity)/**/*.ts;%(Identity)/**/*.tsx;%(Identity)/**/*.$(DefaultLanguageSourceExtension)')" />
 
       <_Files Remove="@(_Files)" />
       <_Directories Remove="@(_Directories)" />
diff --git a/src/Mvc/Extensions.ApiDescription.Client/src/build/OpenApiItemsSchema.xaml b/src/Tools/Extensions.ApiDescription.Client/src/build/OpenApiItemsSchema.xaml
similarity index 100%
rename from src/Mvc/Extensions.ApiDescription.Client/src/build/OpenApiItemsSchema.xaml
rename to src/Tools/Extensions.ApiDescription.Client/src/build/OpenApiItemsSchema.xaml
diff --git a/src/Mvc/Extensions.ApiDescription.Client/src/buildMultiTargeting/Microsoft.Extensions.ApiDescription.Client.props b/src/Tools/Extensions.ApiDescription.Client/src/buildMultiTargeting/Microsoft.Extensions.ApiDescription.Client.props
similarity index 100%
rename from src/Mvc/Extensions.ApiDescription.Client/src/buildMultiTargeting/Microsoft.Extensions.ApiDescription.Client.props
rename to src/Tools/Extensions.ApiDescription.Client/src/buildMultiTargeting/Microsoft.Extensions.ApiDescription.Client.props
diff --git a/src/Mvc/Extensions.ApiDescription.Client/src/buildMultiTargeting/Microsoft.Extensions.ApiDescription.Client.targets b/src/Tools/Extensions.ApiDescription.Client/src/buildMultiTargeting/Microsoft.Extensions.ApiDescription.Client.targets
similarity index 100%
rename from src/Mvc/Extensions.ApiDescription.Client/src/buildMultiTargeting/Microsoft.Extensions.ApiDescription.Client.targets
rename to src/Tools/Extensions.ApiDescription.Client/src/buildMultiTargeting/Microsoft.Extensions.ApiDescription.Client.targets
diff --git a/src/Tools/Extensions.ApiDescription.Client/test/CSharpIdentifierTest.cs b/src/Tools/Extensions.ApiDescription.Client/test/CSharpIdentifierTest.cs
new file mode 100644
index 0000000000..d99b3a55d6
--- /dev/null
+++ b/src/Tools/Extensions.ApiDescription.Client/test/CSharpIdentifierTest.cs
@@ -0,0 +1,107 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using Xunit;
+
+namespace Microsoft.Extensions.ApiDescription.Client
+{
+    public class CSharpIdentifierTest
+    {
+        [Theory]
+        [InlineData('a')]
+        [InlineData('Q')]
+        [InlineData('\u2164')] // UnicodeCategory.LetterNumber (roman numeral five)
+        [InlineData('_')]
+        [InlineData('9')]
+        [InlineData('\u0303')] // UnicodeCategory.NonSpacingMark (combining tilde)
+        [InlineData('\u09CB')] // UnicodeCategory.SpacingCombiningMark (Bengali vowel sign O)
+        [InlineData('\uFE4F')] // UnicodeCategory.ConnectorPunctuation (wavy low line)
+        [InlineData('\u2062')] // UnicodeCategory.Format (invisible times)
+        public void IsIdentifierPart_ReturnsTrue_WhenItShould(char character)
+        {
+            // Arrange and Act
+            var result = CSharpIdentifier.IsIdentifierPart(character);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Theory]
+        [InlineData('/')]
+        [InlineData('-')]
+        [InlineData('\u20DF')] // UnicodeCategory.EnclosingMark (combining enclosing diamond)
+        [InlineData('\u2005')] // UnicodeCategory.SpaceSeparator (four-per-em space)
+        [InlineData('\u0096')] // UnicodeCategory.Control (start of guarded area)
+        [InlineData('\uFF1C')] // UnicodeCategory.MathSymbol (fullwidth less-than sign)
+        public void IsIdentifierPart_ReturnsFalse_WhenItShould(char character)
+        {
+            // Arrange and Act
+            var result = CSharpIdentifier.IsIdentifierPart(character);
+
+            // Assert
+            Assert.False(result);
+        }
+
+        // Output length is one longer than input in these cases.
+        [Theory]
+        [InlineData("9", "_9")]
+        [InlineData("\u0303", "_\u0303")] // UnicodeCategory.NonSpacingMark (combining tilde)
+        [InlineData("\u09CB", "_\u09CB")] // UnicodeCategory.SpacingCombiningMark (Bengali vowel sign O)
+        [InlineData("\uFE4F", "_\uFE4F")] // UnicodeCategory.ConnectorPunctuation (wavy low line)
+        [InlineData("\u2062", "_\u2062")] // UnicodeCategory.Format (invisible times)
+        public void SanitizeIdentifier_AddsUnderscore_WhenItShould(string input, string expectdOutput)
+        {
+            // Arrange and Act
+            var output = CSharpIdentifier.SanitizeIdentifier(input);
+
+            // Assert
+            Assert.Equal(expectdOutput, output);
+        }
+
+        [Theory]
+        [InlineData("a", "a")]
+        [InlineData("Q", "Q")]
+        [InlineData("\u2164", "\u2164")]
+        [InlineData("_", "_")]
+        public void SanitizeIdentifier_DoesNotAddUnderscore_WhenValidStartCharacter(string input, string expectdOutput)
+        {
+            // Arrange and Act
+            var output = CSharpIdentifier.SanitizeIdentifier(input);
+
+            // Assert
+            Assert.Equal(expectdOutput, output);
+        }
+
+        [Theory]
+        [InlineData("/", "_")]
+        [InlineData("-", "_")]
+        [InlineData("\u20DF", "_")] // UnicodeCategory.EnclosingMark (combining enclosing diamond)
+        [InlineData("\u2005", "_")] // UnicodeCategory.SpaceSeparator (four-per-em space)
+        [InlineData("\u0096", "_")] // UnicodeCategory.Control (start of guarded area)
+        [InlineData("\uFF1C", "_")] // UnicodeCategory.MathSymbol (fullwidth less-than sign)
+        public void SanitizeIdentifier_DoesNotAddUnderscore_WhenInvalidCharacter(string input, string expectdOutput)
+        {
+            // Arrange and Act
+            var output = CSharpIdentifier.SanitizeIdentifier(input);
+
+            // Assert
+            Assert.Equal(expectdOutput, output);
+        }
+
+        [Theory]
+        [InlineData("a/", "a_")]
+        [InlineData("aa-bb", "aa_bb")]
+        [InlineData("aa\u20DF\u20DF", "aa__")] // UnicodeCategory.EnclosingMark (combining enclosing diamond)
+        [InlineData("aa\u2005bb\u2005cc", "aa_bb_cc")] // UnicodeCategory.SpaceSeparator (four-per-em space)
+        [InlineData("aa\u0096\u0096bb", "aa__bb")] // UnicodeCategory.Control (start of guarded area)
+        [InlineData("aa\uFF1C\uFF1C\uFF1Cbb", "aa___bb")] // UnicodeCategory.MathSymbol (fullwidth less-than sign)
+        public void SanitizeIdentifier_ReplacesInvalidCharacters_WhenNotFirst(string input, string expectdOutput)
+        {
+            // Arrange and Act
+            var output = CSharpIdentifier.SanitizeIdentifier(input);
+
+            // Assert
+            Assert.Equal(expectdOutput, output);
+        }
+    }
+}
diff --git a/src/Tools/Extensions.ApiDescription.Client/test/GetCurrentOpenApiReferenceTest.cs b/src/Tools/Extensions.ApiDescription.Client/test/GetCurrentOpenApiReferenceTest.cs
new file mode 100644
index 0000000000..1b6abc9f27
--- /dev/null
+++ b/src/Tools/Extensions.ApiDescription.Client/test/GetCurrentOpenApiReferenceTest.cs
@@ -0,0 +1,57 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using Xunit;
+
+namespace Microsoft.Extensions.ApiDescription.Client
+{
+    public class GetCurrentOpenApiReferenceTest
+    {
+        [Fact]
+        public void Execute_ReturnsExpectedItem()
+        {
+            // Arrange
+            string input = "Identity=../files/azureMonitor.json|ClassName=azureMonitorClient|" +
+                "CodeGenerator=NSwagCSharp|Namespace=ConsoleClient|Options=|OutputPath=" +
+                "C:\\dd\\dnx\\AspNetCore\\artifacts\\obj\\ConsoleClient\\azureMonitorClient.cs|" +
+                "OriginalItemSpec=../files/azureMonitor.json|FirstForGenerator=true";
+            var task = new GetCurrentOpenApiReference
+            {
+                Input = input,
+            };
+
+            string expectedIdentity = "../files/azureMonitor.json";
+            IDictionary<string, string> expectedMetadata = new SortedDictionary<string, string>(StringComparer.Ordinal)
+            {
+                { "ClassName", "azureMonitorClient" },
+                { "CodeGenerator", "NSwagCSharp" },
+                { "FirstForGenerator", "true" },
+                { "Namespace", "ConsoleClient" },
+                { "Options", "" },
+                { "OriginalItemSpec", expectedIdentity },
+                { "OutputPath", "C:\\dd\\dnx\\AspNetCore\\artifacts\\obj\\ConsoleClient\\azureMonitorClient.cs" },
+            };
+
+            // Act
+            var result = task.Execute();
+
+            // Assert
+            Assert.True(result);
+            Assert.False(task.Log.HasLoggedErrors);
+            var output = Assert.Single(task.Outputs);
+            Assert.Equal(expectedIdentity, output.ItemSpec);
+            var metadata = Assert.IsAssignableFrom<IDictionary<string, string>>(output.CloneCustomMetadata());
+
+            // The dictionary CloneCustomMetadata returns doesn't provide a useful KeyValuePair enumerator.
+            var orderedMetadata = new SortedDictionary<string, string>(StringComparer.Ordinal);
+            foreach (var key in metadata.Keys)
+            {
+                orderedMetadata.Add(key, metadata[key]);
+            }
+
+            Assert.Equal(expectedMetadata, orderedMetadata);
+        }
+    }
+}
diff --git a/src/Tools/Extensions.ApiDescription.Client/test/GetOpenApiReferenceMetadataTest.cs b/src/Tools/Extensions.ApiDescription.Client/test/GetOpenApiReferenceMetadataTest.cs
new file mode 100644
index 0000000000..7bc5cc7fb9
--- /dev/null
+++ b/src/Tools/Extensions.ApiDescription.Client/test/GetOpenApiReferenceMetadataTest.cs
@@ -0,0 +1,576 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using Microsoft.Build.Utilities;
+using Xunit;
+
+namespace Microsoft.Extensions.ApiDescription.Client
+{
+    public class GetOpenApiReferenceMetadataTest
+    {
+        [Fact]
+        public void Execute_AddsExpectedMetadata()
+        {
+            // Arrange
+            var identity = Path.Combine("TestProjects", "files", "NSwag.json");
+            var @namespace = "Console.Client";
+            var outputPath = Path.Combine("obj", "NSwagClient.cs");
+            var inputMetadata = new Dictionary<string, string> { { "CodeGenerator", "NSwagCSharp" } };
+            var task = new GetOpenApiReferenceMetadata
+            {
+                Extension = ".cs",
+                Inputs = new[] { new TaskItem(identity, inputMetadata) },
+                Namespace = @namespace,
+                OutputDirectory = "obj",
+            };
+
+            IDictionary<string, string> expectedMetadata = new SortedDictionary<string, string>(StringComparer.Ordinal)
+            {
+                { "ClassName", "NSwagClient" },
+                { "CodeGenerator", "NSwagCSharp" },
+                { "FirstForGenerator", "true" },
+                { "Namespace", @namespace },
+                { "OriginalItemSpec", identity },
+                { "OutputPath", outputPath },
+                {
+                    "SerializedMetadata",
+                    $"Identity={identity}|CodeGenerator=NSwagCSharp|" +
+                    $"OriginalItemSpec={identity}|FirstForGenerator=true|" +
+                    $"OutputPath={outputPath}|ClassName=NSwagClient|Namespace={@namespace}"
+                },
+            };
+
+            // Act
+            var result = task.Execute();
+
+            // Assert
+            Assert.True(result);
+            Assert.False(task.Log.HasLoggedErrors);
+            var output = Assert.Single(task.Outputs);
+            Assert.Equal(identity, output.ItemSpec);
+            var metadata = Assert.IsAssignableFrom<IDictionary<string, string>>(output.CloneCustomMetadata());
+
+            // The dictionary CloneCustomMetadata returns doesn't provide a useful KeyValuePair enumerator.
+            var orderedMetadata = new SortedDictionary<string, string>(StringComparer.Ordinal);
+            foreach (var key in metadata.Keys)
+            {
+                orderedMetadata.Add(key, metadata[key]);
+            }
+
+            Assert.Equal(expectedMetadata, orderedMetadata);
+        }
+
+        [Fact]
+        public void Execute_DoesNotOverrideClassName()
+        {
+            // Arrange
+            var identity = Path.Combine("TestProjects", "files", "NSwag.json");
+            var className = "ThisIsClassy";
+            var @namespace = "Console.Client";
+            var outputPath = Path.Combine("obj", $"NSwagClient.cs");
+            var inputMetadata = new Dictionary<string, string>
+            {
+                { "CodeGenerator", "NSwagCSharp" },
+                { "ClassName", className },
+            };
+
+            var task = new GetOpenApiReferenceMetadata
+            {
+                Extension = ".cs",
+                Inputs = new[] { new TaskItem(identity, inputMetadata) },
+                Namespace = @namespace,
+                OutputDirectory = "obj",
+            };
+
+            IDictionary<string, string> expectedMetadata = new SortedDictionary<string, string>(StringComparer.Ordinal)
+            {
+                { "ClassName", className },
+                { "CodeGenerator", "NSwagCSharp" },
+                { "FirstForGenerator", "true" },
+                { "Namespace", @namespace },
+                { "OriginalItemSpec", identity },
+                { "OutputPath", outputPath },
+                {
+                    "SerializedMetadata",
+                    $"Identity={identity}|CodeGenerator=NSwagCSharp|" +
+                    $"ClassName={className}|OriginalItemSpec={identity}|FirstForGenerator=true|" +
+                    $"OutputPath={outputPath}|Namespace={@namespace}"
+                },
+            };
+
+            // Act
+            var result = task.Execute();
+
+            // Assert
+            Assert.True(result);
+            Assert.False(task.Log.HasLoggedErrors);
+            var output = Assert.Single(task.Outputs);
+            Assert.Equal(identity, output.ItemSpec);
+            var metadata = Assert.IsAssignableFrom<IDictionary<string, string>>(output.CloneCustomMetadata());
+
+            // The dictionary CloneCustomMetadata returns doesn't provide a useful KeyValuePair enumerator.
+            var orderedMetadata = new SortedDictionary<string, string>(StringComparer.Ordinal);
+            foreach (var key in metadata.Keys)
+            {
+                orderedMetadata.Add(key, metadata[key]);
+            }
+
+            Assert.Equal(expectedMetadata, orderedMetadata);
+        }
+
+        [Fact]
+        public void Execute_DoesNotOverrideNamespace()
+        {
+            // Arrange
+            var defaultNamespace = "Console.Client";
+            var identity = Path.Combine("TestProjects", "files", "NSwag.json");
+            var @namespace = "NotConsole.NotClient";
+            var outputPath = Path.Combine("obj", "NSwagClient.cs");
+            var inputMetadata = new Dictionary<string, string>
+            {
+                { "CodeGenerator", "NSwagCSharp" },
+                { "Namespace", @namespace },
+            };
+
+            var task = new GetOpenApiReferenceMetadata
+            {
+                Extension = ".cs",
+                Inputs = new[] { new TaskItem(identity, inputMetadata) },
+                Namespace = defaultNamespace,
+                OutputDirectory = "obj",
+            };
+
+            IDictionary<string, string> expectedMetadata = new SortedDictionary<string, string>(StringComparer.Ordinal)
+            {
+                { "ClassName", "NSwagClient" },
+                { "CodeGenerator", "NSwagCSharp" },
+                { "FirstForGenerator", "true" },
+                { "Namespace", @namespace },
+                { "OriginalItemSpec", identity },
+                { "OutputPath", outputPath },
+                {
+                    "SerializedMetadata",
+                    $"Identity={identity}|CodeGenerator=NSwagCSharp|" +
+                    $"Namespace={@namespace}|OriginalItemSpec={identity}|FirstForGenerator=true|" +
+                    $"OutputPath={outputPath}|ClassName=NSwagClient"
+                },
+            };
+
+            // Act
+            var result = task.Execute();
+
+            // Assert
+            Assert.True(result);
+            Assert.False(task.Log.HasLoggedErrors);
+            var output = Assert.Single(task.Outputs);
+            Assert.Equal(identity, output.ItemSpec);
+            var metadata = Assert.IsAssignableFrom<IDictionary<string, string>>(output.CloneCustomMetadata());
+
+            // The dictionary CloneCustomMetadata returns doesn't provide a useful KeyValuePair enumerator.
+            var orderedMetadata = new SortedDictionary<string, string>(StringComparer.Ordinal);
+            foreach (var key in metadata.Keys)
+            {
+                orderedMetadata.Add(key, metadata[key]);
+            }
+
+            Assert.Equal(expectedMetadata, orderedMetadata);
+        }
+
+        [Fact]
+        public void Execute_DoesNotOverrideOutputPath_IfRooted()
+        {
+            // Arrange
+            var identity = Path.Combine("TestProjects", "files", "NSwag.json");
+            var className = "ThisIsClassy";
+            var @namespace = "Console.Client";
+            var outputPath = Path.Combine(Path.GetTempPath(), $"{className}.cs");
+            var inputMetadata = new Dictionary<string, string>
+            {
+                { "CodeGenerator", "NSwagCSharp" },
+                { "OutputPath", outputPath }
+            };
+
+            var task = new GetOpenApiReferenceMetadata
+            {
+                Extension = ".cs",
+                Inputs = new[] { new TaskItem(identity, inputMetadata) },
+                Namespace = @namespace,
+                OutputDirectory = "bin",
+            };
+
+            IDictionary<string, string> expectedMetadata = new SortedDictionary<string, string>(StringComparer.Ordinal)
+            {
+                { "ClassName", className },
+                { "CodeGenerator", "NSwagCSharp" },
+                { "FirstForGenerator", "true" },
+                { "Namespace", @namespace },
+                { "OriginalItemSpec", identity },
+                { "OutputPath", outputPath },
+                {
+                    "SerializedMetadata",
+                    $"Identity={identity}|CodeGenerator=NSwagCSharp|" +
+                    $"OutputPath={outputPath}|OriginalItemSpec={identity}|FirstForGenerator=true|" +
+                    $"ClassName={className}|Namespace={@namespace}"
+                },
+            };
+
+            // Act
+            var result = task.Execute();
+
+            // Assert
+            Assert.True(result);
+            Assert.False(task.Log.HasLoggedErrors);
+            var output = Assert.Single(task.Outputs);
+            Assert.Equal(identity, output.ItemSpec);
+            var metadata = Assert.IsAssignableFrom<IDictionary<string, string>>(output.CloneCustomMetadata());
+
+            // The dictionary CloneCustomMetadata returns doesn't provide a useful KeyValuePair enumerator.
+            var orderedMetadata = new SortedDictionary<string, string>(StringComparer.Ordinal);
+            foreach (var key in metadata.Keys)
+            {
+                orderedMetadata.Add(key, metadata[key]);
+            }
+
+            Assert.Equal(expectedMetadata, orderedMetadata);
+        }
+
+        [Fact]
+        public void Execute_LogsError_IfCodeGeneratorMissing()
+        {
+            // Arrange
+            var identity1 = Path.Combine("TestProjects", "files", "NSwag.json");
+            var identity2 = Path.Combine("TestProjects", "files", "swashbuckle.json");
+            var error1 = Resources.FormatInvalidEmptyMetadataValue("CodeGenerator", "OpenApiReference", identity1);
+            var error2 = Resources.FormatInvalidEmptyMetadataValue("CodeGenerator", "OpenApiProjectReference", identity2);
+            var @namespace = "Console.Client";
+            var inputMetadata1 = new Dictionary<string, string>
+            {
+                { "ExtraMetadata", "this is extra" },
+            };
+            var inputMetadata2 = new Dictionary<string, string>
+            {
+                { "Options", "-quiet" },
+                { "SourceProject", "ConsoleProject.csproj" },
+            };
+
+            var buildEngine = new MockBuildEngine();
+            var task = new GetOpenApiReferenceMetadata
+            {
+                BuildEngine = buildEngine,
+                Extension = ".cs",
+                Inputs = new[]
+                {
+                    new TaskItem(identity1, inputMetadata1),
+                    new TaskItem(identity2, inputMetadata2),
+                },
+                Namespace = @namespace,
+                OutputDirectory = "obj",
+            };
+
+            // Act
+            var result = task.Execute();
+
+            // Assert
+            Assert.False(result);
+            Assert.True(task.Log.HasLoggedErrors);
+            Assert.Equal(2, buildEngine.Errors);
+            Assert.Equal(0, buildEngine.Messages);
+            Assert.Equal(0, buildEngine.Warnings);
+            Assert.Contains(error1, buildEngine.Log, StringComparison.OrdinalIgnoreCase);
+            Assert.Contains(error2, buildEngine.Log, StringComparison.OrdinalIgnoreCase);
+        }
+
+        [Fact]
+        public void Execute_LogsError_IfOutputPathDuplicated()
+        {
+            // Arrange
+            var identity = Path.Combine("TestProjects", "files", "NSwag.json");
+            var codeGenerator = "NSwagCSharp";
+            var error = Resources.FormatDuplicateFileOutputPaths(Path.Combine("obj", "NSwagClient.cs"));
+            var @namespace = "Console.Client";
+            var inputMetadata1 = new Dictionary<string, string>
+            {
+                { "CodeGenerator", codeGenerator },
+                { "ExtraMetadata", "this is extra" },
+            };
+            var inputMetadata2 = new Dictionary<string, string>
+            {
+                { "CodeGenerator", codeGenerator },
+                { "Options", "-quiet" },
+            };
+
+            var buildEngine = new MockBuildEngine();
+            var task = new GetOpenApiReferenceMetadata
+            {
+                BuildEngine = buildEngine,
+                Extension = ".cs",
+                Inputs = new[]
+                {
+                    new TaskItem(identity, inputMetadata1),
+                    new TaskItem(identity, inputMetadata2),
+                },
+                Namespace = @namespace,
+                OutputDirectory = "obj",
+            };
+
+            // Act
+            var result = task.Execute();
+
+            // Assert
+            Assert.False(result);
+            Assert.True(task.Log.HasLoggedErrors);
+            Assert.Equal(1, buildEngine.Errors);
+            Assert.Equal(0, buildEngine.Messages);
+            Assert.Equal(0, buildEngine.Warnings);
+            Assert.Contains(error, buildEngine.Log, StringComparison.OrdinalIgnoreCase);
+        }
+
+        [Fact]
+        public void Execute_SetsClassName_BasedOnOutputPath()
+        {
+            // Arrange
+            var identity = Path.Combine("TestProjects", "files", "NSwag.json");
+            var className = "ThisIsClassy";
+            var @namespace = "Console.Client";
+            var outputPath = $"{className}.cs";
+            var expectedOutputPath = Path.Combine("bin", outputPath);
+            var inputMetadata = new Dictionary<string, string>
+            {
+                { "CodeGenerator", "NSwagCSharp" },
+                { "OutputPath", outputPath }
+            };
+
+            var task = new GetOpenApiReferenceMetadata
+            {
+                Extension = ".cs",
+                Inputs = new[] { new TaskItem(identity, inputMetadata) },
+                Namespace = @namespace,
+                OutputDirectory = "bin",
+            };
+
+            IDictionary<string, string> expectedMetadata = new SortedDictionary<string, string>(StringComparer.Ordinal)
+            {
+                { "ClassName", className },
+                { "CodeGenerator", "NSwagCSharp" },
+                { "FirstForGenerator", "true" },
+                { "Namespace", @namespace },
+                { "OriginalItemSpec", identity },
+                { "OutputPath", expectedOutputPath },
+                {
+                    "SerializedMetadata",
+                    $"Identity={identity}|CodeGenerator=NSwagCSharp|" +
+                    $"OutputPath={expectedOutputPath}|OriginalItemSpec={identity}|FirstForGenerator=true|" +
+                    $"ClassName={className}|Namespace={@namespace}"
+                },
+            };
+
+            // Act
+            var result = task.Execute();
+
+            // Assert
+            Assert.True(result);
+            Assert.False(task.Log.HasLoggedErrors);
+            var output = Assert.Single(task.Outputs);
+            Assert.Equal(identity, output.ItemSpec);
+            var metadata = Assert.IsAssignableFrom<IDictionary<string, string>>(output.CloneCustomMetadata());
+
+            // The dictionary CloneCustomMetadata returns doesn't provide a useful KeyValuePair enumerator.
+            var orderedMetadata = new SortedDictionary<string, string>(StringComparer.Ordinal);
+            foreach (var key in metadata.Keys)
+            {
+                orderedMetadata.Add(key, metadata[key]);
+            }
+
+            Assert.Equal(expectedMetadata, orderedMetadata);
+        }
+
+        [Theory]
+        [InlineData("aa-bb.cs", "aa_bb")]
+        [InlineData("aa.bb.cc.ts", "aa_bb_cc")]
+        [InlineData("aa\u20DF\u20DF.tsx", "aa__")] // UnicodeCategory.EnclosingMark (combining enclosing diamond)
+        [InlineData("aa\u2005bb\u2005cc.cs", "aa_bb_cc")] // UnicodeCategory.SpaceSeparator (four-per-em space)
+        [InlineData("aa\u0096\u0096bb.cs", "aa__bb")] // UnicodeCategory.Control (start of guarded area)
+        [InlineData("aa\uFF1C\uFF1C\uFF1Cbb.cs", "aa___bb")] // UnicodeCategory.MathSymbol (fullwidth less-than sign)
+        public void Execute_SetsClassName_BasedOnSanitizedOutputPath(string outputPath, string className)
+        {
+            // Arrange
+            var identity = Path.Combine("TestProjects", "files", "NSwag.json");
+            var @namespace = "Console.Client";
+            var expectedOutputPath = Path.Combine("bin", outputPath);
+            var inputMetadata = new Dictionary<string, string>
+            {
+                { "CodeGenerator", "NSwagCSharp" },
+                { "OutputPath", outputPath }
+            };
+
+            var task = new GetOpenApiReferenceMetadata
+            {
+                Extension = ".cs",
+                Inputs = new[] { new TaskItem(identity, inputMetadata) },
+                Namespace = @namespace,
+                OutputDirectory = "bin",
+            };
+
+            IDictionary<string, string> expectedMetadata = new SortedDictionary<string, string>(StringComparer.Ordinal)
+            {
+                { "ClassName", className },
+                { "CodeGenerator", "NSwagCSharp" },
+                { "FirstForGenerator", "true" },
+                { "Namespace", @namespace },
+                { "OriginalItemSpec", identity },
+                { "OutputPath", expectedOutputPath },
+                {
+                    "SerializedMetadata",
+                    $"Identity={identity}|CodeGenerator=NSwagCSharp|" +
+                    $"OutputPath={expectedOutputPath}|OriginalItemSpec={identity}|FirstForGenerator=true|" +
+                    $"ClassName={className}|Namespace={@namespace}"
+                },
+            };
+
+            // Act
+            var result = task.Execute();
+
+            // Assert
+            Assert.True(result);
+            Assert.False(task.Log.HasLoggedErrors);
+            var output = Assert.Single(task.Outputs);
+            Assert.Equal(identity, output.ItemSpec);
+            var metadata = Assert.IsAssignableFrom<IDictionary<string, string>>(output.CloneCustomMetadata());
+
+            // The dictionary CloneCustomMetadata returns doesn't provide a useful KeyValuePair enumerator.
+            var orderedMetadata = new SortedDictionary<string, string>(StringComparer.Ordinal);
+            foreach (var key in metadata.Keys)
+            {
+                orderedMetadata.Add(key, metadata[key]);
+            }
+
+            Assert.Equal(expectedMetadata, orderedMetadata);
+        }
+
+        [Fact]
+        public void Execute_SetsFirstForGenerator_UsesCorrectExtension()
+        {
+            // Arrange
+            var identity12 = Path.Combine("TestProjects", "files", "NSwag.json");
+            var identity3 = Path.Combine("TestProjects", "files", "swashbuckle.json");
+            var className12 = "NSwagClient";
+            var className3 = "swashbuckleClient";
+            var codeGenerator13 = "NSwagCSharp";
+            var codeGenerator2 = "NSwagTypeScript";
+            var inputMetadata1 = new Dictionary<string, string> { { "CodeGenerator", codeGenerator13 } };
+            var inputMetadata2 = new Dictionary<string, string> { { "CodeGenerator", codeGenerator2 } };
+            var inputMetadata3 = new Dictionary<string, string> { { "CodeGenerator", codeGenerator13 } };
+            var @namespace = "Console.Client";
+            var outputPath1 = Path.Combine("obj", $"{className12}.cs");
+            var outputPath2 = Path.Combine("obj", $"{className12}.ts");
+            var outputPath3 = Path.Combine("obj", $"{className3}.cs");
+
+            var task = new GetOpenApiReferenceMetadata
+            {
+                Extension = ".cs",
+                Inputs = new[]
+                {
+                    new TaskItem(identity12, inputMetadata1),
+                    new TaskItem(identity12, inputMetadata2),
+                    new TaskItem(identity3, inputMetadata3),
+                },
+                Namespace = @namespace,
+                OutputDirectory = "obj",
+            };
+
+            IDictionary<string, string> expectedMetadata1 = new SortedDictionary<string, string>(StringComparer.Ordinal)
+            {
+                { "ClassName", className12 },
+                { "CodeGenerator", codeGenerator13 },
+                { "FirstForGenerator", "true" },
+                { "Namespace", @namespace },
+                { "OriginalItemSpec", identity12 },
+                { "OutputPath", outputPath1 },
+                {
+                    "SerializedMetadata",
+                    $"Identity={identity12}|CodeGenerator={codeGenerator13}|" +
+                    $"OriginalItemSpec={identity12}|FirstForGenerator=true|" +
+                    $"OutputPath={outputPath1}|ClassName={className12}|Namespace={@namespace}"
+                },
+            };
+            IDictionary<string, string> expectedMetadata2 = new SortedDictionary<string, string>(StringComparer.Ordinal)
+            {
+                { "ClassName", className12 },
+                { "CodeGenerator", codeGenerator2 },
+                { "FirstForGenerator", "true" },
+                { "Namespace", @namespace },
+                { "OriginalItemSpec", identity12 },
+                { "OutputPath", outputPath2 },
+                {
+                    "SerializedMetadata",
+                    $"Identity={identity12}|CodeGenerator={codeGenerator2}|" +
+                    $"OriginalItemSpec={identity12}|FirstForGenerator=true|" +
+                    $"OutputPath={outputPath2}|ClassName={className12}|Namespace={@namespace}"
+                },
+            };
+            IDictionary<string, string> expectedMetadata3 = new SortedDictionary<string, string>(StringComparer.Ordinal)
+            {
+                { "ClassName", className3 },
+                { "CodeGenerator", codeGenerator13 },
+                { "FirstForGenerator", "false" },
+                { "Namespace", @namespace },
+                { "OriginalItemSpec", identity3 },
+                { "OutputPath", outputPath3 },
+                {
+                    "SerializedMetadata",
+                    $"Identity={identity3}|CodeGenerator={codeGenerator13}|" +
+                    $"OriginalItemSpec={identity3}|FirstForGenerator=false|" +
+                    $"OutputPath={outputPath3}|ClassName={className3}|Namespace={@namespace}"
+                },
+            };
+
+            // Act
+            var result = task.Execute();
+
+            // Assert
+            Assert.True(result);
+            Assert.False(task.Log.HasLoggedErrors);
+            Assert.Collection(
+                task.Outputs,
+                output =>
+                {
+                    Assert.Equal(identity12, output.ItemSpec);
+                    var metadata = Assert.IsAssignableFrom<IDictionary<string, string>>(output.CloneCustomMetadata());
+                    var orderedMetadata = new SortedDictionary<string, string>(StringComparer.Ordinal);
+                    foreach (var key in metadata.Keys)
+                    {
+                        orderedMetadata.Add(key, metadata[key]);
+                    }
+
+                    Assert.Equal(expectedMetadata1, orderedMetadata);
+                },
+                output =>
+                {
+                    Assert.Equal(identity12, output.ItemSpec);
+                    var metadata = Assert.IsAssignableFrom<IDictionary<string, string>>(output.CloneCustomMetadata());
+                    var orderedMetadata = new SortedDictionary<string, string>(StringComparer.Ordinal);
+                    foreach (var key in metadata.Keys)
+                    {
+                        orderedMetadata.Add(key, metadata[key]);
+                    }
+
+                    Assert.Equal(expectedMetadata2, orderedMetadata);
+                },
+                output =>
+                {
+                    Assert.Equal(identity3, output.ItemSpec);
+                    var metadata = Assert.IsAssignableFrom<IDictionary<string, string>>(output.CloneCustomMetadata());
+                    var orderedMetadata = new SortedDictionary<string, string>(StringComparer.Ordinal);
+                    foreach (var key in metadata.Keys)
+                    {
+                        orderedMetadata.Add(key, metadata[key]);
+                    }
+
+                    Assert.Equal(expectedMetadata3, orderedMetadata);
+                });
+        }
+    }
+}
diff --git a/src/Tools/Extensions.ApiDescription.Client/test/Microsoft.Extensions.ApiDescription.Client.Tests.csproj b/src/Tools/Extensions.ApiDescription.Client/test/Microsoft.Extensions.ApiDescription.Client.Tests.csproj
new file mode 100644
index 0000000000..5b01ef6ad9
--- /dev/null
+++ b/src/Tools/Extensions.ApiDescription.Client/test/Microsoft.Extensions.ApiDescription.Client.Tests.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
+    <DefaultItemExcludes>$(DefaultItemExcludes);TestProjects\**\*</DefaultItemExcludes>
+    <TestGroupName>ApiDescriptionClientTests</TestGroupName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Content Include="$(MSBuildProjectDirectory)\..\src\build\**\*" CopyToOutputDirectory="PreserveNewest" LinkBase="build" />
+    <Content Include="$(MSBuildProjectDirectory)\..\src\buildMultiTargeting\**\*" CopyToOutputDirectory="PreserveNewest" LinkBase="buildMultiTargeting" />
+    <Content Include="TestProjects\**\*" CopyToOutputDirectory="PreserveNewest" />
+
+    <ProjectReference Include="..\src\Microsoft.Extensions.ApiDescription.Client.csproj" />
+  </ItemGroup>
+
+  <Target Name="CleanTestProjects" BeforeTargets="CoreCompile">
+    <RemoveDir Directories="$(TargetDir)TestProjects" />
+  </Target>
+
+</Project>
diff --git a/src/Tools/Extensions.ApiDescription.Client/test/MockBuildEngine.cs b/src/Tools/Extensions.ApiDescription.Client/test/MockBuildEngine.cs
new file mode 100644
index 0000000000..a78d71ef5b
--- /dev/null
+++ b/src/Tools/Extensions.ApiDescription.Client/test/MockBuildEngine.cs
@@ -0,0 +1,102 @@
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+using Microsoft.Build.Framework;
+
+// Inspired by https://github.com/microsoft/msbuild/blob/master/src/Utilities.UnitTests/MockEngine.cs
+namespace Microsoft.Extensions.ApiDescription.Client
+{
+    internal sealed class MockBuildEngine : IBuildEngine3
+    {
+        private readonly StringBuilder _log = new StringBuilder();
+
+        public bool IsRunningMultipleNodes => false;
+
+        public bool ContinueOnError => false;
+
+        public string ProjectFileOfTaskNode => string.Empty;
+
+        public int LineNumberOfTaskNode => 0;
+
+        public int ColumnNumberOfTaskNode => 0;
+
+        internal MessageImportance MinimumMessageImportance { get; set; } = MessageImportance.Low;
+
+        internal int Messages { set; get; }
+
+        internal int Warnings { set; get; }
+
+        internal int Errors { set; get; }
+
+        internal string Log => _log.ToString();
+
+        public bool BuildProjectFile(
+            string projectFileName,
+            string[] targetNames,
+            IDictionary globalProperties,
+            IDictionary targetOutputs) => false;
+
+        public bool BuildProjectFile(
+            string projectFileName,
+            string[] targetNames,
+            IDictionary globalProperties,
+            IDictionary targetOutputs,
+            string toolsVersion) => false;
+
+        public bool BuildProjectFilesInParallel(
+            string[] projectFileNames,
+            string[] targetNames,
+            IDictionary[] globalProperties,
+            IDictionary[] targetOutputsPerProject,
+            string[] toolsVersion,
+            bool useResultsCache,
+            bool unloadProjectsOnCompletion) => false;
+
+        public BuildEngineResult BuildProjectFilesInParallel(
+            string[] projectFileNames,
+            string[] targetNames,
+            IDictionary[] globalProperties,
+            IList<string>[] undefineProperties,
+            string[] toolsVersion,
+            bool includeTargetOutputs) => new BuildEngineResult(false, null);
+
+        public void LogErrorEvent(BuildErrorEventArgs eventArgs)
+        {
+            _log.AppendLine(eventArgs.Message);
+            Errors++;
+        }
+
+        public void LogWarningEvent(BuildWarningEventArgs eventArgs)
+        {
+            _log.AppendLine(eventArgs.Message);
+            Warnings++;
+        }
+
+        public void LogCustomEvent(CustomBuildEventArgs eventArgs)
+        {
+            _log.AppendLine(eventArgs.Message);
+        }
+
+        public void LogMessageEvent(BuildMessageEventArgs eventArgs)
+        {
+            // Only record the message if it is above the minimum importance. MessageImportance enum has higher values
+            // for lower importance.
+            if (eventArgs.Importance <= MinimumMessageImportance)
+            {
+                _log.AppendLine(eventArgs.Message);
+                Messages++;
+            }
+        }
+
+        public void Reacquire()
+        {
+        }
+
+        public void Yield()
+        {
+        }
+    }
+}
diff --git a/src/Tools/Extensions.ApiDescription.Client/test/TestProjects/ConsoleClient/ConsoleClient.csproj b/src/Tools/Extensions.ApiDescription.Client/test/TestProjects/ConsoleClient/ConsoleClient.csproj
new file mode 100644
index 0000000000..18c332c188
--- /dev/null
+++ b/src/Tools/Extensions.ApiDescription.Client/test/TestProjects/ConsoleClient/ConsoleClient.csproj
@@ -0,0 +1,38 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../../build/Microsoft.Extensions.ApiDescription.Client.props"
+      Condition="Exists('../../build/Microsoft.Extensions.ApiDescription.Client.props')" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
+    <IsTestAssetProject>true</IsTestAssetProject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <OpenApiReference Include="../files/azureMonitor.json" />
+    <OpenApiReference Include="../files/NSwag.json" />
+    <OpenApiReference Include="../files/swashbuckle.json" />
+  </ItemGroup>
+
+  <!-- Position tasks assembly where Microsoft.Extensions.ApiDescription.Client.props expects it. -->
+  <Target Name="CopyTargets" BeforeTargets="BeforeBuild">
+    <ItemGroup>
+      <_Files Include="../../Microsoft.Extensions.ApiDescription.Client.*"
+          Exclude="../../Microsoft.Extensions.ApiDescription.Client.Tests.*" />
+    </ItemGroup>
+
+    <Copy
+        SourceFiles="@(_Files)"
+        DestinationFolder="../../tasks/netstandard2.0/"
+        SkipUnchangedFiles="$(SkipCopyUnchangedFiles)"
+        OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)"
+        Retries="$(CopyRetryCount)"
+        RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"
+        UseHardlinksIfPossible="$(CreateHardLinksForCopyFilesToOutputDirectoryIfPossible)"
+        UseSymboliclinksIfPossible="$(CreateSymbolicLinksForCopyFilesToOutputDirectoryIfPossible)" />
+  </Target>
+
+  <Import Project="../../build/Microsoft.Extensions.ApiDescription.Client.targets"
+      Condition="Exists('../../build/Microsoft.Extensions.ApiDescription.Client.targets')" />
+  <Import Project="../build/Fakes.targets" Condition="EXISTS('../build/Fakes.targets')" />
+</Project>
diff --git a/src/Tools/Extensions.ApiDescription.Client/test/TestProjects/ConsoleClient/Program.cs b/src/Tools/Extensions.ApiDescription.Client/test/TestProjects/ConsoleClient/Program.cs
new file mode 100644
index 0000000000..9e223fb7c0
--- /dev/null
+++ b/src/Tools/Extensions.ApiDescription.Client/test/TestProjects/ConsoleClient/Program.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace ConsoleClient
+{
+    class Program
+    {
+        static void Main(string[] args)
+        {
+            Console.WriteLine("Hello World!");
+        }
+    }
+}
diff --git a/src/Tools/Extensions.ApiDescription.Client/test/TestProjects/build/Fakes.targets b/src/Tools/Extensions.ApiDescription.Client/test/TestProjects/build/Fakes.targets
new file mode 100644
index 0000000000..78597f2ac6
--- /dev/null
+++ b/src/Tools/Extensions.ApiDescription.Client/test/TestProjects/build/Fakes.targets
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<Project>
+  <!-- NSwag's OpenApiReference support for C# (default target). -->
+
+  <Target Name="GenerateNSwagCSharp">
+    <PropertyGroup>
+      <_Metadata>'%(CurrentOpenApiReference.FullPath)'</_Metadata>
+      <_Metadata>$(_Metadata) Class: '%(CurrentOpenApiReference.Namespace).%(CurrentOpenApiReference.ClassName)'</_Metadata>
+      <_Metadata>$(_Metadata) FirstForGenerator: '%(CurrentOpenApiReference.FirstForGenerator)'</_Metadata>
+      <_Metadata>$(_Metadata) Options: '%(CurrentOpenApiReference.Options)'</_Metadata>
+      <_Metadata>$(_Metadata) OutputPath: '%(CurrentOpenApiReference.OutputPath)'</_Metadata>
+    </PropertyGroup>
+
+    <Message Importance="high" Text="GenerateNSwagCSharp $(_Metadata)" />
+  </Target>
+
+  <!-- NSwag's OpenApiReference support for TypeScript. -->
+
+  <Target Name="GenerateNSwagTypeScript">
+    <PropertyGroup>
+      <_Metadata>'%(FullPath)' Class: '%(Namespace).%(ClassName)'</_Metadata>
+      <_Metadata>$(_Metadata) FirstForGenerator: '%(FirstForGenerator)' Options: '%(Options)'</_Metadata>
+      <_Metadata>$(_Metadata) OutputPath: '%(OutputPath)'</_Metadata>
+    </PropertyGroup>
+
+    <Message Importance="high" Text="GenerateNSwagTypeScript $(_Metadata)" />
+  </Target>
+
+  <!-- Custom OpenApiReference support for C#. -->
+
+  <Target Name="GenerateCustomCSharp">
+    <PropertyGroup>
+      <_Metadata>'%(FullPath)' Class: '%(Namespace).%(ClassName)'</_Metadata>
+      <_Metadata>$(_Metadata) FirstForGenerator: '%(FirstForGenerator)' Options: '%(Options)'</_Metadata>
+      <_Metadata>$(_Metadata) OutputPath: '%(OutputPath)'</_Metadata>
+    </PropertyGroup>
+
+    <Message Importance="high" Text="GenerateCustomCSharp $(_Metadata)" />
+  </Target>
+</Project>
diff --git a/src/Tools/Extensions.ApiDescription.Client/test/TestProjects/files/NSwag.json b/src/Tools/Extensions.ApiDescription.Client/test/TestProjects/files/NSwag.json
new file mode 100644
index 0000000000..f8ba05b6f7
--- /dev/null
+++ b/src/Tools/Extensions.ApiDescription.Client/test/TestProjects/files/NSwag.json
@@ -0,0 +1,183 @@
+{
+  "x-generator": "NSwag v11.18.6.0 (NJsonSchema v9.10.67.0 (Newtonsoft.Json v11.0.0.0))",
+  "swagger": "2.0",
+  "info": {
+    "title": "My Title",
+    "version": "1.0.0"
+  },
+  "host": "localhost:5000",
+  "schemes": [
+    "http"
+  ],
+  "consumes": [
+    "application/json-patch+json",
+    "application/json",
+    "text/json",
+    "application/*+json",
+    "application/xml",
+    "text/xml",
+    "application/*+xml"
+  ],
+  "produces": [
+    "text/plain",
+    "application/json",
+    "text/json",
+    "application/xml",
+    "text/xml"
+  ],
+  "paths": {
+    "/api/Values/matches": {
+      "post": {
+        "tags": [
+          "Values"
+        ],
+        "operationId": "Values_Matches",
+        "consumes": [
+          "application/json-patch+json",
+          "application/json",
+          "text/json",
+          "application/*+json",
+          "application/xml",
+          "text/xml",
+          "application/*+xml"
+        ],
+        "parameters": [
+          {
+            "name": "possibilities",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            "x-nullable": true
+          },
+          {
+            "type": "integer",
+            "name": "comparisonType",
+            "in": "query",
+            "x-schema": {
+              "$ref": "#/definitions/StringComparison"
+            },
+            "x-nullable": false,
+            "enum": [
+              0,
+              1,
+              2,
+              3,
+              4,
+              5
+            ]
+          }
+        ],
+        "responses": {
+          "200": {
+            "x-nullable": true,
+            "description": "",
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/Values": {
+      "get": {
+        "tags": [
+          "Values"
+        ],
+        "operationId": "Values_Get",
+        "responses": {
+          "200": {
+            "x-nullable": true,
+            "description": "",
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          }
+        }
+      },
+      "post": {
+        "tags": [
+          "Values"
+        ],
+        "operationId": "Values_Post",
+        "consumes": [
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "name": "value",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "type": "string"
+            },
+            "x-nullable": true
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": ""
+          }
+        }
+      }
+    },
+    "/api/Values/too": {
+      "get": {
+        "tags": [
+          "Values"
+        ],
+        "operationId": "Values_GetToo",
+        "responses": {
+          "200": {
+            "x-nullable": true,
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/Model"
+            }
+          }
+        }
+      }
+    }
+  },
+  "definitions": {
+    "StringComparison": {
+      "type": "integer",
+      "description": "",
+      "x-enumNames": [
+        "CurrentCulture",
+        "CurrentCultureIgnoreCase",
+        "InvariantCulture",
+        "InvariantCultureIgnoreCase",
+        "Ordinal",
+        "OrdinalIgnoreCase"
+      ],
+      "enum": [
+        0,
+        1,
+        2,
+        3,
+        4,
+        5
+      ]
+    },
+    "Model": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "userName": {
+          "type": "string"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/Tools/Extensions.ApiDescription.Client/test/TestProjects/files/azureMonitor.json b/src/Tools/Extensions.ApiDescription.Client/test/TestProjects/files/azureMonitor.json
new file mode 100644
index 0000000000..a63e1f5f2a
--- /dev/null
+++ b/src/Tools/Extensions.ApiDescription.Client/test/TestProjects/files/azureMonitor.json
@@ -0,0 +1 @@
+{"swagger":"2.0","info":{"title":"Microsoft Insights API","version":"2018-04-16","description":"Azure Monitor client to create/update/delete Scheduled Query Rules"},"host":"management.azure.com","schemes":["https"],"consumes":["application/json"],"produces":["application/json"],"security":[{"azure_auth":["user_impersonation"]}],"securityDefinitions":{"azure_auth":{"type":"oauth2","authorizationUrl":"https://login.microsoftonline.com/common/oauth2/authorize","flow":"implicit","description":"Azure Active Directory OAuth2 Flow","scopes":{"user_impersonation":"impersonate your user account"}}},"paths":{"/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/microsoft.insights/scheduledQueryRules/{ruleName}":{"put":{"description":"Creates or updates an log search rule.","tags":["scheduledQueryRules"],"operationId":"ScheduledQueryRules_CreateOrUpdate","parameters":[{"$ref":"#/parameters/SubscriptionIdParameter"},{"$ref":"#/parameters/ResourceGroupNameParameter"},{"$ref":"#/parameters/RuleNameParameter"},{"$ref":"#/parameters/ApiVersionParameter"},{"name":"parameters","in":"body","required":true,"schema":{"$ref":"#/definitions/LogSearchRuleResource"},"description":"The parameters of the rule to create or update."}],"responses":{"default":{"description":"Error response describing why the operation failed.","schema":{"$ref":"#/definitions/ErrorResponse"}},"200":{"description":"Successful request to update an Log Search rule","schema":{"$ref":"#/definitions/LogSearchRuleResource"}},"201":{"description":"Created alert rule","schema":{"$ref":"#/definitions/LogSearchRuleResource"}}},"x-ms-examples":{"Create or Update rule - AletringAction":{"$ref":"./examples/createOrUpdateScheduledQueryRules.json"},"Create or Update rule - LogToMetricAction":{"$ref":"./examples/createOrUpdateScheduledQueryRule-LogToMetricAction.json"}}},"get":{"description":"Gets an Log Search rule","tags":["scheduledQueryRules"],"operationId":"ScheduledQueryRules_Get","parameters":[{"$ref":"#/parameters/ResourceGroupNameParameter"},{"$ref":"#/parameters/RuleNameParameter"},{"$ref":"#/parameters/ApiVersionParameter"},{"$ref":"#/parameters/SubscriptionIdParameter"}],"responses":{"default":{"description":"Error response describing why the operation failed.","schema":{"$ref":"#/definitions/ErrorResponse"}},"200":{"description":"Successful request to get a Log Search rule","schema":{"$ref":"#/definitions/LogSearchRuleResource"}}},"x-ms-examples":{"Get rule":{"$ref":"./examples/getScheduledQueryRules.json"}}},"patch":{"tags":["scheduledQueryRules"],"description":"Update log search Rule.","operationId":"ScheduledQueryRules_Update","parameters":[{"$ref":"#/parameters/SubscriptionIdParameter"},{"$ref":"#/parameters/ResourceGroupNameParameter"},{"$ref":"#/parameters/RuleNameParameter"},{"$ref":"#/parameters/ApiVersionParameter"},{"name":"parameters","in":"body","required":true,"schema":{"$ref":"#/definitions/LogSearchRuleResourcePatch"},"description":"The parameters of the rule to update."}],"responses":{"default":{"description":"Error response describing why the operation failed.","schema":{"$ref":"#/definitions/ErrorResponse"}},"200":{"description":"Successful request to update an Log Search rule","schema":{"$ref":"#/definitions/LogSearchRuleResource"}}},"x-ms-examples":{"Patch Log Search Rule":{"$ref":"./examples/patchScheduledQueryRules.json"}}},"delete":{"description":"Deletes a Log Search rule","tags":["scheduledQueryRules"],"operationId":"ScheduledQueryRules_Delete","parameters":[{"$ref":"#/parameters/ResourceGroupNameParameter"},{"$ref":"#/parameters/RuleNameParameter"},{"$ref":"#/parameters/ApiVersionParameter"},{"$ref":"#/parameters/SubscriptionIdParameter"}],"responses":{"default":{"description":"Error response describing why the operation failed.","schema":{"$ref":"#/definitions/ErrorResponse"}},"200":{"description":"Successful request to delete a  Log Search rule"},"204":{"description":"No Content. Resource not found"}},"x-ms-examples":{"Delete rule":{"$ref":"./examples/deleteScheduledQueryRules.json"}}}},"/subscriptions/{subscriptionId}/providers/microsoft.insights/scheduledQueryRules":{"get":{"tags":["scheduledQueryRules"],"operationId":"ScheduledQueryRules_ListBySubscription","description":"List the Log Search rules within a subscription group.","parameters":[{"$ref":"#/parameters/ApiVersionParameter"},{"$ref":"#/parameters/FilterParameter"},{"$ref":"#/parameters/SubscriptionIdParameter"}],"responses":{"default":{"description":"Error response describing why the operation failed.","schema":{"$ref":"#/definitions/ErrorResponse"}},"200":{"description":"Successful request for a list of alert rules","schema":{"$ref":"#/definitions/LogSearchRuleResourceCollection"}}},"x-ms-pageable":{"nextLinkName":null},"x-ms-examples":{"List rules":{"$ref":"./examples/listScheduledQueryRules.json"}},"x-ms-odata":"#/definitions/LogSearchRuleResource"}},"/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/microsoft.insights/scheduledQueryRules":{"get":{"tags":["scheduledQueryRules"],"operationId":"ScheduledQueryRules_ListByResourceGroup","description":"List the Log Search rules within a resource group.","parameters":[{"$ref":"#/parameters/ResourceGroupNameParameter"},{"$ref":"#/parameters/ApiVersionParameter"},{"$ref":"#/parameters/FilterParameter"},{"$ref":"#/parameters/SubscriptionIdParameter"}],"responses":{"default":{"description":"Error response describing why the operation failed.","schema":{"$ref":"#/definitions/ErrorResponse"}},"200":{"description":"Successful request for a list of alert rules","schema":{"$ref":"#/definitions/LogSearchRuleResourceCollection"}}},"x-ms-pageable":{"nextLinkName":null},"x-ms-examples":{"List rules":{"$ref":"./examples/listScheduledQueryRules.json"}},"x-ms-odata":"#/definitions/LogSearchRuleResource"}}},"definitions":{"Resource":{"properties":{"id":{"type":"string","readOnly":true,"description":"Azure resource Id"},"name":{"type":"string","readOnly":true,"description":"Azure resource name"},"type":{"type":"string","readOnly":true,"description":"Azure resource type"},"location":{"type":"string","description":"Resource location","x-ms-mutability":["create","read"]},"tags":{"additionalProperties":{"type":"string"},"description":"Resource tags"}},"required":["location"],"x-ms-azure-resource":true,"description":"An azure resource object"},"LogSearchRuleResource":{"type":"object","allOf":[{"$ref":"#/definitions/Resource"}],"required":["properties"],"properties":{"properties":{"x-ms-client-flatten":true,"$ref":"#/definitions/LogSearchRule","description":"The rule properties of the resource."}},"description":"The Log Search Rule resource."},"LogSearchRuleResourcePatch":{"properties":{"tags":{"additionalProperties":{"type":"string"},"description":"Resource tags"},"properties":{"x-ms-client-flatten":true,"$ref":"#/definitions/LogSearchRulePatch","description":"The log search rule properties of the resource."}},"description":"The log search rule resource for patch operations."},"LogSearchRuleResourceCollection":{"properties":{"value":{"type":"array","items":{"$ref":"#/definitions/LogSearchRuleResource"},"description":"The values for the Log Search Rule resources."}},"description":"Represents a collection of Log Search rule resources."},"Source":{"type":"object","description":"Specifies the log search query.","properties":{"query":{"type":"string","description":"Log search query. Required for action type - AlertingAction"},"authorizedResources":{"type":"array","items":{"type":"string"},"description":"List of  Resource referred into query"},"dataSourceId":{"type":"string","description":"The resource uri over which log search query is to be run."},"queryType":{"$ref":"#/definitions/QueryType","description":"Set value to 'ResultCount' ."}},"required":["dataSourceId"]},"Schedule":{"type":"object","description":"Defines how often to run the search and the time interval.","properties":{"frequencyInMinutes":{"type":"integer","format":"int32","description":"frequency (in minutes) at which rule condition should be evaluated."},"timeWindowInMinutes":{"type":"integer","format":"int32","description":"Time window for which data needs to be fetched for query (should be greater than or equal to frequencyInMinutes)."}},"required":["frequencyInMinutes","timeWindowInMinutes"]},"TriggerCondition":{"description":"The condition that results in the Log Search rule.","properties":{"thresholdOperator":{"$ref":"#/definitions/ConditionalOperator","description":"Evaluation operation for rule - 'GreaterThan' or 'LessThan."},"threshold":{"description":"Result or count threshold based on which rule should be triggered.","format":"double","type":"number"},"metricTrigger":{"$ref":"#/definitions/LogMetricTrigger","description":"Trigger condition for metric query rule"}},"required":["thresholdOperator","threshold"],"type":"object"},"AzNsActionGroup":{"type":"object","properties":{"actionGroup":{"type":"array","description":"Azure Action Group reference.","items":{"type":"string"}},"emailSubject":{"type":"string","description":"Custom subject override for all email ids in Azure action group"},"customWebhookPayload":{"type":"string","description":"Custom payload to be sent for all webook URI in Azure action group"}},"description":"Azure action group"},"LogMetricTrigger":{"type":"object","properties":{"thresholdOperator":{"$ref":"#/definitions/ConditionalOperator","description":"Evaluation operation for Metric -'GreaterThan' or 'LessThan' or 'Equal'."},"threshold":{"format":"double","type":"number","description":"The threshold of the metric trigger."},"metricTriggerType":{"$ref":"#/definitions/MetricTriggerType","description":"Metric Trigger Type - 'Consecutive' or 'Total'"},"metricColumn":{"type":"string","description":"Evaluation of metric on a particular column"}},"description":"A log metrics trigger descriptor."},"ConditionalOperator":{"type":"string","enum":["GreaterThan","LessThan","Equal"],"x-ms-enum":{"name":"ConditionalOperator","modelAsString":true},"description":"Result Condition Evaluation criteria. Supported Values - 'GreaterThan' or 'LessThan' or 'Equal'."},"MetricTriggerType":{"type":"string","enum":["Consecutive","Total"],"x-ms-enum":{"name":"metricTriggerType","modelAsString":true},"description":"Metric Trigger Evaluation Type"},"AlertSeverity":{"type":"string","enum":["0","1","2","3","4"],"x-ms-enum":{"name":"AlertSeverity","modelAsString":true},"description":"Severity Level of Alert"},"QueryType":{"type":"string","enum":["ResultCount"],"x-ms-enum":{"name":"QueryType","modelAsString":true},"description":"Set value to 'ResultAcount'"},"LogSearchRule":{"description":"Log Search Rule Definition","properties":{"description":{"type":"string","description":"The description of the Log Search rule."},"enabled":{"type":"string","description":"The flag which indicates whether the Log Search rule is enabled. Value should be true or false","enum":["true","false"],"x-ms-enum":{"name":"enabled","modelAsString":true}},"lastUpdatedTime":{"readOnly":true,"type":"string","format":"date-time","description":"Last time the rule was updated in IS08601 format."},"provisioningState":{"readOnly":true,"type":"string","enum":["Succeeded","Deploying","Canceled","Failed"],"x-ms-enum":{"name":"provisioningState","modelAsString":true},"description":"Provisioning state of the scheduledquery rule"},"source":{"$ref":"#/definitions/Source","description":"Data Source against which rule will Query Data"},"schedule":{"$ref":"#/definitions/Schedule","description":"Schedule (Frequnecy, Time Window) for rule. Required for action type - AlertingAction"},"action":{"$ref":"#/definitions/Action","description":"Action needs to be taken on rule execution."}},"required":["source","action"]},"LogSearchRulePatch":{"description":"Log Search Rule Definition for Patching","properties":{"enabled":{"type":"string","description":"The flag which indicates whether the Log Search rule is enabled. Value should be true or false","enum":["true","false"],"x-ms-enum":{"name":"enabled","modelAsString":true}}}},"Action":{"type":"object","discriminator":"odata.type","properties":{"odata.type":{"type":"string","description":"Specifies the action. Supported values - AlertingAction, LogToMetricAction"}},"required":["odata.type"],"description":"Action descriptor."},"AlertingAction":{"description":"Specifiy action need to be taken when rule type is Alert","x-ms-discriminator-value":"Microsoft.WindowsAzure.Management.Monitoring.Alerts.Models.Microsoft.AppInsights.Nexus.DataContracts.Resources.ScheduledQueryRules.AlertingAction","type":"object","allOf":[{"$ref":"#/definitions/Action"}],"properties":{"severity":{"$ref":"#/definitions/AlertSeverity","description":"Severity of the alert"},"aznsAction":{"$ref":"#/definitions/AzNsActionGroup","description":"Azure action group reference."},"throttlingInMin":{"type":"integer","format":"int32","description":"time (in minutes) for which Alerts should be throttled or suppressed."},"trigger":{"$ref":"#/definitions/TriggerCondition","description":"The trigger condition that results in the alert rule being."}},"required":["aznsAction","trigger","severity"]},"Dimension":{"type":"object","description":"Specifies the criteria for converting log to metric.","properties":{"name":{"type":"string","description":"Name of the dimension"},"operator":{"type":"string","description":"Operator for dimension values","enum":["Include"],"x-ms-enum":{"name":"operator","modelAsString":true}},"values":{"type":"array","items":{"type":"string"},"description":"List of dimension values"}},"required":["name","operator","values"]},"Criteria":{"type":"object","description":"Specifies the criteria for converting log to metric.","properties":{"metricName":{"type":"string","description":"Name of the metric"},"dimensions":{"type":"array","items":{"$ref":"#/definitions/Dimension"},"description":"List of Dimensions for creating metric"}},"required":["metricName"]},"LogToMetricAction":{"description":"Specifiy action need to be taken when rule type is converting log to metric","x-ms-discriminator-value":"Microsoft.WindowsAzure.Management.Monitoring.Alerts.Models.Microsoft.AppInsights.Nexus.DataContracts.Resources.ScheduledQueryRules.LogToMetricAction","type":"object","allOf":[{"$ref":"#/definitions/Action"}],"properties":{"criteria":{"$ref":"#/definitions/Criteria","description":"Severity of the alert"}},"required":["criteria"]},"ErrorResponse":{"description":"Describes the format of Error response.","type":"object","properties":{"code":{"description":"Error code","type":"string"},"message":{"description":"Error message indicating why the operation failed.","type":"string"}}}},"parameters":{"SubscriptionIdParameter":{"name":"subscriptionId","in":"path","required":true,"type":"string","description":"The Azure subscription Id."},"ApiVersionParameter":{"name":"api-version","in":"query","required":true,"type":"string","description":"Client Api Version."},"ResourceGroupNameParameter":{"name":"resourceGroupName","in":"path","required":true,"type":"string","description":"The name of the resource group.","x-ms-parameter-location":"method"},"RuleNameParameter":{"name":"ruleName","in":"path","required":true,"type":"string","description":"The name of the rule.","x-ms-parameter-location":"method"},"FilterParameter":{"name":"$filter","in":"query","required":false,"type":"string","description":"The filter to apply on the operation. For more information please see https://msdn.microsoft.com/en-us/library/azure/dn931934.aspx","x-ms-parameter-location":"method"}}}
\ No newline at end of file
diff --git a/src/Tools/Extensions.ApiDescription.Client/test/TestProjects/files/swashbuckle.json b/src/Tools/Extensions.ApiDescription.Client/test/TestProjects/files/swashbuckle.json
new file mode 100644
index 0000000000..57b917e213
--- /dev/null
+++ b/src/Tools/Extensions.ApiDescription.Client/test/TestProjects/files/swashbuckle.json
@@ -0,0 +1,155 @@
+{
+    "swagger": "2.0",
+    "info": {
+        "version": "and so is version",
+        "title": "title is required"
+    },
+    "paths": {
+        "/api/Values/matches": {
+            "post": {
+                "tags": [
+                    "Values"
+                ],
+                "operationId": "ApiValuesMatchesPost",
+                "consumes": [
+                    "application/json-patch+json",
+                    "application/json",
+                    "text/json",
+                    "application/*+json",
+                    "application/xml",
+                    "text/xml",
+                    "application/*+xml"
+                ],
+                "produces": [
+                    "text/plain",
+                    "application/json",
+                    "text/json",
+                    "application/xml",
+                    "text/xml"
+                ],
+                "parameters": [
+                    {
+                        "name": "possibilities",
+                        "in": "body",
+                        "required": false,
+                        "schema": {
+                            "uniqueItems": false,
+                            "type": "array",
+                            "items": {
+                                "type": "string"
+                            }
+                        }
+                    },
+                    {
+                        "name": "comparisonType",
+                        "in": "query",
+                        "required": false,
+                        "type": "integer",
+                        "format": "int32",
+                        "enum": [
+                            0,
+                            1,
+                            2,
+                            3,
+                            4,
+                            5
+                        ]
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Success",
+                        "schema": {
+                            "uniqueItems": false,
+                            "type": "array",
+                            "items": {
+                                "type": "string"
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "/api/Values": {
+            "get": {
+                "tags": [
+                    "Values"
+                ],
+                "operationId": "ApiValuesGet",
+                "consumes": [],
+                "produces": [
+                    "application/json"
+                ],
+                "parameters": [],
+                "responses": {
+                    "200": {
+                        "description": "Success",
+                        "schema": {
+                            "uniqueItems": false,
+                            "type": "array",
+                            "items": {
+                                "type": "string"
+                            }
+                        }
+                    }
+                }
+            },
+            "post": {
+                "tags": [
+                    "Values"
+                ],
+                "operationId": "ApiValuesPost",
+                "consumes": [
+                    "application/xml"
+                ],
+                "produces": [],
+                "parameters": [
+                    {
+                        "name": "value",
+                        "in": "body",
+                        "required": false,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Success"
+                    }
+                }
+            }
+        },
+        "/api/Values/too": {
+            "get": {
+                "tags": [
+                    "Values"
+                ],
+                "operationId": "ApiValuesTooGet",
+                "consumes": [],
+                "produces": [
+                    "application/xml"
+                ],
+                "parameters": [],
+                "responses": {
+                    "200": {
+                        "description": "Success",
+                        "schema": {
+                            "$ref": "#/definitions/Model"
+                        }
+                    }
+                }
+            }
+        }
+    },
+    "definitions": {
+        "Model": {
+            "type": "object",
+            "properties": {
+                "userName": {
+                    "type": "string"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Tools/Extensions.ApiDescription.Server/README.md b/src/Tools/Extensions.ApiDescription.Server/README.md
new file mode 100644
index 0000000000..0b6c56f287
--- /dev/null
+++ b/src/Tools/Extensions.ApiDescription.Server/README.md
@@ -0,0 +1,8 @@
+# Microsoft.Extensions.ApiDescription.Client
+
+MSBuild glue for OpenAPI document generation.
+
+## How To Use
+
+See partner packages such as [NSwag.AspNetCore](https://www.nuget.org/packages/NSwag.AspNetCore/) or
+[Swashbuckle.AspNetCore](https://www.nuget.org/packages/Swashbuckle.AspNetCore/) for intended use.
diff --git a/src/Mvc/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj b/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj
similarity index 92%
rename from src/Mvc/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj
rename to src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj
index 1433203545..e0d39cff01 100644
--- a/src/Mvc/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj
+++ b/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj
@@ -10,7 +10,7 @@
     <HasReferenceAssembly>false</HasReferenceAssembly>
     <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
     <PackageId>$(MSBuildProjectName)</PackageId>
-    <PackageTags>MSBuild;Swagger;Open API;code generation;Web API</PackageTags>
+    <PackageTags>MSBuild;Swagger;OpenAPI;code generation;Web API;service reference;document generation</PackageTags>
     <IsShippingPackage>true</IsShippingPackage>
     <DevelopmentDependency>true</DevelopmentDependency>
 
diff --git a/src/Mvc/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec b/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec
similarity index 100%
rename from src/Mvc/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec
rename to src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec
diff --git a/src/Mvc/Extensions.ApiDescription.Server/src/build/Microsoft.Extensions.ApiDescription.Server.props b/src/Tools/Extensions.ApiDescription.Server/src/build/Microsoft.Extensions.ApiDescription.Server.props
similarity index 67%
rename from src/Mvc/Extensions.ApiDescription.Server/src/build/Microsoft.Extensions.ApiDescription.Server.props
rename to src/Tools/Extensions.ApiDescription.Server/src/build/Microsoft.Extensions.ApiDescription.Server.props
index 4651488ae2..71784e621a 100644
--- a/src/Mvc/Extensions.ApiDescription.Server/src/build/Microsoft.Extensions.ApiDescription.Server.props
+++ b/src/Tools/Extensions.ApiDescription.Server/src/build/Microsoft.Extensions.ApiDescription.Server.props
@@ -1,17 +1,18 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
 <Project>
   <!--
     Settings users may update as they see fit.
   -->
   <PropertyGroup>
     <!--
-      Options added to the Open API document generation tool ('dotnet-getdocument') command line. Available options
-      control console output: 'no-color', 'prefix-output' and 'verbose'. All require a double-dash prefix.
+      Options added to the OpenAPI document generation tool ('dotnet-getdocument') command line. For example, the
+      'prefix-output', 'quiet' and 'verbose' options control console output and the 'help' and 'version' options show
+      information. Long form options require a double-dash prefix.
     -->
     <OpenApiGenerateDocumentsOptions Condition=" '$(OpenApiGenerateDocumentsOptions)' == '' " />
 
     <!--
-      If 'true' (the default when targeting .NET Framework or .NET Core 2.1 and later), enable generation of Open API
+      If 'true' (the default when targeting .NET Framework or .NET Core 2.1 and later), enable generation of OpenAPI
       documents. Otherwise, this feature is completely disabled. This controls whether the 'OpenApiGenerateDocuments'
       project capability is visible, enables / disables the 'GenerateOpenApiDocuments' target and provides the
       $(OpenApiGenerateDocumentsOnBuild) default.
@@ -19,13 +20,13 @@
     <OpenApiGenerateDocuments Condition=" '$(OpenApiGenerateDocuments)' == '' " />
 
     <!--
-      If 'true' (the default if $(OpenApiGenerateDocuments) is 'true'), will generate Open API documents after every
+      If 'true' (the default if $(OpenApiGenerateDocuments) is 'true'), will generate OpenAPI documents after every
       build. Set to 'false' when targets are invoked from the command line or tied to another target.
     -->
     <OpenApiGenerateDocumentsOnBuild Condition=" '$(OpenApiGenerateDocumentsOnBuild)' == '' " />
 
     <!--
-      Where to place Open API documents generated from the application. Value is interpreted relative to the project
+      Where to place OpenAPI documents generated from the application. Value is interpreted relative to the project
       folder, unless already an absolute path.
     -->
     <OpenApiDocumentsDirectory
diff --git a/src/Tools/Extensions.ApiDescription.Server/src/build/Microsoft.Extensions.ApiDescription.Server.targets b/src/Tools/Extensions.ApiDescription.Server/src/build/Microsoft.Extensions.ApiDescription.Server.targets
new file mode 100644
index 0000000000..f6b037335a
--- /dev/null
+++ b/src/Tools/Extensions.ApiDescription.Server/src/build/Microsoft.Extensions.ApiDescription.Server.targets
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<Project>
+  <PropertyGroup Condition=" '$(OpenApiGenerateDocuments)' == '' ">
+    <OpenApiGenerateDocuments>true</OpenApiGenerateDocuments>
+    <OpenApiGenerateDocuments
+        Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(TargetFrameworkVersion.TrimStart(&quot;vV&quot;))' &lt; '2.1' " />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(OpenApiGenerateDocumentsOnBuild)' == '' ">
+    <OpenApiGenerateDocumentsOnBuild>$(OpenApiGenerateDocuments)</OpenApiGenerateDocumentsOnBuild>
+  </PropertyGroup>
+  <PropertyGroup>
+    <_OpenApiDocumentsCache>$(BaseIntermediateOutputPath)$(MSBuildProjectName).OpenApiFiles.cache</_OpenApiDocumentsCache>
+  </PropertyGroup>
+
+  <ItemGroup Condition=" '$(OpenApiGenerateDocuments)' == 'true' ">
+    <ProjectCapability Include="OpenApiGenerateDocuments" />
+  </ItemGroup>
+
+  <Target Name="OpenApiGetDocuments" Returns="@(_OpenApiProjectDocuments)">
+    <!-- E.g. a client project has @(OpenApiProjectReference) item for project that does not support doc generation. -->
+    <Error Condition=" '$(OpenApiGenerateDocuments)' != 'true' "
+        Text="OpenAPI document generation is disabled. Add '&lt;OpenApiGenerateDocuments>true&lt;/OpenApiGenerateDocuments>' to the project." />
+    <!-- E.g. project set $(OpenApiGenerateDocuments) to 'true' but TFM is not supported. -->
+    <Error
+        Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(TargetFrameworkVersion.TrimStart(&quot;vV&quot;))' &lt; '2.1' "
+        Text="OpenAPI document generation is not supported when targeting netcoreapp2.0 or earlier. Disable the feature or move to a later target framework." />
+    <!-- E.g. project set $(OpenApiGenerateDocumentsOnBuild) to 'false' but did not invoke GenerateOpenApiDocuments. -->
+    <Error Condition=" !Exists('$(_OpenApiDocumentsCache)' )"
+        Text="$(_OpenApiDocumentsCache) file does not exist. Add '&lt;OpenApiGenerateDocumentsOnBuild>true&lt;/OpenApiGenerateDocumentsOnBuild>' to the project or call the GenerateOpenApiDocuments target." />
+
+    <ReadLinesFromFile File="$(_OpenApiDocumentsCache)">
+      <Output TaskParameter="Lines" ItemName="_OpenApiProjectDocuments" />
+    </ReadLinesFromFile>
+
+    <!-- Fallback error in case something slips through the insider's error checking. -->
+    <Error Condition=" '@(_OpenApiProjectDocuments)' == '' "
+        Text="Application does not have any registered documents. Update its 'Startup' class to register a document." />
+  </Target>
+
+  <Target Name="GenerateOpenApiDocuments" Inputs="$(TargetPath)" Outputs="$(_OpenApiDocumentsCache)">
+    <!-- E.g. project sets $(OpenApiGenerateDocumentsOnBuild) to 'true' but $(OpenApiGenerateDocuments) is 'false'. -->
+    <Error Condition=" '$(OpenApiGenerateDocuments)' != 'true' "
+        Text="OpenAPI document generation is disabled. Add '&lt;OpenApiGenerateDocuments>true&lt;/OpenApiGenerateDocuments>' to the project." />
+    <!-- E.g. project sets $(OpenApiGenerateDocuments) to 'true' but TFM is not supported. -->
+    <Error
+        Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(TargetFrameworkVersion.TrimStart(&quot;vV&quot;))' &lt; '2.1' "
+        Text="OpenAPI document generation is not supported when targeting netcoreapp2.0 or earlier. Disable the feature or move to a later target framework." />
+
+    <PropertyGroup>
+      <_Command>dotnet "$(MSBuildThisFileDirectory)/../tools/dotnet-getdocument.dll" --assembly "$(TargetPath)"</_Command>
+      <_Command>$(_Command) --file-list "$(_OpenApiDocumentsCache)" --framework "$(TargetFrameworkMoniker)"</_Command>
+      <_Command>$(_Command) --output "$(OpenApiDocumentsDirectory.TrimEnd('\'))" --project "$(MSBuildProjectName)"</_Command>
+      <_Command Condition=" '$(ProjectAssetsFile)' != '' ">$(_Command) --assets-file "$(ProjectAssetsFile)"</_Command>
+      <_Command Condition=" '$(PlatformTarget)' != '' ">$(_Command) --platform "$(PlatformTarget)"</_Command>
+      <_Command Condition=" '$(PlatformTarget)' == '' AND '$(Platform)' != '' ">$(_Command) --platform "$(Platform)"</_Command>
+      <_Command Condition=" '$(RuntimeIdentifier)' != '' ">$(_Command) --runtime "$(RuntimeIdentifier)"</_Command>
+      <_Command>$(_Command) $(OpenApiGenerateDocumentsOptions)</_Command>
+    </PropertyGroup>
+
+    <Message Importance="high" Text="%0AGenerateOpenApiDocuments:" />
+    <Message Importance="high" Text="  $(_Command)" />
+    <Exec Command="$(_Command)" LogStandardErrorAsError="true" />
+  </Target>
+
+  <!-- Unless this is an inner build or default timing is disabled, tie document retrieval into the build. -->
+
+  <Target Name="_GenerateOpenApiDocuments"
+      BeforeTargets="Build"
+      Condition=" '$(OpenApiGenerateDocumentsOnBuild)' == 'true' AND ('$(TargetFramework)' == '' OR '$(TargetFrameworks)' == '') "
+      DependsOnTargets="GenerateOpenApiDocuments" />
+</Project>
diff --git a/src/Mvc/Extensions.ApiDescription.Server/src/buildMultiTargeting/Microsoft.Extensions.ApiDescription.Server.props b/src/Tools/Extensions.ApiDescription.Server/src/buildMultiTargeting/Microsoft.Extensions.ApiDescription.Server.props
similarity index 100%
rename from src/Mvc/Extensions.ApiDescription.Server/src/buildMultiTargeting/Microsoft.Extensions.ApiDescription.Server.props
rename to src/Tools/Extensions.ApiDescription.Server/src/buildMultiTargeting/Microsoft.Extensions.ApiDescription.Server.props
diff --git a/src/Mvc/Extensions.ApiDescription.Server/src/buildMultiTargeting/Microsoft.Extensions.ApiDescription.Server.targets b/src/Tools/Extensions.ApiDescription.Server/src/buildMultiTargeting/Microsoft.Extensions.ApiDescription.Server.targets
similarity index 54%
rename from src/Mvc/Extensions.ApiDescription.Server/src/buildMultiTargeting/Microsoft.Extensions.ApiDescription.Server.targets
rename to src/Tools/Extensions.ApiDescription.Server/src/buildMultiTargeting/Microsoft.Extensions.ApiDescription.Server.targets
index af55c662ce..1b093ed10f 100644
--- a/src/Mvc/Extensions.ApiDescription.Server/src/buildMultiTargeting/Microsoft.Extensions.ApiDescription.Server.targets
+++ b/src/Tools/Extensions.ApiDescription.Server/src/buildMultiTargeting/Microsoft.Extensions.ApiDescription.Server.targets
@@ -1,9 +1,24 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <Project>
   <PropertyGroup>
-    <OpenApiGenerateDocuments Condition=" '$(OpenApiGenerateDocuments)' == '' ">true</OpenApiGenerateDocuments>
+    <!-- Default value may lead to an inner build error if $(OpenApiGenerateDocuments) is explicitly set to 'true'. -->
+    <_OpenApiGenerateDocumentsTFM>$(TargetFrameworks.Trim(';').Split(';')[0])</_OpenApiGenerateDocumentsTFM>
+
+    <!-- Prefer first TFM of those the tool supports. -->
+    <_Temporary>$(TargetFrameworks
+        .Replace('netcoreapp1.0', '')
+        .Replace('netcoreapp1.1', '')
+        .Replace('netcoreapp2.0', '')
+        .Trim(';'))</_Temporary>
+    <_OpenApiGenerateDocumentsTFM
+        Condition=" '$(_Temporary)' != '' ">$(_Temporary.Split(';')[0])</_OpenApiGenerateDocumentsTFM>
+
+    <OpenApiGenerateDocuments
+        Condition=" '$(OpenApiGenerateDocuments)' == '' AND '$(_Temporary)' != '' ">true</OpenApiGenerateDocuments>
     <OpenApiGenerateDocumentsOnBuild
         Condition=" '$(OpenApiGenerateDocumentsOnBuild)' == '' ">$(OpenApiGenerateDocuments)</OpenApiGenerateDocumentsOnBuild>
+
+    <_Temporary />
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(OpenApiGenerateDocuments)' == 'true' ">
@@ -13,37 +28,21 @@
   <Target Name="GenerateOpenApiDocuments">
     <MSBuild Projects="$(MSBuildProjectFile)"
         Targets="GenerateOpenApiDocuments"
-        Properties="TargetFramework=$(TargetFrameworks.Split(';')[0])"
+        Properties="TargetFramework=$(_OpenApiGenerateDocumentsTFM)"
         RemoveProperties="RuntimeIdentifier" />
   </Target>
 
   <Target Name="_GenerateOpenApiDocuments"
-      AfterTargets="Build"
+      BeforeTargets="Build"
       Condition=" '$(OpenApiGenerateDocumentsOnBuild)' == 'true' "
       DependsOnTargets="GenerateOpenApiDocuments" />
 
   <Target Name="OpenApiGetDocuments" Returns="@(_OpenApiProjectDocuments)">
-    <ItemGroup>
-      <_Temporary Remove="@(_Temporary)" />
-      <_Temporary Include="$(TargetFrameworks)" Exclude="netcoreapp1.0;netcoreapp1.1;netcoreapp2.0" />
-    </ItemGroup>
-    <PropertyGroup>
-      <_Temporary>@(_Temporary)</_Temporary>
-    </PropertyGroup>
-
     <MSBuild Projects="$(MSBuildProjectFile)"
         Targets="OpenApiGetDocuments"
-        Condition=" '$(_Temporary)' != '' "
-        Properties="TargetFramework=$(_Temporary.Split(';')[0])"
+        Properties="TargetFramework=$(_OpenApiGenerateDocumentsTFM)"
         RemoveProperties="RuntimeIdentifier">
       <Output TaskParameter="TargetOutputs" ItemName="_OpenApiProjectDocuments" />
     </MSBuild>
-
-    <ItemGroup>
-      <_Temporary Remove="@(_Temporary)" />
-    </ItemGroup>
-    <PropertyGroup>
-      <_Temporary />
-    </PropertyGroup>
   </Target>
 </Project>
diff --git a/src/Tools/FirstRunCertGenerator/test/CertificateManagerTests.cs b/src/Tools/FirstRunCertGenerator/test/CertificateManagerTests.cs
index 843f4ad377..1be6c5cfe7 100644
--- a/src/Tools/FirstRunCertGenerator/test/CertificateManagerTests.cs
+++ b/src/Tools/FirstRunCertGenerator/test/CertificateManagerTests.cs
@@ -7,7 +7,7 @@ using System.Linq;
 using System.Runtime.InteropServices;
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 using Xunit.Abstractions;
 
diff --git a/src/Tools/GetDocumentInsider/README.md b/src/Tools/GetDocumentInsider/README.md
new file mode 100644
index 0000000000..a1dcada4ed
--- /dev/null
+++ b/src/Tools/GetDocumentInsider/README.md
@@ -0,0 +1,7 @@
+# GetDocument.Insider
+
+`GetDocument.Insider` is a command line tool invoked in `dotnet-getdocument` to generate OpenAPI documents.
+
+## How To Use
+
+Run `dotnet ".../GetDocument.Insider.dll" --help` for more information about usage.
diff --git a/src/Mvc/GetDocumentInsider/src/CommandException.cs b/src/Tools/GetDocumentInsider/src/CommandException.cs
similarity index 100%
rename from src/Mvc/GetDocumentInsider/src/CommandException.cs
rename to src/Tools/GetDocumentInsider/src/CommandException.cs
diff --git a/src/Tools/GetDocumentInsider/src/Commands/CommandBase.cs b/src/Tools/GetDocumentInsider/src/Commands/CommandBase.cs
new file mode 100644
index 0000000000..2c0f66fa3f
--- /dev/null
+++ b/src/Tools/GetDocumentInsider/src/Commands/CommandBase.cs
@@ -0,0 +1,58 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.Extensions.CommandLineUtils;
+using Microsoft.Extensions.Tools.Internal;
+
+namespace Microsoft.Extensions.ApiDescription.Tool.Commands
+{
+    internal abstract class CommandBase
+    {
+        private readonly IConsole _console;
+
+        public bool IsQuiet { get; private set; }
+
+        public bool IsVerbose { get; private set; }
+
+        protected IReporter Reporter { get; private set; }
+
+        protected CommandBase(IConsole console)
+        {
+            _console = console ?? throw new ArgumentNullException(nameof(console));
+            Reporter = new ConsoleReporter(_console);
+        }
+
+        public virtual void Configure(CommandLineApplication command)
+        {
+            var prefixOutput = command.Option("--prefix-output", Resources.PrefixDescription);
+            var quiet = command.Option("-q|--quiet", Resources.QuietDescription);
+            var verbose = command.VerboseOption();
+
+            command.OnExecute(
+                () =>
+                {
+                    IsQuiet = quiet.HasValue();
+                    IsVerbose = verbose.HasValue() || CliContext.IsGlobalVerbose();
+                    ReporterExtensions.PrefixOutput = prefixOutput.HasValue();
+
+                    // Update the reporter now that we know the option values.
+                    Reporter = new ConsoleReporter(_console, IsVerbose, IsQuiet);
+
+                    Validate();
+
+                    return Execute();
+                });
+        }
+
+        protected virtual void Validate()
+        {
+            if (IsQuiet && IsVerbose)
+            {
+                throw new CommandException(Resources.QuietAndVerboseSpecified);
+            }
+        }
+
+        protected virtual int Execute() => 0;
+    }
+}
diff --git a/src/Mvc/GetDocumentInsider/src/Commands/GetDocumentCommand.cs b/src/Tools/GetDocumentInsider/src/Commands/GetDocumentCommand.cs
similarity index 92%
rename from src/Mvc/GetDocumentInsider/src/Commands/GetDocumentCommand.cs
rename to src/Tools/GetDocumentInsider/src/Commands/GetDocumentCommand.cs
index 145db50da6..cdebc86188 100644
--- a/src/Mvc/GetDocumentInsider/src/Commands/GetDocumentCommand.cs
+++ b/src/Tools/GetDocumentInsider/src/Commands/GetDocumentCommand.cs
@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
@@ -8,7 +8,8 @@ using System.Reflection;
 #if NETCOREAPP2_1
 using System.Runtime.Loader;
 #endif
-using Microsoft.DotNet.Cli.CommandLine;
+using Microsoft.Extensions.CommandLineUtils;
+using Microsoft.Extensions.Tools.Internal;
 
 namespace Microsoft.Extensions.ApiDescription.Tool.Commands
 {
@@ -17,6 +18,10 @@ namespace Microsoft.Extensions.ApiDescription.Tool.Commands
         private CommandOption _fileListPath;
         private CommandOption _output;
 
+        public GetDocumentCommand(IConsole console) : base(console)
+        {
+        }
+
         public override void Configure(CommandLineApplication command)
         {
             base.Configure(command);
@@ -124,13 +129,14 @@ namespace Microsoft.Extensions.ApiDescription.Tool.Commands
                     FileListPath = _fileListPath.Value(),
                     OutputDirectory = _output.Value(),
                     ProjectName = ProjectName.Value(),
+                    Reporter = Reporter,
                 };
 
-                return GetDocumentCommandWorker.Process(context);
+                return new GetDocumentCommandWorker(context).Process();
             }
             catch (Exception ex)
             {
-                Console.Error.WriteLine(ex.ToString());
+                Reporter.WriteError(ex.ToString());
                 return 2;
             }
         }
diff --git a/src/Mvc/GetDocumentInsider/src/Commands/GetDocumentCommandContext.cs b/src/Tools/GetDocumentInsider/src/Commands/GetDocumentCommandContext.cs
similarity index 77%
rename from src/Mvc/GetDocumentInsider/src/Commands/GetDocumentCommandContext.cs
rename to src/Tools/GetDocumentInsider/src/Commands/GetDocumentCommandContext.cs
index 3cf1da50d1..9ba3020f7d 100644
--- a/src/Mvc/GetDocumentInsider/src/Commands/GetDocumentCommandContext.cs
+++ b/src/Tools/GetDocumentInsider/src/Commands/GetDocumentCommandContext.cs
@@ -1,7 +1,8 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using Microsoft.Extensions.Tools.Internal;
 
 namespace Microsoft.Extensions.ApiDescription.Tool.Commands
 {
@@ -17,5 +18,7 @@ namespace Microsoft.Extensions.ApiDescription.Tool.Commands
         public string OutputDirectory { get; set; }
 
         public string ProjectName { get; set; }
+
+        public IReporter Reporter { get; set; }
     }
 }
diff --git a/src/Mvc/GetDocumentInsider/src/Commands/GetDocumentCommandWorker.cs b/src/Tools/GetDocumentInsider/src/Commands/GetDocumentCommandWorker.cs
similarity index 78%
rename from src/Mvc/GetDocumentInsider/src/Commands/GetDocumentCommandWorker.cs
rename to src/Tools/GetDocumentInsider/src/Commands/GetDocumentCommandWorker.cs
index 2f9a61def0..b7a9582855 100644
--- a/src/Mvc/GetDocumentInsider/src/Commands/GetDocumentCommandWorker.cs
+++ b/src/Tools/GetDocumentInsider/src/Commands/GetDocumentCommandWorker.cs
@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
@@ -8,6 +8,7 @@ using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Tools.Internal;
 
 namespace Microsoft.Extensions.ApiDescription.Tool.Commands
 {
@@ -32,14 +33,23 @@ namespace Microsoft.Extensions.ApiDescription.Tool.Commands
         private static readonly Type[] GenerateMethodParameterTypes = new[] { typeof(string), typeof(TextWriter) };
         private static readonly Type GenerateMethodReturnType = typeof(Task);
 
-        public static int Process(GetDocumentCommandContext context)
+        private readonly GetDocumentCommandContext _context;
+        private readonly IReporter _reporter;
+
+        public GetDocumentCommandWorker(GetDocumentCommandContext context)
         {
-            var assemblyName = new AssemblyName(context.AssemblyName);
+            _context = context ?? throw new ArgumentNullException(nameof(context));
+            _reporter = context.Reporter;
+        }
+
+        public int Process()
+        {
+            var assemblyName = new AssemblyName(_context.AssemblyName);
             var assembly = Assembly.Load(assemblyName);
             var entryPointType = assembly.EntryPoint?.DeclaringType;
             if (entryPointType == null)
             {
-                Reporter.WriteError(Resources.FormatMissingEntryPoint(context.AssemblyPath));
+                _reporter.WriteError(Resources.FormatMissingEntryPoint(_context.AssemblyPath));
                 return 3;
             }
 
@@ -48,7 +58,7 @@ namespace Microsoft.Extensions.ApiDescription.Tool.Commands
                 var serviceFactory = HostFactoryResolver.ResolveServiceProviderFactory(assembly);
                 if (serviceFactory == null)
                 {
-                    Reporter.WriteError(Resources.FormatMethodsNotFound(
+                    _reporter.WriteError(Resources.FormatMethodsNotFound(
                         HostFactoryResolver.BuildWebHost,
                         HostFactoryResolver.CreateHostBuilder,
                         HostFactoryResolver.CreateWebHostBuilder,
@@ -60,7 +70,7 @@ namespace Microsoft.Extensions.ApiDescription.Tool.Commands
                 var services = serviceFactory(Array.Empty<string>());
                 if (services == null)
                 {
-                    Reporter.WriteError(Resources.FormatServiceProviderNotFound(
+                    _reporter.WriteError(Resources.FormatServiceProviderNotFound(
                         typeof(IServiceProvider),
                         HostFactoryResolver.BuildWebHost,
                         HostFactoryResolver.CreateHostBuilder,
@@ -70,7 +80,7 @@ namespace Microsoft.Extensions.ApiDescription.Tool.Commands
                     return 5;
                 }
 
-                var success = GetDocuments(context, services);
+                var success = GetDocuments(services);
                 if (!success)
                 {
                     return 6;
@@ -78,14 +88,14 @@ namespace Microsoft.Extensions.ApiDescription.Tool.Commands
             }
             catch (Exception ex)
             {
-                Reporter.WriteError(ex.ToString());
+                _reporter.WriteError(ex.ToString());
                 return 7;
             }
 
             return 0;
         }
 
-        private static bool GetDocuments(GetDocumentCommandContext context, IServiceProvider services)
+        private bool GetDocuments(IServiceProvider services)
         {
             Type serviceType = null;
             foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies())
@@ -99,7 +109,7 @@ namespace Microsoft.Extensions.ApiDescription.Tool.Commands
 
             if (serviceType == null)
             {
-                Reporter.WriteError(Resources.FormatServiceTypeNotFound(DocumentService));
+                _reporter.WriteError(Resources.FormatServiceTypeNotFound(DocumentService));
                 return false;
             }
 
@@ -126,7 +136,7 @@ namespace Microsoft.Extensions.ApiDescription.Tool.Commands
             var service = services.GetService(serviceType);
             if (service == null)
             {
-                Reporter.WriteError(Resources.FormatServiceNotFound(DocumentService));
+                _reporter.WriteError(Resources.FormatServiceNotFound(DocumentService));
                 return false;
             }
 
@@ -137,14 +147,15 @@ namespace Microsoft.Extensions.ApiDescription.Tool.Commands
             }
 
             // Write out the documents.
-            Directory.CreateDirectory(context.OutputDirectory);
+            var found = false;
+            Directory.CreateDirectory(_context.OutputDirectory);
             var filePathList = new List<string>();
             foreach (var documentName in documentNames)
             {
                 var filePath = GetDocument(
                     documentName,
-                    context.ProjectName,
-                    context.OutputDirectory,
+                    _context.ProjectName,
+                    _context.OutputDirectory,
                     generateMethod,
                     service);
                 if (filePath == null)
@@ -153,24 +164,30 @@ namespace Microsoft.Extensions.ApiDescription.Tool.Commands
                 }
 
                 filePathList.Add(filePath);
+                found = true;
             }
 
             // Write out the cache file.
-            var stream = File.Create(context.FileListPath);
+            var stream = File.Create(_context.FileListPath);
             using var writer = new StreamWriter(stream);
             writer.WriteLine(string.Join(Environment.NewLine, filePathList));
 
-            return true;
+            if (!found)
+            {
+                _reporter.WriteError(Resources.DocumentsNotFound);
+            }
+
+            return found;
         }
 
-        private static string GetDocument(
+        private string GetDocument(
             string documentName,
             string projectName,
             string outputDirectory,
             MethodInfo generateMethod,
             object service)
         {
-            Reporter.WriteInformation(Resources.FormatGeneratingDocument(documentName));
+            _reporter.WriteInformation(Resources.FormatGeneratingDocument(documentName));
 
             using var stream = new MemoryStream();
             using (var writer = new StreamWriter(stream, UTF8EncodingWithoutBOM, bufferSize: 1024, leaveOpen: true))
@@ -185,21 +202,21 @@ namespace Microsoft.Extensions.ApiDescription.Tool.Commands
                 var finished = resultTask.Wait(TimeSpan.FromMinutes(1));
                 if (!finished)
                 {
-                    Reporter.WriteError(Resources.FormatMethodTimedOut(GenerateMethodName, DocumentService, 1));
+                    _reporter.WriteError(Resources.FormatMethodTimedOut(GenerateMethodName, DocumentService, 1));
                     return null;
                 }
             }
 
             if (stream.Length == 0L)
             {
-                Reporter.WriteError(
+                _reporter.WriteError(
                     Resources.FormatMethodWroteNoContent(GenerateMethodName, DocumentService, documentName));
 
                 return null;
             }
 
             var filePath = GetDocumentPath(documentName, projectName, outputDirectory);
-            Reporter.WriteInformation(Resources.FormatWritingDocument(documentName, filePath));
+            _reporter.WriteInformation(Resources.FormatWritingDocument(documentName, filePath));
             try
             {
                 stream.Position = 0L;
@@ -249,24 +266,24 @@ namespace Microsoft.Extensions.ApiDescription.Tool.Commands
             return path;
         }
 
-        private static MethodInfo GetMethod(string methodName, Type type, Type[] parameterTypes, Type returnType)
+        private MethodInfo GetMethod(string methodName, Type type, Type[] parameterTypes, Type returnType)
         {
             var method = type.GetMethod(methodName, parameterTypes);
             if (method == null)
             {
-                Reporter.WriteError(Resources.FormatMethodNotFound(methodName, type));
+                _reporter.WriteError(Resources.FormatMethodNotFound(methodName, type));
                 return null;
             }
 
             if (method.IsStatic)
             {
-                Reporter.WriteError(Resources.FormatMethodIsStatic(methodName, type));
+                _reporter.WriteError(Resources.FormatMethodIsStatic(methodName, type));
                 return null;
             }
 
             if (!returnType.IsAssignableFrom(method.ReturnType))
             {
-                Reporter.WriteError(
+                _reporter.WriteError(
                     Resources.FormatMethodReturnTypeUnsupported(methodName, type, method.ReturnType, returnType));
 
                 return null;
@@ -275,12 +292,12 @@ namespace Microsoft.Extensions.ApiDescription.Tool.Commands
             return method;
         }
 
-        private static object InvokeMethod(MethodInfo method, object instance, object[] arguments)
+        private object InvokeMethod(MethodInfo method, object instance, object[] arguments)
         {
             var result = method.Invoke(instance, arguments);
             if (result == null)
             {
-                Reporter.WriteError(
+                _reporter.WriteError(
                     Resources.FormatMethodReturnedNull(method.Name, method.DeclaringType, method.ReturnType));
             }
 
diff --git a/src/Mvc/GetDocumentInsider/src/Commands/HelpCommandBase.cs b/src/Tools/GetDocumentInsider/src/Commands/HelpCommandBase.cs
similarity index 53%
rename from src/Mvc/GetDocumentInsider/src/Commands/HelpCommandBase.cs
rename to src/Tools/GetDocumentInsider/src/Commands/HelpCommandBase.cs
index bab529d827..06dcdb0664 100644
--- a/src/Mvc/GetDocumentInsider/src/Commands/HelpCommandBase.cs
+++ b/src/Tools/GetDocumentInsider/src/Commands/HelpCommandBase.cs
@@ -1,16 +1,21 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.DotNet.Cli.CommandLine;
+using Microsoft.Extensions.CommandLineUtils;
+using Microsoft.Extensions.Tools.Internal;
 
 namespace Microsoft.Extensions.ApiDescription.Tool.Commands
 {
     internal class HelpCommandBase : CommandBase
     {
+        public HelpCommandBase(IConsole console) : base(console)
+        {
+        }
+
         public override void Configure(CommandLineApplication command)
         {
-            command.HelpOption("-h|--help");
-            command.VersionOption("--version", ProductInfo.GetVersion);
+            command.HelpOption();
+            command.VersionOptionFromAssemblyAttributes();
             base.Configure(command);
         }
     }
diff --git a/src/Mvc/GetDocumentInsider/src/Commands/ProjectCommandBase.cs b/src/Tools/GetDocumentInsider/src/Commands/ProjectCommandBase.cs
similarity index 86%
rename from src/Mvc/GetDocumentInsider/src/Commands/ProjectCommandBase.cs
rename to src/Tools/GetDocumentInsider/src/Commands/ProjectCommandBase.cs
index f6f3b20945..76e9087a06 100644
--- a/src/Mvc/GetDocumentInsider/src/Commands/ProjectCommandBase.cs
+++ b/src/Tools/GetDocumentInsider/src/Commands/ProjectCommandBase.cs
@@ -1,12 +1,17 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.DotNet.Cli.CommandLine;
+using Microsoft.Extensions.CommandLineUtils;
+using Microsoft.Extensions.Tools.Internal;
 
 namespace Microsoft.Extensions.ApiDescription.Tool.Commands
 {
     internal abstract class ProjectCommandBase : HelpCommandBase
     {
+        public ProjectCommandBase(IConsole console) : base(console)
+        {
+        }
+
         public CommandOption AssemblyPath { get; private set; }
 
         public CommandOption ProjectName { get; private set; }
diff --git a/src/Mvc/GetDocumentInsider/src/GetDocumentInsider.csproj b/src/Tools/GetDocumentInsider/src/GetDocumentInsider.csproj
similarity index 74%
rename from src/Mvc/GetDocumentInsider/src/GetDocumentInsider.csproj
rename to src/Tools/GetDocumentInsider/src/GetDocumentInsider.csproj
index 57732f4774..579872f08a 100644
--- a/src/Mvc/GetDocumentInsider/src/GetDocumentInsider.csproj
+++ b/src/Tools/GetDocumentInsider/src/GetDocumentInsider.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>GetDocument.Insider</AssemblyName>
     <Description>GetDocument Command-line Tool inside man</Description>
@@ -15,10 +15,13 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Compile Include="$(ToolSharedSourceRoot)CommandLine/**/*.cs" />
+
+    <Reference Include="Microsoft.Extensions.CommandLineUtils.Sources" />
     <Reference Include="Microsoft.Extensions.HostFactoryResolver.Sources" />
   </ItemGroup>
 
-  <Target Name="BuildX86" AfterTargets="Build" Condition=" '$(TargetFramework)' == 'net461' And '$(Platform)' != 'x86' ">
+  <Target Name="BuildX86" BeforeTargets="Build" Condition=" '$(TargetFramework)' == 'net461' And '$(Platform)' != 'x86' ">
     <MSBuild Projects="$(MSBuildProjectFullPath)" Properties="TargetFramework=$(TargetFramework);Platform=x86" Targets="Build" />
   </Target>
 </Project>
diff --git a/src/Tools/GetDocumentInsider/src/Program.cs b/src/Tools/GetDocumentInsider/src/Program.cs
new file mode 100644
index 0000000000..003bded0d7
--- /dev/null
+++ b/src/Tools/GetDocumentInsider/src/Program.cs
@@ -0,0 +1,24 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using Microsoft.Extensions.ApiDescription.Tool.Commands;
+using Microsoft.Extensions.Tools.Internal;
+
+namespace Microsoft.Extensions.ApiDescription.Tool
+{
+    internal class Program : ProgramBase
+    {
+        public Program(IConsole console) : base(console)
+        {
+        }
+
+        private static int Main(string[] args)
+        {
+            DebugHelper.HandleDebugSwitch(ref args);
+
+            var console = GetConsole();
+
+            return new Program(console).Run(args, new GetDocumentCommand(console), throwOnUnexpectedArg: true);
+        }
+    }
+}
diff --git a/src/Tools/GetDocumentInsider/src/ProgramBase.cs b/src/Tools/GetDocumentInsider/src/ProgramBase.cs
new file mode 100644
index 0000000000..46daf32ef7
--- /dev/null
+++ b/src/Tools/GetDocumentInsider/src/ProgramBase.cs
@@ -0,0 +1,68 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Text;
+using Microsoft.Extensions.ApiDescription.Tool.Commands;
+using Microsoft.Extensions.CommandLineUtils;
+using Microsoft.Extensions.Tools.Internal;
+
+namespace Microsoft.Extensions.ApiDescription.Tool
+{
+    internal abstract class ProgramBase
+    {
+        private readonly IConsole _console;
+        private readonly IReporter _reporter;
+
+        public ProgramBase(IConsole console)
+        {
+            _console = console ?? throw new ArgumentNullException(nameof(console));
+            _reporter = new ConsoleReporter(_console, verbose: false, quiet: false);
+        }
+
+        protected static IConsole GetConsole()
+        {
+            var console = PhysicalConsole.Singleton;
+            if (console.IsOutputRedirected)
+            {
+                Console.OutputEncoding = Encoding.UTF8;
+            }
+
+            return console;
+        }
+
+        protected int Run(string[] args, CommandBase command, bool throwOnUnexpectedArg)
+        {
+            try
+            {
+                // AllowArgumentSeparator and continueAfterUnexpectedArg are ignored when !throwOnUnexpectedArg _except_
+                // AllowArgumentSeparator=true changes the help text (ignoring throwOnUnexpectedArg).
+                var app = new CommandLineApplication(throwOnUnexpectedArg, continueAfterUnexpectedArg: true)
+                {
+                    AllowArgumentSeparator = !throwOnUnexpectedArg,
+                    Error = _console.Error,
+                    FullName = Resources.CommandFullName,
+                    Name = Resources.CommandFullName,
+                    Out = _console.Out,
+                };
+
+                command.Configure(app);
+
+                return app.Execute(args);
+            }
+            catch (Exception ex)
+            {
+                if (ex is CommandException || ex is CommandParsingException)
+                {
+                    _reporter.WriteError(ex.Message);
+                }
+                else
+                {
+                    _reporter.WriteError(ex.ToString());
+                }
+
+                return 1;
+            }
+        }
+    }
+}
diff --git a/src/Tools/GetDocumentInsider/src/ReporterExtensions.cs b/src/Tools/GetDocumentInsider/src/ReporterExtensions.cs
new file mode 100644
index 0000000000..bc42593ffb
--- /dev/null
+++ b/src/Tools/GetDocumentInsider/src/ReporterExtensions.cs
@@ -0,0 +1,40 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Linq;
+using Microsoft.Extensions.Tools.Internal;
+
+namespace Microsoft.Extensions.ApiDescription.Tool
+{
+    internal static class ReporterExtensions
+    {
+        public static bool PrefixOutput { get; set; }
+
+        public static void WriteError(this IReporter reporter, string message)
+            => reporter.Error(Prefix("error:   ", message));
+
+        public static void WriteWarning(this IReporter reporter, string message)
+            => reporter.Warn(Prefix("warn:    ", message));
+
+        public static void WriteInformation(this IReporter reporter, string message)
+            => reporter.Output(Prefix("info:    ", message));
+
+        public static void WriteVerbose(this IReporter reporter, string message)
+            => reporter.Verbose(Prefix("verbose: ", message));
+
+        private static string Prefix(string prefix, string value)
+        {
+            if (PrefixOutput)
+            {
+                return string.Join(
+                    Environment.NewLine,
+                    value
+                        .Split(new[] { Environment.NewLine }, StringSplitOptions.None)
+                        .Select(l => prefix + l));
+            }
+
+            return value;
+        }
+    }
+}
diff --git a/src/Mvc/GetDocumentInsider/src/Resources.resx b/src/Tools/GetDocumentInsider/src/Resources.resx
similarity index 93%
rename from src/Mvc/GetDocumentInsider/src/Resources.resx
rename to src/Tools/GetDocumentInsider/src/Resources.resx
index a27b1be2b0..6a7e8287af 100644
--- a/src/Mvc/GetDocumentInsider/src/Resources.resx
+++ b/src/Tools/GetDocumentInsider/src/Resources.resx
@@ -123,9 +123,6 @@
   <data name="MissingOption" xml:space="preserve">
     <value>Missing required option '--{0}'.</value>
   </data>
-  <data name="NoColorDescription" xml:space="preserve">
-    <value>Do not colorize console output.</value>
-  </data>
   <data name="OutputDescription" xml:space="preserve">
     <value>The directory where the document files should be written. Required.</value>
   </data>
@@ -151,7 +148,8 @@
     <value>Method '{0}' not found in type '{1}' with expected signature.</value>
   </data>
   <data name="ServiceNotFound" xml:space="preserve">
-    <value>Unable to find service type '{0}' in dependency injection container.</value>
+    <value>Unable to find service type '{0}' in dependency injection container. Update the 'Startup' class to register a document.</value>
+    <comment>Do not translate 'Startup'</comment>
   </data>
   <data name="MethodReturnedNull" xml:space="preserve">
     <value>Method '{0}' of type '{1}' returned null. Must return a non-null '{2}'.</value>
@@ -186,4 +184,14 @@
   <data name="ServiceProviderNotFound" xml:space="preserve">
     <value>Unable to resolve a non-null '{0}' implementation using method '{1}', '{2}' or '{3}' of type '{4}'.</value>
   </data>
+  <data name="DocumentsNotFound" xml:space="preserve">
+    <value>Unable to find any registered documents. Update the 'Startup' class to register a document.</value>
+    <comment>Do not translate 'Startup'</comment>
+  </data>
+  <data name="QuietAndVerboseSpecified" xml:space="preserve">
+    <value>Cannot specify both '--quiet' and '--verbose' options.</value>
+  </data>
+  <data name="QuietDescription" xml:space="preserve">
+    <value>Suppresses all output except warnings and errors.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Mvc/GetDocumentInsider/src/runtimeconfig.template.json b/src/Tools/GetDocumentInsider/src/runtimeconfig.template.json
similarity index 100%
rename from src/Mvc/GetDocumentInsider/src/runtimeconfig.template.json
rename to src/Tools/GetDocumentInsider/src/runtimeconfig.template.json
diff --git a/src/Tools/Microsoft.dotnet-openapi/README.md b/src/Tools/Microsoft.dotnet-openapi/README.md
new file mode 100644
index 0000000000..9ad333bddc
--- /dev/null
+++ b/src/Tools/Microsoft.dotnet-openapi/README.md
@@ -0,0 +1,84 @@
+# Microsoft.dotnet-openapi
+
+`Microsoft.dotnet-openapi` is a tool for managing OpenAPI references within your project.
+
+## Commands
+
+### Add Commands
+
+<!-- TODO: Restore after https://github.com/aspnet/AspNetCore/issues/12738
+ #### Add Project
+
+##### Options
+
+| Short option | Long option | Description | Example |
+|-------|------|-------|---------|
+| -v|--verbose | Show verbose output. |dotnet openapi add project *-v* ../Ref/ProjRef.csproj |
+| -p|--project | The project to operate on. |dotnet openapi add project *--project .\Ref.csproj* ../Ref/ProjRef.csproj |
+
+##### Arguments
+
+|  Argument  | Description | Example |
+|-------------|-------------|---------|
+| source-file | The source to create a reference from. Must be a project file. |dotnet openapi add project *../Ref/ProjRef.csproj* | -->
+
+#### Add File
+
+##### Options
+
+| Short option| Long option| Description | Example |
+|-------|------|-------|---------|
+| -v|--verbose | Show verbose output. |dotnet openapi add file *-v* .\OpenAPI.json |
+| -p|--updateProject | The project to operate on. |dotnet openapi add file *--updateProject .\Ref.csproj* .\OpenAPI.json |
+
+##### Arguments
+
+|  Argument  | Description | Example |
+|-------------|-------------|---------|
+| source-file | The source to create a reference from. Must be an OpenAPI file. |dotnet openapi add file *.\OpenAPI.json* |
+
+#### Add URL
+
+##### Options
+
+| Short option| Long option| Description | Example |
+|-------|------|-------------|---------|
+| -v|--verbose | Show verbose output. |dotnet openapi add url *-v* <http://contoso.com/openapi.json> |
+| -p|--updateProject | The project to operate on. |dotnet openapi add url *--updateProject .\Ref.csproj* <http://contoso.com/openapi.json> |
+| -o|--output-file | Where to place the local copy of the OpenAPI file. |dotnet openapi add url <https://contoso.com/openapi.json> *--output-file myclient.json* |
+
+##### Arguments
+
+|  Argument  | Description | Example |
+|-------------|-------------|---------|
+| source-file | The source to create a reference from. Must be a URL. |dotnet openapi add url <https://contoso.com/openapi.json> |
+
+### Remove
+
+##### Options
+
+| Short option| Long option| Description| Example |
+|-------|------|------------|---------|
+| -v|--verbose | Show verbose output. |dotnet openapi remove *-v*|
+| -p|--updateProject | The project to operate on. |dotnet openapi remove *--updateProject .\Ref.csproj* .\OpenAPI.json |
+
+#### Arguments
+
+|  Argument  | Description| Example |
+| ------------|------------|---------|
+| source-file | The source to remove the reference to. |dotnet openapi remove *.\OpenAPI.json* |
+
+### Refresh
+
+#### Options
+
+| Short option| Long option| Description | Example |
+|-------|------|-------------|---------|
+| -v|--verbose | Show verbose output. | dotnet openapi refresh *-v* <https://contoso.com/openapi.json> |
+| -p|--updateProject | The project to operate on. | dotnet openapi refresh *--updateProject .\Ref.csproj* <https://contoso.com/openapi.json> |
+
+#### Arguments
+
+|  Argument  | Description | Example |
+| ------------|-------------|---------|
+| source-file | The URL to refresh the reference from. | dotnet openapi refresh *<https://contoso.com/openapi.json>* |
diff --git a/src/Tools/Microsoft.dotnet-openapi/src/Application.cs b/src/Tools/Microsoft.dotnet-openapi/src/Application.cs
new file mode 100644
index 0000000000..52e25445b1
--- /dev/null
+++ b/src/Tools/Microsoft.dotnet-openapi/src/Application.cs
@@ -0,0 +1,104 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Reflection;
+using Microsoft.Build.Locator;
+using Microsoft.DotNet.Openapi.Tools;
+using Microsoft.DotNet.OpenApi.Commands;
+using Microsoft.Extensions.CommandLineUtils;
+
+namespace Microsoft.DotNet.OpenApi
+{
+    internal class Application : CommandLineApplication
+    {
+        static Application()
+        {
+            MSBuildLocator.RegisterDefaults();
+        }
+
+        public Application(
+            string workingDirectory,
+            IHttpClientWrapper httpClient,
+            TextWriter output = null,
+            TextWriter error = null)
+        {
+            Out = output ?? Out;
+            Error = error ?? Error;
+
+            WorkingDirectory = workingDirectory;
+
+            Name = "openapi";
+            FullName = "OpenApi reference management tool";
+            Description = "OpenApi reference management operations.";
+            ShortVersionGetter = GetInformationalVersion;
+
+            Help = HelpOption("-?|-h|--help");
+            Help.Inherited = true;
+
+            Invoke = () =>
+            {
+                ShowHelp();
+                return 0;
+            };
+
+            Commands.Add(new AddCommand(this, httpClient));
+            Commands.Add(new RemoveCommand(this, httpClient));
+            Commands.Add(new RefreshCommand(this, httpClient));
+        }
+
+        public string WorkingDirectory { get; }
+
+        public CommandOption Help { get; }
+
+        public new int Execute(params string[] args)
+        {
+            try
+            {
+                return base.Execute(args);
+            }
+            catch (AggregateException ex) when (ex.InnerException != null)
+            {
+                foreach (var innerException in ex.InnerExceptions)
+                {
+                    Error.WriteLine(ex.InnerException.Message);
+                }
+                return 1;
+            }
+
+            catch (ArgumentException ex)
+            {
+                // Don't show a call stack when we have unneeded arguments, just print the error message.
+                // The code that throws this exception will print help, so no need to do it here.
+                Error.WriteLine(ex.Message);
+                return 1;
+            }
+            catch (CommandParsingException ex)
+            {
+                // Don't show a call stack when we have unneeded arguments, just print the error message.
+                // The code that throws this exception will print help, so no need to do it here.
+                Error.WriteLine(ex.Message);
+                return 1;
+            }
+            catch (OperationCanceledException)
+            {
+                // This is a cancellation, not a failure.
+                Error.WriteLine("Cancelled");
+                return 1;
+            }
+            catch (Exception ex)
+            {
+                Error.WriteLine(ex);
+                return 1;
+            }
+        }
+
+        private string GetInformationalVersion()
+        {
+            var assembly = typeof(Application).GetTypeInfo().Assembly;
+            var attribute = assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>();
+            return attribute.InformationalVersion;
+        }
+    }
+}
diff --git a/src/Tools/Microsoft.dotnet-openapi/src/CodeGenerator.cs b/src/Tools/Microsoft.dotnet-openapi/src/CodeGenerator.cs
new file mode 100644
index 0000000000..f885993c29
--- /dev/null
+++ b/src/Tools/Microsoft.dotnet-openapi/src/CodeGenerator.cs
@@ -0,0 +1,11 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.DotNet.OpenApi
+{
+    public enum CodeGenerator
+    {
+        NSwagCSharp,
+        NSwagTypeScript
+    }
+}
diff --git a/src/Tools/Microsoft.dotnet-openapi/src/Commands/AddCommand.cs b/src/Tools/Microsoft.dotnet-openapi/src/Commands/AddCommand.cs
new file mode 100644
index 0000000000..bf879c8b20
--- /dev/null
+++ b/src/Tools/Microsoft.dotnet-openapi/src/Commands/AddCommand.cs
@@ -0,0 +1,34 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Threading.Tasks;
+using Microsoft.DotNet.Openapi.Tools;
+
+namespace Microsoft.DotNet.OpenApi.Commands
+{
+    internal class AddCommand : BaseCommand
+    {
+        private const string CommandName = "add";
+
+        public AddCommand(Application parent, IHttpClientWrapper httpClient)
+            : base(parent, CommandName, httpClient)
+        {
+            Commands.Add(new AddFileCommand(this, httpClient));
+            //TODO: Add AddprojectComand here: https://github.com/aspnet/AspNetCore/issues/12738
+            Commands.Add(new AddURLCommand(this, httpClient));
+        }
+
+        internal new Application Parent => (Application)base.Parent;
+
+        protected override Task<int> ExecuteCoreAsync()
+        {
+            ShowHelp();
+            return Task.FromResult(0);
+        }
+
+        protected override bool ValidateArguments()
+        {
+            return true;
+        }
+    }
+}
diff --git a/src/Tools/Microsoft.dotnet-openapi/src/Commands/AddFileCommand.cs b/src/Tools/Microsoft.dotnet-openapi/src/Commands/AddFileCommand.cs
new file mode 100644
index 0000000000..b7f6cc9f00
--- /dev/null
+++ b/src/Tools/Microsoft.dotnet-openapi/src/Commands/AddFileCommand.cs
@@ -0,0 +1,81 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.DotNet.Openapi.Tools;
+using Microsoft.Extensions.CommandLineUtils;
+using Microsoft.Extensions.Tools.Internal;
+
+namespace Microsoft.DotNet.OpenApi.Commands
+{
+    internal class AddFileCommand : BaseCommand
+    {
+        private const string CommandName = "file";
+
+        private const string SourceFileArgName = "source-file";
+
+        public AddFileCommand(AddCommand parent, IHttpClientWrapper httpClient)
+            : base(parent, CommandName, httpClient)
+        {
+            _codeGeneratorOption = Option("-c|--code-generator", "The code generator to use. Defaults to 'NSwagCSharp'.", CommandOptionType.SingleValue);
+            _sourceFileArg = Argument(SourceFileArgName, $"The OpenAPI file to add. This must be a path to local OpenAPI file(s)", multipleValues: true);
+        }
+
+        internal readonly CommandArgument _sourceFileArg;
+        internal readonly CommandOption _codeGeneratorOption;
+
+        private readonly string[] ApprovedExtensions = new[] { ".json", ".yaml", ".yml" };
+
+        protected override async Task<int> ExecuteCoreAsync()
+        {
+            var projectFilePath = ResolveProjectFile(ProjectFileOption);
+
+            Ensure.NotNullOrEmpty(_sourceFileArg.Value, SourceFileArgName);
+            var codeGenerator = GetCodeGenerator(_codeGeneratorOption);
+
+            foreach (var sourceFile in _sourceFileArg.Values)
+            {
+                if (!ApprovedExtensions.Any(e => sourceFile.EndsWith(e)))
+                {
+                    await Warning.WriteLineAsync($"The extension for the given file '{sourceFile}' should have been one of: {string.Join(",", ApprovedExtensions)}.");
+                    await Warning.WriteLineAsync($"The reference has been added, but may fail at build-time if the format is not correct.");
+                }
+                await AddOpenAPIReference(OpenApiReference, projectFilePath, sourceFile, codeGenerator);
+            }
+
+            return 0;
+        }
+
+        private bool IsLocalFile(string file)
+        {
+            return File.Exists(GetFullPath(file));
+        }
+
+        protected override bool ValidateArguments()
+        {
+            ValidateCodeGenerator(_codeGeneratorOption);
+
+            try
+            {
+                Ensure.NotNullOrEmpty(_sourceFileArg.Value, SourceFileArgName);
+            }
+            catch(ArgumentException ex)
+            {
+                Error.Write(ex.Message);
+                return false;
+            }
+
+            foreach (var sourceFile in _sourceFileArg.Values)
+            {
+                if (!IsLocalFile(sourceFile))
+                {
+                    Error.Write($"{SourceFileArgName} of '{sourceFile}' could not be found.");
+                }
+            }
+            return true;
+        }
+    }
+}
diff --git a/src/Tools/Microsoft.dotnet-openapi/src/Commands/AddProjectCommand.cs b/src/Tools/Microsoft.dotnet-openapi/src/Commands/AddProjectCommand.cs
new file mode 100644
index 0000000000..a2a73794f8
--- /dev/null
+++ b/src/Tools/Microsoft.dotnet-openapi/src/Commands/AddProjectCommand.cs
@@ -0,0 +1,57 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.DotNet.Openapi.Tools;
+using Microsoft.Extensions.CommandLineUtils;
+using Microsoft.Extensions.Tools.Internal;
+
+namespace Microsoft.DotNet.OpenApi.Commands
+{
+    internal class AddProjectCommand : BaseCommand
+    {
+        private const string CommandName = "project";
+
+        private const string SourceProjectArgName = "source-project";
+
+        public AddProjectCommand(BaseCommand parent, IHttpClientWrapper httpClient)
+            : base(parent, CommandName, httpClient)
+        {
+            _codeGeneratorOption = Option("-c|--code-generator", "The code generator to use. Defaults to 'NSwagCSharp'.", CommandOptionType.SingleValue);
+            _sourceProjectArg = Argument(SourceProjectArgName, $"The OpenAPI project to add. This must be the path to project file(s) containing OpenAPI endpoints", multipleValues: true);
+        }
+
+        internal readonly CommandArgument _sourceProjectArg;
+        internal readonly CommandOption _codeGeneratorOption;
+
+        protected override async Task<int> ExecuteCoreAsync()
+        {
+            var projectFilePath = ResolveProjectFile(ProjectFileOption);
+
+            var codeGenerator = GetCodeGenerator(_codeGeneratorOption);
+
+            foreach (var sourceFile in _sourceProjectArg.Values)
+            {
+                await AddOpenAPIReference(OpenApiProjectReference, projectFilePath, sourceFile, codeGenerator);
+            }
+
+            return 0;
+        }
+
+        protected override bool ValidateArguments()
+        {
+            ValidateCodeGenerator(_codeGeneratorOption);
+            foreach (var sourceFile in _sourceProjectArg.Values)
+            {
+                if (!IsProjectFile(sourceFile))
+                {
+                    throw new ArgumentException($"{SourceProjectArgName} of '{sourceFile}' was not valid. Valid values must be project file(s)");
+                }
+            }
+
+            Ensure.NotNullOrEmpty(_sourceProjectArg.Value, SourceProjectArgName);
+            return true;
+        }
+    }
+}
diff --git a/src/Tools/Microsoft.dotnet-openapi/src/Commands/AddURLCommand.cs b/src/Tools/Microsoft.dotnet-openapi/src/Commands/AddURLCommand.cs
new file mode 100644
index 0000000000..600584c0fb
--- /dev/null
+++ b/src/Tools/Microsoft.dotnet-openapi/src/Commands/AddURLCommand.cs
@@ -0,0 +1,59 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.DotNet.Openapi.Tools;
+using Microsoft.Extensions.CommandLineUtils;
+using Microsoft.Extensions.Tools.Internal;
+
+namespace Microsoft.DotNet.OpenApi.Commands
+{
+    internal class AddURLCommand : BaseCommand
+    {
+        private const string CommandName = "url";
+
+        private const string OutputFileName = "--output-file";
+        private const string SourceUrlArgName = "source-URL";
+
+        public AddURLCommand(AddCommand parent, IHttpClientWrapper httpClient)
+            : base(parent, CommandName, httpClient)
+        {
+            _codeGeneratorOption = Option("-c|--code-generator", "The code generator to use. Defaults to 'NSwagCSharp'.", CommandOptionType.SingleValue);
+            _outputFileOption = Option(OutputFileName, "The destination to download the remote OpenAPI file to.", CommandOptionType.SingleValue);
+            _sourceFileArg = Argument(SourceUrlArgName, $"The OpenAPI file to add. This must be a URL to a remote OpenAPI file.", multipleValues: true);
+        }
+
+        internal readonly CommandOption _outputFileOption;
+
+        internal readonly CommandArgument _sourceFileArg;
+        internal readonly CommandOption _codeGeneratorOption;
+
+        protected override async Task<int> ExecuteCoreAsync()
+        {
+            var projectFilePath = ResolveProjectFile(ProjectFileOption);
+
+            var sourceFile = Ensure.NotNullOrEmpty(_sourceFileArg.Value, SourceUrlArgName);
+            var codeGenerator = GetCodeGenerator(_codeGeneratorOption);
+
+            // We have to download the file from that URL, save it to a local file, then create a OpenApiReference
+            var outputFile = await DownloadGivenOption(sourceFile, _outputFileOption);
+
+            await AddOpenAPIReference(OpenApiReference, projectFilePath, outputFile, codeGenerator, sourceFile);
+
+            return 0;
+        }
+
+        protected override bool ValidateArguments()
+        {
+            ValidateCodeGenerator(_codeGeneratorOption);
+            var sourceFile = Ensure.NotNullOrEmpty(_sourceFileArg.Value, SourceUrlArgName);
+            if (!IsUrl(sourceFile))
+            {
+                Error.Write($"{SourceUrlArgName} was not valid. Valid values are URLs");
+                return false;
+            }
+            return true;
+        }
+    }
+}
diff --git a/src/Tools/Microsoft.dotnet-openapi/src/Commands/BaseCommand.cs b/src/Tools/Microsoft.dotnet-openapi/src/Commands/BaseCommand.cs
new file mode 100644
index 0000000000..7123f0d04e
--- /dev/null
+++ b/src/Tools/Microsoft.dotnet-openapi/src/Commands/BaseCommand.cs
@@ -0,0 +1,538 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Security.Cryptography;
+using System.Text.Json;
+using System.Threading.Tasks;
+using Microsoft.Build.Evaluation;
+using Microsoft.DotNet.Openapi.Tools;
+using Microsoft.DotNet.Openapi.Tools.Internal;
+using Microsoft.Extensions.CommandLineUtils;
+
+namespace Microsoft.DotNet.OpenApi.Commands
+{
+    internal abstract class BaseCommand : CommandLineApplication
+    {
+        protected string WorkingDirectory;
+
+        protected readonly IHttpClientWrapper _httpClient;
+
+        public const string OpenApiReference = "OpenApiReference";
+        public const string OpenApiProjectReference = "OpenApiProjectReference";
+        protected const string SourceUrlAttrName = "SourceUrl";
+
+        public const string ContentDispositionHeaderName = "Content-Disposition";
+        private const string CodeGeneratorAttrName = "CodeGenerator";
+        private const string DefaultExtension = ".json";
+
+        internal const string PackageVersionUrl = "https://go.microsoft.com/fwlink/?linkid=2099561";
+
+        public BaseCommand(CommandLineApplication parent, string name, IHttpClientWrapper httpClient)
+        {
+            Parent = parent;
+            Name = name;
+            Out = parent.Out ?? Out;
+            Error = parent.Error ?? Error;
+            _httpClient = httpClient;
+
+            ProjectFileOption = Option("-p|--updateProject", "The project file update.", CommandOptionType.SingleValue);
+
+            if (Parent is Application)
+            {
+                WorkingDirectory = ((Application)Parent).WorkingDirectory;
+            }
+            else
+            {
+                WorkingDirectory = ((Application)Parent.Parent).WorkingDirectory;
+            }
+
+            OnExecute(ExecuteAsync);
+        }
+
+        public CommandOption ProjectFileOption { get; }
+
+        public TextWriter Warning
+        {
+            get { return Out; }
+        }
+
+        protected abstract Task<int> ExecuteCoreAsync();
+
+        protected abstract bool ValidateArguments();
+
+        private async Task<int> ExecuteAsync()
+        {
+            if (GetApplication().Help.HasValue())
+            {
+                ShowHelp();
+                return 0;
+            }
+
+            if (!ValidateArguments())
+            {
+                ShowHelp();
+                return 1;
+            }
+
+            return await ExecuteCoreAsync();
+        }
+
+        private Application GetApplication()
+        {
+            var parent = Parent;
+            while(!(parent is Application))
+            {
+                parent = parent.Parent;
+            }
+            return (Application)parent;
+        }
+
+        internal FileInfo ResolveProjectFile(CommandOption projectOption)
+        {
+            string project;
+            if (projectOption.HasValue())
+            {
+                project = projectOption.Value();
+                project = GetFullPath(project);
+                if (!File.Exists(project))
+                {
+                    throw new ArgumentException($"The project '{project}' does not exist.");
+                }
+            }
+            else
+            {
+                var projects = Directory.GetFiles(WorkingDirectory, "*.csproj", SearchOption.TopDirectoryOnly);
+                if (projects.Length == 0)
+                {
+                    throw new ArgumentException("No project files were found in the current directory. Either move to a new directory or provide the project explicitly");
+                }
+                if (projects.Length > 1)
+                {
+                    throw new ArgumentException("More than one project was found in this directory, either remove a duplicate or explicitly provide the project.");
+                }
+
+                project = projects[0];
+            }
+
+            return new FileInfo(project);
+        }
+
+        protected Project LoadProject(FileInfo projectFile)
+        {
+            var project = ProjectCollection.GlobalProjectCollection.LoadProject(
+                projectFile.FullName,
+                globalProperties: null,
+                toolsVersion: null);
+            project.ReevaluateIfNecessary();
+            return project;
+        }
+
+        internal bool IsProjectFile(string file)
+        {
+            return File.Exists(Path.GetFullPath(file)) && file.EndsWith(".csproj");
+        }
+
+        internal bool IsUrl(string file)
+        {
+            return Uri.TryCreate(file, UriKind.Absolute, out var _) && file.StartsWith("http");
+        }
+
+        internal async Task AddOpenAPIReference(
+            string tagName,
+            FileInfo projectFile,
+            string sourceFile,
+            CodeGenerator? codeGenerator,
+            string sourceUrl = null)
+        {
+            // EnsurePackagesInProjectAsync MUST happen before LoadProject, because otherwise the global state set by ProjectCollection doesn't pick up the nuget edits, and we end up losing them.
+            await EnsurePackagesInProjectAsync(projectFile, codeGenerator);
+            var project = LoadProject(projectFile);
+            var items = project.GetItems(tagName);
+            var fileItems = items.Where(i => string.Equals(GetFullPath(i.EvaluatedInclude), GetFullPath(sourceFile), StringComparison.Ordinal));
+
+            if (fileItems.Count() > 0)
+            {
+                Warning.Write($"One or more references to {sourceFile} already exist in '{project.FullPath}'. Duplicate references could lead to unexpected behavior.");
+                return;
+            }
+
+            if (sourceUrl != null)
+            {
+                if (items.Any(i => string.Equals(i.GetMetadataValue(SourceUrlAttrName), sourceUrl)))
+                {
+                    Warning.Write($"A reference to '{sourceUrl}' already exists in '{project.FullPath}'.");
+                    return;
+                }
+            }
+
+            var metadata = new Dictionary<string, string>();
+
+            if (!string.IsNullOrEmpty(sourceUrl))
+            {
+                metadata[SourceUrlAttrName] = sourceUrl;
+            }
+
+            if (codeGenerator != null)
+            {
+                metadata[CodeGeneratorAttrName] = codeGenerator.ToString();
+            }
+
+            project.AddElementWithAttributes(tagName, sourceFile, metadata);
+            project.Save();
+        }
+
+        private async Task EnsurePackagesInProjectAsync(FileInfo projectFile, CodeGenerator? codeGenerator)
+        {
+            var urlPackages = await LoadPackageVersionsFromURLAsync();
+            var attributePackages = GetServicePackages(codeGenerator);
+
+            foreach (var kvp in attributePackages)
+            {
+                var packageId = kvp.Key;
+                var version = urlPackages != null && urlPackages.ContainsKey(packageId) ? urlPackages[packageId] : kvp.Value;
+
+                var args = new[] {
+                    "add",
+                    "package",
+                    packageId,
+                    "--version",
+                    version,
+                    "--no-restore"
+                };
+
+                var muxer = DotNetMuxer.MuxerPathOrDefault();
+                if (string.IsNullOrEmpty(muxer))
+                {
+                    throw new ArgumentException($"dotnet was not found on the path.");
+                }
+
+                var startInfo = new ProcessStartInfo
+                {
+                    FileName = muxer,
+                    Arguments = string.Join(" ", args),
+                    WorkingDirectory = projectFile.Directory.FullName,
+                    RedirectStandardError = true,
+                    RedirectStandardOutput = true,
+                };
+
+                var process = Process.Start(startInfo);
+
+                var timeout = 20;
+                if (!process.WaitForExit(timeout * 1000))
+                {
+                    throw new ArgumentException($"Adding package `{packageId}` to `{projectFile.Directory}` took longer than {timeout} seconds.");
+                }
+
+                if (process.ExitCode != 0)
+                {
+                    Out.Write(process.StandardOutput.ReadToEnd());
+                    Error.Write(process.StandardError.ReadToEnd());
+                    throw new ArgumentException($"Could not add package `{packageId}` to `{projectFile.Directory}`");
+                }
+            }
+        }
+
+        internal async Task DownloadToFileAsync(string url, string destinationPath, bool overwrite)
+        {
+            using var response = await _httpClient.GetResponseAsync(url);
+            await WriteToFileAsync(await response.Stream, destinationPath, overwrite);
+        }
+
+        internal async Task<string> DownloadGivenOption(string url, CommandOption fileOption)
+        {
+            using var response = await _httpClient.GetResponseAsync(url);
+
+            if (response.IsSuccessCode())
+            {
+                string destinationPath;
+                if (fileOption.HasValue())
+                {
+                    destinationPath = fileOption.Value();
+                }
+                else
+                {
+                    var fileName = GetFileNameFromResponse(response, url);
+                    var fullPath = GetFullPath(fileName);
+                    var directory = Path.GetDirectoryName(fullPath);
+                    destinationPath = GetUniqueFileName(directory, Path.GetFileNameWithoutExtension(fileName), Path.GetExtension(fileName));
+                }
+                await WriteToFileAsync(await response.Stream, GetFullPath(destinationPath), overwrite: false);
+
+                return destinationPath;
+            }
+            else
+            {
+                throw new ArgumentException($"The given url returned '{response.StatusCode}', indicating failure. The url might be wrong, or there might be a networking issue.");
+            }
+        }
+
+        private string GetUniqueFileName(string directory, string fileName, string extension)
+        {
+            var uniqueName = fileName;
+
+            var filePath = Path.Combine(directory, fileName + extension);
+            var exists = true;
+            var count = 0;
+
+            do
+            {
+                if (!File.Exists(filePath))
+                {
+                    exists = false;
+                }
+                else
+                {
+                    count++;
+                    uniqueName = fileName + count;
+                    filePath = Path.Combine(directory, uniqueName + extension);
+                }
+            }
+            while (exists);
+
+            return uniqueName + extension;
+        }
+
+        private string GetFileNameFromResponse(IHttpResponseMessageWrapper response, string url)
+        {
+            var contentDisposition = response.ContentDisposition();
+            string result;
+            if (contentDisposition != null && contentDisposition.FileName != null)
+            {
+                var fileName = Path.GetFileName(contentDisposition.FileName);
+                if (!Path.HasExtension(fileName))
+                {
+                    fileName += DefaultExtension;
+                }
+
+                result = fileName;
+            }
+            else
+            {
+                var uri = new Uri(url);
+                if (uri.Segments.Count() > 0 && uri.Segments.Last() != "/")
+                {
+                    var lastSegment = uri.Segments.Last();
+                    if (!Path.HasExtension(lastSegment))
+                    {
+                        lastSegment += DefaultExtension;
+                    }
+
+                    result = lastSegment;
+                }
+                else
+                {
+                    var parts = uri.Host.Split('.');
+
+                    // There's no segment, use the domain name.
+                    string domain;
+                    switch (parts.Length)
+                    {
+                        case 1:
+                        case 2:
+                            // It's localhost if 1, no www if 2
+                            domain = parts.First();
+                            break;
+                        case 3:
+                            domain = parts[1];
+                            break;
+                        default:
+                            throw new NotImplementedException("We don't handle the case that the Host has more than three segments");
+                    }
+
+                    result = domain + DefaultExtension;
+                }
+            }
+
+            return result;
+        }
+
+        internal CodeGenerator? GetCodeGenerator(CommandOption codeGeneratorOption)
+        {
+            CodeGenerator? codeGenerator;
+            if (codeGeneratorOption.HasValue())
+            {
+                codeGenerator = Enum.Parse<CodeGenerator>(codeGeneratorOption.Value());
+            }
+            else
+            {
+                codeGenerator = null;
+            }
+
+            return codeGenerator;
+        }
+
+        internal void ValidateCodeGenerator(CommandOption codeGeneratorOption)
+        {
+            if (codeGeneratorOption.HasValue())
+            {
+                var value = codeGeneratorOption.Value();
+                if (!Enum.TryParse(value, out CodeGenerator _))
+                {
+                    throw new ArgumentException($"Invalid value '{value}' given as code generator.");
+                }
+            }
+        }
+
+        internal string GetFullPath(string path)
+        {
+            return Path.IsPathFullyQualified(path)
+                ? path
+                : Path.GetFullPath(path, WorkingDirectory);
+        }
+
+        private async Task<IDictionary<string, string>> LoadPackageVersionsFromURLAsync()
+        {
+            /* Example Json content
+             {
+              "Version" : "1.0",
+              "Packages"  :  {
+                "Microsoft.Azure.SignalR": "1.1.0-preview1-10442",
+                "Grpc.AspNetCore.Server": "0.1.22-pre2",
+                "Grpc.Net.ClientFactory": "0.1.22-pre2",
+                "Google.Protobuf": "3.8.0",
+                "Grpc.Tools": "1.22.0",
+                "NSwag.ApiDescription.Client": "13.0.3",
+                "Microsoft.Extensions.ApiDescription.Client": "0.3.0-preview7.19365.7",
+                "Newtonsoft.Json": "12.0.2"
+              }
+            }*/
+            try
+            {
+                using var packageVersionStream = await (await _httpClient.GetResponseAsync(PackageVersionUrl)).Stream;
+                using var packageVersionDocument = await JsonDocument.ParseAsync(packageVersionStream);
+                var packageVersionsElement = packageVersionDocument.RootElement.GetProperty("Packages");
+                var packageVersionsDictionary = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+
+                foreach (var packageVersion in packageVersionsElement.EnumerateObject())
+                {
+                    packageVersionsDictionary[packageVersion.Name] = packageVersion.Value.GetString();
+                }
+
+                return packageVersionsDictionary;
+            }
+            catch
+            {
+                // TODO (johluo): Consider logging a message indicating what went wrong and actions, if any, to be taken to resolve possible issues.
+                // Currently not logging anything since the fwlink is not published yet.
+                return null;
+            }
+        }
+
+        private static IDictionary<string, string> GetServicePackages(CodeGenerator? type)
+        {
+            CodeGenerator generator = type ?? CodeGenerator.NSwagCSharp;
+            var name = Enum.GetName(typeof(CodeGenerator), generator);
+            var attributes = typeof(Program).Assembly.GetCustomAttributes<OpenApiDependencyAttribute>();
+
+            var packages = attributes.Where(a => a.CodeGenerators.Contains(generator));
+            var result = new Dictionary<string, string>();
+            if (packages != null)
+            {
+                foreach (var package in packages)
+                {
+                    result[package.Name] = package.Version;
+                }
+            }
+
+            return result;
+        }
+
+        private static byte[] GetHash(Stream stream)
+        {
+            SHA256 algorithm;
+            try
+            {
+                algorithm = SHA256.Create();
+            }
+            catch (TargetInvocationException)
+            {
+                // SHA256.Create is documented to throw this exception on FIPS-compliant machines. See
+                // https://msdn.microsoft.com/en-us/library/z08hz7ad Fall back to a FIPS-compliant SHA256 algorithm.
+                algorithm = new SHA256CryptoServiceProvider();
+            }
+
+            using (algorithm)
+            {
+                return algorithm.ComputeHash(stream);
+            }
+        }
+
+        private async Task WriteToFileAsync(Stream content, string destinationPath, bool overwrite)
+        {
+            if (content.CanSeek)
+            {
+                content.Seek(0, SeekOrigin.Begin);
+            }
+
+            destinationPath = GetFullPath(destinationPath);
+            var destinationExists = File.Exists(destinationPath);
+            if (destinationExists && !overwrite)
+            {
+                throw new ArgumentException($"File '{destinationPath}' already exists. Aborting to avoid conflicts. Provide the '--output-file' argument with an unused file to resolve.");
+            }
+
+            await Out.WriteLineAsync($"Downloading to '{destinationPath}'.");
+            var reachedCopy = false;
+            try
+            {
+                if (destinationExists)
+                {
+                    // Check hashes before using the downloaded information.
+                    var downloadHash = GetHash(content);
+
+                    byte[] destinationHash;
+                    using (var destinationStream = File.OpenRead(destinationPath))
+                    {
+                        destinationHash = GetHash(destinationStream);
+                    }
+
+                    var sameHashes = downloadHash.Length == destinationHash.Length;
+                    for (var i = 0; sameHashes && i < downloadHash.Length; i++)
+                    {
+                        sameHashes = downloadHash[i] == destinationHash[i];
+                    }
+
+                    if (sameHashes)
+                    {
+                        await Out.WriteLineAsync($"Not overwriting existing and matching file '{destinationPath}'.");
+                        return;
+                    }
+                }
+                else
+                {
+                    // May need to create directory to hold the file.
+                    var destinationDirectory = Path.GetDirectoryName(destinationPath);
+                    if (!string.IsNullOrEmpty(destinationDirectory) && !Directory.Exists(destinationDirectory))
+                    {
+                        Directory.CreateDirectory(destinationDirectory);
+                    }
+                }
+
+                // Create or overwrite the destination file.
+                reachedCopy = true;
+                using var fileStream = new FileStream(destinationPath, FileMode.OpenOrCreate, FileAccess.Write);
+                fileStream.Seek(0, SeekOrigin.Begin);
+                if (content.CanSeek)
+                {
+                    content.Seek(0, SeekOrigin.Begin);
+                }
+                await content.CopyToAsync(fileStream);
+            }
+            catch (Exception ex)
+            {
+                await Error.WriteLineAsync($"Downloading failed.");
+                await Error.WriteLineAsync(ex.ToString());
+                if (reachedCopy)
+                {
+                    File.Delete(destinationPath);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Tools/Microsoft.dotnet-openapi/src/Commands/RefreshCommand.cs b/src/Tools/Microsoft.dotnet-openapi/src/Commands/RefreshCommand.cs
new file mode 100644
index 0000000000..f21196f5f4
--- /dev/null
+++ b/src/Tools/Microsoft.dotnet-openapi/src/Commands/RefreshCommand.cs
@@ -0,0 +1,67 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.Build.Evaluation;
+using Microsoft.DotNet.Openapi.Tools;
+using Microsoft.Extensions.CommandLineUtils;
+using Microsoft.Extensions.Tools.Internal;
+
+namespace Microsoft.DotNet.OpenApi.Commands
+{
+    internal class RefreshCommand : BaseCommand
+    {
+        private const string CommandName = "refresh";
+
+        private const string SourceURLArgName = "source-URL";
+
+        public RefreshCommand(Application parent, IHttpClientWrapper httpClient) : base(parent, CommandName, httpClient)
+        {
+            _sourceFileArg = Argument(SourceURLArgName, $"The OpenAPI reference to refresh.");
+        }
+
+        internal readonly CommandArgument _sourceFileArg;
+
+        protected override async Task<int> ExecuteCoreAsync()
+        {
+            var projectFile = ResolveProjectFile(ProjectFileOption);
+
+            var sourceFile = Ensure.NotNullOrEmpty(_sourceFileArg.Value, SourceURLArgName);
+
+            var destination = FindReferenceFromUrl(projectFile, sourceFile);
+            await DownloadToFileAsync(sourceFile, destination, overwrite: true);
+
+            return 0;
+        }
+
+        private string FindReferenceFromUrl(FileInfo projectFile, string url)
+        {
+            var project = LoadProject(projectFile);
+            var openApiReferenceItems = project.GetItems(OpenApiReference);
+
+            foreach (ProjectItem item in openApiReferenceItems)
+            {
+                var attrUrl = item.GetMetadataValue(SourceUrlAttrName);
+                if (string.Equals(attrUrl, url, StringComparison.Ordinal))
+                {
+                    return item.EvaluatedInclude;
+                }
+            }
+
+            throw new ArgumentException("There was no OpenAPI reference to refresh with the given URL.");
+        }
+
+        protected override bool ValidateArguments()
+        {
+            var sourceFile = Ensure.NotNullOrEmpty(_sourceFileArg.Value, SourceURLArgName);
+            if (!IsUrl(sourceFile))
+            {
+                throw new ArgumentException($"'dotnet openapi refresh' must be given a URL");
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/src/Tools/Microsoft.dotnet-openapi/src/Commands/RemoveCommand.cs b/src/Tools/Microsoft.dotnet-openapi/src/Commands/RemoveCommand.cs
new file mode 100644
index 0000000000..e8e45d2b32
--- /dev/null
+++ b/src/Tools/Microsoft.dotnet-openapi/src/Commands/RemoveCommand.cs
@@ -0,0 +1,78 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.Build.Evaluation;
+using Microsoft.DotNet.Openapi.Tools;
+using Microsoft.Extensions.CommandLineUtils;
+using Microsoft.Extensions.Tools.Internal;
+
+namespace Microsoft.DotNet.OpenApi.Commands
+{
+    internal class RemoveCommand : BaseCommand
+    {
+        private const string CommandName = "remove";
+
+        private const string SourceArgName = "soruce";
+
+        public RemoveCommand(Application parent, IHttpClientWrapper httpClient) : base(parent, CommandName, httpClient)
+        {
+            _sourceProjectArg = Argument(SourceArgName, $"The OpenAPI reference to remove. Must represent a reference which is already in this project", multipleValues: true);
+        }
+
+        internal readonly CommandArgument _sourceProjectArg;
+
+        protected override Task<int> ExecuteCoreAsync()
+        {
+            var projectFile = ResolveProjectFile(ProjectFileOption);
+
+            var sourceFile = Ensure.NotNullOrEmpty(_sourceProjectArg.Value, SourceArgName);
+
+            if (IsProjectFile(sourceFile))
+            {
+                RemoveServiceReference(OpenApiProjectReference, projectFile, sourceFile);
+            }
+            else
+            {
+                var file = RemoveServiceReference(OpenApiReference, projectFile, sourceFile);
+
+                if (file != null)
+                {
+                    File.Delete(GetFullPath(file));
+                }
+            }
+
+            return Task.FromResult(0);
+        }
+
+        private string RemoveServiceReference(string tagName, FileInfo projectFile, string sourceFile)
+        {
+            var project = LoadProject(projectFile);
+            var openApiReferenceItems = project.GetItems(tagName);
+
+            foreach (ProjectItem item in openApiReferenceItems)
+            {
+                var include = item.EvaluatedInclude;
+                var sourceUrl = item.HasMetadata(SourceUrlAttrName) ? item.GetMetadataValue(SourceUrlAttrName) : null;
+                if (string.Equals(include, sourceFile, StringComparison.OrdinalIgnoreCase)
+                    || string.Equals(sourceUrl, sourceFile, StringComparison.OrdinalIgnoreCase))
+                {
+                    project.RemoveItem(item);
+                    project.Save();
+                    return include;
+                }
+            }
+
+            Warning.Write($"No OpenAPI reference was found with the file '{sourceFile}'");
+            return null;
+        }
+
+        protected override bool ValidateArguments()
+        {
+            Ensure.NotNullOrEmpty(_sourceProjectArg.Value, SourceArgName);
+            return true;
+        }
+    }
+}
diff --git a/src/Tools/Microsoft.dotnet-openapi/src/DebugMode.cs b/src/Tools/Microsoft.dotnet-openapi/src/DebugMode.cs
new file mode 100644
index 0000000000..5619fe0178
--- /dev/null
+++ b/src/Tools/Microsoft.dotnet-openapi/src/DebugMode.cs
@@ -0,0 +1,27 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading;
+
+namespace Microsoft.DotNet.OpenApi
+{
+    internal static class DebugMode
+    {
+        public static void HandleDebugSwitch(ref string[] args)
+        {
+            if (args.Length > 0 && string.Equals("--debug", args[0], StringComparison.OrdinalIgnoreCase))
+            {
+                args = args.Skip(1).ToArray();
+
+                Console.WriteLine("Waiting for debugger in pid: {0}", Process.GetCurrentProcess().Id);
+                while (!Debugger.IsAttached)
+                {
+                    Thread.Sleep(TimeSpan.FromSeconds(3));
+                }
+            }
+        }
+    }
+}
diff --git a/src/Tools/Microsoft.dotnet-openapi/src/HttpClientWrapper.cs b/src/Tools/Microsoft.dotnet-openapi/src/HttpClientWrapper.cs
new file mode 100644
index 0000000000..4ca5a9ae26
--- /dev/null
+++ b/src/Tools/Microsoft.dotnet-openapi/src/HttpClientWrapper.cs
@@ -0,0 +1,72 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Threading.Tasks;
+using Microsoft.DotNet.OpenApi;
+using Microsoft.DotNet.OpenApi.Commands;
+
+namespace Microsoft.DotNet.Openapi.Tools
+{
+    public class HttpClientWrapper : IHttpClientWrapper
+    {
+        private readonly HttpClient _client;
+
+        public HttpClientWrapper(HttpClient client)
+        {
+            _client = client;
+        }
+
+        public void Dispose()
+        {
+            _client.Dispose();
+        }
+
+        public async Task<IHttpResponseMessageWrapper> GetResponseAsync(string url)
+        {
+            var response = await _client.GetAsync(url);
+
+            return new HttpResponseMessageWrapper(response);
+        }
+
+        public Task<Stream> GetStreamAsync(string url)
+        {
+            return _client.GetStreamAsync(url);
+        }
+    }
+
+    public class HttpResponseMessageWrapper : IHttpResponseMessageWrapper
+    {
+        private HttpResponseMessage _response;
+
+        public HttpResponseMessageWrapper(HttpResponseMessage response)
+        {
+            _response = response;
+        }
+
+        public Task<Stream> Stream => _response.Content.ReadAsStreamAsync();
+
+        public HttpStatusCode StatusCode => _response.StatusCode;
+
+        public bool IsSuccessCode() => _response.IsSuccessStatusCode;
+
+        public ContentDispositionHeaderValue ContentDisposition()
+        {
+            if (_response.Headers.TryGetValues(BaseCommand.ContentDispositionHeaderName, out var disposition))
+            {
+                return new ContentDispositionHeaderValue(disposition.First());
+            }
+
+            return null;
+        }
+
+        public void Dispose()
+        {
+            _response.Dispose();
+        }
+    }
+}
diff --git a/src/Tools/Microsoft.dotnet-openapi/src/IHttpClientWrapper.cs b/src/Tools/Microsoft.dotnet-openapi/src/IHttpClientWrapper.cs
new file mode 100644
index 0000000000..1cdd358942
--- /dev/null
+++ b/src/Tools/Microsoft.dotnet-openapi/src/IHttpClientWrapper.cs
@@ -0,0 +1,14 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.DotNet.OpenApi;
+
+namespace Microsoft.DotNet.Openapi.Tools
+{
+    internal interface IHttpClientWrapper : IDisposable
+    {
+        Task<IHttpResponseMessageWrapper> GetResponseAsync(string url);
+    }
+}
diff --git a/src/Tools/Microsoft.dotnet-openapi/src/IHttpResponseMessageWrapper.cs b/src/Tools/Microsoft.dotnet-openapi/src/IHttpResponseMessageWrapper.cs
new file mode 100644
index 0000000000..07a4cf6355
--- /dev/null
+++ b/src/Tools/Microsoft.dotnet-openapi/src/IHttpResponseMessageWrapper.cs
@@ -0,0 +1,19 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Net;
+using System.Net.Http.Headers;
+using System.Threading.Tasks;
+
+namespace Microsoft.DotNet.OpenApi
+{
+    public interface IHttpResponseMessageWrapper : IDisposable
+    {
+        Task<Stream> Stream { get; }
+        ContentDispositionHeaderValue ContentDisposition();
+        HttpStatusCode StatusCode { get; }
+        bool IsSuccessCode();
+    }
+}
diff --git a/src/Tools/Microsoft.dotnet-openapi/src/Internal/OpenapiDependencyAttribute.cs b/src/Tools/Microsoft.dotnet-openapi/src/Internal/OpenapiDependencyAttribute.cs
new file mode 100644
index 0000000000..ae21fcec0b
--- /dev/null
+++ b/src/Tools/Microsoft.dotnet-openapi/src/Internal/OpenapiDependencyAttribute.cs
@@ -0,0 +1,25 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.DotNet.OpenApi;
+
+namespace Microsoft.DotNet.Openapi.Tools.Internal
+{
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
+    internal class OpenApiDependencyAttribute : Attribute
+    {
+        public OpenApiDependencyAttribute(string name, string version, string codeGenerators)
+        {
+            Name = name;
+            Version = version;
+            CodeGenerators = codeGenerators.Split(';', StringSplitOptions.RemoveEmptyEntries).Select(c => Enum.Parse<CodeGenerator>(c)).ToArray();
+        }
+
+        public string Name { get; set; }
+        public string Version { get; set; }
+        public IEnumerable<CodeGenerator> CodeGenerators { get; set; }
+    }
+}
diff --git a/src/Tools/Microsoft.dotnet-openapi/src/Microsoft.dotnet-openapi.csproj b/src/Tools/Microsoft.dotnet-openapi/src/Microsoft.dotnet-openapi.csproj
new file mode 100644
index 0000000000..35e9c96c78
--- /dev/null
+++ b/src/Tools/Microsoft.dotnet-openapi/src/Microsoft.dotnet-openapi.csproj
@@ -0,0 +1,37 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
+    <OutputType>exe</OutputType>
+    <Description>Command line tool to add an OpenAPI service reference</Description>
+    <RootNamespace>Microsoft.DotNet.Openapi.Tools</RootNamespace>
+    <AssemblyName>dotnet-openapi</AssemblyName>
+    <PackageId>Microsoft.dotnet-openapi</PackageId>
+    <PackAsTool>true</PackAsTool>
+    <IsShippingPackage>true</IsShippingPackage>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="$(ToolSharedSourceRoot)CommandLine\**\*.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.Build" ExcludeAssets="runtime" />
+    <Reference Include="Microsoft.Build.Locator" />
+    <Reference Include="Microsoft.Extensions.CommandLineUtils.Sources" />
+    <Reference Include="Microsoft.Win32.Registry"  />
+    <Reference Include="System.Security.Principal.Windows"  />
+  </ItemGroup>
+
+  <ItemGroup>
+    <AssemblyAttribute Include="Microsoft.DotNet.Openapi.Tools.Internal.OpenApiDependencyAttribute">
+      <_Parameter1>NSwag.ApiDescription.Client</_Parameter1>
+      <_Parameter2>$(NSwagApiDescriptionClientPackageVersion)</_Parameter2>
+      <_Parameter3>NSwagCSharp;NSwagTypeScript</_Parameter3>
+    </AssemblyAttribute>
+    <AssemblyAttribute Include="Microsoft.DotNet.Openapi.Tools.Internal.OpenApiDependencyAttribute">
+      <_Parameter1>Newtonsoft.Json</_Parameter1>
+      <_Parameter2>$(NewtonsoftJsonPackageVersion)</_Parameter2>
+      <_Parameter3>NSwagCSharp;NSwagTypeScript</_Parameter3>
+    </AssemblyAttribute>
+  </ItemGroup>
+</Project>
diff --git a/src/Tools/Microsoft.dotnet-openapi/src/Program.cs b/src/Tools/Microsoft.dotnet-openapi/src/Program.cs
new file mode 100644
index 0000000000..1dc4e5c747
--- /dev/null
+++ b/src/Tools/Microsoft.dotnet-openapi/src/Program.cs
@@ -0,0 +1,53 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Net.Http;
+using Microsoft.DotNet.Openapi.Tools;
+
+namespace Microsoft.DotNet.OpenApi
+{
+    public class Program
+    {
+        public static int Main(string[] args)
+        {
+            var outputWriter = new StringWriter();
+            var errorWriter = new StringWriter();
+
+            DebugMode.HandleDebugSwitch(ref args);
+
+            try
+            {
+                using var httpClient = new HttpClientWrapper(new HttpClient());
+                var application = new Application(
+                    Directory.GetCurrentDirectory(),
+                    httpClient,
+                    outputWriter,
+                    errorWriter);
+
+                var result = application.Execute(args);
+
+                return result;
+            }
+            catch (Exception ex)
+            {
+                errorWriter.Write("Unexpected error:");
+                errorWriter.WriteLine(ex.ToString());
+            }
+            finally
+            {
+                var output = outputWriter.ToString();
+                var error = errorWriter.ToString();
+
+                outputWriter.Dispose();
+                errorWriter.Dispose();
+
+                Console.WriteLine(output);
+                Console.Error.WriteLine(error);
+            }
+
+            return 1;
+        }
+    }
+}
diff --git a/src/Tools/Microsoft.dotnet-openapi/src/ProjectExtensions.cs b/src/Tools/Microsoft.dotnet-openapi/src/ProjectExtensions.cs
new file mode 100644
index 0000000000..3428c82839
--- /dev/null
+++ b/src/Tools/Microsoft.dotnet-openapi/src/ProjectExtensions.cs
@@ -0,0 +1,23 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.Build.Evaluation;
+
+namespace Microsoft.DotNet.OpenApi
+{
+    public static class ProjectExtensions
+    {
+        public static void AddElementWithAttributes(this Project project, string tagName, string include, IDictionary<string, string> metadata)
+        {
+            var item = project.AddItem(tagName, include).Single();
+            foreach (var kvp in metadata)
+            {
+                item.Xml.AddMetadata(kvp.Key, kvp.Value, expressAsAttribute: true);
+            }
+
+            project.Save();
+        }
+    }
+}
diff --git a/src/Tools/Microsoft.dotnet-openapi/src/Properties/AssemblyInfo.cs b/src/Tools/Microsoft.dotnet-openapi/src/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..0df0f149da
--- /dev/null
+++ b/src/Tools/Microsoft.dotnet-openapi/src/Properties/AssemblyInfo.cs
@@ -0,0 +1,6 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("Microsoft.DotNet.Open.Api.Tools.Tests, PublicKey = 0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
diff --git a/src/Tools/Microsoft.dotnet-openapi/test/OpenApiAddFileTests.cs b/src/Tools/Microsoft.dotnet-openapi/test/OpenApiAddFileTests.cs
new file mode 100644
index 0000000000..257a0fc82d
--- /dev/null
+++ b/src/Tools/Microsoft.dotnet-openapi/test/OpenApiAddFileTests.cs
@@ -0,0 +1,254 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.IO;
+using System.Text.RegularExpressions;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Xml;
+using Microsoft.DotNet.OpenApi.Tests;
+using Microsoft.Extensions.Internal;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Microsoft.DotNet.OpenApi.Add.Tests
+{
+    public class OpenApiAddFileTests : OpenApiTestBase
+    {
+        public OpenApiAddFileTests(ITestOutputHelper output) : base(output) { }
+
+        [Fact]
+        public void OpenApi_Empty_ShowsHelp()
+        {
+            var app = GetApplication();
+            var run = app.Execute(new string[] { });
+
+            Assert.True(string.IsNullOrEmpty(_error.ToString()), $"Threw error: {_error.ToString()}");
+            Assert.Equal(0, run);
+
+            Assert.Contains("Usage: openapi ", _output.ToString());
+        }
+
+        [Fact]
+        public void OpenApi_NoProjectExists()
+        {
+            var app = GetApplication();
+            _tempDir.Create();
+            var run = app.Execute(new string[] { "add", "file", "randomfile.json" });
+
+            Assert.Contains("No project files were found in the current directory", _error.ToString());
+            Assert.Equal(1, run);
+        }
+
+        [Fact]
+        public void OpenApi_ExplicitProject_Missing()
+        {
+            var app = GetApplication();
+            _tempDir.Create();
+            var csproj = "fake.csproj";
+            var run = app.Execute(new string[] { "add", "file", "--updateProject", csproj, "randomfile.json" });
+
+            Assert.Contains($"The project '{Path.Combine(_tempDir.Root, csproj)}' does not exist.", _error.ToString());
+            Assert.Equal(1, run);
+        }
+
+        [Fact]
+        public void OpenApi_Add_Empty_ShowsHelp()
+        {
+            var app = GetApplication();
+            var run = app.Execute(new string[] { "add" });
+
+            Assert.True(string.IsNullOrEmpty(_error.ToString()), $"Threw error: {_error.ToString()}");
+            Assert.Equal(0, run);
+
+            Assert.Contains("Usage: openapi add", _output.ToString());
+        }
+
+        [Fact]
+        public void OpenApi_Add_File_Empty_ShowsHelp()
+        {
+            var app = GetApplication();
+            var run = app.Execute(new string[] { "add", "file", "--help" });
+
+            Assert.True(string.IsNullOrEmpty(_error.ToString()), $"Threw error: {_error.ToString()}");
+            Assert.Equal(0, run);
+
+            Assert.Contains("Usage: openapi ", _output.ToString());
+        }
+
+        [Fact]
+        public async Task OpenApi_Add_ReuseItemGroup()
+        {
+            var project = CreateBasicProject(withOpenApi: true);
+
+            var app = GetApplication();
+            var run = app.Execute(new[] { "add", "file", project.NSwagJsonFile });
+
+            Assert.True(string.IsNullOrEmpty(_error.ToString()), $"Threw error: {_error.ToString()}");
+            Assert.Equal(0, run);
+
+            var secondRun = app.Execute(new[] { "add", "url", FakeOpenApiUrl });
+            Assert.True(string.IsNullOrEmpty(_error.ToString()), $"Threw error: {_error.ToString()}");
+            Assert.Equal(0, secondRun);
+
+            var csproj = new FileInfo(project.Project.Path);
+            string content;
+            using (var csprojStream = csproj.OpenRead())
+            using (var reader = new StreamReader(csprojStream))
+            {
+                content = await reader.ReadToEndAsync();
+                Assert.Contains("<PackageReference Include=\"NSwag.ApiDescription.Client\" Version=\"", content);
+                Assert.Contains($"<OpenApiReference Include=\"{project.NSwagJsonFile}\"", content);
+            }
+            var projXml = new XmlDocument();
+            projXml.Load(csproj.FullName);
+
+            var openApiRefs = projXml.GetElementsByTagName(Commands.BaseCommand.OpenApiReference);
+            Assert.Same(openApiRefs[0].ParentNode, openApiRefs[1].ParentNode);
+        }
+
+        [Fact]
+        public void OpenApi_Add_File_EquivilentPaths()
+        {
+            var project = CreateBasicProject(withOpenApi: true);
+            var nswagJsonFile = project.NSwagJsonFile;
+
+            var app = GetApplication();
+            var run = app.Execute(new[] { "add", "file", nswagJsonFile });
+
+            Assert.True(string.IsNullOrEmpty(_error.ToString()), $"Threw error: {_error.ToString()}");
+            Assert.Equal(0, run);
+
+            app = GetApplication();
+            var absolute = Path.GetFullPath(nswagJsonFile, project.Project.Dir().Root);
+            run = app.Execute(new[] { "add", "file", absolute });
+
+            Assert.True(string.IsNullOrEmpty(_error.ToString()), $"Threw error: {_error.ToString()}");
+            Assert.Equal(0, run);
+
+            var csproj = new FileInfo(project.Project.Path);
+            var projXml = new XmlDocument();
+            projXml.Load(csproj.FullName);
+
+            var openApiRefs = projXml.GetElementsByTagName(Commands.BaseCommand.OpenApiReference);
+            Assert.Single(openApiRefs);
+        }
+
+        [Fact]
+        public async Task OpenApi_Add_NSwagTypeScript()
+        {
+            var project = CreateBasicProject(withOpenApi: true);
+            var nswagJsonFile = project.NSwagJsonFile;
+
+            var app = GetApplication();
+            var run = app.Execute(new[] { "add", "file", nswagJsonFile, "--code-generator", "NSwagTypeScript" });
+
+            Assert.True(string.IsNullOrEmpty(_error.ToString()), $"Threw error: {_error.ToString()}");
+            Assert.Equal(0, run);
+
+            // csproj contents
+            var csproj = new FileInfo(project.Project.Path);
+            using (var csprojStream = csproj.OpenRead())
+            using (var reader = new StreamReader(csprojStream))
+            {
+                var content = await reader.ReadToEndAsync();
+                Assert.Contains("<PackageReference Include=\"NSwag.ApiDescription.Client\" Version=\"", content);
+                Assert.Contains($"<OpenApiReference Include=\"{nswagJsonFile}\" CodeGenerator=\"NSwagTypeScript\" />", content);
+            }
+
+            // Build project and make sure it compiles
+            using var buildProc = ProcessEx.Run(_outputHelper, _tempDir.Root, "dotnet", "build");
+            await buildProc.Exited;
+            Assert.True(buildProc.ExitCode == 0, $"Build failed: {buildProc.Output}");
+
+
+            // Run project and make sure it doesn't crash
+            using var runProc = ProcessEx.Run(_outputHelper, _tempDir.Root, "dotnet", "run");
+            Thread.Sleep(100);
+            Assert.False(runProc.HasExited, $"Run failed with: {runProc.Output}");
+        }
+
+        [Fact]
+        public async Task OpenApi_Add_FromJson()
+        {
+            var project = CreateBasicProject(withOpenApi: true);
+            var nswagJsonFile = project.NSwagJsonFile;
+
+            var app = GetApplication();
+            var run = app.Execute(new[] { "add", "file", nswagJsonFile });
+
+            Assert.True(string.IsNullOrEmpty(_error.ToString()), $"Threw error: {_error.ToString()}");
+            Assert.Equal(0, run);
+
+            // csproj contents
+            var csproj = new FileInfo(project.Project.Path);
+            using (var csprojStream = csproj.OpenRead())
+            using (var reader = new StreamReader(csprojStream))
+            {
+                var content = await reader.ReadToEndAsync();
+                Assert.Contains("<PackageReference Include=\"NSwag.ApiDescription.Client\" Version=\"", content);
+                Assert.Contains($"<OpenApiReference Include=\"{nswagJsonFile}\"", content);
+            }
+
+            // Build project and make sure it compiles
+            var buildProc = ProcessEx.Run(_outputHelper, _tempDir.Root, "dotnet", "build");
+            await buildProc.Exited;
+            Assert.True(buildProc.ExitCode == 0, $"Build failed: {buildProc.Output}");
+
+            // Run project and make sure it doesn't crash
+            using var runProc = ProcessEx.Run(_outputHelper, _tempDir.Root, "dotnet", "run");
+            Thread.Sleep(100);
+            Assert.False(runProc.HasExited, $"Run failed with: {runProc.Output}");
+        }
+
+        [Fact]
+        public async Task OpenApi_Add_File_UseProjectOption()
+        {
+            var project = CreateBasicProject(withOpenApi: true);
+            var nswagJsonFIle = project.NSwagJsonFile;
+
+            var app = GetApplication();
+            var run = app.Execute(new[] { "add", "file", "--updateProject", project.Project.Path, nswagJsonFIle });
+
+            Assert.True(string.IsNullOrEmpty(_error.ToString()), $"Threw error: {_error.ToString()}");
+            Assert.Equal(0, run);
+
+            // csproj contents
+            var csproj = new FileInfo(project.Project.Path);
+            using var csprojStream = csproj.OpenRead();
+            using var reader = new StreamReader(csprojStream);
+            var content = await reader.ReadToEndAsync();
+            Assert.Contains("<PackageReference Include=\"NSwag.ApiDescription.Client\" Version=\"", content);
+            Assert.Contains($"<OpenApiReference Include=\"{nswagJsonFIle}\"", content);
+        }
+
+        [Fact]
+        public async Task OpenApi_Add_MultipleTimes_OnlyOneReference()
+        {
+            var project = CreateBasicProject(withOpenApi: true);
+            var nswagJsonFile = project.NSwagJsonFile;
+
+            var app = GetApplication();
+            var run = app.Execute(new[] { "add", "file", nswagJsonFile });
+
+            Assert.True(string.IsNullOrEmpty(_error.ToString()), $"Threw error: {_error.ToString()}");
+            Assert.Equal(0, run);
+
+            app = GetApplication();
+            run = app.Execute(new[] { "add", "file", nswagJsonFile });
+
+            Assert.True(string.IsNullOrEmpty(_error.ToString()), $"Threw error: {_error.ToString()}");
+            Assert.Equal(0, run);
+
+            // csproj contents
+            var csproj = new FileInfo(project.Project.Path);
+            using var csprojStream = csproj.OpenRead();
+            using var reader = new StreamReader(csprojStream);
+            var content = await reader.ReadToEndAsync();
+            var escapedPkgRef = Regex.Escape("<PackageReference Include=\"NSwag.ApiDescription.Client\" Version=\"");
+            Assert.Single(Regex.Matches(content, escapedPkgRef));
+            var escapedApiRef = Regex.Escape($"<OpenApiReference Include=\"{nswagJsonFile}\"");
+            Assert.Single(Regex.Matches(content, escapedApiRef));
+        }
+    }
+}
diff --git a/src/Tools/Microsoft.dotnet-openapi/test/OpenApiAddProjectTests.cs b/src/Tools/Microsoft.dotnet-openapi/test/OpenApiAddProjectTests.cs
new file mode 100644
index 0000000000..ae791bd2d6
--- /dev/null
+++ b/src/Tools/Microsoft.dotnet-openapi/test/OpenApiAddProjectTests.cs
@@ -0,0 +1,123 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.IO;
+using System.Threading.Tasks;
+using System.Xml;
+using Microsoft.DotNet.OpenApi.Tests;
+using Microsoft.Extensions.Tools.Internal;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Microsoft.DotNet.OpenApi.Add.Tests
+{
+    public class OpenApiAddProjectTests : OpenApiTestBase
+    {
+        public OpenApiAddProjectTests(ITestOutputHelper output) : base(output){}
+
+        [Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/12738")]
+        public async Task OpenApi_Add_GlobbingOpenApi()
+        {
+            var project = CreateBasicProject(withOpenApi: true);
+
+            using (var refProj1 = project.Project.Dir().SubDir("refProj1"))
+            using (var refProj2 = project.Project.Dir().SubDir("refProj2"))
+            {
+                var project1 = refProj1.WithCSharpProject("refProj");
+                project1
+                    .WithTargetFrameworks("netcoreapp3.0")
+                    .Dir()
+                    .Create();
+
+                var project2 = refProj2.WithCSharpProject("refProj2");
+                project2
+                    .WithTargetFrameworks("netcoreapp3.0")
+                    .Dir()
+                    .Create();
+
+                var app = GetApplication();
+
+                var run = app.Execute(new[] { "add", "project", project1.Path, project2.Path});
+
+                Assert.True(string.IsNullOrEmpty(_error.ToString()), $"Threw error: {_error.ToString()}");
+                Assert.Equal(0, run);
+
+                // csproj contents
+                using (var csprojStream = new FileInfo(project.Project.Path).OpenRead())
+                using (var reader = new StreamReader(csprojStream))
+                {
+                    var content = await reader.ReadToEndAsync();
+                    Assert.Contains("<PackageReference Include=\"NSwag.ApiDescription.Client\" Version=\"", content);
+                    Assert.Contains($"<OpenApiProjectReference Include=\"{project1.Path}\"", content);
+                    Assert.Contains($"<OpenApiProjectReference Include=\"{project2.Path}\"", content);
+                }
+            }
+        }
+
+        [Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/12738")]
+        public void OpenApi_Add_Project_EquivilentPaths()
+        {
+            var project = CreateBasicProject(withOpenApi: false);
+
+            using (var refProj = new TemporaryDirectory())
+            {
+                var refProjName = "refProj";
+                var csproj = refProj.WithCSharpProject(refProjName);
+                csproj
+                    .WithTargetFrameworks("netcoreapp3.0")
+                    .Dir()
+                    .Create();
+
+                var app = GetApplication();
+                var run = app.Execute(new[] { "add", "project", csproj.Path});
+
+                Assert.True(string.IsNullOrEmpty(_error.ToString()), $"Threw error: {_error.ToString()}");
+                Assert.Equal(0, run);
+
+                app = GetApplication();
+                run = app.Execute(new[] { "add", "project", Path.Combine(csproj.Path, "..", "refProj.csproj")});
+
+                Assert.True(string.IsNullOrEmpty(_error.ToString()), $"Threw error: {_error.ToString()}");
+                Assert.Equal(0, run);
+
+                var projXml = new XmlDocument();
+                projXml.Load(project.Project.Path);
+
+                var openApiRefs = projXml.GetElementsByTagName(Commands.BaseCommand.OpenApiProjectReference);
+                Assert.Single(openApiRefs);
+            }
+        }
+
+        [Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/12738")]
+        public async Task OpenApi_Add_FromCsProj()
+        {
+            var project = CreateBasicProject(withOpenApi: false);
+
+            using (var refProj = new TemporaryDirectory())
+            {
+                var refProjName = "refProj";
+                refProj
+                    .WithCSharpProject(refProjName)
+                    .WithTargetFrameworks("netcoreapp3.0")
+                    .Dir()
+                    .Create();
+
+                var app = GetApplication();
+                var refProjFile = Path.Join(refProj.Root, $"{refProjName}.csproj");
+                var run = app.Execute(new[] { "add", "project", refProjFile });
+
+                Assert.True(string.IsNullOrEmpty(_error.ToString()), $"Threw error: {_error.ToString()}");
+                Assert.Equal(0, run);
+
+                // csproj contents
+                using(var csprojStream = new FileInfo(project.Project.Path).OpenRead())
+                using(var reader = new StreamReader(csprojStream))
+                {
+                    var content = await reader.ReadToEndAsync();
+                    Assert.Contains("<PackageReference Include=\"NSwag.ApiDescription.Client\" Version=\"", content);
+                    Assert.Contains($"<OpenApiProjectReference Include=\"{refProjFile}\"", content);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Tools/Microsoft.dotnet-openapi/test/OpenApiAddURLTests.cs b/src/Tools/Microsoft.dotnet-openapi/test/OpenApiAddURLTests.cs
new file mode 100644
index 0000000000..95369d7683
--- /dev/null
+++ b/src/Tools/Microsoft.dotnet-openapi/test/OpenApiAddURLTests.cs
@@ -0,0 +1,493 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using Microsoft.DotNet.OpenApi.Tests;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Microsoft.DotNet.OpenApi.Add.Tests
+{
+    public class OpenApiAddURLTests : OpenApiTestBase
+    {
+        public OpenApiAddURLTests(ITestOutputHelper output) : base(output){ }
+
+        [Fact]
+        public async Task OpenApi_Add_Url_WithContentDisposition()
+        {
+            var project = CreateBasicProject(withOpenApi: false);
+
+            var app = GetApplication();
+            var run = app.Execute(new[] { "add", "url", FakeOpenApiUrl });
+
+            Assert.True(string.IsNullOrEmpty(_error.ToString()), $"Threw error: {_error.ToString()}");
+            Assert.Equal(0, run);
+
+            var expectedJsonName = "filename.json";
+
+            // csproj contents
+            using (var csprojStream = new FileInfo(project.Project.Path).OpenRead())
+            using (var reader = new StreamReader(csprojStream))
+            {
+                var content = await reader.ReadToEndAsync();
+                Assert.Contains("<PackageReference Include=\"NSwag.ApiDescription.Client\" Version=\"", content);
+                Assert.Contains(
+    $@"<OpenApiReference Include=""{expectedJsonName}"" SourceUrl=""{FakeOpenApiUrl}"" />", content);
+            }
+
+            var jsonFile = Path.Combine(_tempDir.Root, expectedJsonName);
+            Assert.True(File.Exists(jsonFile));
+            using (var jsonStream = new FileInfo(jsonFile).OpenRead())
+            using (var reader = new StreamReader(jsonStream))
+            {
+                var content = await reader.ReadToEndAsync();
+                Assert.Equal(Content, content);
+            }
+        }
+
+        [Fact]
+        public async Task OpenAPI_Add_Url_NoContentDisposition()
+        {
+            var project = CreateBasicProject(withOpenApi: false);
+            var url = NoDispositionUrl;
+
+            var app = GetApplication();
+            var run = app.Execute(new[] { "add", "url", url});
+
+            Assert.True(string.IsNullOrEmpty(_error.ToString()), $"Threw error: {_error.ToString()}");
+            Assert.Equal(0, run);
+
+            var expectedJsonName = "nodisposition.yaml";
+
+            // csproj contents
+            using (var csprojStream = new FileInfo(project.Project.Path).OpenRead())
+            using (var reader = new StreamReader(csprojStream))
+            {
+                var content = await reader.ReadToEndAsync();
+                Assert.Contains("<PackageReference Include=\"NSwag.ApiDescription.Client\" Version=\"", content);
+                Assert.Contains(
+    $@"<OpenApiReference Include=""{expectedJsonName}"" SourceUrl=""{url}"" />", content);
+            }
+
+            var jsonFile = Path.Combine(_tempDir.Root, expectedJsonName);
+            Assert.True(File.Exists(jsonFile));
+            using (var jsonStream = new FileInfo(jsonFile).OpenRead())
+            using (var reader = new StreamReader(jsonStream))
+            {
+                var content = await reader.ReadToEndAsync();
+                Assert.Equal(Content, content);
+            }
+        }
+
+        [Fact]
+        public async Task OpenAPI_Add_Url_NoExtension_AssumesJson()
+        {
+            var project = CreateBasicProject(withOpenApi: false);
+            var url = NoExtensionUrl;
+
+            var app = GetApplication();
+            var run = app.Execute(new[] { "add", "url", url });
+
+            Assert.True(string.IsNullOrEmpty(_error.ToString()), $"Threw error: {_error.ToString()}");
+            Assert.Equal(0, run);
+
+            var expectedJsonName = "filename.json";
+
+            // csproj contents
+            using (var csprojStream = new FileInfo(project.Project.Path).OpenRead())
+            using (var reader = new StreamReader(csprojStream))
+            {
+                var content = await reader.ReadToEndAsync();
+                Assert.Contains("<PackageReference Include=\"NSwag.ApiDescription.Client\" Version=\"", content);
+                Assert.Contains(
+    $@"<OpenApiReference Include=""{expectedJsonName}"" SourceUrl=""{url}"" />", content);
+            }
+
+            var jsonFile = Path.Combine(_tempDir.Root, expectedJsonName);
+            Assert.True(File.Exists(jsonFile));
+            using (var jsonStream = new FileInfo(jsonFile).OpenRead())
+            using (var reader = new StreamReader(jsonStream))
+            {
+                var content = await reader.ReadToEndAsync();
+                Assert.Equal(Content, content);
+            }
+        }
+
+        [Fact]
+        public async Task OpenApi_Add_Url_NoSegment()
+        {
+            var project = CreateBasicProject(withOpenApi: false);
+            var url = NoSegmentUrl;
+
+            var app = GetApplication();
+            var run = app.Execute(new[] { "add", "url", url });
+
+            Assert.True(string.IsNullOrEmpty(_error.ToString()), $"Threw error: {_error.ToString()}");
+            Assert.Equal(0, run);
+
+            var expectedJsonName = "contoso.json";
+
+            // csproj contents
+            using (var csprojStream = new FileInfo(project.Project.Path).OpenRead())
+            using (var reader = new StreamReader(csprojStream))
+            {
+                var content = await reader.ReadToEndAsync();
+                Assert.Contains("<PackageReference Include=\"NSwag.ApiDescription.Client\" Version=\"", content);
+                Assert.Contains(
+    $@"<OpenApiReference Include=""{expectedJsonName}"" SourceUrl=""{url}"" />", content);
+            }
+
+            var jsonFile = Path.Combine(_tempDir.Root, expectedJsonName);
+            Assert.True(File.Exists(jsonFile));
+            using (var jsonStream = new FileInfo(jsonFile).OpenRead())
+            using (var reader = new StreamReader(jsonStream))
+            {
+                var content = await reader.ReadToEndAsync();
+                Assert.Equal(Content, content);
+            }
+        }
+
+        [Fact]
+        public async Task OpenApi_Add_Url()
+        {
+            var project = CreateBasicProject(withOpenApi: false);
+
+            var app = GetApplication();
+            var run = app.Execute(new[] { "add", "url", FakeOpenApiUrl });
+
+            Assert.True(string.IsNullOrEmpty(_error.ToString()), $"Threw error: {_error.ToString()}");
+            Assert.Equal(0, run);
+
+            var expectedJsonName = "filename.json";
+
+            // csproj contents
+            using (var csprojStream = new FileInfo(project.Project.Path).OpenRead())
+            using (var reader = new StreamReader(csprojStream))
+            {
+                var content = await reader.ReadToEndAsync();
+                Assert.Contains("<PackageReference Include=\"NSwag.ApiDescription.Client\" Version=\"", content);
+                Assert.Contains(
+    $@"<OpenApiReference Include=""{expectedJsonName}"" SourceUrl=""{FakeOpenApiUrl}"" />", content);
+            }
+
+            var jsonFile = Path.Combine(_tempDir.Root, expectedJsonName);
+            Assert.True(File.Exists(jsonFile));
+            using (var jsonStream = new FileInfo(jsonFile).OpenRead())
+            using (var reader = new StreamReader(jsonStream))
+            {
+                var content = await reader.ReadToEndAsync();
+                Assert.Equal(Content, content);
+            }
+        }
+
+        [Fact]
+        public async Task OpenApi_Add_Url_SameName_UniqueFile()
+        {
+            var project = CreateBasicProject(withOpenApi: false);
+
+            var app = GetApplication();
+            var run = app.Execute(new[] { "add", "url", FakeOpenApiUrl });
+
+            Assert.True(string.IsNullOrEmpty(_error.ToString()), $"Threw error: {_error.ToString()}");
+            Assert.Equal(0, run);
+
+            var firstExpectedJsonName = "filename.json";
+
+            // csproj contents
+            using (var csprojStream = new FileInfo(project.Project.Path).OpenRead())
+            using (var reader = new StreamReader(csprojStream))
+            {
+                var content = await reader.ReadToEndAsync();
+                Assert.Contains("<PackageReference Include=\"NSwag.ApiDescription.Client\" Version=\"", content);
+                Assert.Contains(
+    $@"<OpenApiReference Include=""{firstExpectedJsonName}"" SourceUrl=""{FakeOpenApiUrl}"" />", content);
+            }
+
+            var firstJsonFile = Path.Combine(_tempDir.Root, firstExpectedJsonName);
+            Assert.True(File.Exists(firstJsonFile));
+            using (var jsonStream = new FileInfo(firstJsonFile).OpenRead())
+            using (var reader = new StreamReader(jsonStream))
+            {
+                var content = await reader.ReadToEndAsync();
+                Assert.Equal(Content, content);
+            }
+
+            app = GetApplication();
+            run = app.Execute(new[] { "add", "url", NoExtensionUrl });
+
+            Assert.True(string.IsNullOrEmpty(_error.ToString()), $"Threw error: {_error.ToString()}");
+            Assert.Equal(0, run);
+
+            var secondExpectedJsonName = "filename1.json";
+
+            // csproj contents
+            using (var csprojStream = new FileInfo(project.Project.Path).OpenRead())
+            using (var reader = new StreamReader(csprojStream))
+            {
+                var content = await reader.ReadToEndAsync();
+                Assert.Contains("<PackageReference Include=\"NSwag.ApiDescription.Client\" Version=\"", content);
+                Assert.Contains(
+    $@"<OpenApiReference Include=""{firstExpectedJsonName}"" SourceUrl=""{FakeOpenApiUrl}"" />", content);
+                Assert.Contains(
+    $@"<OpenApiReference Include=""{secondExpectedJsonName}"" SourceUrl=""{NoExtensionUrl}"" />", content);
+            }
+
+            var secondJsonFile = Path.Combine(_tempDir.Root, secondExpectedJsonName);
+            Assert.True(File.Exists(secondJsonFile));
+            using (var jsonStream = new FileInfo(secondJsonFile).OpenRead())
+            using (var reader = new StreamReader(jsonStream))
+            {
+                var content = await reader.ReadToEndAsync();
+                Assert.Equal(Content, content);
+            }
+        }
+
+        [Fact]
+        public async Task OpenApi_Add_Url_NSwagCSharp()
+        {
+            var project = CreateBasicProject(withOpenApi: false);
+
+            var app = GetApplication();
+            var run = app.Execute(new[] { "add", "url", FakeOpenApiUrl, "--code-generator", "NSwagCSharp" });
+
+            Assert.True(string.IsNullOrEmpty(_error.ToString()), $"Threw error: {_error.ToString()}");
+            Assert.Equal(0, run);
+
+            var expectedJsonName = "filename.json";
+
+            // csproj contents
+            using (var csprojStream = new FileInfo(project.Project.Path).OpenRead())
+            using (var reader = new StreamReader(csprojStream))
+            {
+                var content = await reader.ReadToEndAsync();
+                Assert.Contains("<PackageReference Include=\"NSwag.ApiDescription.Client\" Version=\"", content);
+                Assert.Contains(
+    $@"<OpenApiReference Include=""{expectedJsonName}"" SourceUrl=""{FakeOpenApiUrl}"" CodeGenerator=""NSwagCSharp"" />", content);
+            }
+
+            var resultFile = Path.Combine(_tempDir.Root, expectedJsonName);
+            Assert.True(File.Exists(resultFile));
+            using (var jsonStream = new FileInfo(resultFile).OpenRead())
+            using (var reader = new StreamReader(jsonStream))
+            {
+                var content = await reader.ReadToEndAsync();
+                Assert.Equal(Content, content);
+            }
+        }
+
+        [Fact]
+        public async Task OpenApi_Add_Url_NSwagTypeScript()
+        {
+            var project = CreateBasicProject(withOpenApi: false);
+
+            var app = GetApplication();
+            var run = app.Execute(new[] { "add", "url", FakeOpenApiUrl, "--code-generator", "NSwagTypeScript" });
+
+            Assert.True(string.IsNullOrEmpty(_error.ToString()), $"Threw error: {_error.ToString()}");
+            Assert.Equal(0, run);
+
+            var expectedJsonName = "filename.json";
+
+            // csproj contents
+            using (var csprojStream = new FileInfo(project.Project.Path).OpenRead())
+            using (var reader = new StreamReader(csprojStream))
+            {
+                var content = await reader.ReadToEndAsync();
+                Assert.Contains("<PackageReference Include=\"NSwag.ApiDescription.Client\" Version=\"", content);
+                Assert.Contains(
+    $@"<OpenApiReference Include=""{expectedJsonName}"" SourceUrl=""{FakeOpenApiUrl}"" CodeGenerator=""NSwagTypeScript"" />", content);
+            }
+
+            var resultFile = Path.Combine(_tempDir.Root, expectedJsonName);
+            Assert.True(File.Exists(resultFile));
+            using (var jsonStream = new FileInfo(resultFile).OpenRead())
+            using (var reader = new StreamReader(jsonStream))
+            {
+                var content = await reader.ReadToEndAsync();
+                Assert.Equal(Content, content);
+            }
+        }
+
+        [Fact]
+        public async Task OpenApi_Add_Url_OutputFile()
+        {
+            var project = CreateBasicProject(withOpenApi: false);
+
+            var app = GetApplication();
+            var run = app.Execute(new[] { "add", "url", FakeOpenApiUrl, "--output-file", Path.Combine("outputdir", "file.yaml") });
+
+            Assert.True(string.IsNullOrEmpty(_error.ToString()), $"Threw error: {_error.ToString()}");
+            Assert.Equal(0, run);
+
+            var expectedJsonName = Path.Combine("outputdir", "file.yaml");
+
+            // csproj contents
+            using (var csprojStream = new FileInfo(project.Project.Path).OpenRead())
+            using (var reader = new StreamReader(csprojStream))
+            {
+                var content = await reader.ReadToEndAsync();
+                Assert.Contains("<PackageReference Include=\"NSwag.ApiDescription.Client\" Version=\"", content);
+                Assert.Contains(
+    $@"<OpenApiReference Include=""{expectedJsonName}"" SourceUrl=""{FakeOpenApiUrl}"" />", content);
+            }
+
+            var resultFile = Path.Combine(_tempDir.Root, expectedJsonName);
+            Assert.True(File.Exists(resultFile));
+            using (var jsonStream = new FileInfo(resultFile).OpenRead())
+            using (var reader = new StreamReader(jsonStream))
+            {
+                var content = await reader.ReadToEndAsync();
+                Assert.Equal(Content, content);
+            }
+        }
+
+        [Fact]
+        public async Task OpenApi_Add_URL_FileAlreadyExists_Fail()
+        {
+            var project = CreateBasicProject(withOpenApi: false);
+
+            var app = GetApplication();
+            var outputFile = Path.Combine("outputdir", "file.yaml");
+            var run = app.Execute(new[] { "add", "url", FakeOpenApiUrl, "--output-file", outputFile });
+
+            Assert.True(string.IsNullOrEmpty(_error.ToString()), $"Threw error: {_error.ToString()}");
+            Assert.Equal(0, run);
+
+            var expectedJsonName = Path.Combine("outputdir", "file.yaml");
+
+            // csproj contents
+            using (var csprojStream = new FileInfo(project.Project.Path).OpenRead())
+            using (var reader = new StreamReader(csprojStream))
+            {
+                var content = await reader.ReadToEndAsync();
+                Assert.Contains("<PackageReference Include=\"NSwag.ApiDescription.Client\" Version=\"", content);
+                Assert.Contains(
+    $@"<OpenApiReference Include=""{expectedJsonName}"" SourceUrl=""{FakeOpenApiUrl}"" />", content);
+            }
+
+            var resultFile = Path.Combine(_tempDir.Root, expectedJsonName);
+            Assert.True(File.Exists(resultFile));
+            using (var jsonStream = new FileInfo(resultFile).OpenRead())
+            using (var reader = new StreamReader(jsonStream))
+            {
+                var content = await reader.ReadToEndAsync();
+                Assert.Equal(Content, content);
+            }
+
+            // Second reference, same output
+            app = GetApplication();
+            run = app.Execute(new[] { "add", "url", DifferentUrl, "--output-file", outputFile});
+            Assert.Equal(1, run);
+            Assert.True(_error.ToString().Contains("Aborting to avoid conflicts."), $"Should have aborted to avoid conflicts");
+
+            // csproj contents
+            using (var csprojStream = new FileInfo(project.Project.Path).OpenRead())
+            using (var reader = new StreamReader(csprojStream))
+            {
+                var content = await reader.ReadToEndAsync();
+                Assert.Contains("<PackageReference Include=\"NSwag.ApiDescription.Client\" Version=\"", content);
+                Assert.Contains(
+    $@"<OpenApiReference Include=""{expectedJsonName}"" SourceUrl=""{FakeOpenApiUrl}"" />", content);
+                Assert.DoesNotContain(
+                    $@"<OpenApiReference Include=""{expectedJsonName}"" SourceUrl=""{DifferentUrl}"" CodeGenerator=""NSwagCSharp"" />", content);
+            }
+
+            using (var jsonStream = new FileInfo(resultFile).OpenRead())
+            using (var reader = new StreamReader(jsonStream))
+            {
+                var content = await reader.ReadToEndAsync();
+                Assert.Equal(Content, content);
+            }
+        }
+
+        [Fact]
+        public void OpenApi_Add_URL_MultipleTimes_OnlyOneReference()
+        {
+            var project = CreateBasicProject(withOpenApi: false);
+
+            var app = GetApplication();
+            var run = app.Execute(new[] { "add", "url", FakeOpenApiUrl });
+
+            Assert.True(string.IsNullOrEmpty(_error.ToString()), $"Threw error: {_error.ToString()}");
+            Assert.Equal(0, run);
+
+            app = GetApplication();
+            run = app.Execute(new[] { "add", "url", "--output-file", "openapi.yaml", FakeOpenApiUrl });
+
+            Assert.True(string.IsNullOrEmpty(_error.ToString()), $"Threw error: {_error.ToString()}");
+            Assert.Equal(0, run);
+
+            // csproj contents
+            var csproj = new FileInfo(project.Project.Path);
+            using var csprojStream = csproj.OpenRead();
+            using var reader = new StreamReader(csprojStream);
+            var content = reader.ReadToEnd();
+            var escapedPkgRef = Regex.Escape("<PackageReference Include=\"NSwag.ApiDescription.Client\" Version=\"");
+            Assert.Single(Regex.Matches(content, escapedPkgRef));
+            var escapedApiRef = Regex.Escape($"SourceUrl=\"{FakeOpenApiUrl}\"");
+            Assert.Single(Regex.Matches(content, escapedApiRef));
+        }
+
+        [Fact]
+        public async Task OpenAPi_Add_URL_InvalidUrl()
+        {
+            var project = CreateBasicProject(withOpenApi: false);
+
+            var app = GetApplication(realHttp: true);
+            var url = BrokenUrl;
+            var run = app.Execute(new[] { "add", "url", url });
+
+            Assert.Equal(_error.ToString(), $"The given url returned 'NotFound', " +
+    "indicating failure. The url might be wrong, or there might be a networking issue."+Environment.NewLine);
+            Assert.Equal(1, run);
+
+            var expectedJsonName = "dingos.json";
+
+            // csproj contents
+            using (var csprojStream = new FileInfo(project.Project.Path).OpenRead())
+            using (var reader = new StreamReader(csprojStream))
+            {
+                var content = await reader.ReadToEndAsync();
+                Assert.DoesNotContain("<PackageReference Include=\"NSwag.ApiDescription.Client\" Version=\"", content);
+                Assert.DoesNotContain($@"<OpenApiReference", content);
+            }
+
+            var jsonFile = Path.Combine(_tempDir.Root, expectedJsonName);
+            Assert.False(File.Exists(jsonFile));
+        }
+
+        [Fact]
+        public void OpenApi_Add_URL_ActualResponse()
+        {
+            var project = CreateBasicProject(withOpenApi: false);
+
+            var app = GetApplication(realHttp: true);
+            var url = ActualUrl;
+            var run = app.Execute(new[] { "add", "url", url });
+
+            Assert.True(string.IsNullOrEmpty(_error.ToString()), $"Threw error: {_error.ToString()}");
+            Assert.Equal(0, run);
+
+            app = GetApplication(realHttp: true);
+            run = app.Execute(new[] { "add", "url", url });
+
+            Assert.True(string.IsNullOrEmpty(_error.ToString()), $"Threw error: {_error.ToString()}");
+            Assert.Equal(0, run);
+
+            // csproj contents
+            var csproj = new FileInfo(project.Project.Path);
+            using var csprojStream = csproj.OpenRead();
+            using var reader = new StreamReader(csprojStream);
+            var content = reader.ReadToEnd();
+            var escapedPkgRef = Regex.Escape("<PackageReference Include=\"NSwag.ApiDescription.Client\" Version=\"");
+            Assert.Single(Regex.Matches(content, escapedPkgRef));
+            var escapedApiRef = Regex.Escape($"SourceUrl=\"{url}\"");
+            Assert.Single(Regex.Matches(content, escapedApiRef));
+            Assert.Contains(
+$@"<OpenApiReference Include=""api-with-examples.yaml"" SourceUrl=""{ActualUrl}"" />", content);
+        }
+    }
+}
diff --git a/src/Tools/Microsoft.dotnet-openapi/test/OpenApiRefreshTests.cs b/src/Tools/Microsoft.dotnet-openapi/test/OpenApiRefreshTests.cs
new file mode 100644
index 0000000000..d63d5015f6
--- /dev/null
+++ b/src/Tools/Microsoft.dotnet-openapi/test/OpenApiRefreshTests.cs
@@ -0,0 +1,48 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.DotNet.OpenApi.Tests;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Microsoft.DotNet.OpenApi.Refresh.Tests
+{
+    public class OpenApiRefreshTests : OpenApiTestBase
+    {
+        public OpenApiRefreshTests(ITestOutputHelper output) : base(output) { }
+
+        [Fact]
+        public async Task OpenApi_Refresh_Basic()
+        {
+            CreateBasicProject(withOpenApi: false);
+
+            var app = GetApplication();
+            var run = app.Execute(new[] { "add", "url", FakeOpenApiUrl });
+
+            Assert.True(string.IsNullOrEmpty(_error.ToString()), $"Threw error: {_error.ToString()}");
+            Assert.Equal(0, run);
+
+            var expectedJsonPath = Path.Combine(_tempDir.Root, "filename.json");
+            var json = await File.ReadAllTextAsync(expectedJsonPath);
+            json += "trash";
+            await File.WriteAllTextAsync(expectedJsonPath, json);
+
+            var firstWriteTime = File.GetLastWriteTime(expectedJsonPath);
+
+            Thread.Sleep(TimeSpan.FromSeconds(1));
+
+            app = GetApplication();
+            run = app.Execute(new[] { "refresh", FakeOpenApiUrl });
+
+            Assert.True(string.IsNullOrEmpty(_error.ToString()), $"Threw error: {_error.ToString()}");
+            Assert.Equal(0, run);
+
+            var secondWriteTime = File.GetLastWriteTime(expectedJsonPath);
+            Assert.True(firstWriteTime < secondWriteTime, $"File wasn't updated! {firstWriteTime} {secondWriteTime}");
+        }
+    }
+}
diff --git a/src/Tools/Microsoft.dotnet-openapi/test/OpenApiRemoveTests.cs b/src/Tools/Microsoft.dotnet-openapi/test/OpenApiRemoveTests.cs
new file mode 100644
index 0000000000..5a110a7c66
--- /dev/null
+++ b/src/Tools/Microsoft.dotnet-openapi/test/OpenApiRemoveTests.cs
@@ -0,0 +1,201 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.DotNet.OpenApi.Tests;
+using Microsoft.Extensions.Tools.Internal;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Microsoft.DotNet.OpenApi.Remove.Tests
+{
+    public class OpenApiRemoveTests : OpenApiTestBase
+    {
+        public OpenApiRemoveTests(ITestOutputHelper output) : base(output) { }
+
+        [Fact]
+        public async Task OpenApi_Remove_File()
+        {
+            var nswagJsonFile = "openapi.json";
+            _tempDir
+                .WithCSharpProject("testproj")
+                .WithTargetFrameworks("netcoreapp3.0")
+                .Dir()
+                .WithContentFile(nswagJsonFile)
+                .WithContentFile("Startup.cs")
+                .Create();
+
+            var add = GetApplication();
+            var run = add.Execute(new[] { "add", "file", nswagJsonFile });
+
+            Assert.True(string.IsNullOrEmpty(_error.ToString()), $"Threw error: {_error.ToString()}");
+            Assert.Equal(0, run);
+
+            // csproj contents
+            var csproj = new FileInfo(Path.Join(_tempDir.Root, "testproj.csproj"));
+            using (var csprojStream = csproj.OpenRead())
+            using (var reader = new StreamReader(csprojStream))
+            {
+                var content = await reader.ReadToEndAsync();
+                Assert.Contains("<PackageReference Include=\"NSwag.ApiDescription.Client\" Version=\"", content);
+                Assert.Contains($"<OpenApiReference Include=\"{nswagJsonFile}\"", content);
+            }
+
+            var remove = GetApplication();
+            var removeRun = remove.Execute(new[] { "remove", nswagJsonFile });
+
+            Assert.True(string.IsNullOrEmpty(_error.ToString()), $"Threw error: {_error.ToString()}");
+            Assert.Equal(0, removeRun);
+
+            // csproj contents
+            csproj = new FileInfo(Path.Join(_tempDir.Root, "testproj.csproj"));
+            using (var csprojStream = csproj.OpenRead())
+            using (var reader = new StreamReader(csprojStream))
+            {
+                var content = await reader.ReadToEndAsync();
+                // Don't remove the package reference, they might have taken other dependencies on it
+                Assert.Contains("<PackageReference Include=\"NSwag.ApiDescription.Client\" Version=\"", content);
+                Assert.DoesNotContain($"<OpenApiReference Include=\"{nswagJsonFile}\"", content);
+            }
+            Assert.False(File.Exists(Path.Combine(_tempDir.Root, nswagJsonFile)));
+        }
+
+        [Fact]
+        public async Task OpenApi_Remove_ViaUrl()
+        {
+            _tempDir
+                .WithCSharpProject("testproj")
+                .WithTargetFrameworks("netcoreapp3.0")
+                .Dir()
+                .WithContentFile("Startup.cs")
+                .Create();
+
+            var add = GetApplication();
+            var run = add.Execute(new[] { "add", "url", FakeOpenApiUrl });
+
+            Assert.True(string.IsNullOrEmpty(_error.ToString()), $"Threw error: {_error.ToString()}");
+            Assert.Equal(0, run);
+
+            // csproj contents
+            var csproj = new FileInfo(Path.Join(_tempDir.Root, "testproj.csproj"));
+            using (var csprojStream = csproj.OpenRead())
+            using (var reader = new StreamReader(csprojStream))
+            {
+                var content = await reader.ReadToEndAsync();
+                // Don't remove the package reference, they might have taken other dependencies on it
+                Assert.Contains("<PackageReference Include=\"NSwag.ApiDescription.Client\" Version=\"", content);
+            }
+
+            var remove = GetApplication();
+            var removeRun = remove.Execute(new[] { "remove", FakeOpenApiUrl });
+
+            Assert.True(string.IsNullOrEmpty(_error.ToString()), $"Threw error: {_error.ToString()}");
+            Assert.Equal(0, removeRun);
+
+            // csproj contents
+            csproj = new FileInfo(Path.Join(_tempDir.Root, "testproj.csproj"));
+            using var removedCsprojStream = csproj.OpenRead();
+            using var removedReader = new StreamReader(removedCsprojStream);
+            var removedContent = await removedReader.ReadToEndAsync();
+            // Don't remove the package reference, they might have taken other dependencies on it
+            Assert.Contains("<PackageReference Include=\"NSwag.ApiDescription.Client\" Version=\"", removedContent);
+            Assert.DoesNotContain($"<OpenApiReference", removedContent);
+        }
+
+        [Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/12738")]
+        public async Task OpenApi_Remove_Project()
+        {
+            _tempDir
+               .WithCSharpProject("testproj")
+               .WithTargetFrameworks("netcoreapp3.0")
+               .Dir()
+               .WithContentFile("Startup.cs")
+               .Create();
+
+            using var refProj = new TemporaryDirectory();
+            var refProjName = "refProj";
+            refProj
+                .WithCSharpProject(refProjName)
+                .WithTargetFrameworks("netcoreapp3.0")
+                .Dir()
+                .Create();
+
+            var app = GetApplication();
+            var refProjFile = Path.Join(refProj.Root, $"{refProjName}.csproj");
+            var run = app.Execute(new[] { "add", "project", refProjFile });
+
+            Assert.True(string.IsNullOrEmpty(_error.ToString()), $"Threw error: {_error.ToString()}");
+            Assert.Equal(0, run);
+
+            // csproj contents
+            using (var csprojStream = new FileInfo(Path.Join(_tempDir.Root, "testproj.csproj")).OpenRead())
+            using (var reader = new StreamReader(csprojStream))
+            {
+                var content = await reader.ReadToEndAsync();
+                Assert.Contains("<PackageReference Include=\"NSwag.ApiDescription.Client\" Version=\"", content);
+                Assert.Contains($"<OpenApiProjectReference Include=\"{refProjFile}\"", content);
+            }
+
+            var remove = GetApplication();
+            run = app.Execute(new[] { "remove", refProjFile });
+
+            Assert.True(string.IsNullOrEmpty(_error.ToString()), $"Threw error: {_error.ToString()}");
+            Assert.Equal(0, run);
+
+            // csproj contents
+            using (var csprojStream = new FileInfo(Path.Join(_tempDir.Root, "testproj.csproj")).OpenRead())
+            using (var reader = new StreamReader(csprojStream))
+            {
+                var content = await reader.ReadToEndAsync();
+                Assert.Contains("<PackageReference Include=\"NSwag.ApiDescription.Client\" Version=\"", content);
+                Assert.DoesNotContain($"<OpenApiProjectReference Include=\"{refProjFile}\"", content);
+            }
+        }
+
+        [Fact]
+        public async Task OpenApi_Remove_Multiple()
+        {
+            var nswagJsonFile = "openapi.json";
+            var swagFile2 = "swag2.json";
+            _tempDir
+                .WithCSharpProject("testproj")
+                .WithTargetFrameworks("netcoreapp3.0")
+                .Dir()
+                .WithContentFile(nswagJsonFile)
+                .WithFile(swagFile2)
+                .WithContentFile("Startup.cs")
+                .Create();
+
+            var add = GetApplication();
+            var run = add.Execute(new[] { "add", "file", nswagJsonFile });
+
+            Assert.True(string.IsNullOrEmpty(_error.ToString()), $"Threw error: {_error.ToString()}");
+            Assert.Equal(0, run);
+
+            add = GetApplication();
+            run = add.Execute(new[] { "add", "file", swagFile2 });
+
+            Assert.True(string.IsNullOrEmpty(_error.ToString()), $"Threw error: {_error.ToString()}");
+            Assert.Equal(0, run);
+
+            var remove = GetApplication();
+            var removeRun = remove.Execute(new[] { "remove", nswagJsonFile, swagFile2 });
+
+            Assert.True(string.IsNullOrEmpty(_error.ToString()), $"Threw error: {_error.ToString()}");
+            Assert.Equal(0, removeRun);
+
+            // csproj contents
+            var csproj = new FileInfo(Path.Join(_tempDir.Root, "testproj.csproj"));
+            using (var csprojStream = csproj.OpenRead())
+            using (var reader = new StreamReader(csprojStream))
+            {
+                var content = await reader.ReadToEndAsync();
+                // Don't remove the package reference, they might have taken other dependencies on it
+                Assert.Contains("<PackageReference Include=\"NSwag.ApiDescription.Client\" Version=\"", content);
+                Assert.DoesNotContain($"<OpenApiReference Include=\"{nswagJsonFile}\"", content);
+            }
+            Assert.False(File.Exists(Path.Combine(_tempDir.Root, nswagJsonFile)));
+        }
+    }
+}
diff --git a/src/Tools/Microsoft.dotnet-openapi/test/OpenApiTestBase.cs b/src/Tools/Microsoft.dotnet-openapi/test/OpenApiTestBase.cs
new file mode 100644
index 0000000000..b40d1ae5e8
--- /dev/null
+++ b/src/Tools/Microsoft.dotnet-openapi/test/OpenApiTestBase.cs
@@ -0,0 +1,183 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.DotNet.Openapi.Tools;
+using Microsoft.Extensions.Tools.Internal;
+using Xunit.Abstractions;
+
+namespace Microsoft.DotNet.OpenApi.Tests
+{
+    public class OpenApiTestBase : IDisposable
+    {
+        protected readonly TemporaryDirectory _tempDir;
+        protected readonly TextWriter _output = new StringWriter();
+        protected readonly TextWriter _error = new StringWriter();
+        protected readonly ITestOutputHelper _outputHelper;
+
+        protected const string Content = @"{""x-generator"": ""NSwag""}";
+        protected const string ActualUrl = "https://raw.githubusercontent.com/OAI/OpenAPI-Specification/master/examples/v3.0/api-with-examples.yaml";
+        protected const string BrokenUrl = "https://www.microsoft.com/en-us/dingos.json";
+        protected const string FakeOpenApiUrl = "https://contoso.com/openapi.json";
+        protected const string NoDispositionUrl = "https://contoso.com/nodisposition.yaml";
+        protected const string NoExtensionUrl = "https://contoso.com/noextension";
+        protected const string NoSegmentUrl = "https://contoso.com";
+        protected const string DifferentUrl = "https://contoso.com/different.json";
+        protected const string PackageUrl = "https://go.microsoft.com/fwlink/?linkid=2099561";
+        protected const string DifferentUrlContent = @"
+{
+    ""x-generator"": ""NSwag""
+}";
+        protected const string PackageUrlContent = @"
+{
+  ""Version"" : ""1.0"",
+  ""Packages""  :  {
+    ""Microsoft.Azure.SignalR"": ""1.1.0-preview1-10442"",
+    ""Grpc.AspNetCore.Server"": ""0.1.22-pre2"",
+    ""Grpc.Net.ClientFactory"": ""0.1.22-pre2"",
+    ""Google.Protobuf"": ""3.8.0"",
+    ""Grpc.Tools"": ""1.22.0"",
+    ""NSwag.ApiDescription.Client"": ""13.0.3"",
+    ""Microsoft.Extensions.ApiDescription.Client"": ""0.3.0-preview7.19365.7"",
+    ""Newtonsoft.Json"": ""12.0.2""
+  }
+}";
+
+        public OpenApiTestBase(ITestOutputHelper output)
+        {
+            _tempDir = new TemporaryDirectory();
+            _outputHelper = output;
+        }
+
+        public TemporaryNSwagProject CreateBasicProject(bool withOpenApi)
+        {
+            var nswagJsonFile = "openapi.json";
+            var project = _tempDir
+                .WithCSharpProject("testproj", sdk: "Microsoft.NET.Sdk.Web")
+                .WithTargetFrameworks("netcoreapp3.0");
+            var tmp = project.Dir();
+
+            if (withOpenApi)
+            {
+                tmp = tmp.WithContentFile(nswagJsonFile);
+            }
+
+            tmp.WithContentFile("Startup.cs")
+                .Create();
+
+            return new TemporaryNSwagProject(project, nswagJsonFile);
+        }
+
+        internal Application GetApplication(bool realHttp = false)
+        {
+            IHttpClientWrapper wrapper;
+            if (realHttp)
+            {
+                wrapper = new HttpClientWrapper(new HttpClient());
+            }
+            else
+            {
+                wrapper = new TestHttpClientWrapper(DownloadMock());
+            }
+            return new Application(
+                _tempDir.Root, wrapper, _output, _error);
+        }
+
+        private IDictionary<string, Tuple<string, ContentDispositionHeaderValue>> DownloadMock()
+        {
+            var noExtension = new ContentDispositionHeaderValue("attachment");
+            noExtension.Parameters.Add(new NameValueHeaderValue("filename", "filename"));
+            var extension = new ContentDispositionHeaderValue("attachment");
+            extension.Parameters.Add(new NameValueHeaderValue("filename", "filename.json"));
+            var justAttachments = new ContentDispositionHeaderValue("attachment");
+
+            return new Dictionary<string, Tuple<string, ContentDispositionHeaderValue>> {
+                { FakeOpenApiUrl, Tuple.Create(Content, extension)},
+                { DifferentUrl, Tuple.Create<string, ContentDispositionHeaderValue>(DifferentUrlContent, null) },
+                { PackageUrl, Tuple.Create<string, ContentDispositionHeaderValue>(PackageUrlContent, null) },
+                { NoDispositionUrl, Tuple.Create<string, ContentDispositionHeaderValue>(Content, null) },
+                { NoExtensionUrl, Tuple.Create(Content, noExtension) },
+                { NoSegmentUrl, Tuple.Create(Content, justAttachments) }
+            };
+        }
+
+        public void Dispose()
+        {
+            _outputHelper.WriteLine(_output.ToString());
+            _tempDir.Dispose();
+        }
+    }
+
+    public class TestHttpClientWrapper : IHttpClientWrapper
+    {
+        private readonly IDictionary<string, Tuple<string, ContentDispositionHeaderValue>> _results;
+
+        public TestHttpClientWrapper(IDictionary<string, Tuple<string, ContentDispositionHeaderValue>> results)
+        {
+            _results = results;
+        }
+
+        public void Dispose()
+        {
+        }
+
+        public Task<IHttpResponseMessageWrapper> GetResponseAsync(string url)
+        {
+            var result = _results[url];
+            byte[] byteArray = Encoding.ASCII.GetBytes(result.Item1);
+            var stream = new MemoryStream(byteArray);
+
+            return Task.FromResult<IHttpResponseMessageWrapper>(new TestHttpResponseMessageWrapper(stream, result.Item2));
+        }
+    }
+
+    public class TestHttpResponseMessageWrapper : IHttpResponseMessageWrapper
+    {
+        public Task<Stream> Stream { get; }
+
+        public HttpStatusCode StatusCode { get; } = HttpStatusCode.OK;
+
+        public bool IsSuccessCode()
+        {
+            return true;
+        }
+
+        private ContentDispositionHeaderValue _contentDisposition;
+
+        public TestHttpResponseMessageWrapper(
+            MemoryStream stream,
+            ContentDispositionHeaderValue header)
+        {
+            Stream = Task.FromResult<Stream>(stream);
+            _contentDisposition = header;
+        }
+
+        public ContentDispositionHeaderValue ContentDisposition()
+        {
+            return _contentDisposition;
+        }
+
+        public void Dispose()
+        {
+        }
+    }
+
+    public class TemporaryNSwagProject
+    {
+        public TemporaryNSwagProject(TemporaryCSharpProject project, string jsonFile)
+        {
+            Project = project;
+            NSwagJsonFile = jsonFile;
+        }
+
+        public TemporaryCSharpProject Project { get; set; }
+        public string NSwagJsonFile { get; set; }
+    }
+}
diff --git a/src/Tools/Microsoft.dotnet-openapi/test/ProcessEx.cs b/src/Tools/Microsoft.dotnet-openapi/test/ProcessEx.cs
new file mode 100644
index 0000000000..fddaac68a7
--- /dev/null
+++ b/src/Tools/Microsoft.dotnet-openapi/test/ProcessEx.cs
@@ -0,0 +1,146 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+using Xunit.Abstractions;
+
+namespace Microsoft.Extensions.Internal
+{
+    internal class ProcessEx : IDisposable
+    {
+        private readonly ITestOutputHelper _output;
+        private readonly Process _process;
+        private readonly StringBuilder _stderrCapture = new StringBuilder();
+        private readonly StringBuilder _stdoutCapture = new StringBuilder();
+        private readonly object _pipeCaptureLock = new object();
+        private BlockingCollection<string> _stdoutLines = new BlockingCollection<string>();
+        private TaskCompletionSource<int> _exited;
+
+        private ProcessEx(ITestOutputHelper output, Process proc)
+        {
+            _output = output;
+
+            _process = proc;
+            proc.EnableRaisingEvents = true;
+            proc.OutputDataReceived += OnOutputData;
+            proc.ErrorDataReceived += OnErrorData;
+            proc.Exited += OnProcessExited;
+            proc.BeginOutputReadLine();
+            proc.BeginErrorReadLine();
+
+            _exited = new TaskCompletionSource<int>(TaskCreationOptions.RunContinuationsAsynchronously);
+        }
+
+        public Task Exited => _exited.Task;
+
+        public bool HasExited => _process.HasExited;
+
+        public string Output
+        {
+            get
+            {
+                lock (_pipeCaptureLock)
+                {
+                    return _stdoutCapture.ToString();
+                }
+            }
+        }
+
+        public int ExitCode => _process.ExitCode;
+
+        public static ProcessEx Run(ITestOutputHelper output, string workingDirectory, string command, string args = null, IDictionary<string, string> envVars = null)
+        {
+            var startInfo = new ProcessStartInfo(command, args)
+            {
+                RedirectStandardOutput = true,
+                RedirectStandardError = true,
+                UseShellExecute = false,
+                CreateNoWindow = true,
+                WorkingDirectory = workingDirectory
+            };
+
+            if (envVars != null)
+            {
+                foreach (var envVar in envVars)
+                {
+                    startInfo.EnvironmentVariables[envVar.Key] = envVar.Value;
+                }
+            }
+
+            output.WriteLine($"==> {startInfo.FileName} {startInfo.Arguments} [{startInfo.WorkingDirectory}]");
+            var proc = Process.Start(startInfo);
+
+            return new ProcessEx(output, proc);
+        }
+
+        private void OnErrorData(object sender, DataReceivedEventArgs e)
+        {
+            if (e.Data == null)
+            {
+                return;
+            }
+
+            lock (_pipeCaptureLock)
+            {
+                _stderrCapture.AppendLine(e.Data);
+            }
+
+            _output.WriteLine("[ERROR] " + e.Data);
+        }
+
+        private void OnOutputData(object sender, DataReceivedEventArgs e)
+        {
+            if (e.Data == null)
+            {
+                return;
+            }
+
+            lock (_pipeCaptureLock)
+            {
+                _stdoutCapture.AppendLine(e.Data);
+            }
+
+            _output.WriteLine(e.Data);
+
+            if (_stdoutLines != null)
+            {
+                _stdoutLines.Add(e.Data);
+            }
+        }
+
+        private void OnProcessExited(object sender, EventArgs e)
+        {
+            _process.WaitForExit();
+            _stdoutLines.CompleteAdding();
+            _stdoutLines = null;
+            _exited.TrySetResult(_process.ExitCode);
+        }
+
+        public void Dispose()
+        {
+            if (_process != null && !_process.HasExited)
+            {
+                _process.KillTree();
+            }
+
+            _process.CancelOutputRead();
+            _process.CancelErrorRead();
+
+            _process.ErrorDataReceived -= OnErrorData;
+            _process.OutputDataReceived -= OnOutputData;
+            _process.Exited -= OnProcessExited;
+            _process.Dispose();
+
+            if(_stdoutLines != null)
+            {
+                _stdoutLines.Dispose();
+            }
+        }
+    }
+}
diff --git a/src/Tools/Microsoft.dotnet-openapi/test/Properties/AssemblyInfo.cs b/src/Tools/Microsoft.dotnet-openapi/test/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..76cbce868d
--- /dev/null
+++ b/src/Tools/Microsoft.dotnet-openapi/test/Properties/AssemblyInfo.cs
@@ -0,0 +1,6 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using Xunit;
+
+[assembly: CollectionBehavior(DisableTestParallelization = true)]
\ No newline at end of file
diff --git a/src/Tools/Microsoft.dotnet-openapi/test/TestContent/Startup.cs.txt b/src/Tools/Microsoft.dotnet-openapi/test/TestContent/Startup.cs.txt
new file mode 100644
index 0000000000..edea5132c8
--- /dev/null
+++ b/src/Tools/Microsoft.dotnet-openapi/test/TestContent/Startup.cs.txt
@@ -0,0 +1,46 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.IO;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Net.Http.Headers;
+
+namespace SimpleWebSite
+{
+    public class Startup
+    {
+        public void ConfigureServices(IServiceCollection services)
+        {
+            // Example 1
+            services
+                .AddMvcCore()
+                .AddAuthorization()
+                .AddFormatterMappings(m => m.SetMediaTypeMappingForFormat("js", new MediaTypeHeaderValue("application/json")))
+                .SetCompatibilityVersion(CompatibilityVersion.Latest);
+        }
+
+        public void Configure(IApplicationBuilder app)
+        {
+            app.UseMvcWithDefaultRoute();
+        }
+
+        public static void Main(string[] args)
+        {
+            var host = CreateWebHostBuilder(args)
+                .Build();
+
+            host.Run();
+        }
+
+        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
+            new WebHostBuilder()
+                .UseContentRoot(Directory.GetCurrentDirectory())
+                .UseStartup<Startup>()
+                .UseKestrel()
+                .UseIISIntegration();
+    }
+}
diff --git a/src/Tools/Microsoft.dotnet-openapi/test/TestContent/openapi.json.txt b/src/Tools/Microsoft.dotnet-openapi/test/TestContent/openapi.json.txt
new file mode 100644
index 0000000000..dff10b9817
--- /dev/null
+++ b/src/Tools/Microsoft.dotnet-openapi/test/TestContent/openapi.json.txt
@@ -0,0 +1,514 @@
+{
+  "x-generator": "NSwag v11.17.15.0 (NJsonSchema v9.10.53.0 (Newtonsoft.Json v10.0.0.0))",
+  "openapi": "2.0",
+  "info": {
+    "title": "My Title",
+    "version": "1.0.0"
+  },
+  "host": "localhost:44370",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json",
+    "application/json-patch+json",
+    "text/json",
+    "application/*+json",
+    "multipart/form-data"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "paths": {
+    "/pet": {
+      "post": {
+        "tags": [
+          "Pet"
+        ],
+        "operationId": "Pet_AddPet",
+        "consumes": [
+          "application/json"
+        ],
+        "parameters": [
+          {
+            "name": "pet",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/Pet"
+            },
+            "x-nullable": true
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": ""
+          },
+          "400": {
+            "x-nullable": true,
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/SerializableError"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "Pet"
+        ],
+        "operationId": "Pet_EditPet",
+        "consumes": [
+          "application/json"
+        ],
+        "parameters": [
+          {
+            "name": "pet",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/Pet"
+            },
+            "x-nullable": true
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": ""
+          },
+          "400": {
+            "x-nullable": true,
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/SerializableError"
+            }
+          }
+        }
+      }
+    },
+    "/pet/findByStatus": {
+      "get": {
+        "tags": [
+          "Pet"
+        ],
+        "operationId": "Pet_FindByStatus",
+        "consumes": [
+          "application/json-patch+json",
+          "application/json",
+          "text/json",
+          "application/*+json"
+        ],
+        "parameters": [
+          {
+            "name": "status",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            "x-nullable": true
+          }
+        ],
+        "responses": {
+          "200": {
+            "x-nullable": true,
+            "description": "",
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/Pet"
+              }
+            }
+          }
+        }
+      }
+    },
+    "/pet/findByCategory": {
+      "get": {
+        "tags": [
+          "Pet"
+        ],
+        "operationId": "Pet_FindByCategory",
+        "parameters": [
+          {
+            "type": "string",
+            "name": "category",
+            "in": "query",
+            "required": true,
+            "x-nullable": true
+          }
+        ],
+        "responses": {
+          "200": {
+            "x-nullable": true,
+            "description": "",
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/Pet"
+              }
+            }
+          },
+          "400": {
+            "x-nullable": true,
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/SerializableError"
+            }
+          }
+        }
+      }
+    },
+    "/pet/{petId}": {
+      "get": {
+        "tags": [
+          "Pet"
+        ],
+        "operationId": "Pet_FindById",
+        "parameters": [
+          {
+            "type": "integer",
+            "name": "petId",
+            "in": "path",
+            "required": true,
+            "format": "int32",
+            "x-nullable": false
+          }
+        ],
+        "responses": {
+          "200": {
+            "x-nullable": true,
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/Pet"
+            }
+          },
+          "400": {
+            "x-nullable": true,
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/SerializableError"
+            }
+          },
+          "404": {
+            "description": ""
+          }
+        }
+      },
+      "post": {
+        "tags": [
+          "Pet"
+        ],
+        "operationId": "Pet_EditPet2",
+        "parameters": [
+          {
+            "type": "integer",
+            "name": "petId",
+            "in": "path",
+            "required": true,
+            "format": "int32",
+            "x-nullable": false
+          },
+          {
+            "type": "integer",
+            "name": "Id",
+            "in": "formData",
+            "required": true,
+            "format": "int32",
+            "x-nullable": false
+          },
+          {
+            "type": "integer",
+            "name": "Age",
+            "in": "formData",
+            "required": true,
+            "format": "int32",
+            "x-nullable": false
+          },
+          {
+            "type": "integer",
+            "name": "Category.Id",
+            "in": "formData",
+            "required": true,
+            "format": "int32",
+            "x-nullable": false
+          },
+          {
+            "type": "string",
+            "name": "Category.Name",
+            "in": "formData",
+            "required": true,
+            "x-nullable": true
+          },
+          {
+            "type": "boolean",
+            "name": "HasVaccinations",
+            "in": "formData",
+            "required": true,
+            "x-nullable": false
+          },
+          {
+            "type": "string",
+            "name": "Name",
+            "in": "formData",
+            "required": true,
+            "x-nullable": true
+          },
+          {
+            "type": "array",
+            "name": "Images",
+            "in": "formData",
+            "required": true,
+            "collectionFormat": "multi",
+            "x-nullable": true,
+            "items": {
+              "$ref": "#/definitions/Image"
+            }
+          },
+          {
+            "type": "array",
+            "name": "Tags",
+            "in": "formData",
+            "required": true,
+            "collectionFormat": "multi",
+            "x-nullable": true,
+            "items": {
+              "$ref": "#/definitions/Tag"
+            }
+          },
+          {
+            "type": "string",
+            "name": "Status",
+            "in": "formData",
+            "required": true,
+            "x-nullable": true
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": ""
+          },
+          "400": {
+            "x-nullable": true,
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/SerializableError"
+            }
+          },
+          "404": {
+            "description": ""
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "Pet"
+        ],
+        "operationId": "Pet_DeletePet",
+        "parameters": [
+          {
+            "type": "integer",
+            "name": "petId",
+            "in": "path",
+            "required": true,
+            "format": "int32",
+            "x-nullable": false
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": ""
+          },
+          "400": {
+            "x-nullable": true,
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/SerializableError"
+            }
+          },
+          "404": {
+            "description": ""
+          }
+        }
+      }
+    },
+    "/pet/{petId}/uploadImage": {
+      "post": {
+        "tags": [
+          "Pet"
+        ],
+        "operationId": "Pet_UploadImage",
+        "consumes": [
+          "multipart/form-data"
+        ],
+        "parameters": [
+          {
+            "type": "integer",
+            "name": "petId",
+            "in": "path",
+            "required": true,
+            "format": "int32",
+            "x-nullable": false
+          },
+          {
+            "type": "file",
+            "name": "file",
+            "in": "formData",
+            "required": true,
+            "x-nullable": true
+          }
+        ],
+        "responses": {
+          "200": {
+            "x-nullable": true,
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/ApiResponse"
+            }
+          },
+          "400": {
+            "x-nullable": true,
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/SerializableError"
+            }
+          },
+          "404": {
+            "description": ""
+          }
+        }
+      }
+    }
+  },
+  "definitions": {
+    "Pet": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": [
+        "id",
+        "age",
+        "hasVaccinations",
+        "name",
+        "status"
+      ],
+      "properties": {
+        "id": {
+          "type": "integer",
+          "format": "int32"
+        },
+        "age": {
+          "type": "integer",
+          "format": "int32",
+          "maximum": 150.0,
+          "minimum": 0.0
+        },
+        "category": {
+          "$ref": "#/definitions/Category"
+        },
+        "hasVaccinations": {
+          "type": "boolean"
+        },
+        "name": {
+          "type": "string",
+          "maxLength": 50,
+          "minLength": 2
+        },
+        "images": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Image"
+          }
+        },
+        "tags": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Tag"
+          }
+        },
+        "status": {
+          "type": "string"
+        }
+      }
+    },
+    "Category": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": [
+        "id"
+      ],
+      "properties": {
+        "id": {
+          "type": "integer",
+          "format": "int32"
+        },
+        "name": {
+          "type": "string"
+        }
+      }
+    },
+    "Image": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": [
+        "id"
+      ],
+      "properties": {
+        "id": {
+          "type": "integer",
+          "format": "int32"
+        },
+        "url": {
+          "type": "string"
+        }
+      }
+    },
+    "Tag": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": [
+        "id"
+      ],
+      "properties": {
+        "id": {
+          "type": "integer",
+          "format": "int32"
+        },
+        "name": {
+          "type": "string"
+        }
+      }
+    },
+    "SerializableError": {
+      "type": "object",
+      "additionalProperties": false,
+      "allOf": [
+        {
+          "type": "object",
+          "additionalProperties": {}
+        }
+      ]
+    },
+    "ApiResponse": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": [
+        "code"
+      ],
+      "properties": {
+        "code": {
+          "type": "integer",
+          "format": "int32"
+        },
+        "message": {
+          "type": "string"
+        },
+        "type": {
+          "type": "string"
+        }
+      }
+    }
+  }
+}
diff --git a/src/Tools/Microsoft.dotnet-openapi/test/dotnet-microsoft.openapi.Tests.csproj b/src/Tools/Microsoft.dotnet-openapi/test/dotnet-microsoft.openapi.Tests.csproj
new file mode 100644
index 0000000000..288c651ed3
--- /dev/null
+++ b/src/Tools/Microsoft.dotnet-openapi/test/dotnet-microsoft.openapi.Tests.csproj
@@ -0,0 +1,51 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
+    <AssemblyName>Microsoft.DotNet.Open.Api.Tools.Tests</AssemblyName>
+    <DefaultItemExcludes>$(DefaultItemExcludes);TestProjects\**\*</DefaultItemExcludes>
+    <TestGroupName>DotNetAddOpenAPIReferenceToolsTests</TestGroupName>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <OpenAPIToolCSProjPath>..\src\Microsoft.dotnet-openapi.csproj</OpenAPIToolCSProjPath>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="$(ToolSharedSourceRoot)TestHelpers\**\*.cs" />
+    <Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />
+    <Content Include="TestContent\*" LinkBase="TestContent\" CopyToOutputDirectory="PreserveNewest" />
+    <Compile Include="$(SharedSourceRoot)Process\ProcessExtensions.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.Build" ExcludeAssets="runtime" />
+    <ProjectReference Include="$(OpenAPIToolCSProjPath)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
+      <_Parameter1>TestSettings:RestoreSources</_Parameter1>
+      <_Parameter2>$(RestoreSources)</_Parameter2>
+    </AssemblyAttribute>
+    <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
+      <_Parameter1>TestSettings:RuntimeFrameworkVersion</_Parameter1>
+      <_Parameter2>$(RuntimeFrameworkVersion)</_Parameter2>
+    </AssemblyAttribute>
+    <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
+      <_Parameter1>RepoRoot</_Parameter1>
+      <_Parameter2>$(RepoRoot)</_Parameter2>
+    </AssemblyAttribute>
+  </ItemGroup>
+
+  <Target Name="CleanTestProjects" BeforeTargets="CoreCompile">
+    <RemoveDir Directories="$(TargetDir)TestProjects" Condition="Exists('$(TargetDir)TestProjects')" />
+  </Target>
+
+  <Target Name="PublishDotNetOpenApiOnBuild" BeforeTargets="Build" Condition="'$(DotNetBuildFromSource)' != 'true'">
+    <MSBuild Projects="$(OpenAPIToolCSProjPath)" Targets="Publish" Properties="PublishDir=$(OutputPath)\tool\;Configuration=$(Configuration)" />
+  </Target>
+
+  <Target Name="PublishDotNetOpenApiOnPublish" BeforeTargets="Publish"  Condition="'$(DotNetBuildFromSource)' != 'true'">
+    <MSBuild Projects="$(OpenAPIToolCSProjPath)" Targets="Publish" Properties="PublishDir=$(PublishDir)\tool\;Configuration=$(Configuration)" />
+  </Target>
+</Project>
diff --git a/src/Tools/Microsoft.dotnet-openapi/test/xunit.runner.json b/src/Tools/Microsoft.dotnet-openapi/test/xunit.runner.json
new file mode 100644
index 0000000000..d25ea9035a
--- /dev/null
+++ b/src/Tools/Microsoft.dotnet-openapi/test/xunit.runner.json
@@ -0,0 +1,5 @@
+{
+  "longRunningTestSeconds": 30,
+  "diagnosticMessages": true,
+  "maxParallelThreads": -1
+}
diff --git a/src/Tools/README.md b/src/Tools/README.md
index e13c6ec6e3..2341848303 100644
--- a/src/Tools/README.md
+++ b/src/Tools/README.md
@@ -1,19 +1,31 @@
-DotNetTools
-===========
+# DotNetTools
 
-## Projects
+## Bundled tools
 
-The folder contains command-line tools for ASP.NET Core that are bundled* in the .NET Core CLI. Follow the links below for more details on each tool.
+The folder contains command-line tools for ASP.NET Core. The following tools are bundled* in the .NET Core CLI. Follow the links below for more details on each tool.
 
- - [dotnet-watch](dotnet-watch/README.md)
- - [dotnet-user-secrets](dotnet-user-secrets/README.md)
- - [dotnet-sql-cache](dotnet-sql-cache/README.md)
- - [dotnet-dev-certs](dotnet-dev-certs/README.md)
+- [dotnet-watch](dotnet-watch/README.md)
+- [dotnet-user-secrets](dotnet-user-secrets/README.md)
+- [dotnet-sql-cache](dotnet-sql-cache/README.md)
+- [dotnet-dev-certs](dotnet-dev-certs/README.md)
 
 *\*This applies to .NET Core CLI 2.1.300-preview2 and up. For earlier versions of the CLI, these tools must be installed separately.*
 
 *For 2.0 CLI and earlier, see <https://github.com/aspnet/DotNetTools/tree/rel/2.0.0/README.md> for details.*
 
+## Non-bundled tools
+
+The following tools are produced by us but not bundled in the .NET Core CLI. They must be aquired independently.
+
+- [Microsoft.dotnet-openapi](Microsoft.dotnet-openapi/README.md)
+
+This folder also contains the infrastructure for our partners' service reference features:
+
+- [Extensions.ApiDescription.Client](Extensions.ApiDescription.Client/README.md) MSBuild glue for OpenAPI code generation.
+- [Extensions.ApiDescription.Server](Extensions.ApiDescription.Server/README.md) MSBuild glue for OpenAPI document generation.
+- [dotnet-getdocument](dotnet-getdocument/README.md) the outside man of OpenAPI document generation tool.
+- [GetDocument.Insider](GetDocumentInsider/README.md) the inside man of OpenAPI document generation tool.
+
 ## Usage
 
 The command line tools can be invoked as a subcommand of `dotnet`.
@@ -23,10 +35,11 @@ dotnet watch
 dotnet user-secrets
 dotnet sql-cache
 dotnet dev-certs
+dotnet openapi
 ```
 
 Add `--help` to see more details. For example,
 
-```
+```sh
 dotnet watch --help
 ```
diff --git a/src/Tools/Shared/CommandLine/CliContext.cs b/src/Tools/Shared/CommandLine/CliContext.cs
index 854ea0fef6..230f832037 100644
--- a/src/Tools/Shared/CommandLine/CliContext.cs
+++ b/src/Tools/Shared/CommandLine/CliContext.cs
@@ -5,6 +5,10 @@ using System;
 
 namespace Microsoft.Extensions.Tools.Internal
 {
+    /// <summary>
+    /// This API supports infrastructure and is not intended to be used
+    /// directly from your code. This API may change or be removed in future releases.
+    /// </summary>
     public static class CliContext
     {
         /// <summary>
diff --git a/src/Tools/Shared/CommandLine/CommandLineApplicationExtensions.cs b/src/Tools/Shared/CommandLine/CommandLineApplicationExtensions.cs
index 6206c861c0..d54db4d0fd 100644
--- a/src/Tools/Shared/CommandLine/CommandLineApplicationExtensions.cs
+++ b/src/Tools/Shared/CommandLine/CommandLineApplicationExtensions.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Reflection;
+using System.Threading.Tasks;
 
 namespace Microsoft.Extensions.CommandLineUtils
 {
@@ -21,6 +22,17 @@ namespace Microsoft.Extensions.CommandLineUtils
                     return 0;
                 });
 
+        public static CommandOption Option(this CommandLineApplication command, string template, string description)
+            => command.Option(
+                template,
+                description,
+                template.IndexOf('<') != -1
+                    ? template.EndsWith(">...") ? CommandOptionType.MultipleValue : CommandOptionType.SingleValue
+                    : CommandOptionType.NoValue);
+
+        public static void VersionOptionFromAssemblyAttributes(this CommandLineApplication app)
+            => app.VersionOptionFromAssemblyAttributes(typeof(CommandLineApplicationExtensions).Assembly);
+
         public static void VersionOptionFromAssemblyAttributes(this CommandLineApplication app, Assembly assembly)
             => app.VersionOption("--version", GetInformationalVersion(assembly));
 
diff --git a/src/Tools/Shared/CommandLine/ConsoleReporter.cs b/src/Tools/Shared/CommandLine/ConsoleReporter.cs
index ffcd1e8705..e1cc8022bc 100644
--- a/src/Tools/Shared/CommandLine/ConsoleReporter.cs
+++ b/src/Tools/Shared/CommandLine/ConsoleReporter.cs
@@ -6,9 +6,13 @@ using System.IO;
 
 namespace Microsoft.Extensions.Tools.Internal
 {
+    /// <summary>
+    /// This API supports infrastructure and is not intended to be used
+    /// directly from your code. This API may change or be removed in future releases.
+    /// </summary>
     public class ConsoleReporter : IReporter
     {
-        private object _writeLock = new object();
+        private readonly object _writeLock = new object();
 
         public ConsoleReporter(IConsole console)
             : this(console, verbose: false, quiet: false)
diff --git a/src/Tools/Shared/CommandLine/DebugHelper.cs b/src/Tools/Shared/CommandLine/DebugHelper.cs
index bb7f966d65..24f9173ee7 100644
--- a/src/Tools/Shared/CommandLine/DebugHelper.cs
+++ b/src/Tools/Shared/CommandLine/DebugHelper.cs
@@ -7,6 +7,10 @@ using System.Linq;
 
 namespace Microsoft.Extensions.Tools.Internal
 {
+    /// <summary>
+    /// This API supports infrastructure and is not intended to be used
+    /// directly from your code. This API may change or be removed in future releases.
+    /// </summary>
     public static class DebugHelper
     {
         [Conditional("DEBUG")]
@@ -21,4 +25,4 @@ namespace Microsoft.Extensions.Tools.Internal
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Tools/Shared/CommandLine/Ensure.cs b/src/Tools/Shared/CommandLine/Ensure.cs
index 5cb8ff7ec7..df94e8d01c 100644
--- a/src/Tools/Shared/CommandLine/Ensure.cs
+++ b/src/Tools/Shared/CommandLine/Ensure.cs
@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
diff --git a/src/Tools/Shared/CommandLine/IConsole.cs b/src/Tools/Shared/CommandLine/IConsole.cs
index 7216c267a0..ea40b6620c 100644
--- a/src/Tools/Shared/CommandLine/IConsole.cs
+++ b/src/Tools/Shared/CommandLine/IConsole.cs
@@ -6,6 +6,10 @@ using System.IO;
 
 namespace Microsoft.Extensions.Tools.Internal
 {
+    /// <summary>
+    /// This API supports infrastructure and is not intended to be used
+    /// directly from your code. This API may change or be removed in future releases.
+    /// </summary>
     public interface IConsole
     {
         event ConsoleCancelEventHandler CancelKeyPress;
diff --git a/src/Tools/Shared/CommandLine/IReporter.cs b/src/Tools/Shared/CommandLine/IReporter.cs
index 890dec3f7e..b9828e4e80 100644
--- a/src/Tools/Shared/CommandLine/IReporter.cs
+++ b/src/Tools/Shared/CommandLine/IReporter.cs
@@ -3,6 +3,10 @@
 
 namespace Microsoft.Extensions.Tools.Internal
 {
+    /// <summary>
+    /// This API supports infrastructure and is not intended to be used
+    /// directly from your code. This API may change or be removed in future releases.
+    /// </summary>
     public interface IReporter
     {
         void Verbose(string message);
@@ -10,4 +14,4 @@ namespace Microsoft.Extensions.Tools.Internal
         void Warn(string message);
         void Error(string message);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Tools/Shared/CommandLine/NullReporter.cs b/src/Tools/Shared/CommandLine/NullReporter.cs
index 5d80aeac91..0903797b67 100644
--- a/src/Tools/Shared/CommandLine/NullReporter.cs
+++ b/src/Tools/Shared/CommandLine/NullReporter.cs
@@ -3,6 +3,10 @@
 
 namespace Microsoft.Extensions.Tools.Internal
 {
+    /// <summary>
+    /// This API supports infrastructure and is not intended to be used
+    /// directly from your code. This API may change or be removed in future releases.
+    /// </summary>
     public class NullReporter : IReporter
     {
         private NullReporter()
diff --git a/src/Tools/Shared/CommandLine/PhysicalConsole.cs b/src/Tools/Shared/CommandLine/PhysicalConsole.cs
index 9a93323d5c..1266ab5887 100644
--- a/src/Tools/Shared/CommandLine/PhysicalConsole.cs
+++ b/src/Tools/Shared/CommandLine/PhysicalConsole.cs
@@ -6,6 +6,10 @@ using System.IO;
 
 namespace Microsoft.Extensions.Tools.Internal
 {
+    /// <summary>
+    /// This API supports infrastructure and is not intended to be used
+    /// directly from your code. This API may change or be removed in future releases.
+    /// </summary>
     public class PhysicalConsole : IConsole
     {
         private PhysicalConsole()
diff --git a/src/Tools/dotnet-watch/test/Utilities/TemporaryCSharpProject.cs b/src/Tools/Shared/TestHelpers/TemporaryCSharpProject.cs
similarity index 91%
rename from src/Tools/dotnet-watch/test/Utilities/TemporaryCSharpProject.cs
rename to src/Tools/Shared/TestHelpers/TemporaryCSharpProject.cs
index 7156cf85cf..aeb305c737 100644
--- a/src/Tools/dotnet-watch/test/Utilities/TemporaryCSharpProject.cs
+++ b/src/Tools/Shared/TestHelpers/TemporaryCSharpProject.cs
@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
@@ -6,12 +6,12 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Text;
 
-namespace Microsoft.DotNet.Watcher.Tools.Tests
+namespace Microsoft.Extensions.Tools.Internal
 {
     public class TemporaryCSharpProject
     {
         private const string Template =
- @"<Project Sdk=""Microsoft.NET.Sdk"">
+ @"<Project Sdk=""{2}"">
   <PropertyGroup>
     {0}
     <OutputType>Exe</OutputType>
@@ -23,19 +23,22 @@ namespace Microsoft.DotNet.Watcher.Tools.Tests
 
         private readonly string _filename;
         private readonly TemporaryDirectory _directory;
-        private List<string> _items = new List<string>();
-        private List<string> _properties = new List<string>();
+        private readonly List<string> _items = new List<string>();
+        private readonly List<string> _properties = new List<string>();
 
-        public TemporaryCSharpProject(string name, TemporaryDirectory directory)
+        public TemporaryCSharpProject(string name, TemporaryDirectory directory, string sdk)
         {
             Name = name;
             _filename = name + ".csproj";
             _directory = directory;
+            Sdk = sdk;
         }
 
         public string Name { get; }
         public string Path => System.IO.Path.Combine(_directory.Root, _filename);
 
+        public string Sdk { get; }
+
         public TemporaryCSharpProject WithTargetFrameworks(params string[] tfms)
         {
             Debug.Assert(tfms.Length > 0);
@@ -95,7 +98,7 @@ namespace Microsoft.DotNet.Watcher.Tools.Tests
 
         public void Create()
         {
-            _directory.CreateFile(_filename, string.Format(Template, string.Join("\r\n", _properties), string.Join("\r\n", _items)));
+            _directory.CreateFile(_filename, string.Format(Template, string.Join("\r\n", _properties), string.Join("\r\n", _items), Sdk));
         }
 
         public class ItemSpec
diff --git a/src/Tools/dotnet-watch/test/Utilities/TemporaryDirectory.cs b/src/Tools/Shared/TestHelpers/TemporaryDirectory.cs
similarity index 78%
rename from src/Tools/dotnet-watch/test/Utilities/TemporaryDirectory.cs
rename to src/Tools/Shared/TestHelpers/TemporaryDirectory.cs
index 692899817e..7cdef082f2 100644
--- a/src/Tools/dotnet-watch/test/Utilities/TemporaryDirectory.cs
+++ b/src/Tools/Shared/TestHelpers/TemporaryDirectory.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 
-namespace Microsoft.DotNet.Watcher.Tools.Tests
+namespace Microsoft.Extensions.Tools.Internal
 {
     public class TemporaryDirectory : IDisposable
     {
@@ -16,7 +16,7 @@ namespace Microsoft.DotNet.Watcher.Tools.Tests
 
         public TemporaryDirectory()
         {
-            Root = Path.Combine(Path.GetTempPath(), "dotnet-watch-tests", Guid.NewGuid().ToString("N"));
+            Root = Path.Combine(Path.GetTempPath(), "dotnet-tool-tests", Guid.NewGuid().ToString("N"));
         }
 
         private TemporaryDirectory(string path, TemporaryDirectory parent)
@@ -34,16 +34,16 @@ namespace Microsoft.DotNet.Watcher.Tools.Tests
 
         public string Root { get; }
 
-        public TemporaryCSharpProject WithCSharpProject(string name)
+        public TemporaryCSharpProject WithCSharpProject(string name, string sdk = "Microsoft.NET.Sdk")
         {
-            var project = new TemporaryCSharpProject(name, this);
+            var project = new TemporaryCSharpProject(name, this, sdk);
             _projects.Add(project);
             return project;
         }
 
-        public TemporaryCSharpProject WithCSharpProject(string name, out TemporaryCSharpProject project)
+        public TemporaryCSharpProject WithCSharpProject(string name, out TemporaryCSharpProject project, string sdk = "Microsoft.NET.Sdk")
         {
-            project = WithCSharpProject(name);
+            project = WithCSharpProject(name, sdk);
             return project;
         }
 
@@ -53,6 +53,16 @@ namespace Microsoft.DotNet.Watcher.Tools.Tests
             return this;
         }
 
+        public TemporaryDirectory WithContentFile(string name)
+        {
+            using (var stream = File.OpenRead(Path.Combine("TestContent", $"{name}.txt")))
+            using (var streamReader = new StreamReader(stream))
+            {
+                _files[name] = streamReader.ReadToEnd();
+            }
+            return this;
+        }
+
         public TemporaryDirectory Up()
         {
             if (_parent == null)
diff --git a/src/Tools/Tools.sln b/src/Tools/Tools.sln
index f69110e6d3..f25c3fc982 100644
--- a/src/Tools/Tools.sln
+++ b/src/Tools/Tools.sln
@@ -7,13 +7,33 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-watch", "dotnet-watc
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-watch.Tests", "dotnet-watch\test\dotnet-watch.Tests.csproj", "{63F7E822-D1E2-4C41-8ABF-60B9E3A9C54C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-dev-certs", "dotnet-dev-certs\src\dotnet-dev-certs.csproj", "{0D6D5693-7E0C-4FE8-B4AA-21207B2650AA}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E01EE27B-6CF9-4707-9849-5BA2ABA825F2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DeveloperCertificates.XPlat", "FirstRunCertGenerator\src\Microsoft.AspNetCore.DeveloperCertificates.XPlat.csproj", "{7BBDBDA2-299F-4C36-8338-23C525901DE0}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{2C485EAF-E4DE-4D14-8AE1-330641E17D44}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DeveloperCertificates.XPlat.Tests", "FirstRunCertGenerator\test\Microsoft.AspNetCore.DeveloperCertificates.XPlat.Tests.csproj", "{1EC6FA27-40A5-433F-8CA1-636E7ED8863E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-dev-certs", "dotnet-dev-certs\src\dotnet-dev-certs.csproj", "{98550159-E04E-44EB-A969-E5BF12444B94}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-sql-cache", "dotnet-sql-cache\src\dotnet-sql-cache.csproj", "{15FB0E39-1A28-4325-AD3C-76352516C80D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-sql-cache", "dotnet-sql-cache\src\dotnet-sql-cache.csproj", "{216AF7F1-5B05-477E-B8D3-86F6059F268A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-user-secrets", "dotnet-user-secrets\src\dotnet-user-secrets.csproj", "{5FE62357-2915-4890-813A-D82656BDC4DD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-user-secrets.Tests", "dotnet-user-secrets\test\dotnet-user-secrets.Tests.csproj", "{25F8DCC4-4571-42F7-BA0F-5C2D5A802297}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.dotnet-openapi", "Microsoft.dotnet-openapi\src\Microsoft.dotnet-openapi.csproj", "{C806041C-30F2-4B27-918A-5FF3576B833B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-microsoft.openapi.Tests", "Microsoft.dotnet-openapi\test\dotnet-microsoft.openapi.Tests.csproj", "{26BBA8A7-0F69-4C5F-B1C2-16B3320FFE3F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.ApiDescription.Client", "Extensions.ApiDescription.Client\src\Microsoft.Extensions.ApiDescription.Client.csproj", "{B29B2627-3604-4FDB-A976-EF1E077F5316}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions.ApiDescription.Server", "Extensions.ApiDescription.Server", "{003EA860-5DFC-40AE-87C0-9D21BB2C68D7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-getdocument", "dotnet-getdocument\src\dotnet-getdocument.csproj", "{160A445F-7E1F-430D-9403-41F7F6F4A16E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.ApiDescription.Server", "Extensions.ApiDescription.Server\src\Microsoft.Extensions.ApiDescription.Server.csproj", "{233119FC-E4C1-421C-89AE-1A445C5A947F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GetDocumentInsider", "GetDocumentInsider\src\GetDocumentInsider.csproj", "{EB63AECB-B898-475D-90F7-FE61F9C1CCC6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.ApiDescription.Client.Tests", "Extensions.ApiDescription.Client\test\Microsoft.Extensions.ApiDescription.Client.Tests.csproj", "{2C62584B-EC31-40C8-819B-E46334645AE5}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -29,26 +49,70 @@ Global
 		{63F7E822-D1E2-4C41-8ABF-60B9E3A9C54C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{63F7E822-D1E2-4C41-8ABF-60B9E3A9C54C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{63F7E822-D1E2-4C41-8ABF-60B9E3A9C54C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0D6D5693-7E0C-4FE8-B4AA-21207B2650AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0D6D5693-7E0C-4FE8-B4AA-21207B2650AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0D6D5693-7E0C-4FE8-B4AA-21207B2650AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0D6D5693-7E0C-4FE8-B4AA-21207B2650AA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7BBDBDA2-299F-4C36-8338-23C525901DE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7BBDBDA2-299F-4C36-8338-23C525901DE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7BBDBDA2-299F-4C36-8338-23C525901DE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7BBDBDA2-299F-4C36-8338-23C525901DE0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1EC6FA27-40A5-433F-8CA1-636E7ED8863E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1EC6FA27-40A5-433F-8CA1-636E7ED8863E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1EC6FA27-40A5-433F-8CA1-636E7ED8863E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1EC6FA27-40A5-433F-8CA1-636E7ED8863E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{15FB0E39-1A28-4325-AD3C-76352516C80D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{15FB0E39-1A28-4325-AD3C-76352516C80D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{15FB0E39-1A28-4325-AD3C-76352516C80D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{15FB0E39-1A28-4325-AD3C-76352516C80D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{98550159-E04E-44EB-A969-E5BF12444B94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{98550159-E04E-44EB-A969-E5BF12444B94}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{98550159-E04E-44EB-A969-E5BF12444B94}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{98550159-E04E-44EB-A969-E5BF12444B94}.Release|Any CPU.Build.0 = Release|Any CPU
+		{216AF7F1-5B05-477E-B8D3-86F6059F268A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{216AF7F1-5B05-477E-B8D3-86F6059F268A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{216AF7F1-5B05-477E-B8D3-86F6059F268A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{216AF7F1-5B05-477E-B8D3-86F6059F268A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5FE62357-2915-4890-813A-D82656BDC4DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5FE62357-2915-4890-813A-D82656BDC4DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5FE62357-2915-4890-813A-D82656BDC4DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5FE62357-2915-4890-813A-D82656BDC4DD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{25F8DCC4-4571-42F7-BA0F-5C2D5A802297}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{25F8DCC4-4571-42F7-BA0F-5C2D5A802297}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{25F8DCC4-4571-42F7-BA0F-5C2D5A802297}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{25F8DCC4-4571-42F7-BA0F-5C2D5A802297}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C806041C-30F2-4B27-918A-5FF3576B833B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C806041C-30F2-4B27-918A-5FF3576B833B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C806041C-30F2-4B27-918A-5FF3576B833B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C806041C-30F2-4B27-918A-5FF3576B833B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{26BBA8A7-0F69-4C5F-B1C2-16B3320FFE3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{26BBA8A7-0F69-4C5F-B1C2-16B3320FFE3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{26BBA8A7-0F69-4C5F-B1C2-16B3320FFE3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{26BBA8A7-0F69-4C5F-B1C2-16B3320FFE3F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B29B2627-3604-4FDB-A976-EF1E077F5316}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B29B2627-3604-4FDB-A976-EF1E077F5316}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B29B2627-3604-4FDB-A976-EF1E077F5316}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B29B2627-3604-4FDB-A976-EF1E077F5316}.Release|Any CPU.Build.0 = Release|Any CPU
+		{160A445F-7E1F-430D-9403-41F7F6F4A16E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{160A445F-7E1F-430D-9403-41F7F6F4A16E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{160A445F-7E1F-430D-9403-41F7F6F4A16E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{160A445F-7E1F-430D-9403-41F7F6F4A16E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{233119FC-E4C1-421C-89AE-1A445C5A947F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{233119FC-E4C1-421C-89AE-1A445C5A947F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{233119FC-E4C1-421C-89AE-1A445C5A947F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{233119FC-E4C1-421C-89AE-1A445C5A947F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EB63AECB-B898-475D-90F7-FE61F9C1CCC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB63AECB-B898-475D-90F7-FE61F9C1CCC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EB63AECB-B898-475D-90F7-FE61F9C1CCC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EB63AECB-B898-475D-90F7-FE61F9C1CCC6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2C62584B-EC31-40C8-819B-E46334645AE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2C62584B-EC31-40C8-819B-E46334645AE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2C62584B-EC31-40C8-819B-E46334645AE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2C62584B-EC31-40C8-819B-E46334645AE5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{E16F10C8-5FC3-420B-AB33-D6E5CBE89B75} = {E01EE27B-6CF9-4707-9849-5BA2ABA825F2}
+		{63F7E822-D1E2-4C41-8ABF-60B9E3A9C54C} = {2C485EAF-E4DE-4D14-8AE1-330641E17D44}
+		{98550159-E04E-44EB-A969-E5BF12444B94} = {E01EE27B-6CF9-4707-9849-5BA2ABA825F2}
+		{216AF7F1-5B05-477E-B8D3-86F6059F268A} = {E01EE27B-6CF9-4707-9849-5BA2ABA825F2}
+		{5FE62357-2915-4890-813A-D82656BDC4DD} = {E01EE27B-6CF9-4707-9849-5BA2ABA825F2}
+		{25F8DCC4-4571-42F7-BA0F-5C2D5A802297} = {2C485EAF-E4DE-4D14-8AE1-330641E17D44}
+		{C806041C-30F2-4B27-918A-5FF3576B833B} = {E01EE27B-6CF9-4707-9849-5BA2ABA825F2}
+		{26BBA8A7-0F69-4C5F-B1C2-16B3320FFE3F} = {2C485EAF-E4DE-4D14-8AE1-330641E17D44}
+		{B29B2627-3604-4FDB-A976-EF1E077F5316} = {E01EE27B-6CF9-4707-9849-5BA2ABA825F2}
+		{003EA860-5DFC-40AE-87C0-9D21BB2C68D7} = {E01EE27B-6CF9-4707-9849-5BA2ABA825F2}
+		{160A445F-7E1F-430D-9403-41F7F6F4A16E} = {003EA860-5DFC-40AE-87C0-9D21BB2C68D7}
+		{233119FC-E4C1-421C-89AE-1A445C5A947F} = {003EA860-5DFC-40AE-87C0-9D21BB2C68D7}
+		{EB63AECB-B898-475D-90F7-FE61F9C1CCC6} = {003EA860-5DFC-40AE-87C0-9D21BB2C68D7}
+		{2C62584B-EC31-40C8-819B-E46334645AE5} = {2C485EAF-E4DE-4D14-8AE1-330641E17D44}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {EC668D8E-97B9-4758-9E5C-2E5DD6B9137B}
 	EndGlobalSection
diff --git a/src/Tools/build.cmd b/src/Tools/build.cmd
new file mode 100644
index 0000000000..033fe6f614
--- /dev/null
+++ b/src/Tools/build.cmd
@@ -0,0 +1,3 @@
+@ECHO OFF
+SET RepoRoot=%~dp0..\..
+%RepoRoot%\build.cmd -projects %~dp0\**\*.*proj %*
diff --git a/src/Tools/build.sh b/src/Tools/build.sh
new file mode 100755
index 0000000000..7046bb98a0
--- /dev/null
+++ b/src/Tools/build.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+repo_root="$DIR/../.."
+"$repo_root/build.sh" --projects "$DIR/**/*.*proj" "$@"
diff --git a/src/Tools/dotnet-dev-certs/src/Program.cs b/src/Tools/dotnet-dev-certs/src/Program.cs
index 3854c4c59c..6ecb1912cd 100644
--- a/src/Tools/dotnet-dev-certs/src/Program.cs
+++ b/src/Tools/dotnet-dev-certs/src/Program.cs
@@ -104,10 +104,10 @@ namespace Microsoft.AspNetCore.DeveloperCertificates.Tools
                 app.HelpOption("-h|--help");
 
                 app.OnExecute(() =>
-                    {
-                        app.ShowHelp();
-                        return Success;
-                    });
+                {
+                    app.ShowHelp();
+                    return Success;
+                });
 
                 return app.Execute(args);
             }
diff --git a/src/Tools/dotnet-dev-certs/src/dotnet-dev-certs.csproj b/src/Tools/dotnet-dev-certs/src/dotnet-dev-certs.csproj
index d558f1e6a2..b8a4f38c0c 100644
--- a/src/Tools/dotnet-dev-certs/src/dotnet-dev-certs.csproj
+++ b/src/Tools/dotnet-dev-certs/src/dotnet-dev-certs.csproj
@@ -9,6 +9,7 @@
     <PackAsTool>true</PackAsTool>
     <!-- This package is for internal use only. It contains a CLI which is bundled in the .NET Core SDK. -->
     <IsShippingPackage>false</IsShippingPackage>
+    <ExcludeFromSourceBuild>false</ExcludeFromSourceBuild>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Tools/dotnet-getdocument/README.md b/src/Tools/dotnet-getdocument/README.md
new file mode 100644
index 0000000000..e7542a80c3
--- /dev/null
+++ b/src/Tools/dotnet-getdocument/README.md
@@ -0,0 +1,7 @@
+# dotnet-getdocument
+
+`dotnet-getdocument` is a command line tool to generate OpenAPI documents.
+
+## How To Use
+
+Run `dotnet ".../dotnet-getdocument.dll" --help` for more information about usage.
diff --git a/src/Mvc/dotnet-getdocument/src/Commands/InvokeCommand.cs b/src/Tools/dotnet-getdocument/src/Commands/InvokeCommand.cs
similarity index 92%
rename from src/Mvc/dotnet-getdocument/src/Commands/InvokeCommand.cs
rename to src/Tools/dotnet-getdocument/src/Commands/InvokeCommand.cs
index 52df8b1ae5..c7b4444a1e 100644
--- a/src/Mvc/dotnet-getdocument/src/Commands/InvokeCommand.cs
+++ b/src/Tools/dotnet-getdocument/src/Commands/InvokeCommand.cs
@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
@@ -6,7 +6,8 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Runtime.Versioning;
-using Microsoft.DotNet.Cli.CommandLine;
+using Microsoft.Extensions.CommandLineUtils;
+using Microsoft.Extensions.Tools.Internal;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
@@ -19,6 +20,10 @@ namespace Microsoft.Extensions.ApiDescription.Tool.Commands
         private readonly ProjectOptions _projectOptions = new ProjectOptions();
         private IList<string> _args;
 
+        public InvokeCommand(IConsole console) : base(console)
+        {
+        }
+
         public override void Configure(CommandLineApplication command)
         {
             base.Configure(command);
@@ -75,7 +80,7 @@ namespace Microsoft.Extensions.ApiDescription.Tool.Commands
                                 targetFramework.Version));
                         }
 
-                        executable = "dotnet";
+                        executable = DotNetMuxer.MuxerPathOrDefault();
                         toolsDirectory = Path.Combine(thisPath, "netcoreapp2.1");
 
                         args.Add("exec");
@@ -133,22 +138,22 @@ namespace Microsoft.Extensions.ApiDescription.Tool.Commands
                 args.Add("--tools-directory");
                 args.Add(toolsDirectory);
 
-                if (Reporter.IsVerbose)
-                {
-                    args.Add("--verbose");
-                }
-
-                if (Reporter.NoColor)
-                {
-                    args.Add("--no-color");
-                }
-
-                if (Reporter.PrefixOutput)
+                if (ReporterExtensions.PrefixOutput)
                 {
                     args.Add("--prefix-output");
                 }
 
-                return Exe.Run(executable, args);
+                if (IsQuiet)
+                {
+                    args.Add("--quiet");
+                }
+
+                if (IsVerbose)
+                {
+                    args.Add("--verbose");
+                }
+
+                return Exe.Run(executable, args, Reporter);
             }
             finally
             {
diff --git a/src/Tools/dotnet-getdocument/src/Exe.cs b/src/Tools/dotnet-getdocument/src/Exe.cs
new file mode 100644
index 0000000000..bfdf3caf6f
--- /dev/null
+++ b/src/Tools/dotnet-getdocument/src/Exe.cs
@@ -0,0 +1,63 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using Microsoft.Extensions.CommandLineUtils;
+using Microsoft.Extensions.Tools.Internal;
+
+namespace Microsoft.Extensions.ApiDescription.Tool
+{
+    internal static class Exe
+    {
+        public static int Run(
+            string executable,
+            IReadOnlyList<string> args,
+            IReporter reporter,
+            string workingDirectory = null,
+            bool interceptOutput = false)
+        {
+            var arguments = ArgumentEscaper.EscapeAndConcatenate(args);
+
+            reporter.WriteVerbose(executable + " " + arguments);
+
+            var startInfo = new ProcessStartInfo
+            {
+                FileName = executable,
+                Arguments = arguments,
+                UseShellExecute = false,
+                RedirectStandardOutput = interceptOutput
+            };
+            if (workingDirectory != null)
+            {
+                startInfo.WorkingDirectory = workingDirectory;
+            }
+
+            using var process = Process.Start(startInfo);
+            if (interceptOutput)
+            {
+                string line;
+                while ((line = process.StandardOutput.ReadLine()) != null)
+                {
+                    reporter.WriteVerbose(line);
+                }
+            }
+
+            // Follow precedent set in Razor integration tests and ensure process events and output are complete.
+            // https://github.com/aspnet/Razor/blob/d719920fdcc7d1db3a6f74cd5404d66fa098f057/test/Microsoft.NET.Sdk.Razor.Test/IntegrationTests/MSBuildProcessManager.cs#L91-L102
+            // Timeout is double how long the inside man waits for the IDocumentProcessor to wrap up.
+            if (!process.WaitForExit((int)(TimeSpan.FromMinutes(2).TotalMilliseconds)))
+            {
+                process.Kill();
+
+                // Should be unreachable in almost every case.
+                throw new TimeoutException($"Process {executable} timed out after 2 minutes.");
+            }
+
+            process.WaitForExit();
+
+            return process.ExitCode;
+        }
+    }
+}
diff --git a/src/Tools/dotnet-getdocument/src/Program.cs b/src/Tools/dotnet-getdocument/src/Program.cs
new file mode 100644
index 0000000000..108c862e68
--- /dev/null
+++ b/src/Tools/dotnet-getdocument/src/Program.cs
@@ -0,0 +1,24 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using Microsoft.Extensions.ApiDescription.Tool.Commands;
+using Microsoft.Extensions.Tools.Internal;
+
+namespace Microsoft.Extensions.ApiDescription.Tool
+{
+    internal class Program : ProgramBase
+    {
+        public Program(IConsole console) : base(console)
+        {
+        }
+
+        private static int Main(string[] args)
+        {
+            DebugHelper.HandleDebugSwitch(ref args);
+
+            var console = GetConsole();
+
+            return new Program(console).Run(args, new InvokeCommand(console), throwOnUnexpectedArg: false);
+        }
+    }
+}
diff --git a/src/Mvc/dotnet-getdocument/src/ProjectOptions.cs b/src/Tools/dotnet-getdocument/src/ProjectOptions.cs
similarity index 94%
rename from src/Mvc/dotnet-getdocument/src/ProjectOptions.cs
rename to src/Tools/dotnet-getdocument/src/ProjectOptions.cs
index 84b32968e9..10042cdc48 100644
--- a/src/Mvc/dotnet-getdocument/src/ProjectOptions.cs
+++ b/src/Tools/dotnet-getdocument/src/ProjectOptions.cs
@@ -1,7 +1,7 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.DotNet.Cli.CommandLine;
+using Microsoft.Extensions.CommandLineUtils;
 
 namespace Microsoft.Extensions.ApiDescription.Tool
 {
diff --git a/src/Mvc/dotnet-getdocument/src/Resources.resx b/src/Tools/dotnet-getdocument/src/Resources.resx
similarity index 91%
rename from src/Mvc/dotnet-getdocument/src/Resources.resx
rename to src/Tools/dotnet-getdocument/src/Resources.resx
index 08f92d0397..3f0b6440ad 100644
--- a/src/Mvc/dotnet-getdocument/src/Resources.resx
+++ b/src/Tools/dotnet-getdocument/src/Resources.resx
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!--
-    Microsoft ResX Schema
-
+  <!-- 
+    Microsoft ResX Schema 
+    
     Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
     associated with the data types.
-
+    
     Example:
-
+    
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-
-    There are any number of "resheader" rows that contain simple
+                
+    There are any number of "resheader" rows that contain simple 
     name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
     mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
     extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
     read any of the formats listed below.
-
+    
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
+    value   : The object must be serialized with 
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-
+    
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
+    value   : The object must be serialized with 
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
+    value   : The object must be serialized into a byte array 
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
@@ -129,9 +129,6 @@
   <data name="NETStandardProject" xml:space="preserve">
     <value>Project '{0}' targets framework '.NETStandard'. There is no runtime associated with this framework and projects targeting it cannot be executed directly. To use the dotnet-getdocument tool with this project, update this project to target .NET Core and / or .NET Framework.</value>
   </data>
-  <data name="NoColorDescription" xml:space="preserve">
-    <value>Do not colorize console output.</value>
-  </data>
   <data name="PrefixDescription" xml:space="preserve">
     <value>Prefix console output with logging level.</value>
   </data>
@@ -159,4 +156,10 @@
   <data name="AssemblyDescription" xml:space="preserve">
     <value>The assembly path to use. Required.</value>
   </data>
+  <data name="QuietAndVerboseSpecified" xml:space="preserve">
+    <value>Cannot specify both '--quiet' and '--verbose' options.</value>
+  </data>
+  <data name="QuietDescription" xml:space="preserve">
+    <value>Suppresses all output except warnings and errors.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Mvc/dotnet-getdocument/src/dotnet-getdocument.csproj b/src/Tools/dotnet-getdocument/src/dotnet-getdocument.csproj
similarity index 72%
rename from src/Mvc/dotnet-getdocument/src/dotnet-getdocument.csproj
rename to src/Tools/dotnet-getdocument/src/dotnet-getdocument.csproj
index dfe94dc2b9..c5494e3999 100644
--- a/src/Mvc/dotnet-getdocument/src/dotnet-getdocument.csproj
+++ b/src/Tools/dotnet-getdocument/src/dotnet-getdocument.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>dotnet-getdocument</AssemblyName>
     <Description>GetDocument Command-line Tool outside man</Description>
@@ -12,14 +12,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="../../GetDocumentInsider/src/Ansi*.cs" />
+    <Compile Include="$(ToolSharedSourceRoot)CommandLine/**/*.cs" />
     <Compile Include="../../GetDocumentInsider/src/CommandException.cs" />
-    <Compile Include="../../GetDocumentInsider/src/CommandLineUtils/*.cs" LinkBase="CommandLineUtils" />
     <Compile Include="../../GetDocumentInsider/src/Commands/CommandBase.cs" Link="Commands/CommandBase.cs" />
     <Compile Include="../../GetDocumentInsider/src/Commands/HelpCommandBase.cs" Link="Commands/HelpCommandBase.cs" />
-    <Compile Include="../../GetDocumentInsider/src/ProductInfo.cs" />
-    <Compile Include="../../GetDocumentInsider/src/Reporter.cs" />
+    <Compile Include="../../GetDocumentInsider/src/ProgramBase.cs" />
+    <Compile Include="../../GetDocumentInsider/src/ReporterExtensions.cs" />
 
+    <Reference Include="Microsoft.Extensions.CommandLineUtils.Sources" />
     <Reference Include="Newtonsoft.Json" />
   </ItemGroup>
 </Project>
diff --git a/src/Mvc/dotnet-getdocument/src/runtimeconfig.template.json b/src/Tools/dotnet-getdocument/src/runtimeconfig.template.json
similarity index 100%
rename from src/Mvc/dotnet-getdocument/src/runtimeconfig.template.json
rename to src/Tools/dotnet-getdocument/src/runtimeconfig.template.json
diff --git a/src/Tools/dotnet-user-secrets/src/Internal/CommandContext.cs b/src/Tools/dotnet-user-secrets/src/Internal/CommandContext.cs
index 0ac0ea40fe..cfbec380dd 100644
--- a/src/Tools/dotnet-user-secrets/src/Internal/CommandContext.cs
+++ b/src/Tools/dotnet-user-secrets/src/Internal/CommandContext.cs
@@ -5,6 +5,10 @@ using Microsoft.Extensions.Tools.Internal;
 
 namespace Microsoft.Extensions.SecretManager.Tools.Internal
 {
+    /// <summary>
+    /// This API supports infrastructure and is not intended to be used
+    /// directly from your code. This API may change or be removed in future releases.
+    /// </summary>
     public class CommandContext
     {
         public CommandContext(
@@ -21,4 +25,4 @@ namespace Microsoft.Extensions.SecretManager.Tools.Internal
         public IReporter Reporter { get; }
         public SecretsStore SecretStore { get; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Tools/dotnet-user-secrets/src/Internal/ICommand.cs b/src/Tools/dotnet-user-secrets/src/Internal/ICommand.cs
index 636c08a07c..594a04eb27 100644
--- a/src/Tools/dotnet-user-secrets/src/Internal/ICommand.cs
+++ b/src/Tools/dotnet-user-secrets/src/Internal/ICommand.cs
@@ -3,8 +3,12 @@
 
 namespace Microsoft.Extensions.SecretManager.Tools.Internal
 {
+    /// <summary>
+    /// This API supports infrastructure and is not intended to be used
+    /// directly from your code. This API may change or be removed in future releases.
+    /// </summary>
     public interface ICommand
     {
         void Execute(CommandContext context);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Tools/dotnet-user-secrets/src/Internal/InitCommand.cs b/src/Tools/dotnet-user-secrets/src/Internal/InitCommand.cs
index 670da42c4e..80d1ebbd4d 100644
--- a/src/Tools/dotnet-user-secrets/src/Internal/InitCommand.cs
+++ b/src/Tools/dotnet-user-secrets/src/Internal/InitCommand.cs
@@ -10,7 +10,13 @@ using Microsoft.Extensions.CommandLineUtils;
 
 namespace Microsoft.Extensions.SecretManager.Tools.Internal
 {
-    // Workaround used to handle the fact that the options have not been parsed at configuration time
+    /// <summary>
+    /// This API supports infrastructure and is not intended to be used
+    /// directly from your code. This API may change or be removed in future releases.
+    /// </summary>
+    /// <remarks>
+    /// Workaround used to handle the fact that the options have not been parsed at configuration time
+    /// </remarks>
     public class InitCommandFactory : ICommand
     {
         public CommandLineOptions Options { get; }
@@ -42,6 +48,10 @@ namespace Microsoft.Extensions.SecretManager.Tools.Internal
         }
     }
 
+    /// <summary>
+    /// This API supports infrastructure and is not intended to be used
+    /// directly from your code. This API may change or be removed in future releases.
+    /// </summary>
     public class InitCommand : ICommand
     {
         public string OverrideId { get; }
@@ -81,7 +91,7 @@ namespace Microsoft.Extensions.SecretManager.Tools.Internal
             var existingUserSecretsId = projectDocument.XPathSelectElements("//UserSecretsId").FirstOrDefault();
 
             // Check if a UserSecretsId is already set
-            if (existingUserSecretsId != default)
+            if (existingUserSecretsId != null)
             {
                 // Only set the UserSecretsId if the user specified an explicit value
                 if (string.IsNullOrWhiteSpace(OverrideId))
diff --git a/src/Tools/dotnet-user-secrets/src/Internal/ProjectIdResolver.cs b/src/Tools/dotnet-user-secrets/src/Internal/ProjectIdResolver.cs
index b04cf8306d..c2a81b5c2d 100644
--- a/src/Tools/dotnet-user-secrets/src/Internal/ProjectIdResolver.cs
+++ b/src/Tools/dotnet-user-secrets/src/Internal/ProjectIdResolver.cs
@@ -11,6 +11,10 @@ using Microsoft.Extensions.Tools.Internal;
 
 namespace Microsoft.Extensions.SecretManager.Tools.Internal
 {
+    /// <summary>
+    /// This API supports infrastructure and is not intended to be used
+    /// directly from your code. This API may change or be removed in future releases.
+    /// </summary>
     public class ProjectIdResolver
     {
         private const string DefaultConfig = "Debug";
diff --git a/src/Tools/dotnet-user-secrets/src/Internal/ReadableJsonConfigurationSource.cs b/src/Tools/dotnet-user-secrets/src/Internal/ReadableJsonConfigurationSource.cs
index 96d0554aeb..864a76b36e 100644
--- a/src/Tools/dotnet-user-secrets/src/Internal/ReadableJsonConfigurationSource.cs
+++ b/src/Tools/dotnet-user-secrets/src/Internal/ReadableJsonConfigurationSource.cs
@@ -6,6 +6,10 @@ using Microsoft.Extensions.Configuration.Json;
 
 namespace Microsoft.Extensions.SecretManager.Tools.Internal
 {
+    /// <summary>
+    /// This API supports infrastructure and is not intended to be used
+    /// directly from your code. This API may change or be removed in future releases.
+    /// </summary>
     public class ReadableJsonConfigurationProvider : JsonConfigurationProvider
     {
         public ReadableJsonConfigurationProvider()
@@ -15,4 +19,4 @@ namespace Microsoft.Extensions.SecretManager.Tools.Internal
 
         public IDictionary<string, string> CurrentData => Data;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Tools/dotnet-user-secrets/src/Internal/SecretsStore.cs b/src/Tools/dotnet-user-secrets/src/Internal/SecretsStore.cs
index 93d46242f2..b865f97248 100644
--- a/src/Tools/dotnet-user-secrets/src/Internal/SecretsStore.cs
+++ b/src/Tools/dotnet-user-secrets/src/Internal/SecretsStore.cs
@@ -13,6 +13,10 @@ using Newtonsoft.Json.Linq;
 
 namespace Microsoft.Extensions.SecretManager.Tools.Internal
 {
+    /// <summary>
+    /// This API supports infrastructure and is not intended to be used
+    /// directly from your code. This API may change or be removed in future releases.
+    /// </summary>
     public class SecretsStore
     {
         private readonly string _secretsFilePath;
@@ -84,4 +88,4 @@ namespace Microsoft.Extensions.SecretManager.Tools.Internal
                 .ToDictionary(i => i.Key, i => i.Value, StringComparer.OrdinalIgnoreCase);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj b/src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj
index 814cbbec3f..7fce951f0c 100644
--- a/src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj
+++ b/src/Tools/dotnet-user-secrets/src/dotnet-user-secrets.csproj
@@ -10,6 +10,7 @@
     <PackAsTool>true</PackAsTool>
     <!-- This package is for internal use only. It contains a CLI which is bundled in the .NET Core SDK. -->
     <IsShippingPackage>false</IsShippingPackage>
+    <ExcludeFromSourceBuild>false</ExcludeFromSourceBuild>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Tools/dotnet-watch/src/PrefixConsoleReporter.cs b/src/Tools/dotnet-watch/src/PrefixConsoleReporter.cs
index b2453276ef..cf13cd0733 100644
--- a/src/Tools/dotnet-watch/src/PrefixConsoleReporter.cs
+++ b/src/Tools/dotnet-watch/src/PrefixConsoleReporter.cs
@@ -11,18 +11,20 @@ namespace Microsoft.DotNet.Watcher
     {
         private object _lock = new object();
 
-        public PrefixConsoleReporter(IConsole console, bool verbose, bool quiet)
+        private readonly string _prefix;
+
+        public PrefixConsoleReporter(string prefix, IConsole console, bool verbose, bool quiet)
             : base(console, verbose, quiet)
-        { }
+        {
+            _prefix = prefix;
+        }
 
         protected override void WriteLine(TextWriter writer, string message, ConsoleColor? color)
         {
-            const string prefix = "watch : ";
-
             lock (_lock)
             {
                 Console.ForegroundColor = ConsoleColor.DarkGray;
-                writer.Write(prefix);
+                writer.Write(_prefix);
                 Console.ResetColor();
 
                 base.WriteLine(writer, message, color);
diff --git a/src/Tools/dotnet-watch/src/Program.cs b/src/Tools/dotnet-watch/src/Program.cs
index 25317fb6b2..f27ffd878f 100644
--- a/src/Tools/dotnet-watch/src/Program.cs
+++ b/src/Tools/dotnet-watch/src/Program.cs
@@ -15,17 +15,17 @@ namespace Microsoft.DotNet.Watcher
     public class Program : IDisposable
     {
         private readonly IConsole _console;
-        private readonly string _workingDir;
+        private readonly string _workingDirectory;
         private readonly CancellationTokenSource _cts;
         private IReporter _reporter;
 
-        public Program(IConsole console, string workingDir)
+        public Program(IConsole console, string workingDirectory)
         {
             Ensure.NotNull(console, nameof(console));
-            Ensure.NotNullOrEmpty(workingDir, nameof(workingDir));
+            Ensure.NotNullOrEmpty(workingDirectory, nameof(workingDirectory));
 
             _console = console;
-            _workingDir = workingDir;
+            _workingDirectory = workingDirectory;
             _cts = new CancellationTokenSource();
             _console.CancelKeyPress += OnCancelKeyPress;
             _reporter = CreateReporter(verbose: true, quiet: false, console: _console);
@@ -134,7 +134,7 @@ namespace Microsoft.DotNet.Watcher
             string projectFile;
             try
             {
-                projectFile = MsBuildProjectFinder.FindMsBuildProject(_workingDir, project);
+                projectFile = MsBuildProjectFinder.FindMsBuildProject(_workingDirectory, project);
             }
             catch (FileNotFoundException ex)
             {
@@ -177,7 +177,7 @@ namespace Microsoft.DotNet.Watcher
             string projectFile;
             try
             {
-                projectFile = MsBuildProjectFinder.FindMsBuildProject(_workingDir, project);
+                projectFile = MsBuildProjectFinder.FindMsBuildProject(_workingDirectory, project);
             }
             catch (FileNotFoundException ex)
             {
@@ -205,7 +205,7 @@ namespace Microsoft.DotNet.Watcher
         }
 
         private static IReporter CreateReporter(bool verbose, bool quiet, IConsole console)
-            => new PrefixConsoleReporter(console, verbose || CliContext.IsGlobalVerbose(), quiet);
+            => new PrefixConsoleReporter("watch : ", console, verbose || CliContext.IsGlobalVerbose(), quiet);
 
         public void Dispose()
         {
diff --git a/src/Tools/dotnet-watch/src/dotnet-watch.csproj b/src/Tools/dotnet-watch/src/dotnet-watch.csproj
index 1f02dcec35..3c20912211 100644
--- a/src/Tools/dotnet-watch/src/dotnet-watch.csproj
+++ b/src/Tools/dotnet-watch/src/dotnet-watch.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
@@ -9,10 +9,11 @@
     <PackAsTool>true</PackAsTool>
     <!-- This package is for internal use only. It contains a CLI which is bundled in the .NET Core SDK. -->
     <IsShippingPackage>false</IsShippingPackage>
+    <ExcludeFromSourceBuild>false</ExcludeFromSourceBuild>
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="$(SharedSourceRoot)Process\*.cs" />
+    <Compile Include="$(SharedSourceRoot)Process\ProcessExtensions.cs" />
     <Compile Include="$(ToolSharedSourceRoot)CommandLine\**\*.cs" />
     <None Include="assets\**\*" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" />
   </ItemGroup>
diff --git a/src/Tools/dotnet-watch/test/AppWithDepsTests.cs b/src/Tools/dotnet-watch/test/AppWithDepsTests.cs
index 4ca708d618..9888258327 100644
--- a/src/Tools/dotnet-watch/test/AppWithDepsTests.cs
+++ b/src/Tools/dotnet-watch/test/AppWithDepsTests.cs
@@ -5,7 +5,6 @@ using System;
 using System.IO;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
 using Xunit.Abstractions;
 
diff --git a/src/Tools/dotnet-watch/test/AssertEx.cs b/src/Tools/dotnet-watch/test/AssertEx.cs
index 4d897058fd..d55406d8e9 100644
--- a/src/Tools/dotnet-watch/test/AssertEx.cs
+++ b/src/Tools/dotnet-watch/test/AssertEx.cs
@@ -1,11 +1,9 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using Xunit;
 using Xunit.Sdk;
 
 namespace Microsoft.DotNet.Watcher.Tools.Tests
diff --git a/src/Tools/dotnet-watch/test/DotNetWatcherTests.cs b/src/Tools/dotnet-watch/test/DotNetWatcherTests.cs
index 5eb12ccb19..d6e57ee5cf 100644
--- a/src/Tools/dotnet-watch/test/DotNetWatcherTests.cs
+++ b/src/Tools/dotnet-watch/test/DotNetWatcherTests.cs
@@ -5,10 +5,9 @@ using System;
 using System.IO;
 using System.Globalization;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 using Xunit.Abstractions;
-using Microsoft.AspNetCore.Testing;
 
 namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
 {
diff --git a/src/Tools/dotnet-watch/test/GlobbingAppTests.cs b/src/Tools/dotnet-watch/test/GlobbingAppTests.cs
index f85ef3bfcf..8667c06e7d 100644
--- a/src/Tools/dotnet-watch/test/GlobbingAppTests.cs
+++ b/src/Tools/dotnet-watch/test/GlobbingAppTests.cs
@@ -7,7 +7,6 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.DotNet.Watcher.Tools.Tests;
 using Xunit;
 using Xunit.Abstractions;
diff --git a/src/Tools/dotnet-watch/test/MsBuildFileSetFactoryTest.cs b/src/Tools/dotnet-watch/test/MsBuildFileSetFactoryTest.cs
index c34111b239..0d69f49d2e 100644
--- a/src/Tools/dotnet-watch/test/MsBuildFileSetFactoryTest.cs
+++ b/src/Tools/dotnet-watch/test/MsBuildFileSetFactoryTest.cs
@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
@@ -113,17 +113,20 @@ namespace Microsoft.DotNet.Watcher.Tools.Tests
         public async Task MultiTfm()
         {
             _tempDir
-               .SubDir("src")
-                   .SubDir("Project1")
-                       .WithCSharpProject("Project1", out var target)
-                       .WithTargetFrameworks("netcoreapp1.0", "net451")
-                       .WithProperty("EnableDefaultCompileItems", "false")
-                       .WithItem("Compile", "Class1.netcore.cs", "'$(TargetFramework)'=='netcoreapp1.0'")
-                       .WithItem("Compile", "Class1.desktop.cs", "'$(TargetFramework)'=='net451'")
-                       .Dir()
-                       .WithFile("Class1.netcore.cs")
-                       .WithFile("Class1.desktop.cs")
-                       .WithFile("Class1.notincluded.cs");
+                .SubDir("src")
+                    .SubDir("Project1")
+                        .WithCSharpProject("Project1", out var target)
+                        .WithTargetFrameworks("netcoreapp1.0", "net451")
+                        .WithProperty("EnableDefaultCompileItems", "false")
+                        .WithItem("Compile", "Class1.netcore.cs", "'$(TargetFramework)'=='netcoreapp1.0'")
+                        .WithItem("Compile", "Class1.desktop.cs", "'$(TargetFramework)'=='net451'")
+                        .Dir()
+                        .WithFile("Class1.netcore.cs")
+                        .WithFile("Class1.desktop.cs")
+                        .WithFile("Class1.notincluded.cs")
+                    .Up()
+                .Up()
+                .Create();
 
             var fileset = await GetFileSet(target);
 
@@ -155,7 +158,10 @@ namespace Microsoft.DotNet.Watcher.Tools.Tests
                         .WithTargetFrameworks("netcoreapp1.0", "net451")
                         .WithProjectReference(proj2)
                         .Dir()
-                        .WithFile("Class1.cs");
+                        .WithFile("Class1.cs")
+                    .Up()
+                .Up()
+                .Create();
 
             var fileset = await GetFileSet(target);
 
diff --git a/src/Tools/dotnet-watch/test/NoDepsAppTests.cs b/src/Tools/dotnet-watch/test/NoDepsAppTests.cs
index eb5bd6ff7e..4f2b420492 100644
--- a/src/Tools/dotnet-watch/test/NoDepsAppTests.cs
+++ b/src/Tools/dotnet-watch/test/NoDepsAppTests.cs
@@ -6,7 +6,6 @@ using System.Diagnostics;
 using System.IO;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Testing;
-using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
 using Xunit.Abstractions;
 
diff --git a/src/Tools/dotnet-watch/test/Properties/AssemblyInfo.cs b/src/Tools/dotnet-watch/test/Properties/AssemblyInfo.cs
index d8e6c031be..8faa300eb5 100644
--- a/src/Tools/dotnet-watch/test/Properties/AssemblyInfo.cs
+++ b/src/Tools/dotnet-watch/test/Properties/AssemblyInfo.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
 [assembly: CollectionBehavior(DisableTestParallelization = true)]
\ No newline at end of file
diff --git a/src/Tools/dotnet-watch/test/Utilities/TestProjectGraph.cs b/src/Tools/dotnet-watch/test/Utilities/TestProjectGraph.cs
index a8e615d3c9..7e44ea643e 100644
--- a/src/Tools/dotnet-watch/test/Utilities/TestProjectGraph.cs
+++ b/src/Tools/dotnet-watch/test/Utilities/TestProjectGraph.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using Microsoft.Extensions.Tools.Internal;
 
 namespace Microsoft.DotNet.Watcher.Tools.Tests
 {
@@ -10,7 +11,7 @@ namespace Microsoft.DotNet.Watcher.Tools.Tests
     {
         private readonly TemporaryDirectory _directory;
         private Action<TemporaryCSharpProject> _onCreate;
-        private Dictionary<string, TemporaryCSharpProject> _projects = new Dictionary<string, TemporaryCSharpProject>();
+        private readonly Dictionary<string, TemporaryCSharpProject> _projects = new Dictionary<string, TemporaryCSharpProject>();
         public TestProjectGraph(TemporaryDirectory directory)
         {
             _directory = directory;
@@ -28,8 +29,7 @@ namespace Microsoft.DotNet.Watcher.Tools.Tests
 
         public TemporaryCSharpProject GetOrCreate(string projectName)
         {
-            TemporaryCSharpProject sourceProj;
-            if (!_projects.TryGetValue(projectName, out sourceProj))
+            if (!_projects.TryGetValue(projectName, out TemporaryCSharpProject sourceProj))
             {
                 sourceProj = _directory.SubDir(projectName).WithCSharpProject(projectName);
                 _onCreate?.Invoke(sourceProj);
@@ -38,4 +38,4 @@ namespace Microsoft.DotNet.Watcher.Tools.Tests
             return sourceProj;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Tools/dotnet-watch/test/dotnet-watch.Tests.csproj b/src/Tools/dotnet-watch/test/dotnet-watch.Tests.csproj
index 5236c1f1a7..a187a518a7 100644
--- a/src/Tools/dotnet-watch/test/dotnet-watch.Tests.csproj
+++ b/src/Tools/dotnet-watch/test/dotnet-watch.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <!-- This needs to be hard-coded, since these test projects choose not to import Directory.Build.Props from the root of the repo -->