diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Controller.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Controller.cs
index 297b254f34..8b37f02859 100644
--- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Controller.cs
+++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Controller.cs
@@ -343,11 +343,7 @@ namespace Microsoft.AspNet.Mvc
}
///
- public void Dispose()
- {
- Dispose(disposing: true);
- GC.SuppressFinalize(this);
- }
+ public void Dispose() => Dispose(disposing: true);
///
/// Releases all resources currently used by this instance.
diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/MvcForm.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/MvcForm.cs
index 35fc88f774..ea099652cf 100644
--- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/MvcForm.cs
+++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/MvcForm.cs
@@ -8,11 +8,18 @@ using Microsoft.Extensions.DependencyInjection;
namespace Microsoft.AspNet.Mvc.Rendering
{
+ ///
+ /// An HTML form element in an MVC view.
+ ///
public class MvcForm : IDisposable
{
private readonly ViewContext _viewContext;
private bool _disposed;
+ ///
+ /// Initializes a new instance of .
+ ///
+ /// The .
public MvcForm(ViewContext viewContext)
{
if (viewContext == null)
@@ -23,10 +30,14 @@ namespace Microsoft.AspNet.Mvc.Rendering
_viewContext = viewContext;
}
+ ///
public void Dispose()
{
- Dispose(disposing: true);
- GC.SuppressFinalize(this);
+ if (!_disposed)
+ {
+ _disposed = true;
+ GenerateEndForm();
+ }
}
///
@@ -34,9 +45,13 @@ namespace Microsoft.AspNet.Mvc.Rendering
///
public void EndForm()
{
- Dispose(disposing: true);
+ Dispose();
}
+ ///
+ /// Renders and
+ /// the </form>.
+ ///
protected virtual void GenerateEndForm()
{
RenderEndOfFormContent();
@@ -44,15 +59,6 @@ namespace Microsoft.AspNet.Mvc.Rendering
_viewContext.FormContext = null;
}
- protected virtual void Dispose(bool disposing)
- {
- if (!_disposed)
- {
- _disposed = true;
- GenerateEndForm();
- }
- }
-
private void RenderEndOfFormContent()
{
var formContext = _viewContext.FormContext;
diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ApiController.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ApiController.cs
index b9e34f6d65..9daa158e98 100644
--- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ApiController.cs
+++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ApiController.cs
@@ -544,11 +544,8 @@ namespace System.Web.Http
return new HttpStatusCodeResult((int)status);
}
- public void Dispose()
- {
- Dispose(true);
- GC.SuppressFinalize(this);
- }
+ ///
+ public void Dispose() => Dispose(disposing: true);
///
/// Validates the given entity and adds the validation errors to the