diff --git a/Localization.sln b/Localization.sln index d38677c13c..06bff65d67 100644 --- a/Localization.sln +++ b/Localization.sln @@ -6,7 +6,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{FB313677-BAB EndProject 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}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Localization", "src\Microsoft.AspNetCore.Localization\Microsoft.AspNetCore.Localization.xproj", "{23E3BC23-3464-4D9B-BF78-02CB2182BEF0}" EndProject 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 @@ -25,11 +25,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{B723DB83-A EndProject 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}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Localization.Tests", "test\Microsoft.AspNetCore.Localization.Tests\Microsoft.AspNetCore.Localization.Tests.xproj", "{19A2A931-5C60-47A0-816A-0DC9C4CE5736}" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "LocalizationWebsite", "test\LocalizationWebsite\LocalizationWebsite.xproj", "{EF6C7431-2FB8-4396-8947-F50F31689AF4}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Localization.FunctionalTests", "test\Microsoft.AspNet.Localization.FunctionalTests\Microsoft.AspNet.Localization.FunctionalTests.xproj", "{B1B441BA-3AC8-49F8-850D-E5A178E77DE2}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Localization.FunctionalTests", "test\Microsoft.AspNetCore.Localization.FunctionalTests\Microsoft.AspNetCore.Localization.FunctionalTests.xproj", "{B1B441BA-3AC8-49F8-850D-E5A178E77DE2}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/NuGetPackageVerifier.json b/NuGetPackageVerifier.json index c76561f282..1b96fff1c7 100644 --- a/NuGetPackageVerifier.json +++ b/NuGetPackageVerifier.json @@ -9,7 +9,7 @@ "StrictSemanticVersionValidationRule" ], "packages": { - "Microsoft.AspNet.Localization": { }, + "Microsoft.AspNetCore.Localization": { }, "Microsoft.Extensions.Globalization.CultureInfoCache": { }, "Microsoft.Extensions.Localization": { }, "Microsoft.Extensions.Localization.Abstractions": { } diff --git a/README.md b/README.md index 454660c6cd..660f3c76d6 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Travis: [![Travis](https://travis-ci.org/aspnet/Localization.svg?branch=dev)]( | Package | aspnetvolatiledev | [aspnetcidev](https://myget.org/gallery/aspnetcidev) | [aspnetvnext](https://myget.org/gallery/aspnetvnext) | [NuGet](https://nuget.org) | | ------- | ----------------------- | ----------------- | ----------------- | ----- | | Microsoft.Extensions.Localization | [![MyGet](https://img.shields.io/myget/aspnetvolatiledev/vpre/Microsoft.Extensions.Localization.svg)](https://www.myget.org/feed/aspnetvolatiledev/package/nuget/Microsoft.Extensions.Localization) | [![MyGet](https://img.shields.io/myget/aspnetcidev/vpre/Microsoft.Extensions.Localization.svg)](https://www.myget.org/feed/aspnetcidev/package/nuget/Microsoft.Extensions.Localization) | [![MyGet](https://img.shields.io/myget/aspnetvnext/vpre/Microsoft.Extensions.Localization.svg)](https://www.myget.org/feed/aspnetvnext/package/nuget/Microsoft.Extensions.Localization) | [![NuGet](https://img.shields.io/nuget/v/Microsoft.Extensions.Localization.svg)](https://nuget.org/packages/Microsoft.Extensions.Localization) | -| Microsoft.AspNet.Localization | [![MyGet](https://img.shields.io/myget/aspnetvolatiledev/vpre/Microsoft.AspNet.Localization.svg)](https://www.myget.org/feed/aspnetvolatiledev/package/nuget/Microsoft.AspNet.Localization) | [![MyGet](https://img.shields.io/myget/aspnetcidev/vpre/Microsoft.AspNet.Localization.svg)](https://www.myget.org/feed/aspnetcidev/package/nuget/Microsoft.AspNet.Localization) | [![MyGet](https://img.shields.io/myget/aspnetvnext/vpre/Microsoft.AspNet.Localization.svg)](https://www.myget.org/feed/aspnetvnext/package/nuget/Microsoft.AspNet.Localization) | [![NuGet](https://img.shields.io/nuget/v/Microsoft.AspNet.Localization.svg)](https://nuget.org/packages/Microsoft.AspNet.Localization) | +| Microsoft.AspNetCore.Localization | [![MyGet](https://img.shields.io/myget/aspnetvolatiledev/vpre/Microsoft.AspNetCore.Localization.svg)](https://www.myget.org/feed/aspnetvolatiledev/package/nuget/Microsoft.AspNetCore.Localization) | [![MyGet](https://img.shields.io/myget/aspnetcidev/vpre/Microsoft.AspNetCore.Localization.svg)](https://www.myget.org/feed/aspnetcidev/package/nuget/Microsoft.AspNetCore.Localization) | [![MyGet](https://img.shields.io/myget/aspnetvnext/vpre/Microsoft.AspNetCore.Localization.svg)](https://www.myget.org/feed/aspnetvnext/package/nuget/Microsoft.AspNetCore.Localization) | [![NuGet](https://img.shields.io/nuget/v/Microsoft.AspNetCore.Localization.svg)](https://nuget.org/packages/Microsoft.AspNetCore.Localization) | Localization abstractions and implementations for ASP.NET 5 applications. diff --git a/samples/LocalizationSample/Startup.cs b/samples/LocalizationSample/Startup.cs index 24666dae68..f9baa83810 100644 --- a/samples/LocalizationSample/Startup.cs +++ b/samples/LocalizationSample/Startup.cs @@ -4,10 +4,10 @@ using System; using System.Collections.Generic; using System.Globalization; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Hosting; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Localization; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Localization; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Localization; diff --git a/samples/LocalizationSample/hosting.json b/samples/LocalizationSample/hosting.json index f8ef14574d..6a93dbafa8 100644 --- a/samples/LocalizationSample/hosting.json +++ b/samples/LocalizationSample/hosting.json @@ -1,3 +1,3 @@ -{ - "server": "Microsoft.AspNet.Server.Kestrel" +{ + "server": "Microsoft.AspNetCore.Server.Kestrel" } diff --git a/samples/LocalizationSample/project.json b/samples/LocalizationSample/project.json index e7a8c4a6f2..03d01c990f 100644 --- a/samples/LocalizationSample/project.json +++ b/samples/LocalizationSample/project.json @@ -2,10 +2,10 @@ "version": "1.0.0-*", "dependencies": { - "Microsoft.AspNet.IISPlatformHandler": "1.0.0-*", - "Microsoft.AspNet.Localization": "1.0.0-*", + "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*", + "Microsoft.AspNetCore.Localization": "1.0.0-*", "Microsoft.Extensions.Localization": "1.0.0-*", - "Microsoft.AspNet.Server.Kestrel": "1.0.0-*" + "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*" }, "compilationOptions": { diff --git a/src/Microsoft.AspNetCore.Localization/AcceptLanguageHeaderRequestCultureProvider.cs b/src/Microsoft.AspNetCore.Localization/AcceptLanguageHeaderRequestCultureProvider.cs index 8ce131d6f4..397bf9c537 100644 --- a/src/Microsoft.AspNetCore.Localization/AcceptLanguageHeaderRequestCultureProvider.cs +++ b/src/Microsoft.AspNetCore.Localization/AcceptLanguageHeaderRequestCultureProvider.cs @@ -6,11 +6,11 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; using System.Threading.Tasks; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Globalization; using Microsoft.Net.Http.Headers; -namespace Microsoft.AspNet.Localization +namespace Microsoft.AspNetCore.Localization { /// /// Determines the culture information for a request via the value of the Accept-Language header. diff --git a/src/Microsoft.AspNetCore.Localization/ApplicationBuilderExtensions.cs b/src/Microsoft.AspNetCore.Localization/ApplicationBuilderExtensions.cs index 006629f4c1..4e55497cb2 100644 --- a/src/Microsoft.AspNetCore.Localization/ApplicationBuilderExtensions.cs +++ b/src/Microsoft.AspNetCore.Localization/ApplicationBuilderExtensions.cs @@ -2,10 +2,10 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Localization; +using Microsoft.AspNetCore.Localization; using Microsoft.Extensions.Options; -namespace Microsoft.AspNet.Builder +namespace Microsoft.AspNetCore.Builder { /// /// Extension methods for adding the to an application. diff --git a/src/Microsoft.AspNetCore.Localization/CookieRequestCultureProvider.cs b/src/Microsoft.AspNetCore.Localization/CookieRequestCultureProvider.cs index 64da502da6..bbbf0e3137 100644 --- a/src/Microsoft.AspNetCore.Localization/CookieRequestCultureProvider.cs +++ b/src/Microsoft.AspNetCore.Localization/CookieRequestCultureProvider.cs @@ -5,10 +5,10 @@ using System; using System.Collections.Generic; using System.Globalization; using System.Threading.Tasks; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Globalization; -namespace Microsoft.AspNet.Localization +namespace Microsoft.AspNetCore.Localization { /// /// Determines the culture information for a request via the value of a cookie. diff --git a/src/Microsoft.AspNetCore.Localization/CustomRequestCultureProvider.cs b/src/Microsoft.AspNetCore.Localization/CustomRequestCultureProvider.cs index 7676b85b04..a5c9020ce6 100644 --- a/src/Microsoft.AspNetCore.Localization/CustomRequestCultureProvider.cs +++ b/src/Microsoft.AspNetCore.Localization/CustomRequestCultureProvider.cs @@ -3,9 +3,9 @@ using System; using System.Threading.Tasks; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Http; -namespace Microsoft.AspNet.Localization +namespace Microsoft.AspNetCore.Localization { /// /// Determines the culture information for a request via the configured delegate. diff --git a/src/Microsoft.AspNetCore.Localization/IRequestCultureFeature.cs b/src/Microsoft.AspNetCore.Localization/IRequestCultureFeature.cs index 4ea6aed42c..0103639bb4 100644 --- a/src/Microsoft.AspNetCore.Localization/IRequestCultureFeature.cs +++ b/src/Microsoft.AspNetCore.Localization/IRequestCultureFeature.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.AspNet.Localization +namespace Microsoft.AspNetCore.Localization { /// /// Represents the feature that provides the current request's culture information. diff --git a/src/Microsoft.AspNetCore.Localization/IRequestCultureProvider.cs b/src/Microsoft.AspNetCore.Localization/IRequestCultureProvider.cs index c2bb3810d0..2dbc95fef5 100644 --- a/src/Microsoft.AspNetCore.Localization/IRequestCultureProvider.cs +++ b/src/Microsoft.AspNetCore.Localization/IRequestCultureProvider.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.Collections.Generic; using System.Globalization; using System.Threading.Tasks; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Http; -namespace Microsoft.AspNet.Localization +namespace Microsoft.AspNetCore.Localization { /// /// Represents a provider for determining the culture information of an . diff --git a/src/Microsoft.AspNetCore.Localization/Microsoft.AspNetCore.Localization.xproj b/src/Microsoft.AspNetCore.Localization/Microsoft.AspNetCore.Localization.xproj index d1edd7f61f..213a9f3150 100644 --- a/src/Microsoft.AspNetCore.Localization/Microsoft.AspNetCore.Localization.xproj +++ b/src/Microsoft.AspNetCore.Localization/Microsoft.AspNetCore.Localization.xproj @@ -1,4 +1,4 @@ - + 14.0 @@ -8,7 +8,7 @@ 23e3bc23-3464-4d9b-bf78-02cb2182bef0 - Microsoft.AspNet.Localization + Microsoft.AspNetCore.Localization ..\..\artifacts\obj\$(MSBuildProjectName) ..\..\artifacts\bin\$(MSBuildProjectName)\ diff --git a/src/Microsoft.AspNetCore.Localization/ProviderCultureResult.cs b/src/Microsoft.AspNetCore.Localization/ProviderCultureResult.cs index f397855f92..a8fa269ff3 100644 --- a/src/Microsoft.AspNetCore.Localization/ProviderCultureResult.cs +++ b/src/Microsoft.AspNetCore.Localization/ProviderCultureResult.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.Collections.Generic; -namespace Microsoft.AspNet.Localization +namespace Microsoft.AspNetCore.Localization { /// /// Details about the cultures obtained from . diff --git a/src/Microsoft.AspNetCore.Localization/QueryStringRequestCultureProvider.cs b/src/Microsoft.AspNetCore.Localization/QueryStringRequestCultureProvider.cs index 9ab1fb2dbc..c991536e7d 100644 --- a/src/Microsoft.AspNetCore.Localization/QueryStringRequestCultureProvider.cs +++ b/src/Microsoft.AspNetCore.Localization/QueryStringRequestCultureProvider.cs @@ -3,10 +3,10 @@ using System; using System.Threading.Tasks; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Globalization; -namespace Microsoft.AspNet.Localization +namespace Microsoft.AspNetCore.Localization { /// /// Determines the culture information for a request via values in the query string. diff --git a/src/Microsoft.AspNetCore.Localization/RequestCulture.cs b/src/Microsoft.AspNetCore.Localization/RequestCulture.cs index 1460b5ba0c..5aad1743ca 100644 --- a/src/Microsoft.AspNetCore.Localization/RequestCulture.cs +++ b/src/Microsoft.AspNetCore.Localization/RequestCulture.cs @@ -4,7 +4,7 @@ using System; using System.Globalization; -namespace Microsoft.AspNet.Localization +namespace Microsoft.AspNetCore.Localization { /// /// Details about the culture for an . diff --git a/src/Microsoft.AspNetCore.Localization/RequestCultureFeature.cs b/src/Microsoft.AspNetCore.Localization/RequestCultureFeature.cs index 1fb00c9895..e20805d7ec 100644 --- a/src/Microsoft.AspNetCore.Localization/RequestCultureFeature.cs +++ b/src/Microsoft.AspNetCore.Localization/RequestCultureFeature.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Localization +namespace Microsoft.AspNetCore.Localization { /// /// Provides the current request's culture information. diff --git a/src/Microsoft.AspNetCore.Localization/RequestCultureProvider.cs b/src/Microsoft.AspNetCore.Localization/RequestCultureProvider.cs index bee7030962..bc806a58d3 100644 --- a/src/Microsoft.AspNetCore.Localization/RequestCultureProvider.cs +++ b/src/Microsoft.AspNetCore.Localization/RequestCultureProvider.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.Threading.Tasks; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Http; -namespace Microsoft.AspNet.Localization +namespace Microsoft.AspNetCore.Localization { /// /// An abstract base class provider for determining the culture information of an . diff --git a/src/Microsoft.AspNetCore.Localization/RequestLocalizationMiddleware.cs b/src/Microsoft.AspNetCore.Localization/RequestLocalizationMiddleware.cs index d1974d3e07..16103fd188 100644 --- a/src/Microsoft.AspNetCore.Localization/RequestLocalizationMiddleware.cs +++ b/src/Microsoft.AspNetCore.Localization/RequestLocalizationMiddleware.cs @@ -6,12 +6,12 @@ using System.Collections.Generic; using System.Globalization; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Globalization; using Microsoft.Extensions.Options; -namespace Microsoft.AspNet.Localization +namespace Microsoft.AspNetCore.Localization { /// /// Enables automatic setting of the culture for s based on information diff --git a/src/Microsoft.AspNetCore.Localization/RequestLocalizationOptions.cs b/src/Microsoft.AspNetCore.Localization/RequestLocalizationOptions.cs index b0c8e09e38..a3a39b4fcb 100644 --- a/src/Microsoft.AspNetCore.Localization/RequestLocalizationOptions.cs +++ b/src/Microsoft.AspNetCore.Localization/RequestLocalizationOptions.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 System.Collections.Generic; using System.Globalization; -using Microsoft.AspNet.Localization; +using Microsoft.AspNetCore.Localization; -namespace Microsoft.AspNet.Builder +namespace Microsoft.AspNetCore.Builder { /// /// Specifies options for the . diff --git a/src/Microsoft.AspNetCore.Localization/project.json b/src/Microsoft.AspNetCore.Localization/project.json index 7ab836217f..a799342356 100644 --- a/src/Microsoft.AspNetCore.Localization/project.json +++ b/src/Microsoft.AspNetCore.Localization/project.json @@ -10,7 +10,7 @@ "keyFile": "../../tools/Key.snk" }, "dependencies": { - "Microsoft.AspNet.Http.Extensions": "1.0.0-*", + "Microsoft.AspNetCore.Http.Extensions": "1.0.0-*", "Microsoft.Extensions.Globalization.CultureInfoCache": "1.0.0-*", "Microsoft.Extensions.Localization.Abstractions": "1.0.0-*", "Microsoft.Extensions.Options": "1.0.0-*" diff --git a/test/LocalizationWebsite/Program.cs b/test/LocalizationWebsite/Program.cs index 3dacf84181..6f750fab66 100644 --- a/test/LocalizationWebsite/Program.cs +++ b/test/LocalizationWebsite/Program.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.AspNet.Hosting; +using Microsoft.AspNetCore.Hosting; namespace LocalizationWebsite { diff --git a/test/LocalizationWebsite/StartupResourcesAtRootFolder.cs b/test/LocalizationWebsite/StartupResourcesAtRootFolder.cs index f70bdfa046..ec14141779 100644 --- a/test/LocalizationWebsite/StartupResourcesAtRootFolder.cs +++ b/test/LocalizationWebsite/StartupResourcesAtRootFolder.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.Collections.Generic; using System.Globalization; using LocalizationWebsite.Models; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Localization; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Localization; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Localization; using Microsoft.Extensions.Logging; diff --git a/test/LocalizationWebsite/StartupResourcesInFolder.cs b/test/LocalizationWebsite/StartupResourcesInFolder.cs index 8adc46894b..fa15bf8fc2 100644 --- a/test/LocalizationWebsite/StartupResourcesInFolder.cs +++ b/test/LocalizationWebsite/StartupResourcesInFolder.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.Collections.Generic; using System.Globalization; using LocalizationWebsite.Models; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Localization; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Localization; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Localization; using Microsoft.Extensions.Logging; diff --git a/test/LocalizationWebsite/hosting.json b/test/LocalizationWebsite/hosting.json index 95505372fa..26fd5141aa 100644 --- a/test/LocalizationWebsite/hosting.json +++ b/test/LocalizationWebsite/hosting.json @@ -1,3 +1,3 @@ -{ - "server": "Microsoft.AspNet.Server.Kestrel" +{ + "server": "Microsoft.AspNetCore.Server.Kestrel" } \ No newline at end of file diff --git a/test/LocalizationWebsite/project.json b/test/LocalizationWebsite/project.json index 1a1f2a9599..696651bd8b 100644 --- a/test/LocalizationWebsite/project.json +++ b/test/LocalizationWebsite/project.json @@ -1,4 +1,4 @@ -{ +{ "version": "1.0.0-*", "compilationOptions": { @@ -7,8 +7,8 @@ }, "dependencies": { - "Microsoft.AspNet.Localization": "1.0.0-*", - "Microsoft.AspNet.Server.Kestrel": "1.0.0-*", + "Microsoft.AspNetCore.Localization": "1.0.0-*", + "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Microsoft.Extensions.Localization": "1.0.0-*", "Microsoft.Extensions.Logging.Console": "1.0.0-*" }, diff --git a/test/Microsoft.AspNetCore.Localization.FunctionalTests/LocalizationTest.cs b/test/Microsoft.AspNetCore.Localization.FunctionalTests/LocalizationTest.cs index 3c58923a86..f33280bf73 100644 --- a/test/Microsoft.AspNetCore.Localization.FunctionalTests/LocalizationTest.cs +++ b/test/Microsoft.AspNetCore.Localization.FunctionalTests/LocalizationTest.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.Threading.Tasks; -using Microsoft.AspNet.Server.Testing; -using Microsoft.AspNet.Testing.xunit; +using Microsoft.AspNetCore.Server.Testing; +using Microsoft.AspNetCore.Testing.xunit; using Xunit; -namespace Microsoft.AspNet.Localization.FunctionalTests +namespace Microsoft.AspNetCore.Localization.FunctionalTests { public class LocalizationTest { diff --git a/test/Microsoft.AspNetCore.Localization.FunctionalTests/Microsoft.AspNetCore.Localization.FunctionalTests.xproj b/test/Microsoft.AspNetCore.Localization.FunctionalTests/Microsoft.AspNetCore.Localization.FunctionalTests.xproj index 9e239fe686..9621bf8758 100644 --- a/test/Microsoft.AspNetCore.Localization.FunctionalTests/Microsoft.AspNetCore.Localization.FunctionalTests.xproj +++ b/test/Microsoft.AspNetCore.Localization.FunctionalTests/Microsoft.AspNetCore.Localization.FunctionalTests.xproj @@ -1,4 +1,4 @@ - + 14.0 @@ -7,7 +7,7 @@ b1b441ba-3ac8-49f8-850d-e5a178e77de2 - Microsoft.AspNet.Localization.FunctionalTests + Microsoft.AspNetCore.Localization.FunctionalTests ..\..\artifacts\obj\$(MSBuildProjectName) ..\..\artifacts\bin\$(MSBuildProjectName)\ diff --git a/test/Microsoft.AspNetCore.Localization.FunctionalTests/TestRunner.cs b/test/Microsoft.AspNetCore.Localization.FunctionalTests/TestRunner.cs index 05153279e0..7c51ed9294 100644 --- a/test/Microsoft.AspNetCore.Localization.FunctionalTests/TestRunner.cs +++ b/test/Microsoft.AspNetCore.Localization.FunctionalTests/TestRunner.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,11 +6,11 @@ using System.IO; using System.Net; using System.Net.Http; using System.Threading.Tasks; -using Microsoft.AspNet.Server.Testing; +using Microsoft.AspNetCore.Server.Testing; using Microsoft.Extensions.Logging; using Xunit; -namespace Microsoft.AspNet.Localization.FunctionalTests +namespace Microsoft.AspNetCore.Localization.FunctionalTests { public class TestRunner { diff --git a/test/Microsoft.AspNetCore.Localization.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Localization.FunctionalTests/project.json index 2fa7bea10f..83e816a7a8 100644 --- a/test/Microsoft.AspNetCore.Localization.FunctionalTests/project.json +++ b/test/Microsoft.AspNetCore.Localization.FunctionalTests/project.json @@ -6,7 +6,7 @@ "test": "xunit.runner.aspnet" }, "dependencies": { - "Microsoft.AspNet.Server.Testing": "1.0.0-*", + "Microsoft.AspNetCore.Server.Testing": "1.0.0-*", "Microsoft.Extensions.Logging.Console": "1.0.0-*", "xunit.runner.aspnet": "2.0.0-aspnet-*" }, diff --git a/test/Microsoft.AspNetCore.Localization.Tests/AcceptLanguageHeaderRequestCultureProviderTest.cs b/test/Microsoft.AspNetCore.Localization.Tests/AcceptLanguageHeaderRequestCultureProviderTest.cs index 2daaab9ace..a745fafa5e 100644 --- a/test/Microsoft.AspNetCore.Localization.Tests/AcceptLanguageHeaderRequestCultureProviderTest.cs +++ b/test/Microsoft.AspNetCore.Localization.Tests/AcceptLanguageHeaderRequestCultureProviderTest.cs @@ -4,10 +4,10 @@ using System.Collections.Generic; using System.Globalization; using System.Threading.Tasks; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Hosting; -using Microsoft.AspNet.Localization; -using Microsoft.AspNet.TestHost; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Localization; +using Microsoft.AspNetCore.TestHost; using Xunit; namespace Microsoft.Extensions.Localization.Tests diff --git a/test/Microsoft.AspNetCore.Localization.Tests/CookieRequestCultureProviderTest.cs b/test/Microsoft.AspNetCore.Localization.Tests/CookieRequestCultureProviderTest.cs index f958b33a58..857140cfaf 100644 --- a/test/Microsoft.AspNetCore.Localization.Tests/CookieRequestCultureProviderTest.cs +++ b/test/Microsoft.AspNetCore.Localization.Tests/CookieRequestCultureProviderTest.cs @@ -4,11 +4,11 @@ using System.Collections.Generic; using System.Globalization; using System.Threading.Tasks; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Hosting; -using Microsoft.AspNet.Http.Features; -using Microsoft.AspNet.Localization; -using Microsoft.AspNet.TestHost; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.Localization; +using Microsoft.AspNetCore.TestHost; using Microsoft.Net.Http.Headers; using Xunit; diff --git a/test/Microsoft.AspNetCore.Localization.Tests/CustomRequestCultureProviderTest.cs b/test/Microsoft.AspNetCore.Localization.Tests/CustomRequestCultureProviderTest.cs index 44dded3540..ba251a3614 100644 --- a/test/Microsoft.AspNetCore.Localization.Tests/CustomRequestCultureProviderTest.cs +++ b/test/Microsoft.AspNetCore.Localization.Tests/CustomRequestCultureProviderTest.cs @@ -5,12 +5,12 @@ using System; using System.Collections.Generic; using System.Globalization; using System.Threading.Tasks; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Hosting; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Http.Features; -using Microsoft.AspNet.Localization; -using Microsoft.AspNet.TestHost; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.Localization; +using Microsoft.AspNetCore.TestHost; using Xunit; namespace Microsoft.Extensions.Localization.Tests diff --git a/test/Microsoft.AspNetCore.Localization.Tests/Microsoft.AspNetCore.Localization.Tests.xproj b/test/Microsoft.AspNetCore.Localization.Tests/Microsoft.AspNetCore.Localization.Tests.xproj index c4b04712a4..cb92eb5b79 100644 --- a/test/Microsoft.AspNetCore.Localization.Tests/Microsoft.AspNetCore.Localization.Tests.xproj +++ b/test/Microsoft.AspNetCore.Localization.Tests/Microsoft.AspNetCore.Localization.Tests.xproj @@ -1,4 +1,4 @@ - + 14.0 @@ -7,7 +7,7 @@ 19a2a931-5c60-47a0-816a-0dc9c4ce5736 - Microsoft.AspNet.Localization.Tests + Microsoft.AspNetCore.Localization.Tests ..\..\artifacts\obj\$(MSBuildProjectName) ..\..\artifacts\bin\$(MSBuildProjectName)\ diff --git a/test/Microsoft.AspNetCore.Localization.Tests/QueryStringRequestCultureProviderTest.cs b/test/Microsoft.AspNetCore.Localization.Tests/QueryStringRequestCultureProviderTest.cs index 41fabef924..22edd16996 100644 --- a/test/Microsoft.AspNetCore.Localization.Tests/QueryStringRequestCultureProviderTest.cs +++ b/test/Microsoft.AspNetCore.Localization.Tests/QueryStringRequestCultureProviderTest.cs @@ -4,11 +4,11 @@ using System.Collections.Generic; using System.Globalization; using System.Threading.Tasks; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Hosting; -using Microsoft.AspNet.Http.Features; -using Microsoft.AspNet.Localization; -using Microsoft.AspNet.TestHost; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.Localization; +using Microsoft.AspNetCore.TestHost; using Xunit; namespace Microsoft.Extensions.Localization.Tests diff --git a/test/Microsoft.AspNetCore.Localization.Tests/RequestLocalizationOptionsTest.cs b/test/Microsoft.AspNetCore.Localization.Tests/RequestLocalizationOptionsTest.cs index 9b31c90839..0bc805207b 100644 --- a/test/Microsoft.AspNetCore.Localization.Tests/RequestLocalizationOptionsTest.cs +++ b/test/Microsoft.AspNetCore.Localization.Tests/RequestLocalizationOptionsTest.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; using System.Globalization; using System.Threading; -using Microsoft.AspNet.Builder; +using Microsoft.AspNetCore.Builder; using Xunit; -namespace Microsoft.AspNet.Localization.Tests +namespace Microsoft.AspNetCore.Localization.Tests { public class RequestLocalizationOptionsTest : IDisposable { diff --git a/test/Microsoft.AspNetCore.Localization.Tests/project.json b/test/Microsoft.AspNetCore.Localization.Tests/project.json index 5822697ff4..99b8a4aaae 100644 --- a/test/Microsoft.AspNetCore.Localization.Tests/project.json +++ b/test/Microsoft.AspNetCore.Localization.Tests/project.json @@ -1,10 +1,10 @@ -{ +{ "compilationOptions": { "warningsAsErrors": true }, "dependencies": { - "Microsoft.AspNet.Localization": "1.0.0-*", - "Microsoft.AspNet.TestHost": "1.0.0-*", + "Microsoft.AspNetCore.Localization": "1.0.0-*", + "Microsoft.AspNetCore.TestHost": "1.0.0-*", "xunit": "2.1.0-*", "xunit.runner.aspnet": "2.0.0-aspnet-*" },