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

Merge branch 'release' into dev

This commit is contained in:
Pavel Krymets 2016-04-18 17:09:33 -07:00
parent 34a943a942 23bb1fca43
commit eef52f2544
5 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
samples/LocalizationSample/project.json
View File

@ -1,6 +1,7 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"dependencies": { "dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1-*",
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.Localization": "1.0.0-*", "Microsoft.AspNetCore.Localization": "1.0.0-*",
"Microsoft.Extensions.Localization": "1.0.0-*", "Microsoft.Extensions.Localization": "1.0.0-*",

1
test/LocalizationWebsite/project.json
View File

@ -5,6 +5,7 @@
"emitEntryPoint": true "emitEntryPoint": true
}, },
"dependencies": { "dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1-*",
"Microsoft.AspNetCore.Localization": "1.0.0-*", "Microsoft.AspNetCore.Localization": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.Extensions.Localization": "1.0.0-*", "Microsoft.Extensions.Localization": "1.0.0-*",

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

@ -3,6 +3,7 @@
"warningsAsErrors": true "warningsAsErrors": true
}, },
"dependencies": { "dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1-*",
"Microsoft.AspNetCore.Localization": "1.0.0-*", "Microsoft.AspNetCore.Localization": "1.0.0-*",
"Microsoft.AspNetCore.Server.Testing": "1.0.0-*", "Microsoft.AspNetCore.Server.Testing": "1.0.0-*",
"Microsoft.Extensions.Logging": "1.0.0-*", "Microsoft.Extensions.Logging": "1.0.0-*",

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

@ -3,6 +3,7 @@
"warningsAsErrors": true "warningsAsErrors": true
}, },
"dependencies": { "dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1-*",
"Microsoft.AspNetCore.Localization": "1.0.0-*", "Microsoft.AspNetCore.Localization": "1.0.0-*",
"Microsoft.AspNetCore.TestHost": "1.0.0-*", "Microsoft.AspNetCore.TestHost": "1.0.0-*",
"xunit": "2.1.0-*" "xunit": "2.1.0-*"

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

@ -4,6 +4,7 @@
"keyFile": "../../tools/Key.snk" "keyFile": "../../tools/Key.snk"
}, },
"dependencies": { "dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1-*",
"Microsoft.Extensions.DependencyInjection": "1.0.0-*", "Microsoft.Extensions.DependencyInjection": "1.0.0-*",
"Microsoft.Extensions.Localization": "1.0.0-*", "Microsoft.Extensions.Localization": "1.0.0-*",
"xunit": "2.1.0-*" "xunit": "2.1.0-*"