diff --git a/samples/LocalizationSample/Startup.cs b/samples/LocalizationSample/Startup.cs index 218fceff51..c906275082 100644 --- a/samples/LocalizationSample/Startup.cs +++ b/samples/LocalizationSample/Startup.cs @@ -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 { diff --git a/samples/LocalizationSample/project.json b/samples/LocalizationSample/project.json index 79a00e697f..0416717f98 100644 --- a/samples/LocalizationSample/project.json +++ b/samples/LocalizationSample/project.json @@ -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" ] -} +} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Localization/project.json b/src/Microsoft.AspNetCore.Localization/project.json index 1b51931cba..1292b90f0e 100644 --- a/src/Microsoft.AspNetCore.Localization/project.json +++ b/src/Microsoft.AspNetCore.Localization/project.json @@ -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" + ] + } } -} +} \ No newline at end of file diff --git a/src/Microsoft.Extensions.Globalization.CultureInfoCache/project.json b/src/Microsoft.Extensions.Globalization.CultureInfoCache/project.json index 4983ebf4d5..0819ad2fdd 100644 --- a/src/Microsoft.Extensions.Globalization.CultureInfoCache/project.json +++ b/src/Microsoft.Extensions.Globalization.CultureInfoCache/project.json @@ -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" + ] } } -} +} \ No newline at end of file diff --git a/src/Microsoft.Extensions.Localization.Abstractions/project.json b/src/Microsoft.Extensions.Localization.Abstractions/project.json index 319ad27c82..f2c11f9c49 100644 --- a/src/Microsoft.Extensions.Localization.Abstractions/project.json +++ b/src/Microsoft.Extensions.Localization.Abstractions/project.json @@ -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" + ] } } -} +} \ No newline at end of file diff --git a/src/Microsoft.Extensions.Localization/project.json b/src/Microsoft.Extensions.Localization/project.json index 02ad175733..7b15f7a4c7 100644 --- a/src/Microsoft.Extensions.Localization/project.json +++ b/src/Microsoft.Extensions.Localization/project.json @@ -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" + ] } } -} +} \ No newline at end of file diff --git a/test/LocalizationWebsite/project.json b/test/LocalizationWebsite/project.json index 1439057e00..f4aef97539 100644 --- a/test/LocalizationWebsite/project.json +++ b/test/LocalizationWebsite/project.json @@ -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": {} }, diff --git a/test/Microsoft.AspNetCore.Localization.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Localization.FunctionalTests/project.json index 01a557fc5c..c39676a3be 100644 --- a/test/Microsoft.AspNetCore.Localization.FunctionalTests/project.json +++ b/test/Microsoft.AspNetCore.Localization.FunctionalTests/project.json @@ -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-*" } diff --git a/test/Microsoft.AspNetCore.Localization.Tests/project.json b/test/Microsoft.AspNetCore.Localization.Tests/project.json index 54b23e3802..d24c610a53 100644 --- a/test/Microsoft.AspNetCore.Localization.Tests/project.json +++ b/test/Microsoft.AspNetCore.Localization.Tests/project.json @@ -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-*" } diff --git a/test/Microsoft.Extensions.Localization.Tests/project.json b/test/Microsoft.Extensions.Localization.Tests/project.json index 36b02a3be3..8e00de1fed 100644 --- a/test/Microsoft.Extensions.Localization.Tests/project.json +++ b/test/Microsoft.Extensions.Localization.Tests/project.json @@ -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-*",