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

Transition to netstandard. 

- dotnet5.X => netstandard1.y (where y = x-1).
- DNXCore50 => netstandardapp1.5.
- Applied the same changes to ifdefs.
This commit is contained in:
N. Taylor Mullen 2016-03-01 13:38:14 -08:00
parent 7ac771155d
commit b746844466
10 changed files with 65 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/LocalizationSample/Startup.cs
View File

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

16
samples/LocalizationSample/project.json
View File

@ -1,6 +1,5 @@
{
"version": "1.0.0-*",
"dependencies": {
"Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*",
"Microsoft.AspNetCore.Localization": "1.0.0-*",
@ -8,24 +7,23 @@
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*"
},
"compilationOptions": {
"emitEntryPoint": true
},
"commands": {
"web": "LocalizationSample"
},
"frameworks": {
"dnx451": { },
"dnxcore50": {
"dnx451": {},
"netstandardapp1.5": {
"dependencies": {
"NETStandard.Library": "1.0.0-*"
}
},
"imports": [
"dnxcore50"
]
}
},
"publishExclude": [
"node_modules",
"bower_components",
@ -38,4 +36,4 @@
"node_modules",
"bower_components"
]
}
}

12
src/Microsoft.AspNetCore.Localization/project.json
View File

@ -8,7 +8,9 @@
"compilationOptions": {
"warningsAsErrors": true,
"keyFile": "../../tools/Key.snk",
"nowarn": [ "CS1591" ],
"nowarn": [
"CS1591"
],
"xmlDoc": true
},
"dependencies": {
@ -19,6 +21,10 @@
},
"frameworks": {
"net451": {},
"dotnet5.4": {}
"netstandard1.3": {
"imports": [
"dotnet5.4"
]
}
}
}
}

13
src/Microsoft.Extensions.Globalization.CultureInfoCache/project.json
View File

@ -8,16 +8,21 @@
"compilationOptions": {
"warningsAsErrors": true,
"keyFile": "../../tools/Key.snk",
"nowarn": [ "CS1591" ],
"nowarn": [
"CS1591"
],
"xmlDoc": true
},
"frameworks": {
"net451": {},
"dotnet5.4": {
"netstandard1.3": {
"dependencies": {
"System.Collections.Concurrent": "4.0.12-*",
"System.Linq": "4.1.0-*"
}
},
"imports": [
"dotnet5.4"
]
}
}
}
}

13
src/Microsoft.Extensions.Localization.Abstractions/project.json
View File

@ -8,16 +8,21 @@
"compilationOptions": {
"warningsAsErrors": true,
"keyFile": "../../tools/Key.snk",
"nowarn": [ "CS1591" ],
"nowarn": [
"CS1591"
],
"xmlDoc": true
},
"frameworks": {
"net451": {},
"dotnet5.4": {
"netstandard1.3": {
"dependencies": {
"Microsoft.CSharp": "4.0.1-*",
"System.Globalization": "4.0.11-*"
}
},
"imports": [
"dotnet5.4"
]
}
}
}
}

13
src/Microsoft.Extensions.Localization/project.json
View File

@ -8,7 +8,9 @@
"compilationOptions": {
"warningsAsErrors": true,
"keyFile": "../../tools/Key.snk",
"nowarn": [ "CS1591" ],
"nowarn": [
"CS1591"
],
"xmlDoc": true
},
"dependencies": {
@ -19,11 +21,14 @@
},
"frameworks": {
"net451": {},
"dotnet5.4": {
"netstandard1.3": {
"dependencies": {
"System.Collections.Concurrent": "4.0.12-*",
"System.Resources.Reader": "4.0.0-*"
}
},
"imports": [
"dotnet5.4"
]
}
}
}
}

7
test/LocalizationWebsite/project.json
View File

@ -12,11 +12,14 @@
"Microsoft.NETCore.Platforms": "1.0.1-*"
},
"frameworks": {
"dnxcore50": {
"netstandardapp1.5": {
"dependencies": {
"dotnet-test-xunit": "1.0.0-dev-*"
},
"imports": "portable-net451+win8"
"imports": [
"dnxcore50",
"portable-net451+win8"
]
},
"dnx451": {}
},

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

@ -10,8 +10,11 @@
"xunit": "2.1.0"
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net451+win8",
"netstandardapp1.5": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"dotnet-test-xunit": "1.0.0-dev-*"
}

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

@ -10,8 +10,11 @@
},
"testRunner": "xunit",
"frameworks": {
"dnxcore50": {
"imports": "portable-net451+win8",
"netstandardapp1.5": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"dotnet-test-xunit": "1.0.0-dev-*"
}

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

@ -7,11 +7,14 @@
"Microsoft.Extensions.DependencyInjection": "1.0.0-*",
"Microsoft.Extensions.Localization": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*",
"xunit": "2.1.0-*",
"xunit": "2.1.0-*"
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net451+win8",
"netstandardapp1.5": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {
"moq.netcore": "4.4.0-beta8",
"System.Resources.Writer": "4.0.0-*",