huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'rel/2.0.0-preview1' into dev

This commit is contained in:
Pavel Krymets 2017-05-04 10:05:47 -07:00
parent 7eea97584d 6acc8899ad
commit e33c09ebae
7 changed files with 76 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
build/repo.targets
View File

@ -1,7 +1,15 @@
<Project> <Project>
<Target Name="TestNano" DependsOnTargets="Restore">
<MSBuild Targets="VSTest" <PropertyGroup>
Projects="$(MSBuildThisFileDirectory)..\test\MusicStore.E2ETests\MusicStore.E2ETests.csproj" <MusicStoreE2ETestProject>$(RepositoryRoot)test\MusicStore.E2ETests\MusicStore.E2ETests.csproj</MusicStoreE2ETestProject>
Properties="Configuration=$(Configuration);VSTestLogger=trx;VSTestTestCaseFilter=E2ETests=NanoServer" /> </PropertyGroup>
<Target Name="_FilterTestProjects" BeforeTargets="TestProjects" Condition="'$(VSTestTestCaseFilter)'=='E2Etests=NanoServer'">
<ItemGroup>
<ProjectsToTest Remove="@(ProjectsToTest)" />
<ProjectsToTest Include="$(MusicStoreE2ETestProject)" />
</ItemGroup>
<Error Text="Could not find test projects to run" Condition="@(ProjectsToTest->Count()) == 0" />
</Target> </Target>
</Project> </Project>

2
samples/MusicStore/MusicStore.csproj
View File

@ -4,7 +4,7 @@
<PropertyGroup> <PropertyGroup>
<Description>Music store application on ASP.NET Core</Description> <Description>Music store application on ASP.NET Core</Description>
<TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks> <TargetFramework>netcoreapp2.0</TargetFramework>
<DefineConstants>$(DefineConstants);DEMO</DefineConstants> <DefineConstants>$(DefineConstants);DEMO</DefineConstants>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors> <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<RuntimeIdentifiers>win7-x86;win7-x64;linux-x64;osx-x64</RuntimeIdentifiers> <RuntimeIdentifiers>win7-x86;win7-x64;linux-x64;osx-x64</RuntimeIdentifiers>

16
test/MusicStore.E2ETests/NtlmAuthentationTest.cs
View File

