diff --git a/Localization.sln b/Localization.sln index 78aa0eb0d7..64cb290f7e 100644 --- a/Localization.sln +++ b/Localization.sln @@ -1,15 +1,15 @@ - + Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.23107.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{FB313677-BAB3-4E49-8CDB-4FA4A9564767}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Localization", "src\Microsoft.Framework.Localization\Microsoft.Framework.Localization.xproj", "{29743CFF-120E-40EB-9B89-5818425946FA}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.Localization", "src\Microsoft.Extensions.Localization\Microsoft.Extensions.Localization.xproj", "{29743CFF-120E-40EB-9B89-5818425946FA}" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Localization", "src\Microsoft.AspNet.Localization\Microsoft.AspNet.Localization.xproj", "{23E3BC23-3464-4D9B-BF78-02CB2182BEF0}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Localization.Abstractions", "src\Microsoft.Framework.Localization.Abstractions\Microsoft.Framework.Localization.Abstractions.xproj", "{A1FCF259-70F6-4605-AA2D-E4B356BE771A}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.Localization.Abstractions", "src\Microsoft.Extensions.Localization.Abstractions\Microsoft.Extensions.Localization.Abstractions.xproj", "{A1FCF259-70F6-4605-AA2D-E4B356BE771A}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{79878809-8D1C-4BD4-BA99-F1F13FF96FD8}" EndProject @@ -22,11 +22,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "CultureInfoGenerator", "src\CultureInfoGenerator\CultureInfoGenerator.xproj", "{BD22AE1C-6631-4DA6-874D-0DC0F803CEAB}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Globalization.CultureInfoCache", "src\Microsoft.Framework.Globalization.CultureInfoCache\Microsoft.Framework.Globalization.CultureInfoCache.xproj", "{F3988D3A-A4C8-4FD7-BAFE-13E0D0A1659A}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.Globalization.CultureInfoCache", "src\Microsoft.Extensions.Globalization.CultureInfoCache\Microsoft.Extensions.Globalization.CultureInfoCache.xproj", "{F3988D3A-A4C8-4FD7-BAFE-13E0D0A1659A}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{B723DB83-A670-4BCB-95FB-195361331AD2}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Localization.Tests", "test\Microsoft.Framework.Localization.Tests\Microsoft.Framework.Localization.Tests.xproj", "{287AD58D-DF34-4F16-8616-FD78FA1CADF9}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.Localization.Tests", "test\Microsoft.Extensions.Localization.Tests\Microsoft.Extensions.Localization.Tests.xproj", "{287AD58D-DF34-4F16-8616-FD78FA1CADF9}" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Localization.Tests", "test\Microsoft.AspNet.Localization.Tests\Microsoft.AspNet.Localization.Tests.xproj", "{19A2A931-5C60-47A0-816A-0DC9C4CE5736}" EndProject diff --git a/NuGetPackageVerifier.json b/NuGetPackageVerifier.json index a7b018f710..2ef6165716 100644 --- a/NuGetPackageVerifier.json +++ b/NuGetPackageVerifier.json @@ -10,9 +10,9 @@ ], "packages": { "Microsoft.AspNet.Localization": { }, - "Microsoft.Framework.Globalization.CultureInfoCache": { }, - "Microsoft.Framework.Localization": { }, - "Microsoft.Framework.Localization.Abstractions": { } + "Microsoft.Extensions.Globalization.CultureInfoCache": { }, + "Microsoft.Extensions.Localization": { }, + "Microsoft.Extensions.Localization.Abstractions": { } } }, "adx-nonshipping": { diff --git a/samples/LocalizationSample/Startup.cs b/samples/LocalizationSample/Startup.cs index 265ddce62c..a3545f6622 100644 --- a/samples/LocalizationSample/Startup.cs +++ b/samples/LocalizationSample/Startup.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -7,8 +7,8 @@ using Microsoft.AspNet.Builder; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Features; using Microsoft.AspNet.Localization; -using Microsoft.Framework.DependencyInjection; -using Microsoft.Framework.Localization; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Localization; namespace LocalizationSample { diff --git a/samples/LocalizationSample/project.json b/samples/LocalizationSample/project.json index 0371ca4fb9..a61d708fe3 100644 --- a/samples/LocalizationSample/project.json +++ b/samples/LocalizationSample/project.json @@ -6,7 +6,7 @@ "Microsoft.AspNet.Localization": "1.0.0-*", "Microsoft.AspNet.Server.IIS": "1.0.0-*", "Microsoft.AspNet.Server.WebListener": "1.0.0-*", - "Microsoft.Framework.Localization": "1.0.0-*" + "Microsoft.Extensions.Localization": "1.0.0-*" }, "commands": { diff --git a/src/CultureInfoGenerator/Program.cs b/src/CultureInfoGenerator/Program.cs index ffae2c7fa3..9408009462 100644 --- a/src/CultureInfoGenerator/Program.cs +++ b/src/CultureInfoGenerator/Program.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -22,7 +22,7 @@ namespace CultureInfoGenerator public void Main(string[] args) { - var outputFilePath = Path.GetFullPath(args.Length > 0 ? args[0] : Path.Combine(_appPath, "../Microsoft.Framework.Globalization.CultureInfoCache/CultureInfoList.cs")); + var outputFilePath = Path.GetFullPath(args.Length > 0 ? args[0] : Path.Combine(_appPath, "../Microsoft.Extensions.Globalization.CultureInfoCache/CultureInfoList.cs")); var netFxVersion = Get45or451FromRegistry(); var windowsVersion = Environment.OSVersion; @@ -36,7 +36,7 @@ namespace CultureInfoGenerator using System.Collections.Generic; -namespace Microsoft.Framework.Globalization +namespace Microsoft.Extensions.Globalization {{ /// /// Contains a list of known culture names that can be used to create a . diff --git a/src/Microsoft.AspNet.Localization/AcceptLanguageHeaderRequestCultureProvider.cs b/src/Microsoft.AspNet.Localization/AcceptLanguageHeaderRequestCultureProvider.cs index a80271fbc4..1368efb4ed 100644 --- a/src/Microsoft.AspNet.Localization/AcceptLanguageHeaderRequestCultureProvider.cs +++ b/src/Microsoft.AspNet.Localization/AcceptLanguageHeaderRequestCultureProvider.cs @@ -1,11 +1,11 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Linq; using System.Threading.Tasks; using Microsoft.AspNet.Http; -using Microsoft.Framework.Globalization; -using Microsoft.Framework.Internal; +using Microsoft.Extensions.Globalization; +using Microsoft.Extensions.Internal; using Microsoft.Net.Http.Headers; namespace Microsoft.AspNet.Localization diff --git a/src/Microsoft.AspNet.Localization/ApplicationBuilderExtensions.cs b/src/Microsoft.AspNet.Localization/ApplicationBuilderExtensions.cs index 5c3389616c..37080d6dc2 100644 --- a/src/Microsoft.AspNet.Localization/ApplicationBuilderExtensions.cs +++ b/src/Microsoft.AspNet.Localization/ApplicationBuilderExtensions.cs @@ -1,8 +1,8 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using Microsoft.AspNet.Localization; -using Microsoft.Framework.Internal; +using Microsoft.Extensions.Internal; namespace Microsoft.AspNet.Builder { diff --git a/src/Microsoft.AspNet.Localization/CookieRequestCultureProvider.cs b/src/Microsoft.AspNet.Localization/CookieRequestCultureProvider.cs index 7d477cbbb7..305f0796db 100644 --- a/src/Microsoft.AspNet.Localization/CookieRequestCultureProvider.cs +++ b/src/Microsoft.AspNet.Localization/CookieRequestCultureProvider.cs @@ -1,11 +1,11 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; using System.Threading.Tasks; using Microsoft.AspNet.Http; -using Microsoft.Framework.Globalization; -using Microsoft.Framework.Internal; +using Microsoft.Extensions.Globalization; +using Microsoft.Extensions.Internal; namespace Microsoft.AspNet.Localization { diff --git a/src/Microsoft.AspNet.Localization/CustomRequestCultureProvider.cs b/src/Microsoft.AspNet.Localization/CustomRequestCultureProvider.cs index 571a9a0e90..112123b847 100644 --- a/src/Microsoft.AspNet.Localization/CustomRequestCultureProvider.cs +++ b/src/Microsoft.AspNet.Localization/CustomRequestCultureProvider.cs @@ -1,10 +1,10 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; using System.Threading.Tasks; using Microsoft.AspNet.Http; -using Microsoft.Framework.Internal; +using Microsoft.Extensions.Internal; namespace Microsoft.AspNet.Localization { diff --git a/src/Microsoft.AspNet.Localization/QueryStringRequestCultureProvider.cs b/src/Microsoft.AspNet.Localization/QueryStringRequestCultureProvider.cs index 6c858e32a6..bdf6dc6c1f 100644 --- a/src/Microsoft.AspNet.Localization/QueryStringRequestCultureProvider.cs +++ b/src/Microsoft.AspNet.Localization/QueryStringRequestCultureProvider.cs @@ -1,10 +1,10 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Threading.Tasks; using Microsoft.AspNet.Http; -using Microsoft.Framework.Globalization; -using Microsoft.Framework.Internal; +using Microsoft.Extensions.Globalization; +using Microsoft.Extensions.Internal; namespace Microsoft.AspNet.Localization { diff --git a/src/Microsoft.AspNet.Localization/RequestCulture.cs b/src/Microsoft.AspNet.Localization/RequestCulture.cs index ec109e6d8e..31cf028760 100644 --- a/src/Microsoft.AspNet.Localization/RequestCulture.cs +++ b/src/Microsoft.AspNet.Localization/RequestCulture.cs @@ -1,8 +1,8 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Globalization; -using Microsoft.Framework.Internal; +using Microsoft.Extensions.Internal; namespace Microsoft.AspNet.Localization { diff --git a/src/Microsoft.AspNet.Localization/RequestCultureFeature.cs b/src/Microsoft.AspNet.Localization/RequestCultureFeature.cs index 601ff29bd6..0b952984fb 100644 --- a/src/Microsoft.AspNet.Localization/RequestCultureFeature.cs +++ b/src/Microsoft.AspNet.Localization/RequestCultureFeature.cs @@ -1,7 +1,7 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.Framework.Internal; +using Microsoft.Extensions.Internal; namespace Microsoft.AspNet.Localization { diff --git a/src/Microsoft.AspNet.Localization/RequestLocalizationMiddleware.cs b/src/Microsoft.AspNet.Localization/RequestLocalizationMiddleware.cs index a4808a6dab..a5df668ca5 100644 --- a/src/Microsoft.AspNet.Localization/RequestLocalizationMiddleware.cs +++ b/src/Microsoft.AspNet.Localization/RequestLocalizationMiddleware.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Globalization; @@ -7,7 +7,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.Builder; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Features; -using Microsoft.Framework.Internal; +using Microsoft.Extensions.Internal; namespace Microsoft.AspNet.Localization { diff --git a/src/Microsoft.AspNet.Localization/project.json b/src/Microsoft.AspNet.Localization/project.json index 476b94b634..6b2f05db67 100644 --- a/src/Microsoft.AspNet.Localization/project.json +++ b/src/Microsoft.AspNet.Localization/project.json @@ -7,9 +7,9 @@ }, "dependencies": { "Microsoft.AspNet.Http.Extensions": "1.0.0-*", - "Microsoft.Framework.Globalization.CultureInfoCache": "1.0.0-*", - "Microsoft.Framework.Localization.Abstractions": "1.0.0-*", - "Microsoft.Framework.NotNullAttribute.Sources": { + "Microsoft.Extensions.Globalization.CultureInfoCache": "1.0.0-*", + "Microsoft.Extensions.Localization.Abstractions": "1.0.0-*", + "Microsoft.Extensions.NotNullAttribute.Sources": { "type": "build", "version": "1.0.0-*" } diff --git a/src/Microsoft.Framework.Globalization.CultureInfoCache/CultureInfoCache.cs b/src/Microsoft.Extensions.Globalization.CultureInfoCache/CultureInfoCache.cs similarity index 95% rename from src/Microsoft.Framework.Globalization.CultureInfoCache/CultureInfoCache.cs rename to src/Microsoft.Extensions.Globalization.CultureInfoCache/CultureInfoCache.cs index 906fe777d2..280e38c834 100644 --- a/src/Microsoft.Framework.Globalization.CultureInfoCache/CultureInfoCache.cs +++ b/src/Microsoft.Extensions.Globalization.CultureInfoCache/CultureInfoCache.cs @@ -1,10 +1,10 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Collections.Concurrent; using System.Globalization; -namespace Microsoft.Framework.Globalization +namespace Microsoft.Extensions.Globalization { /// /// Provides read-only cached instances of . diff --git a/src/Microsoft.Framework.Globalization.CultureInfoCache/CultureInfoList.cs b/src/Microsoft.Extensions.Globalization.CultureInfoCache/CultureInfoList.cs similarity index 99% rename from src/Microsoft.Framework.Globalization.CultureInfoCache/CultureInfoList.cs rename to src/Microsoft.Extensions.Globalization.CultureInfoCache/CultureInfoList.cs index c29f8dcb28..64cd81db0f 100644 --- a/src/Microsoft.Framework.Globalization.CultureInfoCache/CultureInfoList.cs +++ b/src/Microsoft.Extensions.Globalization.CultureInfoCache/CultureInfoList.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; -namespace Microsoft.Framework.Globalization +namespace Microsoft.Extensions.Globalization { /// /// Contains a list of known culture names that can be used to create a . diff --git a/src/Microsoft.Framework.Globalization.CultureInfoCache/Microsoft.Framework.Globalization.CultureInfoCache.xproj b/src/Microsoft.Extensions.Globalization.CultureInfoCache/Microsoft.Extensions.Globalization.CultureInfoCache.xproj similarity index 89% rename from src/Microsoft.Framework.Globalization.CultureInfoCache/Microsoft.Framework.Globalization.CultureInfoCache.xproj rename to src/Microsoft.Extensions.Globalization.CultureInfoCache/Microsoft.Extensions.Globalization.CultureInfoCache.xproj index 9b2995ad7a..9ccd747f22 100644 --- a/src/Microsoft.Framework.Globalization.CultureInfoCache/Microsoft.Framework.Globalization.CultureInfoCache.xproj +++ b/src/Microsoft.Extensions.Globalization.CultureInfoCache/Microsoft.Extensions.Globalization.CultureInfoCache.xproj @@ -1,4 +1,4 @@ - + 14.0 @@ -8,7 +8,7 @@ f3988d3a-a4c8-4fd7-bafe-13e0d0a1659a - Microsoft.Framework.Globalization.CultureInfoList + Microsoft.Extensions.Globalization.CultureInfoList ..\..\artifacts\obj\$(MSBuildProjectName) ..\..\artifacts\bin\$(MSBuildProjectName)\ diff --git a/src/Microsoft.Framework.Globalization.CultureInfoCache/Properties/AssemblyInfo.cs b/src/Microsoft.Extensions.Globalization.CultureInfoCache/Properties/AssemblyInfo.cs similarity index 100% rename from src/Microsoft.Framework.Globalization.CultureInfoCache/Properties/AssemblyInfo.cs rename to src/Microsoft.Extensions.Globalization.CultureInfoCache/Properties/AssemblyInfo.cs diff --git a/src/Microsoft.Framework.Globalization.CultureInfoCache/project.json b/src/Microsoft.Extensions.Globalization.CultureInfoCache/project.json similarity index 100% rename from src/Microsoft.Framework.Globalization.CultureInfoCache/project.json rename to src/Microsoft.Extensions.Globalization.CultureInfoCache/project.json diff --git a/src/Microsoft.Framework.Localization.Abstractions/IStringLocalizer.cs b/src/Microsoft.Extensions.Localization.Abstractions/IStringLocalizer.cs similarity index 94% rename from src/Microsoft.Framework.Localization.Abstractions/IStringLocalizer.cs rename to src/Microsoft.Extensions.Localization.Abstractions/IStringLocalizer.cs index 4a1613504e..5afc695041 100644 --- a/src/Microsoft.Framework.Localization.Abstractions/IStringLocalizer.cs +++ b/src/Microsoft.Extensions.Localization.Abstractions/IStringLocalizer.cs @@ -1,10 +1,10 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Collections.Generic; using System.Globalization; -namespace Microsoft.Framework.Localization +namespace Microsoft.Extensions.Localization { /// /// Represents a service that provides localized strings. diff --git a/src/Microsoft.Framework.Localization.Abstractions/IStringLocalizerFactory.cs b/src/Microsoft.Extensions.Localization.Abstractions/IStringLocalizerFactory.cs similarity index 91% rename from src/Microsoft.Framework.Localization.Abstractions/IStringLocalizerFactory.cs rename to src/Microsoft.Extensions.Localization.Abstractions/IStringLocalizerFactory.cs index 0902b26277..559fa69c30 100644 --- a/src/Microsoft.Framework.Localization.Abstractions/IStringLocalizerFactory.cs +++ b/src/Microsoft.Extensions.Localization.Abstractions/IStringLocalizerFactory.cs @@ -1,9 +1,9 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -namespace Microsoft.Framework.Localization +namespace Microsoft.Extensions.Localization { /// /// Represents a factory that creates instances. diff --git a/src/Microsoft.Framework.Localization.Abstractions/IStringLocalizerOfT.cs b/src/Microsoft.Extensions.Localization.Abstractions/IStringLocalizerOfT.cs similarity index 79% rename from src/Microsoft.Framework.Localization.Abstractions/IStringLocalizerOfT.cs rename to src/Microsoft.Extensions.Localization.Abstractions/IStringLocalizerOfT.cs index d7e6f6f196..8b3e3ac330 100644 --- a/src/Microsoft.Framework.Localization.Abstractions/IStringLocalizerOfT.cs +++ b/src/Microsoft.Extensions.Localization.Abstractions/IStringLocalizerOfT.cs @@ -1,7 +1,7 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace Microsoft.Framework.Localization +namespace Microsoft.Extensions.Localization { /// /// Represents an that provides strings for . diff --git a/src/Microsoft.Framework.Localization.Abstractions/LocalizedString.cs b/src/Microsoft.Extensions.Localization.Abstractions/LocalizedString.cs similarity index 93% rename from src/Microsoft.Framework.Localization.Abstractions/LocalizedString.cs rename to src/Microsoft.Extensions.Localization.Abstractions/LocalizedString.cs index 4549457ff1..a8db327609 100644 --- a/src/Microsoft.Framework.Localization.Abstractions/LocalizedString.cs +++ b/src/Microsoft.Extensions.Localization.Abstractions/LocalizedString.cs @@ -1,9 +1,9 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.Framework.Internal; +using Microsoft.Extensions.Internal; -namespace Microsoft.Framework.Localization +namespace Microsoft.Extensions.Localization { /// /// A locale specific string. diff --git a/src/Microsoft.Framework.Localization.Abstractions/Microsoft.Framework.Localization.Abstractions.xproj b/src/Microsoft.Extensions.Localization.Abstractions/Microsoft.Extensions.Localization.Abstractions.xproj similarity index 89% rename from src/Microsoft.Framework.Localization.Abstractions/Microsoft.Framework.Localization.Abstractions.xproj rename to src/Microsoft.Extensions.Localization.Abstractions/Microsoft.Extensions.Localization.Abstractions.xproj index 7e088aa5ce..67e7fde90c 100644 --- a/src/Microsoft.Framework.Localization.Abstractions/Microsoft.Framework.Localization.Abstractions.xproj +++ b/src/Microsoft.Extensions.Localization.Abstractions/Microsoft.Extensions.Localization.Abstractions.xproj @@ -1,4 +1,4 @@ - + 14.0 @@ -8,7 +8,7 @@ a1fcf259-70f6-4605-aa2d-e4b356be771a - Microsoft.Framework.Localization.Abstractions + Microsoft.Extensions.Localization.Abstractions ..\..\artifacts\obj\$(MSBuildProjectName) ..\..\artifacts\bin\$(MSBuildProjectName)\ diff --git a/src/Microsoft.Framework.Localization.Abstractions/Properties/AssemblyInfo.cs b/src/Microsoft.Extensions.Localization.Abstractions/Properties/AssemblyInfo.cs similarity index 100% rename from src/Microsoft.Framework.Localization.Abstractions/Properties/AssemblyInfo.cs rename to src/Microsoft.Extensions.Localization.Abstractions/Properties/AssemblyInfo.cs diff --git a/src/Microsoft.Framework.Localization.Abstractions/StringLocalizerExtensions.cs b/src/Microsoft.Extensions.Localization.Abstractions/StringLocalizerExtensions.cs similarity index 93% rename from src/Microsoft.Framework.Localization.Abstractions/StringLocalizerExtensions.cs rename to src/Microsoft.Extensions.Localization.Abstractions/StringLocalizerExtensions.cs index 0bd30c124e..ff48da00e1 100644 --- a/src/Microsoft.Framework.Localization.Abstractions/StringLocalizerExtensions.cs +++ b/src/Microsoft.Extensions.Localization.Abstractions/StringLocalizerExtensions.cs @@ -1,10 +1,10 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Collections.Generic; -using Microsoft.Framework.Internal; +using Microsoft.Extensions.Internal; -namespace Microsoft.Framework.Localization +namespace Microsoft.Extensions.Localization { public static class StringLocalizerExtensions { diff --git a/src/Microsoft.Framework.Localization.Abstractions/StringLocalizerOfT.cs b/src/Microsoft.Extensions.Localization.Abstractions/StringLocalizerOfT.cs similarity index 91% rename from src/Microsoft.Framework.Localization.Abstractions/StringLocalizerOfT.cs rename to src/Microsoft.Extensions.Localization.Abstractions/StringLocalizerOfT.cs index d8621cf516..2c19e7fbaa 100644 --- a/src/Microsoft.Framework.Localization.Abstractions/StringLocalizerOfT.cs +++ b/src/Microsoft.Extensions.Localization.Abstractions/StringLocalizerOfT.cs @@ -1,11 +1,11 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Collections.Generic; using System.Globalization; -using Microsoft.Framework.Internal; +using Microsoft.Extensions.Internal; -namespace Microsoft.Framework.Localization +namespace Microsoft.Extensions.Localization { /// /// Provides strings for . diff --git a/src/Microsoft.Framework.Localization.Abstractions/project.json b/src/Microsoft.Extensions.Localization.Abstractions/project.json similarity index 92% rename from src/Microsoft.Framework.Localization.Abstractions/project.json rename to src/Microsoft.Extensions.Localization.Abstractions/project.json index fcfa40fffe..323c5af77e 100644 --- a/src/Microsoft.Framework.Localization.Abstractions/project.json +++ b/src/Microsoft.Extensions.Localization.Abstractions/project.json @@ -6,7 +6,7 @@ "url": "https://github.com/aspnet/localization" }, "dependencies": { - "Microsoft.Framework.NotNullAttribute.Sources": { + "Microsoft.Extensions.NotNullAttribute.Sources": { "type": "build", "version": "1.0.0-*" } diff --git a/src/Microsoft.Framework.Localization/IResourceNamesCache.cs b/src/Microsoft.Extensions.Localization/IResourceNamesCache.cs similarity index 89% rename from src/Microsoft.Framework.Localization/IResourceNamesCache.cs rename to src/Microsoft.Extensions.Localization/IResourceNamesCache.cs index 60b7c825cc..90d104aa68 100644 --- a/src/Microsoft.Framework.Localization/IResourceNamesCache.cs +++ b/src/Microsoft.Extensions.Localization/IResourceNamesCache.cs @@ -1,10 +1,10 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; using System.Collections.Generic; -namespace Microsoft.Framework.Localization +namespace Microsoft.Extensions.Localization { /// /// Represents a cache of string names in resources. diff --git a/src/Microsoft.Framework.Localization/Internal/AssemblyWrapper.cs b/src/Microsoft.Extensions.Localization/Internal/AssemblyWrapper.cs similarity index 78% rename from src/Microsoft.Framework.Localization/Internal/AssemblyWrapper.cs rename to src/Microsoft.Extensions.Localization/Internal/AssemblyWrapper.cs index ca95f85540..be32e83867 100644 --- a/src/Microsoft.Framework.Localization/Internal/AssemblyWrapper.cs +++ b/src/Microsoft.Extensions.Localization/Internal/AssemblyWrapper.cs @@ -1,11 +1,11 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.IO; using System.Reflection; -using Microsoft.Framework.Internal; +using Microsoft.Extensions.Internal; -namespace Microsoft.Framework.Localization.Internal +namespace Microsoft.Extensions.Localization.Internal { public class AssemblyWrapper { diff --git a/src/Microsoft.Framework.Localization/LocalizationOptions.cs b/src/Microsoft.Extensions.Localization/LocalizationOptions.cs similarity index 82% rename from src/Microsoft.Framework.Localization/LocalizationOptions.cs rename to src/Microsoft.Extensions.Localization/LocalizationOptions.cs index 211e9622a4..1b7408fe67 100644 --- a/src/Microsoft.Framework.Localization/LocalizationOptions.cs +++ b/src/Microsoft.Extensions.Localization/LocalizationOptions.cs @@ -1,7 +1,7 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace Microsoft.Framework.Localization +namespace Microsoft.Extensions.Localization { /// /// Provides programmatic configuration for localization. diff --git a/src/Microsoft.Framework.Localization/LocalizationServiceCollectionExtensions.cs b/src/Microsoft.Extensions.Localization/LocalizationServiceCollectionExtensions.cs similarity index 88% rename from src/Microsoft.Framework.Localization/LocalizationServiceCollectionExtensions.cs rename to src/Microsoft.Extensions.Localization/LocalizationServiceCollectionExtensions.cs index 6b6f86d866..f09d4ec5d3 100644 --- a/src/Microsoft.Framework.Localization/LocalizationServiceCollectionExtensions.cs +++ b/src/Microsoft.Extensions.Localization/LocalizationServiceCollectionExtensions.cs @@ -1,12 +1,12 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.Framework.DependencyInjection.Extensions; -using Microsoft.Framework.Internal; -using Microsoft.Framework.Localization; +using Microsoft.Extensions.DependencyInjection.Extensions; +using Microsoft.Extensions.Internal; +using Microsoft.Extensions.Localization; -namespace Microsoft.Framework.DependencyInjection +namespace Microsoft.Extensions.DependencyInjection { /// /// Extension methods for adding localization servics to the DI container. diff --git a/src/Microsoft.Framework.Localization/Microsoft.Framework.Localization.xproj b/src/Microsoft.Extensions.Localization/Microsoft.Extensions.Localization.xproj similarity index 90% rename from src/Microsoft.Framework.Localization/Microsoft.Framework.Localization.xproj rename to src/Microsoft.Extensions.Localization/Microsoft.Extensions.Localization.xproj index 487327e0ee..a640f907e3 100644 --- a/src/Microsoft.Framework.Localization/Microsoft.Framework.Localization.xproj +++ b/src/Microsoft.Extensions.Localization/Microsoft.Extensions.Localization.xproj @@ -1,4 +1,4 @@ - + 14.0 @@ -8,7 +8,7 @@ 29743cff-120e-40eb-9b89-5818425946fa - Microsoft.Framework.Localization + Microsoft.Extensions.Localization ..\..\artifacts\obj\$(MSBuildProjectName) ..\..\artifacts\bin\$(MSBuildProjectName)\ diff --git a/src/Microsoft.Framework.Localization/Properties/AssemblyInfo.cs b/src/Microsoft.Extensions.Localization/Properties/AssemblyInfo.cs similarity index 59% rename from src/Microsoft.Framework.Localization/Properties/AssemblyInfo.cs rename to src/Microsoft.Extensions.Localization/Properties/AssemblyInfo.cs index 02cd08d01e..2f92021c0a 100644 --- a/src/Microsoft.Framework.Localization/Properties/AssemblyInfo.cs +++ b/src/Microsoft.Extensions.Localization/Properties/AssemblyInfo.cs @@ -1,10 +1,10 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Reflection; using System.Resources; using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("Microsoft.Framework.Localization.Tests")] +[assembly: InternalsVisibleTo("Microsoft.Extensions.Localization.Tests")] [assembly: AssemblyMetadata("Serviceable", "True")] [assembly: NeutralResourcesLanguage("en-us")] \ No newline at end of file diff --git a/src/Microsoft.Framework.Localization/ResourceManagerStringLocalizer.cs b/src/Microsoft.Extensions.Localization/ResourceManagerStringLocalizer.cs similarity index 97% rename from src/Microsoft.Framework.Localization/ResourceManagerStringLocalizer.cs rename to src/Microsoft.Extensions.Localization/ResourceManagerStringLocalizer.cs index b970d5a4d4..a7d6101c23 100644 --- a/src/Microsoft.Framework.Localization/ResourceManagerStringLocalizer.cs +++ b/src/Microsoft.Extensions.Localization/ResourceManagerStringLocalizer.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Collections; @@ -7,10 +7,10 @@ using System.Collections.Generic; using System.Globalization; using System.Reflection; using System.Resources; -using Microsoft.Framework.Internal; -using Microsoft.Framework.Localization.Internal; +using Microsoft.Extensions.Internal; +using Microsoft.Extensions.Localization.Internal; -namespace Microsoft.Framework.Localization +namespace Microsoft.Extensions.Localization { /// /// An that uses the and diff --git a/src/Microsoft.Framework.Localization/ResourceManagerStringLocalizerFactory.cs b/src/Microsoft.Extensions.Localization/ResourceManagerStringLocalizerFactory.cs similarity index 95% rename from src/Microsoft.Framework.Localization/ResourceManagerStringLocalizerFactory.cs rename to src/Microsoft.Extensions.Localization/ResourceManagerStringLocalizerFactory.cs index b299823b26..75cac08fde 100644 --- a/src/Microsoft.Framework.Localization/ResourceManagerStringLocalizerFactory.cs +++ b/src/Microsoft.Extensions.Localization/ResourceManagerStringLocalizerFactory.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -6,10 +6,10 @@ using System.IO; using System.Reflection; using System.Resources; using Microsoft.Dnx.Runtime; -using Microsoft.Framework.Internal; -using Microsoft.Framework.OptionsModel; +using Microsoft.Extensions.Internal; +using Microsoft.Extensions.OptionsModel; -namespace Microsoft.Framework.Localization +namespace Microsoft.Extensions.Localization { /// /// An that creates instances of . diff --git a/src/Microsoft.Framework.Localization/ResourceManagerWithCultureStringLocalizer.cs b/src/Microsoft.Extensions.Localization/ResourceManagerWithCultureStringLocalizer.cs similarity index 95% rename from src/Microsoft.Framework.Localization/ResourceManagerWithCultureStringLocalizer.cs rename to src/Microsoft.Extensions.Localization/ResourceManagerWithCultureStringLocalizer.cs index 03f0135b54..e077bcd682 100644 --- a/src/Microsoft.Framework.Localization/ResourceManagerWithCultureStringLocalizer.cs +++ b/src/Microsoft.Extensions.Localization/ResourceManagerWithCultureStringLocalizer.cs @@ -1,13 +1,13 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Collections.Generic; using System.Globalization; using System.Reflection; using System.Resources; -using Microsoft.Framework.Internal; +using Microsoft.Extensions.Internal; -namespace Microsoft.Framework.Localization +namespace Microsoft.Extensions.Localization { /// /// An that uses the and diff --git a/src/Microsoft.Framework.Localization/ResourceNamesCache.cs b/src/Microsoft.Extensions.Localization/ResourceNamesCache.cs similarity index 88% rename from src/Microsoft.Framework.Localization/ResourceNamesCache.cs rename to src/Microsoft.Extensions.Localization/ResourceNamesCache.cs index 27ba70cf95..86e94c102a 100644 --- a/src/Microsoft.Framework.Localization/ResourceNamesCache.cs +++ b/src/Microsoft.Extensions.Localization/ResourceNamesCache.cs @@ -1,11 +1,11 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; using System.Collections.Concurrent; using System.Collections.Generic; -namespace Microsoft.Framework.Localization +namespace Microsoft.Extensions.Localization { /// /// An implementation of backed by a . diff --git a/src/Microsoft.Framework.Localization/project.json b/src/Microsoft.Extensions.Localization/project.json similarity index 78% rename from src/Microsoft.Framework.Localization/project.json rename to src/Microsoft.Extensions.Localization/project.json index 03fa7b30f4..632e56f762 100644 --- a/src/Microsoft.Framework.Localization/project.json +++ b/src/Microsoft.Extensions.Localization/project.json @@ -7,13 +7,13 @@ }, "dependencies": { "Microsoft.Dnx.Runtime.Abstractions": "1.0.0-*", - "Microsoft.Framework.DependencyInjection.Abstractions": "1.0.0-*", - "Microsoft.Framework.Localization.Abstractions": "1.0.0-*", - "Microsoft.Framework.NotNullAttribute.Sources": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-*", + "Microsoft.Extensions.Localization.Abstractions": "1.0.0-*", + "Microsoft.Extensions.NotNullAttribute.Sources": { "type": "build", "version": "1.0.0-*" }, - "Microsoft.Framework.OptionsModel": "1.0.0-*" + "Microsoft.Extensions.OptionsModel": "1.0.0-*" }, "frameworks": { "dnx451": { }, diff --git a/test/Microsoft.AspNet.Localization.Tests/AccessLanguageHeaderRequestCultureProviderTest.cs b/test/Microsoft.AspNet.Localization.Tests/AccessLanguageHeaderRequestCultureProviderTest.cs index 854b62c854..c0698c25ff 100644 --- a/test/Microsoft.AspNet.Localization.Tests/AccessLanguageHeaderRequestCultureProviderTest.cs +++ b/test/Microsoft.AspNet.Localization.Tests/AccessLanguageHeaderRequestCultureProviderTest.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Collections.Generic; @@ -10,7 +10,7 @@ using Microsoft.AspNet.Localization; using Microsoft.AspNet.TestHost; using Xunit; -namespace Microsoft.Framework.Localization.Tests +namespace Microsoft.Extensions.Localization.Tests { public class AccessLanguageHeaderRequestCultureProviderTest { diff --git a/test/Microsoft.AspNet.Localization.Tests/CookieRequestCultureProviderTest.cs b/test/Microsoft.AspNet.Localization.Tests/CookieRequestCultureProviderTest.cs index 4b45438378..9bb01e3b8e 100644 --- a/test/Microsoft.AspNet.Localization.Tests/CookieRequestCultureProviderTest.cs +++ b/test/Microsoft.AspNet.Localization.Tests/CookieRequestCultureProviderTest.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Globalization; @@ -10,7 +10,7 @@ using Microsoft.AspNet.TestHost; using Microsoft.Net.Http.Headers; using Xunit; -namespace Microsoft.Framework.Localization.Tests +namespace Microsoft.Extensions.Localization.Tests { public class CookieRequestCultureProviderTest { diff --git a/test/Microsoft.AspNet.Localization.Tests/CustomRequestCultureProviderTest.cs b/test/Microsoft.AspNet.Localization.Tests/CustomRequestCultureProviderTest.cs index 04d1c233a1..78a0ba5520 100644 --- a/test/Microsoft.AspNet.Localization.Tests/CustomRequestCultureProviderTest.cs +++ b/test/Microsoft.AspNet.Localization.Tests/CustomRequestCultureProviderTest.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -9,10 +9,10 @@ using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Features; using Microsoft.AspNet.Localization; using Microsoft.AspNet.TestHost; -using Microsoft.Framework.Globalization; +using Microsoft.Extensions.Globalization; using Xunit; -namespace Microsoft.Framework.Localization.Tests +namespace Microsoft.Extensions.Localization.Tests { public class CustomRequestCultureProviderTest { diff --git a/test/Microsoft.AspNet.Localization.Tests/QueryStringRequestCultureProviderTest.cs b/test/Microsoft.AspNet.Localization.Tests/QueryStringRequestCultureProviderTest.cs index bdea32afec..39fc682f8f 100644 --- a/test/Microsoft.AspNet.Localization.Tests/QueryStringRequestCultureProviderTest.cs +++ b/test/Microsoft.AspNet.Localization.Tests/QueryStringRequestCultureProviderTest.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Threading.Tasks; @@ -8,7 +8,7 @@ using Microsoft.AspNet.Localization; using Microsoft.AspNet.TestHost; using Xunit; -namespace Microsoft.Framework.Localization.Tests +namespace Microsoft.Extensions.Localization.Tests { public class QueryStringRequestCultureProviderTest { diff --git a/test/Microsoft.Framework.Localization.Tests/LocalizationServiceCollectionExtensionsTest.cs b/test/Microsoft.Extensions.Localization.Tests/LocalizationServiceCollectionExtensionsTest.cs similarity index 92% rename from test/Microsoft.Framework.Localization.Tests/LocalizationServiceCollectionExtensionsTest.cs rename to test/Microsoft.Extensions.Localization.Tests/LocalizationServiceCollectionExtensionsTest.cs index c8b10bc8b4..084b2731e8 100644 --- a/test/Microsoft.Framework.Localization.Tests/LocalizationServiceCollectionExtensionsTest.cs +++ b/test/Microsoft.Extensions.Localization.Tests/LocalizationServiceCollectionExtensionsTest.cs @@ -1,12 +1,12 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Linq; -using Microsoft.Framework.DependencyInjection; -using Microsoft.Framework.OptionsModel; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.OptionsModel; using Xunit; -namespace Microsoft.Framework.Localization.Test +namespace Microsoft.Extensions.Localization.Test { public class LocalizationServiceCollectionExtensionsTest { diff --git a/test/Microsoft.Framework.Localization.Tests/Microsoft.Framework.Localization.Tests.xproj b/test/Microsoft.Extensions.Localization.Tests/Microsoft.Extensions.Localization.Tests.xproj similarity index 90% rename from test/Microsoft.Framework.Localization.Tests/Microsoft.Framework.Localization.Tests.xproj rename to test/Microsoft.Extensions.Localization.Tests/Microsoft.Extensions.Localization.Tests.xproj index f307c04f02..9b9303538e 100644 --- a/test/Microsoft.Framework.Localization.Tests/Microsoft.Framework.Localization.Tests.xproj +++ b/test/Microsoft.Extensions.Localization.Tests/Microsoft.Extensions.Localization.Tests.xproj @@ -1,4 +1,4 @@ - + 14.0 @@ -7,7 +7,7 @@ 287ad58d-df34-4f16-8616-fd78fa1cadf9 - Microsoft.Framework.Localization.Test + Microsoft.Extensions.Localization.Test ..\..\artifacts\obj\$(MSBuildProjectName) ..\..\artifacts\bin\$(MSBuildProjectName)\ diff --git a/test/Microsoft.Framework.Localization.Tests/ResourceManagerStringLocalizerTest.cs b/test/Microsoft.Extensions.Localization.Tests/ResourceManagerStringLocalizerTest.cs similarity index 96% rename from test/Microsoft.Framework.Localization.Tests/ResourceManagerStringLocalizerTest.cs rename to test/Microsoft.Extensions.Localization.Tests/ResourceManagerStringLocalizerTest.cs index f52b3aed2d..0ec5a69dfa 100644 --- a/test/Microsoft.Framework.Localization.Tests/ResourceManagerStringLocalizerTest.cs +++ b/test/Microsoft.Extensions.Localization.Tests/ResourceManagerStringLocalizerTest.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Globalization; @@ -6,10 +6,10 @@ using System.IO; using System.Linq; using System.Reflection; using System.Resources; -using Microsoft.Framework.Localization.Internal; +using Microsoft.Extensions.Localization.Internal; using Xunit; -namespace Microsoft.Framework.Localization.Tests +namespace Microsoft.Extensions.Localization.Tests { public class ResourceManagerStringLocalizerTest { diff --git a/test/Microsoft.Framework.Localization.Tests/project.json b/test/Microsoft.Extensions.Localization.Tests/project.json similarity index 72% rename from test/Microsoft.Framework.Localization.Tests/project.json rename to test/Microsoft.Extensions.Localization.Tests/project.json index 4116f905cf..84092ff34a 100644 --- a/test/Microsoft.Framework.Localization.Tests/project.json +++ b/test/Microsoft.Extensions.Localization.Tests/project.json @@ -1,7 +1,7 @@ { "dependencies": { - "Microsoft.Framework.DependencyInjection": "1.0.0-*", - "Microsoft.Framework.Localization": "1.0.0-*", + "Microsoft.Extensions.DependencyInjection": "1.0.0-*", + "Microsoft.Extensions.Localization": "1.0.0-*", "xunit": "2.1.0-*", "xunit.runner.aspnet": "2.0.0-aspnet-*" },