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

HttpAbstractions.sln

@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.23107.0
@@ -35,11 +35,11 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Net.Http.Headers"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Net.Http.Headers.Tests", "test\Microsoft.Net.Http.Headers.Tests\Microsoft.Net.Http.Headers.Tests.xproj", "{E6BB7AD1-BD10-4A23-B780-F4A86ADF00D1}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.WebEncoders", "src\Microsoft.Framework.WebEncoders\Microsoft.Framework.WebEncoders.xproj", "{DD2CE416-765E-4000-A03E-C2FF165DA1B6}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.WebEncoders", "src\Microsoft.Extensions.WebEncoders\Microsoft.Extensions.WebEncoders.xproj", "{DD2CE416-765E-4000-A03E-C2FF165DA1B6}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.WebEncoders.Tests", "test\Microsoft.Framework.WebEncoders.Tests\Microsoft.Framework.WebEncoders.Tests.xproj", "{7AE2731D-43CD-4CF8-850A-4914DE2CE930}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.WebEncoders.Tests", "test\Microsoft.Extensions.WebEncoders.Tests\Microsoft.Extensions.WebEncoders.Tests.xproj", "{7AE2731D-43CD-4CF8-850A-4914DE2CE930}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.WebEncoders.Core", "src\Microsoft.Framework.WebEncoders.Core\Microsoft.Framework.WebEncoders.Core.xproj", "{BE9112CB-D87D-4080-9CC3-24492D49CBE6}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.WebEncoders.Core", "src\Microsoft.Extensions.WebEncoders.Core\Microsoft.Extensions.WebEncoders.Core.xproj", "{BE9112CB-D87D-4080-9CC3-24492D49CBE6}"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Html.Abstractions", "src\Microsoft.AspNet.Html.Abstractions\Microsoft.AspNet.Html.Abstractions.xproj", "{68A28E4A-3ADE-4187-9625-4FF185887CB3}"
 EndProject
@@ -49,9 +49,9 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "SampleApp", "samples\Sample
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Html.Abstractions.Test", "test\Microsoft.AspNet.Html.Abstractions.Test\Microsoft.AspNet.Html.Abstractions.Test.xproj", "{2D187B88-94BD-4A39-AC97-F8F8B9363301}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.BufferedHtmlContent.Sources", "src\Microsoft.Framework.BufferedHtmlContent.Sources\Microsoft.Framework.BufferedHtmlContent.Sources.xproj", "{B1B2B906-24AE-4C57-AAC5-19B734014504}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.BufferedHtmlContent.Sources", "src\Microsoft.Extensions.BufferedHtmlContent.Sources\Microsoft.Extensions.BufferedHtmlContent.Sources.xproj", "{B1B2B906-24AE-4C57-AAC5-19B734014504}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.BufferedHtmlContent.Test", "test\Microsoft.Framework.BufferedHtmlContent.Test\Microsoft.Framework.BufferedHtmlContent.Test.xproj", "{3E5311E2-A73E-40CC-A58C-5A62CEAD43AE}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.BufferedHtmlContent.Test", "test\Microsoft.Extensions.BufferedHtmlContent.Test\Microsoft.Extensions.BufferedHtmlContent.Test.xproj", "{3E5311E2-A73E-40CC-A58C-5A62CEAD43AE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

NuGetPackageVerifier.json

@@ -16,9 +16,9 @@
             "Microsoft.AspNet.Http.Features": { },
             "Microsoft.AspNet.Owin": { },
             "Microsoft.AspNet.WebUtilities": { },
-            "Microsoft.Framework.BufferedHtmlContent.Sources": { },
+            "Microsoft.Extensions.BufferedHtmlContent.Sources": { },
-            "Microsoft.Framework.WebEncoders": { },
+            "Microsoft.Extensions.WebEncoders": { },
-            "Microsoft.Framework.WebEncoders.Core": { },
+            "Microsoft.Extensions.WebEncoders.Core": { },
             "Microsoft.Net.Http.Headers": { }
         }
     },

samples/SampleApp/Program.cs

