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

Merge branch 'kichalla/supply-configuration' into dev

This commit is contained in:
Kiran Challa 2016-08-08 14:10:10 -07:00
parent 8249134911 14d6298308
commit ad23e180a7
5 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/E2ETests/Common/Helpers.cs
View File

@ -40,5 +40,16 @@ namespace E2ETests
File.WriteAllText(overrideConfig, "{\"UseInMemoryDatabase\": \"true\"}"); File.WriteAllText(overrideConfig, "{\"UseInMemoryDatabase\": \"true\"}");
} }
} }
public static string GetCurrentBuildConfiguration()
{
var configuration = "Debug";
if (string.Equals(Environment.GetEnvironmentVariable("Configuration"), "Release", StringComparison.OrdinalIgnoreCase))
{
configuration = "Release";
}
return configuration;
}
} }
} }

1
test/E2ETests/NtlmAuthentationTest.cs
View File

@ -39,6 +39,7 @@ namespace E2ETests
{ {
PublishApplicationBeforeDeployment = true, PublishApplicationBeforeDeployment = true,
TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net451" : "netcoreapp1.0", TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net451" : "netcoreapp1.0",
Configuration = Helpers.GetCurrentBuildConfiguration(),
ApplicationType = applicationType, ApplicationType = applicationType,
ApplicationBaseUriHint = applicationBaseUrl, ApplicationBaseUriHint = applicationBaseUrl,
EnvironmentName = "NtlmAuthentication", //Will pick the Start class named 'StartupNtlmAuthentication' EnvironmentName = "NtlmAuthentication", //Will pick the Start class named 'StartupNtlmAuthentication'

1
test/E2ETests/OpenIdConnectTests.cs
View File

@ -67,6 +67,7 @@ namespace E2ETests
{ {
PublishApplicationBeforeDeployment = true, PublishApplicationBeforeDeployment = true,
TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net451" : "netcoreapp1.0", TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net451" : "netcoreapp1.0",
Configuration = Helpers.GetCurrentBuildConfiguration(),
ApplicationType = applicationType, ApplicationType = applicationType,
ApplicationBaseUriHint = applicationBaseUrl, ApplicationBaseUriHint = applicationBaseUrl,
EnvironmentName = "OpenIdConnectTesting", EnvironmentName = "OpenIdConnectTesting",

1
test/E2ETests/PublishAndRunTests.cs
View File

@ -149,6 +149,7 @@ namespace E2ETests
ApplicationBaseUriHint = applicationBaseUrl, ApplicationBaseUriHint = applicationBaseUrl,
PublishApplicationBeforeDeployment = true, PublishApplicationBeforeDeployment = true,
TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net451" : "netcoreapp1.0", TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net451" : "netcoreapp1.0",
Configuration = Helpers.GetCurrentBuildConfiguration(),
ApplicationType = applicationType, ApplicationType = applicationType,
UserAdditionalCleanup = parameters => UserAdditionalCleanup = parameters =>
{ {

1
test/E2ETests/SmokeTests.cs
View File

@ -185,6 +185,7 @@ namespace E2ETests
SiteName = "MusicStoreTestSite", SiteName = "MusicStoreTestSite",
PublishApplicationBeforeDeployment = true, PublishApplicationBeforeDeployment = true,
TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net451" : "netcoreapp1.0", TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net451" : "netcoreapp1.0",
Configuration = Helpers.GetCurrentBuildConfiguration(),
ApplicationType = applicationType, ApplicationType = applicationType,
UserAdditionalCleanup = parameters => UserAdditionalCleanup = parameters =>
{ {