From d529378a4601d4f5a2da7399d953dd904a619850 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Wed, 29 Jun 2016 12:32:06 -0700
Subject: [PATCH] Updating to RTM builds of dotnet-test-xunit and Moq

---
 .../AntiforgerySampleTest.cs                    |  1 -
 .../project.json                                | 17 +++++------------
 .../DefaultAntiforgeryTokenStoreTest.cs         |  1 -
 .../project.json                                | 16 ++++------------
 4 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/test/Microsoft.AspNetCore.Antiforgery.FunctionalTests/AntiforgerySampleTest.cs b/test/Microsoft.AspNetCore.Antiforgery.FunctionalTests/AntiforgerySampleTest.cs
index 9fd2a497b9..d49d8df723 100644
--- a/test/Microsoft.AspNetCore.Antiforgery.FunctionalTests/AntiforgerySampleTest.cs
+++ b/test/Microsoft.AspNetCore.Antiforgery.FunctionalTests/AntiforgerySampleTest.cs
@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
diff --git a/test/Microsoft.AspNetCore.Antiforgery.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Antiforgery.FunctionalTests/project.json
index 7cabf480a7..286e29b607 100644
--- a/test/Microsoft.AspNetCore.Antiforgery.FunctionalTests/project.json
+++ b/test/Microsoft.AspNetCore.Antiforgery.FunctionalTests/project.json
@@ -1,9 +1,10 @@
 {
   "dependencies": {
-    "dotnet-test-xunit": "1.0.0-*",
+    "dotnet-test-xunit": "2.2.0-*",
     "AntiforgerySample": "1.1.0-*",
     "Microsoft.AspNetCore.TestHost": "1.1.0-*",
-    "Microsoft.AspNetCore.Testing": "1.1.0-*"
+    "Moq": "4.6.25-*",
+    "xunit": "2.2.0-*"
   },
   "testRunner": "xunit",
   "frameworks": {
@@ -13,19 +14,11 @@
           "version": "1.0.0-*",
           "type": "platform"
         },
-        "moq.netcore": "4.4.0-beta8",
-        "System.Net.Http": "4.1.0-*",
-        "System.Diagnostics.Process": "4.1.0-*"
+        "System.Net.Http": "4.1.0-*"
       },
-      "imports": [
-        "dnxcore50",
-        "portable-net451+win8"
-      ]
+      "imports": "dotnet5.4"
     },
     "net451": {
-      "dependencies": {
-        "Moq": "4.2.1312.1622"
-      },
       "frameworkAssemblies": {
         "System.Net.Http": ""
       }
diff --git a/test/Microsoft.AspNetCore.Antiforgery.Test/Internal/DefaultAntiforgeryTokenStoreTest.cs b/test/Microsoft.AspNetCore.Antiforgery.Test/Internal/DefaultAntiforgeryTokenStoreTest.cs
index 09c27585fe..adf466aa05 100644
--- a/test/Microsoft.AspNetCore.Antiforgery.Test/Internal/DefaultAntiforgeryTokenStoreTest.cs
+++ b/test/Microsoft.AspNetCore.Antiforgery.Test/Internal/DefaultAntiforgeryTokenStoreTest.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Internal;
diff --git a/test/Microsoft.AspNetCore.Antiforgery.Test/project.json b/test/Microsoft.AspNetCore.Antiforgery.Test/project.json
index be7721fa2a..f86077f3c1 100644
--- a/test/Microsoft.AspNetCore.Antiforgery.Test/project.json
+++ b/test/Microsoft.AspNetCore.Antiforgery.Test/project.json
@@ -4,14 +4,15 @@
     "keyFile": "../../tools/Key.snk"
   },
   "dependencies": {
-    "dotnet-test-xunit": "1.0.0-*",
+    "dotnet-test-xunit": "2.2.0-*",
     "Microsoft.AspNetCore.Antiforgery": "1.1.0-*",
     "Microsoft.AspNetCore.Http": "1.1.0-*",
     "Microsoft.AspNetCore.Testing": "1.1.0-*",
     "Microsoft.Extensions.DependencyInjection": "1.1.0-*",
     "Microsoft.Extensions.Logging": "1.1.0-*",
     "Microsoft.Extensions.WebEncoders": "1.1.0-*",
-    "xunit": "2.1.0-*"
+    "Moq": "4.6.25-*",
+    "xunit": "2.2.0-*"
   },
   "testRunner": "xunit",
   "frameworks": {
@@ -21,22 +22,13 @@
           "version": "1.0.0-*",
           "type": "platform"
         },
-        "moq.netcore": "4.4.0-beta8",
-        "System.Diagnostics.Process": "4.1.0-*",
         "System.Diagnostics.TraceSource": "4.0.0-*"
       },
-      "imports": [
-        "dnxcore50",
-        "portable-net451+win8"
-      ]
+      "imports": "dotnet5.4"
     },
     "net451": {
       "frameworkAssemblies": {
         "System.Threading.Tasks": ""
-      },
-      "dependencies": {
-        "Moq": "4.2.1312.1622",
-        "xunit.runner.console": "2.1.0"
       }
     }
   }