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

Migrate tests, tools and samples to portable

This commit is contained in:
Pavel Krymets 2016-04-15 12:04:16 -07:00
parent c9d53ad14b
commit 9268ca73df
6 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/LocalizationSample/Startup.cs
View File

@ -34,7 +34,7 @@ namespace LocalizationSample
new CultureInfo("zh"),
new CultureInfo("zh-CN")
};
#if !NETSTANDARDAPP1_5
#if !NETCOREAPP1_0
supportedCultures.Add(new CultureInfo("zh-CHT"));
#endif
var options = new RequestLocalizationOptions {

10
samples/LocalizationSample/project.json
View File

@ -4,8 +4,7 @@
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.Localization": "1.0.0-*",
"Microsoft.Extensions.Localization": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*"
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
},
"compilationOptions": {
"emitEntryPoint": true
@ -15,12 +14,15 @@
],
"frameworks": {
"net451": {},
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50"
],
"dependencies": {
"NETStandard.Library": "1.5.0-*"
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
}
}
}
}

7
test/LocalizationWebsite/project.json
View File

@ -11,10 +11,13 @@
"Microsoft.Extensions.Logging.Console": "1.0.0-*"
},
"frameworks": {
"netstandardapp1.5": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
},
"dotnet-test-xunit": "1.0.0-dev-*",
"NETStandard.Library": "1.5.0-*",
"System.Diagnostics.Process": "4.1.0-*"
},
"imports": [

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

@ -10,14 +10,17 @@
"xunit": "2.1.0"
},
"frameworks": {
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
},
"dotnet-test-xunit": "1.0.0-dev-*",
"NETStandard.Library": "1.5.0-*",
"System.Diagnostics.Process": "4.1.0-*"
}
},

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

@ -9,14 +9,17 @@
},
"testRunner": "xunit",
"frameworks": {
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
},
"dotnet-test-xunit": "1.0.0-dev-*",
"NETStandard.Library": "1.5.0-*",
"System.Diagnostics.Process": "4.1.0-*"
}
},

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

@ -9,17 +9,21 @@
"xunit": "2.1.0-*"
},
"frameworks": {
"netstandardapp1.5": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
},
"moq.netcore": "4.4.0-beta8",
"System.Resources.Writer": "4.0.0-*",
"dotnet-test-xunit": "1.0.0-dev-*",
"NETStandard.Library": "1.5.0-*",
"System.Diagnostics.Process": "4.1.0-*"
"System.Diagnostics.Process": "4.1.0-*",
"System.Diagnostics.TraceSource": "4.0.0-*"
}
},
"net451": {