From 9268ca73dfcb65e505fd666950d4ab6c9ecd02a7 Mon Sep 17 00:00:00 2001
From: Pavel Krymets <pavel@krymets.com>
Date: Fri, 15 Apr 2016 12:04:16 -0700
Subject: [PATCH] Migrate tests, tools and samples to portable

---
 samples/LocalizationSample/Startup.cs                  |  2 +-
 samples/LocalizationSample/project.json                | 10 ++++++----
 test/LocalizationWebsite/project.json                  |  7 +++++--
 .../project.json                                       |  7 +++++--
 .../project.json                                       |  7 +++++--
 .../project.json                                       | 10 +++++++---
 6 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/samples/LocalizationSample/Startup.cs b/samples/LocalizationSample/Startup.cs
index 52ec893b31..9dcd25b82c 100644
--- a/samples/LocalizationSample/Startup.cs
+++ b/samples/LocalizationSample/Startup.cs
@@ -34,7 +34,7 @@ namespace LocalizationSample
                 new CultureInfo("zh"),
                 new CultureInfo("zh-CN")
             };
-#if !NETSTANDARDAPP1_5
+#if !NETCOREAPP1_0
             supportedCultures.Add(new CultureInfo("zh-CHT"));
 #endif
             var options = new RequestLocalizationOptions {
diff --git a/samples/LocalizationSample/project.json b/samples/LocalizationSample/project.json
index 4d42737fe3..68099851d4 100644
--- a/samples/LocalizationSample/project.json
+++ b/samples/LocalizationSample/project.json
@@ -4,8 +4,7 @@
     "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
     "Microsoft.AspNetCore.Localization": "1.0.0-*",
     "Microsoft.Extensions.Localization": "1.0.0-*",
-    "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
-    "Microsoft.NETCore.Platforms": "1.0.1-*"
+    "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
   },
   "compilationOptions": {
     "emitEntryPoint": true
@@ -15,12 +14,15 @@
   ],
   "frameworks": {
     "net451": {},
-    "netstandardapp1.5": {
+    "netcoreapp1.0": {
       "imports": [
         "dnxcore50"
       ],
       "dependencies": {
-          "NETStandard.Library": "1.5.0-*"
+        "Microsoft.NETCore.App": {
+          "version": "1.0.0-*",
+          "type": "platform"
+        }
       }
     }
   }
diff --git a/test/LocalizationWebsite/project.json b/test/LocalizationWebsite/project.json
index 28350dad54..c52999b7c6 100644
--- a/test/LocalizationWebsite/project.json
+++ b/test/LocalizationWebsite/project.json
@@ -11,10 +11,13 @@
     "Microsoft.Extensions.Logging.Console": "1.0.0-*"
   },
   "frameworks": {
-    "netstandardapp1.5": {
+    "netcoreapp1.0": {
       "dependencies": {
+        "Microsoft.NETCore.App": {
+          "version": "1.0.0-*",
+          "type": "platform"
+        },
         "dotnet-test-xunit": "1.0.0-dev-*",
-        "NETStandard.Library": "1.5.0-*",
         "System.Diagnostics.Process": "4.1.0-*"
       },
       "imports": [
diff --git a/test/Microsoft.AspNetCore.Localization.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Localization.FunctionalTests/project.json
index 9f5fd933b5..f2bbb2c62f 100644
--- a/test/Microsoft.AspNetCore.Localization.FunctionalTests/project.json
+++ b/test/Microsoft.AspNetCore.Localization.FunctionalTests/project.json
@@ -10,14 +10,17 @@
     "xunit": "2.1.0"
   },
   "frameworks": {
-    "netstandardapp1.5": {
+    "netcoreapp1.0": {
       "imports": [
         "dnxcore50",
         "portable-net451+win8"
       ],
       "dependencies": {
+        "Microsoft.NETCore.App": {
+          "version": "1.0.0-*",
+          "type": "platform"
+        },
         "dotnet-test-xunit": "1.0.0-dev-*",
-        "NETStandard.Library": "1.5.0-*",
         "System.Diagnostics.Process": "4.1.0-*"
       }
     },
diff --git a/test/Microsoft.AspNetCore.Localization.Tests/project.json b/test/Microsoft.AspNetCore.Localization.Tests/project.json
index 950762a5f8..3df83f4fd8 100644
--- a/test/Microsoft.AspNetCore.Localization.Tests/project.json
+++ b/test/Microsoft.AspNetCore.Localization.Tests/project.json
@@ -9,14 +9,17 @@
   },
   "testRunner": "xunit",
   "frameworks": {
-    "netstandardapp1.5": {
+    "netcoreapp1.0": {
       "imports": [
         "dnxcore50",
         "portable-net451+win8"
       ],
       "dependencies": {
+        "Microsoft.NETCore.App": {
+          "version": "1.0.0-*",
+          "type": "platform"
+        },
         "dotnet-test-xunit": "1.0.0-dev-*",
-        "NETStandard.Library": "1.5.0-*",
         "System.Diagnostics.Process": "4.1.0-*"
       }
     },
diff --git a/test/Microsoft.Extensions.Localization.Tests/project.json b/test/Microsoft.Extensions.Localization.Tests/project.json
index 50a3dd4c2c..decfd461ba 100644
--- a/test/Microsoft.Extensions.Localization.Tests/project.json
+++ b/test/Microsoft.Extensions.Localization.Tests/project.json
@@ -9,17 +9,21 @@
     "xunit": "2.1.0-*"
   },
   "frameworks": {
-    "netstandardapp1.5": {
+    "netcoreapp1.0": {
       "imports": [
         "dnxcore50",
         "portable-net451+win8"
       ],
       "dependencies": {
+        "Microsoft.NETCore.App": {
+          "version": "1.0.0-*",
+          "type": "platform"
+        },
         "moq.netcore": "4.4.0-beta8",
         "System.Resources.Writer": "4.0.0-*",
         "dotnet-test-xunit": "1.0.0-dev-*",
-        "NETStandard.Library": "1.5.0-*",
-        "System.Diagnostics.Process": "4.1.0-*"
+        "System.Diagnostics.Process": "4.1.0-*",
+        "System.Diagnostics.TraceSource": "4.0.0-*"
       }
     },
     "net451": {