diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/AttributeRoutingTest.cs b/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/AttributeRoutingTest.cs index b950e455f4..c9d281b80d 100644 --- a/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/AttributeRoutingTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/AttributeRoutingTest.cs @@ -3,8 +3,6 @@ using System; using System.Collections.Generic; -using System.Text.Encodings.Web; -using System.Reflection; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.Abstractions; @@ -16,9 +14,8 @@ using Microsoft.AspNetCore.Testing; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; -using Microsoft.Extensions.Options; using Microsoft.Extensions.ObjectPool; -using Microsoft.Extensions.WebEncoders.Testing; +using Microsoft.Extensions.Options; using Moq; using Xunit; @@ -180,8 +177,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal var services = new ServiceCollection() .AddSingleton(new DefaultInlineConstraintResolver(routeOptions.Object)) - .AddSingleton() - .AddSingleton(new UrlTestEncoder()); + .AddSingleton(); services.AddSingleton(); services.AddRouting(); diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EditWarehouse.Encoded.html b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EditWarehouse.Encoded.html index d5494a238e..737e085e83 100644 --- a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EditWarehouse.Encoded.html +++ b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EditWarehouse.Encoded.html @@ -1,6 +1,6 @@ -
+
HtmlEncode[[City_1]] diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Index.Encoded.html b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Index.Encoded.html index 39438a1bd7..dfed464b45 100644 --- a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Index.Encoded.html +++ b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Index.Encoded.html @@ -1,10 +1,10 @@ @@ -39,32 +39,32 @@
Non-existent Area diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Order.Encoded.html b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Order.Encoded.html index aee1e808a2..4ec3df1116 100644 --- a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Order.Encoded.html +++ b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Order.Encoded.html @@ -1,10 +1,10 @@ - + - +
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.OrderUsingHtmlHelpers.Encoded.html b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.OrderUsingHtmlHelpers.Encoded.html index 7eb0b60878..82eb28c7a5 100644 --- a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.OrderUsingHtmlHelpers.Encoded.html +++ b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.OrderUsingHtmlHelpers.Encoded.html @@ -1,10 +1,10 @@ - + - +
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Product.Encoded.html b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Product.Encoded.html index d40a62e45e..68230861ed 100644 --- a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Product.Encoded.html +++ b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Product.Encoded.html @@ -1,10 +1,10 @@ - + - +
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/RemoteAttributeTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/RemoteAttributeTest.cs index 4f4bbf920c..5c8da2b478 100644 --- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/RemoteAttributeTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/RemoteAttributeTest.cs @@ -2,7 +2,6 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using System.Text.Encodings.Web; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.Abstractions; @@ -19,7 +18,6 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; using Microsoft.Extensions.ObjectPool; using Microsoft.Extensions.Options; -using Microsoft.Extensions.WebEncoders.Testing; using Moq; using Xunit; using Resources = Microsoft.AspNetCore.Mvc.ViewFeatures.Test.Resources; @@ -698,7 +696,7 @@ namespace Microsoft.AspNetCore.Mvc kvp => { Assert.Equal("data-val-remote-url", kvp.Key); - Assert.Equal("/UrlEncode[[Controller]]/UrlEncode[[Action]]", kvp.Value); + Assert.Equal("/Controller/Action", kvp.Value); }); } @@ -723,7 +721,7 @@ namespace Microsoft.AspNetCore.Mvc kvp => { Assert.Equal("data-val-remote-url", kvp.Key); - Assert.Equal("/UrlEncode[[Test]]/UrlEncode[[Controller]]/UrlEncode[[Action]]", kvp.Value); + Assert.Equal("/Test/Controller/Action", kvp.Value); }); } @@ -749,7 +747,7 @@ namespace Microsoft.AspNetCore.Mvc kvp => { Assert.Equal("data-val-remote-url", kvp.Key); - Assert.Equal("/UrlEncode[[Controller]]/UrlEncode[[Action]]", kvp.Value); + Assert.Equal("/Controller/Action", kvp.Value); }); } @@ -775,7 +773,7 @@ namespace Microsoft.AspNetCore.Mvc kvp => { Assert.Equal("data-val-remote-url", kvp.Key); - Assert.Equal("/UrlEncode[[Controller]]/UrlEncode[[Action]]", kvp.Value); + Assert.Equal("/Controller/Action", kvp.Value); }); } @@ -800,7 +798,7 @@ namespace Microsoft.AspNetCore.Mvc kvp => { Assert.Equal("data-val-remote-url", kvp.Key); - Assert.Equal("/UrlEncode[[Test]]/UrlEncode[[Controller]]/UrlEncode[[Action]]", kvp.Value); + Assert.Equal("/Test/Controller/Action", kvp.Value); }); } @@ -825,7 +823,7 @@ namespace Microsoft.AspNetCore.Mvc kvp => { Assert.Equal("data-val-remote-url", kvp.Key); - Assert.Equal("/UrlEncode[[Test]]/UrlEncode[[Controller]]/UrlEncode[[Action]]", kvp.Value); + Assert.Equal("/Test/Controller/Action", kvp.Value); }); } @@ -850,7 +848,7 @@ namespace Microsoft.AspNetCore.Mvc kvp => { Assert.Equal("data-val-remote-url", kvp.Key); - Assert.Equal("/UrlEncode[[AnotherArea]]/UrlEncode[[Controller]]/UrlEncode[[Action]]", kvp.Value); + Assert.Equal("/AnotherArea/Controller/Action", kvp.Value); }); } @@ -1041,8 +1039,7 @@ namespace Microsoft.AspNetCore.Mvc var serviceCollection = new ServiceCollection(); serviceCollection .AddSingleton() - .AddSingleton(new NullLoggerFactory()) - .AddSingleton(new UrlTestEncoder()); + .AddSingleton(new NullLoggerFactory()); serviceCollection.AddOptions(); serviceCollection.AddRouting(); diff --git a/test/WebSites/SimpleWebSite/Startup.cs b/test/WebSites/SimpleWebSite/Startup.cs index bab22ea874..50ad06a397 100644 --- a/test/WebSites/SimpleWebSite/Startup.cs +++ b/test/WebSites/SimpleWebSite/Startup.cs @@ -22,7 +22,6 @@ namespace SimpleWebSite .AddAuthorization() .AddFormatterMappings(m => m.SetMediaTypeMappingForFormat("js", new MediaTypeHeaderValue("application/json"))) .AddJsonFormatters(j => j.Formatting = Formatting.Indented); - services.AddSingleton(); } public void Configure(IApplicationBuilder app)