From 837b304c320e90a097a29e9a8192c8af5872fea1 Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajbaaska@microsoft.com>
Date: Thu, 30 Jun 2016 16:31:58 -0700
Subject: [PATCH] Updating to RTM builds of xunit and Moq

---
 .../project.json                               | 18 +++++-------------
 .../project.json                               | 17 +++++------------
 2 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/test/Microsoft.AspNetCore.Razor.Runtime.Test/project.json b/test/Microsoft.AspNetCore.Razor.Runtime.Test/project.json
index acc7396ad1..eba98e2f91 100644
--- a/test/Microsoft.AspNetCore.Razor.Runtime.Test/project.json
+++ b/test/Microsoft.AspNetCore.Razor.Runtime.Test/project.json
@@ -5,7 +5,7 @@
     "keyFile": "../../tools/Key.snk"
   },
   "dependencies": {
-    "dotnet-test-xunit": "1.0.0-*",
+    "dotnet-test-xunit": "2.2.0-*",
     "Microsoft.AspNetCore.Razor.Runtime": "1.1.0-*",
     "Microsoft.AspNetCore.Razor.Test.Sources": {
       "version": "1.1.0-*",
@@ -13,24 +13,20 @@
     },
     "Microsoft.AspNetCore.Testing": "1.1.0-*",
     "Microsoft.Extensions.WebEncoders": "1.1.0-*",
-    "xunit": "2.1.0"
+    "Moq": "4.6.25-*",
+    "xunit": "2.2.0-*"
   },
   "testRunner": "xunit",
   "frameworks": {
     "netcoreapp1.0": {
-      "imports": [
-        "dnxcore50",
-        "portable-net451+win8"
-      ],
       "dependencies": {
         "Microsoft.NETCore.App": {
           "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": "dotnet5.4"
     },
     "net451": {
       "frameworkAssemblies": {
@@ -43,10 +39,6 @@
         "System.Threading.Tasks": "",
         "System.Xml": "4.0.0.0",
         "System.Xml.Linq": "4.0.0.0"
-      },
-      "dependencies": {
-        "Moq": "4.2.1312.1622",
-        "xunit.runner.console": "2.1.0"
       }
     }
   }
diff --git a/test/Microsoft.AspNetCore.Razor.Test/project.json b/test/Microsoft.AspNetCore.Razor.Test/project.json
index 4cacda6261..d0db87b6bb 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/project.json
+++ b/test/Microsoft.AspNetCore.Razor.Test/project.json
@@ -1,7 +1,7 @@
 {
   "version": "1.0.0",
   "dependencies": {
-    "dotnet-test-xunit": "1.0.0-*",
+    "dotnet-test-xunit": "2.2.0-*",
     "Microsoft.AspNetCore.Razor": "1.1.0-*",
     "Microsoft.AspNetCore.Razor.Test.Sources": {
       "version": "1.1.0-*",
@@ -9,32 +9,25 @@
     },
     "Microsoft.AspNetCore.Testing": "1.1.0-*",
     "Newtonsoft.Json": "9.0.1",
-    "xunit": "2.1.0"
+    "Moq": "4.6.25-*",
+    "xunit": "2.2.0-*"
   },
   "testRunner": "xunit",
   "frameworks": {
     "netcoreapp1.0": {
-      "imports": [
-        "dnxcore50",
-        "portable-net451+win8"
-      ],
       "dependencies": {
         "Microsoft.NETCore.App": {
           "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": "dotnet5.4"
     },
     "net451": {
       "frameworkAssemblies": {
         "System.Runtime": "",
         "System.Threading.Tasks": ""
-      },
-      "dependencies": {
-        "Moq": "4.2.1312.1622"
       }
     }
   },