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

Merge branch 'merge/release/2.1-to-release/2.2' into release/2.2 (#4619)

This commit is contained in:
Nate McMaster 2018-12-13 22:15:09 -08:00
parent 6adfa32402 9e76bec6e1
commit 4998ad8622
No known key found for this signature in database
GPG Key ID: 157F9066DEF38BD0
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)
{
var solutionPath = TestPathUtilities.GetSolutionRootDirectory("CORS");
var solutionPath = TestPathUtilities.GetSolutionRootDirectory("Middleware");
var runtimeFlavor = GetRuntimeFlavor();
var applicationType = runtimeFlavor == RuntimeFlavor.Clr ? ApplicationType.Standalone : ApplicationType.Portable;
@ -76,7 +76,7 @@ namespace FunctionalTests
{
RuntimeFlavor = runtimeFlavor,
ServerType = ServerType.Kestrel,
ApplicationPath = Path.Combine(solutionPath, "samples", "SampleDestination"),
ApplicationPath = Path.Combine(solutionPath, "CORS", "samples", "SampleDestination"),
PublishApplicationBeforeDeployment = false,
ApplicationType = applicationType,
Configuration = configuration,
@ -89,7 +89,7 @@ namespace FunctionalTests
{
RuntimeFlavor = runtimeFlavor,
ServerType = ServerType.Kestrel,
ApplicationPath = Path.Combine(solutionPath, "samples", "SampleOrigin"),
ApplicationPath = Path.Combine(solutionPath, "CORS", "samples", "SampleOrigin"),
PublishApplicationBeforeDeployment = false,
ApplicationType = applicationType,
Configuration = configuration,