diff --git a/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj b/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj index 66a603d854..dd27a87e20 100644 --- a/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj +++ b/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj @@ -3,7 +3,8 @@ - netcoreapp1.1;net451 + netcoreapp1.1;net452 + netcoreapp1.1 win7-x64 diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/Microsoft.AspNetCore.StaticFiles.Tests.csproj b/test/Microsoft.AspNetCore.StaticFiles.Tests/Microsoft.AspNetCore.StaticFiles.Tests.csproj index 598cca91b2..e1bd141202 100644 --- a/test/Microsoft.AspNetCore.StaticFiles.Tests/Microsoft.AspNetCore.StaticFiles.Tests.csproj +++ b/test/Microsoft.AspNetCore.StaticFiles.Tests/Microsoft.AspNetCore.StaticFiles.Tests.csproj @@ -3,7 +3,8 @@ - netcoreapp1.1;net451 + netcoreapp1.1;net452 + netcoreapp1.1 diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFilesTestServer.cs b/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFilesTestServer.cs index 0f63031210..d5243e3a24 100644 --- a/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFilesTestServer.cs +++ b/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFilesTestServer.cs @@ -16,7 +16,7 @@ namespace Microsoft.AspNetCore.StaticFiles { public static TestServer Create(Action configureApp, Action configureServices = null) { - var contentRootNet451 = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? + var contentRootNet452 = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "." : "../../../../test/Microsoft.AspNetCore.StaticFiles.Tests"; Action defaultConfigureServices = services => { }; var configuration = new ConfigurationBuilder() @@ -26,8 +26,8 @@ namespace Microsoft.AspNetCore.StaticFiles }) .Build(); var builder = new WebHostBuilder() -#if NET451 - .UseContentRoot(contentRootNet451) +#if NET452 + .UseContentRoot(contentRootNet452) #endif .UseConfiguration(configuration) .Configure(configureApp) diff --git a/test/shared/TestBaseDir.cs b/test/shared/TestBaseDir.cs index 0e33ce8522..b5fd6a0352 100644 --- a/test/shared/TestBaseDir.cs +++ b/test/shared/TestBaseDir.cs @@ -8,7 +8,7 @@ namespace Microsoft.AspNetCore.StaticFiles public static class TestDirectory { public static readonly string BaseDirectory -#if NET451 +#if NET452 = AppDomain.CurrentDomain.BaseDirectory; #else = AppContext.BaseDirectory;