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

Updating test TFMs for custom test discovery

This commit is contained in:
John Luo 2016-02-22 14:50:21 -08:00
parent a928982055
commit b294828b0f
6 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/Microsoft.AspNetCore.Localization.FunctionalTests/LocalizationSampleTest.cs
View File

@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Localization.FunctionalTests
public class LocalizationSampleTest public class LocalizationSampleTest
{ {
private static readonly string _applicationPath = private static readonly string _applicationPath =
#if DNX451 #if NET451
Path.GetFullPath(Path.Combine("..", "..", "..", "..", "samples", "LocalizationSample")); Path.GetFullPath(Path.Combine("..", "..", "..", "..", "samples", "LocalizationSample"));
#else #else
Path.GetFullPath(Path.Combine("..", "..", "samples", "LocalizationSample")); Path.GetFullPath(Path.Combine("..", "..", "samples", "LocalizationSample"));

2
test/Microsoft.AspNetCore.Localization.FunctionalTests/LocalizationTest.cs
View File

@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Localization.FunctionalTests
public class LocalizationTest public class LocalizationTest
{ {
private static readonly string _applicationPath = private static readonly string _applicationPath =
#if DNX451 #if NET451
Path.GetFullPath(Path.Combine("..", "..", "..", "LocalizationWebsite")); Path.GetFullPath(Path.Combine("..", "..", "..", "LocalizationWebsite"));
#else #else
Path.GetFullPath(Path.Combine("..", "LocalizationWebsite")); Path.GetFullPath(Path.Combine("..", "LocalizationWebsite"));

15
test/Microsoft.AspNetCore.Localization.FunctionalTests/project.json
View File

@ -4,9 +4,10 @@
}, },
"dependencies": { "dependencies": {
"Microsoft.AspNetCore.Server.Testing": "1.0.0-*", "Microsoft.AspNetCore.Server.Testing": "1.0.0-*",
"Microsoft.Extensions.Logging": "1.0.0-*",
"Microsoft.Extensions.Logging.Console": "1.0.0-*", "Microsoft.Extensions.Logging.Console": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*", "Microsoft.NETCore.Platforms": "1.0.1-*",
"xunit.runner.aspnet": "2.0.0-aspnet-*" "xunit": "2.1.0"
}, },
"frameworks": { "frameworks": {
"dnxcore50": { "dnxcore50": {
@ -15,6 +16,14 @@
"dotnet-test-xunit": "1.0.0-dev-*" "dotnet-test-xunit": "1.0.0-dev-*"
} }
}, },
"dnx451": {} "net451": {
} "frameworkAssemblies": {
"System.Runtime": ""
},
"dependencies": {
"xunit.runner.console": "2.1.0"
}
}
},
"testRunner": "xunit"
} }

6
test/Microsoft.AspNetCore.Localization.Tests/RequestLocalizationOptionsTest.cs
View File

@ -37,7 +37,7 @@ namespace Microsoft.AspNetCore.Localization.Tests
{ {
// Arrange // Arrange
var explicitCulture = new CultureInfo("fr-FR"); var explicitCulture = new CultureInfo("fr-FR");
#if DNX451 #if NET451
Thread.CurrentThread.CurrentCulture = explicitCulture; Thread.CurrentThread.CurrentCulture = explicitCulture;
Thread.CurrentThread.CurrentUICulture = explicitCulture; Thread.CurrentThread.CurrentUICulture = explicitCulture;
#else #else
@ -78,7 +78,7 @@ namespace Microsoft.AspNetCore.Localization.Tests
{ {
// Arrange // Arrange
var explicitCulture = new CultureInfo("fr-FR"); var explicitCulture = new CultureInfo("fr-FR");
#if DNX451 #if NET451
Thread.CurrentThread.CurrentCulture = explicitCulture; Thread.CurrentThread.CurrentCulture = explicitCulture;
Thread.CurrentThread.CurrentUICulture = explicitCulture; Thread.CurrentThread.CurrentUICulture = explicitCulture;
#else #else
@ -96,7 +96,7 @@ namespace Microsoft.AspNetCore.Localization.Tests
public void Dispose() public void Dispose()
{ {
#if DNX451 #if NET451
Thread.CurrentThread.CurrentCulture = _initialCulture; Thread.CurrentThread.CurrentCulture = _initialCulture;
Thread.CurrentThread.CurrentUICulture = _initialUICulture; Thread.CurrentThread.CurrentUICulture = _initialUICulture;
#else #else

2
test/Microsoft.AspNetCore.Localization.Tests/project.json
View File

@ -16,7 +16,7 @@
"dotnet-test-xunit": "1.0.0-dev-*" "dotnet-test-xunit": "1.0.0-dev-*"
} }
}, },
"dnx451": { "net451": {
"frameworkAssemblies": { "frameworkAssemblies": {
"System.Runtime": "", "System.Runtime": "",
"System.Threading.Tasks": "" "System.Threading.Tasks": ""

13
test/Microsoft.Extensions.Localization.Tests/project.json
View File

@ -8,7 +8,6 @@
"Microsoft.Extensions.Localization": "1.0.0-*", "Microsoft.Extensions.Localization": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*", "Microsoft.NETCore.Platforms": "1.0.1-*",
"xunit": "2.1.0-*", "xunit": "2.1.0-*",
"xunit.runner.aspnet": "2.0.0-aspnet-*"
}, },
"frameworks": { "frameworks": {
"dnxcore50": { "dnxcore50": {
@ -19,10 +18,16 @@
"dotnet-test-xunit": "1.0.0-dev-*" "dotnet-test-xunit": "1.0.0-dev-*"
} }
}, },
"dnx451": { "net451": {
"frameworkAssemblies": {
"System.Runtime": "",
"System.Threading.Tasks": ""
},
"dependencies": { "dependencies": {
"Moq": "4.2.1312.1622" "Moq": "4.2.1312.1622",
"xunit.runner.console": "2.1.0"
} }
} }
} },
"testRunner": "xunit"
} }