From 5cd72c1fb2acfdc23e510da44bfa4541588e3dcb Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 7 Feb 2019 09:06:27 -0800 Subject: [PATCH] Remove ANCMV1 from everywhere (#7334) --- .../WebHostFunctionalTests.cs | 3 +- .../src/Common/ANCMVersion.cs | 12 - .../src/Common/DeploymentParameters.cs | 7 - .../Server.IntegrationTesting/src/Http.config | 1034 ----------------- .../src/TestMatrix.cs | 36 +- .../src/TestVariant.cs | 6 +- .../MusicStore/Properties/launchSettings.json | 2 - .../NtlmAuthentationTest.cs | 1 - .../MusicStore.E2ETests/OpenIdConnectTests.cs | 1 - .../MusicStore.E2ETests/PublishAndRunTests.cs | 1 - .../test/MusicStore.E2ETests/SmokeTests.cs | 1 - .../IIS.Performance/StartupTimeBenchmark.cs | 3 +- .../Common.FunctionalTests/BasicAuthTests.cs | 1 - .../ClientCertificateTests.cs | 1 - .../CommonStartupTests.cs | 1 - .../test/Common.FunctionalTests/HttpsTests.cs | 4 +- .../Common.FunctionalTests/LogFileTests.cs | 1 - .../OutOfProcess/AspNetCorePortTests.cs | 3 +- .../OutOfProcess/HelloWorldTest.cs | 5 +- .../PublishedSitesFixture.cs | 3 +- .../Utilities/EventLogHelpers.cs | 3 +- .../Utilities/IISTestSiteFixture.cs | 2 - .../WindowsAuthTests.cs | 1 - ...kwardsCompatibility.FunctionalTests.csproj | 3 - .../OutOfProcess/NtlmAuthentationTest.cs | 3 +- .../samples/IISSample/web.config | 2 +- .../IntegrationTesting.IIS/src/IISDeployer.cs | 11 +- .../src/IISDeployerBase.cs | 16 +- .../src/IISDeploymentResult.cs | 13 +- .../src/IISExpressDeployer.cs | 6 +- src/Servers/IIS/build/applicationhost.config | 2 - .../IIS/build/applicationhost.iis.config | 2 - src/Servers/IIS/build/launchSettings.json | 2 - .../test/FunctionalTests/HelloWorldTest.cs | 1 - .../FunctionalTests/NtlmAuthenticationTest.cs | 1 - .../ResponseCompressionTests.cs | 4 - .../test/FunctionalTests/ResponseTests.cs | 1 - .../clients/ts/FunctionalTests/web.config | 2 +- src/SignalR/samples/SignalRSamples/web.config | 2 +- src/SignalR/samples/SocialWeather/web.config | 2 +- 40 files changed, 34 insertions(+), 1171 deletions(-) delete mode 100644 src/Hosting/Server.IntegrationTesting/src/Common/ANCMVersion.cs diff --git a/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/WebHostFunctionalTests.cs b/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/WebHostFunctionalTests.cs index 60aa1c6562..fc0840fade 100644 --- a/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/WebHostFunctionalTests.cs +++ b/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/WebHostFunctionalTests.cs @@ -159,8 +159,7 @@ namespace Microsoft.AspNetCore.Tests var deploymentParameters = new DeploymentParameters(Path.Combine(GetTestSitesPath(), applicationName), ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) { TargetFramework = "netcoreapp3.0", - HostingModel = HostingModel.InProcess, - AncmVersion = AncmVersion.AspNetCoreModuleV2 + HostingModel = HostingModel.InProcess }; SetEnvironmentVariables(deploymentParameters, "Development"); diff --git a/src/Hosting/Server.IntegrationTesting/src/Common/ANCMVersion.cs b/src/Hosting/Server.IntegrationTesting/src/Common/ANCMVersion.cs deleted file mode 100644 index 38cf93ffcd..0000000000 --- a/src/Hosting/Server.IntegrationTesting/src/Common/ANCMVersion.cs +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -namespace Microsoft.AspNetCore.Server.IntegrationTesting -{ - public enum AncmVersion - { - None, - AspNetCoreModule, - AspNetCoreModuleV2 - } -} \ No newline at end of file diff --git a/src/Hosting/Server.IntegrationTesting/src/Common/DeploymentParameters.cs b/src/Hosting/Server.IntegrationTesting/src/Common/DeploymentParameters.cs index 5e347e4933..1f7287d3a0 100644 --- a/src/Hosting/Server.IntegrationTesting/src/Common/DeploymentParameters.cs +++ b/src/Hosting/Server.IntegrationTesting/src/Common/DeploymentParameters.cs @@ -39,7 +39,6 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting ApplicationType = variant.ApplicationType; RuntimeArchitecture = variant.Architecture; HostingModel = variant.HostingModel; - AncmVersion = variant.AncmVersion; } /// @@ -162,12 +161,6 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting public HostingModel HostingModel { get; set; } - /// - /// When using the IISExpressDeployer, determines whether to use the older or newer version - /// of ANCM. - /// - public AncmVersion AncmVersion { get; set; } = AncmVersion.AspNetCoreModule; - /// /// Environment variables to be set before starting the host. /// Not applicable for IIS Scenarios. diff --git a/src/Hosting/Server.IntegrationTesting/src/Http.config b/src/Hosting/Server.IntegrationTesting/src/Http.config index 4508dea843..e69de29bb2 100644 --- a/src/Hosting/Server.IntegrationTesting/src/Http.config +++ b/src/Hosting/Server.IntegrationTesting/src/Http.config @@ -1,1034 +0,0 @@ - - - - - - - - -
-
-
-
-
-
-
-
- - - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
- -
-
-
-
-
-
- -
-
-
-
-
- -
-
-
- -
-
- -
-
- -
-
-
- - -
-
-
-
-
-
- -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Hosting/Server.IntegrationTesting/src/TestMatrix.cs b/src/Hosting/Server.IntegrationTesting/src/TestMatrix.cs index 4353627fc5..deb7c17343 100644 --- a/src/Hosting/Server.IntegrationTesting/src/TestMatrix.cs +++ b/src/Hosting/Server.IntegrationTesting/src/TestMatrix.cs @@ -18,7 +18,6 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting // ANCM specific... public IList HostingModels { get; set; } = new List(); - public IList AncmVersions { get; set; } = new List(); private IList, string>> Skips { get; } = new List, string>>(); @@ -74,24 +73,11 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting return this; } - public TestMatrix WithAncmVersions(params AncmVersion[] versions) - { - AncmVersions = versions; - return this; - } - - public TestMatrix WithAllAncmVersions() - { - AncmVersions.Add(AncmVersion.AspNetCoreModule); - AncmVersions.Add(AncmVersion.AspNetCoreModuleV2); - return this; - } - /// /// V2 + InProc /// /// - public TestMatrix WithAncmV2InProcess() => WithAncmVersions(AncmVersion.AspNetCoreModuleV2).WithHostingModels(HostingModel.InProcess); + public TestMatrix WithAncmV2InProcess() => WithHostingModels(HostingModel.InProcess); public TestMatrix Skip(string message, Func check) { @@ -119,11 +105,6 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting ApplicationTypes.Add(ApplicationType.Portable); } - if (!AncmVersions.Any()) - { - AncmVersions.Add(AncmVersion.AspNetCoreModule); - } - if (!HostingModels.Any()) { HostingModels.Add(HostingModel.OutOfProcess); @@ -254,7 +235,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting if (server == ServerType.IISExpress || server == ServerType.IIS) { - VaryByAncmVersion(variants, server, tfm, type, arch, archSkip); + VaryByAncmHostingModel(variants, server, tfm, type, arch, archSkip); } else { @@ -289,15 +270,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting return !(arch == RuntimeArchitecture.x86 && ServerType.Nginx == server); } - private void VaryByAncmVersion(IList variants, ServerType server, string tfm, ApplicationType type, RuntimeArchitecture arch, string skip) - { - foreach (var version in AncmVersions) - { - VaryByAncmHostingModel(variants, server, tfm, type, arch, skip, version); - } - } - - private void VaryByAncmHostingModel(IList variants, ServerType server, string tfm, ApplicationType type, RuntimeArchitecture arch, string skip, AncmVersion version) + private void VaryByAncmHostingModel(IList variants, ServerType server, string tfm, ApplicationType type, RuntimeArchitecture arch, string skip) { foreach (var hostingModel in HostingModels) { @@ -305,7 +278,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting if (hostingModel == HostingModel.InProcess) { // Not supported - if (Tfm.Matches(Tfm.Net461, tfm) || Tfm.Matches(Tfm.NetCoreApp20, tfm) || version == AncmVersion.AspNetCoreModule) + if (Tfm.Matches(Tfm.Net461, tfm) || Tfm.Matches(Tfm.NetCoreApp20, tfm)) { continue; } @@ -322,7 +295,6 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting Tfm = tfm, ApplicationType = type, Architecture = arch, - AncmVersion = version, HostingModel = hostingModel, Skip = skipAncm, }); diff --git a/src/Hosting/Server.IntegrationTesting/src/TestVariant.cs b/src/Hosting/Server.IntegrationTesting/src/TestVariant.cs index adf25b0dfa..2d4aeaef48 100644 --- a/src/Hosting/Server.IntegrationTesting/src/TestVariant.cs +++ b/src/Hosting/Server.IntegrationTesting/src/TestVariant.cs @@ -16,7 +16,6 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting // ANCM specifics... public HostingModel HostingModel { get; set; } - public AncmVersion AncmVersion { get; set; } public override string ToString() { @@ -24,8 +23,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting var description = $"Server: {Server}, TFM: {Tfm}, Type: {ApplicationType}, Arch: {Architecture}"; if (Server == ServerType.IISExpress || Server == ServerType.IIS) { - var version = AncmVersion == AncmVersion.AspNetCoreModule ? "V1" : "V2"; - description += $", ANCM: {version}, Host: {HostingModel}"; + description += $", Host: {HostingModel}"; } return description; } @@ -38,7 +36,6 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting info.AddValue(nameof(ApplicationType), ApplicationType, typeof(ApplicationType)); info.AddValue(nameof(Architecture), Architecture, typeof(RuntimeArchitecture)); info.AddValue(nameof(HostingModel), HostingModel, typeof(HostingModel)); - info.AddValue(nameof(AncmVersion), AncmVersion, typeof(AncmVersion)); } public void Deserialize(IXunitSerializationInfo info) @@ -49,7 +46,6 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting ApplicationType = info.GetValue(nameof(ApplicationType)); Architecture = info.GetValue(nameof(Architecture)); HostingModel = info.GetValue(nameof(HostingModel)); - AncmVersion = info.GetValue(nameof(AncmVersion)); } } } diff --git a/src/MusicStore/samples/MusicStore/Properties/launchSettings.json b/src/MusicStore/samples/MusicStore/Properties/launchSettings.json index 739ae702f5..fe76b29b53 100644 --- a/src/MusicStore/samples/MusicStore/Properties/launchSettings.json +++ b/src/MusicStore/samples/MusicStore/Properties/launchSettings.json @@ -14,7 +14,6 @@ "commandLineArgs": "$(IISExpressArguments)", "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(AspNetCoreModuleV1ShimDll)", "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", "ASPNETCORE_MODULE_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", "LAUNCHER_ARGS": "$(TargetPath)", @@ -29,7 +28,6 @@ "commandLineArgs": "$(IISArguments)", "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(AspNetCoreModuleV1ShimDll)", "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", "ASPNETCORE_MODULE_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", "LAUNCHER_ARGS": "$(TargetPath)", diff --git a/src/MusicStore/test/MusicStore.E2ETests/NtlmAuthentationTest.cs b/src/MusicStore/test/MusicStore.E2ETests/NtlmAuthentationTest.cs index aa547f15e8..59d668d09e 100644 --- a/src/MusicStore/test/MusicStore.E2ETests/NtlmAuthentationTest.cs +++ b/src/MusicStore/test/MusicStore.E2ETests/NtlmAuthentationTest.cs @@ -20,7 +20,6 @@ namespace E2ETests => TestMatrix.ForServers(ServerType.IISExpress, ServerType.HttpSys) .WithTfms(Tfm.NetCoreApp30) .WithAllApplicationTypes() - .WithAncmVersions(AncmVersion.AspNetCoreModuleV2) .WithAllArchitectures(); [ConditionalTheory] diff --git a/src/MusicStore/test/MusicStore.E2ETests/OpenIdConnectTests.cs b/src/MusicStore/test/MusicStore.E2ETests/OpenIdConnectTests.cs index 9d7ecf2855..dd47eb8740 100644 --- a/src/MusicStore/test/MusicStore.E2ETests/OpenIdConnectTests.cs +++ b/src/MusicStore/test/MusicStore.E2ETests/OpenIdConnectTests.cs @@ -15,7 +15,6 @@ namespace E2ETests { public static TestMatrix TestVariants => TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel) - .WithAncmVersions(AncmVersion.AspNetCoreModuleV2) .WithTfms(Tfm.NetCoreApp30); [ConditionalTheory] diff --git a/src/MusicStore/test/MusicStore.E2ETests/PublishAndRunTests.cs b/src/MusicStore/test/MusicStore.E2ETests/PublishAndRunTests.cs index 3c5254cc0e..9bca350ead 100644 --- a/src/MusicStore/test/MusicStore.E2ETests/PublishAndRunTests.cs +++ b/src/MusicStore/test/MusicStore.E2ETests/PublishAndRunTests.cs @@ -18,7 +18,6 @@ namespace E2ETests => TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.HttpSys) .WithTfms(Tfm.NetCoreApp30) .WithAllApplicationTypes() - .WithAncmVersions(AncmVersion.AspNetCoreModuleV2) .WithAllHostingModels() .WithAllArchitectures(); diff --git a/src/MusicStore/test/MusicStore.E2ETests/SmokeTests.cs b/src/MusicStore/test/MusicStore.E2ETests/SmokeTests.cs index 9aac88e225..8dcd59d612 100644 --- a/src/MusicStore/test/MusicStore.E2ETests/SmokeTests.cs +++ b/src/MusicStore/test/MusicStore.E2ETests/SmokeTests.cs @@ -19,7 +19,6 @@ namespace E2ETests => TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.HttpSys) .WithTfms(Tfm.NetCoreApp30) .WithAllApplicationTypes() - .WithAncmVersions(AncmVersion.AspNetCoreModuleV2) .WithAllHostingModels(); [ConditionalTheory] diff --git a/src/Servers/IIS/IIS/benchmarks/IIS.Performance/StartupTimeBenchmark.cs b/src/Servers/IIS/IIS/benchmarks/IIS.Performance/StartupTimeBenchmark.cs index 262d54099a..b1da8f1093 100644 --- a/src/Servers/IIS/IIS/benchmarks/IIS.Performance/StartupTimeBenchmark.cs +++ b/src/Servers/IIS/IIS/benchmarks/IIS.Performance/StartupTimeBenchmark.cs @@ -28,8 +28,7 @@ namespace Microsoft.AspNetCore.Server.IIS.Performance ServerConfigTemplateContent = File.ReadAllText("IISExpress.config"), SiteName = "HttpTestSite", TargetFramework = "netcoreapp2.1", - ApplicationType = ApplicationType.Portable, - AncmVersion = AncmVersion.AspNetCoreModuleV2 + ApplicationType = ApplicationType.Portable }; _deployer = ApplicationDeployerFactory.Create(deploymentParameters, NullLoggerFactory.Instance); _client = _deployer.DeployAsync().Result.HttpClient; diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/BasicAuthTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/BasicAuthTests.cs index 46ef274648..763ae8f056 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/BasicAuthTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/BasicAuthTests.cs @@ -28,7 +28,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests => TestMatrix.ForServers(DeployerSelector.ServerType) .WithTfms(Tfm.NetCoreApp30) .WithApplicationTypes(ApplicationType.Portable) - .WithAncmVersions(AncmVersion.AspNetCoreModuleV2) .WithAllHostingModels(); [ConditionalTheory] diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/ClientCertificateTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/ClientCertificateTests.cs index 2daf286823..c1cac0c703 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/ClientCertificateTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/ClientCertificateTests.cs @@ -33,7 +33,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests => TestMatrix.ForServers(DeployerSelector.ServerType) .WithTfms(Tfm.NetCoreApp30) .WithAllApplicationTypes() - .WithAncmVersions(AncmVersion.AspNetCoreModuleV2) .WithAllHostingModels(); [ConditionalTheory] diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/CommonStartupTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/CommonStartupTests.cs index 3d5e52e529..601efbabf5 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/CommonStartupTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/CommonStartupTests.cs @@ -24,7 +24,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests => TestMatrix.ForServers(DeployerSelector.ServerType) .WithTfms(Tfm.NetCoreApp30) .WithAllApplicationTypes() - .WithAncmVersions(AncmVersion.AspNetCoreModuleV2) .WithAllHostingModels(); [ConditionalTheory] diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/HttpsTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/HttpsTests.cs index a35cb60c35..3344a38fa8 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/HttpsTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/HttpsTests.cs @@ -30,7 +30,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests => TestMatrix.ForServers(DeployerSelector.ServerType) .WithTfms(Tfm.NetCoreApp30) .WithAllApplicationTypes() - .WithAncmVersions(AncmVersion.AspNetCoreModuleV2) .WithAllHostingModels(); [ConditionalTheory] @@ -56,8 +55,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.Equal("Scheme:https; Original:", responseText); } - if (variant.AncmVersion == AncmVersion.AspNetCoreModuleV2 && - DeployerSelector.HasNewHandler && + if (DeployerSelector.HasNewHandler && DeployerSelector.HasNewShim) { // We expect ServerAddress to be set for InProcess and HTTPS_PORT for OutOfProcess diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/LogFileTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/LogFileTests.cs index eac971ac33..9f6353fa1f 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/LogFileTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/LogFileTests.cs @@ -26,7 +26,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests => TestMatrix.ForServers(DeployerSelector.ServerType) .WithTfms(Tfm.NetCoreApp30) .WithAllApplicationTypes() - .WithAncmVersions(AncmVersion.AspNetCoreModuleV2) .WithAllHostingModels(); [ConditionalTheory] 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 901c605f28..e49d213b6b 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/OutOfProcess/AspNetCorePortTests.cs @@ -33,8 +33,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public static TestMatrix TestVariants => TestMatrix.ForServers(DeployerSelector.ServerType) .WithTfms(Tfm.NetCoreApp30) - .WithApplicationTypes(ApplicationType.Portable) - .WithAncmVersions(AncmVersion.AspNetCoreModuleV2); + .WithApplicationTypes(ApplicationType.Portable); public static IEnumerable InvalidTestVariants => from v in TestVariants.Select(v => v.Single()) 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 e9a11fcaf3..965794248b 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/OutOfProcess/HelloWorldTest.cs @@ -27,8 +27,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public static TestMatrix TestVariants => TestMatrix.ForServers(DeployerSelector.ServerType) .WithTfms(Tfm.NetCoreApp30) - .WithAllApplicationTypes() - .WithAncmVersions(AncmVersion.AspNetCoreModuleV2); + .WithAllApplicationTypes(); [ConditionalTheory] [MemberData(nameof(TestVariants))] @@ -71,7 +70,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests Assert.Equal(deploymentResult.ContentRoot, await deploymentResult.HttpClient.GetStringAsync("/ContentRootPath")); Assert.Equal(deploymentResult.ContentRoot + "\\wwwroot", await deploymentResult.HttpClient.GetStringAsync("/WebRootPath")); - var expectedDll = variant.AncmVersion == AncmVersion.AspNetCoreModule ? "aspnetcore.dll" : "aspnetcorev2.dll"; + var expectedDll = "aspnetcorev2.dll"; Assert.Contains(deploymentResult.HostProcess.Modules.OfType(), m=> m.FileName.Contains(expectedDll)); if (DeployerSelector.HasNewHandler && variant.HostingModel == HostingModel.InProcess) diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/PublishedSitesFixture.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/PublishedSitesFixture.cs index 1f9df5e01c..097d7e8ccb 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/PublishedSitesFixture.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/PublishedSitesFixture.cs @@ -48,8 +48,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests RuntimeFlavor = RuntimeFlavor.CoreClr, RuntimeArchitecture = RuntimeArchitecture.x64, HostingModel = hostingModel, - TargetFramework = Tfm.NetCoreApp30, - AncmVersion = AncmVersion.AspNetCoreModuleV2 + TargetFramework = Tfm.NetCoreApp30 }); } diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs index 4c441ba160..0f0d556cdf 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/EventLogHelpers.cs @@ -128,8 +128,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests { return "IIS " + (deploymentResult.DeploymentParameters.ServerType == ServerType.IISExpress ? "Express " : "") + - "AspNetCore Module" + - (deploymentResult.DeploymentParameters.AncmVersion == AncmVersion.AspNetCoreModuleV2 ? " V2" : ""); + "AspNetCore Module V2"; } public static string Started(IISDeploymentResult deploymentResult) diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs index 65c20f700c..ff966acc48 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/IISTestSiteFixture.cs @@ -35,7 +35,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests deploymentParameters.ApplicationPublisher = new PublishedApplicationPublisher(Helpers.GetOutOfProcessTestSitesName());; deploymentParameters.ApplicationPath = Helpers.GetOutOfProcessTestSitesName(); deploymentParameters.HostingModel = HostingModel.OutOfProcess; - deploymentParameters.AncmVersion = AncmVersion.AspNetCoreModule; } } @@ -114,7 +113,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests RuntimeArchitecture = RuntimeArchitecture.x64, RuntimeFlavor = RuntimeFlavor.CoreClr, TargetFramework = Tfm.NetCoreApp30, - AncmVersion = AncmVersion.AspNetCoreModuleV2, HostingModel = HostingModel.InProcess, PublishApplicationBeforeDeployment = true, ApplicationPublisher = new PublishedApplicationPublisher(Helpers.GetInProcessTestSitesName()), diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/WindowsAuthTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/WindowsAuthTests.cs index 2c81f3f202..1a2dd11d55 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/WindowsAuthTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/WindowsAuthTests.cs @@ -26,7 +26,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests => TestMatrix.ForServers(DeployerSelector.ServerType) .WithTfms(Tfm.NetCoreApp30) .WithApplicationTypes(ApplicationType.Portable) - .WithAncmVersions(AncmVersion.AspNetCoreModuleV2) .WithAllHostingModels(); [ConditionalTheory] diff --git a/src/Servers/IIS/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj b/src/Servers/IIS/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj index afd4de7647..3bbc263510 100644 --- a/src/Servers/IIS/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj +++ b/src/Servers/IIS/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj @@ -24,9 +24,6 @@ - - true - true 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 d656aa61a9..1d1d549def 100644 --- a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs +++ b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs @@ -30,8 +30,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests public static TestMatrix TestVariants => TestMatrix.ForServers(DeployerSelector.ServerType) - .WithTfms(Tfm.NetCoreApp30) - .WithAncmVersions(AncmVersion.AspNetCoreModuleV2); + .WithTfms(Tfm.NetCoreApp30); [ConditionalTheory] [RequiresIIS(IISCapability.WindowsAuthentication)] diff --git a/src/Servers/IIS/IISIntegration/samples/IISSample/web.config b/src/Servers/IIS/IISIntegration/samples/IISSample/web.config index ca998a82a4..3af0870bfa 100644 --- a/src/Servers/IIS/IISIntegration/samples/IISSample/web.config +++ b/src/Servers/IIS/IISIntegration/samples/IISSample/web.config @@ -5,7 +5,7 @@ - + diff --git a/src/Servers/IIS/IntegrationTesting.IIS/src/IISDeployer.cs b/src/Servers/IIS/IntegrationTesting.IIS/src/IISDeployer.cs index f5b5f14e10..cd05e83de8 100644 --- a/src/Servers/IIS/IntegrationTesting.IIS/src/IISDeployer.cs +++ b/src/Servers/IIS/IntegrationTesting.IIS/src/IISDeployer.cs @@ -134,7 +134,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS yield return WebConfigHelpers.AddOrModifyHandlerSection( key: "modules", - value: DeploymentParameters.AncmVersion.ToString()); + value: AspNetCoreModuleV2ModuleName); foreach (var action in base.GetWebConfigActions()) { @@ -186,11 +186,8 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS return; } } - // ANCM V1 does not support logs - if (DeploymentParameters.AncmVersion == AncmVersion.AspNetCoreModuleV2) - { - throw new InvalidOperationException($"Unable to find non-empty debug log files. Tried: {string.Join(", ", debugLogLocations)}"); - } + + throw new InvalidOperationException($"Unable to find non-empty debug log files. Tried: {string.Join(", ", debugLogLocations)}"); } finally { @@ -304,7 +301,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS config .RequiredElement("system.webServer") .RequiredElement("modules") - .GetOrAdd("add", "name", DeploymentParameters.AncmVersion.ToString()); + .GetOrAdd("add", "name", AspNetCoreModuleV2ModuleName); var pool = config .RequiredElement("system.applicationHost") diff --git a/src/Servers/IIS/IntegrationTesting.IIS/src/IISDeployerBase.cs b/src/Servers/IIS/IntegrationTesting.IIS/src/IISDeployerBase.cs index aa9db97dc7..143b491a6d 100644 --- a/src/Servers/IIS/IntegrationTesting.IIS/src/IISDeployerBase.cs +++ b/src/Servers/IIS/IntegrationTesting.IIS/src/IISDeployerBase.cs @@ -14,6 +14,8 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS { public abstract class IISDeployerBase : ApplicationDeployer { + protected const string AspNetCoreModuleV2ModuleName = "AspNetCoreModuleV2"; + public IISDeploymentParameters IISDeploymentParameters { get; } public IISDeployerBase(IISDeploymentParameters deploymentParameters, ILoggerFactory loggerFactory) @@ -80,13 +82,8 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS } } - protected string GetAncmLocation(AncmVersion version) + protected string GetAncmLocation() { - if (version == AncmVersion.AspNetCoreModule) - { - throw new NotSupportedException("AspNetCoreModule V1 is not supported in 3.0"); - } - var ancmDllName = "aspnetcorev2.dll"; var arch = DeploymentParameters.RuntimeArchitecture == RuntimeArchitecture.x64 ? $@"x64\{ancmDllName}" : $@"x86\{ancmDllName}"; var ancmFile = Path.Combine(AppContext.BaseDirectory, arch); @@ -95,7 +92,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS ancmFile = Path.Combine(AppContext.BaseDirectory, ancmDllName); if (!File.Exists(Environment.ExpandEnvironmentVariables(ancmFile))) { - throw new FileNotFoundException("AspNetCoreModule could not be found.", ancmFile); + throw new FileNotFoundException("AspNetCoreModuleV2 could not be found.", ancmFile); } } @@ -149,12 +146,11 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS .RequiredElement("binding") .SetAttributeValue("bindingInformation", $":{port}:localhost"); - var ancmVersion = DeploymentParameters.AncmVersion.ToString(); config .RequiredElement("system.webServer") .RequiredElement("globalModules") - .GetOrAdd("add", "name", ancmVersion) - .SetAttributeValue("image", GetAncmLocation(DeploymentParameters.AncmVersion)); + .GetOrAdd("add", "name", AspNetCoreModuleV2ModuleName) + .SetAttributeValue("image", GetAncmLocation()); } public abstract void Dispose(bool gracefulShutdown); diff --git a/src/Servers/IIS/IntegrationTesting.IIS/src/IISDeploymentResult.cs b/src/Servers/IIS/IntegrationTesting.IIS/src/IISDeploymentResult.cs index 73a332d9a1..79ce047a9f 100644 --- a/src/Servers/IIS/IntegrationTesting.IIS/src/IISDeploymentResult.cs +++ b/src/Servers/IIS/IntegrationTesting.IIS/src/IISDeploymentResult.cs @@ -32,17 +32,10 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS public HttpClient CreateClient(HttpMessageHandler messageHandler) { - if (DeploymentParameters.AncmVersion == AncmVersion.AspNetCoreModule) + return new HttpClient(new LoggingHandler(messageHandler, Logger)) { - return CreateRetryClient(messageHandler); - } - else - { - return new HttpClient(new LoggingHandler(messageHandler, Logger)) - { - BaseAddress = base.HttpClient.BaseAddress - }; - } + BaseAddress = base.HttpClient.BaseAddress + }; } private HttpClient CreateRetryClient(HttpMessageHandler messageHandler) diff --git a/src/Servers/IIS/IntegrationTesting.IIS/src/IISExpressDeployer.cs b/src/Servers/IIS/IntegrationTesting.IIS/src/IISExpressDeployer.cs index 4e73280fd5..7d56ec6ce3 100644 --- a/src/Servers/IIS/IntegrationTesting.IIS/src/IISExpressDeployer.cs +++ b/src/Servers/IIS/IntegrationTesting.IIS/src/IISExpressDeployer.cs @@ -293,7 +293,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS .RequiredElement("location") .RequiredElement("system.webServer") .RequiredElement("modules") - .GetOrAdd("add", "name", DeploymentParameters.AncmVersion.ToString()); + .GetOrAdd("add", "name", AspNetCoreModuleV2ModuleName); ConfigureModuleAndBinding(config.Root, contentRoot, port); @@ -333,7 +333,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS aspNetCoreHandler.SetAttributeValue("path", "*"); aspNetCoreHandler.SetAttributeValue("verb", "*"); - aspNetCoreHandler.SetAttributeValue("modules", DeploymentParameters.AncmVersion.ToString()); + aspNetCoreHandler.SetAttributeValue("modules", AspNetCoreModuleV2ModuleName); aspNetCoreHandler.SetAttributeValue("resourceType", "Unspecified"); // Make aspNetCore handler first aspNetCoreHandler.Remove(); @@ -351,7 +351,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS yield return WebConfigHelpers.AddOrModifyHandlerSection( key: "modules", - value: DeploymentParameters.AncmVersion.ToString()); + value: AspNetCoreModuleV2ModuleName); // We assume the x64 dotnet.exe is on the path so we need to provide an absolute path for x86 scenarios. // Only do it for scenarios that rely on dotnet.exe (Core, portable, etc.). diff --git a/src/Servers/IIS/build/applicationhost.config b/src/Servers/IIS/build/applicationhost.config index ce00a887b4..e263099421 100644 --- a/src/Servers/IIS/build/applicationhost.config +++ b/src/Servers/IIS/build/applicationhost.config @@ -232,7 +232,6 @@ - @@ -875,7 +874,6 @@ - diff --git a/src/Servers/IIS/build/applicationhost.iis.config b/src/Servers/IIS/build/applicationhost.iis.config index 34a4da59e6..9a49136502 100644 --- a/src/Servers/IIS/build/applicationhost.iis.config +++ b/src/Servers/IIS/build/applicationhost.iis.config @@ -225,7 +225,6 @@ - @@ -288,7 +287,6 @@ - diff --git a/src/Servers/IIS/build/launchSettings.json b/src/Servers/IIS/build/launchSettings.json index 739ae702f5..fe76b29b53 100644 --- a/src/Servers/IIS/build/launchSettings.json +++ b/src/Servers/IIS/build/launchSettings.json @@ -14,7 +14,6 @@ "commandLineArgs": "$(IISExpressArguments)", "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(AspNetCoreModuleV1ShimDll)", "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", "ASPNETCORE_MODULE_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", "LAUNCHER_ARGS": "$(TargetPath)", @@ -29,7 +28,6 @@ "commandLineArgs": "$(IISArguments)", "environmentVariables": { "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)", - "ANCM_PATH": "$(AspNetCoreModuleV1ShimDll)", "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)", "ASPNETCORE_MODULE_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)", "LAUNCHER_ARGS": "$(TargetPath)", diff --git a/src/Servers/test/FunctionalTests/HelloWorldTest.cs b/src/Servers/test/FunctionalTests/HelloWorldTest.cs index 6e8c6beadd..54341cce66 100644 --- a/src/Servers/test/FunctionalTests/HelloWorldTest.cs +++ b/src/Servers/test/FunctionalTests/HelloWorldTest.cs @@ -23,7 +23,6 @@ namespace ServerComparison.FunctionalTests => TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.Nginx, ServerType.HttpSys) .WithTfms(Tfm.NetCoreApp30) .WithApplicationTypes(ApplicationType.Portable) - .WithAncmVersions(AncmVersion.AspNetCoreModuleV2) .WithAllHostingModels() .WithAllArchitectures(); diff --git a/src/Servers/test/FunctionalTests/NtlmAuthenticationTest.cs b/src/Servers/test/FunctionalTests/NtlmAuthenticationTest.cs index 4b72a4bda1..254418ca23 100644 --- a/src/Servers/test/FunctionalTests/NtlmAuthenticationTest.cs +++ b/src/Servers/test/FunctionalTests/NtlmAuthenticationTest.cs @@ -23,7 +23,6 @@ namespace ServerComparison.FunctionalTests public static TestMatrix TestVariants => TestMatrix.ForServers(ServerType.IISExpress, ServerType.HttpSys) .WithTfms(Tfm.NetCoreApp30) - .WithAncmVersions(AncmVersion.AspNetCoreModuleV2) .WithAllHostingModels(); [ConditionalTheory] diff --git a/src/Servers/test/FunctionalTests/ResponseCompressionTests.cs b/src/Servers/test/FunctionalTests/ResponseCompressionTests.cs index 865949df7c..6245667432 100644 --- a/src/Servers/test/FunctionalTests/ResponseCompressionTests.cs +++ b/src/Servers/test/FunctionalTests/ResponseCompressionTests.cs @@ -34,7 +34,6 @@ namespace ServerComparison.FunctionalTests public static TestMatrix NoCompressionTestVariants => TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.Nginx, ServerType.HttpSys) .WithTfms(Tfm.NetCoreApp30) - .WithAncmVersions(AncmVersion.AspNetCoreModuleV2) .WithAllHostingModels(); [ConditionalTheory] @@ -47,7 +46,6 @@ namespace ServerComparison.FunctionalTests public static TestMatrix HostCompressionTestVariants => TestMatrix.ForServers(ServerType.IISExpress, ServerType.Nginx) .WithTfms(Tfm.NetCoreApp30) - .WithAncmVersions(AncmVersion.AspNetCoreModuleV2) .WithAllHostingModels(); [ConditionalTheory] @@ -60,7 +58,6 @@ namespace ServerComparison.FunctionalTests public static TestMatrix AppCompressionTestVariants => TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.HttpSys) // No pass-through compression for nginx .WithTfms(Tfm.NetCoreApp30) - .WithAncmVersions(AncmVersion.AspNetCoreModuleV2) .WithAllHostingModels(); [ConditionalTheory] @@ -73,7 +70,6 @@ namespace ServerComparison.FunctionalTests public static TestMatrix HostAndAppCompressionTestVariants => TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.Nginx, ServerType.HttpSys) .WithTfms(Tfm.NetCoreApp30) - .WithAncmVersions(AncmVersion.AspNetCoreModuleV2) .WithAllHostingModels(); [ConditionalTheory] diff --git a/src/Servers/test/FunctionalTests/ResponseTests.cs b/src/Servers/test/FunctionalTests/ResponseTests.cs index e3f2245f56..298d739f67 100644 --- a/src/Servers/test/FunctionalTests/ResponseTests.cs +++ b/src/Servers/test/FunctionalTests/ResponseTests.cs @@ -27,7 +27,6 @@ namespace ServerComparison.FunctionalTests public static TestMatrix TestVariants => TestMatrix.ForServers(/* ServerType.IISExpress, https://github.com/aspnet/AspNetCore/issues/6168, */ ServerType.Kestrel, ServerType.Nginx, ServerType.HttpSys) .WithTfms(Tfm.NetCoreApp30) - .WithAncmVersions(AncmVersion.AspNetCoreModuleV2) .WithAllHostingModels(); [ConditionalTheory] diff --git a/src/SignalR/clients/ts/FunctionalTests/web.config b/src/SignalR/clients/ts/FunctionalTests/web.config index 5defc1eb37..2de8fd5ede 100644 --- a/src/SignalR/clients/ts/FunctionalTests/web.config +++ b/src/SignalR/clients/ts/FunctionalTests/web.config @@ -5,7 +5,7 @@ --> - + diff --git a/src/SignalR/samples/SignalRSamples/web.config b/src/SignalR/samples/SignalRSamples/web.config index 5defc1eb37..2de8fd5ede 100644 --- a/src/SignalR/samples/SignalRSamples/web.config +++ b/src/SignalR/samples/SignalRSamples/web.config @@ -5,7 +5,7 @@ --> - + diff --git a/src/SignalR/samples/SocialWeather/web.config b/src/SignalR/samples/SocialWeather/web.config index 09b33e27da..847e9821c4 100644 --- a/src/SignalR/samples/SocialWeather/web.config +++ b/src/SignalR/samples/SocialWeather/web.config @@ -7,7 +7,7 @@ - +