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

Commit 2eb731d

Browse files
TratcherTratcher
committed
Build updates
1 parent 19a93d5 commit 2eb731d

File tree

8 files changed

+102
-66
lines changed

8 files changed

+102
-66
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
using System.Diagnostics;
66
using System.Globalization;
77
using System.IO;
8-
using System.Text;
98
using System.Text.Encodings.Web;
10-
using Microsoft.Extensions.WebEncoders;
119

1210
namespace Microsoft.AspNet.Html.Abstractions
1311
{

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
using System.IO;
55
using System.Text.Encodings.Web;
6-
using Microsoft.Extensions.WebEncoders;
76

87
namespace Microsoft.AspNet.Html.Abstractions
98
{

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,15 @@
99
"warningsAsErrors": true
1010
},
1111
"dependencies": {
12-
"Microsoft.Extensions.WebEncoders.Core": "1.0.0-*"
12+
"System.Text.Encodings.Web": "4.0.0-beta-*"
1313
},
1414
"frameworks": {
15-
"net451": {},
15+
"net451": {
16+
"frameworkAssemblies": {
17+
"System.IO": "",
18+
"System.Runtime": ""
19+
}
20+
},
1621
"dotnet5.4": {
1722
"dependencies": {
1823
"System.Resources.ResourceManager": "4.0.1-beta-*"

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
"dotnet5.4": {
2020
"dependencies": {
2121
"System.Diagnostics.Debug": "4.0.11-beta-*",
22-
"System.Text.Encoding": "4.0.11-beta-*"
22+
"System.Text.Encoding": "4.0.11-beta-*",
23+
"System.Threading": "4.0.11-beta-*"
2324
}
2425
}
2526
}

‎src/Microsoft.Extensions.WebEncoders/Testing/HtmlTestEncoder.cs

Lines changed: 28 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

4+
using System.IO;
45
using System.Text.Encodings.Web;
56

67
namespace Microsoft.Extensions.WebEncoders
@@ -10,36 +11,44 @@ namespace Microsoft.Extensions.WebEncoders
1011
/// </summary>
1112
public sealed class HtmlTestEncoder : HtmlEncoder
1213
{
13-
public override unsafe int FindFirstCharacterToEncode(char* text, int textLength)
14+
public override int MaxOutputCharactersPerInputCharacter
1415
{
15-
if (textLength > 0)
16-
{
17-
return 0;
18-
}
19-
return -1;
16+
get { return 1; }
2017
}
2118

22-
public override unsafe bool TryEncodeUnicodeScalar(int unicodeScalar, char* buffer, int bufferLength, out int numberOfCharactersWritten)
19+
public override string Encode(string value)
2320
{
24-
if (bufferLength < 2)
25-
{
26-
numberOfCharactersWritten = 0;
27-
return false;
28-
}
29-
*buffer = '_';
30-
*(buffer + 1) = (char)unicodeScalar;
31-
numberOfCharactersWritten = 2;
32-
return true;
21+
return $"HtmlEncode[[{value}]]";
3322
}
3423

35-
public override int MaxOutputCharactersPerInputCharacter
24+
public override void Encode(TextWriter output, char[] value, int startIndex, int characterCount)
3625
{
37-
get { return 2; } // "_v_a_l_u_e"
26+
output.Write("HtmlEncode[[");
27+
output.Write(value, startIndex, characterCount);
28+
output.Write("]]");
29+
}
30+
31+
public override void Encode(TextWriter output, string value, int startIndex, int characterCount)
32+
{
33+
output.Write("HtmlEncode[[");
34+
output.Write(value.Substring(startIndex, characterCount));
35+
output.Write("]]");
3836
}
3937

4038
public override bool WillEncode(int unicodeScalar)
4139
{
42-
return true;
40+
return false;
41+
}
42+
43+
public override unsafe int FindFirstCharacterToEncode(char* text, int textLength)
44+
{
45+
return -1;
46+
}
47+
48+
public override unsafe bool TryEncodeUnicodeScalar(int unicodeScalar, char* buffer, int bufferLength, out int numberOfCharactersWritten)
49+
{
50+
numberOfCharactersWritten = 0;
51+
return false;
4352
}
4453
}
4554
}

‎src/Microsoft.Extensions.WebEncoders/Testing/JavaScriptTestEncoder.cs

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,54 @@
11
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

4+
using System.IO;
45
using System.Text.Encodings.Web;
56

67
namespace Microsoft.Extensions.WebEncoders
78
{
89
/// <summary>
910
/// Encoder used for unit testing.
1011
/// </summary>
11-
internal sealed class JavaScriptTestEncoder : JavaScriptEncoder
12+
public class JavaScriptTestEncoder : JavaScriptEncoder
1213
{
13-
public override unsafe int FindFirstCharacterToEncode(char* text, int textLength)
14+
public override int MaxOutputCharactersPerInputCharacter
1415
{
15-
if (textLength > 0)
16-
{
17-
return 0;
18-
}
19-
return -1;
16+
get { return 1; }
2017
}
2118

22-
public override unsafe bool TryEncodeUnicodeScalar(int unicodeScalar, char* buffer, int bufferLength, out int numberOfCharactersWritten)
19+
public override string Encode(string value)
2320
{
24-
if (bufferLength < 2)
25-
{
26-
numberOfCharactersWritten = 0;
27-
return false;
28-
}
29-
*buffer = '_';
30-
*(buffer + 1) = (char)unicodeScalar;
31-
numberOfCharactersWritten = 2;
32-
return true;
21+
return $"JavaScriptEncode[[{value}]]";
3322
}
3423

35-
public override int MaxOutputCharactersPerInputCharacter
24+
public override void Encode(TextWriter output, char[] value, int startIndex, int characterCount)
3625
{
37-
get { return 2; } // "_v_a_l_u_e"
26+
output.Write("JavaScriptEncode[[");
27+
output.Write(value, startIndex, characterCount);
28+
output.Write("]]");
29+
}
30+
31+
public override void Encode(TextWriter output, string value, int startIndex, int characterCount)
32+
{
33+
output.Write("JavaScriptEncode[[");
34+
output.Write(value.Substring(startIndex, characterCount));
35+
output.Write("]]");
3836
}
3937

4038
public override bool WillEncode(int unicodeScalar)
4139
{
42-
return true;
40+
return false;
41+
}
42+
43+
public override unsafe int FindFirstCharacterToEncode(char* text, int textLength)
44+
{
45+
return -1;
46+
}
47+
48+
public override unsafe bool TryEncodeUnicodeScalar(int unicodeScalar, char* buffer, int bufferLength, out int numberOfCharactersWritten)
49+
{
50+
numberOfCharactersWritten = 0;
51+
return false;
4352
}
4453
}
4554
}

‎src/Microsoft.Extensions.WebEncoders/Testing/UrlTestEncoder.cs

Lines changed: 28 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

4+
using System.IO;
45
using System.Text.Encodings.Web;
56

67
namespace Microsoft.Extensions.WebEncoders
@@ -10,36 +11,44 @@ namespace Microsoft.Extensions.WebEncoders
1011
/// </summary>
1112
internal sealed class UrlTestEncoder : UrlEncoder
1213
{
13-
public override unsafe int FindFirstCharacterToEncode(char* text, int textLength)
14+
public override int MaxOutputCharactersPerInputCharacter
1415
{
15-
if (textLength > 0)
16-
{
17-
return 0;
18-
}
19-
return -1;
16+
get { return 1; }
2017
}
2118

22-
public override unsafe bool TryEncodeUnicodeScalar(int unicodeScalar, char* buffer, int bufferLength, out int numberOfCharactersWritten)
19+
public override string Encode(string value)
2320
{
24-
if (bufferLength < 2)
25-
{
26-
numberOfCharactersWritten = 0;
27-
return false;
28-
}
29-
*buffer = '_';
30-
*(buffer + 1) = (char)unicodeScalar;
31-
numberOfCharactersWritten = 2;
32-
return true;
21+
return $"UrlEncode[[{value}]]";
3322
}
3423

35-
public override int MaxOutputCharactersPerInputCharacter
24+
public override void Encode(TextWriter output, char[] value, int startIndex, int characterCount)
3625
{
37-
get { return 2; } // "_v_a_l_u_e"
26+
output.Write("UrlEncode[[");
27+
output.Write(value, startIndex, characterCount);
28+
output.Write("]]");
29+
}
30+
31+
public override void Encode(TextWriter output, string value, int startIndex, int characterCount)
32+
{
33+
output.Write("UrlEncode[[");
34+
output.Write(value.Substring(startIndex, characterCount));
35+
output.Write("]]");
3836
}
3937

4038
public override bool WillEncode(int unicodeScalar)
4139
{
42-
return true;
40+
return false;
41+
}
42+
43+
public override unsafe int FindFirstCharacterToEncode(char* text, int textLength)
44+
{
45+
return -1;
46+
}
47+
48+
public override unsafe bool TryEncodeUnicodeScalar(int unicodeScalar, char* buffer, int bufferLength, out int numberOfCharactersWritten)
49+
{
50+
numberOfCharactersWritten = 0;
51+
return false;
4352
}
4453
}
4554
}

‎src/Microsoft.Extensions.WebEncoders/project.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,21 @@
66
"url": "git://github.com/aspnet/httpabstractions"
77
},
88
"compilationOptions": {
9-
"warningsAsErrors": true
9+
"warningsAsErrors": true,
10+
"allowUnsafe": true
1011
},
1112
"dependencies": {
1213
"Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-*",
1314
"Microsoft.Extensions.OptionsModel": "1.0.0-*",
1415
"System.Text.Encodings.Web": "4.0.0-beta-*"
1516
},
1617
"frameworks": {
17-
"net451": {},
18+
"net451": {
19+
"frameworkAssemblies": {
20+
"System.IO": "",
21+
"System.Runtime": ""
22+
}
23+
},
1824
"dotnet5.4": {}
1925
}
2026
}

0 commit comments

Comments
 (0)