From ab81d51594f8d7a3d784a80f7cd9086f0545061c Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Wed, 3 May 2017 16:51:49 -0700 Subject: [PATCH] netcoreapp2.0 --- samples/MusicStore/MusicStore.csproj | 2 +- .../NtlmAuthentationTest.cs | 16 ++--- .../MusicStore.E2ETests/OpenIdConnectTests.cs | 34 +++------ .../MusicStore.E2ETests/PublishAndRunTests.cs | 45 +++++------- test/MusicStore.E2ETests/SmokeTests.cs | 69 +++++++++---------- test/MusicStore.Test/MusicStore.Test.csproj | 3 +- 6 files changed, 70 insertions(+), 99 deletions(-) diff --git a/samples/MusicStore/MusicStore.csproj b/samples/MusicStore/MusicStore.csproj index e80661ed84..1b97253010 100644 --- a/samples/MusicStore/MusicStore.csproj +++ b/samples/MusicStore/MusicStore.csproj @@ -4,7 +4,7 @@ Music store application on ASP.NET Core - net46;netcoreapp2.0 + netcoreapp2.0 $(DefineConstants);DEMO true win7-x86;win7-x64;linux-x64;osx-x64 diff --git a/test/MusicStore.E2ETests/NtlmAuthentationTest.cs b/test/MusicStore.E2ETests/NtlmAuthentationTest.cs index 781e296703..b83ef362d5 100644 --- a/test/MusicStore.E2ETests/NtlmAuthentationTest.cs +++ b/test/MusicStore.E2ETests/NtlmAuthentationTest.cs @@ -21,23 +21,23 @@ namespace E2ETests [ConditionalTheory, Trait("E2Etests", "E2Etests")] [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] - [InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Portable)] - [InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Standalone)] - [InlineData(ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Portable)] - [InlineData(ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Standalone)] - public async Task NtlmAuthenticationTest(ServerType serverType, RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, ApplicationType applicationType) + [InlineData(ServerType.WebListener, RuntimeArchitecture.x64, ApplicationType.Portable)] + [InlineData(ServerType.WebListener, RuntimeArchitecture.x64, ApplicationType.Standalone)] + [InlineData(ServerType.IISExpress, RuntimeArchitecture.x64, ApplicationType.Portable)] + [InlineData(ServerType.IISExpress, RuntimeArchitecture.x64, ApplicationType.Standalone)] + public async Task NtlmAuthenticationTest(ServerType serverType, RuntimeArchitecture architecture, ApplicationType applicationType) { - var testName = $"NtlmAuthentication_{serverType}_{runtimeFlavor}_{architecture}_{applicationType}"; + var testName = $"NtlmAuthentication_{serverType}_{architecture}_{applicationType}"; using (StartLog(out var loggerFactory, testName)) { var logger = loggerFactory.CreateLogger("NtlmAuthenticationTest"); var musicStoreDbName = DbUtils.GetUniqueName(); - var deploymentParameters = new DeploymentParameters(Helpers.GetApplicationPath(applicationType), serverType, runtimeFlavor, architecture) + var deploymentParameters = new DeploymentParameters(Helpers.GetApplicationPath(applicationType), serverType, RuntimeFlavor.CoreClr, architecture) { PublishApplicationBeforeDeployment = true, PreservePublishedApplicationForDebugging = Helpers.PreservePublishedApplicationForDebugging, - TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net46" : "netcoreapp2.0", + TargetFramework = "netcoreapp2.0", Configuration = Helpers.GetCurrentBuildConfiguration(), ApplicationType = applicationType, EnvironmentName = "NtlmAuthentication", //Will pick the Start class named 'StartupNtlmAuthentication' diff --git a/test/MusicStore.E2ETests/OpenIdConnectTests.cs b/test/MusicStore.E2ETests/OpenIdConnectTests.cs index b64bdf9c90..0da69d3a61 100644 --- a/test/MusicStore.E2ETests/OpenIdConnectTests.cs +++ b/test/MusicStore.E2ETests/OpenIdConnectTests.cs @@ -19,50 +19,38 @@ namespace E2ETests [ConditionalTheory, Trait("E2Etests", "E2Etests")] [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] - //[InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x64, ApplicationType.Portable)] - [InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Portable)] - [InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Standalone)] + [InlineData(ServerType.Kestrel, RuntimeArchitecture.x64, ApplicationType.Portable)] + [InlineData(ServerType.Kestrel, RuntimeArchitecture.x64, ApplicationType.Standalone)] public async Task OpenIdConnect_OnWindowsOS( ServerType serverType, - RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, ApplicationType applicationType) { - await OpenIdConnectTestSuite(serverType, runtimeFlavor, architecture, applicationType); + await OpenIdConnectTestSuite(serverType, architecture, applicationType); } [ConditionalTheory, Trait("E2Etests", "E2Etests")] [OSSkipCondition(OperatingSystems.Windows)] - [InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Portable)] - [InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Standalone)] - public async Task OpenIdConnect_OnNonWindows(ServerType serverType, RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, ApplicationType applicationType) + [InlineData(ServerType.Kestrel, RuntimeArchitecture.x64, ApplicationType.Portable)] + [InlineData(ServerType.Kestrel, RuntimeArchitecture.x64, ApplicationType.Standalone)] + public async Task OpenIdConnect_OnNonWindows(ServerType serverType, RuntimeArchitecture architecture, ApplicationType applicationType) { - await OpenIdConnectTestSuite(serverType, runtimeFlavor, architecture, applicationType); + await OpenIdConnectTestSuite(serverType, architecture, applicationType); } - // TODO: temporarily disabling x86 tests as dotnet xunit test runner currently does not support 32-bit - - //[ConditionalTheory(Skip = "https://github.com/aspnet/MusicStore/issues/565"), Trait("E2Etests", "E2Etests")] - //[OSSkipCondition(OperatingSystems.Windows)] - //[InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x86, ApplicationType.Portable)] - //public async Task OpenIdConnect_OnMono(ServerType serverType, RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, ApplicationType applicationType) - //{ - // await OpenIdConnectTestSuite(serverType, runtimeFlavor, architecture); - //} - - private async Task OpenIdConnectTestSuite(ServerType serverType, RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, ApplicationType applicationType) + private async Task OpenIdConnectTestSuite(ServerType serverType, RuntimeArchitecture architecture, ApplicationType applicationType) { - var testName = $"OpenIdConnectTestSuite_{serverType}_{runtimeFlavor}_{architecture}_{applicationType}"; + var testName = $"OpenIdConnectTestSuite_{serverType}_{architecture}_{applicationType}"; using (StartLog(out var loggerFactory, testName)) { var logger = loggerFactory.CreateLogger("OpenIdConnectTestSuite"); var musicStoreDbName = DbUtils.GetUniqueName(); - var deploymentParameters = new DeploymentParameters(Helpers.GetApplicationPath(applicationType), serverType, runtimeFlavor, architecture) + var deploymentParameters = new DeploymentParameters(Helpers.GetApplicationPath(applicationType), serverType, RuntimeFlavor.CoreClr, architecture) { PublishApplicationBeforeDeployment = true, PreservePublishedApplicationForDebugging = Helpers.PreservePublishedApplicationForDebugging, - TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net46" : "netcoreapp2.0", + TargetFramework = "netcoreapp2.0", Configuration = Helpers.GetCurrentBuildConfiguration(), ApplicationType = applicationType, EnvironmentName = "OpenIdConnectTesting", diff --git a/test/MusicStore.E2ETests/PublishAndRunTests.cs b/test/MusicStore.E2ETests/PublishAndRunTests.cs index 6f86b5e77b..2c2293d1fc 100644 --- a/test/MusicStore.E2ETests/PublishAndRunTests.cs +++ b/test/MusicStore.E2ETests/PublishAndRunTests.cs @@ -24,38 +24,34 @@ namespace E2ETests [ConditionalTheory, Trait("E2Etests", "PublishAndRun")] [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] - //[InlineData(ServerType.WebListener, RuntimeFlavor.Clr, RuntimeArchitecture.x64, ApplicationType.Portable, false)] - [InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Portable, false)] - [InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Standalone, false)] - // [InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x64, ApplicationType.Portable, false)] - [InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Portable, false)] - [InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Standalone, false)] + [InlineData(ServerType.WebListener, RuntimeArchitecture.x64, ApplicationType.Portable, false)] + [InlineData(ServerType.WebListener, RuntimeArchitecture.x64, ApplicationType.Standalone, false)] + [InlineData(ServerType.Kestrel, RuntimeArchitecture.x64, ApplicationType.Portable, false)] + [InlineData(ServerType.Kestrel, RuntimeArchitecture.x64, ApplicationType.Standalone, false)] public async Task WindowsOS( ServerType serverType, - RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, ApplicationType applicationType, bool noSource) { var testRunner = new PublishAndRunTests(_output); await testRunner.Publish_And_Run_Tests( - serverType, runtimeFlavor, architecture, applicationType, noSource); + serverType, architecture, applicationType, noSource); } [ConditionalTheory, Trait("E2Etests", "PublishAndRun")] [OSSkipCondition(OperatingSystems.Windows)] - [InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Portable, false)] - [InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Standalone, false)] + [InlineData(ServerType.Kestrel, RuntimeArchitecture.x64, ApplicationType.Portable, false)] + [InlineData(ServerType.Kestrel, RuntimeArchitecture.x64, ApplicationType.Standalone, false)] public async Task NonWindowsOS( ServerType serverType, - RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, ApplicationType applicationType, bool noSource) { var testRunner = new PublishAndRunTests(_output); await testRunner.Publish_And_Run_Tests( - serverType, runtimeFlavor, architecture, applicationType, noSource); + serverType, architecture, applicationType, noSource); } } @@ -73,37 +69,33 @@ namespace E2ETests [ConditionalTheory, Trait("E2Etests", "PublishAndRun")] [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] - [InlineData(ServerType.WebListener, RuntimeFlavor.Clr, RuntimeArchitecture.x86, ApplicationType.Portable, false)] - [InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, ApplicationType.Portable, false)] - [InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, ApplicationType.Standalone, false)] - [InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x86, ApplicationType.Portable, false)] - [InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, ApplicationType.Portable, false)] - [InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, ApplicationType.Standalone, false)] + [InlineData(ServerType.WebListener, RuntimeArchitecture.x86, ApplicationType.Portable, false)] + [InlineData(ServerType.WebListener, RuntimeArchitecture.x86, ApplicationType.Standalone, false)] + [InlineData(ServerType.Kestrel, RuntimeArchitecture.x86, ApplicationType.Portable, false)] + [InlineData(ServerType.Kestrel, RuntimeArchitecture.x86, ApplicationType.Standalone, false)] public async Task WindowsOS( ServerType serverType, - RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, ApplicationType applicationType, bool noSource) { var testRunner = new PublishAndRunTests(_output); await testRunner.Publish_And_Run_Tests( - serverType, runtimeFlavor, architecture, applicationType, noSource); + serverType, architecture, applicationType, noSource); } [ConditionalTheory, Trait("E2Etests", "PublishAndRun")] [OSSkipCondition(OperatingSystems.Windows)] - [InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x86, ApplicationType.Portable, false)] + [InlineData(ServerType.Kestrel, RuntimeArchitecture.x86, ApplicationType.Portable, false)] public async Task NonWindowsOS( ServerType serverType, - RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, ApplicationType applicationType, bool noSource) { var testRunner = new PublishAndRunTests(_output); await testRunner.Publish_And_Run_Tests( - serverType, runtimeFlavor, architecture, applicationType, noSource); + serverType, architecture, applicationType, noSource); } } @@ -115,24 +107,23 @@ namespace E2ETests public async Task Publish_And_Run_Tests( ServerType serverType, - RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, ApplicationType applicationType, bool noSource) { var noSourceStr = noSource ? "NoSource" : "WithSource"; - var testName = $"PublishAndRunTests_{serverType}_{runtimeFlavor}_{architecture}_{applicationType}_{noSourceStr}"; + var testName = $"PublishAndRunTests_{serverType}_{architecture}_{applicationType}_{noSourceStr}"; using (StartLog(out var loggerFactory, testName)) { var logger = loggerFactory.CreateLogger("Publish_And_Run_Tests"); var musicStoreDbName = DbUtils.GetUniqueName(); var deploymentParameters = new DeploymentParameters( - Helpers.GetApplicationPath(applicationType), serverType, runtimeFlavor, architecture) + Helpers.GetApplicationPath(applicationType), serverType, RuntimeFlavor.CoreClr, architecture) { PublishApplicationBeforeDeployment = true, PreservePublishedApplicationForDebugging = Helpers.PreservePublishedApplicationForDebugging, - TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net46" : "netcoreapp2.0", + TargetFramework = "netcoreapp2.0", Configuration = Helpers.GetCurrentBuildConfiguration(), ApplicationType = applicationType, UserAdditionalCleanup = parameters => diff --git a/test/MusicStore.E2ETests/SmokeTests.cs b/test/MusicStore.E2ETests/SmokeTests.cs index 4b41bfc95f..fac9f3884b 100644 --- a/test/MusicStore.E2ETests/SmokeTests.cs +++ b/test/MusicStore.E2ETests/SmokeTests.cs @@ -22,36 +22,34 @@ namespace E2ETests [ConditionalTheory, Trait("E2Etests", "Smoke")] [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] - [InlineData(ServerType.WebListener, RuntimeFlavor.Clr, RuntimeArchitecture.x86, ApplicationType.Portable)] - [InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, ApplicationType.Portable)] - [InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, ApplicationType.Standalone)] - [InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x86, ApplicationType.Portable)] - [InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, ApplicationType.Portable)] - [InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, ApplicationType.Standalone)] - [InlineData(ServerType.IISExpress, RuntimeFlavor.Clr, RuntimeArchitecture.x86, ApplicationType.Portable)] - [InlineData(ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, ApplicationType.Portable)] - [InlineData(ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, ApplicationType.Standalone)] + [InlineData(ServerType.WebListener, RuntimeArchitecture.x86, ApplicationType.Portable)] + [InlineData(ServerType.WebListener, RuntimeArchitecture.x86, ApplicationType.Portable)] + [InlineData(ServerType.WebListener, RuntimeArchitecture.x86, ApplicationType.Standalone)] + [InlineData(ServerType.Kestrel, RuntimeArchitecture.x86, ApplicationType.Portable)] + [InlineData(ServerType.Kestrel, RuntimeArchitecture.x86, ApplicationType.Portable)] + [InlineData(ServerType.Kestrel, RuntimeArchitecture.x86, ApplicationType.Standalone)] + [InlineData(ServerType.IISExpress, RuntimeArchitecture.x86, ApplicationType.Portable)] + [InlineData(ServerType.IISExpress, RuntimeArchitecture.x86, ApplicationType.Portable)] + [InlineData(ServerType.IISExpress, RuntimeArchitecture.x86, ApplicationType.Standalone)] public async Task WindowsOS( ServerType serverType, - RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, ApplicationType applicationType) { var smokeTestRunner = new SmokeTests(_output); - await smokeTestRunner.SmokeTestSuite(serverType, runtimeFlavor, architecture, applicationType); + await smokeTestRunner.SmokeTestSuite(serverType, architecture, applicationType); } [ConditionalTheory(Skip = "Temporarily disabling test"), Trait("E2Etests", "Smoke")] [OSSkipCondition(OperatingSystems.Windows)] - [InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x86, ApplicationType.Portable)] + [InlineData(ServerType.Kestrel, RuntimeArchitecture.x86, ApplicationType.Portable)] public async Task NonWindowsOS( ServerType serverType, - RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, ApplicationType applicationType) { var smokeTestRunner = new SmokeTests(_output); - await smokeTestRunner.SmokeTestSuite(serverType, runtimeFlavor, architecture, applicationType); + await smokeTestRunner.SmokeTestSuite(serverType, architecture, applicationType); } } @@ -67,37 +65,35 @@ namespace E2ETests [ConditionalTheory, Trait("E2Etests", "Smoke")] [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] - [InlineData(ServerType.WebListener, RuntimeFlavor.Clr, RuntimeArchitecture.x64, ApplicationType.Portable)] - [InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Portable)] - [InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Standalone)] - [InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x64, ApplicationType.Portable)] - [InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Portable)] - [InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Standalone)] - [InlineData(ServerType.IISExpress, RuntimeFlavor.Clr, RuntimeArchitecture.x64, ApplicationType.Portable)] - [InlineData(ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Portable)] - [InlineData(ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Standalone)] + [InlineData(ServerType.WebListener, RuntimeArchitecture.x64, ApplicationType.Portable)] + [InlineData(ServerType.WebListener, RuntimeArchitecture.x64, ApplicationType.Portable)] + [InlineData(ServerType.WebListener, RuntimeArchitecture.x64, ApplicationType.Standalone)] + [InlineData(ServerType.Kestrel, RuntimeArchitecture.x64, ApplicationType.Portable)] + [InlineData(ServerType.Kestrel, RuntimeArchitecture.x64, ApplicationType.Portable)] + [InlineData(ServerType.Kestrel, RuntimeArchitecture.x64, ApplicationType.Standalone)] + [InlineData(ServerType.IISExpress, RuntimeArchitecture.x64, ApplicationType.Portable)] + [InlineData(ServerType.IISExpress, RuntimeArchitecture.x64, ApplicationType.Portable)] + [InlineData(ServerType.IISExpress, RuntimeArchitecture.x64, ApplicationType.Standalone)] public async Task WindowsOS( ServerType serverType, - RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, ApplicationType applicationType) { var smokeTestRunner = new SmokeTests(_output); - await smokeTestRunner.SmokeTestSuite(serverType, runtimeFlavor, architecture, applicationType); + await smokeTestRunner.SmokeTestSuite(serverType, architecture, applicationType); } [ConditionalTheory, Trait("E2Etests", "Smoke")] [OSSkipCondition(OperatingSystems.Windows)] - [InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Portable)] - [InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Standalone)] + [InlineData(ServerType.Kestrel, RuntimeArchitecture.x64, ApplicationType.Portable)] + [InlineData(ServerType.Kestrel, RuntimeArchitecture.x64, ApplicationType.Standalone)] public async Task NonWindowsOS( ServerType serverType, - RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, ApplicationType applicationType) { var smokeTestRunner = new SmokeTests(_output); - await smokeTestRunner.SmokeTestSuite(serverType, runtimeFlavor, architecture, applicationType); + await smokeTestRunner.SmokeTestSuite(serverType, architecture, applicationType); } } @@ -115,18 +111,16 @@ namespace E2ETests [OSSkipCondition(OperatingSystems.Linux)] [FrameworkSkipCondition(RuntimeFrameworks.CoreCLR)] [SkipIfEnvironmentVariableNotEnabled("IIS_VARIATIONS_ENABLED")] - //[InlineData(ServerType.IIS, RuntimeFlavor.Clr, RuntimeArchitecture.x86, ApplicationType.Portable)] - [InlineData(ServerType.IIS, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Portable)] - [InlineData(ServerType.IIS, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Standalone)] + [InlineData(ServerType.IIS, RuntimeArchitecture.x64, ApplicationType.Portable)] + [InlineData(ServerType.IIS, RuntimeArchitecture.x64, ApplicationType.Standalone)] public async Task SmokeTestSuite_On_IIS_X86( ServerType serverType, - RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, ApplicationType applicationType) { var smokeTestRunner = new SmokeTests(_output); await smokeTestRunner.SmokeTestSuite( - serverType, runtimeFlavor, architecture, applicationType, noSource: true); + serverType, architecture, applicationType, noSource: true); } } @@ -138,26 +132,25 @@ namespace E2ETests public async Task SmokeTestSuite( ServerType serverType, - RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, ApplicationType applicationType, bool noSource = false) { - var testName = $"SmokeTestSuite_{serverType}_{runtimeFlavor}_{architecture}_{applicationType}"; + var testName = $"SmokeTestSuite_{serverType}_{architecture}_{applicationType}"; using (StartLog(out var loggerFactory, testName)) { var logger = loggerFactory.CreateLogger("SmokeTestSuite"); var musicStoreDbName = DbUtils.GetUniqueName(); var deploymentParameters = new DeploymentParameters( - Helpers.GetApplicationPath(applicationType), serverType, runtimeFlavor, architecture) + Helpers.GetApplicationPath(applicationType), serverType, RuntimeFlavor.CoreClr, architecture) { EnvironmentName = "SocialTesting", ServerConfigTemplateContent = (serverType == ServerType.IISExpress) ? File.ReadAllText("Http.config") : null, SiteName = "MusicStoreTestSite", PublishApplicationBeforeDeployment = true, PreservePublishedApplicationForDebugging = Helpers.PreservePublishedApplicationForDebugging, - TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net46" : "netcoreapp2.0", + TargetFramework = "netcoreapp2.0", Configuration = Helpers.GetCurrentBuildConfiguration(), ApplicationType = applicationType, UserAdditionalCleanup = parameters => diff --git a/test/MusicStore.Test/MusicStore.Test.csproj b/test/MusicStore.Test/MusicStore.Test.csproj index d56558bf6a..4e507b4d53 100644 --- a/test/MusicStore.Test/MusicStore.Test.csproj +++ b/test/MusicStore.Test/MusicStore.Test.csproj @@ -3,8 +3,7 @@ - netcoreapp2.0;net46 - netcoreapp2.0 + netcoreapp2.0