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

Merge in 'release/2.1' changes

This commit is contained in:
dotnet-bot 2018-12-03 22:06:28 +00:00
parent 3a74f325e2 81bc0b1ca8
commit f89d98f241
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Hosting/test/FunctionalTests/ShutdownTests.cs
View File

@ -47,7 +47,7 @@ namespace Microsoft.AspNetCore.Hosting.FunctionalTests
{ {
var logger = loggerFactory.CreateLogger(testName); var logger = loggerFactory.CreateLogger(testName);
var applicationPath = Path.Combine(TestPathUtilities.GetSolutionRootDirectory("Hosting"), "test", "TestAssets", var applicationPath = Path.Combine(TestPathUtilities.GetSolutionRootDirectory("Hosting"), "test", "testassets",
"Microsoft.AspNetCore.Hosting.TestSites"); "Microsoft.AspNetCore.Hosting.TestSites");
var deploymentParameters = new DeploymentParameters( var deploymentParameters = new DeploymentParameters(

2
src/Hosting/test/FunctionalTests/WebHostBuilderTests.cs
View File

@ -33,7 +33,7 @@ namespace Microsoft.AspNetCore.Hosting.FunctionalTests
{ {
var logger = loggerFactory.CreateLogger(nameof(InjectedStartup_DefaultApplicationNameIsEntryAssembly)); var logger = loggerFactory.CreateLogger(nameof(InjectedStartup_DefaultApplicationNameIsEntryAssembly));
var applicationPath = Path.Combine(TestPathUtilities.GetSolutionRootDirectory("Hosting"), "test", "TestAssets", "IStartupInjectionAssemblyName"); var applicationPath = Path.Combine(TestPathUtilities.GetSolutionRootDirectory("Hosting"), "test", "testassets", "IStartupInjectionAssemblyName");
var deploymentParameters = new DeploymentParameters( var deploymentParameters = new DeploymentParameters(
applicationPath, applicationPath,