From f4d84f50cdf33c559491ce2364aaec76d2a717a7 Mon Sep 17 00:00:00 2001
From: Kiran Challa <kichalla@microsoft.com>
Date: Thu, 20 Apr 2017 16:28:49 -0700
Subject: [PATCH] Upgrading Moq to 4.7.1

---
 build/dependencies.props                                       | 2 +-
 .../Builder/MvcAreaRouteBuilderExtensionsTest.cs               | 2 +-
 test/Microsoft.AspNetCore.Mvc.TestCommon/CommonFilterTest.cs   | 2 +-
 .../ViewEngines/CompositeViewEngineTest.cs                     | 3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/build/dependencies.props b/build/dependencies.props
index f82f7d6005..ca7f57c3de 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -6,7 +6,7 @@
     <DependencyModelVersion>2.0.0-*</DependencyModelVersion>
     <InternalAspNetCoreSdkVersion>2.0.0-*</InternalAspNetCoreSdkVersion>
     <JsonNetBsonVersion>1.0.1</JsonNetBsonVersion>
-    <MoqVersion>4.6.36-alpha</MoqVersion>
+    <MoqVersion>4.7.1</MoqVersion>
     <NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
     <RoslynVersion>1.3.0</RoslynVersion>
     <RuntimeFrameworkVersion>2.0.0-*</RuntimeFrameworkVersion>
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Builder/MvcAreaRouteBuilderExtensionsTest.cs b/test/Microsoft.AspNetCore.Mvc.Core.Test/Builder/MvcAreaRouteBuilderExtensionsTest.cs
index 2f8e1eb960..c717d2d8ed 100644
--- a/test/Microsoft.AspNetCore.Mvc.Core.Test/Builder/MvcAreaRouteBuilderExtensionsTest.cs
+++ b/test/Microsoft.AspNetCore.Mvc.Core.Test/Builder/MvcAreaRouteBuilderExtensionsTest.cs
@@ -252,7 +252,7 @@ namespace Microsoft.AspNetCore.Builder
 
                     var values = new RouteValueDictionary(new { area = areaName });
                     var match = kvp.Value.Match(
-                        httpContext: Mock.Of<HttpContext>(),
+                        new DefaultHttpContext(),
                         route: new Mock<IRouter>().Object,
                         routeKey: kvp.Key,
                         values: values,
diff --git a/test/Microsoft.AspNetCore.Mvc.TestCommon/CommonFilterTest.cs b/test/Microsoft.AspNetCore.Mvc.TestCommon/CommonFilterTest.cs
index da12a53473..61c2ac3b90 100644
--- a/test/Microsoft.AspNetCore.Mvc.TestCommon/CommonFilterTest.cs
+++ b/test/Microsoft.AspNetCore.Mvc.TestCommon/CommonFilterTest.cs
@@ -225,7 +225,7 @@ namespace Microsoft.AspNetCore.Mvc.Filters
 
         private static ActionContext CreateActionContext()
         {
-            return new ActionContext(Mock.Of<HttpContext>(), new RouteData(), new ActionDescriptor());
+            return new ActionContext(new DefaultHttpContext(), new RouteData(), new ActionDescriptor());
         }
 
         private class NoOpResult : IActionResult
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewEngines/CompositeViewEngineTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewEngines/CompositeViewEngineTest.cs
index 3696a61639..7ec833d39a 100644
--- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewEngines/CompositeViewEngineTest.cs
+++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewEngines/CompositeViewEngineTest.cs
@@ -429,8 +429,7 @@ namespace Microsoft.AspNetCore.Mvc.ViewEngines
 
         private static ActionContext GetActionContext()
         {
-            var httpContext = Mock.Of<HttpContext>();
-            return new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+            return new ActionContext(new DefaultHttpContext(), new RouteData(), new ActionDescriptor());
         }
 
         private class TestViewEngine : IViewEngine