From ecd36454bb1a5058c7b6a555ce6722504d4e550c Mon Sep 17 00:00:00 2001
From: Ajay Bhargav Baaskaran <ajbaaska@microsoft.com>
Date: Fri, 1 Jul 2016 12:22:52 -0700
Subject: [PATCH] Updating to RTM builds of xunit and Moq

---
 .../project.json                              |  9 +++-----
 .../project.json                              | 21 +++++++------------
 test/ServerComparison.TestSites/project.json  |  9 +-------
 3 files changed, 11 insertions(+), 28 deletions(-)

diff --git a/test/ServerComparison.FunctionalTests/project.json b/test/ServerComparison.FunctionalTests/project.json
index 4ef710d579..08406b8e1e 100644
--- a/test/ServerComparison.FunctionalTests/project.json
+++ b/test/ServerComparison.FunctionalTests/project.json
@@ -16,7 +16,8 @@
     "Microsoft.Extensions.Logging": "1.1.0-*",
     "Microsoft.Extensions.Logging.Console": "1.1.0-*",
     "Microsoft.Extensions.PlatformAbstractions": "1.0.0-*",
-    "Microsoft.Net.Http.Headers": "1.1.0-*"
+    "Microsoft.Net.Http.Headers": "1.1.0-*",
+    "xunit": "2.2.0-*"
   },
   "publishOptions": {
     "include": [
@@ -33,11 +34,7 @@
           "version": "1.0.0-*",
           "type": "platform"
         }
-      },
-      "imports": [
-        "dnxcore50",
-        "portable-net451+win8"
-      ]
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/test/ServerComparison.TestSites.Standalone/project.json b/test/ServerComparison.TestSites.Standalone/project.json
index 73a5e7c914..c0a256a2f7 100644
--- a/test/ServerComparison.TestSites.Standalone/project.json
+++ b/test/ServerComparison.TestSites.Standalone/project.json
@@ -8,7 +8,11 @@
     "Microsoft.Extensions.Configuration.CommandLine": "1.1.0-*",
     "Microsoft.Extensions.Configuration.Json": "1.1.0-*",
     "Microsoft.Extensions.Logging.Console": "1.1.0-*",
-    "Microsoft.Net.Http.Headers": "1.1.0-*"
+    "Microsoft.Net.Http.Headers": "1.1.0-*",
+    "Microsoft.NETCore.App": {
+      "version": "1.0.0-*",
+      "type": "platform"
+    }
   },
   "buildOptions": {
     "emitEntryPoint": true,
@@ -22,21 +26,10 @@
     ]
   },
   "frameworks": {
-    "netcoreapp1.0": {
-      "imports": [
-        "dnxcore50",
-        "portable-net451+win8"
-      ],
-      "dependencies": {
-        "Microsoft.NETCore.App": "1.0.0-*"
-      }
-    }
+    "netcoreapp1.0": {}
   },
   "tools": {
-    "Microsoft.AspNetCore.Server.IISIntegration.Tools": {
-      "version": "1.0.0-*",
-      "imports": "portable-net45+wp80+win8+wpa81+dnxcore50"
-    }
+    "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-*"
   },
   "scripts": {
     "postpublish": "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%"
diff --git a/test/ServerComparison.TestSites/project.json b/test/ServerComparison.TestSites/project.json
index bd15837f7f..5552ffb497 100644
--- a/test/ServerComparison.TestSites/project.json
+++ b/test/ServerComparison.TestSites/project.json
@@ -21,10 +21,6 @@
   "frameworks": {
     "net451": {},
     "netcoreapp1.0": {
-      "imports": [
-        "dnxcore50",
-        "portable-net451+win8"
-      ],
       "dependencies": {
         "Microsoft.NETCore.App": {
           "version": "1.0.0-*",
@@ -34,10 +30,7 @@
     }
   },
   "tools": {
-    "Microsoft.AspNetCore.Server.IISIntegration.Tools": {
-      "version": "1.0.0-*",
-      "imports": "portable-net45+wp80+win8+wpa81+dnxcore50"
-    }
+    "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-*"
   },
   "scripts": {
     "postpublish": "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%"