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

---
 .../project.json                              |  7 +++---
 .../project.json                              | 20 +++++------------
 .../project.json                              | 22 +++++--------------
 .../project.json                              | 22 +++++--------------
 .../project.json                              |  5 +----
 .../project.json                              | 21 +++++-------------
 6 files changed, 24 insertions(+), 73 deletions(-)

diff --git a/test/Microsoft.AspNetCore.Cryptography.Internal.Test/project.json b/test/Microsoft.AspNetCore.Cryptography.Internal.Test/project.json
index 72f189dd08..bebcb11214 100644
--- a/test/Microsoft.AspNetCore.Cryptography.Internal.Test/project.json
+++ b/test/Microsoft.AspNetCore.Cryptography.Internal.Test/project.json
@@ -1,13 +1,13 @@
 {
   "dependencies": {
-    "dotnet-test-xunit": "1.0.0-*",
+    "dotnet-test-xunit": "2.2.0-*",
     "Microsoft.AspNetCore.Cryptography.Internal": "1.1.0-*",
     "Microsoft.AspNetCore.DataProtection.Test.Shared": {
       "type": "build",
       "version": "1.0.0-*"
     },
     "Microsoft.AspNetCore.Testing": "1.1.0-*",
-    "xunit": "2.1.0"
+    "xunit": "2.2.0-*"
   },
   "frameworks": {
     "netcoreapp1.0": {
@@ -15,8 +15,7 @@
         "Microsoft.NETCore.App": {
           "version": "1.0.0-*",
           "type": "platform"
-        },
-        "System.Diagnostics.Process": "4.1.0-*"
+        }
       },
       "imports": [
         "dnxcore50",
diff --git a/test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Test/project.json b/test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Test/project.json
index 71bdf8e127..189bf61634 100644
--- a/test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Test/project.json
+++ b/test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Test/project.json
@@ -1,11 +1,11 @@
 {
   "dependencies": {
-    "dotnet-test-xunit": "1.0.0-*",
+    "dotnet-test-xunit": "2.2.0-*",
     "Microsoft.AspNetCore.Cryptography.Internal": "1.1.0-*",
     "Microsoft.AspNetCore.Cryptography.KeyDerivation": "1.1.0-*",
     "Microsoft.AspNetCore.DataProtection.Test.Shared": "1.0.0-*",
     "Microsoft.AspNetCore.Testing": "1.1.0-*",
-    "xunit": "2.1.0"
+    "xunit": "2.2.0-*"
   },
   "frameworks": {
     "netcoreapp1.0": {
@@ -13,20 +13,10 @@
         "Microsoft.NETCore.App": {
           "version": "1.0.0-*",
           "type": "platform"
-        },
-        "System.Diagnostics.Process": "4.1.0-*"
-      },
-      "imports": [
-        "dnxcore50",
-        "portable-net451+win8"
-      ]
-    },
-    "net451": {
-      "frameworkAssemblies": {
-        "System.Runtime": "",
-        "System.Threading.Tasks": ""
+        }
       }
-    }
+    },
+    "net451": {}
   },
   "testRunner": "xunit",
   "buildOptions": {
diff --git a/test/Microsoft.AspNetCore.DataProtection.Abstractions.Test/project.json b/test/Microsoft.AspNetCore.DataProtection.Abstractions.Test/project.json
index 50cb652ae0..0fba881c20 100644
--- a/test/Microsoft.AspNetCore.DataProtection.Abstractions.Test/project.json
+++ b/test/Microsoft.AspNetCore.DataProtection.Abstractions.Test/project.json
@@ -1,10 +1,11 @@
 {
   "dependencies": {
-    "dotnet-test-xunit": "1.0.0-*",
+    "dotnet-test-xunit": "2.2.0-*",
     "Microsoft.AspNetCore.Cryptography.Internal": "1.1.0-*",
     "Microsoft.AspNetCore.DataProtection.Abstractions": "1.1.0-*",
     "Microsoft.AspNetCore.Testing": "1.1.0-*",
-    "xunit": "2.1.0"
+    "Moq": "4.6.25-*",
+    "xunit": "2.2.0-*"
   },
   "frameworks": {
     "netcoreapp1.0": {
@@ -13,24 +14,11 @@
           "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": {
-      "dependencies": {
-        "Moq": "4.2.1312.1622"
-      },
-      "frameworkAssemblies": {
-        "System.Runtime": "",
-        "System.Threading.Tasks": ""
-      }
-    }
+    "net451": {}
   },
   "testRunner": "xunit",
   "buildOptions": {
diff --git a/test/Microsoft.AspNetCore.DataProtection.Extensions.Test/project.json b/test/Microsoft.AspNetCore.DataProtection.Extensions.Test/project.json
index 304748b77d..e54428104e 100644
--- a/test/Microsoft.AspNetCore.DataProtection.Extensions.Test/project.json
+++ b/test/Microsoft.AspNetCore.DataProtection.Extensions.Test/project.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "dotnet-test-xunit": "1.0.0-*",
+    "dotnet-test-xunit": "2.2.0-*",
     "Microsoft.AspNetCore.DataProtection.Abstractions": "1.1.0-*",
     "Microsoft.AspNetCore.DataProtection.Extensions": "1.1.0-*",
     "Microsoft.AspNetCore.DataProtection.Test.Shared": {
@@ -8,7 +8,8 @@
       "version": "1.0.0-*"
     },
     "Microsoft.AspNetCore.Testing": "1.1.0-*",
-    "xunit": "2.1.0"
+    "Moq":  "4.6.25-*",
+    "xunit": "2.2.0-*"
   },
   "frameworks": {
     "netcoreapp1.0": {
@@ -17,24 +18,11 @@
           "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": {
-      "dependencies": {
-        "Moq": "4.2.1312.1622"
-      },
-      "frameworkAssemblies": {
-        "System.Runtime": "",
-        "System.Threading.Tasks": ""
-      }
-    }
+    "net451": {}
   },
   "testRunner": "xunit",
   "buildOptions": {
diff --git a/test/Microsoft.AspNetCore.DataProtection.Test.Shared/project.json b/test/Microsoft.AspNetCore.DataProtection.Test.Shared/project.json
index 86a03356af..73f8bafccc 100644
--- a/test/Microsoft.AspNetCore.DataProtection.Test.Shared/project.json
+++ b/test/Microsoft.AspNetCore.DataProtection.Test.Shared/project.json
@@ -3,10 +3,7 @@
     "netstandard1.1": {
       "dependencies": {
         "System.Runtime": "4.1.0-*"
-      },
-      "imports": [
-        "dotnet5.2"
-      ]
+      }
     }
   },
   "shared": "**/*.cs"
diff --git a/test/Microsoft.AspNetCore.DataProtection.Test/project.json b/test/Microsoft.AspNetCore.DataProtection.Test/project.json
index 8891a88599..81d1700afe 100644
--- a/test/Microsoft.AspNetCore.DataProtection.Test/project.json
+++ b/test/Microsoft.AspNetCore.DataProtection.Test/project.json
@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-*",
-    "dotnet-test-xunit": "1.0.0-*",
+    "dotnet-test-xunit": "2.2.0-*",
     "Microsoft.AspNetCore.DataProtection": "1.1.0-*",
     "Microsoft.AspNetCore.DataProtection.Test.Shared": {
       "type": "build",
@@ -9,7 +9,8 @@
     },
     "Microsoft.AspNetCore.Testing": "1.1.0-*",
     "Microsoft.Extensions.DependencyInjection": "1.1.0-*",
-    "xunit": "2.1.0"
+    "Moq": "4.6.25-*",
+    "xunit": "2.2.0-*"
   },
   "frameworks": {
     "netcoreapp1.0": {
@@ -18,23 +19,11 @@
           "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": {
-      "dependencies": {
-        "Moq": "4.2.1312.1622"
-      },
-      "frameworkAssemblies": {
-        "System.Threading.Tasks": ""
-      }
-    }
+    "net451": {}
   },
   "testRunner": "xunit",
   "buildOptions": {