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

Reacting to KoreBuild xunit test changes

This commit is contained in:
Pranav K 2016-03-07 15:49:11 -08:00
parent 05ac95c344
commit f3740b2196
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/Microsoft.AspNetCore.Mvc.FunctionalTests/MvcSampleFixture.cs
View File

@ -1,16 +1,14 @@
// Copyright (c) .NET Foundation. All rights reserved. // 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. // 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 namespace Microsoft.AspNetCore.Mvc.FunctionalTests
{ {
public class MvcSampleFixture<TStartup> : MvcTestFixture<TStartup> public class MvcSampleFixture<TStartup> : MvcTestFixture<TStartup>
{ {
public MvcSampleFixture() public MvcSampleFixture()
#if NETSTANDARDAPP1_5 : base(Path.Combine("..", "..", "..", "..", "..", "..", "samples"))
:base("../../../../../../samples/")
#else
: base("../../../../samples/")
#endif
{ {
} }
} }

4
test/Microsoft.AspNetCore.Mvc.FunctionalTests/MvcTestFixture.cs
View File

@ -24,11 +24,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
private readonly TestServer _server; private readonly TestServer _server;
public MvcTestFixture() public MvcTestFixture()
#if NETSTANDARDAPP1_5
: this(Path.Combine("..", "..", "..", "..", "..", "WebSites")) : this(Path.Combine("..", "..", "..", "..", "..", "WebSites"))
#else
: this(Path.Combine("..", "..", "..", "WebSites"))
#endif
{ {
} }

8
test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/project.json
View File

@ -26,10 +26,12 @@
"dotnet-test-xunit": "1.0.0-dev-*" "dotnet-test-xunit": "1.0.0-dev-*"
} }
}, },
"dnx451": { "net451": {
"frameworkAssemblies": {
"System.Threading.Tasks": ""
},
"dependencies": { "dependencies": {
"Moq": "4.2.1312.1622", "Moq": "4.2.1312.1622"
"xunit.runner.aspnet": "2.0.0-aspnet-*"
} }
} }
} }