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

Fix content root for non-windows xunit tests with no app domains

This commit is contained in:
= 2016-03-25 12:39:15 -07:00
parent 2477982854
commit d42eb56fee
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFilesTestServer.cs
View File

@ -8,6 +8,7 @@ using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.TestHost; using Microsoft.AspNetCore.TestHost;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.PlatformAbstractions;
namespace Microsoft.AspNetCore.StaticFiles namespace Microsoft.AspNetCore.StaticFiles
{ {
@ -15,6 +16,8 @@ namespace Microsoft.AspNetCore.StaticFiles
{ {
public static TestServer Create(Action<IApplicationBuilder> configureApp, Action<IServiceCollection> configureServices = null) public static TestServer Create(Action<IApplicationBuilder> configureApp, Action<IServiceCollection> configureServices = null)
{ {
var contentRootNet451 = PlatformServices.Default.Runtime.OperatingSystemPlatform == Platform.Windows ?
"." : "../../../../test/Microsoft.AspNetCore.StaticFiles.Tests";
Action<IServiceCollection> defaultConfigureServices = services => { }; Action<IServiceCollection> defaultConfigureServices = services => { };
var configuration = new ConfigurationBuilder() var configuration = new ConfigurationBuilder()
.AddInMemoryCollection(new [] .AddInMemoryCollection(new []
@ -23,6 +26,9 @@ namespace Microsoft.AspNetCore.StaticFiles
}) })
.Build(); .Build();
var builder = new WebHostBuilder() var builder = new WebHostBuilder()
#if NET451
.UseContentRoot(contentRootNet451)
#endif
.UseConfiguration(configuration) .UseConfiguration(configuration)
.Configure(configureApp) .Configure(configureApp)
.ConfigureServices(configureServices ?? defaultConfigureServices); .ConfigureServices(configureServices ?? defaultConfigureServices);