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

Merge branch 'release' into dev

This commit is contained in:
John Luo 2016-04-25 14:38:38 -07:00
parent d75c6d47f9 5a8263bb26
commit 7fcbd57bc7
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/E2ETests/NtlmAuthentationTest.cs
View File

@ -39,7 +39,7 @@ namespace E2ETests
{ {
PublishApplicationBeforeDeployment = true, PublishApplicationBeforeDeployment = true,
PublishTargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net451" : "netcoreapp1.0", PublishTargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net451" : "netcoreapp1.0",
ApplicationType = runtimeFlavor == RuntimeFlavor.Clr ? ApplicationType.Standalone : ApplicationType.Portable, ApplicationType = applicationType,
ApplicationBaseUriHint = applicationBaseUrl, ApplicationBaseUriHint = applicationBaseUrl,
EnvironmentName = "NtlmAuthentication", //Will pick the Start class named 'StartupNtlmAuthentication' EnvironmentName = "NtlmAuthentication", //Will pick the Start class named 'StartupNtlmAuthentication'
ServerConfigTemplateContent = (serverType == ServerType.IISExpress) ? File.ReadAllText("NtlmAuthentation.config") : null, ServerConfigTemplateContent = (serverType == ServerType.IISExpress) ? File.ReadAllText("NtlmAuthentation.config") : null,

2
test/E2ETests/OpenIdConnectTests.cs
View File

@ -67,7 +67,7 @@ namespace E2ETests
{ {
PublishApplicationBeforeDeployment = true, PublishApplicationBeforeDeployment = true,
PublishTargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net451" : "netcoreapp1.0", PublishTargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net451" : "netcoreapp1.0",
ApplicationType = runtimeFlavor == RuntimeFlavor.Clr ? ApplicationType.Standalone : ApplicationType.Portable, ApplicationType = applicationType,
ApplicationBaseUriHint = applicationBaseUrl, ApplicationBaseUriHint = applicationBaseUrl,
EnvironmentName = "OpenIdConnectTesting", EnvironmentName = "OpenIdConnectTesting",
UserAdditionalCleanup = parameters => UserAdditionalCleanup = parameters =>

2
test/E2ETests/PublishAndRunTests.cs
View File

@ -149,7 +149,7 @@ namespace E2ETests
ApplicationBaseUriHint = applicationBaseUrl, ApplicationBaseUriHint = applicationBaseUrl,
PublishApplicationBeforeDeployment = true, PublishApplicationBeforeDeployment = true,
PublishTargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net451" : "netcoreapp1.0", PublishTargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net451" : "netcoreapp1.0",
ApplicationType = runtimeFlavor == RuntimeFlavor.Clr ? ApplicationType.Standalone : ApplicationType.Portable, ApplicationType = applicationType,
UserAdditionalCleanup = parameters => UserAdditionalCleanup = parameters =>
{ {
DbUtils.DropDatabase(musicStoreDbName, _logger); DbUtils.DropDatabase(musicStoreDbName, _logger);

2
test/E2ETests/SmokeTests.cs
View File

@ -185,7 +185,7 @@ namespace E2ETests
SiteName = "MusicStoreTestSite", SiteName = "MusicStoreTestSite",
PublishApplicationBeforeDeployment = true, PublishApplicationBeforeDeployment = true,
PublishTargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net451" : "netcoreapp1.0", PublishTargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net451" : "netcoreapp1.0",
ApplicationType = runtimeFlavor == RuntimeFlavor.Clr ? ApplicationType.Standalone : ApplicationType.Portable, ApplicationType = applicationType,
UserAdditionalCleanup = parameters => UserAdditionalCleanup = parameters =>
{ {
DbUtils.DropDatabase(musicStoreDbName, _logger); DbUtils.DropDatabase(musicStoreDbName, _logger);