@@ -1,6 +1,6 @@
-using System;
+using System;
 using System.Diagnostics;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Primitives;
 
 namespace SampleApp
 {

src/Microsoft.AspNet.Html.Abstractions/HtmlContentBuilderExtensions.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,7 +6,7 @@ using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 using System.Text;
-using Microsoft.Framework.WebEncoders;
+using Microsoft.Extensions.WebEncoders;
 
 namespace Microsoft.AspNet.Html.Abstractions
 {

src/Microsoft.AspNet.Html.Abstractions/IHtmlContent.cs

@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.IO;
-using Microsoft.Framework.WebEncoders;
+using Microsoft.Extensions.WebEncoders;
 
 namespace Microsoft.AspNet.Html.Abstractions
 {

src/Microsoft.AspNet.Html.Abstractions/project.json

@@ -1,4 +1,4 @@
-{
+{
     "version": "1.0.0-*",
     "description": "ASP.NET 5 HTML content interface.",
     "repository": {
@@ -9,7 +9,7 @@
         "warningsAsErrors": true
     },
     "dependencies": {
-        "Microsoft.Framework.WebEncoders.Core": "1.0.0-*"
+        "Microsoft.Extensions.WebEncoders.Core": "1.0.0-*"
     },
     "frameworks": {
         "net45" : { },

src/Microsoft.AspNet.Http.Abstractions/Extensions/UseMiddlewareExtensions.cs

@@ -7,7 +7,7 @@ using System.Reflection;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Abstractions;
-using Microsoft.Framework.Internal;
+using Microsoft.Extensions.Internal;
 
 namespace Microsoft.AspNet.Builder
 {

src/Microsoft.AspNet.Http.Abstractions/IHeaderDictionary.cs

@@ -2,7 +2,7 @@
 // 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.Primitives;
+using Microsoft.Extensions.Primitives;
 
 namespace Microsoft.AspNet.Http
 {

src/Microsoft.AspNet.Http.Abstractions/IReadableStringCollection.cs

@@ -2,7 +2,7 @@
 // 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.Primitives;
+using Microsoft.Extensions.Primitives;
 
 namespace Microsoft.AspNet.Http
 {

src/Microsoft.AspNet.Http.Abstractions/PathString.cs

@@ -3,7 +3,7 @@
 
 using System;
 using System.Linq;
-using Microsoft.Framework.WebEncoders;
+using Microsoft.Extensions.WebEncoders;
 
 namespace Microsoft.AspNet.Http
 {

src/Microsoft.AspNet.Http.Abstractions/QueryString.cs

@@ -4,8 +4,8 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Primitives;
-using Microsoft.Framework.WebEncoders;
+using Microsoft.Extensions.WebEncoders;
 
 namespace Microsoft.AspNet.Http
 {

src/Microsoft.AspNet.Http.Abstractions/project.json

@@ -10,8 +10,8 @@
   },
   "dependencies": {
     "Microsoft.AspNet.Http.Features": "1.0.0-*",
-    "Microsoft.Framework.ActivatorUtilities.Sources": { "type": "build", "version": "1.0.0-*" },
+    "Microsoft.Extensions.ActivatorUtilities.Sources": { "type": "build", "version": "1.0.0-*" },
-    "Microsoft.Framework.WebEncoders.Core": "1.0.0-*"
+    "Microsoft.Extensions.WebEncoders.Core": "1.0.0-*"
   },
   "frameworks": {
     "dnx451": { },

src/Microsoft.AspNet.Http.Extensions/HeaderDictionaryExtensions.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.Http.Internal;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Primitives;
 
 namespace Microsoft.AspNet.Http
 {

src/Microsoft.AspNet.Http.Extensions/HeaderDictionaryTypeExtensions.cs

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using Microsoft.AspNet.Http.Headers;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Primitives;
 using Microsoft.Net.Http.Headers;
 
 namespace Microsoft.AspNet.Http

src/Microsoft.AspNet.Http.Extensions/Internal/HeaderSegmentCollection.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Primitives;
 
 namespace Microsoft.AspNet.Http.Internal
 {

src/Microsoft.AspNet.Http.Extensions/Internal/ParsingHelpers.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Primitives;
 
 namespace Microsoft.AspNet.Http.Internal
 {

src/Microsoft.AspNet.Http.Extensions/QueryBuilder.cs

@@ -4,7 +4,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Text;
-using Microsoft.Framework.WebEncoders;
+using Microsoft.Extensions.WebEncoders;
 
 namespace Microsoft.AspNet.Http.Extensions
 {

src/Microsoft.AspNet.Http.Extensions/project.json

@@ -10,7 +10,7 @@
     },
     "dependencies": {
     "Microsoft.AspNet.Http.Abstractions": "1.0.0-*",
-    "Microsoft.Framework.WebEncoders.Core": "1.0.0-*",
+    "Microsoft.Extensions.WebEncoders.Core": "1.0.0-*",
     "Microsoft.Net.Http.Headers": "1.0.0-*"
   },
   "frameworks": {

src/Microsoft.AspNet.Http.Features/IHttpRequestFeature.cs

@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 using System.IO;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Primitives;
 
 namespace Microsoft.AspNet.Http.Features
 {

src/Microsoft.AspNet.Http.Features/IHttpResponseFeature.cs

@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Primitives;
 
 namespace Microsoft.AspNet.Http.Features
 {

src/Microsoft.AspNet.Http.Features/project.json

@@ -9,7 +9,7 @@
         "warningsAsErrors": true
     },
     "dependencies": {
-        "Microsoft.Framework.Primitives": "1.0.0-*"
+        "Microsoft.Extensions.Primitives": "1.0.0-*"
     },
     "frameworks": {
         "dnx451": { },

src/Microsoft.AspNet.Http/Features/FormFeature.cs

@@ -9,7 +9,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http.Internal;
 using Microsoft.AspNet.WebUtilities;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Primitives;
 using Microsoft.Net.Http.Headers;
 
 namespace Microsoft.AspNet.Http.Features.Internal

src/Microsoft.AspNet.Http/Features/HttpRequestFeature.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Primitives;
 
 namespace Microsoft.AspNet.Http.Features.Internal
 {

src/Microsoft.AspNet.Http/Features/HttpResponseFeature.cs

@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Primitives;
 
 namespace Microsoft.AspNet.Http.Features.Internal
 {

src/Microsoft.AspNet.Http/Features/QueryFeature.cs

@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using Microsoft.AspNet.Http.Internal;
 using Microsoft.AspNet.WebUtilities;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Primitives;
 
 namespace Microsoft.AspNet.Http.Features.Internal
 {

src/Microsoft.AspNet.Http/Features/RequestCookiesFeature.cs

@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNet.Http.Internal;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Primitives;
 using Microsoft.Net.Http.Headers;
 
 namespace Microsoft.AspNet.Http.Features.Internal

src/Microsoft.AspNet.Http/FormCollection.cs

@@ -3,7 +3,7 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Primitives;
 
 namespace Microsoft.AspNet.Http.Internal
 {

src/Microsoft.AspNet.Http/HeaderDictionary.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Primitives;
 
 namespace Microsoft.AspNet.Http.Internal
 {

src/Microsoft.AspNet.Http/ParsingHelpers.cs

@@ -6,7 +6,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Primitives;
 using Microsoft.Net.Http.Headers;
 
 namespace Microsoft.AspNet.Http.Internal

src/Microsoft.AspNet.Http/ReadableStringCollection.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Primitives;
 
 namespace Microsoft.AspNet.Http.Internal
 {

src/Microsoft.AspNet.Http/RequestCookiesCollection.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Primitives;
 using Microsoft.Net.Http.Headers;
 
 namespace Microsoft.AspNet.Http.Internal

src/Microsoft.AspNet.Http/ResponseCookies.cs

@@ -3,8 +3,8 @@
 
 using System;
 using System.Linq;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Primitives;
-using Microsoft.Framework.WebEncoders;
+using Microsoft.Extensions.WebEncoders;
 using Microsoft.Net.Http.Headers;
 
 namespace Microsoft.AspNet.Http.Internal

src/Microsoft.AspNet.Owin/DictionaryStringArrayWrapper.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;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Primitives;
 
 namespace Microsoft.AspNet.Owin
 {

src/Microsoft.AspNet.Owin/DictionaryStringValuesWrapper.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;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Primitives;
 
 namespace Microsoft.AspNet.Owin
 {

src/Microsoft.AspNet.Owin/OwinFeatureCollection.cs

@@ -17,7 +17,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Features;
 using Microsoft.AspNet.Http.Features.Authentication;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Primitives;
 
 namespace Microsoft.AspNet.Owin
 {

src/Microsoft.AspNet.Owin/Utilities.cs

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Security.Claims;
 using System.Security.Principal;
 using Microsoft.AspNet.Http;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Primitives;
 
 namespace Microsoft.AspNet.Owin
 {

src/Microsoft.AspNet.WebUtilities/FormReader.cs

@@ -7,7 +7,7 @@ using System.IO;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Primitives;
 
 namespace Microsoft.AspNet.WebUtilities
 {

src/Microsoft.AspNet.WebUtilities/KeyValueAccumulator.cs

@@ -3,7 +3,7 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Primitives;
 
 namespace Microsoft.AspNet.WebUtilities
 {

src/Microsoft.AspNet.WebUtilities/MultipartReader.cs

@@ -7,7 +7,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Primitives;
 
 namespace Microsoft.AspNet.WebUtilities
 {

src/Microsoft.AspNet.WebUtilities/MultipartSection.cs

@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 using System.IO;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Primitives;
 
 namespace Microsoft.AspNet.WebUtilities
 {

src/Microsoft.AspNet.WebUtilities/QueryHelpers.cs

@@ -4,8 +4,8 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Primitives;
-using Microsoft.Framework.WebEncoders;
+using Microsoft.Extensions.WebEncoders;
 
 namespace Microsoft.AspNet.WebUtilities
 {

src/Microsoft.AspNet.WebUtilities/project.json

@@ -9,8 +9,8 @@
         "warningsAsErrors": true
     },
     "dependencies": {
-        "Microsoft.Framework.Primitives": "1.0.0-*",
+        "Microsoft.Extensions.Primitives": "1.0.0-*",
-        "Microsoft.Framework.WebEncoders.Core": "1.0.0-*"
+        "Microsoft.Extensions.WebEncoders.Core": "1.0.0-*"
     },
     "frameworks": {
         "dnx451": { },

src/Microsoft.Extensions.BufferedHtmlContent.Sources/BufferedHtmlContent.cs

@@ -6,9 +6,9 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using Microsoft.AspNet.Html.Abstractions;
-using Microsoft.Framework.WebEncoders;
+using Microsoft.Extensions.WebEncoders;
 
-namespace Microsoft.Framework.Internal
+namespace Microsoft.Extensions.Internal
 {
     /// <summary>
     /// Enumerable object collection which knows how to write itself.

src/Microsoft.Extensions.BufferedHtmlContent.Sources/Microsoft.Extensions.BufferedHtmlContent.Sources.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>b1b2b906-24ae-4c57-aac5-19b734014504</ProjectGuid>
-    <RootNamespace>Microsoft.Framework.BufferedHtmlContent.Sources</RootNamespace>
+    <RootNamespace>Microsoft.Extensions.BufferedHtmlContent.Sources</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
   </PropertyGroup>

src/Microsoft.Extensions.WebEncoders.Core/AllowedCharsBitmap.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Diagnostics;
 
-namespace Microsoft.Framework.WebEncoders
+namespace Microsoft.Extensions.WebEncoders
 {
     internal struct AllowedCharsBitmap
     {

src/Microsoft.Extensions.WebEncoders.Core/CodePointFilter.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Microsoft.Framework.WebEncoders
+namespace Microsoft.Extensions.WebEncoders
 {
     /// <summary>
     /// Represents a filter which allows only certain Unicode code points through.

src/Microsoft.Extensions.WebEncoders.Core/EncoderCommon.cs

@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.Framework.WebEncoders
+namespace Microsoft.Extensions.WebEncoders
 {
     internal static class EncoderCommon
     {

src/Microsoft.Extensions.WebEncoders.Core/EncoderExtensions.cs

@@ -4,7 +4,7 @@
 using System;
 using System.IO;
 
-namespace Microsoft.Framework.WebEncoders
+namespace Microsoft.Extensions.WebEncoders
 {
     /// <summary>
     /// Helpful extension methods for the encoder classes.

src/Microsoft.Extensions.WebEncoders.Core/EncoderServiceProviderExtensions.cs

@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.Framework.WebEncoders
+namespace Microsoft.Extensions.WebEncoders
 {
     /// <summary>
     /// Contains extension methods for fetching encoders from an <see cref="IServiceProvider"/>.

src/Microsoft.Extensions.WebEncoders.Core/HexUtil.cs

@@ -5,7 +5,7 @@ using System;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
 
-namespace Microsoft.Framework.WebEncoders
+namespace Microsoft.Extensions.WebEncoders
 {
     /// <summary>
     /// Contains helpers for dealing with byte-hex char conversions.

src/Microsoft.Extensions.WebEncoders.Core/HtmlEncoder.cs

@@ -7,7 +7,7 @@ using System.IO;
 using System.Runtime.CompilerServices;
 using System.Threading;
 
-namespace Microsoft.Framework.WebEncoders
+namespace Microsoft.Extensions.WebEncoders
 {
     /// <summary>
     /// A class which can perform HTML encoding given an allow list of characters which

src/Microsoft.Extensions.WebEncoders.Core/ICodePointFilter.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Microsoft.Framework.WebEncoders
+namespace Microsoft.Extensions.WebEncoders
 {
     /// <summary>
     /// Represents a filter which allows only certain Unicode code points through.

src/Microsoft.Extensions.WebEncoders.Core/IHtmlEncoder.cs

@@ -3,7 +3,7 @@
 
 using System.IO;
 
-namespace Microsoft.Framework.WebEncoders
+namespace Microsoft.Extensions.WebEncoders
 {
     /// <summary>
     /// Provides services for HTML-encoding input.

src/Microsoft.Extensions.WebEncoders.Core/IJavaScriptStringEncoder.cs

@@ -3,7 +3,7 @@
 
 using System.IO;
 
-namespace Microsoft.Framework.WebEncoders
+namespace Microsoft.Extensions.WebEncoders
 {
     /// <summary>
     /// Provides services for JavaScript-escaping strings.

src/Microsoft.Extensions.WebEncoders.Core/IUrlEncoder.cs

@@ -3,7 +3,7 @@
 
 using System.IO;
 
-namespace Microsoft.Framework.WebEncoders
+namespace Microsoft.Extensions.WebEncoders
 {
     /// <summary>
     /// Provides services for URL-escaping strings.

src/Microsoft.Extensions.WebEncoders.Core/JavaScriptStringEncoder.cs

@@ -7,7 +7,7 @@ using System.IO;
 using System.Runtime.CompilerServices;
 using System.Threading;
 
-namespace Microsoft.Framework.WebEncoders
+namespace Microsoft.Extensions.WebEncoders
 {
     /// <summary>
     /// A class which can perform JavaScript string escaping given an allow list of characters which

src/Microsoft.Extensions.WebEncoders.Core/Properties/AssemblyInfo.cs

@@ -5,6 +5,6 @@ using System.Reflection;
 using System.Resources;
 using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("Microsoft.Framework.WebEncoders.Tests")]
+[assembly: InternalsVisibleTo("Microsoft.Extensions.WebEncoders.Tests")]
 [assembly: AssemblyMetadata("Serviceable", "True")]
 [assembly: NeutralResourcesLanguage("en-us")]

src/Microsoft.Extensions.WebEncoders.Core/UnicodeEncoderBase.cs

@@ -7,7 +7,7 @@ using System.IO;
 using System.Runtime.CompilerServices;
 using System.Text;
 
-namespace Microsoft.Framework.WebEncoders
+namespace Microsoft.Extensions.WebEncoders
 {
     internal unsafe abstract class UnicodeEncoderBase
     {

src/Microsoft.Extensions.WebEncoders.Core/UnicodeHelpers.cs

@@ -7,7 +7,7 @@ using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Threading;
 
-namespace Microsoft.Framework.WebEncoders
+namespace Microsoft.Extensions.WebEncoders
 {
     /// <summary>
     /// Contains helpers for dealing with Unicode code points.

src/Microsoft.Extensions.WebEncoders.Core/UnicodeRange.cs

@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.Framework.WebEncoders
+namespace Microsoft.Extensions.WebEncoders
 {
     /// <summary>
     /// Represents a contiguous range of Unicode code points.

src/Microsoft.Extensions.WebEncoders.Core/UnicodeRanges.cs

@@ -6,7 +6,7 @@ using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using System.Threading;
 
-namespace Microsoft.Framework.WebEncoders
+namespace Microsoft.Extensions.WebEncoders
 {
     /// <summary>
     /// Contains predefined <see cref="UnicodeRange"/> instances which correspond to blocks

src/Microsoft.Extensions.WebEncoders.Core/UnicodeRanges.generated.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Threading;
 
-namespace Microsoft.Framework.WebEncoders
+namespace Microsoft.Extensions.WebEncoders
 {
     public static partial class UnicodeRanges
     {

src/Microsoft.Extensions.WebEncoders.Core/UrlEncoder.cs

@@ -7,7 +7,7 @@ using System.IO;
 using System.Runtime.CompilerServices;
 using System.Threading;
 
-namespace Microsoft.Framework.WebEncoders
+namespace Microsoft.Extensions.WebEncoders
 {
     /// <summary>
     /// A class which can perform URL string escaping given an allow list of characters which

src/Microsoft.Extensions.WebEncoders.Core/WebEncoderOptions.cs

@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.Framework.WebEncoders
+namespace Microsoft.Extensions.WebEncoders
 {
     /// <summary>
     /// Specifies options common to all three encoders (HtmlEncode, JavaScriptStringEncode, UrlEncode).

src/Microsoft.Extensions.WebEncoders/EncoderServiceCollectionExtensions.cs

@@ -2,11 +2,11 @@
 // 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.OptionsModel;
+using Microsoft.Extensions.OptionsModel;
-using Microsoft.Framework.WebEncoders;
+using Microsoft.Extensions.WebEncoders;
 
-namespace Microsoft.Framework.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection
 {
     public static class EncoderServiceCollectionExtensions
     {

src/Microsoft.Extensions.WebEncoders/project.json

@@ -9,9 +9,9 @@
         "warningsAsErrors": true
     },
     "dependencies": {
-        "Microsoft.Framework.DependencyInjection.Abstractions": "1.0.0-*",
+        "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-*",
-        "Microsoft.Framework.OptionsModel": "1.0.0-*",
+        "Microsoft.Extensions.OptionsModel": "1.0.0-*",
-        "Microsoft.Framework.WebEncoders.Core": "1.0.0-*"
+        "Microsoft.Extensions.WebEncoders.Core": "1.0.0-*"
     },
     "frameworks": {
         "net45": { },

test/Microsoft.AspNet.Html.Abstractions.Test/HtmlContentBuilderExtensionsTest.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,7 +6,7 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using Microsoft.AspNet.Testing;
-using Microsoft.Framework.WebEncoders;
+using Microsoft.Extensions.WebEncoders;
 using Xunit;
 
 namespace Microsoft.AspNet.Html.Abstractions.Test

test/Microsoft.AspNet.Html.Abstractions.Test/project.json

@@ -4,7 +4,7 @@
     "Microsoft.AspNet.Testing": "1.0.0-*",
     "xunit.runner.aspnet": "2.0.0-aspnet-*"
   },
-  "compile": [ "../Microsoft.Framework.WebEncoders.Tests/CommonTestEncoder.cs" ],
+  "compile": [ "../Microsoft.Extensions.WebEncoders.Tests/CommonTestEncoder.cs" ],
   "commands": {
     "test": "xunit.runner.aspnet"
   },

test/Microsoft.AspNet.Http.Extensions.Tests/ResponseExtensionTests.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,7 +7,7 @@ using System.IO;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http.Features;
 using Microsoft.AspNet.Http.Internal;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Primitives;
 using Xunit;
 
 namespace Microsoft.AspNet.Http.Extensions

test/Microsoft.AspNet.Http.Extensions.Tests/project.json

@@ -2,7 +2,7 @@
   "dependencies": {
     "Microsoft.AspNet.Http": "1.0.0-*",
     "Microsoft.AspNet.Http.Extensions": "1.0.0-*",
-    "Microsoft.Framework.DependencyInjection": "1.0.0-*",
+    "Microsoft.Extensions.DependencyInjection": "1.0.0-*",
     "xunit.runner.aspnet": "2.0.0-aspnet-*"
   },
   "commands": {

test/Microsoft.AspNet.Http.Tests/DefaultHttpRequestTests.cs

@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using Microsoft.AspNet.Http.Features;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Primitives;
 using Xunit;
 
 namespace Microsoft.AspNet.Http.Internal

test/Microsoft.AspNet.Http.Tests/HeaderDictionaryTests.cs

@@ -3,7 +3,7 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.Framework.Primitives;
+using Microsoft.Extensions.Primitives;
 using Xunit;
 
 namespace Microsoft.AspNet.Http.Internal

test/Microsoft.Extensions.BufferedHtmlContent.Test/BufferedHtmlContentTest.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.IO;
 using Microsoft.AspNet.Html.Abstractions;
-using Microsoft.Framework.WebEncoders;
+using Microsoft.Extensions.WebEncoders;
 using Xunit;
 
-namespace Microsoft.Framework.Internal
+namespace Microsoft.Extensions.Internal
 {
     public class BufferedHtmlContentTest
     {

test/Microsoft.Extensions.BufferedHtmlContent.Test/Microsoft.Extensions.BufferedHtmlContent.Test.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>3e5311e2-a73e-40cc-a58c-5a62cead43ae</ProjectGuid>
-    <RootNamespace>Microsoft.Framework.BufferedHtmlContent.Test</RootNamespace>
+    <RootNamespace>Microsoft.Extensions.BufferedHtmlContent.Test</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
   </PropertyGroup>

test/Microsoft.Extensions.BufferedHtmlContent.Test/project.json

@@ -4,10 +4,10 @@
     },
     "dependencies": {
         "Microsoft.AspNet.Html.Abstractions": "1.0.0-*",
-        "Microsoft.Framework.BufferedHtmlContent.Sources": { "type": "build", "version": "1.0.0-*" },
+        "Microsoft.Extensions.BufferedHtmlContent.Sources": { "type": "build", "version": "1.0.0-*" },
         "xunit.runner.aspnet": "2.0.0-aspnet-*"
     },
-    "compile": [ "../Microsoft.Framework.WebEncoders.Tests/CommonTestEncoder.cs" ],
+    "compile": [ "../Microsoft.Extensions.WebEncoders.Tests/CommonTestEncoder.cs" ],
     "commands": {
         "test": "xunit.runner.aspnet"
     },

test/Microsoft.Extensions.WebEncoders.Tests/AllowedCharsBitmapTests.cs

@@ -4,7 +4,7 @@
 using System;
 using Xunit;
 
-namespace Microsoft.Framework.WebEncoders
+namespace Microsoft.Extensions.WebEncoders
 {
     public class AllowedCharsBitmapTests
     {

test/Microsoft.Extensions.WebEncoders.Tests/CodePointFilterTests.cs

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Xunit;
 
-namespace Microsoft.Framework.WebEncoders
+namespace Microsoft.Extensions.WebEncoders
 {
     public class CodePointFilterTests
     {

test/Microsoft.Extensions.WebEncoders.Tests/CommonTestEncoder.cs

@@ -6,7 +6,7 @@ using System.Globalization;
 using System.IO;
 using System.Runtime.CompilerServices;
 
-namespace Microsoft.Framework.WebEncoders
+namespace Microsoft.Extensions.WebEncoders
 {
     /// <summary>
     /// Encoder used for unit testing.

test/Microsoft.Extensions.WebEncoders.Tests/EncoderCommonTests.cs

@@ -4,7 +4,7 @@
 using System;
 using Xunit;
 
-namespace Microsoft.Framework.WebEncoders
+namespace Microsoft.Extensions.WebEncoders
 {
     public class EncoderCommonTests
     {

test/Microsoft.Extensions.WebEncoders.Tests/EncoderExtensionsTests.cs

@@ -5,7 +5,7 @@ using System;
 using System.IO;
 using Xunit;
 
-namespace Microsoft.Framework.WebEncoders
+namespace Microsoft.Extensions.WebEncoders
 {
     public class EncoderExtensionsTests
     {

test/Microsoft.Extensions.WebEncoders.Tests/EncoderServiceCollectionExtensionsTests.cs

@@ -1,10 +1,10 @@
 // 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.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 using Xunit;
 
-namespace Microsoft.Framework.WebEncoders
+namespace Microsoft.Extensions.WebEncoders
 {
     public class EncoderServiceCollectionExtensionsTests
     {

test/Microsoft.Extensions.WebEncoders.Tests/EncoderServiceProviderExtensionsTests.cs

@@ -4,7 +4,7 @@
 using System;
 using Xunit;
 
-namespace Microsoft.Framework.WebEncoders
+namespace Microsoft.Extensions.WebEncoders
 {
     public class EncoderServiceProviderExtensionsTests
     {

test/Microsoft.Extensions.WebEncoders.Tests/Entities.cs

@@ -7,7 +7,7 @@ using System.IO;
 using System.Linq;
 using Newtonsoft.Json;
 
-namespace Microsoft.Framework.WebEncoders
+namespace Microsoft.Extensions.WebEncoders
 {
     internal static class Entities
     {

test/Microsoft.Extensions.WebEncoders.Tests/Extensions.cs

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 
-namespace Microsoft.Framework.WebEncoders
+namespace Microsoft.Extensions.WebEncoders
 {
     public static class Extensions
     {

test/Microsoft.Extensions.WebEncoders.Tests/HtmlEncoderTests.cs

@@ -6,7 +6,7 @@ using System.Globalization;
 using System.IO;
 using Xunit;
 
-namespace Microsoft.Framework.WebEncoders
+namespace Microsoft.Extensions.WebEncoders
 {
     public class HtmlEncoderTests
     {

test/Microsoft.Extensions.WebEncoders.Tests/JavaScriptStringEncoderTests.cs

@@ -6,7 +6,7 @@ using System.Globalization;
 using System.IO;
 using Xunit;
 
-namespace Microsoft.Framework.WebEncoders
+namespace Microsoft.Extensions.WebEncoders
 {
     public class JavaScriptStringEncoderTests
     {

test/Microsoft.Extensions.WebEncoders.Tests/ParsedEntity.cs

@@ -4,7 +4,7 @@
 using System;
 using Newtonsoft.Json;
 
-namespace Microsoft.Framework.WebEncoders
+namespace Microsoft.Extensions.WebEncoders
 {
     internal sealed class ParsedEntity
     {

test/Microsoft.Extensions.WebEncoders.Tests/UnicodeEncoderBaseTests.cs

@@ -7,7 +7,7 @@ using System.Globalization;
 using System.IO;
 using Xunit;
 
-namespace Microsoft.Framework.WebEncoders
+namespace Microsoft.Extensions.WebEncoders
 {
     public class UnicodeEncoderBaseTests
     {

test/Microsoft.Extensions.WebEncoders.Tests/UnicodeHelpersTests.cs

@@ -10,7 +10,7 @@ using System.Reflection;
 using System.Text;
 using Xunit;
 
-namespace Microsoft.Framework.WebEncoders
+namespace Microsoft.Extensions.WebEncoders
 {
     public unsafe class UnicodeHelpersTests
     {

test/Microsoft.Extensions.WebEncoders.Tests/UnicodeRangeTests.cs

@@ -4,7 +4,7 @@
 using System;
 using Xunit;
 
-namespace Microsoft.Framework.WebEncoders
+namespace Microsoft.Extensions.WebEncoders
 {
     public class UnicodeRangeTests
     {

test/Microsoft.Extensions.WebEncoders.Tests/UnicodeRangesTests.cs

@@ -5,7 +5,7 @@ using System;
 using System.Reflection;
 using Xunit;
 
-namespace Microsoft.Framework.WebEncoders
+namespace Microsoft.Extensions.WebEncoders
 {
     public class UnicodeRangesTests
     {

test/Microsoft.Extensions.WebEncoders.Tests/UrlEncoderTests.cs

@@ -8,7 +8,7 @@ using System.Linq;
 using System.Text;
 using Xunit;
 
-namespace Microsoft.Framework.WebEncoders
+namespace Microsoft.Extensions.WebEncoders
 {
     public class UrlEncoderTests
     {