Skip to content
This repository was archived by the owner on Nov 20, 2018. It is now read-only.

Commit 19a93d5

Browse files
TratcherTratcher
committed
Don't wrap the encoders.
1 parent da88e89 commit 19a93d5

29 files changed

+217
-507
lines changed

‎HttpAbstractions.sln

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
Microsoft Visual Studio Solution File, Format Version 12.00
32
# Visual Studio 14
43
VisualStudioVersion = 14.0.23107.0
@@ -39,8 +38,6 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.WebEnc
3938
EndProject
4039
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}"
4140
EndProject
42-
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}"
43-
EndProject
4441
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}"
4542
EndProject
4643
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{982F09D8-621E-4872-BA7B-BBDEA47D1EFD}"
@@ -231,18 +228,6 @@ Global
231228
{7AE2731D-43CD-4CF8-850A-4914DE2CE930}.Release|Mixed Platforms.Build.0 = Release|Any CPU
232229
{7AE2731D-43CD-4CF8-850A-4914DE2CE930}.Release|x86.ActiveCfg = Release|Any CPU
233230
{7AE2731D-43CD-4CF8-850A-4914DE2CE930}.Release|x86.Build.0 = Release|Any CPU
234-
{BE9112CB-D87D-4080-9CC3-24492D49CBE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
235-
{BE9112CB-D87D-4080-9CC3-24492D49CBE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
236-
{BE9112CB-D87D-4080-9CC3-24492D49CBE6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
237-
{BE9112CB-D87D-4080-9CC3-24492D49CBE6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
238-
{BE9112CB-D87D-4080-9CC3-24492D49CBE6}.Debug|x86.ActiveCfg = Debug|Any CPU
239-
{BE9112CB-D87D-4080-9CC3-24492D49CBE6}.Debug|x86.Build.0 = Debug|Any CPU
240-
{BE9112CB-D87D-4080-9CC3-24492D49CBE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
241-
{BE9112CB-D87D-4080-9CC3-24492D49CBE6}.Release|Any CPU.Build.0 = Release|Any CPU
242-
{BE9112CB-D87D-4080-9CC3-24492D49CBE6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
243-
{BE9112CB-D87D-4080-9CC3-24492D49CBE6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
244-
{BE9112CB-D87D-4080-9CC3-24492D49CBE6}.Release|x86.ActiveCfg = Release|Any CPU
245-
{BE9112CB-D87D-4080-9CC3-24492D49CBE6}.Release|x86.Build.0 = Release|Any CPU
246231
{68A28E4A-3ADE-4187-9625-4FF185887CB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
247232
{68A28E4A-3ADE-4187-9625-4FF185887CB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
248233
{68A28E4A-3ADE-4187-9625-4FF185887CB3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -324,7 +309,6 @@ Global
324309
{E6BB7AD1-BD10-4A23-B780-F4A86ADF00D1} = {F31FF137-390C-49BF-A3BD-7C6ED3597C21}
325310
{DD2CE416-765E-4000-A03E-C2FF165DA1B6} = {A5A15F1C-885A-452A-A731-B0173DDBD913}
326311
{7AE2731D-43CD-4CF8-850A-4914DE2CE930} = {F31FF137-390C-49BF-A3BD-7C6ED3597C21}
327-
{BE9112CB-D87D-4080-9CC3-24492D49CBE6} = {A5A15F1C-885A-452A-A731-B0173DDBD913}
328312
{68A28E4A-3ADE-4187-9625-4FF185887CB3} = {A5A15F1C-885A-452A-A731-B0173DDBD913}
329313
{1D0764B4-1DEB-4232-A714-D4B7E846918A} = {982F09D8-621E-4872-BA7B-BBDEA47D1EFD}
330314
{2D187B88-94BD-4A39-AC97-F8F8B9363301} = {F31FF137-390C-49BF-A3BD-7C6ED3597C21}

‎src/Microsoft.AspNet.Html.Abstractions/HtmlContentBuilderExtensions.cs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
using System.Diagnostics;
66
using System.Globalization;
77
using System.IO;
8+
using System.Text;
9+
using System.Text.Encodings.Web;
810
using Microsoft.Extensions.WebEncoders;
911

1012
namespace Microsoft.AspNet.Html.Abstractions
@@ -197,7 +199,7 @@ public HtmlEncodedString(string value)
197199
_value = value;
198200
}
199201

200-
public void WriteTo(TextWriter writer, IHtmlEncoder encoder)
202+
public void WriteTo(TextWriter writer, HtmlEncoder encoder)
201203
{
202204
writer.Write(_value);
203205
}
@@ -206,7 +208,7 @@ private string DebuggerToString()
206208
{
207209
using (var writer = new StringWriter())
208210
{
209-
WriteTo(writer, HtmlEncoderWrapper.Default);
211+
WriteTo(writer, HtmlEncoder.Default);
210212
return writer.ToString();
211213
}
212214
}
@@ -234,7 +236,7 @@ public HtmlFormatString(IFormatProvider formatProvider, string format, object[]
234236
_args = args;
235237
}
236238

237-
public void WriteTo(TextWriter writer, IHtmlEncoder encoder)
239+
public void WriteTo(TextWriter writer, HtmlEncoder encoder)
238240
{
239241
if (writer == null)
240242
{
@@ -254,7 +256,7 @@ private string DebuggerToString()
254256
{
255257
using (var writer = new StringWriter())
256258
{
257-
WriteTo(writer, HtmlEncoderWrapper.Default);
259+
WriteTo(writer, HtmlEncoder.Default);
258260
return writer.ToString();
259261
}
260262
}
@@ -269,10 +271,10 @@ private string DebuggerToString()
269271
// https://msdn.microsoft.com/en-us/library/system.string.format(v=vs.110).aspx#Format6_Example
270272
private class EncodingFormatProvider : IFormatProvider, ICustomFormatter
271273
{
272-
private readonly IHtmlEncoder _encoder;
274+
private readonly HtmlEncoder _encoder;
273275
private readonly IFormatProvider _formatProvider;
274276

275-
public EncodingFormatProvider(IFormatProvider formatProvider, IHtmlEncoder encoder)
277+
public EncodingFormatProvider(IFormatProvider formatProvider, HtmlEncoder encoder)
276278
{
277279
Debug.Assert(formatProvider != null);
278280
Debug.Assert(encoder != null);

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System.IO;
5+
using System.Text.Encodings.Web;
56
using Microsoft.Extensions.WebEncoders;
67

78
namespace Microsoft.AspNet.Html.Abstractions
@@ -16,7 +17,7 @@ public interface IHtmlContent
1617
/// to the specified <paramref name="writer"/>.
1718
/// </summary>
1819
/// <param name="writer">The <see cref="TextWriter"/> to which the content is written.</param>
19-
/// <param name="encoder">The <see cref="IHtmlEncoder"/> which encodes the content to be written.</param>
20-
void WriteTo(TextWriter writer, IHtmlEncoder encoder);
20+
/// <param name="encoder">The <see cref="HtmlEncoder"/> which encodes the content to be written.</param>
21+
void WriteTo(TextWriter writer, HtmlEncoder encoder);
2122
}
2223
}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using System.Collections.Generic;
66
using System.Diagnostics;
77
using System.IO;
8+
using System.Text.Encodings.Web;
89
using Microsoft.AspNet.Html.Abstractions;
910
using Microsoft.Extensions.WebEncoders;
1011

@@ -64,7 +65,7 @@ public IHtmlContentBuilder Clear()
6465
}
6566

6667
/// <inheritdoc />
67-
public void WriteTo(TextWriter writer, IHtmlEncoder encoder)
68+
public void WriteTo(TextWriter writer, HtmlEncoder encoder)
6869
{
6970
if (writer == null)
7071
{
@@ -100,7 +101,7 @@ private string DebuggerToString()
100101
{
101102
using (var writer = new StringWriter())
102103
{
103-
WriteTo(writer, HtmlEncoderWrapper.Default);
104+
WriteTo(writer, HtmlEncoder.Default);
104105
return writer.ToString();
105106
}
106107
}
@@ -116,7 +117,7 @@ public HtmlEncodedString(string value)
116117
_value = value;
117118
}
118119

119-
public void WriteTo(TextWriter writer, IHtmlEncoder encoder)
120+
public void WriteTo(TextWriter writer, HtmlEncoder encoder)
120121
{
121122
writer.Write(_value);
122123
}

‎src/Microsoft.Extensions.WebEncoders.Core/HtmlEncoderWrapper.cs

Lines changed: 0 additions & 45 deletions
This file was deleted.

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

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎src/Microsoft.Extensions.WebEncoders.Core/IJavaScriptEncoder.cs

Lines changed: 0 additions & 40 deletions
This file was deleted.

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

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎src/Microsoft.Extensions.WebEncoders.Core/JavaScriptEncoderWrapper.cs

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎src/Microsoft.Extensions.WebEncoders.Core/Microsoft.Extensions.WebEncoders.Core.xproj

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)