From 2217be28261ee2df07dd5d293d92a05a458f5a6b Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Tue, 13 Aug 2019 14:00:33 -0700 Subject: [PATCH 01/94] Skip/disable tests in 2.2 for IIS (#12985) * Skip/disable tests in 2.2 for IIS * Update ServicesTests.cs --- .../IIS/test/Common.FunctionalTests/Inprocess/RequestTests.cs | 2 ++ .../IIS/IIS/test/IIS.Shared.FunctionalTests/ServicesTests.cs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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 f4ae7dbc02..cf0bacc8be 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/RequestTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/RequestTests.cs @@ -49,6 +49,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } [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) @@ -59,6 +60,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } [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/IIS.Shared.FunctionalTests/ServicesTests.cs b/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/ServicesTests.cs index 875b5b13be..3185b1143f 100644 --- a/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/ServicesTests.cs +++ b/src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/ServicesTests.cs @@ -70,7 +70,7 @@ namespace IIS.FunctionalTests var result = await DeployAsync(baseDeploymentParameters); - await Helpers.Retry(async () => await File.ReadAllTextAsync(Path.Combine(result.ContentRoot, "Started.txt")), 10, 200); + await Helpers.Retry(async () => await File.ReadAllTextAsync(Path.Combine(result.ContentRoot, "Started.txt")), 10, 3000); StopServer(); EventLogHelpers.VerifyEventLogEvent(result, EventLogHelpers.Started(result)); } From 39aa19ae687328a33adb48a24815b978764e6f6b Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Wed, 14 Aug 2019 02:04:07 +0000 Subject: [PATCH 02/94] 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 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6bbaaaf86f..75426dfccc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,21 +13,21 @@ https://github.com/aspnet/Blazor 498a843f7854f9a2a5820e55cd2c7d7654429682 - + https://github.com/aspnet/AspNetCore-Tooling - 3e788675fd3dab5fddd7b9aba9225e5b5ebbd946 + 0306a0c9bb2efe551bfdfeb475e550f214170ca0 - + https://github.com/aspnet/AspNetCore-Tooling - 3e788675fd3dab5fddd7b9aba9225e5b5ebbd946 + 0306a0c9bb2efe551bfdfeb475e550f214170ca0 - + https://github.com/aspnet/AspNetCore-Tooling - 3e788675fd3dab5fddd7b9aba9225e5b5ebbd946 + 0306a0c9bb2efe551bfdfeb475e550f214170ca0 - + https://github.com/aspnet/AspNetCore-Tooling - 3e788675fd3dab5fddd7b9aba9225e5b5ebbd946 + 0306a0c9bb2efe551bfdfeb475e550f214170ca0 https://github.com/aspnet/EntityFrameworkCore diff --git a/eng/Versions.props b/eng/Versions.props index 648fe409f8..de5d67fcd2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -157,10 +157,10 @@ 3.0.0-preview9.19412.3 3.0.0-preview9.19412.3 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 + 3.0.0-preview9.19413.3 + 3.0.0-preview9.19413.3 + 3.0.0-preview9.19413.3 + 3.0.0-preview9.19413.3 - + https://github.com/dotnet/core-setup - 9408f55c19a0a9118a23b05f83200a3534dd9f7f + 91004b0eb6f484c56f50d0f428988268e3ef455d - + https://github.com/dotnet/core-setup - 9408f55c19a0a9118a23b05f83200a3534dd9f7f + 91004b0eb6f484c56f50d0f428988268e3ef455d @@ -412,9 +412,9 @@ https://github.com/dotnet/corefx b82d2bc44424c8a99a1f0fc13202bdfd43e6f9f5 - + https://github.com/aspnet/Extensions - 14c51735aa12343b7b0e53ae775990ab9c98c42f + d3376113aef163ec9750f0841efc221f9f8ef8e2 https://github.com/dotnet/arcade @@ -428,9 +428,9 @@ https://github.com/dotnet/arcade a11024c8c22cc762011addafc30c653c938048f4 - + https://github.com/aspnet/Extensions - 14c51735aa12343b7b0e53ae775990ab9c98c42f + d3376113aef163ec9750f0841efc221f9f8ef8e2 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index de5d67fcd2..b1b7c09b9e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,10 +54,10 @@ 3.3.0-beta3-19409-05 - 3.0.0-preview9-19410-12 - 3.0.0-preview9-19410-12 - 3.0.0-preview9-19410-12 - 2.1.0-preview9-19410-12 + 3.0.0-preview9-19411-11 + 3.0.0-preview9-19411-11 + 3.0.0-preview9-19411-11 + 2.1.0-preview9-19411-11 1.0.0-preview9.19409.17 4.6.0-preview9.19409.17 @@ -87,75 +87,75 @@ 3.0.0-preview9.19405.1 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 - 3.0.0-preview9.19411.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 + 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.3 - 3.0.0-preview9.19412.3 - 3.0.0-preview9.19412.3 - 3.0.0-preview9.19412.3 - 3.0.0-preview9.19412.3 - 3.0.0-preview9.19412.3 - 3.0.0-preview9.19412.3 + 3.0.0-preview9.19413.10 + 3.0.0-preview9.19413.10 + 3.0.0-preview9.19413.10 + 3.0.0-preview9.19413.10 + 3.0.0-preview9.19413.10 + 3.0.0-preview9.19413.10 + 3.0.0-preview9.19413.10 3.0.0-preview9.19413.3 3.0.0-preview9.19413.3 From b8996c0f2f50c0b5783c754b08df6ce973081ce5 Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Wed, 14 Aug 2019 12:06:41 +0000 Subject: [PATCH 04/94] 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) --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2d18c4cb13..966da562e4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,33 +29,33 @@ https://github.com/aspnet/AspNetCore-Tooling 0306a0c9bb2efe551bfdfeb475e550f214170ca0 - + https://github.com/aspnet/EntityFrameworkCore - 9dab5d8fc528b3d0b2e64b26ddd01402754efcc7 + cd63eea1a235b67e32a1759d507b871dc5724099 - + https://github.com/aspnet/EntityFrameworkCore - 9dab5d8fc528b3d0b2e64b26ddd01402754efcc7 + cd63eea1a235b67e32a1759d507b871dc5724099 - + https://github.com/aspnet/EntityFrameworkCore - 9dab5d8fc528b3d0b2e64b26ddd01402754efcc7 + cd63eea1a235b67e32a1759d507b871dc5724099 - + https://github.com/aspnet/EntityFrameworkCore - 9dab5d8fc528b3d0b2e64b26ddd01402754efcc7 + cd63eea1a235b67e32a1759d507b871dc5724099 - + https://github.com/aspnet/EntityFrameworkCore - 9dab5d8fc528b3d0b2e64b26ddd01402754efcc7 + cd63eea1a235b67e32a1759d507b871dc5724099 - + https://github.com/aspnet/EntityFrameworkCore - 9dab5d8fc528b3d0b2e64b26ddd01402754efcc7 + cd63eea1a235b67e32a1759d507b871dc5724099 - + https://github.com/aspnet/EntityFrameworkCore - 9dab5d8fc528b3d0b2e64b26ddd01402754efcc7 + cd63eea1a235b67e32a1759d507b871dc5724099 https://github.com/aspnet/Extensions diff --git a/eng/Versions.props b/eng/Versions.props index b1b7c09b9e..0e7ee9c8cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -149,13 +149,13 @@ 3.0.0-preview9.19412.2 3.0.0-preview9.19412.2 - 3.0.0-preview9.19413.10 - 3.0.0-preview9.19413.10 - 3.0.0-preview9.19413.10 - 3.0.0-preview9.19413.10 - 3.0.0-preview9.19413.10 - 3.0.0-preview9.19413.10 - 3.0.0-preview9.19413.10 + 3.0.0-preview9.19413.14 + 3.0.0-preview9.19413.14 + 3.0.0-preview9.19413.14 + 3.0.0-preview9.19413.14 + 3.0.0-preview9.19413.14 + 3.0.0-preview9.19413.14 + 3.0.0-preview9.19413.14 3.0.0-preview9.19413.3 3.0.0-preview9.19413.3 From 221dbeb54072e18b04081d741625d0efd1c8311f Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Thu, 15 Aug 2019 02:03:14 +0000 Subject: [PATCH 05/94] 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 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 966da562e4..29e1902978 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,21 +13,21 @@ https://github.com/aspnet/Blazor 498a843f7854f9a2a5820e55cd2c7d7654429682 - + https://github.com/aspnet/AspNetCore-Tooling - 0306a0c9bb2efe551bfdfeb475e550f214170ca0 + 304cafcffe0c190b6a93ec1887cd25d119f6524c - + https://github.com/aspnet/AspNetCore-Tooling - 0306a0c9bb2efe551bfdfeb475e550f214170ca0 + 304cafcffe0c190b6a93ec1887cd25d119f6524c - + https://github.com/aspnet/AspNetCore-Tooling - 0306a0c9bb2efe551bfdfeb475e550f214170ca0 + 304cafcffe0c190b6a93ec1887cd25d119f6524c - + https://github.com/aspnet/AspNetCore-Tooling - 0306a0c9bb2efe551bfdfeb475e550f214170ca0 + 304cafcffe0c190b6a93ec1887cd25d119f6524c https://github.com/aspnet/EntityFrameworkCore diff --git a/eng/Versions.props b/eng/Versions.props index 0e7ee9c8cc..ec118fe200 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -157,10 +157,10 @@ 3.0.0-preview9.19413.14 3.0.0-preview9.19413.14 - 3.0.0-preview9.19413.3 - 3.0.0-preview9.19413.3 - 3.0.0-preview9.19413.3 - 3.0.0-preview9.19413.3 + 3.0.0-preview9.19414.3 + 3.0.0-preview9.19414.3 + 3.0.0-preview9.19414.3 + 3.0.0-preview9.19414.3 - 3.0.0-preview9.19413.14 - 3.0.0-preview9.19413.14 - 3.0.0-preview9.19413.14 - 3.0.0-preview9.19413.14 - 3.0.0-preview9.19413.14 - 3.0.0-preview9.19413.14 - 3.0.0-preview9.19413.14 + 3.0.0-preview9.19414.3 + 3.0.0-preview9.19414.3 + 3.0.0-preview9.19414.3 + 3.0.0-preview9.19414.3 + 3.0.0-preview9.19414.3 + 3.0.0-preview9.19414.3 + 3.0.0-preview9.19414.3 3.0.0-preview9.19414.3 3.0.0-preview9.19414.3 From 02fd9a9dc975a1c47223cebc4985d89269ad45cf Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Thu, 15 Aug 2019 12:04:37 +0000 Subject: [PATCH 07/94] 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) --- eng/Version.Details.xml | 292 ++++++++++++++++++++-------------------- eng/Versions.props | 146 ++++++++++---------- 2 files changed, 219 insertions(+), 219 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 28cc9eee70..1dbe7a0da8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,269 +29,269 @@ https://github.com/aspnet/AspNetCore-Tooling 304cafcffe0c190b6a93ec1887cd25d119f6524c - + https://github.com/aspnet/EntityFrameworkCore - 22711701cc41d53cb21350634246b30caf57033b + 9a3229099b2e89bd40f3ae9ee2e90875774925b9 - + https://github.com/aspnet/EntityFrameworkCore - 22711701cc41d53cb21350634246b30caf57033b + 9a3229099b2e89bd40f3ae9ee2e90875774925b9 - + https://github.com/aspnet/EntityFrameworkCore - 22711701cc41d53cb21350634246b30caf57033b + 9a3229099b2e89bd40f3ae9ee2e90875774925b9 - + https://github.com/aspnet/EntityFrameworkCore - 22711701cc41d53cb21350634246b30caf57033b + 9a3229099b2e89bd40f3ae9ee2e90875774925b9 - + https://github.com/aspnet/EntityFrameworkCore - 22711701cc41d53cb21350634246b30caf57033b + 9a3229099b2e89bd40f3ae9ee2e90875774925b9 - + https://github.com/aspnet/EntityFrameworkCore - 22711701cc41d53cb21350634246b30caf57033b + 9a3229099b2e89bd40f3ae9ee2e90875774925b9 - + https://github.com/aspnet/EntityFrameworkCore - 22711701cc41d53cb21350634246b30caf57033b + 9a3229099b2e89bd40f3ae9ee2e90875774925b9 - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc https://github.com/dotnet/corefx @@ -385,25 +385,25 @@ https://github.com/dotnet/corefx b82d2bc44424c8a99a1f0fc13202bdfd43e6f9f5 - + https://github.com/dotnet/core-setup - 91004b0eb6f484c56f50d0f428988268e3ef455d + f1de07d0abab3899bd7e1facb7e375d6100a2ac8 - + https://github.com/dotnet/core-setup - 91004b0eb6f484c56f50d0f428988268e3ef455d + f1de07d0abab3899bd7e1facb7e375d6100a2ac8 - + https://github.com/dotnet/core-setup - 91004b0eb6f484c56f50d0f428988268e3ef455d + f1de07d0abab3899bd7e1facb7e375d6100a2ac8 - + https://github.com/dotnet/core-setup - 91004b0eb6f484c56f50d0f428988268e3ef455d + f1de07d0abab3899bd7e1facb7e375d6100a2ac8 @@ -412,9 +412,9 @@ https://github.com/dotnet/corefx b82d2bc44424c8a99a1f0fc13202bdfd43e6f9f5 - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc https://github.com/dotnet/arcade @@ -428,13 +428,13 @@ https://github.com/dotnet/arcade a11024c8c22cc762011addafc30c653c938048f4 - + https://github.com/aspnet/Extensions - d3376113aef163ec9750f0841efc221f9f8ef8e2 + 93d3ae448551cac29af8cf882b31047f5da0dadc - + https://github.com/dotnet/roslyn - ed92d532473db83c1db47b313ee1c1bd7520aa08 + 40b3c24da722148153675112d727b030f448454e diff --git a/eng/Versions.props b/eng/Versions.props index 32250d505f..f5da6c9693 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,12 +52,12 @@ 1.0.0-beta.19411.1 - 3.3.0-beta3-19409-05 + 3.3.0-beta3-19413-08 - 3.0.0-preview9-19411-11 - 3.0.0-preview9-19411-11 - 3.0.0-preview9-19411-11 - 2.1.0-preview9-19411-11 + 3.0.0-preview9-19414-02 + 3.0.0-preview9-19414-02 + 3.0.0-preview9-19414-02 + 2.1.0-preview9-19414-02 1.0.0-preview9.19409.17 4.6.0-preview9.19409.17 @@ -87,75 +87,75 @@ 3.0.0-preview9.19405.1 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 - 3.0.0-preview9.19412.2 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 + 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.3 - 3.0.0-preview9.19414.3 - 3.0.0-preview9.19414.3 - 3.0.0-preview9.19414.3 - 3.0.0-preview9.19414.3 - 3.0.0-preview9.19414.3 - 3.0.0-preview9.19414.3 + 3.0.0-preview9.19414.8 + 3.0.0-preview9.19414.8 + 3.0.0-preview9.19414.8 + 3.0.0-preview9.19414.8 + 3.0.0-preview9.19414.8 + 3.0.0-preview9.19414.8 + 3.0.0-preview9.19414.8 3.0.0-preview9.19414.3 3.0.0-preview9.19414.3 From 98c8988baac7e8301079f952ab0ff0e8167b2e49 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Thu, 15 Aug 2019 13:34:20 -0700 Subject: [PATCH 08/94] React to JSRuntime changes --- .../Server/src/Circuits/CircuitHost.cs | 5 +- .../Server/src/Circuits/RemoteJSRuntime.cs | 2 +- .../Server/src/Circuits/RemoteRenderer.cs | 4 +- .../test/Circuits/RemoteRendererTest.cs | 8 +-- .../BasicTestApp/InteropComponent.razor | 14 ++-- .../InteropTest/JavaScriptInterop.cs | 70 +++++++++---------- .../BasicTestApp/LongRunningInterop.razor | 6 +- .../NavigationManagerComponent.razor | 9 +-- .../ServerReliability/JSInterop.cs | 6 +- .../testassets/TestContentPackage/MyPrompt.cs | 2 +- .../UnsupportedJavaScriptRuntime.cs | 6 +- 11 files changed, 65 insertions(+), 67 deletions(-) diff --git a/src/Components/Server/src/Circuits/CircuitHost.cs b/src/Components/Server/src/Circuits/CircuitHost.cs index 0f0cbceafb..cf3235f3f5 100644 --- a/src/Components/Server/src/Circuits/CircuitHost.cs +++ b/src/Components/Server/src/Circuits/CircuitHost.cs @@ -13,6 +13,7 @@ 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 { @@ -342,7 +343,7 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits { SetCurrentJSRuntime(); Log.BeginInvokeDotNet(_logger, callId, assemblyName, methodIdentifier, dotNetObjectId); - DotNetDispatcher.BeginInvoke(callId, assemblyName, methodIdentifier, dotNetObjectId, argsJson); + DotNetDispatcher.BeginInvokeDotNet(callId, assemblyName, methodIdentifier, dotNetObjectId, argsJson); }); } catch (Exception ex) @@ -377,7 +378,7 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits Log.EndInvokeJSSucceeded(_logger, asyncCall); } - DotNetDispatcher.EndInvoke(arguments); + DotNetDispatcher.EndInvokeJS(arguments); }); } catch (Exception ex) diff --git a/src/Components/Server/src/Circuits/RemoteJSRuntime.cs b/src/Components/Server/src/Circuits/RemoteJSRuntime.cs index 442775d451..9d88588e45 100644 --- a/src/Components/Server/src/Circuits/RemoteJSRuntime.cs +++ b/src/Components/Server/src/Circuits/RemoteJSRuntime.cs @@ -11,7 +11,7 @@ using Microsoft.JSInterop; namespace Microsoft.AspNetCore.Components.Server.Circuits { - internal class RemoteJSRuntime : JSRuntimeBase + internal class RemoteJSRuntime : JSRuntime { private readonly CircuitOptions _options; private readonly ILogger _logger; diff --git a/src/Components/Server/src/Circuits/RemoteRenderer.cs b/src/Components/Server/src/Circuits/RemoteRenderer.cs index a53ee90de3..690adc66cd 100644 --- a/src/Components/Server/src/Circuits/RemoteRenderer.cs +++ b/src/Components/Server/src/Circuits/RemoteRenderer.cs @@ -64,11 +64,11 @@ namespace Microsoft.AspNetCore.Components.Web.Rendering var component = InstantiateComponent(componentType); var componentId = AssignRootComponentId(component); - var attachComponentTask = _jsRuntime.InvokeAsync( + var attachComponentTask = _jsRuntime.InvokeVoidAsync( "Blazor._internal.attachRootComponentToElement", domElementSelector, componentId); - CaptureAsyncExceptions(attachComponentTask); + CaptureAsyncExceptions(attachComponentTask.AsTask()); return RenderRootComponentAsync(componentId); } diff --git a/src/Components/Server/test/Circuits/RemoteRendererTest.cs b/src/Components/Server/test/Circuits/RemoteRendererTest.cs index 11f772e3ca..5505daf3e3 100644 --- a/src/Components/Server/test/Circuits/RemoteRendererTest.cs +++ b/src/Components/Server/test/Circuits/RemoteRendererTest.cs @@ -427,12 +427,8 @@ namespace Microsoft.AspNetCore.Components.Web.Rendering private TestRemoteRenderer GetRemoteRenderer(IServiceProvider serviceProvider, CircuitClientProxy circuitClient = null) { var jsRuntime = new Mock(); - jsRuntime.Setup(r => r.InvokeAsync( - "Blazor._internal.attachRootComponentToElement", - It.IsAny(), - It.IsAny(), - It.IsAny())) - .ReturnsAsync(Task.FromResult(null)); + jsRuntime.Setup(r => r.InvokeAsync("Blazor._internal.attachRootComponentToElement", It.IsAny())) + .ReturnsAsync(new ValueTask((object)null)); return new TestRemoteRenderer( serviceProvider, 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( + 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("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("receiveDotNetObjectByRef", passDotNetObjectByRefArg); ReceiveDotNetObjectByRefResult["stringValueUpper"] = result.StringValueUpper; @@ -165,7 +165,7 @@ { public string StringValue { get; set; } - public DotNetObjectRef TestDto { get; set; } + public DotNetObjectReference TestDto { get; set; } } public class ReceiveDotNetObjectByRefArgs @@ -174,6 +174,6 @@ public int TestDtoNonSerializedValue { get; set; } - public DotNetObjectRef TestDto { get; set; } + public DotNetObjectReference 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 parameter3) + DotNetObjectReference 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 parameter3, + DotNetObjectReference 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 parameter3, + DotNetObjectReference parameter3, int parameter4, long parameter5) { @@ -81,7 +81,7 @@ namespace BasicTestApp.InteropTest public static void VoidWithSixParameters( ComplexParameter parameter1, byte parameter2, - DotNetObjectRef parameter3, + DotNetObjectReference parameter3, int parameter4, long parameter5, float parameter6) @@ -93,7 +93,7 @@ namespace BasicTestApp.InteropTest public static void VoidWithSevenParameters( ComplexParameter parameter1, byte parameter2, - DotNetObjectRef parameter3, + DotNetObjectReference parameter3, int parameter4, long parameter5, float parameter6, @@ -106,7 +106,7 @@ namespace BasicTestApp.InteropTest public static void VoidWithEightParameters( ComplexParameter parameter1, byte parameter2, - DotNetObjectRef parameter3, + DotNetObjectReference parameter3, int parameter4, long parameter5, float parameter6, @@ -140,7 +140,7 @@ namespace BasicTestApp.InteropTest public static object[] EchoThreeParameters( ComplexParameter parameter1, byte parameter2, - DotNetObjectRef parameter3) + DotNetObjectReference 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 parameter3, + DotNetObjectReference 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 parameter3, + DotNetObjectReference parameter3, int parameter4, long parameter5) { @@ -169,7 +169,7 @@ namespace BasicTestApp.InteropTest [JSInvokable] public static object[] EchoSixParameters(ComplexParameter parameter1, byte parameter2, - DotNetObjectRef parameter3, + DotNetObjectReference parameter3, int parameter4, long parameter5, float parameter6) @@ -180,7 +180,7 @@ namespace BasicTestApp.InteropTest [JSInvokable] public static object[] EchoSevenParameters(ComplexParameter parameter1, byte parameter2, - DotNetObjectRef parameter3, + DotNetObjectReference parameter3, int parameter4, long parameter5, float parameter6, @@ -193,7 +193,7 @@ namespace BasicTestApp.InteropTest public static object[] EchoEightParameters( ComplexParameter parameter1, byte parameter2, - DotNetObjectRef parameter3, + DotNetObjectReference parameter3, int parameter4, long parameter5, float parameter6, @@ -230,7 +230,7 @@ namespace BasicTestApp.InteropTest public static Task VoidWithThreeParametersAsync( ComplexParameter parameter1, byte parameter2, - DotNetObjectRef parameter3) + DotNetObjectReference 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 parameter3, + DotNetObjectReference 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 parameter3, + DotNetObjectReference parameter3, int parameter4, long parameter5) { @@ -263,7 +263,7 @@ namespace BasicTestApp.InteropTest public static Task VoidWithSixParametersAsync( ComplexParameter parameter1, byte parameter2, - DotNetObjectRef parameter3, + DotNetObjectReference parameter3, int parameter4, long parameter5, float parameter6) @@ -276,7 +276,7 @@ namespace BasicTestApp.InteropTest public static Task VoidWithSevenParametersAsync( ComplexParameter parameter1, byte parameter2, - DotNetObjectRef parameter3, + DotNetObjectReference parameter3, int parameter4, long parameter5, float parameter6, @@ -290,7 +290,7 @@ namespace BasicTestApp.InteropTest public static Task VoidWithEightParametersAsync( ComplexParameter parameter1, byte parameter2, - DotNetObjectRef parameter3, + DotNetObjectReference parameter3, int parameter4, long parameter5, float parameter6, @@ -325,7 +325,7 @@ namespace BasicTestApp.InteropTest public static Task EchoThreeParametersAsync( ComplexParameter parameter1, byte parameter2, - DotNetObjectRef parameter3) + DotNetObjectReference parameter3) { return Task.FromResult(new object[] { parameter1, parameter2, parameter3.Value.GetNonSerializedValue() }); } @@ -334,7 +334,7 @@ namespace BasicTestApp.InteropTest public static Task EchoFourParametersAsync( ComplexParameter parameter1, byte parameter2, - DotNetObjectRef parameter3, + DotNetObjectReference parameter3, int parameter4) { return Task.FromResult(new object[] { parameter1, parameter2, parameter3.Value.GetNonSerializedValue(), parameter4 }); @@ -344,7 +344,7 @@ namespace BasicTestApp.InteropTest public static Task EchoFiveParametersAsync( ComplexParameter parameter1, byte parameter2, - DotNetObjectRef parameter3, + DotNetObjectReference parameter3, int parameter4, long parameter5) { @@ -354,7 +354,7 @@ namespace BasicTestApp.InteropTest [JSInvokable] public static Task EchoSixParametersAsync(ComplexParameter parameter1, byte parameter2, - DotNetObjectRef parameter3, + DotNetObjectReference parameter3, int parameter4, long parameter5, float parameter6) @@ -366,7 +366,7 @@ namespace BasicTestApp.InteropTest public static Task EchoSevenParametersAsync( ComplexParameter parameter1, byte parameter2, - DotNetObjectRef parameter3, + DotNetObjectReference parameter3, int parameter4, long parameter5, float parameter6, @@ -379,7 +379,7 @@ namespace BasicTestApp.InteropTest public static Task EchoEightParametersAsync( ComplexParameter parameter1, byte parameter2, - DotNetObjectRef parameter3, + DotNetObjectReference parameter3, int parameter4, long parameter5, float parameter6, @@ -390,26 +390,26 @@ namespace BasicTestApp.InteropTest } [JSInvokable] - public static Dictionary> ReturnDotNetObjectByRef() + public static Dictionary> ReturnDotNetObjectByRef() { - return new Dictionary> + return new Dictionary> { - { "Some sync instance", DotNetObjectRef.Create(new TestDTO(1000)) } + { "Some sync instance", DotNetObjectReference.Create(new TestDTO(1000)) } }; } [JSInvokable] - public static async Task>> ReturnDotNetObjectByRefAsync() + public static async Task>> ReturnDotNetObjectByRefAsync() { await Task.Yield(); - return new Dictionary> + return new Dictionary> { - { "Some async instance", DotNetObjectRef.Create(new TestDTO(1001)) } + { "Some async instance", DotNetObjectReference.Create(new TestDTO(1001)) } }; } [JSInvokable] - public static int ExtractNonSerializedValue(DotNetObjectRef objectByRef) + public static int ExtractNonSerializedValue(DotNetObjectReference 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 DTOByRef { get; set; } + public DotNetObjectReference DTOByRef { get; set; } } public class InstanceMethodOutput @@ -460,7 +460,7 @@ namespace BasicTestApp.InteropTest public int IncomingByRef { get; set; } - public DotNetObjectRef OutgoingByRef { get; set; } + public DotNetObjectReference OutgoingByRef { get; set; } } } } 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( + await JSRuntime.InvokeVoidAsync( "asyncFunctionTakesLongerThanDefaultTimeoutToResolve", - Array.Empty(), - cancellationTokenSource.Token); + cancellationTokenSource.Token, + Array.Empty()); } catch (TaskCanceledException) { 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 @@ -29,7 +31,6 @@ async Task Navigate() { - await JSRuntime.InvokeAsync("navigationManagerNavigate"); + await JSRuntime.InvokeVoidAsync("navigationManagerNavigate"); } } - 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 CreateImportant() + public static DotNetObjectReference CreateImportant() { - return DotNetObjectRef.Create(new ImportantInformation()); + return DotNetObjectReference.Create(new ImportantInformation()); } [JSInvokable] - public static string ReceiveTrivial(DotNetObjectRef information) + public static string ReceiveTrivial(DotNetObjectReference information) { return information.Value.Message; } 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 Show(IJSRuntime jsRuntime, string message) + public static ValueTask Show(IJSRuntime jsRuntime, string message) { return jsRuntime.InvokeAsync( "TestContentPackage.showPrompt", // Keep in sync with identifiers in the.js file 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 InvokeAsync(string identifier, params object[] args) + public ValueTask InvokeAsync(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 InvokeAsync(string identifier, IEnumerable args, CancellationToken cancellationToken = default) + ValueTask IJSRuntime.InvokeAsync(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 From 846987771801cb29ed39b33e5898aaa75732899e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Aug 2019 21:31:54 +0000 Subject: [PATCH 09/94] 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 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1dbe7a0da8..35929dff5b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,21 +13,21 @@ https://github.com/aspnet/Blazor 498a843f7854f9a2a5820e55cd2c7d7654429682 - + https://github.com/aspnet/AspNetCore-Tooling - 304cafcffe0c190b6a93ec1887cd25d119f6524c + 970cd5ce8b70956e013b1a67f0df37dda0ddbb1d - + https://github.com/aspnet/AspNetCore-Tooling - 304cafcffe0c190b6a93ec1887cd25d119f6524c + 970cd5ce8b70956e013b1a67f0df37dda0ddbb1d - + https://github.com/aspnet/AspNetCore-Tooling - 304cafcffe0c190b6a93ec1887cd25d119f6524c + 970cd5ce8b70956e013b1a67f0df37dda0ddbb1d - + https://github.com/aspnet/AspNetCore-Tooling - 304cafcffe0c190b6a93ec1887cd25d119f6524c + 970cd5ce8b70956e013b1a67f0df37dda0ddbb1d https://github.com/aspnet/EntityFrameworkCore diff --git a/eng/Versions.props b/eng/Versions.props index f5da6c9693..94d6391c7e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -157,10 +157,10 @@ 3.0.0-preview9.19414.8 3.0.0-preview9.19414.8 - 3.0.0-preview9.19414.3 - 3.0.0-preview9.19414.3 - 3.0.0-preview9.19414.3 - 3.0.0-preview9.19414.3 + 3.0.0-preview9.19415.5 + 3.0.0-preview9.19415.5 + 3.0.0-preview9.19415.5 + 3.0.0-preview9.19415.5 - 3.0.0-preview9.19414.8 - 3.0.0-preview9.19414.8 - 3.0.0-preview9.19414.8 - 3.0.0-preview9.19414.8 - 3.0.0-preview9.19414.8 - 3.0.0-preview9.19414.8 - 3.0.0-preview9.19414.8 + 3.0.0-preview9.19415.5 + 3.0.0-preview9.19415.5 + 3.0.0-preview9.19415.5 + 3.0.0-preview9.19415.5 + 3.0.0-preview9.19415.5 + 3.0.0-preview9.19415.5 + 3.0.0-preview9.19415.5 3.0.0-preview9.19415.5 3.0.0-preview9.19415.5 From c2a95e440a2a46cee5c29faf060ad1349038fa33 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Aug 2019 21:32:24 +0000 Subject: [PATCH 11/94] 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) --- eng/Version.Details.xml | 264 ++++++++++++++++++++-------------------- eng/Versions.props | 132 ++++++++++---------- 2 files changed, 198 insertions(+), 198 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f180b7fe82..cc082c71ca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -57,241 +57,241 @@ https://github.com/aspnet/EntityFrameworkCore bda51d2ca1b56176c6d5d55491fe5ff5204c0a41 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 https://github.com/dotnet/corefx @@ -385,25 +385,25 @@ https://github.com/dotnet/corefx b82d2bc44424c8a99a1f0fc13202bdfd43e6f9f5 - + https://github.com/dotnet/core-setup - f1de07d0abab3899bd7e1facb7e375d6100a2ac8 + 0b84934a47d2717e666d72bd04df5bd91c21c8b1 - + https://github.com/dotnet/core-setup - f1de07d0abab3899bd7e1facb7e375d6100a2ac8 + 0b84934a47d2717e666d72bd04df5bd91c21c8b1 - + https://github.com/dotnet/core-setup - f1de07d0abab3899bd7e1facb7e375d6100a2ac8 + 0b84934a47d2717e666d72bd04df5bd91c21c8b1 - + https://github.com/dotnet/core-setup - f1de07d0abab3899bd7e1facb7e375d6100a2ac8 + 0b84934a47d2717e666d72bd04df5bd91c21c8b1 @@ -412,9 +412,9 @@ https://github.com/dotnet/corefx b82d2bc44424c8a99a1f0fc13202bdfd43e6f9f5 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 https://github.com/dotnet/arcade @@ -428,13 +428,13 @@ https://github.com/dotnet/arcade a11024c8c22cc762011addafc30c653c938048f4 - + https://github.com/aspnet/Extensions - 93d3ae448551cac29af8cf882b31047f5da0dadc + cfef5e07fb893b1c5a94566a0d053290f0c75382 - + https://github.com/dotnet/roslyn - 40b3c24da722148153675112d727b030f448454e + f5ba9f2c61a2fe853dc4913888d40df221539147 diff --git a/eng/Versions.props b/eng/Versions.props index da81a17bef..63d91d1a2c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,12 +52,12 @@ 1.0.0-beta.19411.1 - 3.3.0-beta3-19413-08 + 3.3.0-beta3-19415-01 - 3.0.0-preview9-19414-02 - 3.0.0-preview9-19414-02 - 3.0.0-preview9-19414-02 - 2.1.0-preview9-19414-02 + 3.0.0-preview9-19414-17 + 3.0.0-preview9-19414-17 + 3.0.0-preview9-19414-17 + 2.1.0-preview9-19414-17 1.0.0-preview9.19409.17 4.6.0-preview9.19409.17 @@ -87,67 +87,67 @@ 3.0.0-preview9.19405.1 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 - 3.0.0-preview9.19414.4 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 + 3.0.0-preview9.19415.2 3.0.0-preview9.19415.5 3.0.0-preview9.19415.5 From 829f893f290306116bf7d0879f4b2f16400cecfe Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Thu, 15 Aug 2019 15:44:07 -0700 Subject: [PATCH 12/94] React to extensions changes --- src/Analyzers/Analyzers/test/AnalyzerTestBase.cs | 1 - src/Components/Analyzers/test/AnalyzerTestBase.cs | 1 - .../Build/test/RuntimeDependenciesResolverTest.cs | 2 +- src/Components/Components/test/RendererTest.cs | 1 - .../Server/test/Circuits/CircuitRegistryTest.cs | 1 - src/Components/test/E2ETest/Tests/EventTest.cs | 1 - src/Components/test/E2ETest/Tests/FormsTest.cs | 1 - .../test/Cng/BCryptUtilTests.cs | 2 +- .../test/Cng/CachedAlgorithmHandlesTests.cs | 2 +- .../Cryptography.KeyDerivation/test/Pbkdf2Tests.cs | 2 +- .../CngCbcAuthenticatedEncryptorFactoryTest.cs | 2 +- .../CngGcmAuthenticatedEncryptorFactoryTest.cs | 2 +- .../AuthenticatedEncryptorDescriptorTests.cs | 2 +- ...nticatedEncryptorDescriptorDeserializerTests.cs | 2 +- ...nticatedEncryptorDescriptorDeserializerTests.cs | 2 +- .../test/Cng/CbcAuthenticatedEncryptorTests.cs | 2 +- .../test/Cng/CngAuthenticatedEncryptorBaseTests.cs | 2 +- .../test/Cng/GcmAuthenticatedEncryptorTests.cs | 2 +- .../DataProtection/test/ContainerUtilsTests.cs | 2 +- .../test/Internal/KeyManagementOptionsSetupTest.cs | 2 +- .../Managed/ManagedAuthenticatedEncryptorTests.cs | 2 +- .../test/RegistryPolicyResolverTests.cs | 2 +- .../Repositories/FileSystemXmlRepositoryTests.cs | 2 +- .../Repositories/RegistryXmlRepositoryTests.cs | 2 +- .../test/SP800_108/SP800_108Tests.cs | 2 +- .../XmlEncryption/DpapiNGXmlEncryptionTests.cs | 2 +- .../test/XmlEncryption/DpapiXmlEncryptionTests.cs | 1 - .../Extensions/test/DataProtectionProviderTests.cs | 1 - .../test/X509StoreIsAvailableAttribute.cs | 2 +- .../test/DataProtectionRedisTests.cs | 1 - .../test/TestRedisServerIsAvailableAttribute.cs | 2 +- ...nditionalRunTestOnlyWindows8OrLaterAttribute.cs | 2 +- .../test/ConditionalRunTestOnlyWindowsAttribute.cs | 2 +- .../WebHostFunctionalTests.cs | 2 +- .../test/Internal/HostingEventSourceTests.cs | 1 - src/Hosting/Hosting/test/WebHostTests.cs | 1 - ...Core.Server.IntegrationTesting.netcoreapp3.0.cs | 6 +++--- .../xunit/SkipIfEnvironmentVariableNotEnabled.cs | 2 +- ...pIfIISExpressSchemaMissingInProcessAttribute.cs | 2 +- .../src/xunit/SkipOn32BitOSAttribute.cs | 2 +- src/Hosting/TestHost/test/TestClientTests.cs | 2 +- .../test/Properties/AssemblyInfo.cs | 2 +- .../WindowsServices/test/WebHostServiceTests.cs | 2 +- src/Hosting/test/FunctionalTests/ShutdownTests.cs | 1 - .../test/FunctionalTests/WebHostBuilderTests.cs | 1 - .../ConfigureSigningCredentialsTests.cs | 2 +- .../test/Configuration/SigningKeysLoaderTests.cs | 2 +- .../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 - .../Properties/AssemblyInfo.cs | 2 +- .../test/Identity.Test/IdentityUIScriptsTest.cs | 1 - .../CorsMiddlewareFunctionalTest.cs | 1 - .../DatabaseErrorPageMiddlewareTest.cs | 2 +- .../MigrationsEndPointMiddlewareTest.cs | 2 +- .../FunctionalTests/DatabaseErrorPageSampleTest.cs | 2 +- .../FunctionalTests/StaticFileMiddlewareTests.cs | 1 - .../test/UnitTests/DefaultFilesMiddlewareTests.cs | 2 +- .../UnitTests/DirectoryBrowserMiddlewareTests.cs | 2 +- .../test/UnitTests/StaticFileMiddlewareTests.cs | 2 +- .../test/ConformanceTests/AutobahnTests.cs | 2 +- .../SkipIfWsTestNotPresentAttribute.cs | 2 +- .../test/UnitTests/WebSocketMiddlewareTests.cs | 1 - .../test/MusicStore.E2ETests/DotnetRunTests.cs | 2 +- .../MusicStore.E2ETests/NtlmAuthentationTest.cs | 2 +- .../test/MusicStore.E2ETests/OpenIdConnectTests.cs | 2 +- .../test/MusicStore.E2ETests/PublishAndRunTests.cs | 2 +- .../test/MusicStore.E2ETests/SmokeTests.cs | 2 +- .../MusicStore.E2ETests/SmokeTestsOnNanoServer.cs | 2 +- .../test/MusicStore.E2ETests/StoreSmokeTests.cs | 2 +- .../test/Infrastructure/MvcTestSource.cs | 1 - .../test/Infrastructure/MvcTestSource.cs | 1 - src/Mvc/Mvc.Core/test/FileResultTest.cs | 2 +- .../Binders/FloatingPointTypeModelBinderTestOfT.cs | 1 - .../Validation/DefaultObjectValidatorTests.cs | 1 - .../test/CompareAttributeAdapterTest.cs | 1 - src/Mvc/Mvc.Formatters.Xml/test/XmlAssertTest.cs | 1 - ...XmlDataContractSerializerOutputFormatterTest.cs | 2 +- .../test/XmlSerializerInputFormatterTest.cs | 1 - .../test/LanguageViewLocationExpanderTest.cs | 14 +++++++------- .../test/Mvc.FunctionalTests/ApiExplorerTest.cs | 2 +- .../ConsumesAttributeTestsBase.cs | 2 +- .../Mvc.FunctionalTests/ContentNegotiationTest.cs | 2 +- .../DoNotRespectBrowserAcceptHeaderTests.cs | 2 +- .../test/Mvc.FunctionalTests/FileResultTests.cs | 2 +- src/Mvc/test/Mvc.FunctionalTests/FlushPointTest.cs | 1 - .../Mvc.FunctionalTests/InputFormatterTests.cs | 2 +- .../InputObjectValidationTests.cs | 2 +- .../TempDataInCookiesUsingCookieConsentTest.cs | 1 - ...DataContractSerializerFormattersWrappingTest.cs | 4 ++-- .../Mvc.FunctionalTests/XmlOutputFormatterTests.cs | 2 +- .../XmlSerializerInputFormatterTests.cs | 2 +- .../test/BlazorServerTemplateTest.cs | 1 - src/ProjectTemplates/test/MvcTemplateTest.cs | 1 - .../test/RazorPagesTemplateTest.cs | 1 - .../test/SpaTemplateTest/AngularTemplateTest.cs | 1 - .../test/SpaTemplateTest/ReactTemplateTest.cs | 1 - .../Negotiate.FunctionalTest/CrossMachineTests.cs | 2 +- .../NegotiateHandlerFunctionalTests.cs | 4 ++-- .../Authentication/test/CertificateTests.cs | 2 +- src/Security/Authentication/test/CookieTests.cs | 4 ++-- .../Authentication/test/SecureDataFormatTests.cs | 2 +- .../Authentication/test/TicketSerializerTests.cs | 2 +- .../test/FunctionalTests/AuthenticationTests.cs | 1 - .../HttpSys/test/FunctionalTests/HttpsTests.cs | 1 - .../FunctionalTests/Listener/RequestBodyTests.cs | 1 - .../FunctionalTests/Listener/RequestHeaderTests.cs | 2 +- .../test/FunctionalTests/Listener/RequestTests.cs | 2 +- .../FunctionalTests/Listener/ResponseBodyTests.cs | 1 - .../Listener/ResponseHeaderTests.cs | 2 +- .../test/FunctionalTests/Listener/ServerTests.cs | 1 - .../test/FunctionalTests/MessagePumpTests.cs | 2 +- .../OSDontSkipConditionAttribute.cs | 2 +- .../test/FunctionalTests/OpaqueUpgradeTests.cs | 1 - .../FunctionalTests/Properties/AssemblyInfo.cs | 2 +- .../test/FunctionalTests/RequestBodyLimitTests.cs | 2 +- .../test/FunctionalTests/RequestBodyTests.cs | 2 +- .../test/FunctionalTests/RequestHeaderTests.cs | 2 +- .../HttpSys/test/FunctionalTests/RequestTests.cs | 2 +- .../test/FunctionalTests/ResponseBodyTests.cs | 1 - .../test/FunctionalTests/ResponseCachingTests.cs | 1 - .../test/FunctionalTests/ResponseHeaderTests.cs | 2 +- .../test/FunctionalTests/ResponseSendFileTests.cs | 3 +-- .../HttpSys/test/FunctionalTests/ResponseTests.cs | 1 - .../HttpSys/test/FunctionalTests/ServerTests.cs | 1 - .../test/Common.FunctionalTests/AppOfflineTests.cs | 1 - .../test/Common.FunctionalTests/BasicAuthTests.cs | 2 +- .../ClientCertificateTests.cs | 2 +- .../ClientDisconnectStress.cs | 2 +- .../Common.FunctionalTests/CommonStartupTests.cs | 2 +- .../Common.FunctionalTests/CompressionTests.cs | 2 +- .../ConfigurationChangeTests.cs | 1 - .../IIS/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 +- .../Common.FunctionalTests/Inprocess/FrebTests.cs | 1 - .../Inprocess/HelloWorldTests.cs | 2 +- .../Inprocess/HostingEnvironmentTests.cs | 2 +- .../Inprocess/InvalidReadWriteOperationTests.cs | 2 +- .../Inprocess/LargeResponseBodyTests.cs | 2 +- .../Inprocess/LogPipeTests.cs | 2 +- .../Inprocess/MaxRequestBodySizeTests.cs | 4 ++-- .../Inprocess/RequestTests.cs | 2 +- .../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 +- .../test/Common.FunctionalTests/LogFileTests.cs | 1 - .../MultiApplicationTests.cs | 2 +- .../OutOfProcess/AspNetCorePortTests.cs | 2 +- .../OutOfProcess/GlobalVersionTests.cs | 2 +- .../OutOfProcess/HelloWorldTest.cs | 2 +- .../Common.FunctionalTests/RequiresNewHandler.cs | 2 +- .../test/Common.FunctionalTests/RequiresNewShim.cs | 2 +- .../Common.FunctionalTests/ServerAbortTests.cs | 2 +- .../SkipIfNotAdminAttribute.cs | 2 +- .../Common.FunctionalTests/SkipVSTSAttribute.cs | 2 +- .../RequiresEnvironmentVariableAttribute.cs | 2 +- .../Utilities/SkipIfDebugAttribute.cs | 4 ++-- .../Common.FunctionalTests/WindowsAuthTests.cs | 2 +- .../NewHandlerTests.cs | 2 +- .../ForwardsCompatibilityTests.cs | 2 +- .../ApplicationInitializationTests.cs | 1 - .../Inprocess/StdOutRedirectionTests.cs | 2 +- .../RequiresIISAttribute.cs | 2 +- .../IIS/test/IIS.Tests/ClientDisconnectTests.cs | 1 - .../IIS/test/IIS.Tests/ConnectionIdFeatureTests.cs | 2 +- .../test/IIS.Tests/HttpBodyControlFeatureTests.cs | 2 +- .../IIS/test/IIS.Tests/MaxRequestBodySizeTests.cs | 2 +- .../IIS/IIS/test/IIS.Tests/ResponseAbortTests.cs | 2 +- .../IIS/IIS/test/IIS.Tests/TestServerTest.cs | 2 +- .../SkipIfHostableWebCoreNotAvailibleAttribute.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 +- .../Kestrel/Core/test/AddressBinderTests.cs | 1 - .../Kestrel/Kestrel/test/GeneratedCodeTests.cs | 1 - .../test/KestrelConfigurationBuilderTests.cs | 1 - .../Transport.Libuv/test/LibuvTransportTests.cs | 1 - .../HostNameIsReachableAttribute.cs | 2 +- .../IPv6ScopeIdPresentConditionAttribute.cs | 2 +- .../IPv6SupportedConditionAttribute.cs | 2 +- .../test/BindTests/AddressRegistrationTests.cs | 1 - .../test/FunctionalTests/Http2/HandshakeTests.cs | 1 - .../test/FunctionalTests/Http2/ShutdownTests.cs | 1 - .../FunctionalTests/MaxRequestBufferSizeTests.cs | 1 - .../Kestrel/test/FunctionalTests/RequestTests.cs | 1 - .../Kestrel/test/FunctionalTests/ResponseTests.cs | 1 - .../test/FunctionalTests/UnixDomainSocketsTests.cs | 1 - .../ConnectionLimitTests.cs | 1 - .../Http2/Http2StreamTests.cs | 2 +- .../Http2/Http2TimeoutTests.cs | 1 - .../InMemory.FunctionalTests/Http2/TlsTests.cs | 1 - .../HttpConnectionManagerTests.cs | 1 - .../HttpsConnectionMiddlewareTests.cs | 5 ++--- .../LoggingConnectionMiddlewareTests.cs | 1 - .../test/InMemory.FunctionalTests/RequestTests.cs | 1 - .../test/InMemory.FunctionalTests/ResponseTests.cs | 1 - .../test/Interop.FunctionalTests/ChromeTests.cs | 1 - .../test/Interop.FunctionalTests/H2SpecTests.cs | 1 - .../HttpClientHttp2InteropTests.cs | 1 - .../SkipIfChromeUnavailableAttribute.cs | 2 +- .../test/Interop.FunctionalTests/Utilities.cs | 2 +- .../Libuv.FunctionalTests/ListenHandleTests.cs | 1 - src/Servers/test/FunctionalTests/HelloWorldTest.cs | 2 +- .../test/FunctionalTests/NtlmAuthenticationTest.cs | 2 +- .../FunctionalTests/ResponseCompressionTests.cs | 2 +- src/Servers/test/FunctionalTests/ResponseTests.cs | 2 +- .../test/FunctionalTests/HubConnectionTests.cs | 2 +- .../test/HttpConnectionDispatcherTests.cs | 1 - .../test/MapConnectionHandlerTests.cs | 2 +- .../WebSocketsSupportedConditionAttribute.cs | 2 +- .../SignalR/test/DefaultTransportFactoryTests.cs | 2 +- src/SignalR/server/SignalR/test/EndToEndTests.cs | 1 - .../SignalR/test/WebSocketsTransportTests.cs | 2 +- .../StackExchangeRedis/test/RedisEndToEnd.cs | 2 +- .../test/SkipIfDockerNotPresentAttribute.cs | 2 +- .../test/CertificateManagerTests.cs | 2 +- src/Tools/dotnet-watch/test/AppWithDepsTests.cs | 1 - src/Tools/dotnet-watch/test/DotNetWatcherTests.cs | 3 +-- src/Tools/dotnet-watch/test/GlobbingAppTests.cs | 1 - src/Tools/dotnet-watch/test/NoDepsAppTests.cs | 1 - .../dotnet-watch/test/Properties/AssemblyInfo.cs | 2 +- 242 files changed, 182 insertions(+), 261 deletions(-) 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/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/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/Components/test/RendererTest.cs b/src/Components/Components/test/RendererTest.cs index 71ebf86351..75f60eeb00 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; diff --git a/src/Components/Server/test/Circuits/CircuitRegistryTest.cs b/src/Components/Server/test/Circuits/CircuitRegistryTest.cs index f57c27dbfa..8696c1ae3d 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; 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/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/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 fc0840fade..8162172cbf 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/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.netcoreapp3.0.cs b/src/Hosting/Server.IntegrationTesting/ref/Microsoft.AspNetCore.Server.IntegrationTesting.netcoreapp3.0.cs index ebfe3bbfeb..a9d6aac1e1 100644 --- a/src/Hosting/Server.IntegrationTesting/ref/Microsoft.AspNetCore.Server.IntegrationTesting.netcoreapp3.0.cs +++ b/src/Hosting/Server.IntegrationTesting/ref/Microsoft.AspNetCore.Server.IntegrationTesting.netcoreapp3.0.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 4c94b289a7..b7f837c110 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; diff --git a/src/Hosting/test/FunctionalTests/WebHostBuilderTests.cs b/src/Hosting/test/FunctionalTests/WebHostBuilderTests.cs index 216cf1cff9..53fa50ed8d 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/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/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/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..8976366b43 100644 --- a/src/Identity/test/Identity.Test/IdentityUIScriptsTest.cs +++ b/src/Identity/test/Identity.Test/IdentityUIScriptsTest.cs @@ -12,7 +12,6 @@ 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; diff --git a/src/Middleware/CORS/test/FunctionalTests/CorsMiddlewareFunctionalTest.cs b/src/Middleware/CORS/test/FunctionalTests/CorsMiddlewareFunctionalTest.cs index f64dbdad74..305165c922 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/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 ed6947593b..ab456fd218 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 3bbdabfe30..3e909a24ab 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/DotnetRunTests.cs b/src/MusicStore/test/MusicStore.E2ETests/DotnetRunTests.cs index a8456e3f5d..7325917892 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/NtlmAuthentationTest.cs b/src/MusicStore/test/MusicStore.E2ETests/NtlmAuthentationTest.cs index 59d668d09e..d1d82a9717 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 dd47eb8740..d65b0c0d49 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 8c31c9c2f6..66216c0d43 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 8dcd59d612..a109d20340 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 f1db389ec3..93bd014a2c 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 f49072fa6b..aa9a908d66 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/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/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/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.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/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/ProjectTemplates/test/BlazorServerTemplateTest.cs b/src/ProjectTemplates/test/BlazorServerTemplateTest.cs index cd1426c596..61c3eb20b8 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 99b4da9d8d..3acd6e804c 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 c1980954f7..69076fc55b 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/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 5fc93e69e7..bbd47f3e19 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/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 fbe47f4df7..bbef662784 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 3ce31f90f6..e02a459695 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 6f2ba0d609..e437782eef 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 c56ea32047..f0000fb681 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..2754e591ce 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 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 11467d4424..25a752fa80 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 26f3ec6812..690dfb328d 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 060e63370f..30e0fb2e27 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 09cc1099e7..a454403f64 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 ec89251779..60920bc036 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 e3d04768ef..271bb18033 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/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/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..6d294edd00 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; 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 03f7bb9f43..7ddb4deb26 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 6e20f3e71a..d3fa68a1bd 100644 --- a/src/Servers/Kestrel/test/FunctionalTests/ResponseTests.cs +++ b/src/Servers/Kestrel/test/FunctionalTests/ResponseTests.cs @@ -22,7 +22,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 91faea0786..f52e83eb62 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..70ee2b30ad 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; @@ -613,8 +612,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests /// /// 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. /// 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 54341cce66..99a72dcba9 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 2c0d6e15de..297794e50b 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 6245667432..c64218a6b2 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 298d739f67..94748bcd9d 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/SignalR/clients/csharp/Client/test/FunctionalTests/HubConnectionTests.cs b/src/SignalR/clients/csharp/Client/test/FunctionalTests/HubConnectionTests.cs index 5c135f381a..14e9d78e5b 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/common/Http.Connections/test/HttpConnectionDispatcherTests.cs b/src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs index 90fee0efac..7b164b8929 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/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/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/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/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/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/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 From b79e9aac3656d7347c2d4b6cd55efce19dd7aaf0 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Thu, 15 Aug 2019 16:57:50 -0700 Subject: [PATCH 13/94] refs --- ...crosoft.AspNetCore.Components.Authorization.netcoreapp3.0.cs | 2 +- ...rosoft.AspNetCore.Components.Authorization.netstandard2.0.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Components/Authorization/ref/Microsoft.AspNetCore.Components.Authorization.netcoreapp3.0.cs b/src/Components/Authorization/ref/Microsoft.AspNetCore.Components.Authorization.netcoreapp3.0.cs index a19e7c1ba3..ca0535937a 100644 --- a/src/Components/Authorization/ref/Microsoft.AspNetCore.Components.Authorization.netcoreapp3.0.cs +++ b/src/Components/Authorization/ref/Microsoft.AspNetCore.Components.Authorization.netcoreapp3.0.cs @@ -57,7 +57,7 @@ namespace Microsoft.AspNetCore.Components.Authorization public CascadingAuthenticationState() { } [Microsoft.AspNetCore.Components.ParameterAttribute] public Microsoft.AspNetCore.Components.RenderFragment ChildContent { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder) { } + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder) { } protected override void OnInitialized() { } void System.IDisposable.Dispose() { } } diff --git a/src/Components/Authorization/ref/Microsoft.AspNetCore.Components.Authorization.netstandard2.0.cs b/src/Components/Authorization/ref/Microsoft.AspNetCore.Components.Authorization.netstandard2.0.cs index a19e7c1ba3..ca0535937a 100644 --- a/src/Components/Authorization/ref/Microsoft.AspNetCore.Components.Authorization.netstandard2.0.cs +++ b/src/Components/Authorization/ref/Microsoft.AspNetCore.Components.Authorization.netstandard2.0.cs @@ -57,7 +57,7 @@ namespace Microsoft.AspNetCore.Components.Authorization public CascadingAuthenticationState() { } [Microsoft.AspNetCore.Components.ParameterAttribute] public Microsoft.AspNetCore.Components.RenderFragment ChildContent { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder) { } + protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder) { } protected override void OnInitialized() { } void System.IDisposable.Dispose() { } } From 3e08d453fe93e74de6e498b75c0f506b44d014f8 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Thu, 15 Aug 2019 17:05:17 -0700 Subject: [PATCH 14/94] fix xunit namespace --- .../test/E2ETest/ServerExecutionTests/InteropReliabilityTests.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Components/test/E2ETest/ServerExecutionTests/InteropReliabilityTests.cs b/src/Components/test/E2ETest/ServerExecutionTests/InteropReliabilityTests.cs index 0e9b6568ef..868a13be33 100644 --- a/src/Components/test/E2ETest/ServerExecutionTests/InteropReliabilityTests.cs +++ b/src/Components/test/E2ETest/ServerExecutionTests/InteropReliabilityTests.cs @@ -13,7 +13,6 @@ using Microsoft.AspNetCore.Components.Rendering; 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; From 9d11d6f2f5fb6883fbc661d6a6a759dccdfff9d8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 16 Aug 2019 02:00:56 +0000 Subject: [PATCH 15/94] 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 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cc082c71ca..2e0feba64d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,21 +13,21 @@ https://github.com/aspnet/Blazor 498a843f7854f9a2a5820e55cd2c7d7654429682 - + https://github.com/aspnet/AspNetCore-Tooling - 970cd5ce8b70956e013b1a67f0df37dda0ddbb1d + b82d4f958386828a4664fcce73acfcf2e1e5a066 - + https://github.com/aspnet/AspNetCore-Tooling - 970cd5ce8b70956e013b1a67f0df37dda0ddbb1d + b82d4f958386828a4664fcce73acfcf2e1e5a066 - + https://github.com/aspnet/AspNetCore-Tooling - 970cd5ce8b70956e013b1a67f0df37dda0ddbb1d + b82d4f958386828a4664fcce73acfcf2e1e5a066 - + https://github.com/aspnet/AspNetCore-Tooling - 970cd5ce8b70956e013b1a67f0df37dda0ddbb1d + b82d4f958386828a4664fcce73acfcf2e1e5a066 https://github.com/aspnet/EntityFrameworkCore diff --git a/eng/Versions.props b/eng/Versions.props index 63d91d1a2c..af9a1e7ce4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -157,10 +157,10 @@ 3.0.0-preview9.19415.5 3.0.0-preview9.19415.5 - 3.0.0-preview9.19415.5 - 3.0.0-preview9.19415.5 - 3.0.0-preview9.19415.5 - 3.0.0-preview9.19415.5 + 3.0.0-preview9.19415.10 + 3.0.0-preview9.19415.10 + 3.0.0-preview9.19415.10 + 3.0.0-preview9.19415.10 - 3.0.0-preview9.19415.5 - 3.0.0-preview9.19415.5 - 3.0.0-preview9.19415.5 - 3.0.0-preview9.19415.5 - 3.0.0-preview9.19415.5 - 3.0.0-preview9.19415.5 - 3.0.0-preview9.19415.5 + 3.0.0-preview9.19415.12 + 3.0.0-preview9.19415.12 + 3.0.0-preview9.19415.12 + 3.0.0-preview9.19415.12 + 3.0.0-preview9.19415.12 + 3.0.0-preview9.19415.12 + 3.0.0-preview9.19415.12 3.0.0-preview9.19415.10 3.0.0-preview9.19415.10 From 7f054152db50635e1c14b9d9d34088e369a64422 Mon Sep 17 00:00:00 2001 From: Ryan Nowak Date: Wed, 14 Aug 2019 16:01:08 -0700 Subject: [PATCH 17/94] 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. --- ...rosoft.AspNetCore.Blazor.netstandard2.0.cs | 2 +- .../Rendering/WebAssemblyEventDispatcher.cs | 1 + .../src/Rendering/WebAssemblyRenderer.cs | 2 +- ...oft.AspNetCore.Components.netcoreapp3.0.cs | 66 +++++++++---------- ...ft.AspNetCore.Components.netstandard2.0.cs | 66 +++++++++---------- src/Components/Components/src/Dispatcher.cs | 1 + 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 ++-- .../src/Circuits/ArrayBuilderMemoryStream.cs | 2 +- .../Server/src/Circuits/CircuitHost.cs | 1 - .../src/Circuits/DefaultCircuitFactory.cs | 2 - .../Server/src/Circuits/RemoteRenderer.cs | 9 +-- .../Server/src/Circuits/RenderBatchWriter.cs | 3 +- src/Components/Shared/src/ArrayBuilder.cs | 2 +- src/Components/Shared/src/WebEventData.cs | 2 +- ...AspNetCore.Components.Web.netcoreapp3.0.cs | 22 +++---- ...spNetCore.Components.Web.netstandard2.0.cs | 22 +++---- src/Components/Web/src/WebEventDescriptor.cs | 7 +- .../ComponentHubReliabilityTest.cs | 1 + .../InteropReliabilityTests.cs | 1 + .../Ignitor.Test/RenderBatchReaderTest.cs | 2 +- .../test/testassets/Ignitor/ElementNode.cs | 1 + 25 files changed, 128 insertions(+), 123 deletions(-) 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%) 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/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/Components/ref/Microsoft.AspNetCore.Components.netcoreapp3.0.cs b/src/Components/Components/ref/Microsoft.AspNetCore.Components.netcoreapp3.0.cs index e8054887c5..c21b1b151b 100644 --- a/src/Components/Components/ref/Microsoft.AspNetCore.Components.netcoreapp3.0.cs +++ b/src/Components/Components/ref/Microsoft.AspNetCore.Components.netcoreapp3.0.cs @@ -360,39 +360,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 DisposedComponentIDs { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public Microsoft.AspNetCore.Components.RenderTree.ArrayRange DisposedEventHandlerIDs { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public Microsoft.AspNetCore.Components.RenderTree.ArrayRange ReferenceFrames { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public Microsoft.AspNetCore.Components.RenderTree.ArrayRange 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 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 +415,39 @@ namespace Microsoft.AspNetCore.Components.RenderTree public ArrayRange(T[] array, int count) { throw null; } public Microsoft.AspNetCore.Components.RenderTree.ArrayRange 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 DisposedComponentIDs { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Components.RenderTree.ArrayRange DisposedEventHandlerIDs { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Components.RenderTree.ArrayRange ReferenceFrames { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Components.RenderTree.ArrayRange 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 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 { 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..c21b1b151b 100644 --- a/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.cs +++ b/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.cs @@ -360,39 +360,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 DisposedComponentIDs { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public Microsoft.AspNetCore.Components.RenderTree.ArrayRange DisposedEventHandlerIDs { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public Microsoft.AspNetCore.Components.RenderTree.ArrayRange ReferenceFrames { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public Microsoft.AspNetCore.Components.RenderTree.ArrayRange 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 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 +415,39 @@ namespace Microsoft.AspNetCore.Components.RenderTree public ArrayRange(T[] array, int count) { throw null; } public Microsoft.AspNetCore.Components.RenderTree.ArrayRange 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 DisposedComponentIDs { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Components.RenderTree.ArrayRange DisposedEventHandlerIDs { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Components.RenderTree.ArrayRange ReferenceFrames { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Components.RenderTree.ArrayRange 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 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 { 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/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 { /// - /// 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. /// + // + // 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 { /// 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 { /// - /// 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. /// + // + // Describes a set of UI changes. public readonly struct RenderBatch { /// 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 { /// - /// Provides mechanisms for rendering hierarchies of 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. /// + // + // Provides mechanisms for rendering hierarchies of 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/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 { /// /// Writeable memory stream backed by a an . diff --git a/src/Components/Server/src/Circuits/CircuitHost.cs b/src/Components/Server/src/Circuits/CircuitHost.cs index 0f0cbceafb..a2c9ac869b 100644 --- a/src/Components/Server/src/Circuits/CircuitHost.cs +++ b/src/Components/Server/src/Circuits/CircuitHost.cs @@ -8,7 +8,6 @@ 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; diff --git a/src/Components/Server/src/Circuits/DefaultCircuitFactory.cs b/src/Components/Server/src/Circuits/DefaultCircuitFactory.cs index cbeb6d2c7e..59ac520ea1 100644 --- a/src/Components/Server/src/Circuits/DefaultCircuitFactory.cs +++ b/src/Components/Server/src/Circuits/DefaultCircuitFactory.cs @@ -5,9 +5,7 @@ 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; diff --git a/src/Components/Server/src/Circuits/RemoteRenderer.cs b/src/Components/Server/src/Circuits/RemoteRenderer.cs index a53ee90de3..bd514924a2 100644 --- a/src/Components/Server/src/Circuits/RemoteRenderer.cs +++ b/src/Components/Server/src/Circuits/RemoteRenderer.cs @@ -6,17 +6,14 @@ 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)); @@ -132,7 +129,7 @@ namespace Microsoft.AspNetCore.Components.Web.Rendering } /// - 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/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/WebEventData.cs b/src/Components/Shared/src/WebEventData.cs index 07aafbddf2..fc1416b2dc 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 { diff --git a/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.netcoreapp3.0.cs b/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.netcoreapp3.0.cs index f6a30257c2..339793e708 100644 --- a/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.netcoreapp3.0.cs +++ b/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.netcoreapp3.0.cs @@ -395,6 +395,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 @@ -420,14 +431,3 @@ namespace Microsoft.AspNetCore.Components.Routing All = 1, } } -namespace Microsoft.AspNetCore.Components.Web -{ - 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.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 { } } - } -} 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..339793e708 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 @@ -395,6 +395,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 @@ -420,14 +431,3 @@ namespace Microsoft.AspNetCore.Components.Routing All = 1, } } -namespace Microsoft.AspNetCore.Components.Web -{ - 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.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 { } } - } -} 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 { /// - /// 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. /// public sealed class WebEventDescriptor { diff --git a/src/Components/test/E2ETest/ServerExecutionTests/ComponentHubReliabilityTest.cs b/src/Components/test/E2ETest/ServerExecutionTests/ComponentHubReliabilityTest.cs index afb29e3a05..4721ca053f 100644 --- a/src/Components/test/E2ETest/ServerExecutionTests/ComponentHubReliabilityTest.cs +++ b/src/Components/test/E2ETest/ServerExecutionTests/ComponentHubReliabilityTest.cs @@ -18,6 +18,7 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Testing; using Xunit; using Xunit.Abstractions; +using Microsoft.AspNetCore.Components.RenderTree; namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests { diff --git a/src/Components/test/E2ETest/ServerExecutionTests/InteropReliabilityTests.cs b/src/Components/test/E2ETest/ServerExecutionTests/InteropReliabilityTests.cs index 0e9b6568ef..7d7dd7d509 100644 --- a/src/Components/test/E2ETest/ServerExecutionTests/InteropReliabilityTests.cs +++ b/src/Components/test/E2ETest/ServerExecutionTests/InteropReliabilityTests.cs @@ -10,6 +10,7 @@ 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; 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/Ignitor/ElementNode.cs b/src/Components/test/testassets/Ignitor/ElementNode.cs index 527f4b30c5..e98051fa15 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; From 029e455e7b38e06a69858e7d4254ae7ad91a8c6d Mon Sep 17 00:00:00 2001 From: Pranav K Date: Thu, 15 Aug 2019 23:00:46 -0700 Subject: [PATCH 18/94] Remove ref:suppressField --- .../testassets/BasicTestApp/AfterRenderInteropComponent.razor | 2 +- .../test/testassets/BasicTestApp/ComponentRefComponent.razor | 2 +- .../test/testassets/BasicTestApp/ElementRefComponent.razor | 2 +- .../BasicTestApp/InteropOnInitializationComponent.razor | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Components/test/testassets/BasicTestApp/AfterRenderInteropComponent.razor b/src/Components/test/testassets/BasicTestApp/AfterRenderInteropComponent.razor index 41bcfe275d..7092993113 100644 --- a/src/Components/test/testassets/BasicTestApp/AfterRenderInteropComponent.razor +++ b/src/Components/test/testassets/BasicTestApp/AfterRenderInteropComponent.razor @@ -1,7 +1,7 @@ @using Microsoft.JSInterop @inject IJSRuntime JSRuntime - + @code { ElementReference myInput; diff --git a/src/Components/test/testassets/BasicTestApp/ComponentRefComponent.razor b/src/Components/test/testassets/BasicTestApp/ComponentRefComponent.razor index 3670852e48..1768d2b7cc 100644 --- a/src/Components/test/testassets/BasicTestApp/ComponentRefComponent.razor +++ b/src/Components/test/testassets/BasicTestApp/ComponentRefComponent.razor @@ -11,7 +11,7 @@ @if (_toggleCapturedComponentPresence) {
- +
} diff --git a/src/Components/test/testassets/BasicTestApp/ElementRefComponent.razor b/src/Components/test/testassets/BasicTestApp/ElementRefComponent.razor index 06ece3a788..36a003b48f 100644 --- a/src/Components/test/testassets/BasicTestApp/ElementRefComponent.razor +++ b/src/Components/test/testassets/BasicTestApp/ElementRefComponent.razor @@ -17,7 +17,7 @@ @if (_toggleCapturedElementPresence) { - + } - 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. @@ -101,7 +95,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); @@ -341,9 +334,8 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits { await Renderer.Dispatcher.InvokeAsync(() => { - SetCurrentJSRuntime(); Log.BeginInvokeDotNet(_logger, callId, assemblyName, methodIdentifier, dotNetObjectId); - DotNetDispatcher.BeginInvokeDotNet(callId, assemblyName, methodIdentifier, dotNetObjectId, argsJson); + DotNetDispatcher.BeginInvokeDotNet(JSRuntime, callId, assemblyName, methodIdentifier, dotNetObjectId, argsJson); }); } catch (Exception ex) @@ -367,7 +359,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. @@ -378,7 +369,7 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits Log.EndInvokeJSSucceeded(_logger, asyncCall); } - DotNetDispatcher.EndInvokeJS(arguments); + DotNetDispatcher.EndInvokeJS(JSRuntime, arguments); }); } catch (Exception ex) @@ -416,7 +407,6 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits { await Renderer.Dispatcher.InvokeAsync(() => { - SetCurrentJSRuntime(); return Renderer.DispatchEventAsync( webEventData.EventHandlerId, webEventData.EventFieldInfo, @@ -444,7 +434,6 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits { await Renderer.Dispatcher.InvokeAsync(() => { - SetCurrentJSRuntime(); Log.LocationChange(_logger, uri, CircuitId); var navigationManager = (RemoteNavigationManager)Services.GetRequiredService(); navigationManager.NotifyLocationChanged(uri, intercepted); diff --git a/src/Components/Server/src/Circuits/RemoteJSRuntime.cs b/src/Components/Server/src/Circuits/RemoteJSRuntime.cs index 9d88588e45..54abb9f7a9 100644 --- a/src/Components/Server/src/Circuits/RemoteJSRuntime.cs +++ b/src/Components/Server/src/Circuits/RemoteJSRuntime.cs @@ -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) @@ -58,7 +59,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) diff --git a/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj b/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj index 84a0695bdf..5c515b82df 100644 --- a/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj +++ b/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj @@ -41,6 +41,7 @@ + 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(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(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(() => JsonSerializer.Deserialize(json, JsonSerializerOptionsProvider.Options)); + var ex = Assert.Throws(() => + { + 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(() => JsonSerializer.Deserialize(json, JsonSerializerOptionsProvider.Options)); + var ex = Assert.Throws(() => + { + 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/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 + { + 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/Web.JS/dist/Release/blazor.server.js b/src/Components/Web.JS/dist/Release/blazor.server.js index 31a3a61398..d9ebc8dba1 100644 --- a/src/Components/Web.JS/dist/Release/blazor.server.js +++ b/src/Components/Web.JS/dist/Release/blazor.server.js @@ -5,7 +5,7 @@ * @author Feross Aboukhadijeh * @license MIT */ -var r=n(50),o=n(51),i=n(52);function a(){return c.TYPED_ARRAY_SUPPORT?2147483647:1073741823}function s(e,t){if(a()=a())throw new RangeError("Attempt to allocate Buffer larger than maximum size: 0x"+a().toString(16)+" bytes");return 0|e}function d(e,t){if(c.isBuffer(e))return e.length;if("undefined"!=typeof ArrayBuffer&&"function"==typeof ArrayBuffer.isView&&(ArrayBuffer.isView(e)||e instanceof ArrayBuffer))return e.byteLength;"string"!=typeof e&&(e=""+e);var n=e.length;if(0===n)return 0;for(var r=!1;;)switch(t){case"ascii":case"latin1":case"binary":return n;case"utf8":case"utf-8":case void 0:return F(e).length;case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return 2*n;case"hex":return n>>>1;case"base64":return H(e).length;default:if(r)return F(e).length;t=(""+t).toLowerCase(),r=!0}}function g(e,t,n){var r=e[t];e[t]=e[n],e[n]=r}function y(e,t,n,r,o){if(0===e.length)return-1;if("string"==typeof n?(r=n,n=0):n>2147483647?n=2147483647:n<-2147483648&&(n=-2147483648),n=+n,isNaN(n)&&(n=o?0:e.length-1),n<0&&(n=e.length+n),n>=e.length){if(o)return-1;n=e.length-1}else if(n<0){if(!o)return-1;n=0}if("string"==typeof t&&(t=c.from(t,r)),c.isBuffer(t))return 0===t.length?-1:v(e,t,n,r,o);if("number"==typeof t)return t&=255,c.TYPED_ARRAY_SUPPORT&&"function"==typeof Uint8Array.prototype.indexOf?o?Uint8Array.prototype.indexOf.call(e,t,n):Uint8Array.prototype.lastIndexOf.call(e,t,n):v(e,[t],n,r,o);throw new TypeError("val must be string, number or Buffer")}function v(e,t,n,r,o){var i,a=1,s=e.length,c=t.length;if(void 0!==r&&("ucs2"===(r=String(r).toLowerCase())||"ucs-2"===r||"utf16le"===r||"utf-16le"===r)){if(e.length<2||t.length<2)return-1;a=2,s/=2,c/=2,n/=2}function u(e,t){return 1===a?e[t]:e.readUInt16BE(t*a)}if(o){var l=-1;for(i=n;is&&(n=s-c),i=n;i>=0;i--){for(var f=!0,h=0;ho&&(r=o):r=o;var i=t.length;if(i%2!=0)throw new TypeError("Invalid hex string");r>i/2&&(r=i/2);for(var a=0;a>8,o=n%256,i.push(o),i.push(r);return i}(t,e.length-n),e,n,r)}function _(e,t,n){return 0===t&&n===e.length?r.fromByteArray(e):r.fromByteArray(e.slice(t,n))}function T(e,t,n){n=Math.min(e.length,n);for(var r=[],o=t;o239?4:u>223?3:u>191?2:1;if(o+f<=n)switch(f){case 1:u<128&&(l=u);break;case 2:128==(192&(i=e[o+1]))&&(c=(31&u)<<6|63&i)>127&&(l=c);break;case 3:i=e[o+1],a=e[o+2],128==(192&i)&&128==(192&a)&&(c=(15&u)<<12|(63&i)<<6|63&a)>2047&&(c<55296||c>57343)&&(l=c);break;case 4:i=e[o+1],a=e[o+2],s=e[o+3],128==(192&i)&&128==(192&a)&&128==(192&s)&&(c=(15&u)<<18|(63&i)<<12|(63&a)<<6|63&s)>65535&&c<1114112&&(l=c)}null===l?(l=65533,f=1):l>65535&&(l-=65536,r.push(l>>>10&1023|55296),l=56320|1023&l),r.push(l),o+=f}return function(e){var t=e.length;if(t<=I)return String.fromCharCode.apply(String,e);var n="",r=0;for(;rthis.length)return"";if((void 0===n||n>this.length)&&(n=this.length),n<=0)return"";if((n>>>=0)<=(t>>>=0))return"";for(e||(e="utf8");;)switch(e){case"hex":return x(this,t,n);case"utf8":case"utf-8":return T(this,t,n);case"ascii":return k(this,t,n);case"latin1":case"binary":return P(this,t,n);case"base64":return _(this,t,n);case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return R(this,t,n);default:if(r)throw new TypeError("Unknown encoding: "+e);e=(e+"").toLowerCase(),r=!0}}.apply(this,arguments)},c.prototype.equals=function(e){if(!c.isBuffer(e))throw new TypeError("Argument must be a Buffer");return this===e||0===c.compare(this,e)},c.prototype.inspect=function(){var e="",n=t.INSPECT_MAX_BYTES;return this.length>0&&(e=this.toString("hex",0,n).match(/.{2}/g).join(" "),this.length>n&&(e+=" ... ")),""},c.prototype.compare=function(e,t,n,r,o){if(!c.isBuffer(e))throw new TypeError("Argument must be a Buffer");if(void 0===t&&(t=0),void 0===n&&(n=e?e.length:0),void 0===r&&(r=0),void 0===o&&(o=this.length),t<0||n>e.length||r<0||o>this.length)throw new RangeError("out of range index");if(r>=o&&t>=n)return 0;if(r>=o)return-1;if(t>=n)return 1;if(this===e)return 0;for(var i=(o>>>=0)-(r>>>=0),a=(n>>>=0)-(t>>>=0),s=Math.min(i,a),u=this.slice(r,o),l=e.slice(t,n),f=0;fo)&&(n=o),e.length>0&&(n<0||t<0)||t>this.length)throw new RangeError("Attempt to write outside buffer bounds");r||(r="utf8");for(var i=!1;;)switch(r){case"hex":return b(this,e,t,n);case"utf8":case"utf-8":return m(this,e,t,n);case"ascii":return w(this,e,t,n);case"latin1":case"binary":return E(this,e,t,n);case"base64":return S(this,e,t,n);case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return C(this,e,t,n);default:if(i)throw new TypeError("Unknown encoding: "+r);r=(""+r).toLowerCase(),i=!0}},c.prototype.toJSON=function(){return{type:"Buffer",data:Array.prototype.slice.call(this._arr||this,0)}};var I=4096;function k(e,t,n){var r="";n=Math.min(e.length,n);for(var o=t;or)&&(n=r);for(var o="",i=t;in)throw new RangeError("Trying to access beyond buffer length")}function O(e,t,n,r,o,i){if(!c.isBuffer(e))throw new TypeError('"buffer" argument must be a Buffer instance');if(t>o||te.length)throw new RangeError("Index out of range")}function L(e,t,n,r){t<0&&(t=65535+t+1);for(var o=0,i=Math.min(e.length-n,2);o>>8*(r?o:1-o)}function M(e,t,n,r){t<0&&(t=4294967295+t+1);for(var o=0,i=Math.min(e.length-n,4);o>>8*(r?o:3-o)&255}function A(e,t,n,r,o,i){if(n+r>e.length)throw new RangeError("Index out of range");if(n<0)throw new RangeError("Index out of range")}function B(e,t,n,r,i){return i||A(e,0,n,4),o.write(e,t,n,r,23,4),n+4}function j(e,t,n,r,i){return i||A(e,0,n,8),o.write(e,t,n,r,52,8),n+8}c.prototype.slice=function(e,t){var n,r=this.length;if((e=~~e)<0?(e+=r)<0&&(e=0):e>r&&(e=r),(t=void 0===t?r:~~t)<0?(t+=r)<0&&(t=0):t>r&&(t=r),t0&&(o*=256);)r+=this[e+--t]*o;return r},c.prototype.readUInt8=function(e,t){return t||D(e,1,this.length),this[e]},c.prototype.readUInt16LE=function(e,t){return t||D(e,2,this.length),this[e]|this[e+1]<<8},c.prototype.readUInt16BE=function(e,t){return t||D(e,2,this.length),this[e]<<8|this[e+1]},c.prototype.readUInt32LE=function(e,t){return t||D(e,4,this.length),(this[e]|this[e+1]<<8|this[e+2]<<16)+16777216*this[e+3]},c.prototype.readUInt32BE=function(e,t){return t||D(e,4,this.length),16777216*this[e]+(this[e+1]<<16|this[e+2]<<8|this[e+3])},c.prototype.readIntLE=function(e,t,n){e|=0,t|=0,n||D(e,t,this.length);for(var r=this[e],o=1,i=0;++i=(o*=128)&&(r-=Math.pow(2,8*t)),r},c.prototype.readIntBE=function(e,t,n){e|=0,t|=0,n||D(e,t,this.length);for(var r=t,o=1,i=this[e+--r];r>0&&(o*=256);)i+=this[e+--r]*o;return i>=(o*=128)&&(i-=Math.pow(2,8*t)),i},c.prototype.readInt8=function(e,t){return t||D(e,1,this.length),128&this[e]?-1*(255-this[e]+1):this[e]},c.prototype.readInt16LE=function(e,t){t||D(e,2,this.length);var n=this[e]|this[e+1]<<8;return 32768&n?4294901760|n:n},c.prototype.readInt16BE=function(e,t){t||D(e,2,this.length);var n=this[e+1]|this[e]<<8;return 32768&n?4294901760|n:n},c.prototype.readInt32LE=function(e,t){return t||D(e,4,this.length),this[e]|this[e+1]<<8|this[e+2]<<16|this[e+3]<<24},c.prototype.readInt32BE=function(e,t){return t||D(e,4,this.length),this[e]<<24|this[e+1]<<16|this[e+2]<<8|this[e+3]},c.prototype.readFloatLE=function(e,t){return t||D(e,4,this.length),o.read(this,e,!0,23,4)},c.prototype.readFloatBE=function(e,t){return t||D(e,4,this.length),o.read(this,e,!1,23,4)},c.prototype.readDoubleLE=function(e,t){return t||D(e,8,this.length),o.read(this,e,!0,52,8)},c.prototype.readDoubleBE=function(e,t){return t||D(e,8,this.length),o.read(this,e,!1,52,8)},c.prototype.writeUIntLE=function(e,t,n,r){(e=+e,t|=0,n|=0,r)||O(this,e,t,n,Math.pow(2,8*n)-1,0);var o=1,i=0;for(this[t]=255&e;++i=0&&(i*=256);)this[t+o]=e/i&255;return t+n},c.prototype.writeUInt8=function(e,t,n){return e=+e,t|=0,n||O(this,e,t,1,255,0),c.TYPED_ARRAY_SUPPORT||(e=Math.floor(e)),this[t]=255&e,t+1},c.prototype.writeUInt16LE=function(e,t,n){return e=+e,t|=0,n||O(this,e,t,2,65535,0),c.TYPED_ARRAY_SUPPORT?(this[t]=255&e,this[t+1]=e>>>8):L(this,e,t,!0),t+2},c.prototype.writeUInt16BE=function(e,t,n){return e=+e,t|=0,n||O(this,e,t,2,65535,0),c.TYPED_ARRAY_SUPPORT?(this[t]=e>>>8,this[t+1]=255&e):L(this,e,t,!1),t+2},c.prototype.writeUInt32LE=function(e,t,n){return e=+e,t|=0,n||O(this,e,t,4,4294967295,0),c.TYPED_ARRAY_SUPPORT?(this[t+3]=e>>>24,this[t+2]=e>>>16,this[t+1]=e>>>8,this[t]=255&e):M(this,e,t,!0),t+4},c.prototype.writeUInt32BE=function(e,t,n){return e=+e,t|=0,n||O(this,e,t,4,4294967295,0),c.TYPED_ARRAY_SUPPORT?(this[t]=e>>>24,this[t+1]=e>>>16,this[t+2]=e>>>8,this[t+3]=255&e):M(this,e,t,!1),t+4},c.prototype.writeIntLE=function(e,t,n,r){if(e=+e,t|=0,!r){var o=Math.pow(2,8*n-1);O(this,e,t,n,o-1,-o)}var i=0,a=1,s=0;for(this[t]=255&e;++i>0)-s&255;return t+n},c.prototype.writeIntBE=function(e,t,n,r){if(e=+e,t|=0,!r){var o=Math.pow(2,8*n-1);O(this,e,t,n,o-1,-o)}var i=n-1,a=1,s=0;for(this[t+i]=255&e;--i>=0&&(a*=256);)e<0&&0===s&&0!==this[t+i+1]&&(s=1),this[t+i]=(e/a>>0)-s&255;return t+n},c.prototype.writeInt8=function(e,t,n){return e=+e,t|=0,n||O(this,e,t,1,127,-128),c.TYPED_ARRAY_SUPPORT||(e=Math.floor(e)),e<0&&(e=255+e+1),this[t]=255&e,t+1},c.prototype.writeInt16LE=function(e,t,n){return e=+e,t|=0,n||O(this,e,t,2,32767,-32768),c.TYPED_ARRAY_SUPPORT?(this[t]=255&e,this[t+1]=e>>>8):L(this,e,t,!0),t+2},c.prototype.writeInt16BE=function(e,t,n){return e=+e,t|=0,n||O(this,e,t,2,32767,-32768),c.TYPED_ARRAY_SUPPORT?(this[t]=e>>>8,this[t+1]=255&e):L(this,e,t,!1),t+2},c.prototype.writeInt32LE=function(e,t,n){return e=+e,t|=0,n||O(this,e,t,4,2147483647,-2147483648),c.TYPED_ARRAY_SUPPORT?(this[t]=255&e,this[t+1]=e>>>8,this[t+2]=e>>>16,this[t+3]=e>>>24):M(this,e,t,!0),t+4},c.prototype.writeInt32BE=function(e,t,n){return e=+e,t|=0,n||O(this,e,t,4,2147483647,-2147483648),e<0&&(e=4294967295+e+1),c.TYPED_ARRAY_SUPPORT?(this[t]=e>>>24,this[t+1]=e>>>16,this[t+2]=e>>>8,this[t+3]=255&e):M(this,e,t,!1),t+4},c.prototype.writeFloatLE=function(e,t,n){return B(this,e,t,!0,n)},c.prototype.writeFloatBE=function(e,t,n){return B(this,e,t,!1,n)},c.prototype.writeDoubleLE=function(e,t,n){return j(this,e,t,!0,n)},c.prototype.writeDoubleBE=function(e,t,n){return j(this,e,t,!1,n)},c.prototype.copy=function(e,t,n,r){if(n||(n=0),r||0===r||(r=this.length),t>=e.length&&(t=e.length),t||(t=0),r>0&&r=this.length)throw new RangeError("sourceStart out of bounds");if(r<0)throw new RangeError("sourceEnd out of bounds");r>this.length&&(r=this.length),e.length-t=0;--o)e[o+t]=this[o+n];else if(i<1e3||!c.TYPED_ARRAY_SUPPORT)for(o=0;o>>=0,n=void 0===n?this.length:n>>>0,e||(e=0),"number"==typeof e)for(i=t;i55295&&n<57344){if(!o){if(n>56319){(t-=3)>-1&&i.push(239,191,189);continue}if(a+1===r){(t-=3)>-1&&i.push(239,191,189);continue}o=n;continue}if(n<56320){(t-=3)>-1&&i.push(239,191,189),o=n;continue}n=65536+(o-55296<<10|n-56320)}else o&&(t-=3)>-1&&i.push(239,191,189);if(o=null,n<128){if((t-=1)<0)break;i.push(n)}else if(n<2048){if((t-=2)<0)break;i.push(n>>6|192,63&n|128)}else if(n<65536){if((t-=3)<0)break;i.push(n>>12|224,n>>6&63|128,63&n|128)}else{if(!(n<1114112))throw new Error("Invalid code point");if((t-=4)<0)break;i.push(n>>18|240,n>>12&63|128,n>>6&63|128,63&n|128)}}return i}function H(e){return r.toByteArray(function(e){if((e=function(e){return e.trim?e.trim():e.replace(/^\s+|\s+$/g,"")}(e).replace(U,"")).length<2)return"";for(;e.length%4!=0;)e+="=";return e}(e))}function q(e,t,n,r){for(var o=0;o=t.length||o>=e.length);++o)t[o+n]=e[o];return o}}).call(this,n(10))},function(e,t,n){"use strict";n.d(t,"a",function(){return r});var r=function(){function e(){}return e.prototype.log=function(e,t){},e.instance=new e,e}()},function(e,t,n){"use strict";n.d(t,"a",function(){return r});var r=function(){function e(){}return e.write=function(t){return""+t+e.RecordSeparator},e.parse=function(t){if(t[t.length-1]!==e.RecordSeparator)throw new Error("Message is incomplete.");var n=t.split(e.RecordSeparator);return n.pop(),n},e.RecordSeparatorCode=30,e.RecordSeparator=String.fromCharCode(e.RecordSeparatorCode),e}()},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),n(25),n(9);var r=n(26),o=n(17),i={},a=!1;function s(e,t,n){var o=i[e];o||(o=i[e]=new r.BrowserRenderer(e)),o.attachRootComponentToLogicalElement(n,t)}t.attachRootComponentToLogicalElement=s,t.attachRootComponentToElement=function(e,t,n){var r=document.querySelector(e);if(!r)throw new Error("Could not find any element matching selector '"+e+"'.");s(n||0,o.toLogicalElement(r,!0),t)},t.renderBatch=function(e,t){var n=i[e];if(!n)throw new Error("There is no browser renderer with ID "+e+".");for(var r=t.arrayRangeReader,o=t.updatedComponents(),s=r.values(o),c=r.count(o),u=t.referenceFrames(),l=r.values(u),f=t.diffReader,h=0;h=0,"must have a non-negative type"),o(a,"must have a decode function"),this.registerEncoder(function(e){return e instanceof t},function(t){var o=i(),a=r.allocUnsafe(1);return a.writeInt8(e,0),o.append(a),o.append(n(t)),o}),this.registerDecoder(e,a),this},registerEncoder:function(e,n){return o(e,"must have an encode function"),o(n,"must have an encode function"),t.push({check:e,encode:n}),this},registerDecoder:function(e,t){return o(e>=0,"must have a non-negative type"),o(t,"must have a decode function"),n.push({type:e,decode:t}),this},encoder:a.encoder,decoder:a.decoder,buffer:!0,type:"msgpack5",IncompleteBufferError:s.IncompleteBufferError}}},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){"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){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),function(e){e[e.Trace=0]="Trace",e[e.Debug=1]="Debug",e[e.Information=2]="Information",e[e.Warning=3]="Warning",e[e.Error=4]="Error",e[e.Critical=5]="Critical",e[e.None=6]="None"}(t.LogLevel||(t.LogLevel={}))},function(e,t,n){"use strict";var r;!function(e){window.DotNet=e;var t=[],n={},r={},o=1,i=null;function a(e){t.push(e)}function s(e,t){for(var n=[],r=2;r0&&!t)throw new Error("New logical elements must start empty, or allowExistingContents must be true");return e[r]=[],e}function s(e,t,n){var i=e;if(e instanceof Comment&&(u(i)&&u(i).length>0))throw new Error("Not implemented: inserting non-empty logical container");if(c(i))throw new Error("Not implemented: moving existing logical children");var a=u(t);if(n0;)e(r,0);var i=r;i.parentNode.removeChild(i)},t.getLogicalParent=c,t.getLogicalSiblingEnd=function(e){return e[i]||null},t.getLogicalChild=function(e,t){return u(e)[t]},t.isSvgElement=function(e){return"http://www.w3.org/2000/svg"===l(e).namespaceURI},t.getLogicalChildrenArray=u,t.permuteLogicalChildren=function(e,t){var n=u(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=c(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):h(r,e)}),t.forEach(function(e){for(var t=e.moveToBeforeMarker,n=t.parentNode,r=e.moveRangeStart,o=e.moveRangeEnd,i=r;i;){var a=i.nextSibling;if(n.insertBefore(i,t),i===o)break;i=a}n.removeChild(t)}),t.forEach(function(e){n[e.toSiblingIndex]=e.moveRangeStart})},t.getClosestDomElement=l},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){var n,r,o=e.exports={};function i(){throw new Error("setTimeout has not been defined")}function a(){throw new Error("clearTimeout has not been defined")}function s(e){if(n===setTimeout)return setTimeout(e,0);if((n===i||!n)&&setTimeout)return n=setTimeout,setTimeout(e,0);try{return n(e,0)}catch(t){try{return n.call(null,e,0)}catch(t){return n.call(this,e,0)}}}!function(){try{n="function"==typeof setTimeout?setTimeout:i}catch(e){n=i}try{r="function"==typeof clearTimeout?clearTimeout:a}catch(e){r=a}}();var c,u=[],l=!1,f=-1;function h(){l&&c&&(l=!1,c.length?u=c.concat(u):f=-1,u.length&&p())}function p(){if(!l){var e=s(h);l=!0;for(var t=u.length;t;){for(c=u,u=[];++f1)for(var n=1;n0&&o[o.length-1])&&(6===i[0]||2===i[0])){a=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]this.length)&&(r=this.length),n>=this.length)return e||i.alloc(0);if(r<=0)return e||i.alloc(0);var o,a,s=!!e,c=this._offset(n),u=r-n,l=u,f=s&&t||0,h=c[1];if(0===n&&r==this.length){if(!s)return 1===this._bufs.length?this._bufs[0]:i.concat(this._bufs,this.length);for(a=0;a(o=this._bufs[a].length-h))){this._bufs[a].copy(e,f,h,h+l);break}this._bufs[a].copy(e,f,h),f+=o,l-=o,h&&(h=0)}return e},a.prototype.shallowSlice=function(e,t){e=e||0,t=t||this.length,e<0&&(e+=this.length),t<0&&(t+=this.length);var n=this._offset(e),r=this._offset(t),o=this._bufs.slice(n[0],r[0]+1);return 0==r[1]?o.pop():o[o.length-1]=o[o.length-1].slice(0,r[1]),0!=n[1]&&(o[0]=o[0].slice(n[1])),new a(o)},a.prototype.toString=function(e,t,n){return this.slice(t,n).toString(e)},a.prototype.consume=function(e){for(;this._bufs.length;){if(!(e>=this._bufs[0].length)){this._bufs[0]=this._bufs[0].slice(e),this.length-=e;break}e-=this._bufs[0].length,this.length-=this._bufs[0].length,this._bufs.shift()}return this},a.prototype.duplicate=function(){for(var e=0,t=new a;e0&&o[o.length-1])&&(6===i[0]||2===i[0])){a=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]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]=i)return e;switch(e){case"%s":return String(r[n++]);case"%d":return Number(r[n++]);case"%j":try{return JSON.stringify(r[n++])}catch(e){return"[Circular]"}default:return e}}),c=r[n];n=3&&(r.depth=arguments[2]),arguments.length>=4&&(r.colors=arguments[3]),d(n)?r.showHidden=n:n&&t._extend(r,n),b(r.showHidden)&&(r.showHidden=!1),b(r.depth)&&(r.depth=2),b(r.colors)&&(r.colors=!1),b(r.customInspect)&&(r.customInspect=!0),r.colors&&(r.stylize=c),l(r,e,r.depth)}function c(e,t){var n=s.styles[t];return n?"["+s.colors[n][0]+"m"+e+"["+s.colors[n][1]+"m":e}function u(e,t){return e}function l(e,n,r){if(e.customInspect&&n&&C(n.inspect)&&n.inspect!==t.inspect&&(!n.constructor||n.constructor.prototype!==n)){var o=n.inspect(r,e);return v(o)||(o=l(e,o,r)),o}var i=function(e,t){if(b(t))return e.stylize("undefined","undefined");if(v(t)){var n="'"+JSON.stringify(t).replace(/^"|"$/g,"").replace(/'/g,"\\'").replace(/\\"/g,'"')+"'";return e.stylize(n,"string")}if(y(t))return e.stylize(""+t,"number");if(d(t))return e.stylize(""+t,"boolean");if(g(t))return e.stylize("null","null")}(e,n);if(i)return i;var a=Object.keys(n),s=function(e){var t={};return e.forEach(function(e,n){t[e]=!0}),t}(a);if(e.showHidden&&(a=Object.getOwnPropertyNames(n)),S(n)&&(a.indexOf("message")>=0||a.indexOf("description")>=0))return f(n);if(0===a.length){if(C(n)){var c=n.name?": "+n.name:"";return e.stylize("[Function"+c+"]","special")}if(m(n))return e.stylize(RegExp.prototype.toString.call(n),"regexp");if(E(n))return e.stylize(Date.prototype.toString.call(n),"date");if(S(n))return f(n)}var u,w="",_=!1,T=["{","}"];(p(n)&&(_=!0,T=["[","]"]),C(n))&&(w=" [Function"+(n.name?": "+n.name:"")+"]");return m(n)&&(w=" "+RegExp.prototype.toString.call(n)),E(n)&&(w=" "+Date.prototype.toUTCString.call(n)),S(n)&&(w=" "+f(n)),0!==a.length||_&&0!=n.length?r<0?m(n)?e.stylize(RegExp.prototype.toString.call(n),"regexp"):e.stylize("[Object]","special"):(e.seen.push(n),u=_?function(e,t,n,r,o){for(var i=[],a=0,s=t.length;a=0&&0,e+t.replace(/\u001b\[\d\d?m/g,"").length+1},0)>60)return n[0]+(""===t?"":t+"\n ")+" "+e.join(",\n ")+" "+n[1];return n[0]+t+" "+e.join(", ")+" "+n[1]}(u,w,T)):T[0]+w+T[1]}function f(e){return"["+Error.prototype.toString.call(e)+"]"}function h(e,t,n,r,o,i){var a,s,c;if((c=Object.getOwnPropertyDescriptor(t,o)||{value:t[o]}).get?s=c.set?e.stylize("[Getter/Setter]","special"):e.stylize("[Getter]","special"):c.set&&(s=e.stylize("[Setter]","special")),k(r,o)||(a="["+o+"]"),s||(e.seen.indexOf(c.value)<0?(s=g(n)?l(e,c.value,null):l(e,c.value,n-1)).indexOf("\n")>-1&&(s=i?s.split("\n").map(function(e){return" "+e}).join("\n").substr(2):"\n"+s.split("\n").map(function(e){return" "+e}).join("\n")):s=e.stylize("[Circular]","special")),b(a)){if(i&&o.match(/^\d+$/))return s;(a=JSON.stringify(""+o)).match(/^"([a-zA-Z_][a-zA-Z_0-9]*)"$/)?(a=a.substr(1,a.length-2),a=e.stylize(a,"name")):(a=a.replace(/'/g,"\\'").replace(/\\"/g,'"').replace(/(^"|"$)/g,"'"),a=e.stylize(a,"string"))}return a+": "+s}function p(e){return Array.isArray(e)}function d(e){return"boolean"==typeof e}function g(e){return null===e}function y(e){return"number"==typeof e}function v(e){return"string"==typeof e}function b(e){return void 0===e}function m(e){return w(e)&&"[object RegExp]"===_(e)}function w(e){return"object"==typeof e&&null!==e}function E(e){return w(e)&&"[object Date]"===_(e)}function S(e){return w(e)&&("[object Error]"===_(e)||e instanceof Error)}function C(e){return"function"==typeof e}function _(e){return Object.prototype.toString.call(e)}function T(e){return e<10?"0"+e.toString(10):e.toString(10)}t.debuglog=function(n){if(b(i)&&(i=e.env.NODE_DEBUG||""),n=n.toUpperCase(),!a[n])if(new RegExp("\\b"+n+"\\b","i").test(i)){var r=e.pid;a[n]=function(){var e=t.format.apply(t,arguments);console.error("%s %d: %s",n,r,e)}}else a[n]=function(){};return a[n]},t.inspect=s,s.colors={bold:[1,22],italic:[3,23],underline:[4,24],inverse:[7,27],white:[37,39],grey:[90,39],black:[30,39],blue:[34,39],cyan:[36,39],green:[32,39],magenta:[35,39],red:[31,39],yellow:[33,39]},s.styles={special:"cyan",number:"yellow",boolean:"yellow",undefined:"grey",null:"bold",string:"green",date:"magenta",regexp:"red"},t.isArray=p,t.isBoolean=d,t.isNull=g,t.isNullOrUndefined=function(e){return null==e},t.isNumber=y,t.isString=v,t.isSymbol=function(e){return"symbol"==typeof e},t.isUndefined=b,t.isRegExp=m,t.isObject=w,t.isDate=E,t.isError=S,t.isFunction=C,t.isPrimitive=function(e){return null===e||"boolean"==typeof e||"number"==typeof e||"string"==typeof e||"symbol"==typeof e||void 0===e},t.isBuffer=n(54);var I=["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"];function k(e,t){return Object.prototype.hasOwnProperty.call(e,t)}t.log=function(){var e,n;console.log("%s - %s",(e=new Date,n=[T(e.getHours()),T(e.getMinutes()),T(e.getSeconds())].join(":"),[e.getDate(),I[e.getMonth()],n].join(" ")),t.format.apply(t,arguments))},t.inherits=n(55),t._extend=function(e,t){if(!t||!w(t))return e;for(var n=Object.keys(t),r=n.length;r--;)e[n[r]]=t[n[r]];return e};var P="undefined"!=typeof Symbol?Symbol("util.promisify.custom"):void 0;function x(e,t){if(!e){var n=new Error("Promise was rejected with a falsy value");n.reason=e,e=n}return t(e)}t.promisify=function(e){if("function"!=typeof e)throw new TypeError('The "original" argument must be of type Function');if(P&&e[P]){var t;if("function"!=typeof(t=e[P]))throw new TypeError('The "util.promisify.custom" argument must be of type Function');return Object.defineProperty(t,P,{value:t,enumerable:!1,writable:!1,configurable:!0}),t}function t(){for(var t,n,r=new Promise(function(e,r){t=e,n=r}),o=[],i=0;i0?("string"==typeof t||a.objectMode||Object.getPrototypeOf(t)===u.prototype||(t=function(e){return u.from(e)}(t)),r?a.endEmitted?e.emit("error",new Error("stream.unshift() after end event")):E(e,a,t,!0):a.ended?e.emit("error",new Error("stream.push() after EOF")):(a.reading=!1,a.decoder&&!n?(t=a.decoder.write(t),a.objectMode||0!==t.length?E(e,a,t,!1):I(e,a)):E(e,a,t,!1))):r||(a.reading=!1));return function(e){return!e.ended&&(e.needReadable||e.lengtht.highWaterMark&&(t.highWaterMark=function(e){return e>=S?e=S:(e--,e|=e>>>1,e|=e>>>2,e|=e>>>4,e|=e>>>8,e|=e>>>16,e++),e}(e)),e<=t.length?e:t.ended?t.length:(t.needReadable=!0,0))}function _(e){var t=e._readableState;t.needReadable=!1,t.emittedReadable||(p("emitReadable",t.flowing),t.emittedReadable=!0,t.sync?o.nextTick(T,e):T(e))}function T(e){p("emit readable"),e.emit("readable"),R(e)}function I(e,t){t.readingMore||(t.readingMore=!0,o.nextTick(k,e,t))}function k(e,t){for(var n=t.length;!t.reading&&!t.flowing&&!t.ended&&t.length=t.length?(n=t.decoder?t.buffer.join(""):1===t.buffer.length?t.buffer.head.data:t.buffer.concat(t.length),t.buffer.clear()):n=function(e,t,n){var r;ei.length?i.length:e;if(a===i.length?o+=i:o+=i.slice(0,e),0===(e-=a)){a===i.length?(++r,n.next?t.head=n.next:t.head=t.tail=null):(t.head=n,n.data=i.slice(a));break}++r}return t.length-=r,o}(e,t):function(e,t){var n=u.allocUnsafe(e),r=t.head,o=1;r.data.copy(n),e-=r.data.length;for(;r=r.next;){var i=r.data,a=e>i.length?i.length:e;if(i.copy(n,n.length-e,0,a),0===(e-=a)){a===i.length?(++o,r.next?t.head=r.next:t.head=t.tail=null):(t.head=r,r.data=i.slice(a));break}++o}return t.length-=o,n}(e,t);return r}(e,t.buffer,t.decoder),n);var n}function O(e){var t=e._readableState;if(t.length>0)throw new Error('"endReadable()" called on non-empty stream');t.endEmitted||(t.ended=!0,o.nextTick(L,t,e))}function L(e,t){e.endEmitted||0!==e.length||(e.endEmitted=!0,t.readable=!1,t.emit("end"))}function M(e,t){for(var n=0,r=e.length;n=t.highWaterMark||t.ended))return p("read: emitReadable",t.length,t.ended),0===t.length&&t.ended?O(this):_(this),null;if(0===(e=C(e,t))&&t.ended)return 0===t.length&&O(this),null;var r,o=t.needReadable;return p("need readable",o),(0===t.length||t.length-e0?D(e,t):null)?(t.needReadable=!0,e=0):t.length-=e,0===t.length&&(t.ended||(t.needReadable=!0),n!==e&&t.ended&&O(this)),null!==r&&this.emit("data",r),r},m.prototype._read=function(e){this.emit("error",new Error("_read() is not implemented"))},m.prototype.pipe=function(e,t){var n=this,i=this._readableState;switch(i.pipesCount){case 0:i.pipes=e;break;case 1:i.pipes=[i.pipes,e];break;default:i.pipes.push(e)}i.pipesCount+=1,p("pipe count=%d opts=%j",i.pipesCount,t);var c=(!t||!1!==t.end)&&e!==r.stdout&&e!==r.stderr?l:m;function u(t,r){p("onunpipe"),t===n&&r&&!1===r.hasUnpiped&&(r.hasUnpiped=!0,p("cleanup"),e.removeListener("close",v),e.removeListener("finish",b),e.removeListener("drain",f),e.removeListener("error",y),e.removeListener("unpipe",u),n.removeListener("end",l),n.removeListener("end",m),n.removeListener("data",g),h=!0,!i.awaitDrain||e._writableState&&!e._writableState.needDrain||f())}function l(){p("onend"),e.end()}i.endEmitted?o.nextTick(c):n.once("end",c),e.on("unpipe",u);var f=function(e){return function(){var t=e._readableState;p("pipeOnDrain",t.awaitDrain),t.awaitDrain&&t.awaitDrain--,0===t.awaitDrain&&s(e,"data")&&(t.flowing=!0,R(e))}}(n);e.on("drain",f);var h=!1;var d=!1;function g(t){p("ondata"),d=!1,!1!==e.write(t)||d||((1===i.pipesCount&&i.pipes===e||i.pipesCount>1&&-1!==M(i.pipes,e))&&!h&&(p("false write response, pause",n._readableState.awaitDrain),n._readableState.awaitDrain++,d=!0),n.pause())}function y(t){p("onerror",t),m(),e.removeListener("error",y),0===s(e,"error")&&e.emit("error",t)}function v(){e.removeListener("finish",b),m()}function b(){p("onfinish"),e.removeListener("close",v),m()}function m(){p("unpipe"),n.unpipe(e)}return n.on("data",g),function(e,t,n){if("function"==typeof e.prependListener)return e.prependListener(t,n);e._events&&e._events[t]?a(e._events[t])?e._events[t].unshift(n):e._events[t]=[n,e._events[t]]:e.on(t,n)}(e,"error",y),e.once("close",v),e.once("finish",b),e.emit("pipe",n),i.flowing||(p("pipe resume"),n.resume()),e},m.prototype.unpipe=function(e){var t=this._readableState,n={hasUnpiped:!1};if(0===t.pipesCount)return this;if(1===t.pipesCount)return e&&e!==t.pipes?this:(e||(e=t.pipes),t.pipes=null,t.pipesCount=0,t.flowing=!1,e&&e.emit("unpipe",this,n),this);if(!e){var r=t.pipes,o=t.pipesCount;t.pipes=null,t.pipesCount=0,t.flowing=!1;for(var i=0;i0&&a.length>o&&!a.warned){a.warned=!0;var c=new Error("Possible EventEmitter memory leak detected. "+a.length+" "+String(t)+" listeners added. Use emitter.setMaxListeners() to increase limit");c.name="MaxListenersExceededWarning",c.emitter=e,c.type=t,c.count=a.length,s=c,console&&console.warn&&console.warn(s)}return e}function f(e,t,n){var r={fired:!1,wrapFn:void 0,target:e,type:t,listener:n},o=function(){for(var e=[],t=0;t0&&(a=t[0]),a instanceof Error)throw a;var s=new Error("Unhandled error."+(a?" ("+a.message+")":""));throw s.context=a,s}var c=o[e];if(void 0===c)return!1;if("function"==typeof c)i(c,this,t);else{var u=c.length,l=d(c,u);for(n=0;n=0;i--)if(n[i]===t||n[i].listener===t){a=n[i].listener,o=i;break}if(o<0)return this;0===o?n.shift():function(e,t){for(;t+1=0;r--)this.removeListener(e,t[r]);return this},s.prototype.listeners=function(e){return h(this,e,!0)},s.prototype.rawListeners=function(e){return h(this,e,!1)},s.listenerCount=function(e,t){return"function"==typeof e.listenerCount?e.listenerCount(t):p.call(e,t)},s.prototype.listenerCount=p,s.prototype.eventNames=function(){return this._eventsCount>0?r(this._events):[]}},function(e,t,n){e.exports=n(37).EventEmitter},function(e,t,n){"use strict";var r=n(23);function o(e,t){e.emit("error",t)}e.exports={destroy:function(e,t){var n=this,i=this._readableState&&this._readableState.destroyed,a=this._writableState&&this._writableState.destroyed;return i||a?(t?t(e):!e||this._writableState&&this._writableState.errorEmitted||r.nextTick(o,this,e),this):(this._readableState&&(this._readableState.destroyed=!0),this._writableState&&(this._writableState.destroyed=!0),this._destroy(e||null,function(e){!t&&e?(r.nextTick(o,n,e),n._writableState&&(n._writableState.errorEmitted=!0)):t&&t(e)}),this)},undestroy:function(){this._readableState&&(this._readableState.destroyed=!1,this._readableState.reading=!1,this._readableState.ended=!1,this._readableState.endEmitted=!1),this._writableState&&(this._writableState.destroyed=!1,this._writableState.ended=!1,this._writableState.ending=!1,this._writableState.finished=!1,this._writableState.errorEmitted=!1)}}},function(e,t,n){"use strict";var r=n(61).Buffer,o=r.isEncoding||function(e){switch((e=""+e)&&e.toLowerCase()){case"hex":case"utf8":case"utf-8":case"ascii":case"binary":case"base64":case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":case"raw":return!0;default:return!1}};function i(e){var t;switch(this.encoding=function(e){var t=function(e){if(!e)return"utf8";for(var t;;)switch(e){case"utf8":case"utf-8":return"utf8";case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return"utf16le";case"latin1":case"binary":return"latin1";case"base64":case"ascii":case"hex":return e;default:if(t)return;e=(""+e).toLowerCase(),t=!0}}(e);if("string"!=typeof t&&(r.isEncoding===o||!o(e)))throw new Error("Unknown encoding: "+e);return t||e}(e),this.encoding){case"utf16le":this.text=c,this.end=u,t=4;break;case"utf8":this.fillLast=s,t=4;break;case"base64":this.text=l,this.end=f,t=3;break;default:return this.write=h,void(this.end=p)}this.lastNeed=0,this.lastTotal=0,this.lastChar=r.allocUnsafe(t)}function a(e){return e<=127?0:e>>5==6?2:e>>4==14?3:e>>3==30?4:e>>6==2?-1:-2}function s(e){var t=this.lastTotal-this.lastNeed,n=function(e,t,n){if(128!=(192&t[0]))return e.lastNeed=0,"�";if(e.lastNeed>1&&t.length>1){if(128!=(192&t[1]))return e.lastNeed=1,"�";if(e.lastNeed>2&&t.length>2&&128!=(192&t[2]))return e.lastNeed=2,"�"}}(this,e);return void 0!==n?n:this.lastNeed<=e.length?(e.copy(this.lastChar,t,0,this.lastNeed),this.lastChar.toString(this.encoding,0,this.lastTotal)):(e.copy(this.lastChar,t,0,e.length),void(this.lastNeed-=e.length))}function c(e,t){if((e.length-t)%2==0){var n=e.toString("utf16le",t);if(n){var r=n.charCodeAt(n.length-1);if(r>=55296&&r<=56319)return this.lastNeed=2,this.lastTotal=4,this.lastChar[0]=e[e.length-2],this.lastChar[1]=e[e.length-1],n.slice(0,-1)}return n}return this.lastNeed=1,this.lastTotal=2,this.lastChar[0]=e[e.length-1],e.toString("utf16le",t,e.length-1)}function u(e){var t=e&&e.length?this.write(e):"";if(this.lastNeed){var n=this.lastTotal-this.lastNeed;return t+this.lastChar.toString("utf16le",0,n)}return t}function l(e,t){var n=(e.length-t)%3;return 0===n?e.toString("base64",t):(this.lastNeed=3-n,this.lastTotal=3,1===n?this.lastChar[0]=e[e.length-1]:(this.lastChar[0]=e[e.length-2],this.lastChar[1]=e[e.length-1]),e.toString("base64",t,e.length-n))}function f(e){var t=e&&e.length?this.write(e):"";return this.lastNeed?t+this.lastChar.toString("base64",0,3-this.lastNeed):t}function h(e){return e.toString(this.encoding)}function p(e){return e&&e.length?this.write(e):""}t.StringDecoder=i,i.prototype.write=function(e){if(0===e.length)return"";var t,n;if(this.lastNeed){if(void 0===(t=this.fillLast(e)))return"";n=this.lastNeed,this.lastNeed=0}else n=0;return n=0)return o>0&&(e.lastNeed=o-1),o;if(--r=0)return o>0&&(e.lastNeed=o-2),o;if(--r=0)return o>0&&(2===o?o=0:e.lastNeed=o-3),o;return 0}(this,e,t);if(!this.lastNeed)return e.toString("utf8",t);this.lastTotal=n;var r=e.length-(n-this.lastNeed);return e.copy(this.lastChar,0,r),e.toString("utf8",t,r)},i.prototype.fillLast=function(e){if(this.lastNeed<=e.length)return e.copy(this.lastChar,this.lastTotal-this.lastNeed,0,this.lastNeed),this.lastChar.toString(this.encoding,0,this.lastTotal);e.copy(this.lastChar,this.lastTotal-this.lastNeed,0,e.length),this.lastNeed-=e.length}},function(e,t,n){"use strict";(function(t,r,o){var i=n(23);function a(e){var t=this;this.next=null,this.entry=null,this.finish=function(){!function(e,t,n){var r=e.entry;e.entry=null;for(;r;){var o=r.callback;t.pendingcb--,o(n),r=r.next}t.corkedRequestsFree?t.corkedRequestsFree.next=e:t.corkedRequestsFree=e}(t,e)}}e.exports=b;var s,c=!t.browser&&["v0.10","v0.9."].indexOf(t.version.slice(0,5))>-1?r:i.nextTick;b.WritableState=v;var u=n(20);u.inherits=n(14);var l={deprecate:n(64)},f=n(38),h=n(13).Buffer,p=o.Uint8Array||function(){};var d,g=n(39);function y(){}function v(e,t){s=s||n(11),e=e||{};var r=t instanceof s;this.objectMode=!!e.objectMode,r&&(this.objectMode=this.objectMode||!!e.writableObjectMode);var o=e.highWaterMark,u=e.writableHighWaterMark,l=this.objectMode?16:16384;this.highWaterMark=o||0===o?o:r&&(u||0===u)?u:l,this.highWaterMark=Math.floor(this.highWaterMark),this.finalCalled=!1,this.needDrain=!1,this.ending=!1,this.ended=!1,this.finished=!1,this.destroyed=!1;var f=!1===e.decodeStrings;this.decodeStrings=!f,this.defaultEncoding=e.defaultEncoding||"utf8",this.length=0,this.writing=!1,this.corked=0,this.sync=!0,this.bufferProcessing=!1,this.onwrite=function(e){!function(e,t){var n=e._writableState,r=n.sync,o=n.writecb;if(function(e){e.writing=!1,e.writecb=null,e.length-=e.writelen,e.writelen=0}(n),t)!function(e,t,n,r,o){--t.pendingcb,n?(i.nextTick(o,r),i.nextTick(_,e,t),e._writableState.errorEmitted=!0,e.emit("error",r)):(o(r),e._writableState.errorEmitted=!0,e.emit("error",r),_(e,t))}(e,n,r,t,o);else{var a=S(n);a||n.corked||n.bufferProcessing||!n.bufferedRequest||E(e,n),r?c(w,e,n,a,o):w(e,n,a,o)}}(t,e)},this.writecb=null,this.writelen=0,this.bufferedRequest=null,this.lastBufferedRequest=null,this.pendingcb=0,this.prefinished=!1,this.errorEmitted=!1,this.bufferedRequestCount=0,this.corkedRequestsFree=new a(this)}function b(e){if(s=s||n(11),!(d.call(b,this)||this instanceof s))return new b(e);this._writableState=new v(e,this),this.writable=!0,e&&("function"==typeof e.write&&(this._write=e.write),"function"==typeof e.writev&&(this._writev=e.writev),"function"==typeof e.destroy&&(this._destroy=e.destroy),"function"==typeof e.final&&(this._final=e.final)),f.call(this)}function m(e,t,n,r,o,i,a){t.writelen=r,t.writecb=a,t.writing=!0,t.sync=!0,n?e._writev(o,t.onwrite):e._write(o,i,t.onwrite),t.sync=!1}function w(e,t,n,r){n||function(e,t){0===t.length&&t.needDrain&&(t.needDrain=!1,e.emit("drain"))}(e,t),t.pendingcb--,r(),_(e,t)}function E(e,t){t.bufferProcessing=!0;var n=t.bufferedRequest;if(e._writev&&n&&n.next){var r=t.bufferedRequestCount,o=new Array(r),i=t.corkedRequestsFree;i.entry=n;for(var s=0,c=!0;n;)o[s]=n,n.isBuf||(c=!1),n=n.next,s+=1;o.allBuffers=c,m(e,t,!0,t.length,o,"",i.finish),t.pendingcb++,t.lastBufferedRequest=null,i.next?(t.corkedRequestsFree=i.next,i.next=null):t.corkedRequestsFree=new a(t),t.bufferedRequestCount=0}else{for(;n;){var u=n.chunk,l=n.encoding,f=n.callback;if(m(e,t,!1,t.objectMode?1:u.length,u,l,f),n=n.next,t.bufferedRequestCount--,t.writing)break}null===n&&(t.lastBufferedRequest=null)}t.bufferedRequest=n,t.bufferProcessing=!1}function S(e){return e.ending&&0===e.length&&null===e.bufferedRequest&&!e.finished&&!e.writing}function C(e,t){e._final(function(n){t.pendingcb--,n&&e.emit("error",n),t.prefinished=!0,e.emit("prefinish"),_(e,t)})}function _(e,t){var n=S(t);return n&&(!function(e,t){t.prefinished||t.finalCalled||("function"==typeof e._final?(t.pendingcb++,t.finalCalled=!0,i.nextTick(C,e,t)):(t.prefinished=!0,e.emit("prefinish")))}(e,t),0===t.pendingcb&&(t.finished=!0,e.emit("finish"))),n}u.inherits(b,f),v.prototype.getBuffer=function(){for(var e=this.bufferedRequest,t=[];e;)t.push(e),e=e.next;return t},function(){try{Object.defineProperty(v.prototype,"buffer",{get:l.deprecate(function(){return this.getBuffer()},"_writableState.buffer is deprecated. Use _writableState.getBuffer instead.","DEP0003")})}catch(e){}}(),"function"==typeof Symbol&&Symbol.hasInstance&&"function"==typeof Function.prototype[Symbol.hasInstance]?(d=Function.prototype[Symbol.hasInstance],Object.defineProperty(b,Symbol.hasInstance,{value:function(e){return!!d.call(this,e)||this===b&&(e&&e._writableState instanceof v)}})):d=function(e){return e instanceof this},b.prototype.pipe=function(){this.emit("error",new Error("Cannot pipe, not readable"))},b.prototype.write=function(e,t,n){var r,o=this._writableState,a=!1,s=!o.objectMode&&(r=e,h.isBuffer(r)||r instanceof p);return s&&!h.isBuffer(e)&&(e=function(e){return h.from(e)}(e)),"function"==typeof t&&(n=t,t=null),s?t="buffer":t||(t=o.defaultEncoding),"function"!=typeof n&&(n=y),o.ended?function(e,t){var n=new Error("write after end");e.emit("error",n),i.nextTick(t,n)}(this,n):(s||function(e,t,n,r){var o=!0,a=!1;return null===n?a=new TypeError("May not write null values to stream"):"string"==typeof n||void 0===n||t.objectMode||(a=new TypeError("Invalid non-string/buffer chunk")),a&&(e.emit("error",a),i.nextTick(r,a),o=!1),o}(this,o,e,n))&&(o.pendingcb++,a=function(e,t,n,r,o,i){if(!n){var a=function(e,t,n){e.objectMode||!1===e.decodeStrings||"string"!=typeof t||(t=h.from(t,n));return t}(t,r,o);r!==a&&(n=!0,o="buffer",r=a)}var s=t.objectMode?1:r.length;t.length+=s;var c=t.length-1))throw new TypeError("Unknown encoding: "+e);return this._writableState.defaultEncoding=e,this},Object.defineProperty(b.prototype,"writableHighWaterMark",{enumerable:!1,get:function(){return this._writableState.highWaterMark}}),b.prototype._write=function(e,t,n){n(new Error("_write() is not implemented"))},b.prototype._writev=null,b.prototype.end=function(e,t,n){var r=this._writableState;"function"==typeof e?(n=e,e=null,t=null):"function"==typeof t&&(n=t,t=null),null!=e&&this.write(e,t),r.corked&&(r.corked=1,this.uncork()),r.ending||r.finished||function(e,t,n){t.ending=!0,_(e,t),n&&(t.finished?i.nextTick(n):e.once("finish",n));t.ended=!0,e.writable=!1}(this,r,n)},Object.defineProperty(b.prototype,"destroyed",{get:function(){return void 0!==this._writableState&&this._writableState.destroyed},set:function(e){this._writableState&&(this._writableState.destroyed=e)}}),b.prototype.destroy=g.destroy,b.prototype._undestroy=g.undestroy,b.prototype._destroy=function(e,t){this.end(),t(e)}}).call(this,n(19),n(62).setImmediate,n(10))},function(e,t,n){"use strict";e.exports=a;var r=n(11),o=n(20);function i(e,t){var n=this._transformState;n.transforming=!1;var r=n.writecb;if(!r)return this.emit("error",new Error("write callback called multiple times"));n.writechunk=null,n.writecb=null,null!=t&&this.push(t),r(e);var o=this._readableState;o.reading=!1,(o.needReadable||o.length=200&&c.statusCode<300?r(new a.b(c.statusCode,c.statusMessage||"",u)):o(new i.b(c.statusMessage||"",c.statusCode||0))});t.abortSignal&&(t.abortSignal.onabort=function(){f.abort(),o(new i.a)})})},n.prototype.getCookieString=function(e){return this.cookieJar.getCookieString(e)},n}(a.a)}).call(this,n(5).Buffer)},function(e,t,n){"use strict";(function(e){n.d(t,"a",function(){return i});var r=n(7),o=n(1),i=function(){function t(){}return t.prototype.writeHandshakeRequest=function(e){return r.a.write(JSON.stringify(e))},t.prototype.parseHandshakeResponse=function(t){var n,i;if(Object(o.g)(t)||void 0!==e&&t instanceof e){var a=new Uint8Array(t);if(-1===(c=a.indexOf(r.a.RecordSeparatorCode)))throw new Error("Message is incomplete.");var s=c+1;n=String.fromCharCode.apply(null,a.slice(0,s)),i=a.byteLength>s?a.slice(s).buffer:null}else{var c,u=t;if(-1===(c=u.indexOf(r.a.RecordSeparator)))throw new Error("Message is incomplete.");s=c+1;n=u.substring(0,s),i=u.length>s?u.substring(s):null}var l=r.a.parse(n),f=JSON.parse(l[0]);if(f.type)throw new Error("Expected a handshake response from the server.");return[i,f]},t}()}).call(this,n(5).Buffer)},,,,,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]0)&&!(r=i.next()).done;)a.push(r.value)}catch(e){o={error:e}}finally{try{r&&!r.done&&(n=i.return)&&n.call(i)}finally{if(o)throw o.error}}return a},a=this&&this.__spread||function(){for(var e=[],t=0;t0?r-4:r,f=0;f>16&255,s[c++]=t>>8&255,s[c++]=255&t;2===a&&(t=o[e.charCodeAt(f)]<<2|o[e.charCodeAt(f+1)]>>4,s[c++]=255&t);1===a&&(t=o[e.charCodeAt(f)]<<10|o[e.charCodeAt(f+1)]<<4|o[e.charCodeAt(f+2)]>>2,s[c++]=t>>8&255,s[c++]=255&t);return s},t.fromByteArray=function(e){for(var t,n=e.length,o=n%3,i=[],a=0,s=n-o;as?s:a+16383));1===o?(t=e[n-1],i.push(r[t>>2]+r[t<<4&63]+"==")):2===o&&(t=(e[n-2]<<8)+e[n-1],i.push(r[t>>10]+r[t>>4&63]+r[t<<2&63]+"="));return i.join("")};for(var r=[],o=[],i="undefined"!=typeof Uint8Array?Uint8Array:Array,a="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",s=0,c=a.length;s0)throw new Error("Invalid string. Length must be a multiple of 4");var n=e.indexOf("=");return-1===n&&(n=t),[n,n===t?0:4-n%4]}function l(e,t,n){for(var o,i,a=[],s=t;s>18&63]+r[i>>12&63]+r[i>>6&63]+r[63&i]);return a.join("")}o["-".charCodeAt(0)]=62,o["_".charCodeAt(0)]=63},function(e,t){t.read=function(e,t,n,r,o){var i,a,s=8*o-r-1,c=(1<>1,l=-7,f=n?o-1:0,h=n?-1:1,p=e[t+f];for(f+=h,i=p&(1<<-l)-1,p>>=-l,l+=s;l>0;i=256*i+e[t+f],f+=h,l-=8);for(a=i&(1<<-l)-1,i>>=-l,l+=r;l>0;a=256*a+e[t+f],f+=h,l-=8);if(0===i)i=1-u;else{if(i===c)return a?NaN:1/0*(p?-1:1);a+=Math.pow(2,r),i-=u}return(p?-1:1)*a*Math.pow(2,i-r)},t.write=function(e,t,n,r,o,i){var a,s,c,u=8*i-o-1,l=(1<>1,h=23===o?Math.pow(2,-24)-Math.pow(2,-77):0,p=r?0:i-1,d=r?1:-1,g=t<0||0===t&&1/t<0?1:0;for(t=Math.abs(t),isNaN(t)||t===1/0?(s=isNaN(t)?1:0,a=l):(a=Math.floor(Math.log(t)/Math.LN2),t*(c=Math.pow(2,-a))<1&&(a--,c*=2),(t+=a+f>=1?h/c:h*Math.pow(2,1-f))*c>=2&&(a++,c/=2),a+f>=l?(s=0,a=l):a+f>=1?(s=(t*c-1)*Math.pow(2,o),a+=f):(s=t*Math.pow(2,f-1)*Math.pow(2,o),a=0));o>=8;e[n+p]=255&s,p+=d,s/=256,o-=8);for(a=a<0;e[n+p]=255&a,p+=d,a/=256,u-=8);e[n+p-d]|=128*g}},function(e,t){var n={}.toString;e.exports=Array.isArray||function(e){return"[object Array]"==n.call(e)}},function(e,t,n){"use strict";(function(t){ +var r=n(50),o=n(51),i=n(52);function a(){return c.TYPED_ARRAY_SUPPORT?2147483647:1073741823}function s(e,t){if(a()=a())throw new RangeError("Attempt to allocate Buffer larger than maximum size: 0x"+a().toString(16)+" bytes");return 0|e}function d(e,t){if(c.isBuffer(e))return e.length;if("undefined"!=typeof ArrayBuffer&&"function"==typeof ArrayBuffer.isView&&(ArrayBuffer.isView(e)||e instanceof ArrayBuffer))return e.byteLength;"string"!=typeof e&&(e=""+e);var n=e.length;if(0===n)return 0;for(var r=!1;;)switch(t){case"ascii":case"latin1":case"binary":return n;case"utf8":case"utf-8":case void 0:return F(e).length;case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return 2*n;case"hex":return n>>>1;case"base64":return H(e).length;default:if(r)return F(e).length;t=(""+t).toLowerCase(),r=!0}}function g(e,t,n){var r=e[t];e[t]=e[n],e[n]=r}function y(e,t,n,r,o){if(0===e.length)return-1;if("string"==typeof n?(r=n,n=0):n>2147483647?n=2147483647:n<-2147483648&&(n=-2147483648),n=+n,isNaN(n)&&(n=o?0:e.length-1),n<0&&(n=e.length+n),n>=e.length){if(o)return-1;n=e.length-1}else if(n<0){if(!o)return-1;n=0}if("string"==typeof t&&(t=c.from(t,r)),c.isBuffer(t))return 0===t.length?-1:v(e,t,n,r,o);if("number"==typeof t)return t&=255,c.TYPED_ARRAY_SUPPORT&&"function"==typeof Uint8Array.prototype.indexOf?o?Uint8Array.prototype.indexOf.call(e,t,n):Uint8Array.prototype.lastIndexOf.call(e,t,n):v(e,[t],n,r,o);throw new TypeError("val must be string, number or Buffer")}function v(e,t,n,r,o){var i,a=1,s=e.length,c=t.length;if(void 0!==r&&("ucs2"===(r=String(r).toLowerCase())||"ucs-2"===r||"utf16le"===r||"utf-16le"===r)){if(e.length<2||t.length<2)return-1;a=2,s/=2,c/=2,n/=2}function u(e,t){return 1===a?e[t]:e.readUInt16BE(t*a)}if(o){var l=-1;for(i=n;is&&(n=s-c),i=n;i>=0;i--){for(var f=!0,h=0;ho&&(r=o):r=o;var i=t.length;if(i%2!=0)throw new TypeError("Invalid hex string");r>i/2&&(r=i/2);for(var a=0;a>8,o=n%256,i.push(o),i.push(r);return i}(t,e.length-n),e,n,r)}function _(e,t,n){return 0===t&&n===e.length?r.fromByteArray(e):r.fromByteArray(e.slice(t,n))}function T(e,t,n){n=Math.min(e.length,n);for(var r=[],o=t;o239?4:u>223?3:u>191?2:1;if(o+f<=n)switch(f){case 1:u<128&&(l=u);break;case 2:128==(192&(i=e[o+1]))&&(c=(31&u)<<6|63&i)>127&&(l=c);break;case 3:i=e[o+1],a=e[o+2],128==(192&i)&&128==(192&a)&&(c=(15&u)<<12|(63&i)<<6|63&a)>2047&&(c<55296||c>57343)&&(l=c);break;case 4:i=e[o+1],a=e[o+2],s=e[o+3],128==(192&i)&&128==(192&a)&&128==(192&s)&&(c=(15&u)<<18|(63&i)<<12|(63&a)<<6|63&s)>65535&&c<1114112&&(l=c)}null===l?(l=65533,f=1):l>65535&&(l-=65536,r.push(l>>>10&1023|55296),l=56320|1023&l),r.push(l),o+=f}return function(e){var t=e.length;if(t<=I)return String.fromCharCode.apply(String,e);var n="",r=0;for(;rthis.length)return"";if((void 0===n||n>this.length)&&(n=this.length),n<=0)return"";if((n>>>=0)<=(t>>>=0))return"";for(e||(e="utf8");;)switch(e){case"hex":return x(this,t,n);case"utf8":case"utf-8":return T(this,t,n);case"ascii":return k(this,t,n);case"latin1":case"binary":return P(this,t,n);case"base64":return _(this,t,n);case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return R(this,t,n);default:if(r)throw new TypeError("Unknown encoding: "+e);e=(e+"").toLowerCase(),r=!0}}.apply(this,arguments)},c.prototype.equals=function(e){if(!c.isBuffer(e))throw new TypeError("Argument must be a Buffer");return this===e||0===c.compare(this,e)},c.prototype.inspect=function(){var e="",n=t.INSPECT_MAX_BYTES;return this.length>0&&(e=this.toString("hex",0,n).match(/.{2}/g).join(" "),this.length>n&&(e+=" ... ")),""},c.prototype.compare=function(e,t,n,r,o){if(!c.isBuffer(e))throw new TypeError("Argument must be a Buffer");if(void 0===t&&(t=0),void 0===n&&(n=e?e.length:0),void 0===r&&(r=0),void 0===o&&(o=this.length),t<0||n>e.length||r<0||o>this.length)throw new RangeError("out of range index");if(r>=o&&t>=n)return 0;if(r>=o)return-1;if(t>=n)return 1;if(this===e)return 0;for(var i=(o>>>=0)-(r>>>=0),a=(n>>>=0)-(t>>>=0),s=Math.min(i,a),u=this.slice(r,o),l=e.slice(t,n),f=0;fo)&&(n=o),e.length>0&&(n<0||t<0)||t>this.length)throw new RangeError("Attempt to write outside buffer bounds");r||(r="utf8");for(var i=!1;;)switch(r){case"hex":return b(this,e,t,n);case"utf8":case"utf-8":return m(this,e,t,n);case"ascii":return w(this,e,t,n);case"latin1":case"binary":return E(this,e,t,n);case"base64":return S(this,e,t,n);case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return C(this,e,t,n);default:if(i)throw new TypeError("Unknown encoding: "+r);r=(""+r).toLowerCase(),i=!0}},c.prototype.toJSON=function(){return{type:"Buffer",data:Array.prototype.slice.call(this._arr||this,0)}};var I=4096;function k(e,t,n){var r="";n=Math.min(e.length,n);for(var o=t;or)&&(n=r);for(var o="",i=t;in)throw new RangeError("Trying to access beyond buffer length")}function O(e,t,n,r,o,i){if(!c.isBuffer(e))throw new TypeError('"buffer" argument must be a Buffer instance');if(t>o||te.length)throw new RangeError("Index out of range")}function L(e,t,n,r){t<0&&(t=65535+t+1);for(var o=0,i=Math.min(e.length-n,2);o>>8*(r?o:1-o)}function M(e,t,n,r){t<0&&(t=4294967295+t+1);for(var o=0,i=Math.min(e.length-n,4);o>>8*(r?o:3-o)&255}function A(e,t,n,r,o,i){if(n+r>e.length)throw new RangeError("Index out of range");if(n<0)throw new RangeError("Index out of range")}function B(e,t,n,r,i){return i||A(e,0,n,4),o.write(e,t,n,r,23,4),n+4}function j(e,t,n,r,i){return i||A(e,0,n,8),o.write(e,t,n,r,52,8),n+8}c.prototype.slice=function(e,t){var n,r=this.length;if((e=~~e)<0?(e+=r)<0&&(e=0):e>r&&(e=r),(t=void 0===t?r:~~t)<0?(t+=r)<0&&(t=0):t>r&&(t=r),t0&&(o*=256);)r+=this[e+--t]*o;return r},c.prototype.readUInt8=function(e,t){return t||D(e,1,this.length),this[e]},c.prototype.readUInt16LE=function(e,t){return t||D(e,2,this.length),this[e]|this[e+1]<<8},c.prototype.readUInt16BE=function(e,t){return t||D(e,2,this.length),this[e]<<8|this[e+1]},c.prototype.readUInt32LE=function(e,t){return t||D(e,4,this.length),(this[e]|this[e+1]<<8|this[e+2]<<16)+16777216*this[e+3]},c.prototype.readUInt32BE=function(e,t){return t||D(e,4,this.length),16777216*this[e]+(this[e+1]<<16|this[e+2]<<8|this[e+3])},c.prototype.readIntLE=function(e,t,n){e|=0,t|=0,n||D(e,t,this.length);for(var r=this[e],o=1,i=0;++i=(o*=128)&&(r-=Math.pow(2,8*t)),r},c.prototype.readIntBE=function(e,t,n){e|=0,t|=0,n||D(e,t,this.length);for(var r=t,o=1,i=this[e+--r];r>0&&(o*=256);)i+=this[e+--r]*o;return i>=(o*=128)&&(i-=Math.pow(2,8*t)),i},c.prototype.readInt8=function(e,t){return t||D(e,1,this.length),128&this[e]?-1*(255-this[e]+1):this[e]},c.prototype.readInt16LE=function(e,t){t||D(e,2,this.length);var n=this[e]|this[e+1]<<8;return 32768&n?4294901760|n:n},c.prototype.readInt16BE=function(e,t){t||D(e,2,this.length);var n=this[e+1]|this[e]<<8;return 32768&n?4294901760|n:n},c.prototype.readInt32LE=function(e,t){return t||D(e,4,this.length),this[e]|this[e+1]<<8|this[e+2]<<16|this[e+3]<<24},c.prototype.readInt32BE=function(e,t){return t||D(e,4,this.length),this[e]<<24|this[e+1]<<16|this[e+2]<<8|this[e+3]},c.prototype.readFloatLE=function(e,t){return t||D(e,4,this.length),o.read(this,e,!0,23,4)},c.prototype.readFloatBE=function(e,t){return t||D(e,4,this.length),o.read(this,e,!1,23,4)},c.prototype.readDoubleLE=function(e,t){return t||D(e,8,this.length),o.read(this,e,!0,52,8)},c.prototype.readDoubleBE=function(e,t){return t||D(e,8,this.length),o.read(this,e,!1,52,8)},c.prototype.writeUIntLE=function(e,t,n,r){(e=+e,t|=0,n|=0,r)||O(this,e,t,n,Math.pow(2,8*n)-1,0);var o=1,i=0;for(this[t]=255&e;++i=0&&(i*=256);)this[t+o]=e/i&255;return t+n},c.prototype.writeUInt8=function(e,t,n){return e=+e,t|=0,n||O(this,e,t,1,255,0),c.TYPED_ARRAY_SUPPORT||(e=Math.floor(e)),this[t]=255&e,t+1},c.prototype.writeUInt16LE=function(e,t,n){return e=+e,t|=0,n||O(this,e,t,2,65535,0),c.TYPED_ARRAY_SUPPORT?(this[t]=255&e,this[t+1]=e>>>8):L(this,e,t,!0),t+2},c.prototype.writeUInt16BE=function(e,t,n){return e=+e,t|=0,n||O(this,e,t,2,65535,0),c.TYPED_ARRAY_SUPPORT?(this[t]=e>>>8,this[t+1]=255&e):L(this,e,t,!1),t+2},c.prototype.writeUInt32LE=function(e,t,n){return e=+e,t|=0,n||O(this,e,t,4,4294967295,0),c.TYPED_ARRAY_SUPPORT?(this[t+3]=e>>>24,this[t+2]=e>>>16,this[t+1]=e>>>8,this[t]=255&e):M(this,e,t,!0),t+4},c.prototype.writeUInt32BE=function(e,t,n){return e=+e,t|=0,n||O(this,e,t,4,4294967295,0),c.TYPED_ARRAY_SUPPORT?(this[t]=e>>>24,this[t+1]=e>>>16,this[t+2]=e>>>8,this[t+3]=255&e):M(this,e,t,!1),t+4},c.prototype.writeIntLE=function(e,t,n,r){if(e=+e,t|=0,!r){var o=Math.pow(2,8*n-1);O(this,e,t,n,o-1,-o)}var i=0,a=1,s=0;for(this[t]=255&e;++i>0)-s&255;return t+n},c.prototype.writeIntBE=function(e,t,n,r){if(e=+e,t|=0,!r){var o=Math.pow(2,8*n-1);O(this,e,t,n,o-1,-o)}var i=n-1,a=1,s=0;for(this[t+i]=255&e;--i>=0&&(a*=256);)e<0&&0===s&&0!==this[t+i+1]&&(s=1),this[t+i]=(e/a>>0)-s&255;return t+n},c.prototype.writeInt8=function(e,t,n){return e=+e,t|=0,n||O(this,e,t,1,127,-128),c.TYPED_ARRAY_SUPPORT||(e=Math.floor(e)),e<0&&(e=255+e+1),this[t]=255&e,t+1},c.prototype.writeInt16LE=function(e,t,n){return e=+e,t|=0,n||O(this,e,t,2,32767,-32768),c.TYPED_ARRAY_SUPPORT?(this[t]=255&e,this[t+1]=e>>>8):L(this,e,t,!0),t+2},c.prototype.writeInt16BE=function(e,t,n){return e=+e,t|=0,n||O(this,e,t,2,32767,-32768),c.TYPED_ARRAY_SUPPORT?(this[t]=e>>>8,this[t+1]=255&e):L(this,e,t,!1),t+2},c.prototype.writeInt32LE=function(e,t,n){return e=+e,t|=0,n||O(this,e,t,4,2147483647,-2147483648),c.TYPED_ARRAY_SUPPORT?(this[t]=255&e,this[t+1]=e>>>8,this[t+2]=e>>>16,this[t+3]=e>>>24):M(this,e,t,!0),t+4},c.prototype.writeInt32BE=function(e,t,n){return e=+e,t|=0,n||O(this,e,t,4,2147483647,-2147483648),e<0&&(e=4294967295+e+1),c.TYPED_ARRAY_SUPPORT?(this[t]=e>>>24,this[t+1]=e>>>16,this[t+2]=e>>>8,this[t+3]=255&e):M(this,e,t,!1),t+4},c.prototype.writeFloatLE=function(e,t,n){return B(this,e,t,!0,n)},c.prototype.writeFloatBE=function(e,t,n){return B(this,e,t,!1,n)},c.prototype.writeDoubleLE=function(e,t,n){return j(this,e,t,!0,n)},c.prototype.writeDoubleBE=function(e,t,n){return j(this,e,t,!1,n)},c.prototype.copy=function(e,t,n,r){if(n||(n=0),r||0===r||(r=this.length),t>=e.length&&(t=e.length),t||(t=0),r>0&&r=this.length)throw new RangeError("sourceStart out of bounds");if(r<0)throw new RangeError("sourceEnd out of bounds");r>this.length&&(r=this.length),e.length-t=0;--o)e[o+t]=this[o+n];else if(i<1e3||!c.TYPED_ARRAY_SUPPORT)for(o=0;o>>=0,n=void 0===n?this.length:n>>>0,e||(e=0),"number"==typeof e)for(i=t;i55295&&n<57344){if(!o){if(n>56319){(t-=3)>-1&&i.push(239,191,189);continue}if(a+1===r){(t-=3)>-1&&i.push(239,191,189);continue}o=n;continue}if(n<56320){(t-=3)>-1&&i.push(239,191,189),o=n;continue}n=65536+(o-55296<<10|n-56320)}else o&&(t-=3)>-1&&i.push(239,191,189);if(o=null,n<128){if((t-=1)<0)break;i.push(n)}else if(n<2048){if((t-=2)<0)break;i.push(n>>6|192,63&n|128)}else if(n<65536){if((t-=3)<0)break;i.push(n>>12|224,n>>6&63|128,63&n|128)}else{if(!(n<1114112))throw new Error("Invalid code point");if((t-=4)<0)break;i.push(n>>18|240,n>>12&63|128,n>>6&63|128,63&n|128)}}return i}function H(e){return r.toByteArray(function(e){if((e=function(e){return e.trim?e.trim():e.replace(/^\s+|\s+$/g,"")}(e).replace(U,"")).length<2)return"";for(;e.length%4!=0;)e+="=";return e}(e))}function q(e,t,n,r){for(var o=0;o=t.length||o>=e.length);++o)t[o+n]=e[o];return o}}).call(this,n(10))},function(e,t,n){"use strict";n.d(t,"a",function(){return r});var r=function(){function e(){}return e.prototype.log=function(e,t){},e.instance=new e,e}()},function(e,t,n){"use strict";n.d(t,"a",function(){return r});var r=function(){function e(){}return e.write=function(t){return""+t+e.RecordSeparator},e.parse=function(t){if(t[t.length-1]!==e.RecordSeparator)throw new Error("Message is incomplete.");var n=t.split(e.RecordSeparator);return n.pop(),n},e.RecordSeparatorCode=30,e.RecordSeparator=String.fromCharCode(e.RecordSeparatorCode),e}()},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),n(25),n(9);var r=n(26),o=n(17),i={},a=!1;function s(e,t,n){var o=i[e];o||(o=i[e]=new r.BrowserRenderer(e)),o.attachRootComponentToLogicalElement(n,t)}t.attachRootComponentToLogicalElement=s,t.attachRootComponentToElement=function(e,t,n){var r=document.querySelector(e);if(!r)throw new Error("Could not find any element matching selector '"+e+"'.");s(n||0,o.toLogicalElement(r,!0),t)},t.renderBatch=function(e,t){var n=i[e];if(!n)throw new Error("There is no browser renderer with ID "+e+".");for(var r=t.arrayRangeReader,o=t.updatedComponents(),s=r.values(o),c=r.count(o),u=t.referenceFrames(),l=r.values(u),f=t.diffReader,h=0;h=0,"must have a non-negative type"),o(a,"must have a decode function"),this.registerEncoder(function(e){return e instanceof t},function(t){var o=i(),a=r.allocUnsafe(1);return a.writeInt8(e,0),o.append(a),o.append(n(t)),o}),this.registerDecoder(e,a),this},registerEncoder:function(e,n){return o(e,"must have an encode function"),o(n,"must have an encode function"),t.push({check:e,encode:n}),this},registerDecoder:function(e,t){return o(e>=0,"must have a non-negative type"),o(t,"must have a decode function"),n.push({type:e,decode:t}),this},encoder:a.encoder,decoder:a.decoder,buffer:!0,type:"msgpack5",IncompleteBufferError:s.IncompleteBufferError}}},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){"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){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),function(e){e[e.Trace=0]="Trace",e[e.Debug=1]="Debug",e[e.Information=2]="Information",e[e.Warning=3]="Warning",e[e.Error=4]="Error",e[e.Critical=5]="Critical",e[e.None=6]="None"}(t.LogLevel||(t.LogLevel={}))},function(e,t,n){"use strict";var r;!function(e){window.DotNet=e;var t=[],n={},r={},o=1,i=null;function a(e){t.push(e)}function s(e,t,n,r){var o=u();if(o.invokeDotNetFromJS){var i=JSON.stringify(r,g),a=o.invokeDotNetFromJS(e,t,n,i);return a?f(a):null}throw new Error("The current dispatcher does not support synchronous calls from JS to .NET. Use invokeMethodAsync instead.")}function c(e,t,r,i){if(e&&r)throw new Error("For instance method calls, assemblyName should be null. Received '"+e+"'.");var a=o++,s=new Promise(function(e,t){n[a]={resolve:e,reject:t}});try{var c=JSON.stringify(i,g);u().beginInvokeDotNetFromJS(a,e,t,r,c)}catch(e){l(a,!1,e)}return s}function u(){if(null!==i)return i;throw new Error("No .NET call dispatcher has been set.")}function l(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 h(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){i=e},e.attachReviver=a,e.invokeMethod=function(e,t){for(var n=[],r=2;r0&&!t)throw new Error("New logical elements must start empty, or allowExistingContents must be true");return e[r]=[],e}function s(e,t,n){var i=e;if(e instanceof Comment&&(u(i)&&u(i).length>0))throw new Error("Not implemented: inserting non-empty logical container");if(c(i))throw new Error("Not implemented: moving existing logical children");var a=u(t);if(n0;)e(r,0);var i=r;i.parentNode.removeChild(i)},t.getLogicalParent=c,t.getLogicalSiblingEnd=function(e){return e[i]||null},t.getLogicalChild=function(e,t){return u(e)[t]},t.isSvgElement=function(e){return"http://www.w3.org/2000/svg"===l(e).namespaceURI},t.getLogicalChildrenArray=u,t.permuteLogicalChildren=function(e,t){var n=u(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=c(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):h(r,e)}),t.forEach(function(e){for(var t=e.moveToBeforeMarker,n=t.parentNode,r=e.moveRangeStart,o=e.moveRangeEnd,i=r;i;){var a=i.nextSibling;if(n.insertBefore(i,t),i===o)break;i=a}n.removeChild(t)}),t.forEach(function(e){n[e.toSiblingIndex]=e.moveRangeStart})},t.getClosestDomElement=l},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){var n,r,o=e.exports={};function i(){throw new Error("setTimeout has not been defined")}function a(){throw new Error("clearTimeout has not been defined")}function s(e){if(n===setTimeout)return setTimeout(e,0);if((n===i||!n)&&setTimeout)return n=setTimeout,setTimeout(e,0);try{return n(e,0)}catch(t){try{return n.call(null,e,0)}catch(t){return n.call(this,e,0)}}}!function(){try{n="function"==typeof setTimeout?setTimeout:i}catch(e){n=i}try{r="function"==typeof clearTimeout?clearTimeout:a}catch(e){r=a}}();var c,u=[],l=!1,f=-1;function h(){l&&c&&(l=!1,c.length?u=c.concat(u):f=-1,u.length&&p())}function p(){if(!l){var e=s(h);l=!0;for(var t=u.length;t;){for(c=u,u=[];++f1)for(var n=1;n0&&o[o.length-1])&&(6===i[0]||2===i[0])){a=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]this.length)&&(r=this.length),n>=this.length)return e||i.alloc(0);if(r<=0)return e||i.alloc(0);var o,a,s=!!e,c=this._offset(n),u=r-n,l=u,f=s&&t||0,h=c[1];if(0===n&&r==this.length){if(!s)return 1===this._bufs.length?this._bufs[0]:i.concat(this._bufs,this.length);for(a=0;a(o=this._bufs[a].length-h))){this._bufs[a].copy(e,f,h,h+l);break}this._bufs[a].copy(e,f,h),f+=o,l-=o,h&&(h=0)}return e},a.prototype.shallowSlice=function(e,t){e=e||0,t=t||this.length,e<0&&(e+=this.length),t<0&&(t+=this.length);var n=this._offset(e),r=this._offset(t),o=this._bufs.slice(n[0],r[0]+1);return 0==r[1]?o.pop():o[o.length-1]=o[o.length-1].slice(0,r[1]),0!=n[1]&&(o[0]=o[0].slice(n[1])),new a(o)},a.prototype.toString=function(e,t,n){return this.slice(t,n).toString(e)},a.prototype.consume=function(e){for(;this._bufs.length;){if(!(e>=this._bufs[0].length)){this._bufs[0]=this._bufs[0].slice(e),this.length-=e;break}e-=this._bufs[0].length,this.length-=this._bufs[0].length,this._bufs.shift()}return this},a.prototype.duplicate=function(){for(var e=0,t=new a;e0&&o[o.length-1])&&(6===i[0]||2===i[0])){a=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]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]=i)return e;switch(e){case"%s":return String(r[n++]);case"%d":return Number(r[n++]);case"%j":try{return JSON.stringify(r[n++])}catch(e){return"[Circular]"}default:return e}}),c=r[n];n=3&&(r.depth=arguments[2]),arguments.length>=4&&(r.colors=arguments[3]),d(n)?r.showHidden=n:n&&t._extend(r,n),b(r.showHidden)&&(r.showHidden=!1),b(r.depth)&&(r.depth=2),b(r.colors)&&(r.colors=!1),b(r.customInspect)&&(r.customInspect=!0),r.colors&&(r.stylize=c),l(r,e,r.depth)}function c(e,t){var n=s.styles[t];return n?"["+s.colors[n][0]+"m"+e+"["+s.colors[n][1]+"m":e}function u(e,t){return e}function l(e,n,r){if(e.customInspect&&n&&C(n.inspect)&&n.inspect!==t.inspect&&(!n.constructor||n.constructor.prototype!==n)){var o=n.inspect(r,e);return v(o)||(o=l(e,o,r)),o}var i=function(e,t){if(b(t))return e.stylize("undefined","undefined");if(v(t)){var n="'"+JSON.stringify(t).replace(/^"|"$/g,"").replace(/'/g,"\\'").replace(/\\"/g,'"')+"'";return e.stylize(n,"string")}if(y(t))return e.stylize(""+t,"number");if(d(t))return e.stylize(""+t,"boolean");if(g(t))return e.stylize("null","null")}(e,n);if(i)return i;var a=Object.keys(n),s=function(e){var t={};return e.forEach(function(e,n){t[e]=!0}),t}(a);if(e.showHidden&&(a=Object.getOwnPropertyNames(n)),S(n)&&(a.indexOf("message")>=0||a.indexOf("description")>=0))return f(n);if(0===a.length){if(C(n)){var c=n.name?": "+n.name:"";return e.stylize("[Function"+c+"]","special")}if(m(n))return e.stylize(RegExp.prototype.toString.call(n),"regexp");if(E(n))return e.stylize(Date.prototype.toString.call(n),"date");if(S(n))return f(n)}var u,w="",_=!1,T=["{","}"];(p(n)&&(_=!0,T=["[","]"]),C(n))&&(w=" [Function"+(n.name?": "+n.name:"")+"]");return m(n)&&(w=" "+RegExp.prototype.toString.call(n)),E(n)&&(w=" "+Date.prototype.toUTCString.call(n)),S(n)&&(w=" "+f(n)),0!==a.length||_&&0!=n.length?r<0?m(n)?e.stylize(RegExp.prototype.toString.call(n),"regexp"):e.stylize("[Object]","special"):(e.seen.push(n),u=_?function(e,t,n,r,o){for(var i=[],a=0,s=t.length;a=0&&0,e+t.replace(/\u001b\[\d\d?m/g,"").length+1},0)>60)return n[0]+(""===t?"":t+"\n ")+" "+e.join(",\n ")+" "+n[1];return n[0]+t+" "+e.join(", ")+" "+n[1]}(u,w,T)):T[0]+w+T[1]}function f(e){return"["+Error.prototype.toString.call(e)+"]"}function h(e,t,n,r,o,i){var a,s,c;if((c=Object.getOwnPropertyDescriptor(t,o)||{value:t[o]}).get?s=c.set?e.stylize("[Getter/Setter]","special"):e.stylize("[Getter]","special"):c.set&&(s=e.stylize("[Setter]","special")),k(r,o)||(a="["+o+"]"),s||(e.seen.indexOf(c.value)<0?(s=g(n)?l(e,c.value,null):l(e,c.value,n-1)).indexOf("\n")>-1&&(s=i?s.split("\n").map(function(e){return" "+e}).join("\n").substr(2):"\n"+s.split("\n").map(function(e){return" "+e}).join("\n")):s=e.stylize("[Circular]","special")),b(a)){if(i&&o.match(/^\d+$/))return s;(a=JSON.stringify(""+o)).match(/^"([a-zA-Z_][a-zA-Z_0-9]*)"$/)?(a=a.substr(1,a.length-2),a=e.stylize(a,"name")):(a=a.replace(/'/g,"\\'").replace(/\\"/g,'"').replace(/(^"|"$)/g,"'"),a=e.stylize(a,"string"))}return a+": "+s}function p(e){return Array.isArray(e)}function d(e){return"boolean"==typeof e}function g(e){return null===e}function y(e){return"number"==typeof e}function v(e){return"string"==typeof e}function b(e){return void 0===e}function m(e){return w(e)&&"[object RegExp]"===_(e)}function w(e){return"object"==typeof e&&null!==e}function E(e){return w(e)&&"[object Date]"===_(e)}function S(e){return w(e)&&("[object Error]"===_(e)||e instanceof Error)}function C(e){return"function"==typeof e}function _(e){return Object.prototype.toString.call(e)}function T(e){return e<10?"0"+e.toString(10):e.toString(10)}t.debuglog=function(n){if(b(i)&&(i=e.env.NODE_DEBUG||""),n=n.toUpperCase(),!a[n])if(new RegExp("\\b"+n+"\\b","i").test(i)){var r=e.pid;a[n]=function(){var e=t.format.apply(t,arguments);console.error("%s %d: %s",n,r,e)}}else a[n]=function(){};return a[n]},t.inspect=s,s.colors={bold:[1,22],italic:[3,23],underline:[4,24],inverse:[7,27],white:[37,39],grey:[90,39],black:[30,39],blue:[34,39],cyan:[36,39],green:[32,39],magenta:[35,39],red:[31,39],yellow:[33,39]},s.styles={special:"cyan",number:"yellow",boolean:"yellow",undefined:"grey",null:"bold",string:"green",date:"magenta",regexp:"red"},t.isArray=p,t.isBoolean=d,t.isNull=g,t.isNullOrUndefined=function(e){return null==e},t.isNumber=y,t.isString=v,t.isSymbol=function(e){return"symbol"==typeof e},t.isUndefined=b,t.isRegExp=m,t.isObject=w,t.isDate=E,t.isError=S,t.isFunction=C,t.isPrimitive=function(e){return null===e||"boolean"==typeof e||"number"==typeof e||"string"==typeof e||"symbol"==typeof e||void 0===e},t.isBuffer=n(54);var I=["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"];function k(e,t){return Object.prototype.hasOwnProperty.call(e,t)}t.log=function(){var e,n;console.log("%s - %s",(e=new Date,n=[T(e.getHours()),T(e.getMinutes()),T(e.getSeconds())].join(":"),[e.getDate(),I[e.getMonth()],n].join(" ")),t.format.apply(t,arguments))},t.inherits=n(55),t._extend=function(e,t){if(!t||!w(t))return e;for(var n=Object.keys(t),r=n.length;r--;)e[n[r]]=t[n[r]];return e};var P="undefined"!=typeof Symbol?Symbol("util.promisify.custom"):void 0;function x(e,t){if(!e){var n=new Error("Promise was rejected with a falsy value");n.reason=e,e=n}return t(e)}t.promisify=function(e){if("function"!=typeof e)throw new TypeError('The "original" argument must be of type Function');if(P&&e[P]){var t;if("function"!=typeof(t=e[P]))throw new TypeError('The "util.promisify.custom" argument must be of type Function');return Object.defineProperty(t,P,{value:t,enumerable:!1,writable:!1,configurable:!0}),t}function t(){for(var t,n,r=new Promise(function(e,r){t=e,n=r}),o=[],i=0;i0?("string"==typeof t||a.objectMode||Object.getPrototypeOf(t)===u.prototype||(t=function(e){return u.from(e)}(t)),r?a.endEmitted?e.emit("error",new Error("stream.unshift() after end event")):E(e,a,t,!0):a.ended?e.emit("error",new Error("stream.push() after EOF")):(a.reading=!1,a.decoder&&!n?(t=a.decoder.write(t),a.objectMode||0!==t.length?E(e,a,t,!1):I(e,a)):E(e,a,t,!1))):r||(a.reading=!1));return function(e){return!e.ended&&(e.needReadable||e.lengtht.highWaterMark&&(t.highWaterMark=function(e){return e>=S?e=S:(e--,e|=e>>>1,e|=e>>>2,e|=e>>>4,e|=e>>>8,e|=e>>>16,e++),e}(e)),e<=t.length?e:t.ended?t.length:(t.needReadable=!0,0))}function _(e){var t=e._readableState;t.needReadable=!1,t.emittedReadable||(p("emitReadable",t.flowing),t.emittedReadable=!0,t.sync?o.nextTick(T,e):T(e))}function T(e){p("emit readable"),e.emit("readable"),R(e)}function I(e,t){t.readingMore||(t.readingMore=!0,o.nextTick(k,e,t))}function k(e,t){for(var n=t.length;!t.reading&&!t.flowing&&!t.ended&&t.length=t.length?(n=t.decoder?t.buffer.join(""):1===t.buffer.length?t.buffer.head.data:t.buffer.concat(t.length),t.buffer.clear()):n=function(e,t,n){var r;ei.length?i.length:e;if(a===i.length?o+=i:o+=i.slice(0,e),0===(e-=a)){a===i.length?(++r,n.next?t.head=n.next:t.head=t.tail=null):(t.head=n,n.data=i.slice(a));break}++r}return t.length-=r,o}(e,t):function(e,t){var n=u.allocUnsafe(e),r=t.head,o=1;r.data.copy(n),e-=r.data.length;for(;r=r.next;){var i=r.data,a=e>i.length?i.length:e;if(i.copy(n,n.length-e,0,a),0===(e-=a)){a===i.length?(++o,r.next?t.head=r.next:t.head=t.tail=null):(t.head=r,r.data=i.slice(a));break}++o}return t.length-=o,n}(e,t);return r}(e,t.buffer,t.decoder),n);var n}function O(e){var t=e._readableState;if(t.length>0)throw new Error('"endReadable()" called on non-empty stream');t.endEmitted||(t.ended=!0,o.nextTick(L,t,e))}function L(e,t){e.endEmitted||0!==e.length||(e.endEmitted=!0,t.readable=!1,t.emit("end"))}function M(e,t){for(var n=0,r=e.length;n=t.highWaterMark||t.ended))return p("read: emitReadable",t.length,t.ended),0===t.length&&t.ended?O(this):_(this),null;if(0===(e=C(e,t))&&t.ended)return 0===t.length&&O(this),null;var r,o=t.needReadable;return p("need readable",o),(0===t.length||t.length-e0?D(e,t):null)?(t.needReadable=!0,e=0):t.length-=e,0===t.length&&(t.ended||(t.needReadable=!0),n!==e&&t.ended&&O(this)),null!==r&&this.emit("data",r),r},m.prototype._read=function(e){this.emit("error",new Error("_read() is not implemented"))},m.prototype.pipe=function(e,t){var n=this,i=this._readableState;switch(i.pipesCount){case 0:i.pipes=e;break;case 1:i.pipes=[i.pipes,e];break;default:i.pipes.push(e)}i.pipesCount+=1,p("pipe count=%d opts=%j",i.pipesCount,t);var c=(!t||!1!==t.end)&&e!==r.stdout&&e!==r.stderr?l:m;function u(t,r){p("onunpipe"),t===n&&r&&!1===r.hasUnpiped&&(r.hasUnpiped=!0,p("cleanup"),e.removeListener("close",v),e.removeListener("finish",b),e.removeListener("drain",f),e.removeListener("error",y),e.removeListener("unpipe",u),n.removeListener("end",l),n.removeListener("end",m),n.removeListener("data",g),h=!0,!i.awaitDrain||e._writableState&&!e._writableState.needDrain||f())}function l(){p("onend"),e.end()}i.endEmitted?o.nextTick(c):n.once("end",c),e.on("unpipe",u);var f=function(e){return function(){var t=e._readableState;p("pipeOnDrain",t.awaitDrain),t.awaitDrain&&t.awaitDrain--,0===t.awaitDrain&&s(e,"data")&&(t.flowing=!0,R(e))}}(n);e.on("drain",f);var h=!1;var d=!1;function g(t){p("ondata"),d=!1,!1!==e.write(t)||d||((1===i.pipesCount&&i.pipes===e||i.pipesCount>1&&-1!==M(i.pipes,e))&&!h&&(p("false write response, pause",n._readableState.awaitDrain),n._readableState.awaitDrain++,d=!0),n.pause())}function y(t){p("onerror",t),m(),e.removeListener("error",y),0===s(e,"error")&&e.emit("error",t)}function v(){e.removeListener("finish",b),m()}function b(){p("onfinish"),e.removeListener("close",v),m()}function m(){p("unpipe"),n.unpipe(e)}return n.on("data",g),function(e,t,n){if("function"==typeof e.prependListener)return e.prependListener(t,n);e._events&&e._events[t]?a(e._events[t])?e._events[t].unshift(n):e._events[t]=[n,e._events[t]]:e.on(t,n)}(e,"error",y),e.once("close",v),e.once("finish",b),e.emit("pipe",n),i.flowing||(p("pipe resume"),n.resume()),e},m.prototype.unpipe=function(e){var t=this._readableState,n={hasUnpiped:!1};if(0===t.pipesCount)return this;if(1===t.pipesCount)return e&&e!==t.pipes?this:(e||(e=t.pipes),t.pipes=null,t.pipesCount=0,t.flowing=!1,e&&e.emit("unpipe",this,n),this);if(!e){var r=t.pipes,o=t.pipesCount;t.pipes=null,t.pipesCount=0,t.flowing=!1;for(var i=0;i0&&a.length>o&&!a.warned){a.warned=!0;var c=new Error("Possible EventEmitter memory leak detected. "+a.length+" "+String(t)+" listeners added. Use emitter.setMaxListeners() to increase limit");c.name="MaxListenersExceededWarning",c.emitter=e,c.type=t,c.count=a.length,s=c,console&&console.warn&&console.warn(s)}return e}function f(e,t,n){var r={fired:!1,wrapFn:void 0,target:e,type:t,listener:n},o=function(){for(var e=[],t=0;t0&&(a=t[0]),a instanceof Error)throw a;var s=new Error("Unhandled error."+(a?" ("+a.message+")":""));throw s.context=a,s}var c=o[e];if(void 0===c)return!1;if("function"==typeof c)i(c,this,t);else{var u=c.length,l=d(c,u);for(n=0;n=0;i--)if(n[i]===t||n[i].listener===t){a=n[i].listener,o=i;break}if(o<0)return this;0===o?n.shift():function(e,t){for(;t+1=0;r--)this.removeListener(e,t[r]);return this},s.prototype.listeners=function(e){return h(this,e,!0)},s.prototype.rawListeners=function(e){return h(this,e,!1)},s.listenerCount=function(e,t){return"function"==typeof e.listenerCount?e.listenerCount(t):p.call(e,t)},s.prototype.listenerCount=p,s.prototype.eventNames=function(){return this._eventsCount>0?r(this._events):[]}},function(e,t,n){e.exports=n(37).EventEmitter},function(e,t,n){"use strict";var r=n(23);function o(e,t){e.emit("error",t)}e.exports={destroy:function(e,t){var n=this,i=this._readableState&&this._readableState.destroyed,a=this._writableState&&this._writableState.destroyed;return i||a?(t?t(e):!e||this._writableState&&this._writableState.errorEmitted||r.nextTick(o,this,e),this):(this._readableState&&(this._readableState.destroyed=!0),this._writableState&&(this._writableState.destroyed=!0),this._destroy(e||null,function(e){!t&&e?(r.nextTick(o,n,e),n._writableState&&(n._writableState.errorEmitted=!0)):t&&t(e)}),this)},undestroy:function(){this._readableState&&(this._readableState.destroyed=!1,this._readableState.reading=!1,this._readableState.ended=!1,this._readableState.endEmitted=!1),this._writableState&&(this._writableState.destroyed=!1,this._writableState.ended=!1,this._writableState.ending=!1,this._writableState.finished=!1,this._writableState.errorEmitted=!1)}}},function(e,t,n){"use strict";var r=n(61).Buffer,o=r.isEncoding||function(e){switch((e=""+e)&&e.toLowerCase()){case"hex":case"utf8":case"utf-8":case"ascii":case"binary":case"base64":case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":case"raw":return!0;default:return!1}};function i(e){var t;switch(this.encoding=function(e){var t=function(e){if(!e)return"utf8";for(var t;;)switch(e){case"utf8":case"utf-8":return"utf8";case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return"utf16le";case"latin1":case"binary":return"latin1";case"base64":case"ascii":case"hex":return e;default:if(t)return;e=(""+e).toLowerCase(),t=!0}}(e);if("string"!=typeof t&&(r.isEncoding===o||!o(e)))throw new Error("Unknown encoding: "+e);return t||e}(e),this.encoding){case"utf16le":this.text=c,this.end=u,t=4;break;case"utf8":this.fillLast=s,t=4;break;case"base64":this.text=l,this.end=f,t=3;break;default:return this.write=h,void(this.end=p)}this.lastNeed=0,this.lastTotal=0,this.lastChar=r.allocUnsafe(t)}function a(e){return e<=127?0:e>>5==6?2:e>>4==14?3:e>>3==30?4:e>>6==2?-1:-2}function s(e){var t=this.lastTotal-this.lastNeed,n=function(e,t,n){if(128!=(192&t[0]))return e.lastNeed=0,"�";if(e.lastNeed>1&&t.length>1){if(128!=(192&t[1]))return e.lastNeed=1,"�";if(e.lastNeed>2&&t.length>2&&128!=(192&t[2]))return e.lastNeed=2,"�"}}(this,e);return void 0!==n?n:this.lastNeed<=e.length?(e.copy(this.lastChar,t,0,this.lastNeed),this.lastChar.toString(this.encoding,0,this.lastTotal)):(e.copy(this.lastChar,t,0,e.length),void(this.lastNeed-=e.length))}function c(e,t){if((e.length-t)%2==0){var n=e.toString("utf16le",t);if(n){var r=n.charCodeAt(n.length-1);if(r>=55296&&r<=56319)return this.lastNeed=2,this.lastTotal=4,this.lastChar[0]=e[e.length-2],this.lastChar[1]=e[e.length-1],n.slice(0,-1)}return n}return this.lastNeed=1,this.lastTotal=2,this.lastChar[0]=e[e.length-1],e.toString("utf16le",t,e.length-1)}function u(e){var t=e&&e.length?this.write(e):"";if(this.lastNeed){var n=this.lastTotal-this.lastNeed;return t+this.lastChar.toString("utf16le",0,n)}return t}function l(e,t){var n=(e.length-t)%3;return 0===n?e.toString("base64",t):(this.lastNeed=3-n,this.lastTotal=3,1===n?this.lastChar[0]=e[e.length-1]:(this.lastChar[0]=e[e.length-2],this.lastChar[1]=e[e.length-1]),e.toString("base64",t,e.length-n))}function f(e){var t=e&&e.length?this.write(e):"";return this.lastNeed?t+this.lastChar.toString("base64",0,3-this.lastNeed):t}function h(e){return e.toString(this.encoding)}function p(e){return e&&e.length?this.write(e):""}t.StringDecoder=i,i.prototype.write=function(e){if(0===e.length)return"";var t,n;if(this.lastNeed){if(void 0===(t=this.fillLast(e)))return"";n=this.lastNeed,this.lastNeed=0}else n=0;return n=0)return o>0&&(e.lastNeed=o-1),o;if(--r=0)return o>0&&(e.lastNeed=o-2),o;if(--r=0)return o>0&&(2===o?o=0:e.lastNeed=o-3),o;return 0}(this,e,t);if(!this.lastNeed)return e.toString("utf8",t);this.lastTotal=n;var r=e.length-(n-this.lastNeed);return e.copy(this.lastChar,0,r),e.toString("utf8",t,r)},i.prototype.fillLast=function(e){if(this.lastNeed<=e.length)return e.copy(this.lastChar,this.lastTotal-this.lastNeed,0,this.lastNeed),this.lastChar.toString(this.encoding,0,this.lastTotal);e.copy(this.lastChar,this.lastTotal-this.lastNeed,0,e.length),this.lastNeed-=e.length}},function(e,t,n){"use strict";(function(t,r,o){var i=n(23);function a(e){var t=this;this.next=null,this.entry=null,this.finish=function(){!function(e,t,n){var r=e.entry;e.entry=null;for(;r;){var o=r.callback;t.pendingcb--,o(n),r=r.next}t.corkedRequestsFree?t.corkedRequestsFree.next=e:t.corkedRequestsFree=e}(t,e)}}e.exports=b;var s,c=!t.browser&&["v0.10","v0.9."].indexOf(t.version.slice(0,5))>-1?r:i.nextTick;b.WritableState=v;var u=n(20);u.inherits=n(14);var l={deprecate:n(64)},f=n(38),h=n(13).Buffer,p=o.Uint8Array||function(){};var d,g=n(39);function y(){}function v(e,t){s=s||n(11),e=e||{};var r=t instanceof s;this.objectMode=!!e.objectMode,r&&(this.objectMode=this.objectMode||!!e.writableObjectMode);var o=e.highWaterMark,u=e.writableHighWaterMark,l=this.objectMode?16:16384;this.highWaterMark=o||0===o?o:r&&(u||0===u)?u:l,this.highWaterMark=Math.floor(this.highWaterMark),this.finalCalled=!1,this.needDrain=!1,this.ending=!1,this.ended=!1,this.finished=!1,this.destroyed=!1;var f=!1===e.decodeStrings;this.decodeStrings=!f,this.defaultEncoding=e.defaultEncoding||"utf8",this.length=0,this.writing=!1,this.corked=0,this.sync=!0,this.bufferProcessing=!1,this.onwrite=function(e){!function(e,t){var n=e._writableState,r=n.sync,o=n.writecb;if(function(e){e.writing=!1,e.writecb=null,e.length-=e.writelen,e.writelen=0}(n),t)!function(e,t,n,r,o){--t.pendingcb,n?(i.nextTick(o,r),i.nextTick(_,e,t),e._writableState.errorEmitted=!0,e.emit("error",r)):(o(r),e._writableState.errorEmitted=!0,e.emit("error",r),_(e,t))}(e,n,r,t,o);else{var a=S(n);a||n.corked||n.bufferProcessing||!n.bufferedRequest||E(e,n),r?c(w,e,n,a,o):w(e,n,a,o)}}(t,e)},this.writecb=null,this.writelen=0,this.bufferedRequest=null,this.lastBufferedRequest=null,this.pendingcb=0,this.prefinished=!1,this.errorEmitted=!1,this.bufferedRequestCount=0,this.corkedRequestsFree=new a(this)}function b(e){if(s=s||n(11),!(d.call(b,this)||this instanceof s))return new b(e);this._writableState=new v(e,this),this.writable=!0,e&&("function"==typeof e.write&&(this._write=e.write),"function"==typeof e.writev&&(this._writev=e.writev),"function"==typeof e.destroy&&(this._destroy=e.destroy),"function"==typeof e.final&&(this._final=e.final)),f.call(this)}function m(e,t,n,r,o,i,a){t.writelen=r,t.writecb=a,t.writing=!0,t.sync=!0,n?e._writev(o,t.onwrite):e._write(o,i,t.onwrite),t.sync=!1}function w(e,t,n,r){n||function(e,t){0===t.length&&t.needDrain&&(t.needDrain=!1,e.emit("drain"))}(e,t),t.pendingcb--,r(),_(e,t)}function E(e,t){t.bufferProcessing=!0;var n=t.bufferedRequest;if(e._writev&&n&&n.next){var r=t.bufferedRequestCount,o=new Array(r),i=t.corkedRequestsFree;i.entry=n;for(var s=0,c=!0;n;)o[s]=n,n.isBuf||(c=!1),n=n.next,s+=1;o.allBuffers=c,m(e,t,!0,t.length,o,"",i.finish),t.pendingcb++,t.lastBufferedRequest=null,i.next?(t.corkedRequestsFree=i.next,i.next=null):t.corkedRequestsFree=new a(t),t.bufferedRequestCount=0}else{for(;n;){var u=n.chunk,l=n.encoding,f=n.callback;if(m(e,t,!1,t.objectMode?1:u.length,u,l,f),n=n.next,t.bufferedRequestCount--,t.writing)break}null===n&&(t.lastBufferedRequest=null)}t.bufferedRequest=n,t.bufferProcessing=!1}function S(e){return e.ending&&0===e.length&&null===e.bufferedRequest&&!e.finished&&!e.writing}function C(e,t){e._final(function(n){t.pendingcb--,n&&e.emit("error",n),t.prefinished=!0,e.emit("prefinish"),_(e,t)})}function _(e,t){var n=S(t);return n&&(!function(e,t){t.prefinished||t.finalCalled||("function"==typeof e._final?(t.pendingcb++,t.finalCalled=!0,i.nextTick(C,e,t)):(t.prefinished=!0,e.emit("prefinish")))}(e,t),0===t.pendingcb&&(t.finished=!0,e.emit("finish"))),n}u.inherits(b,f),v.prototype.getBuffer=function(){for(var e=this.bufferedRequest,t=[];e;)t.push(e),e=e.next;return t},function(){try{Object.defineProperty(v.prototype,"buffer",{get:l.deprecate(function(){return this.getBuffer()},"_writableState.buffer is deprecated. Use _writableState.getBuffer instead.","DEP0003")})}catch(e){}}(),"function"==typeof Symbol&&Symbol.hasInstance&&"function"==typeof Function.prototype[Symbol.hasInstance]?(d=Function.prototype[Symbol.hasInstance],Object.defineProperty(b,Symbol.hasInstance,{value:function(e){return!!d.call(this,e)||this===b&&(e&&e._writableState instanceof v)}})):d=function(e){return e instanceof this},b.prototype.pipe=function(){this.emit("error",new Error("Cannot pipe, not readable"))},b.prototype.write=function(e,t,n){var r,o=this._writableState,a=!1,s=!o.objectMode&&(r=e,h.isBuffer(r)||r instanceof p);return s&&!h.isBuffer(e)&&(e=function(e){return h.from(e)}(e)),"function"==typeof t&&(n=t,t=null),s?t="buffer":t||(t=o.defaultEncoding),"function"!=typeof n&&(n=y),o.ended?function(e,t){var n=new Error("write after end");e.emit("error",n),i.nextTick(t,n)}(this,n):(s||function(e,t,n,r){var o=!0,a=!1;return null===n?a=new TypeError("May not write null values to stream"):"string"==typeof n||void 0===n||t.objectMode||(a=new TypeError("Invalid non-string/buffer chunk")),a&&(e.emit("error",a),i.nextTick(r,a),o=!1),o}(this,o,e,n))&&(o.pendingcb++,a=function(e,t,n,r,o,i){if(!n){var a=function(e,t,n){e.objectMode||!1===e.decodeStrings||"string"!=typeof t||(t=h.from(t,n));return t}(t,r,o);r!==a&&(n=!0,o="buffer",r=a)}var s=t.objectMode?1:r.length;t.length+=s;var c=t.length-1))throw new TypeError("Unknown encoding: "+e);return this._writableState.defaultEncoding=e,this},Object.defineProperty(b.prototype,"writableHighWaterMark",{enumerable:!1,get:function(){return this._writableState.highWaterMark}}),b.prototype._write=function(e,t,n){n(new Error("_write() is not implemented"))},b.prototype._writev=null,b.prototype.end=function(e,t,n){var r=this._writableState;"function"==typeof e?(n=e,e=null,t=null):"function"==typeof t&&(n=t,t=null),null!=e&&this.write(e,t),r.corked&&(r.corked=1,this.uncork()),r.ending||r.finished||function(e,t,n){t.ending=!0,_(e,t),n&&(t.finished?i.nextTick(n):e.once("finish",n));t.ended=!0,e.writable=!1}(this,r,n)},Object.defineProperty(b.prototype,"destroyed",{get:function(){return void 0!==this._writableState&&this._writableState.destroyed},set:function(e){this._writableState&&(this._writableState.destroyed=e)}}),b.prototype.destroy=g.destroy,b.prototype._undestroy=g.undestroy,b.prototype._destroy=function(e,t){this.end(),t(e)}}).call(this,n(19),n(62).setImmediate,n(10))},function(e,t,n){"use strict";e.exports=a;var r=n(11),o=n(20);function i(e,t){var n=this._transformState;n.transforming=!1;var r=n.writecb;if(!r)return this.emit("error",new Error("write callback called multiple times"));n.writechunk=null,n.writecb=null,null!=t&&this.push(t),r(e);var o=this._readableState;o.reading=!1,(o.needReadable||o.length=200&&c.statusCode<300?r(new a.b(c.statusCode,c.statusMessage||"",u)):o(new i.b(c.statusMessage||"",c.statusCode||0))});t.abortSignal&&(t.abortSignal.onabort=function(){f.abort(),o(new i.a)})})},n.prototype.getCookieString=function(e){return this.cookieJar.getCookieString(e)},n}(a.a)}).call(this,n(5).Buffer)},function(e,t,n){"use strict";(function(e){n.d(t,"a",function(){return i});var r=n(7),o=n(1),i=function(){function t(){}return t.prototype.writeHandshakeRequest=function(e){return r.a.write(JSON.stringify(e))},t.prototype.parseHandshakeResponse=function(t){var n,i;if(Object(o.g)(t)||void 0!==e&&t instanceof e){var a=new Uint8Array(t);if(-1===(c=a.indexOf(r.a.RecordSeparatorCode)))throw new Error("Message is incomplete.");var s=c+1;n=String.fromCharCode.apply(null,a.slice(0,s)),i=a.byteLength>s?a.slice(s).buffer:null}else{var c,u=t;if(-1===(c=u.indexOf(r.a.RecordSeparator)))throw new Error("Message is incomplete.");s=c+1;n=u.substring(0,s),i=u.length>s?u.substring(s):null}var l=r.a.parse(n),f=JSON.parse(l[0]);if(f.type)throw new Error("Expected a handshake response from the server.");return[i,f]},t}()}).call(this,n(5).Buffer)},,,,,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]0)&&!(r=i.next()).done;)a.push(r.value)}catch(e){o={error:e}}finally{try{r&&!r.done&&(n=i.return)&&n.call(i)}finally{if(o)throw o.error}}return a},a=this&&this.__spread||function(){for(var e=[],t=0;t0?r-4:r,f=0;f>16&255,s[c++]=t>>8&255,s[c++]=255&t;2===a&&(t=o[e.charCodeAt(f)]<<2|o[e.charCodeAt(f+1)]>>4,s[c++]=255&t);1===a&&(t=o[e.charCodeAt(f)]<<10|o[e.charCodeAt(f+1)]<<4|o[e.charCodeAt(f+2)]>>2,s[c++]=t>>8&255,s[c++]=255&t);return s},t.fromByteArray=function(e){for(var t,n=e.length,o=n%3,i=[],a=0,s=n-o;as?s:a+16383));1===o?(t=e[n-1],i.push(r[t>>2]+r[t<<4&63]+"==")):2===o&&(t=(e[n-2]<<8)+e[n-1],i.push(r[t>>10]+r[t>>4&63]+r[t<<2&63]+"="));return i.join("")};for(var r=[],o=[],i="undefined"!=typeof Uint8Array?Uint8Array:Array,a="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",s=0,c=a.length;s0)throw new Error("Invalid string. Length must be a multiple of 4");var n=e.indexOf("=");return-1===n&&(n=t),[n,n===t?0:4-n%4]}function l(e,t,n){for(var o,i,a=[],s=t;s>18&63]+r[i>>12&63]+r[i>>6&63]+r[63&i]);return a.join("")}o["-".charCodeAt(0)]=62,o["_".charCodeAt(0)]=63},function(e,t){t.read=function(e,t,n,r,o){var i,a,s=8*o-r-1,c=(1<>1,l=-7,f=n?o-1:0,h=n?-1:1,p=e[t+f];for(f+=h,i=p&(1<<-l)-1,p>>=-l,l+=s;l>0;i=256*i+e[t+f],f+=h,l-=8);for(a=i&(1<<-l)-1,i>>=-l,l+=r;l>0;a=256*a+e[t+f],f+=h,l-=8);if(0===i)i=1-u;else{if(i===c)return a?NaN:1/0*(p?-1:1);a+=Math.pow(2,r),i-=u}return(p?-1:1)*a*Math.pow(2,i-r)},t.write=function(e,t,n,r,o,i){var a,s,c,u=8*i-o-1,l=(1<>1,h=23===o?Math.pow(2,-24)-Math.pow(2,-77):0,p=r?0:i-1,d=r?1:-1,g=t<0||0===t&&1/t<0?1:0;for(t=Math.abs(t),isNaN(t)||t===1/0?(s=isNaN(t)?1:0,a=l):(a=Math.floor(Math.log(t)/Math.LN2),t*(c=Math.pow(2,-a))<1&&(a--,c*=2),(t+=a+f>=1?h/c:h*Math.pow(2,1-f))*c>=2&&(a++,c/=2),a+f>=l?(s=0,a=l):a+f>=1?(s=(t*c-1)*Math.pow(2,o),a+=f):(s=t*Math.pow(2,f-1)*Math.pow(2,o),a=0));o>=8;e[n+p]=255&s,p+=d,s/=256,o-=8);for(a=a<0;e[n+p]=255&a,p+=d,a/=256,u-=8);e[n+p-d]|=128*g}},function(e,t){var n={}.toString;e.exports=Array.isArray||function(e){return"[object Array]"==n.call(e)}},function(e,t,n){"use strict";(function(t){ /*! * The buffer module from node.js, for the browser. * diff --git a/src/Components/Web.JS/dist/Release/blazor.webassembly.js b/src/Components/Web.JS/dist/Release/blazor.webassembly.js index 4d485caeb7..fa1237693c 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;d0&&!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(n0;)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]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]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]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]-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>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(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;d0&&!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(n0;)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]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]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]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]-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>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/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 45c17a23fb..74a0b82c27 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 @@ + + diff --git a/src/Components/Web/src/Microsoft.AspNetCore.Components.Web.csproj b/src/Components/Web/src/Microsoft.AspNetCore.Components.Web.csproj index 1f683d5d49..2c602acd95 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 @@ - + netstandard2.0;netcoreapp3.0 @@ -14,10 +14,7 @@ - - - - + 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 3116c4aefc..8d970f9924 100644 --- a/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj +++ b/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj @@ -11,7 +11,7 @@ - + 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 aa272b1397..d2e2c57090 100644 --- a/src/Mvc/Mvc.ViewFeatures/src/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj +++ b/src/Mvc/Mvc.ViewFeatures/src/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj @@ -22,8 +22,8 @@ Microsoft.AspNetCore.Mvc.ViewComponent - + From 3b51b55176d85637742be6ab1259fc3f8820e56c Mon Sep 17 00:00:00 2001 From: Ryan Nowak Date: Wed, 14 Aug 2019 18:32:55 -0700 Subject: [PATCH 22/94] 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. --- .../Server/src/CircuitDisconnectMiddleware.cs | 56 +++--- src/Components/Server/src/Circuits/Circuit.cs | 2 +- .../Server/src/Circuits/CircuitHost.cs | 123 +++++++------- .../Server/src/Circuits/CircuitId.cs | 63 +++++++ .../Server/src/Circuits/CircuitIdFactory.cs | 56 ++++-- .../Server/src/Circuits/CircuitRegistry.cs | 160 +++++++++--------- .../src/Circuits/DefaultCircuitFactory.cs | 8 +- src/Components/Server/src/ComponentHub.cs | 62 ++++++- .../test/CircuitDisconnectMiddlewareTest.cs | 16 +- .../Server/test/Circuits/CircuitHostTest.cs | 20 +-- .../test/Circuits/CircuitIdFactoryTest.cs | 31 ++-- .../test/Circuits/CircuitRegistryTest.cs | 16 +- .../Server/test/Circuits/TestCircuitHost.cs | 6 +- .../CircuitGracefulTerminationTests.cs | 3 - .../ComponentHubReliabilityTest.cs | 33 ++-- .../testassets/TestServer/appsettings.json | 2 +- 16 files changed, 403 insertions(+), 254 deletions(-) create mode 100644 src/Components/Server/src/Circuits/CircuitId.cs 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 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 _circuitTerminatedGracefully = - LoggerMessage.Define(LogLevel.Debug, new EventId(1, "CircuitTerminatedGracefully"), "Circuit '{CircuitId}' terminated gracefully"); + private static readonly Action _circuitTerminatingGracefully = + LoggerMessage.Define(LogLevel.Debug, new EventId(1, "CircuitTerminatingGracefully"), "Circuit with id '{CircuitId}' terminating gracefully."); - private static readonly Action _unhandledExceptionInCircuit = - LoggerMessage.Define(LogLevel.Warning, new EventId(2, "UnhandledExceptionInCircuit"), "Unhandled exception in circuit {CircuitId} while terminating gracefully."); + private static readonly Action _circuitTerminatedGracefully = + LoggerMessage.Define(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 _invalidCircuitId = + LoggerMessage.Define(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/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 /// /// Gets the identifier for the . /// - public string Id => _circuitHost.CircuitId; + public string Id => _circuitHost.CircuitId.Id; } } diff --git a/src/Components/Server/src/Circuits/CircuitHost.cs b/src/Components/Server/src/Circuits/CircuitHost.cs index a2c9ac869b..e664f32918 100644 --- a/src/Components/Server/src/Circuits/CircuitHost.cs +++ b/src/Components/Server/src/Circuits/CircuitHost.cs @@ -38,7 +38,7 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits public event UnhandledExceptionEventHandler UnhandledException; public CircuitHost( - string circuitId, + CircuitId circuitId, IServiceScope scope, CircuitOptions options, CircuitClientProxy client, @@ -48,7 +48,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)); @@ -70,7 +75,7 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits public CircuitHandle Handle { get; } - public string CircuitId { get; } + public CircuitId CircuitId { get; } public Circuit Circuit { get; } @@ -194,7 +199,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(); @@ -223,7 +228,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(); @@ -252,7 +257,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(); @@ -281,7 +286,7 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits private async Task OnCircuitDownAsync(CancellationToken cancellationToken) { - Log.CircuitClosed(_logger, Circuit.Id); + Log.CircuitClosed(_logger, CircuitId); List exceptions = null; @@ -585,19 +590,19 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits private static readonly Action _intializationStarted; private static readonly Action _intializationSucceded; private static readonly Action _intializationFailed; - private static readonly Action _disposeStarted; - private static readonly Action _disposeSucceded; - private static readonly Action _disposeFailed; - private static readonly Action _onCircuitOpened; - private static readonly Action _onConnectionUp; - private static readonly Action _onConnectionDown; - private static readonly Action _onCircuitClosed; + private static readonly Action _disposeStarted; + private static readonly Action _disposeSucceded; + private static readonly Action _disposeFailed; + private static readonly Action _onCircuitOpened; + private static readonly Action _onConnectionUp; + private static readonly Action _onConnectionDown; + private static readonly Action _onCircuitClosed; private static readonly Action _circuitHandlerFailed; - private static readonly Action _circuitUnhandledException; - private static readonly Action _circuitTransmittingClientError; - private static readonly Action _circuitTransmittedClientErrorSuccess; - private static readonly Action _circuitTransmitErrorFailed; - private static readonly Action _unhandledExceptionClientDisconnected; + private static readonly Action _circuitUnhandledException; + private static readonly Action _circuitTransmittingClientError; + private static readonly Action _circuitTransmittedClientErrorSuccess; + private static readonly Action _circuitTransmitErrorFailed; + private static readonly Action _unhandledExceptionClientDisconnected; private static readonly Action _beginInvokeDotNetStatic; private static readonly Action _beginInvokeDotNetInstance; @@ -608,11 +613,11 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits private static readonly Action _endInvokeJSSucceeded; private static readonly Action _dispatchEventFailedToParseEventData; private static readonly Action _dispatchEventFailedToDispatchEvent; - private static readonly Action _locationChange; - private static readonly Action _locationChangeSucceeded; - private static readonly Action _locationChangeFailed; - private static readonly Action _locationChangeFailedInCircuit; - private static readonly Action _onRenderCompletedFailed; + private static readonly Action _locationChange; + private static readonly Action _locationChangeSucceeded; + private static readonly Action _locationChangeFailed; + private static readonly Action _locationChangeFailedInCircuit; + private static readonly Action _onRenderCompletedFailed; private static class EventIds { @@ -647,7 +652,7 @@ 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() @@ -667,37 +672,37 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits EventIds.InitializationFailed, "Circuit initialization failed."); - _disposeStarted = LoggerMessage.Define( + _disposeStarted = LoggerMessage.Define( LogLevel.Debug, EventIds.DisposeStarted, "Disposing circuit '{CircuitId}' started."); - _disposeSucceded = LoggerMessage.Define( + _disposeSucceded = LoggerMessage.Define( LogLevel.Debug, EventIds.DisposeSucceeded, "Disposing circuit '{CircuitId}' succeded."); - _disposeFailed = LoggerMessage.Define( + _disposeFailed = LoggerMessage.Define( LogLevel.Debug, EventIds.DisposeFailed, "Disposing circuit '{CircuitId}' failed."); - _onCircuitOpened = LoggerMessage.Define( + _onCircuitOpened = LoggerMessage.Define( LogLevel.Debug, EventIds.OnCircuitOpened, "Opening circuit with id '{CircuitId}'."); - _onConnectionUp = LoggerMessage.Define( + _onConnectionUp = LoggerMessage.Define( LogLevel.Debug, EventIds.OnConnectionUp, "Circuit id '{CircuitId}' connected using connection '{ConnectionId}'."); - _onConnectionDown = LoggerMessage.Define( + _onConnectionDown = LoggerMessage.Define( LogLevel.Debug, EventIds.OnConnectionDown, "Circuit id '{CircuitId}' disconnected from connection '{ConnectionId}'."); - _onCircuitClosed = LoggerMessage.Define( + _onCircuitClosed = LoggerMessage.Define( LogLevel.Debug, EventIds.OnCircuitClosed, "Closing circuit with id '{CircuitId}'."); @@ -707,27 +712,27 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits EventIds.CircuitHandlerFailed, "Unhandled error invoking circuit handler type {handlerType}.{handlerMethod}: {Message}"); - _circuitUnhandledException = LoggerMessage.Define( + _circuitUnhandledException = LoggerMessage.Define( LogLevel.Error, EventIds.CircuitUnhandledException, "Unhandled exception in circuit '{CircuitId}'."); - _circuitTransmittingClientError = LoggerMessage.Define( + _circuitTransmittingClientError = LoggerMessage.Define( LogLevel.Debug, EventIds.CircuitTransmittingClientError, "About to notify client of an error in circuit '{CircuitId}'."); - _circuitTransmittedClientErrorSuccess = LoggerMessage.Define( + _circuitTransmittedClientErrorSuccess = LoggerMessage.Define( LogLevel.Debug, EventIds.CircuitTransmittedClientErrorSuccess, "Successfully transmitted error to client in circuit '{CircuitId}'."); - _circuitTransmitErrorFailed = LoggerMessage.Define( + _circuitTransmitErrorFailed = LoggerMessage.Define( LogLevel.Debug, EventIds.CircuitTransmitErrorFailed, "Failed to transmit exception to client in circuit '{CircuitId}'."); - _unhandledExceptionClientDisconnected = LoggerMessage.Define( + _unhandledExceptionClientDisconnected = LoggerMessage.Define( LogLevel.Debug, EventIds.UnhandledExceptionClientDisconnected, "An exception ocurred on the circuit host '{CircuitId}' while the client is disconnected."); @@ -777,27 +782,27 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits EventIds.DispatchEventFailedToDispatchEvent, "There was an error dispatching the event '{EventHandlerId}' to the application."); - _locationChange = LoggerMessage.Define( + _locationChange = LoggerMessage.Define( LogLevel.Debug, EventIds.LocationChange, "Location changing to {URI} in circuit '{CircuitId}'."); - _locationChangeSucceeded = LoggerMessage.Define( + _locationChangeSucceeded = LoggerMessage.Define( LogLevel.Debug, EventIds.LocationChangeSucceded, "Location change to '{URI}' in circuit '{CircuitId}' succeded."); - _locationChangeFailed = LoggerMessage.Define( + _locationChangeFailed = LoggerMessage.Define( LogLevel.Debug, EventIds.LocationChangeFailed, "Location change to '{URI}' in circuit '{CircuitId}' failed."); - _locationChangeFailedInCircuit = LoggerMessage.Define( + _locationChangeFailedInCircuit = LoggerMessage.Define( LogLevel.Error, EventIds.LocationChangeFailed, "Location change to '{URI}' in circuit '{CircuitId}' failed."); - _onRenderCompletedFailed = LoggerMessage.Define( + _onRenderCompletedFailed = LoggerMessage.Define( LogLevel.Debug, EventIds.OnRenderCompletedFailed, "Failed to complete render batch '{RenderId}' in circuit host '{CircuitId}'."); @@ -806,13 +811,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) { @@ -824,8 +829,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); @@ -856,14 +861,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 + { + 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..3d47161fea 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"; + + // 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 options, ILogger logger, - CircuitIdFactory circuitIdFactory) + CircuitIdFactory CircuitHostFactory) { _options = options.Value; _logger = logger; - _circuitIdFactory = circuitIdFactory; - ConnectedCircuits = new ConcurrentDictionary(StringComparer.Ordinal); + _circuitIdFactory = CircuitHostFactory; + ConnectedCircuits = new ConcurrentDictionary(); DisconnectedCircuits = new MemoryCache(new MemoryCacheOptions { @@ -65,7 +65,7 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits }; } - internal ConcurrentDictionary ConnectedCircuits { get; } + internal ConcurrentDictionary 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 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 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 _exceptionDisposingCircuitHost; private static readonly Action _unhandledExceptionDisposingTokenSource; - private static readonly Action _circuitReconnectStarted; - private static readonly Action _invalidCircuitId; - private static readonly Action _connectingToActiveCircuit; - private static readonly Action _connectingToDisconnectedCircuit; - private static readonly Action _failedToReconnectToCircuit; - private static readonly Action _reconnectionSucceeded; - private static readonly Action _circuitDisconnectStarted; - private static readonly Action _circuitNotActive; - private static readonly Action _circuitConnectedToDifferentConnection; - private static readonly Action _circuitMarkedDisconnected; - private static readonly Action _circuitDisconnectedPermanently; - private static readonly Action _circuitEvicted; - private static readonly Action _circuitExceptionHandlerFailed; + private static readonly Action _circuitReconnectStarted; + private static readonly Action _failedToFindCircuit; + private static readonly Action _connectingToActiveCircuit; + private static readonly Action _connectingToDisconnectedCircuit; + private static readonly Action _failedToReconnectToCircuit; + private static readonly Action _reconnectionSucceeded; + private static readonly Action _circuitDisconnectStarted; + private static readonly Action _circuitNotActive; + private static readonly Action _circuitConnectedToDifferentConnection; + private static readonly Action _circuitMarkedDisconnected; + private static readonly Action _circuitDisconnectedPermanently; + private static readonly Action _circuitEvicted; + private static readonly Action _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( + _circuitReconnectStarted = LoggerMessage.Define( LogLevel.Debug, EventIds.AttemptingToReconnect, - "Attempting to reconnect to Circuit with id {CircuitId}."); + "Attempting to reconnect to Circuit with secret {CircuitHost}."); - _invalidCircuitId = LoggerMessage.Define( + _failedToFindCircuit = LoggerMessage.Define( 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( + _connectingToActiveCircuit = LoggerMessage.Define( LogLevel.Debug, EventIds.ConnectingToActiveCircuit, "Transferring active circuit {CircuitId} to connection {ConnectionId}."); - _connectingToDisconnectedCircuit = LoggerMessage.Define( + _connectingToDisconnectedCircuit = LoggerMessage.Define( LogLevel.Debug, EventIds.ConnectingToDisconnectedCircuit, "Transfering disconnected circuit {CircuitId} to connection {ConnectionId}."); - _failedToReconnectToCircuit = LoggerMessage.Define( + _failedToReconnectToCircuit = LoggerMessage.Define( LogLevel.Debug, EventIds.FailedToReconnectToCircuit, "Failed to reconnect to a circuit with id {CircuitId}."); - _reconnectionSucceeded = LoggerMessage.Define( + _reconnectionSucceeded = LoggerMessage.Define( LogLevel.Debug, EventIds.FailedToReconnectToCircuit, "Reconnect to circuit with id {CircuitId} succeeded."); - _circuitDisconnectStarted = LoggerMessage.Define( + _circuitDisconnectStarted = LoggerMessage.Define( LogLevel.Debug, EventIds.CircuitDisconnectStarted, "Attempting to disconnect circuit with id {CircuitId} from connection {ConnectionId}."); - _circuitNotActive = LoggerMessage.Define( + _circuitNotActive = LoggerMessage.Define( LogLevel.Debug, EventIds.CircuitNotActive, "Failed to disconnect circuit with id {CircuitId}. The circuit is not active."); - _circuitConnectedToDifferentConnection = LoggerMessage.Define( + _circuitConnectedToDifferentConnection = LoggerMessage.Define( LogLevel.Debug, EventIds.CircuitConnectedToDifferentConnection, "Failed to disconnect circuit with id {CircuitId}. The circuit is connected to {ConnectionId}."); - _circuitMarkedDisconnected = LoggerMessage.Define( + _circuitMarkedDisconnected = LoggerMessage.Define( LogLevel.Debug, EventIds.CircuitMarkedDisconnected, "Circuit with id {CircuitId} is disconnected."); - _circuitDisconnectedPermanently = LoggerMessage.Define( + _circuitDisconnectedPermanently = LoggerMessage.Define( LogLevel.Debug, EventIds.CircuitDisconnectedPermanently, "Circuit with id {CircuitId} has been removed from the registry for permanent disconnection."); - _circuitEvicted = LoggerMessage.Define( + _circuitEvicted = LoggerMessage.Define( LogLevel.Debug, EventIds.CircuitEvicted, "Circuit with id {CircuitId} evicted due to {EvictionReason}."); - _circuitExceptionHandlerFailed = LoggerMessage.Define( + _circuitExceptionHandlerFailed = LoggerMessage.Define( 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/Circuits/DefaultCircuitFactory.cs b/src/Components/Server/src/Circuits/DefaultCircuitFactory.cs index 59ac520ea1..83886bb3b8 100644 --- a/src/Components/Server/src/Circuits/DefaultCircuitFactory.cs +++ b/src/Components/Server/src/Circuits/DefaultCircuitFactory.cs @@ -111,11 +111,11 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits private static class Log { - private static readonly Action _createdConnectedCircuit = - LoggerMessage.Define(LogLevel.Debug, new EventId(1, "CreatedConnectedCircuit"), "Created circuit {CircuitId} for connection {ConnectionId}"); + private static readonly Action _createdConnectedCircuit = + LoggerMessage.Define(LogLevel.Debug, new EventId(1, "CreatedConnectedCircuit"), "Created circuit {CircuitId} for connection {ConnectionId}"); - private static readonly Action _createdDisconnectedCircuit = - LoggerMessage.Define(LogLevel.Debug, new EventId(2, "CreatedDisconnectedCircuit"), "Created circuit {CircuitId} for disconnected client"); + private static readonly Action _createdDisconnectedCircuit = + LoggerMessage.Define(LogLevel.Debug, new EventId(2, "CreatedDisconnectedCircuit"), "Created circuit {CircuitId} for disconnected client"); internal static void CreatedCircuit(ILogger logger, CircuitHost circuitHost) { diff --git a/src/Components/Server/src/ComponentHub.cs b/src/Components/Server/src/ComponentHub.cs index 7ba95300de..a31982ea8f 100644 --- a/src/Components/Server/src/ComponentHub.cs +++ b/src/Components/Server/src/ComponentHub.cs @@ -38,17 +38,20 @@ namespace Microsoft.AspNetCore.Components.Server { private static readonly object CircuitKey = new object(); private readonly CircuitFactory _circuitFactory; + private readonly CircuitIdFactory _circuitIdFactory; private readonly CircuitRegistry _circuitRegistry; private readonly CircuitOptions _options; private readonly ILogger _logger; public ComponentHub( CircuitFactory circuitFactory, + CircuitIdFactory circuitIdFactory, CircuitRegistry circuitRegistry, ILogger logger, IOptions options) { _circuitFactory = circuitFactory; + _circuitIdFactory = circuitIdFactory; _circuitRegistry = circuitRegistry; _options = options.Value; _logger = logger; @@ -129,7 +132,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 +150,22 @@ namespace Microsoft.AspNetCore.Components.Server } } - public async ValueTask ConnectCircuit(string circuitId) + public async ValueTask 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); @@ -270,8 +290,8 @@ namespace Microsoft.AspNetCore.Components.Server private static readonly Action _unhandledExceptionInCircuit = LoggerMessage.Define(LogLevel.Warning, new EventId(3, "UnhandledExceptionInCircuit"), "Unhandled exception in circuit {CircuitId}"); - private static readonly Action _circuitAlreadyInitialized = - LoggerMessage.Define(LogLevel.Debug, new EventId(4, "CircuitAlreadyInitialized"), "The circuit host '{CircuitId}' has already been initialized"); + private static readonly Action _circuitAlreadyInitialized = + LoggerMessage.Define(LogLevel.Debug, new EventId(4, "CircuitAlreadyInitialized"), "The circuit host '{CircuitId}' has already been initialized"); private static readonly Action _circuitHostNotInitialized = LoggerMessage.Define(LogLevel.Debug, new EventId(5, "CircuitHostNotInitialized"), "Call to '{CallSite}' received before the circuit host initialization"); @@ -285,11 +305,17 @@ namespace Microsoft.AspNetCore.Components.Server private static readonly Action _circuitInitializationFailed = LoggerMessage.Define(LogLevel.Debug, new EventId(8, "CircuitInitializationFailed"), "Circuit initialization failed"); + private static readonly Action _createdCircuit = + LoggerMessage.Define(LogLevel.Debug, new EventId(8, "CreatedCircuit"), "Created circuit '{CircuitId}' with secret '{CircuitIdSecret}' for '{ConnectionId}'"); + + private static readonly Action _invalidCircuitId = + LoggerMessage.Define(LogLevel.Debug, new EventId(9, "InvalidCircuitId"), "ConnectAsync recieved an invalid circuit id '{CircuitIdSecret}'"); + public static void NoComponentsRegisteredInEndpoint(ILogger logger, string endpointDisplayName) => _noComponentsRegisteredInEndpoint(logger, endpointDisplayName, null); 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 +324,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/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.Instance, @@ -151,7 +151,7 @@ namespace Microsoft.AspNetCore.Components.Server (ctx) => Task.CompletedTask); using var memory = new MemoryStream(); - await new FormUrlEncodedContent(new Dictionary { ["circuitId"] = id }).CopyToAsync(memory); + await new FormUrlEncodedContent(new Dictionary { ["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 { ["circuitId"] = id }).CopyToAsync(memory); + await new FormUrlEncodedContent(new Dictionary { ["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 { ["circuitId"] = id }).CopyToAsync(memory); + await new FormUrlEncodedContent(new Dictionary { ["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..1d5ec1c772 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(); 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(); 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(); 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); 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..245f29c114 100644 --- a/src/Components/Server/test/Circuits/CircuitRegistryTest.cs +++ b/src/Components/Server/test/Circuits/CircuitRegistryTest.cs @@ -163,14 +163,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 +267,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 +297,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 +322,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 +355,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 +370,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/TestCircuitHost.cs b/src/Components/Server/test/Circuits/TestCircuitHost.cs index e0a2e0bd54..b6c52eaf9c 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 descriptors, RemoteJSRuntime jsRuntime, CircuitHandler[] circuitHandlers, ILogger logger) + private TestCircuitHost(CircuitId circuitId, IServiceScope scope, CircuitOptions options, CircuitClientProxy client, RemoteRenderer renderer, IReadOnlyList 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, @@ -44,7 +44,7 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits handlers = handlers ?? Array.Empty(); 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/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/ComponentHubReliabilityTest.cs b/src/Components/test/E2ETest/ServerExecutionTests/ComponentHubReliabilityTest.cs index 4721ca053f..536717ec41 100644 --- a/src/Components/test/E2ETest/ServerExecutionTests/ComponentHubReliabilityTest.cs +++ b/src/Components/test/E2ETest/ServerExecutionTests/ComponentHubReliabilityTest.cs @@ -63,7 +63,7 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests private void LogMessages(WriteContext context) { - var log = new LogMessage(context.LogLevel, context.Message, context.Exception); + var log = new LogMessage(context.LogLevel, context.EventId, context.Message, context.Exception); Logs.Enqueue(log); Output.WriteLine(log.ToString()); } @@ -309,10 +309,11 @@ 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 => (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'.")); + + 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); } [Fact] @@ -384,10 +385,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] @@ -414,10 +415,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] @@ -501,20 +502,22 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests [DebuggerDisplay("{LogLevel.ToString(),nq} - {Message ?? \"null\",nq} - {Exception?.Message,nq}")] private class LogMessage { - public LogMessage(LogLevel logLevel, string message, Exception exception) + 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}: {Message}{(Exception != null ? Environment.NewLine : "")}{Exception}"; + return $"{LogLevel}: {EventId} {Message}{(Exception != null ? Environment.NewLine : "")}{Exception}"; } } 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": { From aafb0813e6175dc1af1e3beeca1747201f9c5a0c Mon Sep 17 00:00:00 2001 From: Ryan Nowak Date: Wed, 14 Aug 2019 13:08:15 -0700 Subject: [PATCH 23/94] 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. --- .../Build/test/BindRazorIntegrationTest.cs | 5 + .../ComponentRenderingRazorIntegrationTest.cs | 12 +- .../test/RenderingRazorIntegrationTest.cs | 81 +-- .../BlazorWasm-CSharp/Client/_Imports.razor | 1 + .../HostedInAspNet.Client/_Imports.razor | 1 + .../_Imports.razor | 1 + .../testassets/StandaloneApp/_Imports.razor | 3 +- ...oft.AspNetCore.Components.netcoreapp3.0.cs | 16 + ...ft.AspNetCore.Components.netstandard2.0.cs | 16 + .../src/BindElementAttribute.cs | 0 .../src/EventHandlerAttribute.cs | 0 src/Components/Shared/src/WebEventData.cs | 20 +- ...AspNetCore.Components.Web.netcoreapp3.0.cs | 519 +++++++++--------- ...spNetCore.Components.Web.netstandard2.0.cs | 519 +++++++++--------- src/Components/Web/src/EventHandlers.cs | 128 ----- .../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 +- .../ComponentHubReliabilityTest.cs | 2 +- .../InteropReliabilityTests.cs | 2 +- .../AsyncEventHandlerComponent.razor | 4 +- .../EventCallbackTest/ButtonComponent.razor | 2 +- .../StronglyTypedButton.razor | 2 +- .../BasicTestApp/FocusEventComponent.razor | 8 +- .../BasicTestApp/KeyPressEventComponent.razor | 2 +- .../BasicTestApp/MouseEventComponent.razor | 18 +- .../BasicTestApp/TouchEventComponent.razor | 2 +- .../testassets/BasicTestApp/_Imports.razor | 1 + .../ComponentsApp.App/_Imports.razor | 1 + .../test/testassets/Ignitor/ElementNode.cs | 2 +- .../TestContentPackage/_Imports.razor | 1 + .../MvcSandbox/Components/_Imports.razor | 1 + .../WebSites/BasicWebSite/BasicWebSite.csproj | 1 + .../RazorComponents/_Imports.razor | 1 + .../BlazorServerWeb-CSharp/_Imports.razor | 1 + .../.template.config/template.json | 1 + .../RazorClassLibrary-CSharp/_Imports.razor | 1 + .../test/template-baselines.json | 1 + 51 files changed, 855 insertions(+), 817 deletions(-) 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%) 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/testassets/BasicTestApp/_Imports.razor create mode 100644 src/Components/test/testassets/TestContentPackage/_Imports.razor 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 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 @code { public int ParentValue { get; set; } = 42; @@ -292,6 +293,7 @@ namespace Test { // Arrange var component = CompileToComponent(@" +@using Microsoft.AspNetCore.Components.Web @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 @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 @code { public int ParentValue { get; set; } = 42; @@ -360,6 +364,7 @@ namespace Test { // Arrange var component = CompileToComponent(@" +@using Microsoft.AspNetCore.Components.Web @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 OnClick { get; set; } + public Action OnClick { get; set; } } } ")); var component = CompileToComponent($@" +@using Microsoft.AspNetCore.Components.Web @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>(frame.AttributeValue); + var handler = Assert.IsType>(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

@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( - @" - @code { - public string MyValue { get; set; } = ""Initial value""; - }"); + var component = CompileToComponent(@" +@using Microsoft.AspNetCore.Components.Web + +@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( - @" - @code { - public string MyValue { get; set; } = ""Initial value""; - }"); + var component = CompileToComponent(@" +@using Microsoft.AspNetCore.Components.Web + +@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( - @" - @code { - public DateTime MyDate { get; set; } = new DateTime(2018, 3, 4, 1, 2, 3); - }"); + var component = CompileToComponent(@" +@using Microsoft.AspNetCore.Components.Web + +@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( - $@" - @code {{ - public DateTime MyDate {{ get; set; }} = new DateTime(2018, 3, 4); - }}"); + var component = CompileToComponent($@" +@using Microsoft.AspNetCore.Components.Web + +@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