Enable more tests for .NET Core

Author: xplicit

lib/tests/netstandard1.6/ServiceStack.deps.json

@@ -0,0 +1,7 @@
+SET BUILD=Debug
+REM SET BUILD=Release
+
+COPY ..\..\..\ServiceStack\src\ServiceStack\bin\%BUILD%\netstandard1.6\ServiceStack.dll .
+COPY ..\..\..\ServiceStack\src\ServiceStack\bin\%BUILD%\netstandard1.6\ServiceStack.pdb .
+COPY ..\..\..\ServiceStack\src\ServiceStack\bin\%BUILD%\netstandard1.6\ServiceStack.deps.json .
+

lib/tests/netstandard1.6/ServiceStack.dll

@@ -54,12 +54,12 @@ public T Get<T>(string key)
 
         //Looking up Dictionary<Type,bool> for type is faster than HashSet<Type>.
         private static Dictionary<Type, bool> integralTypes = new Dictionary<Type, bool> {
-            { typeof(byte), true },
+            { typeof(byte), true},
             { typeof(sbyte), true},
             { typeof(short), true},
             { typeof(ushort), true},
             { typeof(int), true},
-            { typeof(uint), true },
+            { typeof(uint), true},
             { typeof(long), true},
             { typeof(ulong), true},
         };

lib/tests/netstandard1.6/ServiceStack.pdb

@@ -0,0 +1,27 @@
+{
+  "configurations": {
+    "Debug": {
+      "buildOptions": {
+        "define": ["DEBUG", "TRACE"]
+      }
+    },
+    "Release": {
+      "buildOptions": {
+        "define": ["TRACE"],
+        "optimize": true
+      }
+    }
+  },
+  "dependencies": {
+    "NETStandard.Library": "1.6.0"
+  },
+  "frameworks": {
+    "netstandard1.6": { 
+      	"bin" : { 
+          "assembly":"../../lib/tests/netstandard1.6/ServiceStack.dll",
+          "pdb" : "../../lib/tests/netstandard1.6/ServiceStack.pdb"
+        }
+     }
+  },
+  "version": "1.0.0"
+}

lib/tests/netstandard1.6/copy.bat

@@ -26,7 +26,7 @@ public static int Main(string[] args)
             Licensing.RegisterLicense(licenseKey);
             //"ActivatedLicenseFeatures: ".Print(LicenseUtils.ActivatedLicenseFeatures());
 
-	    CultureInfo.DefaultThreadCurrentCulture = new CultureInfo("en-US");
+            CultureInfo.DefaultThreadCurrentCulture = new CultureInfo("en-US");
             JsConfig.InitStatics();
             //JsonServiceClient client = new JsonServiceClient();
             var writer = new ExtendedTextWrapper(Console.Out);

src/ServiceStack.Redis/RedisClient.ICacheClient.cs

@@ -1,5 +1,4 @@
-#if !NETCORE_SUPPORT
-using System;
+using System;
 using System.Diagnostics;
 using NUnit.Framework;
 using ServiceStack.Logging;
@@ -161,6 +160,7 @@ public void Benchmark_SET_raw_bytes_8MB_ServiceStack()
                 (i, bytes) => redis.Set("eitan" + i.ToString(), bytes));
         }
 
+#if !NETCORE
         [Test]
         public void Benchmark_SET_raw_bytes_8MB_Sider()
         {
@@ -170,6 +170,7 @@ public void Benchmark_SET_raw_bytes_8MB_Sider()
             Run("Sider 8MB", 8000000,
                 (i, bytes) => redis.SetRaw("eitan" + i.ToString(), bytes));
         }
+#endif
 
         [Test]
         public void Benchmark_SET_raw_bytes_1MB_ServiceStack()
@@ -180,6 +181,7 @@ public void Benchmark_SET_raw_bytes_1MB_ServiceStack()
                 (i, bytes) => redis.Set("eitan" + i.ToString(), bytes));
         }
 
+#if !NETCORE
         [Test]
         public void Benchmark_SET_raw_bytes_1MB_Sider()
         {
@@ -189,6 +191,7 @@ public void Benchmark_SET_raw_bytes_1MB_Sider()
             Run("Sider 1MB", 1000000,
                 (i, bytes) => redis.SetRaw("eitan" + i.ToString(), bytes));
         }
+#endif
 
         [Test]
         public void Benchmark_SET_raw_bytes_100k_ServiceStack()
@@ -199,6 +202,7 @@ public void Benchmark_SET_raw_bytes_100k_ServiceStack()
                 (i, bytes) => redis.Set("eitan" + i.ToString(), bytes));
         }
 
+#if !NETCORE
         [Test]
         public void Benchmark_SET_raw_bytes_100k_Sider()
         {
@@ -208,6 +212,7 @@ public void Benchmark_SET_raw_bytes_100k_Sider()
             Run("Sider 100K", 100000,
                 (i, bytes) => redis.SetRaw("eitan" + i.ToString(), bytes));
         }
+#endif
 
         [Test]
         public void Benchmark_SET_raw_bytes_10k_ServiceStack()
@@ -218,6 +223,7 @@ public void Benchmark_SET_raw_bytes_10k_ServiceStack()
                 (i, bytes) => redis.Set("eitan" + i.ToString(), bytes));
         }
 
+#if !NETCORE
         [Test]
         public void Benchmark_SET_raw_bytes_10k_Sider()
         {
@@ -227,6 +233,7 @@ public void Benchmark_SET_raw_bytes_10k_Sider()
             Run("Sider 10K", 10000,
                 (i, bytes) => redis.SetRaw("eitan" + i.ToString(), bytes));
         }
+#endif
 
         [Test]
         public void Benchmark_SET_raw_bytes_1k_ServiceStack()
@@ -237,6 +244,7 @@ public void Benchmark_SET_raw_bytes_1k_ServiceStack()
                 (i, bytes) => redis.Set("eitan" + i.ToString(), bytes));
         }
 
+#if !NETCORE
         [Test]
         public void Benchmark_SET_raw_bytes_1k_Sider()
         {
@@ -246,7 +254,7 @@ public void Benchmark_SET_raw_bytes_1k_Sider()
             Run("Sider 1K", 1000,
                 (i, bytes) => redis.SetRaw("eitan" + i.ToString(), bytes));
         }
+#endif
     }
 
-}
-#endif
+}

src/ServiceStack/project.json

@@ -72,7 +72,6 @@ public void Can_Set_and_Get_key_with_all_byte_values()
             Assert.That(resultValue, Is.EquivalentTo(value));
         }
 
-#if !NETCORE_SUPPORT
         [Test]
         public void Can_Replace_By_Pattern()
         {
@@ -103,7 +102,6 @@ public void Can_Replace_By_Pattern()
             result2 = cacheClient.Get<string>("string1");
             Assert.That(result2, Is.Null);
         }
-#endif
 
         [Test]
         public void Can_GetTimeToLive()

tests/ServiceStack.Redis.Tests/NetCoreTestsRunner.cs

@@ -26,13 +26,11 @@ public class SslTests
         [TestFixtureSetUp]
         public void TestFixtureSetUp()
         {
-#if !NETCORE_SUPPORT
             var settings = new TextFileSettings("~/azureconfig.txt".MapProjectPath());
             Host = settings.GetString("Host");
             Port = settings.Get("Port", 6379);
             Password = settings.GetString("Password");
             connectionString = "{0}@{1}".Fmt(Password, Host);
-#endif
         }
 
         [Test]