Skip to content

Commit 46f64df

Browse files
committed
* Remove EncoderServiceProviderExtensions
1 parent b423955 commit 46f64df

File tree

5 files changed

+17
-162
lines changed

5 files changed

+17
-162
lines changed

src/Microsoft.Extensions.WebEncoders/EncoderServiceCollectionExtensions.cs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@ namespace Microsoft.Extensions.DependencyInjection
1111
{
1212
public static class EncoderServiceCollectionExtensions
1313
{
14+
/// <summary>
15+
/// Adds <see cref="HtmlEncoder"/>, <see cref="JavaScriptEncoder"/> and <see cref="UrlEncoder"/>
16+
/// to the specified <paramref name="services" />.
17+
/// </summary>
18+
/// <param name="services">The <see cref="IServiceCollection"/>.</param>
19+
/// <returns>The <see cref="IServiceCollection"/> instance after the encoders have been added.</returns>
1420
public static IServiceCollection AddWebEncoders(this IServiceCollection services)
1521
{
1622
if (services == null)
@@ -21,6 +27,13 @@ public static IServiceCollection AddWebEncoders(this IServiceCollection services
2127
return AddWebEncoders(services, configureOptions: null);
2228
}
2329

30+
/// <summary>
31+
/// Adds <see cref="HtmlEncoder"/>, <see cref="JavaScriptEncoder"/> and <see cref="UrlEncoder"/>
32+
/// to the specified <paramref name="services" />.
33+
/// </summary>
34+
/// <param name="services">The <see cref="IServiceCollection"/>.</param>
35+
/// <param name="configureOptions">A callback to configure <see cref="WebEncoderOptions"/>.</param>
36+
/// <returns>The <see cref="IServiceCollection"/> instance after the encoders have been added.</returns>
2437
public static IServiceCollection AddWebEncoders(this IServiceCollection services, Action<WebEncoderOptions> configureOptions)
2538
{
2639
if (services == null)

src/Microsoft.Extensions.WebEncoders/EncoderServiceProviderExtensions.cs

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

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@ public void AddWebEncoders_DoesNotOverrideExistingRegisteredEncoders()
7777
// Assert
7878
var serviceProvider = serviceCollection.BuildServiceProvider();
7979

80-
var htmlEncoder = serviceProvider.GetHtmlEncoder();
80+
var htmlEncoder = serviceProvider.GetRequiredService<HtmlEncoder>();
8181
Assert.Equal("HtmlEncode[[abcde]]", htmlEncoder.Encode("abcde"));
8282

83-
var javaScriptEncoder = serviceProvider.GetJavaScriptEncoder();
83+
var javaScriptEncoder = serviceProvider.GetRequiredService<JavaScriptEncoder>();
8484
Assert.Equal("JavaScriptEncode[[abcde]]", javaScriptEncoder.Encode("abcde"));
8585

86-
var urlEncoder = serviceProvider.GetUrlEncoder();
86+
var urlEncoder = serviceProvider.GetRequiredService<UrlEncoder>();
8787
Assert.Equal("a%62c%64e", urlEncoder.Encode("abcde"));
8888
}
8989
}

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

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

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"dependencies": {
33
"Microsoft.Extensions.DependencyInjection": "1.0.0-*",
44
"Microsoft.Extensions.WebEncoders": "1.0.0-*",
5-
"Newtonsoft.Json": "6.0.6",
65
"xunit.runner.aspnet": "2.0.0-aspnet-*"
76
},
87
"commands": {
@@ -15,10 +14,6 @@
1514
},
1615
"frameworks": {
1716
"dnx451": { },
18-
"dnxcore50": {
19-
"dependencies": {
20-
"System.Text.Encoding.Extensions": "4.0.11-*"
21-
}
22-
}
17+
"dnxcore50": { }
2318
}
2419
}

0 commit comments

Comments
 (0)