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

Handle IFileSystem rename.

This commit is contained in:
Chris Ross 2015-01-20 08:37:10 -08:00
parent a93537e3be
commit 36c2a44b91
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Microsoft.AspNet.Hosting/HostingEnvironment.cs
View File

@ -2,7 +2,7 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.Collections.Generic; using System.Collections.Generic;
using Microsoft.AspNet.FileSystems; using Microsoft.AspNet.FileProviders;
using Microsoft.Framework.Runtime; using Microsoft.Framework.Runtime;
namespace Microsoft.AspNet.Hosting namespace Microsoft.AspNet.Hosting
@ -15,7 +15,7 @@ namespace Microsoft.AspNet.Hosting
{ {
EnvironmentName = DefaultEnvironmentName; EnvironmentName = DefaultEnvironmentName;
WebRoot = HostingUtilities.GetWebRoot(appEnvironment.ApplicationBasePath); WebRoot = HostingUtilities.GetWebRoot(appEnvironment.ApplicationBasePath);
WebRootFileSystem = new PhysicalFileSystem(WebRoot); WebRootFileProvider = new PhysicalFileProvider(WebRoot);
foreach (var configure in configures) foreach (var configure in configures)
{ {
configure.Configure(this); configure.Configure(this);
@ -26,6 +26,6 @@ namespace Microsoft.AspNet.Hosting
public string WebRoot { get; private set; } public string WebRoot { get; private set; }
public IFileSystem WebRootFileSystem { get; set; } public IFileProvider WebRootFileProvider { get; set; }
} }
} }

4
src/Microsoft.AspNet.Hosting/IHostingEnvironment.cs
View File

@ -1,7 +1,7 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using Microsoft.AspNet.FileSystems; using Microsoft.AspNet.FileProviders;
using Microsoft.Framework.Runtime; using Microsoft.Framework.Runtime;
namespace Microsoft.AspNet.Hosting namespace Microsoft.AspNet.Hosting
@ -13,6 +13,6 @@ namespace Microsoft.AspNet.Hosting
string WebRoot { get; } string WebRoot { get; }
IFileSystem WebRootFileSystem { get; set; } IFileProvider WebRootFileProvider { get; set; }
} }
} }

2
src/Microsoft.AspNet.Hosting/project.json
View File

@ -2,7 +2,7 @@
"version": "1.0.0-*", "version": "1.0.0-*",
"description": "ASP.NET 5 core hosting infrastructure and startup logic for web applications.", "description": "ASP.NET 5 core hosting infrastructure and startup logic for web applications.",
"dependencies": { "dependencies": {
"Microsoft.AspNet.FileSystems": "1.0.0-*", "Microsoft.AspNet.FileProviders": "1.0.0-*",
"Microsoft.AspNet.Http.Core": "1.0.0-*", "Microsoft.AspNet.Http.Core": "1.0.0-*",
"Microsoft.Framework.Logging": "1.0.0-*", "Microsoft.Framework.Logging": "1.0.0-*",
"Microsoft.Framework.OptionsModel": "1.0.0-*", "Microsoft.Framework.OptionsModel": "1.0.0-*",

2
test/Microsoft.AspNet.Hosting.Tests/HostingEngineTests.cs
View File

@ -59,7 +59,7 @@ namespace Microsoft.AspNet.Hosting
var services = HostingServices.Create().BuildServiceProvider(); var services = HostingServices.Create().BuildServiceProvider();
var env = services.GetRequiredService<IHostingEnvironment>(); var env = services.GetRequiredService<IHostingEnvironment>();
Assert.Equal(Path.GetFullPath("testroot"), env.WebRoot); Assert.Equal(Path.GetFullPath("testroot"), env.WebRoot);
Assert.True(env.WebRootFileSystem.GetFileInfo("TextFile.txt").Exists); Assert.True(env.WebRootFileProvider.GetFileInfo("TextFile.txt").Exists);
} }
public void Initialize(IApplicationBuilder builder) public void Initialize(IApplicationBuilder builder)