From 61466af7a38497ae25d538e5eb0f4cbcb6f303a0 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Sat, 3 Oct 2015 15:44:37 -0700 Subject: [PATCH] Renaming Microsoft.Framework.* -> Microsoft.Extensions.* --- HttpAbstractions.sln | 12 ++++++------ NuGetPackageVerifier.json | 6 +++--- samples/SampleApp/Program.cs | 4 ++-- .../HtmlContentBuilderExtensions.cs | 4 ++-- .../IHtmlContent.cs | 2 +- .../project.json | 4 ++-- .../Extensions/UseMiddlewareExtensions.cs | 2 +- .../IHeaderDictionary.cs | 2 +- .../IReadableStringCollection.cs | 2 +- .../PathString.cs | 2 +- .../QueryString.cs | 4 ++-- .../project.json | 4 ++-- .../HeaderDictionaryExtensions.cs | 4 ++-- .../HeaderDictionaryTypeExtensions.cs | 2 +- .../Internal/HeaderSegmentCollection.cs | 2 +- .../Internal/ParsingHelpers.cs | 2 +- .../QueryBuilder.cs | 2 +- .../project.json | 2 +- .../IHttpRequestFeature.cs | 2 +- .../IHttpResponseFeature.cs | 2 +- src/Microsoft.AspNet.Http.Features/project.json | 2 +- .../Features/FormFeature.cs | 2 +- .../Features/HttpRequestFeature.cs | 2 +- .../Features/HttpResponseFeature.cs | 2 +- .../Features/QueryFeature.cs | 2 +- .../Features/RequestCookiesFeature.cs | 2 +- src/Microsoft.AspNet.Http/FormCollection.cs | 2 +- src/Microsoft.AspNet.Http/HeaderDictionary.cs | 2 +- src/Microsoft.AspNet.Http/ParsingHelpers.cs | 2 +- .../ReadableStringCollection.cs | 2 +- .../RequestCookiesCollection.cs | 2 +- src/Microsoft.AspNet.Http/ResponseCookies.cs | 4 ++-- .../DictionaryStringArrayWrapper.cs | 4 ++-- .../DictionaryStringValuesWrapper.cs | 4 ++-- .../OwinFeatureCollection.cs | 2 +- src/Microsoft.AspNet.Owin/Utilities.cs | 2 +- src/Microsoft.AspNet.WebUtilities/FormReader.cs | 2 +- .../KeyValueAccumulator.cs | 2 +- .../MultipartReader.cs | 2 +- .../MultipartSection.cs | 2 +- .../QueryHelpers.cs | 4 ++-- src/Microsoft.AspNet.WebUtilities/project.json | 4 ++-- .../BufferedHtmlContent.cs | 4 ++-- ...xtensions.BufferedHtmlContent.Sources.xproj} | 4 ++-- .../Properties/AssemblyInfo.cs | 0 .../project.json | 0 .../AllowedCharsBitmap.cs | 2 +- .../CodePointFilter.cs | 2 +- .../EncoderCommon.cs | 2 +- .../EncoderExtensions.cs | 2 +- .../EncoderServiceProviderExtensions.cs | 2 +- .../HexUtil.cs | 2 +- .../HtmlEncoder.cs | 2 +- .../ICodePointFilter.cs | 2 +- .../IHtmlEncoder.cs | 2 +- .../IJavaScriptStringEncoder.cs | 2 +- .../IUrlEncoder.cs | 2 +- .../JavaScriptStringEncoder.cs | 2 +- ...Microsoft.Extensions.WebEncoders.Core.xproj} | 0 .../Properties/AssemblyInfo.cs | 2 +- .../UnicodeEncoderBase.cs | 2 +- .../UnicodeHelpers.cs | 2 +- .../UnicodeRange.cs | 2 +- .../UnicodeRanges.cs | 2 +- .../UnicodeRanges.generated.cs | 2 +- .../UrlEncoder.cs | 2 +- .../WebEncoderOptions.cs | 2 +- .../resources/unicode-defined-chars.bin | Bin .../project.json | 0 .../EncoderServiceCollectionExtensions.cs | 8 ++++---- .../Microsoft.Extensions.WebEncoders.xproj} | 0 .../Properties/AssemblyInfo.cs | 0 .../project.json | 6 +++--- .../HtmlContentBuilderExtensionsTest.cs | 4 ++-- .../project.json | 2 +- .../ResponseExtensionTests.cs | 4 ++-- .../project.json | 2 +- .../DefaultHttpRequestTests.cs | 2 +- .../HeaderDictionaryTests.cs | 2 +- .../BufferedHtmlContentTest.cs | 6 +++--- ...t.Extensions.BufferedHtmlContent.Test.xproj} | 4 ++-- .../project.json | 4 ++-- .../AllowedCharsBitmapTests.cs | 2 +- .../CodePointFilterTests.cs | 2 +- .../CommonTestEncoder.cs | 2 +- .../EncoderCommonTests.cs | 2 +- .../EncoderExtensionsTests.cs | 2 +- .../EncoderServiceCollectionExtensionsTests.cs | 4 ++-- .../EncoderServiceProviderExtensionsTests.cs | 2 +- .../Entities.cs | 2 +- .../Extensions.cs | 2 +- .../HtmlEncoderTests.cs | 2 +- .../JavaScriptStringEncoderTests.cs | 2 +- ...icrosoft.Extensions.WebEncoders.Tests.xproj} | 0 .../ParsedEntity.cs | 2 +- .../UnicodeEncoderBaseTests.cs | 2 +- .../UnicodeHelpersTests.cs | 2 +- .../UnicodeRangeTests.cs | 2 +- .../UnicodeRangesTests.cs | 2 +- .../UrlEncoderTests.cs | 2 +- .../project.json | 4 ++-- unicode/how-to-update.txt | 16 ++++++++-------- 102 files changed, 134 insertions(+), 134 deletions(-) rename src/{Microsoft.Framework.BufferedHtmlContent.Sources => Microsoft.Extensions.BufferedHtmlContent.Sources}/BufferedHtmlContent.cs (98%) rename src/{Microsoft.Framework.BufferedHtmlContent.Sources/Microsoft.Framework.BufferedHtmlContent.Sources.xproj => Microsoft.Extensions.BufferedHtmlContent.Sources/Microsoft.Extensions.BufferedHtmlContent.Sources.xproj} (88%) rename src/{Microsoft.Framework.BufferedHtmlContent.Sources => Microsoft.Extensions.BufferedHtmlContent.Sources}/Properties/AssemblyInfo.cs (100%) rename src/{Microsoft.Framework.BufferedHtmlContent.Sources => Microsoft.Extensions.BufferedHtmlContent.Sources}/project.json (100%) rename src/{Microsoft.Framework.WebEncoders.Core => Microsoft.Extensions.WebEncoders.Core}/AllowedCharsBitmap.cs (98%) rename src/{Microsoft.Framework.WebEncoders.Core => Microsoft.Extensions.WebEncoders.Core}/CodePointFilter.cs (99%) rename src/{Microsoft.Framework.WebEncoders.Core => Microsoft.Extensions.WebEncoders.Core}/EncoderCommon.cs (97%) rename src/{Microsoft.Framework.WebEncoders.Core => Microsoft.Extensions.WebEncoders.Core}/EncoderExtensions.cs (98%) rename src/{Microsoft.Framework.WebEncoders.Core => Microsoft.Extensions.WebEncoders.Core}/EncoderServiceProviderExtensions.cs (98%) rename src/{Microsoft.Framework.WebEncoders.Core => Microsoft.Extensions.WebEncoders.Core}/HexUtil.cs (97%) rename src/{Microsoft.Framework.WebEncoders.Core => Microsoft.Extensions.WebEncoders.Core}/HtmlEncoder.cs (99%) rename src/{Microsoft.Framework.WebEncoders.Core => Microsoft.Extensions.WebEncoders.Core}/ICodePointFilter.cs (92%) rename src/{Microsoft.Framework.WebEncoders.Core => Microsoft.Extensions.WebEncoders.Core}/IHtmlEncoder.cs (97%) rename src/{Microsoft.Framework.WebEncoders.Core => Microsoft.Extensions.WebEncoders.Core}/IJavaScriptStringEncoder.cs (97%) rename src/{Microsoft.Framework.WebEncoders.Core => Microsoft.Extensions.WebEncoders.Core}/IUrlEncoder.cs (97%) rename src/{Microsoft.Framework.WebEncoders.Core => Microsoft.Extensions.WebEncoders.Core}/JavaScriptStringEncoder.cs (99%) rename src/{Microsoft.Framework.WebEncoders.Core/Microsoft.Framework.WebEncoders.Core.xproj => Microsoft.Extensions.WebEncoders.Core/Microsoft.Extensions.WebEncoders.Core.xproj} (100%) rename src/{Microsoft.Framework.WebEncoders.Core => Microsoft.Extensions.WebEncoders.Core}/Properties/AssemblyInfo.cs (72%) rename src/{Microsoft.Framework.WebEncoders.Core => Microsoft.Extensions.WebEncoders.Core}/UnicodeEncoderBase.cs (99%) rename src/{Microsoft.Framework.WebEncoders.Core => Microsoft.Extensions.WebEncoders.Core}/UnicodeHelpers.cs (99%) rename src/{Microsoft.Framework.WebEncoders.Core => Microsoft.Extensions.WebEncoders.Core}/UnicodeRange.cs (98%) rename src/{Microsoft.Framework.WebEncoders.Core => Microsoft.Extensions.WebEncoders.Core}/UnicodeRanges.cs (98%) rename src/{Microsoft.Framework.WebEncoders.Core => Microsoft.Extensions.WebEncoders.Core}/UnicodeRanges.generated.cs (99%) rename src/{Microsoft.Framework.WebEncoders.Core => Microsoft.Extensions.WebEncoders.Core}/UrlEncoder.cs (99%) rename src/{Microsoft.Framework.WebEncoders.Core => Microsoft.Extensions.WebEncoders.Core}/WebEncoderOptions.cs (94%) rename src/{Microsoft.Framework.WebEncoders.Core => Microsoft.Extensions.WebEncoders.Core}/compiler/resources/unicode-defined-chars.bin (100%) rename src/{Microsoft.Framework.WebEncoders.Core => Microsoft.Extensions.WebEncoders.Core}/project.json (100%) rename src/{Microsoft.Framework.WebEncoders => Microsoft.Extensions.WebEncoders}/EncoderServiceCollectionExtensions.cs (92%) rename src/{Microsoft.Framework.WebEncoders/Microsoft.Framework.WebEncoders.xproj => Microsoft.Extensions.WebEncoders/Microsoft.Extensions.WebEncoders.xproj} (100%) rename src/{Microsoft.Framework.WebEncoders => Microsoft.Extensions.WebEncoders}/Properties/AssemblyInfo.cs (100%) rename src/{Microsoft.Framework.WebEncoders => Microsoft.Extensions.WebEncoders}/project.json (69%) rename test/{Microsoft.Framework.BufferedHtmlContent.Test => Microsoft.Extensions.BufferedHtmlContent.Test}/BufferedHtmlContentTest.cs (96%) rename test/{Microsoft.Framework.BufferedHtmlContent.Test/Microsoft.Framework.BufferedHtmlContent.Test.xproj => Microsoft.Extensions.BufferedHtmlContent.Test/Microsoft.Extensions.BufferedHtmlContent.Test.xproj} (88%) rename test/{Microsoft.Framework.BufferedHtmlContent.Test => Microsoft.Extensions.BufferedHtmlContent.Test}/project.json (64%) rename test/{Microsoft.Framework.WebEncoders.Tests => Microsoft.Extensions.WebEncoders.Tests}/AllowedCharsBitmapTests.cs (98%) rename test/{Microsoft.Framework.WebEncoders.Tests => Microsoft.Extensions.WebEncoders.Tests}/CodePointFilterTests.cs (99%) rename test/{Microsoft.Framework.WebEncoders.Tests => Microsoft.Extensions.WebEncoders.Tests}/CommonTestEncoder.cs (98%) rename test/{Microsoft.Framework.WebEncoders.Tests => Microsoft.Extensions.WebEncoders.Tests}/EncoderCommonTests.cs (95%) rename test/{Microsoft.Framework.WebEncoders.Tests => Microsoft.Extensions.WebEncoders.Tests}/EncoderExtensionsTests.cs (98%) rename test/{Microsoft.Framework.WebEncoders.Tests => Microsoft.Extensions.WebEncoders.Tests}/EncoderServiceCollectionExtensionsTests.cs (97%) rename test/{Microsoft.Framework.WebEncoders.Tests => Microsoft.Extensions.WebEncoders.Tests}/EncoderServiceProviderExtensionsTests.cs (98%) rename test/{Microsoft.Framework.WebEncoders.Tests => Microsoft.Extensions.WebEncoders.Tests}/Entities.cs (96%) rename test/{Microsoft.Framework.WebEncoders.Tests => Microsoft.Extensions.WebEncoders.Tests}/Extensions.cs (94%) rename test/{Microsoft.Framework.WebEncoders.Tests => Microsoft.Extensions.WebEncoders.Tests}/HtmlEncoderTests.cs (99%) rename test/{Microsoft.Framework.WebEncoders.Tests => Microsoft.Extensions.WebEncoders.Tests}/JavaScriptStringEncoderTests.cs (99%) rename test/{Microsoft.Framework.WebEncoders.Tests/Microsoft.Framework.WebEncoders.Tests.xproj => Microsoft.Extensions.WebEncoders.Tests/Microsoft.Extensions.WebEncoders.Tests.xproj} (100%) rename test/{Microsoft.Framework.WebEncoders.Tests => Microsoft.Extensions.WebEncoders.Tests}/ParsedEntity.cs (90%) rename test/{Microsoft.Framework.WebEncoders.Tests => Microsoft.Extensions.WebEncoders.Tests}/UnicodeEncoderBaseTests.cs (99%) rename test/{Microsoft.Framework.WebEncoders.Tests => Microsoft.Extensions.WebEncoders.Tests}/UnicodeHelpersTests.cs (99%) rename test/{Microsoft.Framework.WebEncoders.Tests => Microsoft.Extensions.WebEncoders.Tests}/UnicodeRangeTests.cs (98%) rename test/{Microsoft.Framework.WebEncoders.Tests => Microsoft.Extensions.WebEncoders.Tests}/UnicodeRangesTests.cs (99%) rename test/{Microsoft.Framework.WebEncoders.Tests => Microsoft.Extensions.WebEncoders.Tests}/UrlEncoderTests.cs (99%) rename test/{Microsoft.Framework.WebEncoders.Tests => Microsoft.Extensions.WebEncoders.Tests}/project.json (79%) diff --git a/HttpAbstractions.sln b/HttpAbstractions.sln index 1e1b155ed3..28574eee21 100644 --- a/HttpAbstractions.sln +++ b/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 diff --git a/NuGetPackageVerifier.json b/NuGetPackageVerifier.json index 3a6a9f4229..d465e3b553 100644 --- a/NuGetPackageVerifier.json +++ b/NuGetPackageVerifier.json @@ -16,9 +16,9 @@ "Microsoft.AspNet.Http.Features": { }, "Microsoft.AspNet.Owin": { }, "Microsoft.AspNet.WebUtilities": { }, - "Microsoft.Framework.BufferedHtmlContent.Sources": { }, - "Microsoft.Framework.WebEncoders": { }, - "Microsoft.Framework.WebEncoders.Core": { }, + "Microsoft.Extensions.BufferedHtmlContent.Sources": { }, + "Microsoft.Extensions.WebEncoders": { }, + "Microsoft.Extensions.WebEncoders.Core": { }, "Microsoft.Net.Http.Headers": { } } }, diff --git a/samples/SampleApp/Program.cs b/samples/SampleApp/Program.cs index c434e6c0a6..0bfe4fbd10 100644 --- a/samples/SampleApp/Program.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Html.Abstractions/HtmlContentBuilderExtensions.cs b/src/Microsoft.AspNet.Html.Abstractions/HtmlContentBuilderExtensions.cs index 0e15077764..5f8515bb03 100644 --- a/src/Microsoft.AspNet.Html.Abstractions/HtmlContentBuilderExtensions.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Html.Abstractions/IHtmlContent.cs b/src/Microsoft.AspNet.Html.Abstractions/IHtmlContent.cs index fc77f9edf4..05f09cb7b4 100644 --- a/src/Microsoft.AspNet.Html.Abstractions/IHtmlContent.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Html.Abstractions/project.json b/src/Microsoft.AspNet.Html.Abstractions/project.json index e4f6452bf1..fd368e97e6 100644 --- a/src/Microsoft.AspNet.Html.Abstractions/project.json +++ b/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" : { }, diff --git a/src/Microsoft.AspNet.Http.Abstractions/Extensions/UseMiddlewareExtensions.cs b/src/Microsoft.AspNet.Http.Abstractions/Extensions/UseMiddlewareExtensions.cs index 04430164df..cac2100ce3 100644 --- a/src/Microsoft.AspNet.Http.Abstractions/Extensions/UseMiddlewareExtensions.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Http.Abstractions/IHeaderDictionary.cs b/src/Microsoft.AspNet.Http.Abstractions/IHeaderDictionary.cs index 36137ed45c..b6483c15a8 100644 --- a/src/Microsoft.AspNet.Http.Abstractions/IHeaderDictionary.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Http.Abstractions/IReadableStringCollection.cs b/src/Microsoft.AspNet.Http.Abstractions/IReadableStringCollection.cs index d85e960d9b..81c8408753 100644 --- a/src/Microsoft.AspNet.Http.Abstractions/IReadableStringCollection.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Http.Abstractions/PathString.cs b/src/Microsoft.AspNet.Http.Abstractions/PathString.cs index be6422063f..4f1499650d 100644 --- a/src/Microsoft.AspNet.Http.Abstractions/PathString.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Http.Abstractions/QueryString.cs b/src/Microsoft.AspNet.Http.Abstractions/QueryString.cs index ed59879585..25ba1f2699 100644 --- a/src/Microsoft.AspNet.Http.Abstractions/QueryString.cs +++ b/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.Framework.WebEncoders; +using Microsoft.Extensions.Primitives; +using Microsoft.Extensions.WebEncoders; namespace Microsoft.AspNet.Http { diff --git a/src/Microsoft.AspNet.Http.Abstractions/project.json b/src/Microsoft.AspNet.Http.Abstractions/project.json index 3ae66b0aba..1d944cde2a 100644 --- a/src/Microsoft.AspNet.Http.Abstractions/project.json +++ b/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.Framework.WebEncoders.Core": "1.0.0-*" + "Microsoft.Extensions.ActivatorUtilities.Sources": { "type": "build", "version": "1.0.0-*" }, + "Microsoft.Extensions.WebEncoders.Core": "1.0.0-*" }, "frameworks": { "dnx451": { }, diff --git a/src/Microsoft.AspNet.Http.Extensions/HeaderDictionaryExtensions.cs b/src/Microsoft.AspNet.Http.Extensions/HeaderDictionaryExtensions.cs index c986a530c0..6a8d909dba 100644 --- a/src/Microsoft.AspNet.Http.Extensions/HeaderDictionaryExtensions.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Http.Extensions/HeaderDictionaryTypeExtensions.cs b/src/Microsoft.AspNet.Http.Extensions/HeaderDictionaryTypeExtensions.cs index 78bafd33bc..5b1f70f471 100644 --- a/src/Microsoft.AspNet.Http.Extensions/HeaderDictionaryTypeExtensions.cs +++ b/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 diff --git a/src/Microsoft.AspNet.Http.Extensions/Internal/HeaderSegmentCollection.cs b/src/Microsoft.AspNet.Http.Extensions/Internal/HeaderSegmentCollection.cs index d3bfe5f4cf..6806dbaab0 100644 --- a/src/Microsoft.AspNet.Http.Extensions/Internal/HeaderSegmentCollection.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Http.Extensions/Internal/ParsingHelpers.cs b/src/Microsoft.AspNet.Http.Extensions/Internal/ParsingHelpers.cs index 93a5bfc631..f829eec939 100644 --- a/src/Microsoft.AspNet.Http.Extensions/Internal/ParsingHelpers.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Http.Extensions/QueryBuilder.cs b/src/Microsoft.AspNet.Http.Extensions/QueryBuilder.cs index fa23ebeced..060c04efc7 100644 --- a/src/Microsoft.AspNet.Http.Extensions/QueryBuilder.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Http.Extensions/project.json b/src/Microsoft.AspNet.Http.Extensions/project.json index 4ef0842096..1d330ebe5d 100644 --- a/src/Microsoft.AspNet.Http.Extensions/project.json +++ b/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": { diff --git a/src/Microsoft.AspNet.Http.Features/IHttpRequestFeature.cs b/src/Microsoft.AspNet.Http.Features/IHttpRequestFeature.cs index 7e61bb915a..d67143e096 100644 --- a/src/Microsoft.AspNet.Http.Features/IHttpRequestFeature.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Http.Features/IHttpResponseFeature.cs b/src/Microsoft.AspNet.Http.Features/IHttpResponseFeature.cs index b46b4ae4b6..2a8b10ab15 100644 --- a/src/Microsoft.AspNet.Http.Features/IHttpResponseFeature.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Http.Features/project.json b/src/Microsoft.AspNet.Http.Features/project.json index 51e3cada2f..73e5663933 100644 --- a/src/Microsoft.AspNet.Http.Features/project.json +++ b/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": { }, diff --git a/src/Microsoft.AspNet.Http/Features/FormFeature.cs b/src/Microsoft.AspNet.Http/Features/FormFeature.cs index 6d6ff1d012..b5e71b8cab 100644 --- a/src/Microsoft.AspNet.Http/Features/FormFeature.cs +++ b/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 diff --git a/src/Microsoft.AspNet.Http/Features/HttpRequestFeature.cs b/src/Microsoft.AspNet.Http/Features/HttpRequestFeature.cs index 73bf244cbf..900976e647 100644 --- a/src/Microsoft.AspNet.Http/Features/HttpRequestFeature.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Http/Features/HttpResponseFeature.cs b/src/Microsoft.AspNet.Http/Features/HttpResponseFeature.cs index 010a13c86c..50a204efcf 100644 --- a/src/Microsoft.AspNet.Http/Features/HttpResponseFeature.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Http/Features/QueryFeature.cs b/src/Microsoft.AspNet.Http/Features/QueryFeature.cs index 5dd7ca9163..b0ceafb3f1 100644 --- a/src/Microsoft.AspNet.Http/Features/QueryFeature.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Http/Features/RequestCookiesFeature.cs b/src/Microsoft.AspNet.Http/Features/RequestCookiesFeature.cs index 0eb44ef102..3806a65f06 100644 --- a/src/Microsoft.AspNet.Http/Features/RequestCookiesFeature.cs +++ b/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 diff --git a/src/Microsoft.AspNet.Http/FormCollection.cs b/src/Microsoft.AspNet.Http/FormCollection.cs index 550ad933eb..a0e7428567 100644 --- a/src/Microsoft.AspNet.Http/FormCollection.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Http/HeaderDictionary.cs b/src/Microsoft.AspNet.Http/HeaderDictionary.cs index 20b520b783..2955cddec0 100644 --- a/src/Microsoft.AspNet.Http/HeaderDictionary.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Http/ParsingHelpers.cs b/src/Microsoft.AspNet.Http/ParsingHelpers.cs index 6bf5a57ae6..ef8c526945 100644 --- a/src/Microsoft.AspNet.Http/ParsingHelpers.cs +++ b/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 diff --git a/src/Microsoft.AspNet.Http/ReadableStringCollection.cs b/src/Microsoft.AspNet.Http/ReadableStringCollection.cs index c1ed5d910e..8239699e1b 100644 --- a/src/Microsoft.AspNet.Http/ReadableStringCollection.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Http/RequestCookiesCollection.cs b/src/Microsoft.AspNet.Http/RequestCookiesCollection.cs index 8fb23def3d..d0001c1a5d 100644 --- a/src/Microsoft.AspNet.Http/RequestCookiesCollection.cs +++ b/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 diff --git a/src/Microsoft.AspNet.Http/ResponseCookies.cs b/src/Microsoft.AspNet.Http/ResponseCookies.cs index c4db554c47..e67251f61a 100644 --- a/src/Microsoft.AspNet.Http/ResponseCookies.cs +++ b/src/Microsoft.AspNet.Http/ResponseCookies.cs @@ -3,8 +3,8 @@ using System; using System.Linq; -using Microsoft.Framework.Primitives; -using Microsoft.Framework.WebEncoders; +using Microsoft.Extensions.Primitives; +using Microsoft.Extensions.WebEncoders; using Microsoft.Net.Http.Headers; namespace Microsoft.AspNet.Http.Internal diff --git a/src/Microsoft.AspNet.Owin/DictionaryStringArrayWrapper.cs b/src/Microsoft.AspNet.Owin/DictionaryStringArrayWrapper.cs index fb1e812cca..4aec5c9d27 100644 --- a/src/Microsoft.AspNet.Owin/DictionaryStringArrayWrapper.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Owin/DictionaryStringValuesWrapper.cs b/src/Microsoft.AspNet.Owin/DictionaryStringValuesWrapper.cs index e94ecbcb30..51cd330dd8 100644 --- a/src/Microsoft.AspNet.Owin/DictionaryStringValuesWrapper.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Owin/OwinFeatureCollection.cs b/src/Microsoft.AspNet.Owin/OwinFeatureCollection.cs index de01c47052..72a7b19f4f 100644 --- a/src/Microsoft.AspNet.Owin/OwinFeatureCollection.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Owin/Utilities.cs b/src/Microsoft.AspNet.Owin/Utilities.cs index 98fc30ea26..a7aa9a752c 100644 --- a/src/Microsoft.AspNet.Owin/Utilities.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.WebUtilities/FormReader.cs b/src/Microsoft.AspNet.WebUtilities/FormReader.cs index d4e36264de..e361bac1c4 100644 --- a/src/Microsoft.AspNet.WebUtilities/FormReader.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.WebUtilities/KeyValueAccumulator.cs b/src/Microsoft.AspNet.WebUtilities/KeyValueAccumulator.cs index eb8f311c50..c0ecc8c45c 100644 --- a/src/Microsoft.AspNet.WebUtilities/KeyValueAccumulator.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.WebUtilities/MultipartReader.cs b/src/Microsoft.AspNet.WebUtilities/MultipartReader.cs index 8c87e5db52..ef6f03a92f 100644 --- a/src/Microsoft.AspNet.WebUtilities/MultipartReader.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.WebUtilities/MultipartSection.cs b/src/Microsoft.AspNet.WebUtilities/MultipartSection.cs index c420073eef..29dfc49574 100644 --- a/src/Microsoft.AspNet.WebUtilities/MultipartSection.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.WebUtilities/QueryHelpers.cs b/src/Microsoft.AspNet.WebUtilities/QueryHelpers.cs index 17022d0b2d..465ce48a83 100644 --- a/src/Microsoft.AspNet.WebUtilities/QueryHelpers.cs +++ b/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.Framework.WebEncoders; +using Microsoft.Extensions.Primitives; +using Microsoft.Extensions.WebEncoders; namespace Microsoft.AspNet.WebUtilities { diff --git a/src/Microsoft.AspNet.WebUtilities/project.json b/src/Microsoft.AspNet.WebUtilities/project.json index 88b039b752..5a64ca96b6 100644 --- a/src/Microsoft.AspNet.WebUtilities/project.json +++ b/src/Microsoft.AspNet.WebUtilities/project.json @@ -9,8 +9,8 @@ "warningsAsErrors": true }, "dependencies": { - "Microsoft.Framework.Primitives": "1.0.0-*", - "Microsoft.Framework.WebEncoders.Core": "1.0.0-*" + "Microsoft.Extensions.Primitives": "1.0.0-*", + "Microsoft.Extensions.WebEncoders.Core": "1.0.0-*" }, "frameworks": { "dnx451": { }, diff --git a/src/Microsoft.Framework.BufferedHtmlContent.Sources/BufferedHtmlContent.cs b/src/Microsoft.Extensions.BufferedHtmlContent.Sources/BufferedHtmlContent.cs similarity index 98% rename from src/Microsoft.Framework.BufferedHtmlContent.Sources/BufferedHtmlContent.cs rename to src/Microsoft.Extensions.BufferedHtmlContent.Sources/BufferedHtmlContent.cs index 0b9ddc770f..3b79916d9c 100644 --- a/src/Microsoft.Framework.BufferedHtmlContent.Sources/BufferedHtmlContent.cs +++ b/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 { /// /// Enumerable object collection which knows how to write itself. diff --git a/src/Microsoft.Framework.BufferedHtmlContent.Sources/Microsoft.Framework.BufferedHtmlContent.Sources.xproj b/src/Microsoft.Extensions.BufferedHtmlContent.Sources/Microsoft.Extensions.BufferedHtmlContent.Sources.xproj similarity index 88% rename from src/Microsoft.Framework.BufferedHtmlContent.Sources/Microsoft.Framework.BufferedHtmlContent.Sources.xproj rename to src/Microsoft.Extensions.BufferedHtmlContent.Sources/Microsoft.Extensions.BufferedHtmlContent.Sources.xproj index 9185ec07d6..6d93971523 100644 --- a/src/Microsoft.Framework.BufferedHtmlContent.Sources/Microsoft.Framework.BufferedHtmlContent.Sources.xproj +++ b/src/Microsoft.Extensions.BufferedHtmlContent.Sources/Microsoft.Extensions.BufferedHtmlContent.Sources.xproj @@ -1,4 +1,4 @@ - + 14.0 @@ -7,7 +7,7 @@ b1b2b906-24ae-4c57-aac5-19b734014504 - Microsoft.Framework.BufferedHtmlContent.Sources + Microsoft.Extensions.BufferedHtmlContent.Sources ..\..\artifacts\obj\$(MSBuildProjectName) ..\..\artifacts\bin\$(MSBuildProjectName)\ diff --git a/src/Microsoft.Framework.BufferedHtmlContent.Sources/Properties/AssemblyInfo.cs b/src/Microsoft.Extensions.BufferedHtmlContent.Sources/Properties/AssemblyInfo.cs similarity index 100% rename from src/Microsoft.Framework.BufferedHtmlContent.Sources/Properties/AssemblyInfo.cs rename to src/Microsoft.Extensions.BufferedHtmlContent.Sources/Properties/AssemblyInfo.cs diff --git a/src/Microsoft.Framework.BufferedHtmlContent.Sources/project.json b/src/Microsoft.Extensions.BufferedHtmlContent.Sources/project.json similarity index 100% rename from src/Microsoft.Framework.BufferedHtmlContent.Sources/project.json rename to src/Microsoft.Extensions.BufferedHtmlContent.Sources/project.json diff --git a/src/Microsoft.Framework.WebEncoders.Core/AllowedCharsBitmap.cs b/src/Microsoft.Extensions.WebEncoders.Core/AllowedCharsBitmap.cs similarity index 98% rename from src/Microsoft.Framework.WebEncoders.Core/AllowedCharsBitmap.cs rename to src/Microsoft.Extensions.WebEncoders.Core/AllowedCharsBitmap.cs index 5d396a473a..aae7b3c8b8 100644 --- a/src/Microsoft.Framework.WebEncoders.Core/AllowedCharsBitmap.cs +++ b/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 { diff --git a/src/Microsoft.Framework.WebEncoders.Core/CodePointFilter.cs b/src/Microsoft.Extensions.WebEncoders.Core/CodePointFilter.cs similarity index 99% rename from src/Microsoft.Framework.WebEncoders.Core/CodePointFilter.cs rename to src/Microsoft.Extensions.WebEncoders.Core/CodePointFilter.cs index 8858c2df17..dda6499604 100644 --- a/src/Microsoft.Framework.WebEncoders.Core/CodePointFilter.cs +++ b/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 { /// /// Represents a filter which allows only certain Unicode code points through. diff --git a/src/Microsoft.Framework.WebEncoders.Core/EncoderCommon.cs b/src/Microsoft.Extensions.WebEncoders.Core/EncoderCommon.cs similarity index 97% rename from src/Microsoft.Framework.WebEncoders.Core/EncoderCommon.cs rename to src/Microsoft.Extensions.WebEncoders.Core/EncoderCommon.cs index 3ec108fff2..940a8590ae 100644 --- a/src/Microsoft.Framework.WebEncoders.Core/EncoderCommon.cs +++ b/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 { diff --git a/src/Microsoft.Framework.WebEncoders.Core/EncoderExtensions.cs b/src/Microsoft.Extensions.WebEncoders.Core/EncoderExtensions.cs similarity index 98% rename from src/Microsoft.Framework.WebEncoders.Core/EncoderExtensions.cs rename to src/Microsoft.Extensions.WebEncoders.Core/EncoderExtensions.cs index df01877f6d..d6428f866e 100644 --- a/src/Microsoft.Framework.WebEncoders.Core/EncoderExtensions.cs +++ b/src/Microsoft.Extensions.WebEncoders.Core/EncoderExtensions.cs @@ -4,7 +4,7 @@ using System; using System.IO; -namespace Microsoft.Framework.WebEncoders +namespace Microsoft.Extensions.WebEncoders { /// /// Helpful extension methods for the encoder classes. diff --git a/src/Microsoft.Framework.WebEncoders.Core/EncoderServiceProviderExtensions.cs b/src/Microsoft.Extensions.WebEncoders.Core/EncoderServiceProviderExtensions.cs similarity index 98% rename from src/Microsoft.Framework.WebEncoders.Core/EncoderServiceProviderExtensions.cs rename to src/Microsoft.Extensions.WebEncoders.Core/EncoderServiceProviderExtensions.cs index 7d2b81a8fe..f08f37db52 100644 --- a/src/Microsoft.Framework.WebEncoders.Core/EncoderServiceProviderExtensions.cs +++ b/src/Microsoft.Extensions.WebEncoders.Core/EncoderServiceProviderExtensions.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.Framework.WebEncoders +namespace Microsoft.Extensions.WebEncoders { /// /// Contains extension methods for fetching encoders from an . diff --git a/src/Microsoft.Framework.WebEncoders.Core/HexUtil.cs b/src/Microsoft.Extensions.WebEncoders.Core/HexUtil.cs similarity index 97% rename from src/Microsoft.Framework.WebEncoders.Core/HexUtil.cs rename to src/Microsoft.Extensions.WebEncoders.Core/HexUtil.cs index a2a350b9a9..3262a1665d 100644 --- a/src/Microsoft.Framework.WebEncoders.Core/HexUtil.cs +++ b/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 { /// /// Contains helpers for dealing with byte-hex char conversions. diff --git a/src/Microsoft.Framework.WebEncoders.Core/HtmlEncoder.cs b/src/Microsoft.Extensions.WebEncoders.Core/HtmlEncoder.cs similarity index 99% rename from src/Microsoft.Framework.WebEncoders.Core/HtmlEncoder.cs rename to src/Microsoft.Extensions.WebEncoders.Core/HtmlEncoder.cs index 5a0553e782..d1347c0338 100644 --- a/src/Microsoft.Framework.WebEncoders.Core/HtmlEncoder.cs +++ b/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 { /// /// A class which can perform HTML encoding given an allow list of characters which diff --git a/src/Microsoft.Framework.WebEncoders.Core/ICodePointFilter.cs b/src/Microsoft.Extensions.WebEncoders.Core/ICodePointFilter.cs similarity index 92% rename from src/Microsoft.Framework.WebEncoders.Core/ICodePointFilter.cs rename to src/Microsoft.Extensions.WebEncoders.Core/ICodePointFilter.cs index f39c3580f8..446bc354a5 100644 --- a/src/Microsoft.Framework.WebEncoders.Core/ICodePointFilter.cs +++ b/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 { /// /// Represents a filter which allows only certain Unicode code points through. diff --git a/src/Microsoft.Framework.WebEncoders.Core/IHtmlEncoder.cs b/src/Microsoft.Extensions.WebEncoders.Core/IHtmlEncoder.cs similarity index 97% rename from src/Microsoft.Framework.WebEncoders.Core/IHtmlEncoder.cs rename to src/Microsoft.Extensions.WebEncoders.Core/IHtmlEncoder.cs index f7c6adb064..e6bbb35a5c 100644 --- a/src/Microsoft.Framework.WebEncoders.Core/IHtmlEncoder.cs +++ b/src/Microsoft.Extensions.WebEncoders.Core/IHtmlEncoder.cs @@ -3,7 +3,7 @@ using System.IO; -namespace Microsoft.Framework.WebEncoders +namespace Microsoft.Extensions.WebEncoders { /// /// Provides services for HTML-encoding input. diff --git a/src/Microsoft.Framework.WebEncoders.Core/IJavaScriptStringEncoder.cs b/src/Microsoft.Extensions.WebEncoders.Core/IJavaScriptStringEncoder.cs similarity index 97% rename from src/Microsoft.Framework.WebEncoders.Core/IJavaScriptStringEncoder.cs rename to src/Microsoft.Extensions.WebEncoders.Core/IJavaScriptStringEncoder.cs index 19b7d843e2..29d07a46cc 100644 --- a/src/Microsoft.Framework.WebEncoders.Core/IJavaScriptStringEncoder.cs +++ b/src/Microsoft.Extensions.WebEncoders.Core/IJavaScriptStringEncoder.cs @@ -3,7 +3,7 @@ using System.IO; -namespace Microsoft.Framework.WebEncoders +namespace Microsoft.Extensions.WebEncoders { /// /// Provides services for JavaScript-escaping strings. diff --git a/src/Microsoft.Framework.WebEncoders.Core/IUrlEncoder.cs b/src/Microsoft.Extensions.WebEncoders.Core/IUrlEncoder.cs similarity index 97% rename from src/Microsoft.Framework.WebEncoders.Core/IUrlEncoder.cs rename to src/Microsoft.Extensions.WebEncoders.Core/IUrlEncoder.cs index edcaaffea8..c3e92568ab 100644 --- a/src/Microsoft.Framework.WebEncoders.Core/IUrlEncoder.cs +++ b/src/Microsoft.Extensions.WebEncoders.Core/IUrlEncoder.cs @@ -3,7 +3,7 @@ using System.IO; -namespace Microsoft.Framework.WebEncoders +namespace Microsoft.Extensions.WebEncoders { /// /// Provides services for URL-escaping strings. diff --git a/src/Microsoft.Framework.WebEncoders.Core/JavaScriptStringEncoder.cs b/src/Microsoft.Extensions.WebEncoders.Core/JavaScriptStringEncoder.cs similarity index 99% rename from src/Microsoft.Framework.WebEncoders.Core/JavaScriptStringEncoder.cs rename to src/Microsoft.Extensions.WebEncoders.Core/JavaScriptStringEncoder.cs index 6328bdebc1..008c6bcc51 100644 --- a/src/Microsoft.Framework.WebEncoders.Core/JavaScriptStringEncoder.cs +++ b/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 { /// /// A class which can perform JavaScript string escaping given an allow list of characters which diff --git a/src/Microsoft.Framework.WebEncoders.Core/Microsoft.Framework.WebEncoders.Core.xproj b/src/Microsoft.Extensions.WebEncoders.Core/Microsoft.Extensions.WebEncoders.Core.xproj similarity index 100% rename from src/Microsoft.Framework.WebEncoders.Core/Microsoft.Framework.WebEncoders.Core.xproj rename to src/Microsoft.Extensions.WebEncoders.Core/Microsoft.Extensions.WebEncoders.Core.xproj diff --git a/src/Microsoft.Framework.WebEncoders.Core/Properties/AssemblyInfo.cs b/src/Microsoft.Extensions.WebEncoders.Core/Properties/AssemblyInfo.cs similarity index 72% rename from src/Microsoft.Framework.WebEncoders.Core/Properties/AssemblyInfo.cs rename to src/Microsoft.Extensions.WebEncoders.Core/Properties/AssemblyInfo.cs index 48510ed635..b781d6ca97 100644 --- a/src/Microsoft.Framework.WebEncoders.Core/Properties/AssemblyInfo.cs +++ b/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")] \ No newline at end of file diff --git a/src/Microsoft.Framework.WebEncoders.Core/UnicodeEncoderBase.cs b/src/Microsoft.Extensions.WebEncoders.Core/UnicodeEncoderBase.cs similarity index 99% rename from src/Microsoft.Framework.WebEncoders.Core/UnicodeEncoderBase.cs rename to src/Microsoft.Extensions.WebEncoders.Core/UnicodeEncoderBase.cs index 1588ec0e19..1a6baaf665 100644 --- a/src/Microsoft.Framework.WebEncoders.Core/UnicodeEncoderBase.cs +++ b/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 { diff --git a/src/Microsoft.Framework.WebEncoders.Core/UnicodeHelpers.cs b/src/Microsoft.Extensions.WebEncoders.Core/UnicodeHelpers.cs similarity index 99% rename from src/Microsoft.Framework.WebEncoders.Core/UnicodeHelpers.cs rename to src/Microsoft.Extensions.WebEncoders.Core/UnicodeHelpers.cs index fac3a2e4e1..53e52ef573 100644 --- a/src/Microsoft.Framework.WebEncoders.Core/UnicodeHelpers.cs +++ b/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 { /// /// Contains helpers for dealing with Unicode code points. diff --git a/src/Microsoft.Framework.WebEncoders.Core/UnicodeRange.cs b/src/Microsoft.Extensions.WebEncoders.Core/UnicodeRange.cs similarity index 98% rename from src/Microsoft.Framework.WebEncoders.Core/UnicodeRange.cs rename to src/Microsoft.Extensions.WebEncoders.Core/UnicodeRange.cs index 78a3c41a2f..8320350e16 100644 --- a/src/Microsoft.Framework.WebEncoders.Core/UnicodeRange.cs +++ b/src/Microsoft.Extensions.WebEncoders.Core/UnicodeRange.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.Framework.WebEncoders +namespace Microsoft.Extensions.WebEncoders { /// /// Represents a contiguous range of Unicode code points. diff --git a/src/Microsoft.Framework.WebEncoders.Core/UnicodeRanges.cs b/src/Microsoft.Extensions.WebEncoders.Core/UnicodeRanges.cs similarity index 98% rename from src/Microsoft.Framework.WebEncoders.Core/UnicodeRanges.cs rename to src/Microsoft.Extensions.WebEncoders.Core/UnicodeRanges.cs index f78837bc6e..73d155e141 100644 --- a/src/Microsoft.Framework.WebEncoders.Core/UnicodeRanges.cs +++ b/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 { /// /// Contains predefined instances which correspond to blocks diff --git a/src/Microsoft.Framework.WebEncoders.Core/UnicodeRanges.generated.cs b/src/Microsoft.Extensions.WebEncoders.Core/UnicodeRanges.generated.cs similarity index 99% rename from src/Microsoft.Framework.WebEncoders.Core/UnicodeRanges.generated.cs rename to src/Microsoft.Extensions.WebEncoders.Core/UnicodeRanges.generated.cs index 64d522f248..ae2079a309 100644 --- a/src/Microsoft.Framework.WebEncoders.Core/UnicodeRanges.generated.cs +++ b/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 { diff --git a/src/Microsoft.Framework.WebEncoders.Core/UrlEncoder.cs b/src/Microsoft.Extensions.WebEncoders.Core/UrlEncoder.cs similarity index 99% rename from src/Microsoft.Framework.WebEncoders.Core/UrlEncoder.cs rename to src/Microsoft.Extensions.WebEncoders.Core/UrlEncoder.cs index e15096659f..f5d6ea1c99 100644 --- a/src/Microsoft.Framework.WebEncoders.Core/UrlEncoder.cs +++ b/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 { /// /// A class which can perform URL string escaping given an allow list of characters which diff --git a/src/Microsoft.Framework.WebEncoders.Core/WebEncoderOptions.cs b/src/Microsoft.Extensions.WebEncoders.Core/WebEncoderOptions.cs similarity index 94% rename from src/Microsoft.Framework.WebEncoders.Core/WebEncoderOptions.cs rename to src/Microsoft.Extensions.WebEncoders.Core/WebEncoderOptions.cs index 0e06693f3c..b68b05ee50 100644 --- a/src/Microsoft.Framework.WebEncoders.Core/WebEncoderOptions.cs +++ b/src/Microsoft.Extensions.WebEncoders.Core/WebEncoderOptions.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.Framework.WebEncoders +namespace Microsoft.Extensions.WebEncoders { /// /// Specifies options common to all three encoders (HtmlEncode, JavaScriptStringEncode, UrlEncode). diff --git a/src/Microsoft.Framework.WebEncoders.Core/compiler/resources/unicode-defined-chars.bin b/src/Microsoft.Extensions.WebEncoders.Core/compiler/resources/unicode-defined-chars.bin similarity index 100% rename from src/Microsoft.Framework.WebEncoders.Core/compiler/resources/unicode-defined-chars.bin rename to src/Microsoft.Extensions.WebEncoders.Core/compiler/resources/unicode-defined-chars.bin diff --git a/src/Microsoft.Framework.WebEncoders.Core/project.json b/src/Microsoft.Extensions.WebEncoders.Core/project.json similarity index 100% rename from src/Microsoft.Framework.WebEncoders.Core/project.json rename to src/Microsoft.Extensions.WebEncoders.Core/project.json diff --git a/src/Microsoft.Framework.WebEncoders/EncoderServiceCollectionExtensions.cs b/src/Microsoft.Extensions.WebEncoders/EncoderServiceCollectionExtensions.cs similarity index 92% rename from src/Microsoft.Framework.WebEncoders/EncoderServiceCollectionExtensions.cs rename to src/Microsoft.Extensions.WebEncoders/EncoderServiceCollectionExtensions.cs index 13505165d8..0cb40d8a62 100644 --- a/src/Microsoft.Framework.WebEncoders/EncoderServiceCollectionExtensions.cs +++ b/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.Framework.OptionsModel; -using Microsoft.Framework.WebEncoders; +using Microsoft.Extensions.DependencyInjection.Extensions; +using Microsoft.Extensions.OptionsModel; +using Microsoft.Extensions.WebEncoders; -namespace Microsoft.Framework.DependencyInjection +namespace Microsoft.Extensions.DependencyInjection { public static class EncoderServiceCollectionExtensions { diff --git a/src/Microsoft.Framework.WebEncoders/Microsoft.Framework.WebEncoders.xproj b/src/Microsoft.Extensions.WebEncoders/Microsoft.Extensions.WebEncoders.xproj similarity index 100% rename from src/Microsoft.Framework.WebEncoders/Microsoft.Framework.WebEncoders.xproj rename to src/Microsoft.Extensions.WebEncoders/Microsoft.Extensions.WebEncoders.xproj diff --git a/src/Microsoft.Framework.WebEncoders/Properties/AssemblyInfo.cs b/src/Microsoft.Extensions.WebEncoders/Properties/AssemblyInfo.cs similarity index 100% rename from src/Microsoft.Framework.WebEncoders/Properties/AssemblyInfo.cs rename to src/Microsoft.Extensions.WebEncoders/Properties/AssemblyInfo.cs diff --git a/src/Microsoft.Framework.WebEncoders/project.json b/src/Microsoft.Extensions.WebEncoders/project.json similarity index 69% rename from src/Microsoft.Framework.WebEncoders/project.json rename to src/Microsoft.Extensions.WebEncoders/project.json index d2a1c401fb..7cd8aac9ad 100644 --- a/src/Microsoft.Framework.WebEncoders/project.json +++ b/src/Microsoft.Extensions.WebEncoders/project.json @@ -9,9 +9,9 @@ "warningsAsErrors": true }, "dependencies": { - "Microsoft.Framework.DependencyInjection.Abstractions": "1.0.0-*", - "Microsoft.Framework.OptionsModel": "1.0.0-*", - "Microsoft.Framework.WebEncoders.Core": "1.0.0-*" + "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-*", + "Microsoft.Extensions.OptionsModel": "1.0.0-*", + "Microsoft.Extensions.WebEncoders.Core": "1.0.0-*" }, "frameworks": { "net45": { }, diff --git a/test/Microsoft.AspNet.Html.Abstractions.Test/HtmlContentBuilderExtensionsTest.cs b/test/Microsoft.AspNet.Html.Abstractions.Test/HtmlContentBuilderExtensionsTest.cs index a32724ca8f..660b1a4dc6 100644 --- a/test/Microsoft.AspNet.Html.Abstractions.Test/HtmlContentBuilderExtensionsTest.cs +++ b/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 diff --git a/test/Microsoft.AspNet.Html.Abstractions.Test/project.json b/test/Microsoft.AspNet.Html.Abstractions.Test/project.json index 4536c6b8d2..789d27a38d 100644 --- a/test/Microsoft.AspNet.Html.Abstractions.Test/project.json +++ b/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" }, diff --git a/test/Microsoft.AspNet.Http.Extensions.Tests/ResponseExtensionTests.cs b/test/Microsoft.AspNet.Http.Extensions.Tests/ResponseExtensionTests.cs index 2565ef1f80..383f75315e 100644 --- a/test/Microsoft.AspNet.Http.Extensions.Tests/ResponseExtensionTests.cs +++ b/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 diff --git a/test/Microsoft.AspNet.Http.Extensions.Tests/project.json b/test/Microsoft.AspNet.Http.Extensions.Tests/project.json index bac140231f..2b7a5ed450 100644 --- a/test/Microsoft.AspNet.Http.Extensions.Tests/project.json +++ b/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": { diff --git a/test/Microsoft.AspNet.Http.Tests/DefaultHttpRequestTests.cs b/test/Microsoft.AspNet.Http.Tests/DefaultHttpRequestTests.cs index 4a767821ff..33f6a3ac9c 100644 --- a/test/Microsoft.AspNet.Http.Tests/DefaultHttpRequestTests.cs +++ b/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 diff --git a/test/Microsoft.AspNet.Http.Tests/HeaderDictionaryTests.cs b/test/Microsoft.AspNet.Http.Tests/HeaderDictionaryTests.cs index c353d54d68..d69dd0a129 100644 --- a/test/Microsoft.AspNet.Http.Tests/HeaderDictionaryTests.cs +++ b/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 diff --git a/test/Microsoft.Framework.BufferedHtmlContent.Test/BufferedHtmlContentTest.cs b/test/Microsoft.Extensions.BufferedHtmlContent.Test/BufferedHtmlContentTest.cs similarity index 96% rename from test/Microsoft.Framework.BufferedHtmlContent.Test/BufferedHtmlContentTest.cs rename to test/Microsoft.Extensions.BufferedHtmlContent.Test/BufferedHtmlContentTest.cs index 234da8af9c..e883f84960 100644 --- a/test/Microsoft.Framework.BufferedHtmlContent.Test/BufferedHtmlContentTest.cs +++ b/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 { diff --git a/test/Microsoft.Framework.BufferedHtmlContent.Test/Microsoft.Framework.BufferedHtmlContent.Test.xproj b/test/Microsoft.Extensions.BufferedHtmlContent.Test/Microsoft.Extensions.BufferedHtmlContent.Test.xproj similarity index 88% rename from test/Microsoft.Framework.BufferedHtmlContent.Test/Microsoft.Framework.BufferedHtmlContent.Test.xproj rename to test/Microsoft.Extensions.BufferedHtmlContent.Test/Microsoft.Extensions.BufferedHtmlContent.Test.xproj index a112b34876..a091460b76 100644 --- a/test/Microsoft.Framework.BufferedHtmlContent.Test/Microsoft.Framework.BufferedHtmlContent.Test.xproj +++ b/test/Microsoft.Extensions.BufferedHtmlContent.Test/Microsoft.Extensions.BufferedHtmlContent.Test.xproj @@ -1,4 +1,4 @@ - + 14.0 @@ -7,7 +7,7 @@ 3e5311e2-a73e-40cc-a58c-5a62cead43ae - Microsoft.Framework.BufferedHtmlContent.Test + Microsoft.Extensions.BufferedHtmlContent.Test ..\..\artifacts\obj\$(MSBuildProjectName) ..\..\artifacts\bin\$(MSBuildProjectName)\ diff --git a/test/Microsoft.Framework.BufferedHtmlContent.Test/project.json b/test/Microsoft.Extensions.BufferedHtmlContent.Test/project.json similarity index 64% rename from test/Microsoft.Framework.BufferedHtmlContent.Test/project.json rename to test/Microsoft.Extensions.BufferedHtmlContent.Test/project.json index 8064ceed44..0f4d9b84b3 100644 --- a/test/Microsoft.Framework.BufferedHtmlContent.Test/project.json +++ b/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" }, diff --git a/test/Microsoft.Framework.WebEncoders.Tests/AllowedCharsBitmapTests.cs b/test/Microsoft.Extensions.WebEncoders.Tests/AllowedCharsBitmapTests.cs similarity index 98% rename from test/Microsoft.Framework.WebEncoders.Tests/AllowedCharsBitmapTests.cs rename to test/Microsoft.Extensions.WebEncoders.Tests/AllowedCharsBitmapTests.cs index faf6d4c982..24cdb75568 100644 --- a/test/Microsoft.Framework.WebEncoders.Tests/AllowedCharsBitmapTests.cs +++ b/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 { diff --git a/test/Microsoft.Framework.WebEncoders.Tests/CodePointFilterTests.cs b/test/Microsoft.Extensions.WebEncoders.Tests/CodePointFilterTests.cs similarity index 99% rename from test/Microsoft.Framework.WebEncoders.Tests/CodePointFilterTests.cs rename to test/Microsoft.Extensions.WebEncoders.Tests/CodePointFilterTests.cs index 64e517a6f0..39624b1fb1 100644 --- a/test/Microsoft.Framework.WebEncoders.Tests/CodePointFilterTests.cs +++ b/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 { diff --git a/test/Microsoft.Framework.WebEncoders.Tests/CommonTestEncoder.cs b/test/Microsoft.Extensions.WebEncoders.Tests/CommonTestEncoder.cs similarity index 98% rename from test/Microsoft.Framework.WebEncoders.Tests/CommonTestEncoder.cs rename to test/Microsoft.Extensions.WebEncoders.Tests/CommonTestEncoder.cs index 9f24eae292..b78d91e8c2 100644 --- a/test/Microsoft.Framework.WebEncoders.Tests/CommonTestEncoder.cs +++ b/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 { /// /// Encoder used for unit testing. diff --git a/test/Microsoft.Framework.WebEncoders.Tests/EncoderCommonTests.cs b/test/Microsoft.Extensions.WebEncoders.Tests/EncoderCommonTests.cs similarity index 95% rename from test/Microsoft.Framework.WebEncoders.Tests/EncoderCommonTests.cs rename to test/Microsoft.Extensions.WebEncoders.Tests/EncoderCommonTests.cs index debec372ac..ac9fc8bb28 100644 --- a/test/Microsoft.Framework.WebEncoders.Tests/EncoderCommonTests.cs +++ b/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 { diff --git a/test/Microsoft.Framework.WebEncoders.Tests/EncoderExtensionsTests.cs b/test/Microsoft.Extensions.WebEncoders.Tests/EncoderExtensionsTests.cs similarity index 98% rename from test/Microsoft.Framework.WebEncoders.Tests/EncoderExtensionsTests.cs rename to test/Microsoft.Extensions.WebEncoders.Tests/EncoderExtensionsTests.cs index 5b7797340f..abdc1d9cc2 100644 --- a/test/Microsoft.Framework.WebEncoders.Tests/EncoderExtensionsTests.cs +++ b/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 { diff --git a/test/Microsoft.Framework.WebEncoders.Tests/EncoderServiceCollectionExtensionsTests.cs b/test/Microsoft.Extensions.WebEncoders.Tests/EncoderServiceCollectionExtensionsTests.cs similarity index 97% rename from test/Microsoft.Framework.WebEncoders.Tests/EncoderServiceCollectionExtensionsTests.cs rename to test/Microsoft.Extensions.WebEncoders.Tests/EncoderServiceCollectionExtensionsTests.cs index ff6acd3772..790210be39 100644 --- a/test/Microsoft.Framework.WebEncoders.Tests/EncoderServiceCollectionExtensionsTests.cs +++ b/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 { diff --git a/test/Microsoft.Framework.WebEncoders.Tests/EncoderServiceProviderExtensionsTests.cs b/test/Microsoft.Extensions.WebEncoders.Tests/EncoderServiceProviderExtensionsTests.cs similarity index 98% rename from test/Microsoft.Framework.WebEncoders.Tests/EncoderServiceProviderExtensionsTests.cs rename to test/Microsoft.Extensions.WebEncoders.Tests/EncoderServiceProviderExtensionsTests.cs index 07b23933e1..b62068a941 100644 --- a/test/Microsoft.Framework.WebEncoders.Tests/EncoderServiceProviderExtensionsTests.cs +++ b/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 { diff --git a/test/Microsoft.Framework.WebEncoders.Tests/Entities.cs b/test/Microsoft.Extensions.WebEncoders.Tests/Entities.cs similarity index 96% rename from test/Microsoft.Framework.WebEncoders.Tests/Entities.cs rename to test/Microsoft.Extensions.WebEncoders.Tests/Entities.cs index e10ff951b0..c872b7bf9d 100644 --- a/test/Microsoft.Framework.WebEncoders.Tests/Entities.cs +++ b/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 { diff --git a/test/Microsoft.Framework.WebEncoders.Tests/Extensions.cs b/test/Microsoft.Extensions.WebEncoders.Tests/Extensions.cs similarity index 94% rename from test/Microsoft.Framework.WebEncoders.Tests/Extensions.cs rename to test/Microsoft.Extensions.WebEncoders.Tests/Extensions.cs index 14d0f21e9d..97b157b7d5 100644 --- a/test/Microsoft.Framework.WebEncoders.Tests/Extensions.cs +++ b/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 { diff --git a/test/Microsoft.Framework.WebEncoders.Tests/HtmlEncoderTests.cs b/test/Microsoft.Extensions.WebEncoders.Tests/HtmlEncoderTests.cs similarity index 99% rename from test/Microsoft.Framework.WebEncoders.Tests/HtmlEncoderTests.cs rename to test/Microsoft.Extensions.WebEncoders.Tests/HtmlEncoderTests.cs index 471ea4f385..8fe2ddde62 100644 --- a/test/Microsoft.Framework.WebEncoders.Tests/HtmlEncoderTests.cs +++ b/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 { diff --git a/test/Microsoft.Framework.WebEncoders.Tests/JavaScriptStringEncoderTests.cs b/test/Microsoft.Extensions.WebEncoders.Tests/JavaScriptStringEncoderTests.cs similarity index 99% rename from test/Microsoft.Framework.WebEncoders.Tests/JavaScriptStringEncoderTests.cs rename to test/Microsoft.Extensions.WebEncoders.Tests/JavaScriptStringEncoderTests.cs index 4acee36980..b4d4f250de 100644 --- a/test/Microsoft.Framework.WebEncoders.Tests/JavaScriptStringEncoderTests.cs +++ b/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 { diff --git a/test/Microsoft.Framework.WebEncoders.Tests/Microsoft.Framework.WebEncoders.Tests.xproj b/test/Microsoft.Extensions.WebEncoders.Tests/Microsoft.Extensions.WebEncoders.Tests.xproj similarity index 100% rename from test/Microsoft.Framework.WebEncoders.Tests/Microsoft.Framework.WebEncoders.Tests.xproj rename to test/Microsoft.Extensions.WebEncoders.Tests/Microsoft.Extensions.WebEncoders.Tests.xproj diff --git a/test/Microsoft.Framework.WebEncoders.Tests/ParsedEntity.cs b/test/Microsoft.Extensions.WebEncoders.Tests/ParsedEntity.cs similarity index 90% rename from test/Microsoft.Framework.WebEncoders.Tests/ParsedEntity.cs rename to test/Microsoft.Extensions.WebEncoders.Tests/ParsedEntity.cs index e7bf1f49a6..b52ee7f04f 100644 --- a/test/Microsoft.Framework.WebEncoders.Tests/ParsedEntity.cs +++ b/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 { diff --git a/test/Microsoft.Framework.WebEncoders.Tests/UnicodeEncoderBaseTests.cs b/test/Microsoft.Extensions.WebEncoders.Tests/UnicodeEncoderBaseTests.cs similarity index 99% rename from test/Microsoft.Framework.WebEncoders.Tests/UnicodeEncoderBaseTests.cs rename to test/Microsoft.Extensions.WebEncoders.Tests/UnicodeEncoderBaseTests.cs index 6ee48c5954..1c088e8b16 100644 --- a/test/Microsoft.Framework.WebEncoders.Tests/UnicodeEncoderBaseTests.cs +++ b/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 { diff --git a/test/Microsoft.Framework.WebEncoders.Tests/UnicodeHelpersTests.cs b/test/Microsoft.Extensions.WebEncoders.Tests/UnicodeHelpersTests.cs similarity index 99% rename from test/Microsoft.Framework.WebEncoders.Tests/UnicodeHelpersTests.cs rename to test/Microsoft.Extensions.WebEncoders.Tests/UnicodeHelpersTests.cs index cf170bf3f8..57ba091465 100644 --- a/test/Microsoft.Framework.WebEncoders.Tests/UnicodeHelpersTests.cs +++ b/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 { diff --git a/test/Microsoft.Framework.WebEncoders.Tests/UnicodeRangeTests.cs b/test/Microsoft.Extensions.WebEncoders.Tests/UnicodeRangeTests.cs similarity index 98% rename from test/Microsoft.Framework.WebEncoders.Tests/UnicodeRangeTests.cs rename to test/Microsoft.Extensions.WebEncoders.Tests/UnicodeRangeTests.cs index fd64048673..dd9302f2a1 100644 --- a/test/Microsoft.Framework.WebEncoders.Tests/UnicodeRangeTests.cs +++ b/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 { diff --git a/test/Microsoft.Framework.WebEncoders.Tests/UnicodeRangesTests.cs b/test/Microsoft.Extensions.WebEncoders.Tests/UnicodeRangesTests.cs similarity index 99% rename from test/Microsoft.Framework.WebEncoders.Tests/UnicodeRangesTests.cs rename to test/Microsoft.Extensions.WebEncoders.Tests/UnicodeRangesTests.cs index 208eb34c6b..ddb4b1c646 100644 --- a/test/Microsoft.Framework.WebEncoders.Tests/UnicodeRangesTests.cs +++ b/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 { diff --git a/test/Microsoft.Framework.WebEncoders.Tests/UrlEncoderTests.cs b/test/Microsoft.Extensions.WebEncoders.Tests/UrlEncoderTests.cs similarity index 99% rename from test/Microsoft.Framework.WebEncoders.Tests/UrlEncoderTests.cs rename to test/Microsoft.Extensions.WebEncoders.Tests/UrlEncoderTests.cs index 54ad81839e..2f31e0e16f 100644 --- a/test/Microsoft.Framework.WebEncoders.Tests/UrlEncoderTests.cs +++ b/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 { diff --git a/test/Microsoft.Framework.WebEncoders.Tests/project.json b/test/Microsoft.Extensions.WebEncoders.Tests/project.json similarity index 79% rename from test/Microsoft.Framework.WebEncoders.Tests/project.json rename to test/Microsoft.Extensions.WebEncoders.Tests/project.json index c5c1f52c94..87d9e98e9c 100644 --- a/test/Microsoft.Framework.WebEncoders.Tests/project.json +++ b/test/Microsoft.Extensions.WebEncoders.Tests/project.json @@ -1,7 +1,7 @@ { "dependencies": { - "Microsoft.Framework.DependencyInjection": "1.0.0-*", - "Microsoft.Framework.WebEncoders": "1.0.0-*", + "Microsoft.Extensions.DependencyInjection": "1.0.0-*", + "Microsoft.Extensions.WebEncoders": "1.0.0-*", "Newtonsoft.Json": "6.0.6", "xunit.runner.aspnet": "2.0.0-aspnet-*" }, diff --git a/unicode/how-to-update.txt b/unicode/how-to-update.txt index 246e84891a..5014ea151b 100644 --- a/unicode/how-to-update.txt +++ b/unicode/how-to-update.txt @@ -18,7 +18,7 @@ the WebEncoders project. Running this will drop a file unicode-defined-chars.bin into the output folder. Move this file into the following directory, overwriting the existing file in that directory: - src\Microsoft.Framework.WebEncoders.Core\compiler\resources + src\Microsoft.Extensions.WebEncoders.Core\compiler\resources 4) Open the Generators solution and run the UnicodeTablesGenerator project. Running this will drop two files UnicodeRanges.generated.txt and @@ -33,12 +33,12 @@ the WebEncoders project. - Low Surrogates (U+DC00..U+DFFF) - Private Use Area (U+E000..U+F8FF) -6) Open src\Microsoft.Framework.WebEncoders.Core\UnicodeRanges.generated.cs in +6) Open src\Microsoft.Extensions.WebEncoders.Core\UnicodeRanges.generated.cs in your IDE. Delete everything within the partial class definition and replace it with the contents of UnicodeRanges.generated.txt. (Remember to remove the blocks mentioned in the previous step, otherwise unit tests will fail.) - Open src\Microsoft.Framework.WebEncoders.Core\UnicodeRanges.cs in your IDE. + Open src\Microsoft.Extensions.WebEncoders.Core\UnicodeRanges.cs in your IDE. Update the doc comment at the top of the class to reflect the appropriate version of the Unicode specification. @@ -48,14 +48,14 @@ the WebEncoders project. See step (5) for the list of which blocks must be removed. Then re-save this file. -8) Open test\Microsoft.Framework.WebEncoders.Tests\UnicodeRangesTests.cs in +8) Open test\Microsoft.Extensions.WebEncoders.Tests\UnicodeRangesTests.cs in your IDE. Delete all of the [InlineData] attributes on the Range_Unicode test, then paste the contents of UnicodeRangesTests.generated.txt in to restore the new [InlineData] list. IMPORTANT: Don't delete the [Theory] attribute on this method! -9) Open test\Microsoft.Framework.WebEncoders.Tests\UnicodeHelpersTests.cs in +9) Open test\Microsoft.Extensions.WebEncoders.Tests\UnicodeHelpersTests.cs in your IDE. Scroll to the bottom of the ReadListOfDefinedCharacters method, and you'll see a section where the test special-cases CJK Ideographs and Hangul Syllables. As more characters are added to the Unicode specification @@ -77,14 +77,14 @@ reflect the version you just submitted. To recap, the files you should check in are: -src\Microsoft.Framework.WebEncoders.Core\compiler\resources\ +src\Microsoft.Extensions.WebEncoders.Core\compiler\resources\ unicode-defined-chars.bin -src\Microsoft.Framework.WebEncoders.Core\ +src\Microsoft.Extensions.WebEncoders.Core\ UnicodeRanges.cs UnicodeRanges.generated.cs -test\Microsoft.Framework.WebEncoders.Tests\ +test\Microsoft.Extensions.WebEncoders.Tests\ UnicodeHelpersTests.cs (if necessary, see step 9) UnicodeRangesTests.cs