From 84cfe5640d5b554bf390c54e1f6369d623ef8895 Mon Sep 17 00:00:00 2001
From: Chris R <Tratcher@outlook.com>
Date: Fri, 30 Oct 2015 11:45:48 -0700
Subject: [PATCH] React to WebEncoders changes.

---
 .../DefaultAntiforgery.cs                            | 12 ++++++------
 src/Microsoft.AspNet.Antiforgery/project.json        |  2 --
 .../DefaultAntiforgeryTest.cs                        |  2 +-
 test/Microsoft.AspNet.Antiforgery.Test/project.json  |  1 -
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/Microsoft.AspNet.Antiforgery/DefaultAntiforgery.cs b/src/Microsoft.AspNet.Antiforgery/DefaultAntiforgery.cs
index e1eb7a10eb..98f6e49f84 100644
--- a/src/Microsoft.AspNet.Antiforgery/DefaultAntiforgery.cs
+++ b/src/Microsoft.AspNet.Antiforgery/DefaultAntiforgery.cs
@@ -3,10 +3,10 @@
 
 using System;
 using System.Diagnostics;
+using System.Text.Encodings.Web;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.Extensions.OptionsModel;
-using Microsoft.Extensions.WebEncoders;
 
 namespace Microsoft.AspNet.Antiforgery
 {
@@ -16,7 +16,7 @@ namespace Microsoft.AspNet.Antiforgery
     /// </summary>
     public class DefaultAntiforgery : IAntiforgery
     {
-        private readonly IHtmlEncoder _htmlEncoder;
+        private readonly HtmlEncoder _htmlEncoder;
         private readonly AntiforgeryOptions _options;
         private readonly IAntiforgeryTokenGenerator _tokenGenerator;
         private readonly IAntiforgeryTokenSerializer _tokenSerializer;
@@ -27,7 +27,7 @@ namespace Microsoft.AspNet.Antiforgery
             IAntiforgeryTokenGenerator tokenGenerator,
             IAntiforgeryTokenSerializer tokenSerializer,
             IAntiforgeryTokenStore tokenStore,
-            IHtmlEncoder htmlEncoder)
+            HtmlEncoder htmlEncoder)
         {
             _options = antiforgeryOptionsAccessor.Value;
             _tokenGenerator = tokenGenerator;
@@ -50,9 +50,9 @@ namespace Microsoft.AspNet.Antiforgery
 
             var inputTag = string.Format(
                 "<input name=\"{0}\" type=\"{1}\" value=\"{2}\" />",
-                _htmlEncoder.HtmlEncode(_options.FormFieldName),
-                _htmlEncoder.HtmlEncode("hidden"),
-                _htmlEncoder.HtmlEncode(tokenSet.FormToken));
+                _htmlEncoder.Encode(_options.FormFieldName),
+                _htmlEncoder.Encode("hidden"),
+                _htmlEncoder.Encode(tokenSet.FormToken));
             return inputTag;
         }
 
diff --git a/src/Microsoft.AspNet.Antiforgery/project.json b/src/Microsoft.AspNet.Antiforgery/project.json
index 593788b3f5..882a5e760e 100644
--- a/src/Microsoft.AspNet.Antiforgery/project.json
+++ b/src/Microsoft.AspNet.Antiforgery/project.json
@@ -9,8 +9,6 @@
     "Microsoft.AspNet.DataProtection": "1.0.0-*",
     "Microsoft.AspNet.Http.Abstractions": "1.0.0-*",
     "Microsoft.AspNet.WebUtilities": "1.0.0-*",
-    "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-*",
-    "Microsoft.Extensions.OptionsModel": "1.0.0-*",
     "Microsoft.Extensions.WebEncoders": "1.0.0-*"
   },
   "frameworks": {
diff --git a/test/Microsoft.AspNet.Antiforgery.Test/DefaultAntiforgeryTest.cs b/test/Microsoft.AspNet.Antiforgery.Test/DefaultAntiforgeryTest.cs
index 112b1fc629..fe3c5387e1 100644
--- a/test/Microsoft.AspNet.Antiforgery.Test/DefaultAntiforgeryTest.cs
+++ b/test/Microsoft.AspNet.Antiforgery.Test/DefaultAntiforgeryTest.cs
@@ -474,7 +474,7 @@ namespace Microsoft.AspNet.Antiforgery
                 tokenGenerator: tokenGenerator,
                 tokenSerializer: tokenSerializer,
                 tokenStore: tokenStore,
-                htmlEncoder: new CommonTestEncoder());
+                htmlEncoder: new HtmlTestEncoder());
         }
 
         private HttpContext GetHttpContext()
diff --git a/test/Microsoft.AspNet.Antiforgery.Test/project.json b/test/Microsoft.AspNet.Antiforgery.Test/project.json
index e3a04e2114..f4fed3ec60 100644
--- a/test/Microsoft.AspNet.Antiforgery.Test/project.json
+++ b/test/Microsoft.AspNet.Antiforgery.Test/project.json
@@ -3,7 +3,6 @@
         "Microsoft.AspNet.Antiforgery": "1.0.0-*",
         "Microsoft.AspNet.Http": "1.0.0-*",
         "Microsoft.Extensions.DependencyInjection": "1.0.0-*",
-        "Microsoft.Extensions.WebEncoders.Testing": "1.0.0-*",
         "xunit.runner.aspnet": "2.0.0-aspnet-*"
     },
     "commands": {