@ -21,23 +21,23 @@ namespace E2ETests
[ConditionalTheory, Trait("E2Etests", "E2Etests")] [ConditionalTheory, Trait("E2Etests", "E2Etests")]
[OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.Linux)]
[OSSkipCondition(OperatingSystems.MacOSX)] [OSSkipCondition(OperatingSystems.MacOSX)]
[InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Portable)] [InlineData(ServerType.WebListener, RuntimeArchitecture.x64, ApplicationType.Portable)]
[InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Standalone)] [InlineData(ServerType.WebListener, RuntimeArchitecture.x64, ApplicationType.Standalone)]
[InlineData(ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Portable)] [InlineData(ServerType.IISExpress, RuntimeArchitecture.x64, ApplicationType.Portable)]
[InlineData(ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Standalone)] [InlineData(ServerType.IISExpress, RuntimeArchitecture.x64, ApplicationType.Standalone)]
public async Task NtlmAuthenticationTest(ServerType serverType, RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, ApplicationType applicationType) 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)) using (StartLog(out var loggerFactory, testName))
{ {
var logger = loggerFactory.CreateLogger("NtlmAuthenticationTest"); var logger = loggerFactory.CreateLogger("NtlmAuthenticationTest");
var musicStoreDbName = DbUtils.GetUniqueName(); 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, PublishApplicationBeforeDeployment = true,
PreservePublishedApplicationForDebugging = Helpers.PreservePublishedApplicationForDebugging, PreservePublishedApplicationForDebugging = Helpers.PreservePublishedApplicationForDebugging,
TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net46" : "netcoreapp2.0", TargetFramework = "netcoreapp2.0",
Configuration = Helpers.GetCurrentBuildConfiguration(), Configuration = Helpers.GetCurrentBuildConfiguration(),
ApplicationType = applicationType, ApplicationType = applicationType,
EnvironmentName = "NtlmAuthentication", //Will pick the Start class named 'StartupNtlmAuthentication' EnvironmentName = "NtlmAuthentication", //Will pick the Start class named 'StartupNtlmAuthentication'

34
test/MusicStore.E2ETests/OpenIdConnectTests.cs
View File

@ -19,50 +19,38 @@ namespace E2ETests
[ConditionalTheory, Trait("E2Etests", "E2Etests")] [ConditionalTheory, Trait("E2Etests", "E2Etests")]
[OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.Linux)]
[OSSkipCondition(OperatingSystems.MacOSX)] [OSSkipCondition(OperatingSystems.MacOSX)]
//[InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x64, ApplicationType.Portable)] [InlineData(ServerType.Kestrel, RuntimeArchitecture.x64, ApplicationType.Portable)]
[InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Portable)] [InlineData(ServerType.Kestrel, RuntimeArchitecture.x64, ApplicationType.Standalone)]
[InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Standalone)]
public async Task OpenIdConnect_OnWindowsOS( public async Task OpenIdConnect_OnWindowsOS(
ServerType serverType, ServerType serverType,
RuntimeFlavor runtimeFlavor,
RuntimeArchitecture architecture, RuntimeArchitecture architecture,
ApplicationType applicationType) ApplicationType applicationType)
{ {
await OpenIdConnectTestSuite(serverType, runtimeFlavor, architecture, applicationType); await OpenIdConnectTestSuite(serverType, architecture, applicationType);
} }
[ConditionalTheory, Trait("E2Etests", "E2Etests")] [ConditionalTheory, Trait("E2Etests", "E2Etests")]
[OSSkipCondition(OperatingSystems.Windows)] [OSSkipCondition(OperatingSystems.Windows)]
[InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Portable)] [InlineData(ServerType.Kestrel, RuntimeArchitecture.x64, ApplicationType.Portable)]
[InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Standalone)] [InlineData(ServerType.Kestrel, RuntimeArchitecture.x64, ApplicationType.Standalone)]
public async Task OpenIdConnect_OnNonWindows(ServerType serverType, RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, ApplicationType applicationType) 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 private async Task OpenIdConnectTestSuite(ServerType serverType, RuntimeArchitecture architecture, ApplicationType applicationType)
//[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)
{ {
var testName = $"OpenIdConnectTestSuite_{serverType}_{runtimeFlavor}_{architecture}_{applicationType}"; var testName = $"OpenIdConnectTestSuite_{serverType}_{architecture}_{applicationType}";
using (StartLog(out var loggerFactory, testName)) using (StartLog(out var loggerFactory, testName))
{ {
var logger = loggerFactory.CreateLogger("OpenIdConnectTestSuite"); var logger = loggerFactory.CreateLogger("OpenIdConnectTestSuite");
var musicStoreDbName = DbUtils.GetUniqueName(); 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, PublishApplicationBeforeDeployment = true,
PreservePublishedApplicationForDebugging = Helpers.PreservePublishedApplicationForDebugging, PreservePublishedApplicationForDebugging = Helpers.PreservePublishedApplicationForDebugging,
TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net46" : "netcoreapp2.0", TargetFramework = "netcoreapp2.0",
Configuration = Helpers.GetCurrentBuildConfiguration(), Configuration = Helpers.GetCurrentBuildConfiguration(),
ApplicationType = applicationType, ApplicationType = applicationType,
EnvironmentName = "OpenIdConnectTesting", EnvironmentName = "OpenIdConnectTesting",

45
test/MusicStore.E2ETests/PublishAndRunTests.cs
View File

@ -24,38 +24,34 @@ namespace E2ETests
[ConditionalTheory, Trait("E2Etests", "PublishAndRun")] [ConditionalTheory, Trait("E2Etests", "PublishAndRun")]
[OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.Linux)]
[OSSkipCondition(OperatingSystems.MacOSX)] [OSSkipCondition(OperatingSystems.MacOSX)]
//[InlineData(ServerType.WebListener, RuntimeFlavor.Clr, RuntimeArchitecture.x64, ApplicationType.Portable, false)] [InlineData(ServerType.WebListener, RuntimeArchitecture.x64, ApplicationType.Portable, false)]
[InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Portable, false)] [InlineData(ServerType.WebListener, RuntimeArchitecture.x64, ApplicationType.Standalone, false)]
[InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Standalone, false)] [InlineData(ServerType.Kestrel, RuntimeArchitecture.x64, ApplicationType.Portable, false)]
// [InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x64, ApplicationType.Portable, false)] [InlineData(ServerType.Kestrel, RuntimeArchitecture.x64, ApplicationType.Standalone, false)]
[InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Portable, false)]
[InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Standalone, false)]
public async Task WindowsOS( public async Task WindowsOS(
ServerType serverType, ServerType serverType,
RuntimeFlavor runtimeFlavor,
RuntimeArchitecture architecture, RuntimeArchitecture architecture,
ApplicationType applicationType, ApplicationType applicationType,
bool noSource) bool noSource)
{ {
var testRunner = new PublishAndRunTests(_output); var testRunner = new PublishAndRunTests(_output);
await testRunner.Publish_And_Run_Tests( await testRunner.Publish_And_Run_Tests(
serverType, runtimeFlavor, architecture, applicationType, noSource); serverType, architecture, applicationType, noSource);
} }
[ConditionalTheory, Trait("E2Etests", "PublishAndRun")] [ConditionalTheory, Trait("E2Etests", "PublishAndRun")]
[OSSkipCondition(OperatingSystems.Windows)] [OSSkipCondition(OperatingSystems.Windows)]
[InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Portable, false)] [InlineData(ServerType.Kestrel, RuntimeArchitecture.x64, ApplicationType.Portable, false)]
[InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Standalone, false)] [InlineData(ServerType.Kestrel, RuntimeArchitecture.x64, ApplicationType.Standalone, false)]
public async Task NonWindowsOS( public async Task NonWindowsOS(
ServerType serverType, ServerType serverType,
RuntimeFlavor runtimeFlavor,
RuntimeArchitecture architecture, RuntimeArchitecture architecture,
ApplicationType applicationType, ApplicationType applicationType,
bool noSource) bool noSource)
{ {
var testRunner = new PublishAndRunTests(_output); var testRunner = new PublishAndRunTests(_output);
await testRunner.Publish_And_Run_Tests( 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")] [ConditionalTheory, Trait("E2Etests", "PublishAndRun")]
[OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.Linux)]
[OSSkipCondition(OperatingSystems.MacOSX)] [OSSkipCondition(OperatingSystems.MacOSX)]
[InlineData(ServerType.WebListener, RuntimeFlavor.Clr, RuntimeArchitecture.x86, ApplicationType.Portable, false)] [InlineData(ServerType.WebListener, RuntimeArchitecture.x86, ApplicationType.Portable, false)]
[InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, ApplicationType.Portable, false)] [InlineData(ServerType.WebListener, RuntimeArchitecture.x86, ApplicationType.Standalone, false)]
[InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, ApplicationType.Standalone, false)] [InlineData(ServerType.Kestrel, RuntimeArchitecture.x86, ApplicationType.Portable, false)]
[InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x86, ApplicationType.Portable, false)] [InlineData(ServerType.Kestrel, RuntimeArchitecture.x86, ApplicationType.Standalone, false)]
[InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, ApplicationType.Portable, false)]
[InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, ApplicationType.Standalone, false)]
public async Task WindowsOS( public async Task WindowsOS(
ServerType serverType, ServerType serverType,
RuntimeFlavor runtimeFlavor,
RuntimeArchitecture architecture, RuntimeArchitecture architecture,
ApplicationType applicationType, ApplicationType applicationType,
bool noSource) bool noSource)
{ {
var testRunner = new PublishAndRunTests(_output); var testRunner = new PublishAndRunTests(_output);
await testRunner.Publish_And_Run_Tests( await testRunner.Publish_And_Run_Tests(
serverType, runtimeFlavor, architecture, applicationType, noSource); serverType, architecture, applicationType, noSource);
} }
[ConditionalTheory, Trait("E2Etests", "PublishAndRun")] [ConditionalTheory, Trait("E2Etests", "PublishAndRun")]
[OSSkipCondition(OperatingSystems.Windows)] [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( public async Task NonWindowsOS(
ServerType serverType, ServerType serverType,
RuntimeFlavor runtimeFlavor,
RuntimeArchitecture architecture, RuntimeArchitecture architecture,
ApplicationType applicationType, ApplicationType applicationType,
bool noSource) bool noSource)
{ {
var testRunner = new PublishAndRunTests(_output); var testRunner = new PublishAndRunTests(_output);
await testRunner.Publish_And_Run_Tests( 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( public async Task Publish_And_Run_Tests(
ServerType serverType, ServerType serverType,
RuntimeFlavor runtimeFlavor,
RuntimeArchitecture architecture, RuntimeArchitecture architecture,
ApplicationType applicationType, ApplicationType applicationType,
bool noSource) bool noSource)
{ {
var noSourceStr = noSource ? "NoSource" : "WithSource"; 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)) using (StartLog(out var loggerFactory, testName))
{ {
var logger = loggerFactory.CreateLogger("Publish_And_Run_Tests"); var logger = loggerFactory.CreateLogger("Publish_And_Run_Tests");
var musicStoreDbName = DbUtils.GetUniqueName(); var musicStoreDbName = DbUtils.GetUniqueName();
var deploymentParameters = new DeploymentParameters( var deploymentParameters = new DeploymentParameters(
Helpers.GetApplicationPath(applicationType), serverType, runtimeFlavor, architecture) Helpers.GetApplicationPath(applicationType), serverType, RuntimeFlavor.CoreClr, architecture)
{ {
PublishApplicationBeforeDeployment = true, PublishApplicationBeforeDeployment = true,
PreservePublishedApplicationForDebugging = Helpers.PreservePublishedApplicationForDebugging, PreservePublishedApplicationForDebugging = Helpers.PreservePublishedApplicationForDebugging,
TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net46" : "netcoreapp2.0", TargetFramework = "netcoreapp2.0",
Configuration = Helpers.GetCurrentBuildConfiguration(), Configuration = Helpers.GetCurrentBuildConfiguration(),
ApplicationType = applicationType, ApplicationType = applicationType,
UserAdditionalCleanup = parameters => UserAdditionalCleanup = parameters =>

63
test/MusicStore.E2ETests/SmokeTests.cs
View File

@ -22,36 +22,31 @@ namespace E2ETests
[ConditionalTheory, Trait("E2Etests", "Smoke")] [ConditionalTheory, Trait("E2Etests", "Smoke")]
[OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.Linux)]
[OSSkipCondition(OperatingSystems.MacOSX)] [OSSkipCondition(OperatingSystems.MacOSX)]
[InlineData(ServerType.WebListener, RuntimeFlavor.Clr, RuntimeArchitecture.x86, ApplicationType.Portable)] [InlineData(ServerType.WebListener, RuntimeArchitecture.x86, ApplicationType.Portable)]
[InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, ApplicationType.Portable)] [InlineData(ServerType.WebListener, RuntimeArchitecture.x86, ApplicationType.Standalone)]
[InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, ApplicationType.Standalone)] [InlineData(ServerType.Kestrel, RuntimeArchitecture.x86, ApplicationType.Portable)]
[InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x86, ApplicationType.Portable)] [InlineData(ServerType.Kestrel, RuntimeArchitecture.x86, ApplicationType.Standalone)]
[InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, ApplicationType.Portable)] [InlineData(ServerType.IISExpress, RuntimeArchitecture.x86, ApplicationType.Portable)]
[InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, ApplicationType.Standalone)] [InlineData(ServerType.IISExpress, 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)]
public async Task WindowsOS( public async Task WindowsOS(
ServerType serverType, ServerType serverType,
RuntimeFlavor runtimeFlavor,
RuntimeArchitecture architecture, RuntimeArchitecture architecture,
ApplicationType applicationType) ApplicationType applicationType)
{ {
var smokeTestRunner = new SmokeTests(_output); 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")] [ConditionalTheory(Skip = "Temporarily disabling test"), Trait("E2Etests", "Smoke")]
[OSSkipCondition(OperatingSystems.Windows)] [OSSkipCondition(OperatingSystems.Windows)]
[InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x86, ApplicationType.Portable)] [InlineData(ServerType.Kestrel, RuntimeArchitecture.x86, ApplicationType.Portable)]
public async Task NonWindowsOS( public async Task NonWindowsOS(
ServerType serverType, ServerType serverType,
RuntimeFlavor runtimeFlavor,
RuntimeArchitecture architecture, RuntimeArchitecture architecture,
ApplicationType applicationType) ApplicationType applicationType)
{ {
var smokeTestRunner = new SmokeTests(_output); var smokeTestRunner = new SmokeTests(_output);
await smokeTestRunner.SmokeTestSuite(serverType, runtimeFlavor, architecture, applicationType); await smokeTestRunner.SmokeTestSuite(serverType, architecture, applicationType);
} }
} }
@ -67,37 +62,32 @@ namespace E2ETests
[ConditionalTheory, Trait("E2Etests", "Smoke")] [ConditionalTheory, Trait("E2Etests", "Smoke")]
[OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.Linux)]
[OSSkipCondition(OperatingSystems.MacOSX)] [OSSkipCondition(OperatingSystems.MacOSX)]
[InlineData(ServerType.WebListener, RuntimeFlavor.Clr, RuntimeArchitecture.x64, ApplicationType.Portable)] [InlineData(ServerType.WebListener, RuntimeArchitecture.x64, ApplicationType.Portable)]
[InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Portable)] [InlineData(ServerType.WebListener, RuntimeArchitecture.x64, ApplicationType.Standalone)]
[InlineData(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Standalone)] [InlineData(ServerType.Kestrel, RuntimeArchitecture.x64, ApplicationType.Portable)]
[InlineData(ServerType.Kestrel, RuntimeFlavor.Clr, RuntimeArchitecture.x64, ApplicationType.Portable)] [InlineData(ServerType.Kestrel, RuntimeArchitecture.x64, ApplicationType.Standalone)]
[InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Portable)] [InlineData(ServerType.IISExpress, RuntimeArchitecture.x64, ApplicationType.Portable)]
[InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Standalone)] [InlineData(ServerType.IISExpress, 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)]
public async Task WindowsOS( public async Task WindowsOS(
ServerType serverType, ServerType serverType,
RuntimeFlavor runtimeFlavor,
RuntimeArchitecture architecture, RuntimeArchitecture architecture,
ApplicationType applicationType) ApplicationType applicationType)
{ {
var smokeTestRunner = new SmokeTests(_output); var smokeTestRunner = new SmokeTests(_output);
await smokeTestRunner.SmokeTestSuite(serverType, runtimeFlavor, architecture, applicationType); await smokeTestRunner.SmokeTestSuite(serverType, architecture, applicationType);
} }
[ConditionalTheory, Trait("E2Etests", "Smoke")] [ConditionalTheory, Trait("E2Etests", "Smoke")]
[OSSkipCondition(OperatingSystems.Windows)] [OSSkipCondition(OperatingSystems.Windows)]
[InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Portable)] [InlineData(ServerType.Kestrel, RuntimeArchitecture.x64, ApplicationType.Portable)]
[InlineData(ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Standalone)] [InlineData(ServerType.Kestrel, RuntimeArchitecture.x64, ApplicationType.Standalone)]
public async Task NonWindowsOS( public async Task NonWindowsOS(
ServerType serverType, ServerType serverType,
RuntimeFlavor runtimeFlavor,
RuntimeArchitecture architecture, RuntimeArchitecture architecture,
ApplicationType applicationType) ApplicationType applicationType)
{ {
var smokeTestRunner = new SmokeTests(_output); var smokeTestRunner = new SmokeTests(_output);
await smokeTestRunner.SmokeTestSuite(serverType, runtimeFlavor, architecture, applicationType); await smokeTestRunner.SmokeTestSuite(serverType, architecture, applicationType);
} }
} }
@ -115,18 +105,16 @@ namespace E2ETests
[OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.Linux)]
[FrameworkSkipCondition(RuntimeFrameworks.CoreCLR)] [FrameworkSkipCondition(RuntimeFrameworks.CoreCLR)]
[SkipIfEnvironmentVariableNotEnabled("IIS_VARIATIONS_ENABLED")] [SkipIfEnvironmentVariableNotEnabled("IIS_VARIATIONS_ENABLED")]
//[InlineData(ServerType.IIS, RuntimeFlavor.Clr, RuntimeArchitecture.x86, ApplicationType.Portable)] [InlineData(ServerType.IIS, RuntimeArchitecture.x64, ApplicationType.Portable)]
[InlineData(ServerType.IIS, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Portable)] [InlineData(ServerType.IIS, RuntimeArchitecture.x64, ApplicationType.Standalone)]
[InlineData(ServerType.IIS, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Standalone)]
public async Task SmokeTestSuite_On_IIS_X86( public async Task SmokeTestSuite_On_IIS_X86(
ServerType serverType, ServerType serverType,
RuntimeFlavor runtimeFlavor,
RuntimeArchitecture architecture, RuntimeArchitecture architecture,
ApplicationType applicationType) ApplicationType applicationType)
{ {
var smokeTestRunner = new SmokeTests(_output); var smokeTestRunner = new SmokeTests(_output);
await smokeTestRunner.SmokeTestSuite( await smokeTestRunner.SmokeTestSuite(
serverType, runtimeFlavor, architecture, applicationType, noSource: true); serverType, architecture, applicationType, noSource: true);
} }
} }
@ -138,26 +126,25 @@ namespace E2ETests
public async Task SmokeTestSuite( public async Task SmokeTestSuite(
ServerType serverType, ServerType serverType,
RuntimeFlavor runtimeFlavor,
RuntimeArchitecture architecture, RuntimeArchitecture architecture,
ApplicationType applicationType, ApplicationType applicationType,
bool noSource = false) bool noSource = false)
{ {
var testName = $"SmokeTestSuite_{serverType}_{runtimeFlavor}_{architecture}_{applicationType}"; var testName = $"SmokeTestSuite_{serverType}_{architecture}_{applicationType}";
using (StartLog(out var loggerFactory, testName)) using (StartLog(out var loggerFactory, testName))
{ {
var logger = loggerFactory.CreateLogger("SmokeTestSuite"); var logger = loggerFactory.CreateLogger("SmokeTestSuite");
var musicStoreDbName = DbUtils.GetUniqueName(); var musicStoreDbName = DbUtils.GetUniqueName();
var deploymentParameters = new DeploymentParameters( var deploymentParameters = new DeploymentParameters(
Helpers.GetApplicationPath(applicationType), serverType, runtimeFlavor, architecture) Helpers.GetApplicationPath(applicationType), serverType, RuntimeFlavor.CoreClr, architecture)
{ {
EnvironmentName = "SocialTesting", EnvironmentName = "SocialTesting",
ServerConfigTemplateContent = (serverType == ServerType.IISExpress) ? File.ReadAllText("Http.config") : null, ServerConfigTemplateContent = (serverType == ServerType.IISExpress) ? File.ReadAllText("Http.config") : null,
SiteName = "MusicStoreTestSite", SiteName = "MusicStoreTestSite",
PublishApplicationBeforeDeployment = true, PublishApplicationBeforeDeployment = true,
PreservePublishedApplicationForDebugging = Helpers.PreservePublishedApplicationForDebugging, PreservePublishedApplicationForDebugging = Helpers.PreservePublishedApplicationForDebugging,
TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net46" : "netcoreapp2.0", TargetFramework = "netcoreapp2.0",
Configuration = Helpers.GetCurrentBuildConfiguration(), Configuration = Helpers.GetCurrentBuildConfiguration(),
ApplicationType = applicationType, ApplicationType = applicationType,
UserAdditionalCleanup = parameters => UserAdditionalCleanup = parameters =>

3
test/MusicStore.Test/MusicStore.Test.csproj
View File

@ -3,8 +3,7 @@
<Import Project="..\..\build\dependencies.props" /> <Import Project="..\..\build\dependencies.props" />
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks> <TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.0</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>