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

Simplify resolve path check

This commit is contained in:
David Fowler 2016-02-13 22:47:07 -08:00
parent cf6d7f9a56
commit 0633690715
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Microsoft.AspNetCore.Hosting/WebHostBuilder.cs
View File

@ -225,7 +225,7 @@ namespace Microsoft.AspNetCore.Hosting
{ {
public WrappedApplicationEnvironment(string applicationBasePath, IApplicationEnvironment env) public WrappedApplicationEnvironment(string applicationBasePath, IApplicationEnvironment env)
{ {
ApplicationBasePath = ResolvePath(applicationBasePath); ApplicationBasePath = ResolvePath(applicationBasePath, env.ApplicationBasePath);
ApplicationName = env.ApplicationName; ApplicationName = env.ApplicationName;
ApplicationVersion = env.ApplicationVersion; ApplicationVersion = env.ApplicationVersion;
RuntimeFramework = env.RuntimeFramework; RuntimeFramework = env.RuntimeFramework;
@ -240,20 +240,13 @@ namespace Microsoft.AspNetCore.Hosting
public FrameworkName RuntimeFramework { get; } public FrameworkName RuntimeFramework { get; }
} }
private static string ResolvePath(string applicationBasePath) private static string ResolvePath(string applicationBasePath, string basePath)
{ {
if (Path.IsPathRooted(applicationBasePath)) if (Path.IsPathRooted(applicationBasePath))
{ {
return applicationBasePath; return applicationBasePath;
} }
var basePath =
#if NET451
(string)AppDomain.CurrentDomain.GetData("APP_CONTEXT_BASE_DIRECTORY") ??
AppDomain.CurrentDomain.BaseDirectory;
#else
AppContext.BaseDirectory;
#endif
return Path.Combine(Path.GetFullPath(basePath), applicationBasePath); return Path.Combine(Path.GetFullPath(basePath), applicationBasePath);
} }
} }