diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/DefaultHtmlGenerator.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/DefaultHtmlGenerator.cs
index 587f88cfc6..ab292f1512 100644
--- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/DefaultHtmlGenerator.cs
+++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/DefaultHtmlGenerator.cs
@@ -11,10 +11,8 @@ using System.Reflection;
using System.Text.Encodings.Web;
using Microsoft.AspNetCore.Antiforgery;
using Microsoft.AspNetCore.Html;
-using Microsoft.AspNetCore.Mvc.Internal;
using Microsoft.AspNetCore.Mvc.ModelBinding;
using Microsoft.AspNetCore.Mvc.ModelBinding.Internal;
-using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.AspNetCore.Mvc.Routing;
using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
@@ -38,45 +36,6 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures
private readonly HtmlEncoder _htmlEncoder;
private readonly ValidationHtmlAttributeProvider _validationAttributeProvider;
- ///
- ///
- /// Initializes a new instance of the class.
- ///
- ///
- /// This constructor is obsolete and will be removed in a future version. The recommended alternative is to
- /// use .
- ///
- ///
- /// The instance which is used to generate antiforgery
- /// tokens.
- /// The accessor for .
- /// The .
- /// The .
- /// The .
- ///
- /// The that provides a list of s.
- ///
- [Obsolete("This constructor is obsolete and will be removed in a future version. The recommended " +
- "alternative is to use the other public constructor.")]
- public DefaultHtmlGenerator(
- IAntiforgery antiforgery,
- IOptions optionsAccessor,
- IModelMetadataProvider metadataProvider,
- IUrlHelperFactory urlHelperFactory,
- HtmlEncoder htmlEncoder,
- ClientValidatorCache clientValidatorCache)
- : this(
- antiforgery,
- optionsAccessor,
- metadataProvider,
- urlHelperFactory,
- htmlEncoder,
- clientValidatorCache,
- new DefaultValidationHtmlAttributeProvider(optionsAccessor, metadataProvider, clientValidatorCache))
- {
- }
-
///
/// Initializes a new instance of the class.
///
@@ -86,9 +45,6 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures
/// The .
/// The .
/// The .
- ///
- /// The that provides a list of s.
- ///
/// The .
public DefaultHtmlGenerator(
IAntiforgery antiforgery,
@@ -96,7 +52,6 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures
IModelMetadataProvider metadataProvider,
IUrlHelperFactory urlHelperFactory,
HtmlEncoder htmlEncoder,
- ClientValidatorCache clientValidatorCache,
ValidationHtmlAttributeProvider validationAttributeProvider)
{
if (antiforgery == null)
@@ -124,11 +79,6 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures
throw new ArgumentNullException(nameof(htmlEncoder));
}
- if (clientValidatorCache == null)
- {
- throw new ArgumentNullException(nameof(clientValidatorCache));
- }
-
if (validationAttributeProvider == null)
{
throw new ArgumentNullException(nameof(validationAttributeProvider));
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/exceptions.net45.json b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/exceptions.net45.json
index 063df4e403..3f5e07c865 100644
--- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/exceptions.net45.json
+++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/exceptions.net45.json
@@ -8,5 +8,10 @@
"OldTypeId": "public class Microsoft.AspNetCore.Mvc.ViewComponentResult : Microsoft.AspNetCore.Mvc.ActionResult",
"OldMemberId": "public System.Void set_ViewEngine(Microsoft.AspNetCore.Mvc.ViewEngines.IViewEngine value)",
"Kind": "Removal"
+ },
+ {
+ "OldTypeId": "public class Microsoft.AspNetCore.Mvc.ViewFeatures.DefaultHtmlGenerator : Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator",
+ "OldMemberId": "public .ctor(Microsoft.AspNetCore.Antiforgery.IAntiforgery antiforgery, Microsoft.Extensions.Options.IOptions optionsAccessor, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider metadataProvider, Microsoft.AspNetCore.Mvc.Routing.IUrlHelperFactory urlHelperFactory, System.Text.Encodings.Web.HtmlEncoder htmlEncoder, Microsoft.AspNetCore.Mvc.Internal.ClientValidatorCache clientValidatorCache)",
+ "Kind":"Removal"
}
]
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/exceptions.netcore.json b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/exceptions.netcore.json
index 063df4e403..3f5e07c865 100644
--- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/exceptions.netcore.json
+++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/exceptions.netcore.json
@@ -8,5 +8,10 @@
"OldTypeId": "public class Microsoft.AspNetCore.Mvc.ViewComponentResult : Microsoft.AspNetCore.Mvc.ActionResult",
"OldMemberId": "public System.Void set_ViewEngine(Microsoft.AspNetCore.Mvc.ViewEngines.IViewEngine value)",
"Kind": "Removal"
+ },
+ {
+ "OldTypeId": "public class Microsoft.AspNetCore.Mvc.ViewFeatures.DefaultHtmlGenerator : Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator",
+ "OldMemberId": "public .ctor(Microsoft.AspNetCore.Antiforgery.IAntiforgery antiforgery, Microsoft.Extensions.Options.IOptions optionsAccessor, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider metadataProvider, Microsoft.AspNetCore.Mvc.Routing.IUrlHelperFactory urlHelperFactory, System.Text.Encodings.Web.HtmlEncoder htmlEncoder, Microsoft.AspNetCore.Mvc.Internal.ClientValidatorCache clientValidatorCache)",
+ "Kind":"Removal"
}
]
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/TestableHtmlGenerator.cs b/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/TestableHtmlGenerator.cs
index 70e8ca8020..daf8314ff5 100644
--- a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/TestableHtmlGenerator.cs
+++ b/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/TestableHtmlGenerator.cs
@@ -50,7 +50,6 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
metadataProvider,
CreateUrlHelperFactory(urlHelper),
new HtmlTestEncoder(),
- new ClientValidatorCache(),
new DefaultValidationHtmlAttributeProvider(options, metadataProvider, new ClientValidatorCache()))
{
_validationAttributes = validationAttributes;
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/DefaultTemplatesUtilities.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/DefaultTemplatesUtilities.cs
index c3d280c0e1..7a327b24ea 100644
--- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/DefaultTemplatesUtilities.cs
+++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/DefaultTemplatesUtilities.cs
@@ -263,7 +263,6 @@ namespace Microsoft.AspNetCore.Mvc.Rendering
provider,
urlHelperFactory.Object,
new HtmlTestEncoder(),
- new ClientValidatorCache(),
attributeProvider);
}
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/DefaultHtmlGeneratorTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/DefaultHtmlGeneratorTest.cs
index 021b670e8d..3df4cf0438 100644
--- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/DefaultHtmlGeneratorTest.cs
+++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/DefaultHtmlGeneratorTest.cs
@@ -702,7 +702,6 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures
metadataProvider,
new UrlHelperFactory(),
htmlEncoder,
- new ClientValidatorCache(),
attributeProvider);
}