Move project.json to /tests folder

Author: xplicit

.vscode/launch.json

@@ -0,0 +1,16 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": ".NET Core Launch (console)",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build",
+            "program": "${workspaceRoot}/tests/ServiceStack.Redis.Tests/bin/Debug/netcoreapp1.0/ServiceStack.Redis.Tests.dll",
+            "args": [],
+            "cwd": "${workspaceRoot}",
+            "stopAtEntry": false,
+            "externalConsole": false
+        }
+     ]
+}

.vscode/tasks.json

@@ -0,0 +1,17 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "0.1.0",
+    "command": "dotnet",
+    "isShellCommand": true,
+    "args": [],
+    "tasks": [
+        {
+            "taskName": "build",
+            "args": [ "tests/ServiceStack.Redis.Tests"],
+            "isBuildCommand": true,
+            "showOutput": "silent",
+            "problemMatcher": "$msCompile"
+        }
+    ]
+}

global.json

@@ -0,0 +1,6 @@
+{
+    "projects": [
+       "src",
+       "tests"
+    ]
+}

tests/ServiceStack.Redis.Tests/LicenseUsageTests.cs

@@ -78,7 +78,7 @@ public class RegisteredLicenseUsageTests : LicenseUsageTests
         public void Allows_access_of_21_types()
         {
 #if NETCORE
-	    Environment.GetEnvironmentVariable("SERVICESTACK_LICENSE");
+            Environment.GetEnvironmentVariable("SERVICESTACK_LICENSE");
 #else
             Licensing.RegisterLicense(new AppSettings().GetString("servicestack:license"));
 #endif
@@ -96,7 +96,7 @@ public void Allows_access_of_21_types()
         public void Allows_access_of_6100_operations()
         {
 #if NETCORE
-	    Environment.GetEnvironmentVariable("SERVICESTACK_LICENSE");
+	        Environment.GetEnvironmentVariable("SERVICESTACK_LICENSE");
 #else
             Licensing.RegisterLicense(new AppSettings().GetString("servicestack:license"));
 #endif

tests/ServiceStack.Redis.Tests/NetCoreTestsRunner.cs

@@ -0,0 +1,36 @@
+using NUnitLite;
+using NUnit.Common;
+using System.Reflection;
+using ServiceStack;
+using ServiceStack.Text;
+using System;
+using System.Globalization;
+using System.Threading;
+
+namespace NUnitLite.Tests
+{
+    public class NetCoreTestsRunner
+    {
+        /// <summary>
+        /// The main program executes the tests. Output may be routed to
+        /// various locations, depending on the arguments passed.
+        /// </summary>
+        /// <remarks>Run with --help for a full list of arguments supported</remarks>
+        /// <param name="args"></param>
+        public static int Main(string[] args)
+        {
+            var licenseKey = Environment.GetEnvironmentVariable("SERVICESTACK_LICENSE");
+            if (licenseKey.IsNullOrEmpty())
+                throw new ArgumentNullException("SERVICESTACK_LICENSE", "Add Environment variable for SERVICESTACK_LICENSE");
+
+            Licensing.RegisterLicense(licenseKey);
+            //"ActivatedLicenseFeatures: ".Print(LicenseUtils.ActivatedLicenseFeatures());
+
+	    CultureInfo.DefaultThreadCurrentCulture = new CultureInfo("en-US");
+            JsConfig.InitStatics();
+            //JsonServiceClient client = new JsonServiceClient();
+            var writer = new ExtendedTextWrapper(Console.Out);
+            return new AutoRun(((IReflectableType)typeof(NetCoreTestsRunner)).GetTypeInfo().Assembly).Execute(args, writer, Console.In);
+        }
+    }
+}

tests/ServiceStack.Redis.Tests/ServiceStack.Redis.Tests.project.json

@@ -0,0 +1,9 @@
+{
+  "frameworks": {
+    "net45": {}
+  },
+  "runtimes": {
+    "win": {},
+    "win-x86": {}
+  }
+}

tests/ServiceStack.Redis.Tests/SslTests.cs

@@ -95,11 +95,7 @@ public void Can_connect_to_NetworkStream()
 
             if (!socket.Connected)
             {
-#if NETCORE
-                socket.Dispose();
-#else
                 socket.Close();
-#endif
                 throw new Exception("Could not connect");
             }
 
@@ -121,11 +117,7 @@ public void Can_connect_to_Buffered_SslStream()
 
             if (!socket.Connected)
             {
-#if NETCORE
-                socket.Dispose();
-#else
                 socket.Close();
-#endif
                 throw new Exception("Could not connect");
             }
 
@@ -143,13 +135,8 @@ public void Can_connect_to_Buffered_SslStream()
             }
             else
             {
-#if NETCORE
-                var ctor = typeof(SslStream).GetTypeInfo().GetConstructors()
+                var ctor = typeof(SslStream).GetAllConstructors()
                     .First(x => x.GetParameters().Length == 5);
-#else
-                var ctor = typeof(SslStream).GetConstructors()
-                    .First(x => x.GetParameters().Length == 5);
-#endif
 
                 var policyType = AssemblyUtils.FindType("System.Net.Security.EncryptionPolicy");
                 var policyValue = Enum.Parse(policyType, "RequireEncryption");

tests/ServiceStack.Redis.Tests/UserSessionRedisClientTests.cs

@@ -14,9 +14,7 @@ public class UserSessionTests
     {
         static UserSessionTests()
         {
-#if !NETCORE
             LogManager.LogFactory = new ConsoleLogFactory();
-#endif
         }
 
         //MasterUser master;

tests/ServiceStack.Redis.Tests/project.json

@@ -0,0 +1,38 @@
+{
+  "configurations": {
+    "Debug": {
+      "buildOptions": {
+        "define": ["NETCORE_SUPPORT", "NETCORE", "DEBUG", "TRACE"]
+      }
+    },
+    "Release": {
+      "buildOptions": {
+        "define": ["NETCORE_SUPPORT", "NETCORE", "TRACE"],
+        "optimize": true
+      }
+    }
+  },
+  "buildOptions": {
+    "debugType": "portable",
+    "emitEntryPoint": true
+  },
+  "dependencies": {
+    "Microsoft.NETCore.App": {
+      "type": "platform",
+      "version": "1.0.0"
+    },
+    "NUnitLite" : "3.2.1",
+    "ServiceStack.Redis" : "1.0.*",
+    "ServiceStack.Interfaces" : "1.0.*",
+    "ServiceStack.Text" : "1.0.*",
+    "ServiceStack.Common" : "1.0.*"
+  },
+  "frameworks": {
+   "netcoreapp1.0": { 
+      "imports": "dnxcore50",
+	    "dependencies" : {
+		    "System.Runtime.Serialization.Primitives": "4.1.1"
+      }	
+    }
+  }
+}