From b294828b0fbaffceb2b839324b93ee295aadcea4 Mon Sep 17 00:00:00 2001
From: John Luo <jt.luo@mail.utoronto.ca>
Date: Mon, 22 Feb 2016 14:50:21 -0800
Subject: [PATCH] Updating test TFMs for custom test discovery

---
 .../LocalizationSampleTest.cs                     |  2 +-
 .../LocalizationTest.cs                           |  2 +-
 .../project.json                                  | 15 ++++++++++++---
 .../RequestLocalizationOptionsTest.cs             |  6 +++---
 .../project.json                                  |  2 +-
 .../project.json                                  | 13 +++++++++----
 6 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/test/Microsoft.AspNetCore.Localization.FunctionalTests/LocalizationSampleTest.cs b/test/Microsoft.AspNetCore.Localization.FunctionalTests/LocalizationSampleTest.cs
index 731c72e633..99b852cf99 100644
--- a/test/Microsoft.AspNetCore.Localization.FunctionalTests/LocalizationSampleTest.cs
+++ b/test/Microsoft.AspNetCore.Localization.FunctionalTests/LocalizationSampleTest.cs
@@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Localization.FunctionalTests
     public class LocalizationSampleTest
     {
         private static readonly string _applicationPath =
-#if DNX451
+#if NET451
             Path.GetFullPath(Path.Combine("..", "..", "..", "..", "samples", "LocalizationSample"));
 #else
             Path.GetFullPath(Path.Combine("..", "..", "samples", "LocalizationSample"));
diff --git a/test/Microsoft.AspNetCore.Localization.FunctionalTests/LocalizationTest.cs b/test/Microsoft.AspNetCore.Localization.FunctionalTests/LocalizationTest.cs
index 7d4c861cc8..b434852813 100644
--- a/test/Microsoft.AspNetCore.Localization.FunctionalTests/LocalizationTest.cs
+++ b/test/Microsoft.AspNetCore.Localization.FunctionalTests/LocalizationTest.cs
@@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Localization.FunctionalTests
     public class LocalizationTest
     {
         private static readonly string _applicationPath =
-#if DNX451
+#if NET451
             Path.GetFullPath(Path.Combine("..", "..", "..", "LocalizationWebsite"));
 #else
             Path.GetFullPath(Path.Combine("..", "LocalizationWebsite"));
diff --git a/test/Microsoft.AspNetCore.Localization.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Localization.FunctionalTests/project.json
index b79f41d33a..01a557fc5c 100644
--- a/test/Microsoft.AspNetCore.Localization.FunctionalTests/project.json
+++ b/test/Microsoft.AspNetCore.Localization.FunctionalTests/project.json
@@ -4,9 +4,10 @@
   },
   "dependencies": {
     "Microsoft.AspNetCore.Server.Testing": "1.0.0-*",
+    "Microsoft.Extensions.Logging": "1.0.0-*",
     "Microsoft.Extensions.Logging.Console": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*",
-    "xunit.runner.aspnet": "2.0.0-aspnet-*"
+    "xunit": "2.1.0"
   },
   "frameworks": {
     "dnxcore50": {
@@ -15,6 +16,14 @@
         "dotnet-test-xunit": "1.0.0-dev-*"
       }
     },
-    "dnx451": {}
-  }
+    "net451": {
+      "frameworkAssemblies": {
+        "System.Runtime": ""
+      },
+      "dependencies": {
+        "xunit.runner.console": "2.1.0"
+      }
+    }
+  },
+  "testRunner": "xunit"
 }
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.Localization.Tests/RequestLocalizationOptionsTest.cs b/test/Microsoft.AspNetCore.Localization.Tests/RequestLocalizationOptionsTest.cs
index 0bc805207b..96a5dc2668 100644
--- a/test/Microsoft.AspNetCore.Localization.Tests/RequestLocalizationOptionsTest.cs
+++ b/test/Microsoft.AspNetCore.Localization.Tests/RequestLocalizationOptionsTest.cs
@@ -37,7 +37,7 @@ namespace Microsoft.AspNetCore.Localization.Tests
         {
             // Arrange
             var explicitCulture = new CultureInfo("fr-FR");
-#if DNX451
+#if NET451
             Thread.CurrentThread.CurrentCulture = explicitCulture;
             Thread.CurrentThread.CurrentUICulture = explicitCulture;
 #else
@@ -78,7 +78,7 @@ namespace Microsoft.AspNetCore.Localization.Tests
         {
             // Arrange
             var explicitCulture = new CultureInfo("fr-FR");
-#if DNX451
+#if NET451
             Thread.CurrentThread.CurrentCulture = explicitCulture;
             Thread.CurrentThread.CurrentUICulture = explicitCulture;
 #else
@@ -96,7 +96,7 @@ namespace Microsoft.AspNetCore.Localization.Tests
 
         public void Dispose()
         {
-#if DNX451
+#if NET451
             Thread.CurrentThread.CurrentCulture = _initialCulture;
             Thread.CurrentThread.CurrentUICulture = _initialUICulture;
 #else
diff --git a/test/Microsoft.AspNetCore.Localization.Tests/project.json b/test/Microsoft.AspNetCore.Localization.Tests/project.json
index 9021b3d3bf..54b23e3802 100644
--- a/test/Microsoft.AspNetCore.Localization.Tests/project.json
+++ b/test/Microsoft.AspNetCore.Localization.Tests/project.json
@@ -16,7 +16,7 @@
         "dotnet-test-xunit": "1.0.0-dev-*"
       }
     },
-    "dnx451": {
+    "net451": {
       "frameworkAssemblies": {
         "System.Runtime": "",
         "System.Threading.Tasks": ""
diff --git a/test/Microsoft.Extensions.Localization.Tests/project.json b/test/Microsoft.Extensions.Localization.Tests/project.json
index a8d150c268..36b02a3be3 100644
--- a/test/Microsoft.Extensions.Localization.Tests/project.json
+++ b/test/Microsoft.Extensions.Localization.Tests/project.json
@@ -8,7 +8,6 @@
     "Microsoft.Extensions.Localization": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*",
     "xunit": "2.1.0-*",
-    "xunit.runner.aspnet": "2.0.0-aspnet-*"
   },
   "frameworks": {
     "dnxcore50": {
@@ -19,10 +18,16 @@
         "dotnet-test-xunit": "1.0.0-dev-*"
       }
     },
-    "dnx451": {
+    "net451": {
+      "frameworkAssemblies": {
+        "System.Runtime": "",
+        "System.Threading.Tasks": ""
+      },
       "dependencies": {
-        "Moq": "4.2.1312.1622"
+        "Moq": "4.2.1312.1622",
+        "xunit.runner.console": "2.1.0"
       }
     }
-  }
+  },
+  "testRunner": "xunit"
 }
\ No newline at end of file