Renaming Microsoft.Framework.* -> Microsoft.Extensions.*

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

NuGetPackageVerifier.json

@@ -10,9 +10,9 @@
         ],
         "packages": {
             "Microsoft.AspNet.Localization": { },
-            "Microsoft.Framework.Globalization.CultureInfoCache": { },
+            "Microsoft.Extensions.Globalization.CultureInfoCache": { },
-            "Microsoft.Framework.Localization": { },
+            "Microsoft.Extensions.Localization": { },
-            "Microsoft.Framework.Localization.Abstractions": { }
+            "Microsoft.Extensions.Localization.Abstractions": { }
         }
     },
     "adx-nonshipping": {

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.Extensions.DependencyInjection;
-using Microsoft.Framework.Localization;
+using Microsoft.Extensions.Localization;
 
 namespace LocalizationSample
 {

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": {

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
 {{
     /// <summary>
     /// Contains a list of known culture names that can be used to create a <see cref=""System.Globalization.CultureInfo""/>.

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.Extensions.Globalization;
-using Microsoft.Framework.Internal;
+using Microsoft.Extensions.Internal;
 using Microsoft.Net.Http.Headers;
 
 namespace Microsoft.AspNet.Localization

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
 {

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.Extensions.Globalization;
-using Microsoft.Framework.Internal;
+using Microsoft.Extensions.Internal;
 
 namespace Microsoft.AspNet.Localization
 {

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
 {

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.Extensions.Globalization;
-using Microsoft.Framework.Internal;
+using Microsoft.Extensions.Internal;
 
 namespace Microsoft.AspNet.Localization
 {

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
 {

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
 {

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
 {

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.Extensions.Globalization.CultureInfoCache": "1.0.0-*",
-        "Microsoft.Framework.Localization.Abstractions": "1.0.0-*",
+        "Microsoft.Extensions.Localization.Abstractions": "1.0.0-*",
-        "Microsoft.Framework.NotNullAttribute.Sources": {
+        "Microsoft.Extensions.NotNullAttribute.Sources": {
             "type": "build",
             "version": "1.0.0-*"
         }

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
 {
     /// <summary>
     /// Provides read-only cached instances of <see cref="CultureInfo"/>.

src/Microsoft.Extensions.Globalization.CultureInfoCache/CultureInfoList.cs

@@ -6,7 +6,7 @@
 
 using System.Collections.Generic;
 
-namespace Microsoft.Framework.Globalization
+namespace Microsoft.Extensions.Globalization
 {
     /// <summary>
     /// Contains a list of known culture names that can be used to create a <see cref="System.Globalization.CultureInfo"/>.

src/Microsoft.Extensions.Globalization.CultureInfoCache/Microsoft.Extensions.Globalization.CultureInfoCache.xproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
@@ -8,7 +8,7 @@
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>f3988d3a-a4c8-4fd7-bafe-13e0d0a1659a</ProjectGuid>
-    <RootNamespace>Microsoft.Framework.Globalization.CultureInfoList</RootNamespace>
+    <RootNamespace>Microsoft.Extensions.Globalization.CultureInfoList</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
   </PropertyGroup>

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
 {
     /// <summary>
     /// Represents a service that provides localized strings.

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
 {
     /// <summary>
     /// Represents a factory that creates <see cref="IStringLocalizer"/> instances.

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
 {
     /// <summary>
     /// Represents an <see cref="IStringLocalizer"/> that provides strings for <see cref="T"/>.

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
 {
     /// <summary>
     /// A locale specific string.

src/Microsoft.Extensions.Localization.Abstractions/Microsoft.Extensions.Localization.Abstractions.xproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
@@ -8,7 +8,7 @@
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>a1fcf259-70f6-4605-aa2d-e4b356be771a</ProjectGuid>
-    <RootNamespace>Microsoft.Framework.Localization.Abstractions</RootNamespace>
+    <RootNamespace>Microsoft.Extensions.Localization.Abstractions</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
   </PropertyGroup>

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
     {

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
 {
     /// <summary>
     /// Provides strings for <see cref="TResourceSource"/>.

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-*"
         }

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
 {
     /// <summary>
     /// Represents a cache of string names in resources.

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
     {

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
 {
     /// <summary>
     /// Provides programmatic configuration for localization.

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.Extensions.DependencyInjection.Extensions;
-using Microsoft.Framework.Internal;
+using Microsoft.Extensions.Internal;
-using Microsoft.Framework.Localization;
+using Microsoft.Extensions.Localization;
 
-namespace Microsoft.Framework.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection
 {
     /// <summary>
     /// Extension methods for adding localization servics to the DI container.

src/Microsoft.Extensions.Localization/Microsoft.Extensions.Localization.xproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
@@ -8,7 +8,7 @@
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>29743cff-120e-40eb-9b89-5818425946fa</ProjectGuid>
-    <RootNamespace>Microsoft.Framework.Localization</RootNamespace>
+    <RootNamespace>Microsoft.Extensions.Localization</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
   </PropertyGroup>

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")]

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.Extensions.Internal;
-using Microsoft.Framework.Localization.Internal;
+using Microsoft.Extensions.Localization.Internal;
 
-namespace Microsoft.Framework.Localization
+namespace Microsoft.Extensions.Localization
 {
     /// <summary>
     /// An <see cref="IStringLocalizer"/> that uses the <see cref="System.Resources.ResourceManager"/> and

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.Extensions.Internal;
-using Microsoft.Framework.OptionsModel;
+using Microsoft.Extensions.OptionsModel;
 
-namespace Microsoft.Framework.Localization
+namespace Microsoft.Extensions.Localization
 {
     /// <summary>
     /// An <see cref="IStringLocalizerFactory"/> that creates instances of <see cref="ResourceManagerStringLocalizer"/>.

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
 {
     /// <summary>
     /// An <see cref="IStringLocalizer"/> that uses the <see cref="System.Resources.ResourceManager"/> and

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
 {
     /// <summary>
     /// An implementation of <see cref="IResourceNamesCache"/> backed by a <see cref="ConcurrentDictionary{TKey, TValue}"/>.

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.Extensions.DependencyInjection.Abstractions": "1.0.0-*",
-        "Microsoft.Framework.Localization.Abstractions": "1.0.0-*",
+        "Microsoft.Extensions.Localization.Abstractions": "1.0.0-*",
-        "Microsoft.Framework.NotNullAttribute.Sources": {
+        "Microsoft.Extensions.NotNullAttribute.Sources": {
             "type": "build",
             "version": "1.0.0-*"
         },
-        "Microsoft.Framework.OptionsModel": "1.0.0-*"
+        "Microsoft.Extensions.OptionsModel": "1.0.0-*"
     },
     "frameworks": {
         "dnx451": { },

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
     {

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
     {

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
     {

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
     {

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.Extensions.DependencyInjection;
-using Microsoft.Framework.OptionsModel;
+using Microsoft.Extensions.OptionsModel;
 using Xunit;
 
-namespace Microsoft.Framework.Localization.Test
+namespace Microsoft.Extensions.Localization.Test
 {
     public class LocalizationServiceCollectionExtensionsTest
     {

test/Microsoft.Extensions.Localization.Tests/Microsoft.Extensions.Localization.Tests.xproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
@@ -7,7 +7,7 @@
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>287ad58d-df34-4f16-8616-fd78fa1cadf9</ProjectGuid>
-    <RootNamespace>Microsoft.Framework.Localization.Test</RootNamespace>
+    <RootNamespace>Microsoft.Extensions.Localization.Test</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
   </PropertyGroup>

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
     {

test/Microsoft.Extensions.Localization.Tests/project.json

@@ -1,7 +1,7 @@
 {
   "dependencies": {
-    "Microsoft.Framework.DependencyInjection": "1.0.0-*",
+    "Microsoft.Extensions.DependencyInjection": "1.0.0-*",
-    "Microsoft.Framework.Localization": "1.0.0-*",
+    "Microsoft.Extensions.Localization": "1.0.0-*",
     "xunit": "2.1.0-*",
     "xunit.runner.aspnet": "2.0.0-aspnet-*"
   },