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

Merge in 'release/2.2' changes

This commit is contained in:
dotnet-bot 2018-12-12 22:37:18 +00:00
parent 1d0254977e 9e76bec6e1
commit f1bfecfa03
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Middleware/CORS/test/FunctionalTests/CorsMiddlewareFunctionalTest.cs
View File

@ -60,7 +60,7 @@ namespace FunctionalTests
private static async Task<SamplesDeploymentResult> CreateDeployments(ILoggerFactory loggerFactory) private static async Task<SamplesDeploymentResult> CreateDeployments(ILoggerFactory loggerFactory)
{ {
var solutionPath = TestPathUtilities.GetSolutionRootDirectory("CORS"); var solutionPath = TestPathUtilities.GetSolutionRootDirectory("Middleware");
var runtimeFlavor = GetRuntimeFlavor(); var runtimeFlavor = GetRuntimeFlavor();
var applicationType = runtimeFlavor == RuntimeFlavor.Clr ? ApplicationType.Standalone : ApplicationType.Portable; var applicationType = runtimeFlavor == RuntimeFlavor.Clr ? ApplicationType.Standalone : ApplicationType.Portable;
@ -76,7 +76,7 @@ namespace FunctionalTests
{ {
RuntimeFlavor = runtimeFlavor, RuntimeFlavor = runtimeFlavor,
ServerType = ServerType.Kestrel, ServerType = ServerType.Kestrel,
ApplicationPath = Path.Combine(solutionPath, "samples", "SampleDestination"), ApplicationPath = Path.Combine(solutionPath, "CORS", "samples", "SampleDestination"),
PublishApplicationBeforeDeployment = false, PublishApplicationBeforeDeployment = false,
ApplicationType = applicationType, ApplicationType = applicationType,
Configuration = configuration, Configuration = configuration,
@ -89,7 +89,7 @@ namespace FunctionalTests
{ {
RuntimeFlavor = runtimeFlavor, RuntimeFlavor = runtimeFlavor,
ServerType = ServerType.Kestrel, ServerType = ServerType.Kestrel,
ApplicationPath = Path.Combine(solutionPath, "samples", "SampleOrigin"), ApplicationPath = Path.Combine(solutionPath, "CORS", "samples", "SampleOrigin"),
PublishApplicationBeforeDeployment = false, PublishApplicationBeforeDeployment = false,
ApplicationType = applicationType, ApplicationType = applicationType,
Configuration = configuration, Configuration = configuration,