From 3574a25316d76ea38a47273f8f1ba54033616b81 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Tue, 22 Mar 2016 10:51:12 -0700
Subject: [PATCH] Revert "Revert "Reacting to CoreCLR package changes""

This reverts commit 33dd349cd02c768cc31e211caca1ff6feeddbb9a.
---
 samples/IISSample/project.json                           | 6 ++++--
 .../project.json                                         | 6 +++++-
 .../project.json                                         | 7 +++++--
 .../project.json                                         | 7 +++++--
 test/TestSites/project.json                              | 9 ++++++---
 5 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/samples/IISSample/project.json b/samples/IISSample/project.json
index 416c330ce0..56c97356c7 100644
--- a/samples/IISSample/project.json
+++ b/samples/IISSample/project.json
@@ -13,8 +13,10 @@
     "web": "IISSample"
   },
   "frameworks": {
-    "dnx451": { },
-    "dnxcore50": { }
+    "net451": { },
+    "netstandardapp1.5": {
+      "imports": "portable-net451+win8"
+    }
   },
   "publishExclude": [
     "node_modules",
diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration.Tools/project.json b/src/Microsoft.AspNetCore.Server.IISIntegration.Tools/project.json
index 9087a880cd..7fdd45ce6e 100644
--- a/src/Microsoft.AspNetCore.Server.IISIntegration.Tools/project.json
+++ b/src/Microsoft.AspNetCore.Server.IISIntegration.Tools/project.json
@@ -18,7 +18,11 @@
   },
 
   "frameworks": {
-    "dnxcore50": {
+    "netstandardapp1.5": {
+      "imports": [
+        "portable-net451+win8",
+        "dnxcore50"
+      ]
     }
   }
 }
diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/project.json b/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/project.json
index da6782f459..6684014037 100644
--- a/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/project.json
+++ b/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/project.json
@@ -7,8 +7,11 @@
     "xunit": "2.1.0"
   },
   "frameworks": {
-    "dnxcore50": {
-      "imports": "portable-net451+win8",
+    "netstandardapp1.5": {
+      "imports": [
+        "portable-net451+win8",
+        "dnxcore50"
+      ],
       "dependencies": {
         "dotnet-test-xunit": "1.0.0-dev-*"
       }
diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.Tools.Tests/project.json b/test/Microsoft.AspNetCore.Server.IISIntegration.Tools.Tests/project.json
index 8a969aebbf..dee9e49e2a 100644
--- a/test/Microsoft.AspNetCore.Server.IISIntegration.Tools.Tests/project.json
+++ b/test/Microsoft.AspNetCore.Server.IISIntegration.Tools.Tests/project.json
@@ -5,8 +5,11 @@
     "Microsoft.NETCore.Platforms": "1.0.1-*"
   },
   "frameworks": {
-    "dnxcore50": {
-      "imports": "portable-net451+win8",
+    "netstandardapp1.5": {
+      "imports": [
+        "portable-net451+win8",
+        "dnxcore50"
+      ],
       "dependencies": {
         "dotnet-test-xunit": "1.0.0-dev-*"
       }
diff --git a/test/TestSites/project.json b/test/TestSites/project.json
index 8cafbbc3cd..12826ac40b 100644
--- a/test/TestSites/project.json
+++ b/test/TestSites/project.json
@@ -17,13 +17,16 @@
     "xunit": "2.1.0"
   },
   "frameworks": {
-    "dnxcore50": {
-      "imports": "portable-net451+win8",
+    "netstandardapp1.5": {
+      "imports": [
+        "portable-net451+win8",
+        "dnxcore50"
+      ],
       "dependencies": {
         "System.Net.Primitives": "4.0.11-*",
         "dotnet-test-xunit": "1.0.0-dev-*"
       }
     },
-    "dnx451": {}
+    "net451": {}
   }
 }