diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/MvcSampleFixture.cs b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/MvcSampleFixture.cs index 35352ab73d..e03f90897d 100644 --- a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/MvcSampleFixture.cs +++ b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/MvcSampleFixture.cs @@ -1,16 +1,14 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using System.IO; + namespace Microsoft.AspNetCore.Mvc.FunctionalTests { public class MvcSampleFixture : MvcTestFixture { public MvcSampleFixture() -#if NETSTANDARDAPP1_5 - :base("../../../../../../samples/") -#else - : base("../../../../samples/") -#endif + : base(Path.Combine("..", "..", "..", "..", "..", "..", "samples")) { } } diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/MvcTestFixture.cs b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/MvcTestFixture.cs index c18388c8c7..5f2733f15b 100644 --- a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/MvcTestFixture.cs +++ b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/MvcTestFixture.cs @@ -24,11 +24,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests private readonly TestServer _server; public MvcTestFixture() -#if NETSTANDARDAPP1_5 : this(Path.Combine("..", "..", "..", "..", "..", "WebSites")) -#else - : this(Path.Combine("..", "..", "..", "WebSites")) -#endif { } diff --git a/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/project.json b/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/project.json index 1984515f45..002032e0cd 100644 --- a/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/project.json +++ b/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/project.json @@ -26,10 +26,12 @@ "dotnet-test-xunit": "1.0.0-dev-*" } }, - "dnx451": { + "net451": { + "frameworkAssemblies": { + "System.Threading.Tasks": "" + }, "dependencies": { - "Moq": "4.2.1312.1622", - "xunit.runner.aspnet": "2.0.0-aspnet-*" + "Moq": "4.2.1312.1622" } } }