Refactor project structure to be more manageable; move to CORE_CLR for DNX conditions

01817068 · Marc Gravell · 2b532e7a · 01817068 · 01817068 · 01817068
Commit 01817068 authored Dec 10, 2015 by Marc Gravell
43 changed files
--- a/BasicTest/BasicTest.csproj
+++ b/BasicTest/BasicTest.csproj
@@ -48,13 +48,13 @@
    <Compile Include="Program.cs" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\StackExchange.Redis\StackExchange.Redis.csproj">
-      <Project>{7cec07f2-8c03-4c42-b048-738b215824c1}</Project>
-      <Name>StackExchange.Redis</Name>
-    </ProjectReference>
+    <Folder Include="Properties\" />
  </ItemGroup>
  <ItemGroup>
-    <Folder Include="Properties\" />
+    <ProjectReference Include="..\StackExchange.Redis_Net45\StackExchange.Redis_Net45.csproj">
+      <Project>{7cec07f2-8c03-4c42-b048-738b215824c1}</Project>
+      <Name>StackExchange.Redis_Net45</Name>
+    </ProjectReference>
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

--- a/BasicTest_dnxcore50/project.json
+++ b/BasicTest_dnxcore50/project.json
@@ -9,11 +9,12 @@
  "compile": [
    "../BasicTest/Program.cs"
  ],
-
  "dependencies": {
-    "StackExchange.Redis": "1.1.0-*"
+    "StackExchange.Redis": {
+      "version": "1.1.0-alpha1",
+      "target": "project"
+    }
  },
-
  "commands": {
    "run": "BasicTest_dnxcore50"
  },

--- a/ConnectionWatcher/ConnectionWatcher.csproj
+++ b/ConnectionWatcher/ConnectionWatcher.csproj
@@ -113,9 +113,9 @@
    <None Include="App.config" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\StackExchange.Redis\StackExchange.Redis.csproj">
+    <ProjectReference Include="..\StackExchange.Redis_Net45\StackExchange.Redis_Net45.csproj">
      <Project>{7cec07f2-8c03-4c42-b048-738b215824c1}</Project>
-      <Name>StackExchange.Redis</Name>
+      <Name>StackExchange.Redis_Net45</Name>
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

--- a/MigratedBookSleeveTestSuite/MigratedBookSleeveTestSuite.csproj
+++ b/MigratedBookSleeveTestSuite/MigratedBookSleeveTestSuite.csproj
@@ -87,13 +87,13 @@
    <None Include="packages.config" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\StackExchange.Redis\StackExchange.Redis.csproj">
-      <Project>{7cec07f2-8c03-4c42-b048-738b215824c1}</Project>
-      <Name>StackExchange.Redis</Name>
-    </ProjectReference>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
  </ItemGroup>
  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+    <ProjectReference Include="..\StackExchange.Redis_Net45\StackExchange.Redis_Net45.csproj">
+      <Project>{7cec07f2-8c03-4c42-b048-738b215824c1}</Project>
+      <Name>StackExchange.Redis_Net45</Name>
+    </ProjectReference>
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

--- a/StackExchange.Redis.StrongName/StackExchange.Redis.StrongName.xproj
+++ b/StackExchange.Redis.StrongName/StackExchange.Redis.StrongName.xproj
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0.24720" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0.24720</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>46754d2a-ac16-4686-b113-3db08acf4269</ProjectGuid>
+    <RootNamespace>StackExchange.Redis.StrongName</RootNamespace>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
+</Project>
\ No newline at end of file
--- a/StackExchange.Redis.StrongName/project.json
+++ b/StackExchange.Redis.StrongName/project.json
+{
+  "version": "1.1.0-alpha1",
+  "description": "High performance Redis client, incorporating both synchronous and asynchronous usage.",
+  "authors": [ "Stack Exchange inc., marc.gravell" ],
+  "owners": [ "marc.gravell" ],
+  "tags": [ "Async", "Redis", "Cache", "PubSub", "Messaging" ],
+  "projectUrl": "https://github.com/StackExchange/StackExchange.Redis",
+  "licenseUrl": "https://raw.github.com/StackExchange/StackExchange.Redis/master/LICENSE",
+  "copyright": "Stack Exchange inc. 2014-",
+  "requireLicenseAcceptance": false,
+  "summary": "Redis client library",
+  "compile": [
+    "../StackExchange.Redis/**/*.cs"
+  ],
+  "dependencies": {
+  },
+  "compilationOptions": {
+    "allowUnsafe": true,
+    "keyFile": "../StackExchange.Redis.snk",
+    "define": [ "STRONG_NAME" ]
+  },
+  "frameworks": {
+    "net40": {
+      "dependencies": {
+        "Microsoft.Bcl": "1.1.10",
+        "Microsoft.Bcl.Async": "1.0.168"
+      },
+      "compilationOptions": {
+        "define": [ "FEATURE_SERIALIZATION" ]
+      }
+    },
+    "net45": {
+      "frameworkAssemblies": {
+        "System.IO.Compression": "4.0.0.0"
+      },
+      "compilationOptions": {
+        "define": [ "FEATURE_SERIALIZATION" ]
+      }
+    },
+    "net46": {
+      "frameworkAssemblies": {
+        "System.IO.Compression": "4.0.0.0"
+      },
+      "define": [ "FEATURE_SERIALIZATION", "PLAT_SAFE_CONTINUATIONS" ]
+    },
+    "dnxcore50": {
+      "compilationOptions": {
+        "define": [ "PLAT_SAFE_CONTINUATIONS", "CORE_CLR" ]
+      },
+      "dependencies": {
+        "System.Collections.Concurrent": "4.0.11-beta-23516",
+        "System.Collections.NonGeneric": "4.0.1-beta-23516",
+        "System.Diagnostics.Debug": "4.0.11-beta-23516",
+        "System.Diagnostics.Tools": "4.0.1-beta-23516",
+        "System.Diagnostics.TraceSource": "4.0.0-beta-23516",
+        "System.Globalization": "4.0.11-beta-23516",
+        "System.IO": "4.0.11-beta-23516",
+        "System.IO.Compression": "4.1.0-beta-23516",
+        "System.IO.FileSystem": "4.0.1-beta-23516",
+        "System.Linq": "4.0.1-beta-23516",
+        "System.Net.NameResolution": "4.0.0-beta-23516",
+        "System.Net.Primitives": "4.0.11-beta-23516",
+        "System.Net.Security": "4.0.0-beta-23516",
+        "System.Net.Sockets": "4.1.0-beta-23516",
+        "System.Reflection": "4.1.0-beta-23516",
+        "System.Reflection.Emit": "4.0.1-beta-23516",
+        "System.Reflection.Emit.Lightweight": "4.0.1-beta-23516",
+        "System.Reflection.Primitives": "4.0.1-beta-23516",
+        "System.Reflection.TypeExtensions": "4.1.0-beta-23516",
+        "System.Security.Cryptography.Algorithms": "4.0.0-beta-23516",
+        "System.Security.Cryptography.X509Certificates": "4.0.0-beta-23516",
+        "System.Text.Encoding": "4.0.11-beta-23516",
+        "System.Text.RegularExpressions": "4.0.11-beta-23516",
+        "System.Threading": "4.0.11-beta-23516",
+        "System.Threading.Tasks": "4.0.11-beta-23516",
+        "System.Threading.Thread": "4.0.0-beta-23516",
+        "System.Threading.ThreadPool": "4.0.10-beta-23516",
+        "System.Threading.Timer": "4.0.1-beta-23516"
+      }
+    },
+    "dotnet5.5": {
+      "compilationOptions": {
+        "define": [ "PLAT_SAFE_CONTINUATIONS", "CORE_CLR" ]
+      },
+      "dependencies": {
+        "System.Collections.Concurrent": "4.0.11-beta-23516",
+        "System.Collections.NonGeneric": "4.0.1-beta-23516",
+        "System.Diagnostics.Debug": "4.0.11-beta-23516",
+        "System.Diagnostics.Tools": "4.0.1-beta-23516",
+        "System.Diagnostics.TraceSource": "4.0.0-beta-23516",
+        "System.Globalization": "4.0.11-beta-23516",
+        "System.IO": "4.0.11-beta-23516",
+        "System.IO.Compression": "4.1.0-beta-23516",
+        "System.IO.FileSystem": "4.0.1-beta-23516",
+        "System.Linq": "4.0.1-beta-23516",
+        "System.Net.NameResolution": "4.0.0-beta-23516",
+        "System.Net.Primitives": "4.0.11-beta-23516",
+        "System.Net.Security": "4.0.0-beta-23516",
+        "System.Net.Sockets": "4.1.0-beta-23516",
+        "System.Reflection": "4.1.0-beta-23516",
+        "System.Reflection.Emit": "4.0.1-beta-23516",
+        "System.Reflection.Emit.Lightweight": "4.0.1-beta-23516",
+        "System.Reflection.Primitives": "4.0.1-beta-23516",
+        "System.Reflection.TypeExtensions": "4.1.0-beta-23516",
+        "System.Security.Cryptography.Algorithms": "4.0.0-beta-23516",
+        "System.Security.Cryptography.X509Certificates": "4.0.0-beta-23516",
+        "System.Text.Encoding": "4.0.11-beta-23516",
+        "System.Text.RegularExpressions": "4.0.11-beta-23516",
+        "System.Threading": "4.0.11-beta-23516",
+        "System.Threading.Tasks": "4.0.11-beta-23516",
+        "System.Threading.Thread": "4.0.0-beta-23516",
+        "System.Threading.ThreadPool": "4.0.10-beta-23516",
+        "System.Threading.Timer": "4.0.1-beta-23516"
+      }
+    }
+  }
+}
\ No newline at end of file
--- a/StackExchange.Redis.Tests/BasicOps.cs
+++ b/StackExchange.Redis.Tests/BasicOps.cs
@@ -234,12 +234,12 @@ public void MassiveBulkOpsAsync(bool preserveOrder, bool withContinuation)
                var conn = muxer.GetDatabase();
                muxer.Wait(conn.PingAsync());

-#if DNXCORE50
+#if CORE_CLR
                int number = 0;
 #endif
                Action<Task> nonTrivial = delegate
                {
-#if !DNXCORE50
+#if !CORE_CLR
                    Thread.SpinWait(5);
 #else
                    for (int i = 0; i < 50; i++)

--- a/StackExchange.Redis.Tests/Cluster.cs
+++ b/StackExchange.Redis.Tests/Cluster.cs
@@ -20,7 +20,7 @@ public class Cluster : TestBase
        protected override string GetConfiguration()
        {
            var server = ClusterIp;
-#if !DNXCORE50
+#if !CORE_CLR
            if (string.Equals(Environment.MachineName, "MARC-LAPTOP", StringComparison.InvariantCultureIgnoreCase))
 #else
            if (string.Equals(Environment.GetEnvironmentVariable("COMPUTERNAME"), "MARC-LAPTOP", StringComparison.OrdinalIgnoreCase))

--- a/StackExchange.Redis.Tests/Config.cs
+++ b/StackExchange.Redis.Tests/Config.cs
@@ -147,7 +147,7 @@ public void ReadConfig()
                var all = conn.ConfigGet();
                Assert.IsTrue(all.Length > 0, "any");

-#if !DNXCORE50
+#if !CORE_CLR
                var pairs = all.ToDictionary(x => (string)x.Key, x => (string)x.Value, StringComparer.InvariantCultureIgnoreCase);
 #else
                var pairs = all.ToDictionary(x => (string)x.Key, x => (string)x.Value, StringComparer.OrdinalIgnoreCase);

--- a/StackExchange.Redis.Tests/Naming.cs
+++ b/StackExchange.Redis.Tests/Naming.cs
@@ -150,7 +150,7 @@ public void CheckSyncAsyncMethodsMatch(Type from, Type to)
                var pFrom = method.GetParameters();
                Type[] args = pFrom.Select(x => x.ParameterType).ToArray();
                Assert.AreEqual(typeof(CommandFlags), args.Last());
-#if !DNXCORE50
+#if !CORE_CLR
                var found = to.GetMethod(huntName, flags, null, method.CallingConvention, args, null);
 #else
                var found = to.GetMethods(flags)
@@ -176,14 +176,14 @@ void CheckMethod(MethodInfo method, bool isAsync)
        {

 #if DEBUG
-#if !DNXCORE50
+#if !CORE_CLR
            bool ignorePrefix = ignoreType != null && Attribute.IsDefined(method, ignoreType);
 #else
            bool ignorePrefix = ignoreType != null && method.IsDefined(ignoreType);
 #endif
            if (ignorePrefix)
            {
-#if !DNXCORE50
+#if !CORE_CLR
                Attribute attrib = Attribute.GetCustomAttribute(method, ignoreType);
 #else
                Attribute attrib = method.GetCustomAttribute(ignoreType);
@@ -228,7 +228,7 @@ void CheckName(MemberInfo member, bool isAsync)

    public static class ReflectionExtensions
    {
-#if !DNXCORE50
+#if !CORE_CLR
        public static Type GetTypeInfo(this Type type)
        {
            return type;

--- a/StackExchange.Redis.Tests/Profiling.cs
+++ b/StackExchange.Redis.Tests/Profiling.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-#if DNXCORE50
+#if CORE_CLR
 using System.Reflection;
 #endif
 using System.Threading.Tasks;

--- a/StackExchange.Redis.Tests_dnxcore50/StackExchange.Redis.Tests/Program.cs
+++ b/StackExchange.Redis.Tests_dnxcore50/StackExchange.Redis.Tests/Program.cs
+#if NUNITLITE
 using System;
 using System.Reflection;
 using NUnitLite;
@@ -11,4 +12,5 @@ public int Main(string[] args)
            return new AutoRun().Execute(typeof(TestBase).GetTypeInfo().Assembly, Console.Out, Console.In, args);
        }
    }
-}
\ No newline at end of file
+}
+#endif
\ No newline at end of file
--- a/StackExchange.Redis.Tests/PubSub.cs
+++ b/StackExchange.Redis.Tests/PubSub.cs
@@ -417,7 +417,7 @@ internal static class VolatileWrapper
    {
        public static int Read(ref int location)
        {
-#if !DNXCORE50
+#if !CORE_CLR
            return Thread.VolatileRead(ref location);
 #else
            return Volatile.Read(ref location);

--- a/StackExchange.Redis.Tests_dnxcore50/StackExchange.Redis.Tests/StackExchange.Redis.Tests.xproj
+++ b/StackExchange.Redis.Tests_dnxcore50/StackExchange.Redis.Tests/StackExchange.Redis.Tests.xproj
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="14.0.24720" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0.24720</VisualStudioVersion>
    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
  </PropertyGroup>
  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
  <PropertyGroup Label="Globals">
-    <ProjectGuid>a51dca17-e8f1-44e1-9a37-328fab14d2ce</ProjectGuid>
+    <ProjectGuid>3b8bd8f1-8bfc-4d8c-b4da-25ffaf3d1dbe</ProjectGuid>
    <RootNamespace>StackExchange.Redis.Tests</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\StackExchange.Redis_dnxcore50\StackExchange.Redis\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\StackExchange.Redis_dnxcore50\StackExchange.Redis\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
  </PropertyGroup>

  <PropertyGroup>

--- a/StackExchange.Redis.Tests/TestBase.cs
+++ b/StackExchange.Redis.Tests/TestBase.cs
@@ -285,7 +285,7 @@ protected static TimeSpan RunConcurrent(Action work, int threads, int timeout =
            }
            if (!allDone.WaitOne(timeout))
            {
-#if !DNXCORE50
+#if !CORE_CLR
                for (int i = 0; i < threads; i++)
                {
                    var thd = threadArr[i];

--- a/StackExchange.Redis.Tests_dnxcore50/StackExchange.Redis.Tests/project.json
+++ b/StackExchange.Redis.Tests_dnxcore50/StackExchange.Redis.Tests/project.json
@@ -5,36 +5,21 @@
  "tags": [ "" ],
  "projectUrl": "",
  "licenseUrl": "",
-
-  "compile": [
-    "../../StackExchange.Redis.Tests/**/*.cs"
-  ],
-
  "dependencies": {
-    "StackExchange.Redis": "1.1.0-*"
+    "StackExchange.Redis": {
+      "version": "1.1.0-alpha1",
+      "target": "project"
+    }
  },
-
  "commands": {
    "run": "StackExchange.Redis.Tests"
  },
-
-  "configurations": {
-    "Debug": {
-      "compilationOptions": {
-        "define": [ "DEBUG", "TRACE", "PLAT_SAFE_CONTINUATIONS" ]
-      }
-    },
-    "Release": {
-      "compilationOptions": {
-        "define": [ "TRACE", "PLAT_SAFE_CONTINUATIONS" ]
-      }
-    }
-  },
-
+  "compilationOptions": { "define": [ "NUNITLITE" ] },
  "frameworks": {
    "dnxcore50": {
+      "compilationOptions": { "define": [ "PLAT_SAFE_CONTINUATIONS", "CORE_CLR" ] },
      "dependencies": {
-        "System.Console": "4.0.0-beta-*",
+        "System.Console": "4.0.0-beta-23516",
        "System.Linq.Expressions": "4.0.11-beta-23516",
        "System.Reflection.Extensions": "4.0.1-beta-23516",
        "System.Threading.Tasks.Parallel": "4.0.1-beta-23516",

--- a/StackExchange.Redis.Tests/StackExchange.Redis.Tests.csproj
+++ b/StackExchange.Redis.Tests/StackExchange.Redis.Tests.csproj
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{19C00111-1328-4089-8565-94920B5B47F2}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>StackExchange.Redis.Tests</RootNamespace>
-    <AssemblyName>StackExchange.Redis.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;PLAT_SAFE_CONTINUATIONS;FEATURE_BOOKSLEEVE;FEATURE_MOQ</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;PLAT_SAFE_CONTINUATIONS;FEATURE_BOOKSLEEVE;FEATURE_MOQ</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Verbose|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Verbose\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;VERBOSE;FEATURE_BOOKSLEEVE;FEATURE_MOQ</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Log Output|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Log Output\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;LOGOUTPUT;FEATURE_BOOKSLEEVE;FEATURE_MOQ</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Mono|AnyCPU'">
-    <OutputPath>bin\Mono\</OutputPath>
-    <DefineConstants>TRACE;FEATURE_BOOKSLEEVE;FEATURE_MOQ</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="BookSleeve">
-      <HintPath>..\packages\BookSleeve.1.3.41\lib\BookSleeve.dll</HintPath>
-    </Reference>
-    <Reference Include="Moq, Version=4.2.1502.911, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\packages\Moq.4.2.1502.0911\lib\net40\Moq.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nunit.framework, Version=3.0.5797.27534, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.0.0\lib\net45\nunit.framework.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AsyncTests.cs" />
-    <Compile Include="BasicOps.cs" />
-    <Compile Include="ConnectingFailDetection.cs" />
-    <Compile Include="ConnectToUnexistingHost.cs" />
-    <Compile Include="HyperLogLog.cs" />
-    <Compile Include="Issues\DefaultDatabase.cs" />
-    <Compile Include="Profiling.cs" />
-    <Compile Include="Issues\Issue182.cs" />
-    <Compile Include="WrapperBaseTests.cs" />
-    <Compile Include="TransactionWrapperTests.cs" />
-    <Compile Include="Bits.cs" />
-    <Compile Include="Cluster.cs" />
-    <Compile Include="Commands.cs" />
-    <Compile Include="ConnectFailTimeout.cs" />
-    <Compile Include="ConnectionShutdown.cs" />
-    <Compile Include="Databases.cs" />
-    <Compile Include="BatchWrapperTests.cs" />
-    <Compile Include="DatabaseWrapperTests.cs" />
-    <Compile Include="DefaultPorts.cs" />
-    <Compile Include="Expiry.cs" />
-    <Compile Include="Config.cs" />
-    <Compile Include="FloatingPoint.cs" />
-    <Compile Include="Issues\BGSAVEResponse.cs" />
-    <Compile Include="Issues\Issue25.cs" />
-    <Compile Include="Issues\Issue6.cs" />
-    <Compile Include="Issues\SO22786599.cs" />
-    <Compile Include="Issues\SO23949477.cs" />
-    <Compile Include="Issues\SO24807536.cs" />
-    <Compile Include="Issues\SO25567566.cs" />
-    <Compile Include="Keys.cs" />
-    <Compile Include="KeysAndValues.cs" />
-    <Compile Include="Lex.cs" />
-    <Compile Include="Lists.cs" />
-    <Compile Include="Locking.cs" />
-    <Compile Include="Migrate.cs" />
-    <Compile Include="MultiAdd.cs" />
-    <Compile Include="MultiMaster.cs" />
-    <Compile Include="Naming.cs" />
-    <Compile Include="PreserveOrder.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="PubSub.cs" />
-    <Compile Include="PubSubCommand.cs" />
-    <Compile Include="RealWorld.cs" />
-    <Compile Include="Scans.cs" />
-    <Compile Include="Scripting.cs" />
-    <Compile Include="Secure.cs" />
-    <Compile Include="Sentinel.cs" />
-    <Compile Include="Sets.cs" />
-    <Compile Include="Issues\SO25113323.cs" />
-    <Compile Include="SSDB.cs" />
-    <Compile Include="SSL.cs" />
-    <Compile Include="TaskTests.cs" />
-    <Compile Include="TestBase.cs" />
-    <Compile Include="TestInfoReplicationChecks.cs" />
-    <Compile Include="Transactions.cs" />
-    <Compile Include="VPNTest.cs" />
-    <Compile Include="WithKeyPrefixTests.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\StackExchange.Redis_Net46\StackExchange.Redis_Net46.csproj">
-      <Project>{8c473a6f-b0de-4add-88f8-c41b441e407c}</Project>
-      <Name>StackExchange.Redis_Net46</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{19C00111-1328-4089-8565-94920B5B47F2}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>StackExchange.Redis.Tests</RootNamespace>
+    <AssemblyName>StackExchange.Redis.Tests</AssemblyName>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;PLAT_SAFE_CONTINUATIONS;FEATURE_BOOKSLEEVE;FEATURE_MOQ</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE;PLAT_SAFE_CONTINUATIONS;FEATURE_BOOKSLEEVE;FEATURE_MOQ</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Verbose|AnyCPU'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Verbose\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;VERBOSE;FEATURE_BOOKSLEEVE;FEATURE_MOQ</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Log Output|AnyCPU'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Log Output\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;LOGOUTPUT;FEATURE_BOOKSLEEVE;FEATURE_MOQ</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Mono|AnyCPU'">
+    <OutputPath>bin\Mono\</OutputPath>
+    <DefineConstants>TRACE;FEATURE_BOOKSLEEVE;FEATURE_MOQ</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="BookSleeve">
+      <HintPath>..\packages\BookSleeve.1.3.41\lib\BookSleeve.dll</HintPath>
+    </Reference>
+    <Reference Include="Moq, Version=4.2.1502.911, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\packages\Moq.4.2.1502.0911\lib\net40\Moq.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="nunit.framework, Version=3.0.5797.27534, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.0.0\lib\net45\nunit.framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\StackExchange.Redis.Tests\**\*.cs"/>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\StackExchange.Redis_Net46\StackExchange.Redis_Net46.csproj">
+      <Project>{8c473a6f-b0de-4add-88f8-c41b441e407c}</Project>
+      <Name>StackExchange.Redis_Net46</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
 </Project>
\ No newline at end of file
--- a/StackExchange.Redis.dnx.sln
+++ b/StackExchange.Redis.dnx.sln
@@ -3,16 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.24720.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "StackExchange.Redis", "StackExchange.Redis_dnxcore50\StackExchange.Redis\StackExchange.Redis.xproj", "{86526B5C-1163-4481-A5E2-A303A0BB1535}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "BasicTest_dnxcore50", "BasicTest_dnxcore50\BasicTest_dnxcore50.xproj", "{9D83BABA-A92E-495F-BF63-DEB4F6B09355}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "StackExchange.Redis.Tests", "StackExchange.Redis.Tests_dnxcore50\StackExchange.Redis.Tests\StackExchange.Redis.Tests.xproj", "{A51DCA17-E8F1-44E1-9A37-328FAB14D2CE}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "StackExchange.Redis", "StackExchange.Redis\StackExchange.Redis.xproj", "{EF84877F-59BE-41BE-9013-E765AF0BB72E}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "BasicTest_dnxcore50", "BasicTest_dnxcore50\BasicTest_dnxcore50.xproj", "{9D83BABA-A92E-495F-BF63-DEB4F6B09355}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "StackExchange.Redis.StrongName", "StackExchange.Redis.StrongName\StackExchange.Redis.StrongName.xproj", "{46754D2A-AC16-4686-B113-3DB08ACF4269}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{647CB8F7-A025-4B90-8295-6FE5C61A780D}"
-	ProjectSection(SolutionItems) = preProject
-		StackExchange.Redis.nuspec = StackExchange.Redis.nuspec
-	EndProjectSection
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "StackExchange.Redis.Tests", "StackExchange.Redis.Tests\StackExchange.Redis.Tests.xproj", "{3B8BD8F1-8BFC-4D8C-B4DA-25FFAF3D1DBE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -20,18 +17,22 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{86526B5C-1163-4481-A5E2-A303A0BB1535}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{86526B5C-1163-4481-A5E2-A303A0BB1535}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{86526B5C-1163-4481-A5E2-A303A0BB1535}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{86526B5C-1163-4481-A5E2-A303A0BB1535}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A51DCA17-E8F1-44E1-9A37-328FAB14D2CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A51DCA17-E8F1-44E1-9A37-328FAB14D2CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A51DCA17-E8F1-44E1-9A37-328FAB14D2CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A51DCA17-E8F1-44E1-9A37-328FAB14D2CE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9D83BABA-A92E-495F-BF63-DEB4F6B09355}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9D83BABA-A92E-495F-BF63-DEB4F6B09355}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9D83BABA-A92E-495F-BF63-DEB4F6B09355}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9D83BABA-A92E-495F-BF63-DEB4F6B09355}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EF84877F-59BE-41BE-9013-E765AF0BB72E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EF84877F-59BE-41BE-9013-E765AF0BB72E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EF84877F-59BE-41BE-9013-E765AF0BB72E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EF84877F-59BE-41BE-9013-E765AF0BB72E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{46754D2A-AC16-4686-B113-3DB08ACF4269}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{46754D2A-AC16-4686-B113-3DB08ACF4269}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{46754D2A-AC16-4686-B113-3DB08ACF4269}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{46754D2A-AC16-4686-B113-3DB08ACF4269}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3B8BD8F1-8BFC-4D8C-B4DA-25FFAF3D1DBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3B8BD8F1-8BFC-4D8C-B4DA-25FFAF3D1DBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3B8BD8F1-8BFC-4D8C-B4DA-25FFAF3D1DBE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3B8BD8F1-8BFC-4D8C-B4DA-25FFAF3D1DBE}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

--- a/StackExchange.Redis.md.sln
+++ b/StackExchange.Redis.md.sln
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StackExchange.Redis.md", "StackExchange.Redis\StackExchange.Redis.md.csproj", "{8EA21FC8-9CF7-438B-94F2-42E3810C3641}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x86 = Debug|x86
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8EA21FC8-9CF7-438B-94F2-42E3810C3641}.Debug|x86.ActiveCfg = Debug|x86
-		{8EA21FC8-9CF7-438B-94F2-42E3810C3641}.Debug|x86.Build.0 = Debug|x86
-		{8EA21FC8-9CF7-438B-94F2-42E3810C3641}.Release|x86.ActiveCfg = Release|x86
-		{8EA21FC8-9CF7-438B-94F2-42E3810C3641}.Release|x86.Build.0 = Release|x86
-	EndGlobalSection
-	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = StackExchange.Redis.md\StackExchange.Redis.md.csproj
-	EndGlobalSection
-EndGlobal
--- a/StackExchange.Redis.sln
+++ b/StackExchange.Redis.sln

 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.24606.1
+VisualStudioVersion = 14.0.24720.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StackExchange.Redis", "StackExchange.Redis\StackExchange.Redis.csproj", "{7CEC07F2-8C03-4C42-B048-738B215824C1}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StackExchange.Redis.Tests", "StackExchange.Redis.Tests\StackExchange.Redis.Tests.csproj", "{19C00111-1328-4089-8565-94920B5B47F2}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{D3090DF1-8760-4FE2-A595-4C8AC12854ED}"
 	ProjectSection(SolutionItems) = preProject
 		.nuget\packages.config = .nuget\packages.config
@@ -52,14 +48,18 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MigratedBookSleeveTestSuite
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StackExchange.Redis_Net40", "StackExchange.Redis_Net40\StackExchange.Redis_Net40.csproj", "{36CAC6B6-2B88-447F-AA35-D4DAA5E4F2C7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StackExchange.Redis.StrongName", "StackExchange.Redis\StackExchange.Redis.StrongName.csproj", "{EBF46088-E318-4D32-9EFB-01EF130A4554}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StackExchange.Redis_Net40.StrongName", "StackExchange.Redis_Net40\StackExchange.Redis_Net40.StrongName.csproj", "{75CED009-AAC6-4AC1-9C38-A0530619062D}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StackExchange.Redis_Net46", "StackExchange.Redis_Net46\StackExchange.Redis_Net46.csproj", "{8C473A6F-B0DE-4ADD-88F8-C41B441E407C}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StackExchange.Redis_Net46.StrongName", "StackExchange.Redis_Net46\StackExchange.Redis_Net46.StrongName.csproj", "{8CE5D027-E332-42DD-BA54-16310DCD529C}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StackExchange.Redis_Net45", "StackExchange.Redis_Net45\StackExchange.Redis_Net45.csproj", "{7CEC07F2-8C03-4C42-B048-738B215824C1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StackExchange.Redis_Net45.StrongName", "StackExchange.Redis_Net45\StackExchange.Redis_Net45.StrongName.csproj", "{EBF46088-E318-4D32-9EFB-01EF130A4554}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StackExchange.Redis.Tests_Net46", "StackExchange.Redis.Tests_Net46\StackExchange.Redis.Tests_Net46.csproj", "{19C00111-1328-4089-8565-94920B5B47F2}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -69,26 +69,6 @@ Global
 		Verbose|Any CPU = Verbose|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7CEC07F2-8C03-4C42-B048-738B215824C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7CEC07F2-8C03-4C42-B048-738B215824C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7CEC07F2-8C03-4C42-B048-738B215824C1}.Log Output|Any CPU.ActiveCfg = Log Output|Any CPU
-		{7CEC07F2-8C03-4C42-B048-738B215824C1}.Log Output|Any CPU.Build.0 = Log Output|Any CPU
-		{7CEC07F2-8C03-4C42-B048-738B215824C1}.Mono|Any CPU.ActiveCfg = Mono|Any CPU
-		{7CEC07F2-8C03-4C42-B048-738B215824C1}.Mono|Any CPU.Build.0 = Mono|Any CPU
-		{7CEC07F2-8C03-4C42-B048-738B215824C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7CEC07F2-8C03-4C42-B048-738B215824C1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7CEC07F2-8C03-4C42-B048-738B215824C1}.Verbose|Any CPU.ActiveCfg = Verbose|Any CPU
-		{7CEC07F2-8C03-4C42-B048-738B215824C1}.Verbose|Any CPU.Build.0 = Verbose|Any CPU
-		{19C00111-1328-4089-8565-94920B5B47F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{19C00111-1328-4089-8565-94920B5B47F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{19C00111-1328-4089-8565-94920B5B47F2}.Log Output|Any CPU.ActiveCfg = Log Output|Any CPU
-		{19C00111-1328-4089-8565-94920B5B47F2}.Log Output|Any CPU.Build.0 = Log Output|Any CPU
-		{19C00111-1328-4089-8565-94920B5B47F2}.Mono|Any CPU.ActiveCfg = Mono|Any CPU
-		{19C00111-1328-4089-8565-94920B5B47F2}.Mono|Any CPU.Build.0 = Mono|Any CPU
-		{19C00111-1328-4089-8565-94920B5B47F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{19C00111-1328-4089-8565-94920B5B47F2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{19C00111-1328-4089-8565-94920B5B47F2}.Verbose|Any CPU.ActiveCfg = Verbose|Any CPU
-		{19C00111-1328-4089-8565-94920B5B47F2}.Verbose|Any CPU.Build.0 = Verbose|Any CPU
 		{6756F911-BD09-4226-B597-67871DEB8ED5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6756F911-BD09-4226-B597-67871DEB8ED5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6756F911-BD09-4226-B597-67871DEB8ED5}.Log Output|Any CPU.ActiveCfg = Log Output|Any CPU
@@ -139,16 +119,6 @@ Global
 		{36CAC6B6-2B88-447F-AA35-D4DAA5E4F2C7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{36CAC6B6-2B88-447F-AA35-D4DAA5E4F2C7}.Verbose|Any CPU.ActiveCfg = Release|Any CPU
 		{36CAC6B6-2B88-447F-AA35-D4DAA5E4F2C7}.Verbose|Any CPU.Build.0 = Release|Any CPU
-		{EBF46088-E318-4D32-9EFB-01EF130A4554}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EBF46088-E318-4D32-9EFB-01EF130A4554}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EBF46088-E318-4D32-9EFB-01EF130A4554}.Log Output|Any CPU.ActiveCfg = Log Output|Any CPU
-		{EBF46088-E318-4D32-9EFB-01EF130A4554}.Log Output|Any CPU.Build.0 = Log Output|Any CPU
-		{EBF46088-E318-4D32-9EFB-01EF130A4554}.Mono|Any CPU.ActiveCfg = Mono|Any CPU
-		{EBF46088-E318-4D32-9EFB-01EF130A4554}.Mono|Any CPU.Build.0 = Mono|Any CPU
-		{EBF46088-E318-4D32-9EFB-01EF130A4554}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EBF46088-E318-4D32-9EFB-01EF130A4554}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EBF46088-E318-4D32-9EFB-01EF130A4554}.Verbose|Any CPU.ActiveCfg = Verbose|Any CPU
-		{EBF46088-E318-4D32-9EFB-01EF130A4554}.Verbose|Any CPU.Build.0 = Verbose|Any CPU
 		{75CED009-AAC6-4AC1-9C38-A0530619062D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{75CED009-AAC6-4AC1-9C38-A0530619062D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{75CED009-AAC6-4AC1-9C38-A0530619062D}.Log Output|Any CPU.ActiveCfg = Release|Any CPU
@@ -179,6 +149,36 @@ Global
 		{8CE5D027-E332-42DD-BA54-16310DCD529C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8CE5D027-E332-42DD-BA54-16310DCD529C}.Verbose|Any CPU.ActiveCfg = Mono|Any CPU
 		{8CE5D027-E332-42DD-BA54-16310DCD529C}.Verbose|Any CPU.Build.0 = Mono|Any CPU
+		{7CEC07F2-8C03-4C42-B048-738B215824C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7CEC07F2-8C03-4C42-B048-738B215824C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7CEC07F2-8C03-4C42-B048-738B215824C1}.Log Output|Any CPU.ActiveCfg = Log Output|Any CPU
+		{7CEC07F2-8C03-4C42-B048-738B215824C1}.Log Output|Any CPU.Build.0 = Log Output|Any CPU
+		{7CEC07F2-8C03-4C42-B048-738B215824C1}.Mono|Any CPU.ActiveCfg = Mono|Any CPU
+		{7CEC07F2-8C03-4C42-B048-738B215824C1}.Mono|Any CPU.Build.0 = Mono|Any CPU
+		{7CEC07F2-8C03-4C42-B048-738B215824C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7CEC07F2-8C03-4C42-B048-738B215824C1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7CEC07F2-8C03-4C42-B048-738B215824C1}.Verbose|Any CPU.ActiveCfg = Verbose|Any CPU
+		{7CEC07F2-8C03-4C42-B048-738B215824C1}.Verbose|Any CPU.Build.0 = Verbose|Any CPU
+		{EBF46088-E318-4D32-9EFB-01EF130A4554}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EBF46088-E318-4D32-9EFB-01EF130A4554}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EBF46088-E318-4D32-9EFB-01EF130A4554}.Log Output|Any CPU.ActiveCfg = Log Output|Any CPU
+		{EBF46088-E318-4D32-9EFB-01EF130A4554}.Log Output|Any CPU.Build.0 = Log Output|Any CPU
+		{EBF46088-E318-4D32-9EFB-01EF130A4554}.Mono|Any CPU.ActiveCfg = Mono|Any CPU
+		{EBF46088-E318-4D32-9EFB-01EF130A4554}.Mono|Any CPU.Build.0 = Mono|Any CPU
+		{EBF46088-E318-4D32-9EFB-01EF130A4554}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EBF46088-E318-4D32-9EFB-01EF130A4554}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EBF46088-E318-4D32-9EFB-01EF130A4554}.Verbose|Any CPU.ActiveCfg = Verbose|Any CPU
+		{EBF46088-E318-4D32-9EFB-01EF130A4554}.Verbose|Any CPU.Build.0 = Verbose|Any CPU
+		{19C00111-1328-4089-8565-94920B5B47F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19C00111-1328-4089-8565-94920B5B47F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19C00111-1328-4089-8565-94920B5B47F2}.Log Output|Any CPU.ActiveCfg = Log Output|Any CPU
+		{19C00111-1328-4089-8565-94920B5B47F2}.Log Output|Any CPU.Build.0 = Log Output|Any CPU
+		{19C00111-1328-4089-8565-94920B5B47F2}.Mono|Any CPU.ActiveCfg = Mono|Any CPU
+		{19C00111-1328-4089-8565-94920B5B47F2}.Mono|Any CPU.Build.0 = Mono|Any CPU
+		{19C00111-1328-4089-8565-94920B5B47F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19C00111-1328-4089-8565-94920B5B47F2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19C00111-1328-4089-8565-94920B5B47F2}.Verbose|Any CPU.ActiveCfg = Verbose|Any CPU
+		{19C00111-1328-4089-8565-94920B5B47F2}.Verbose|Any CPU.Build.0 = Verbose|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

--- a/StackExchange.Redis/StackExchange.Redis.md.csproj
+++ b/StackExchange.Redis/StackExchange.Redis.md.csproj
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{8EA21FC8-9CF7-438B-94F2-42E3810C3641}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>StackExchange.Redis.md</RootNamespace>
-    <AssemblyName>StackExchange.Redis.md</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;MONO</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
-    <ConsolePause>false</ConsolePause>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
-    <ConsolePause>false</ConsolePause>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>MONO</DefineConstants>
-  </PropertyGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="StackExchange\Redis\Aggregate.cs" />
-    <Compile Include="StackExchange\Redis\Bitwise.cs" />
-    <Compile Include="StackExchange\Redis\ClientFlags.cs" />
-    <Compile Include="StackExchange\Redis\ClientInfo.cs" />
-    <Compile Include="StackExchange\Redis\ClusterConfiguration.cs" />
-    <Compile Include="StackExchange\Redis\CommandFlags.cs" />
-    <Compile Include="StackExchange\Redis\CommandMap.cs" />
-    <Compile Include="StackExchange\Redis\CommandTrace.cs" />
-    <Compile Include="StackExchange\Redis\CompletedDefaultTask.cs" />
-    <Compile Include="StackExchange\Redis\CompletionManager.cs" />
-    <Compile Include="StackExchange\Redis\Condition.cs" />
-    <Compile Include="StackExchange\Redis\ConfigurationOptions.cs" />
-    <Compile Include="StackExchange\Redis\ConnectionCounters.cs" />
-    <Compile Include="StackExchange\Redis\ConnectionFailedEventArgs.cs" />
-    <Compile Include="StackExchange\Redis\ConnectionFailureType.cs" />
-    <Compile Include="StackExchange\Redis\ConnectionMultiplexer.cs" />
-    <Compile Include="StackExchange\Redis\ConnectionMultiplexer.ReaderWriter.cs" />
-    <Compile Include="StackExchange\Redis\ConnectionType.cs" />
-    <Compile Include="StackExchange\Redis\DebuggingAids.cs" />
-    <Compile Include="StackExchange\Redis\EndPointCollection.cs" />
-    <Compile Include="StackExchange\Redis\EndPointEventArgs.cs" />
-    <Compile Include="StackExchange\Redis\ExceptionFactory.cs" />
-    <Compile Include="StackExchange\Redis\Exclude.cs" />
-    <Compile Include="StackExchange\Redis\ExportOptions.cs" />
-    <Compile Include="StackExchange\Redis\Format.cs" />
-    <Compile Include="StackExchange\Redis\HashSlotMovedEventArgs.cs" />
-    <Compile Include="StackExchange\Redis\IBatch.cs" />
-    <Compile Include="StackExchange\Redis\ICompletable.cs" />
-    <Compile Include="StackExchange\Redis\IDatabase.cs" />
-    <Compile Include="StackExchange\Redis\IDatabaseAsync.cs" />
-    <Compile Include="StackExchange\Redis\IMultiMessage.cs" />
-    <Compile Include="StackExchange\Redis\InternalErrorEventArgs.cs" />
-    <Compile Include="StackExchange\Redis\IRedis.cs" />
-    <Compile Include="StackExchange\Redis\IRedisAsync.cs" />
-    <Compile Include="StackExchange\Redis\IServer.cs" />
-    <Compile Include="StackExchange\Redis\ISubscriber.cs" />
-    <Compile Include="StackExchange\Redis\ITransaction.cs" />
-    <Compile Include="StackExchange\Redis\LoggingTextStream.cs" />
-    <Compile Include="StackExchange\Redis\Message.cs" />
-    <Compile Include="StackExchange\Redis\MessageCompletable.cs" />
-    <Compile Include="StackExchange\Redis\MessageQueue.cs" />
-    <Compile Include="StackExchange\Redis\Order.cs" />
-    <Compile Include="StackExchange\Redis\PhysicalBridge.cs" />
-    <Compile Include="StackExchange\Redis\PhysicalConnection.cs" />
-    <Compile Include="StackExchange\Redis\RawResult.cs" />
-    <Compile Include="StackExchange\Redis\RedisBase.cs" />
-    <Compile Include="StackExchange\Redis\RedisBatch.cs" />
-    <Compile Include="StackExchange\Redis\RedisChannel.cs" />
-    <Compile Include="StackExchange\Redis\RedisCommand.cs" />
-    <Compile Include="StackExchange\Redis\RedisDatabase.cs" />
-    <Compile Include="StackExchange\Redis\RedisErrorEventArgs.cs" />
-    <Compile Include="StackExchange\Redis\RedisFeatures.cs" />
-    <Compile Include="StackExchange\Redis\RedisKey.cs" />
-    <Compile Include="StackExchange\Redis\RedisLiterals.cs" />
-    <Compile Include="StackExchange\Redis\RedisResult.cs" />
-    <Compile Include="StackExchange\Redis\RedisServer.cs" />
-    <Compile Include="StackExchange\Redis\RedisSubscriber.cs" />
-    <Compile Include="StackExchange\Redis\RedisTransaction.cs" />
-    <Compile Include="StackExchange\Redis\RedisType.cs" />
-    <Compile Include="StackExchange\Redis\RedisValue.cs" />
-    <Compile Include="StackExchange\Redis\ReplicationChangeOptions.cs" />
-    <Compile Include="StackExchange\Redis\ResultBox.cs" />
-    <Compile Include="StackExchange\Redis\ResultProcessor.cs" />
-    <Compile Include="StackExchange\Redis\ResultType.cs" />
-    <Compile Include="StackExchange\Redis\SaveType.cs" />
-    <Compile Include="StackExchange\Redis\ServerCounters.cs" />
-    <Compile Include="StackExchange\Redis\ServerEndPoint.cs" />
-    <Compile Include="StackExchange\Redis\ServerSelectionStrategy.cs" />
-    <Compile Include="StackExchange\Redis\ServerType.cs" />
-    <Compile Include="StackExchange\Redis\SetOperation.cs" />
-    <Compile Include="StackExchange\Redis\ShutdownMode.cs" />
-    <Compile Include="StackExchange\Redis\SocketManager.cs" />
-    <Compile Include="StackExchange\Redis\SortType.cs" />
-    <Compile Include="StackExchange\Redis\StringSplits.cs" />
-    <Compile Include="StackExchange\Redis\TaskSource.cs" />
-    <Compile Include="StackExchange\Redis\When.cs" />
-    <Compile Include="StackExchange\Redis\HashEntry.cs" />
-    <Compile Include="StackExchange\Redis\ExtensionMethods.cs" />
-    <Compile Include="StackExchange\Redis\SocketManager.NoPoll.cs" />
-    <Compile Include="StackExchange\Redis\SocketManager.Poll.cs" />
-    <Compile Include="StackExchange\Redis\SortedSetEntry.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.IO.Compression" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="StackExchange\Redis\" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
--- a/StackExchange.Redis/StackExchange.Redis.snk
+++ b/StackExchange.Redis/StackExchange.Redis.snk
--- a/StackExchange.Redis_dnxcore50/StackExchange.Redis/StackExchange.Redis.xproj
+++ b/StackExchange.Redis_dnxcore50/StackExchange.Redis/StackExchange.Redis.xproj
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>86526b5c-1163-4481-a5e2-a303a0bb1535</ProjectGuid>
-    <RootNamespace>StackExchange.Redis</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0.24720" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0.24720</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>ef84877f-59be-41be-9013-e765af0bb72e</ProjectGuid>
+    <RootNamespace>StackExchange.Redis</RootNamespace>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
--- a/StackExchange.Redis/StackExchange/Redis/InternalRegexCompiledOption.cs
+++ b/StackExchange.Redis/StackExchange/Redis/InternalRegexCompiledOption.cs
-#if DNXCORE50
-using System;
-#endif
+using System;
 using System.Text.RegularExpressions;

 namespace StackExchange.Redis
@@ -14,7 +12,7 @@ internal static class InternalRegexCompiledOption

        static InternalRegexCompiledOption()
        {
-#if DNXCORE50
+#if CORE_CLR
            if (!Enum.TryParse("Compiled", out RegexCompiledOption))
                RegexCompiledOption = RegexOptions.None;
 #else

--- a/StackExchange.Redis/StackExchange/Redis/KeyspaceIsolation/WrapperBase.cs
+++ b/StackExchange.Redis/StackExchange/Redis/KeyspaceIsolation/WrapperBase.cs
@@ -335,12 +335,12 @@ public Task<RedisResult> ScriptEvaluateAsync(string script, RedisKey[] keys = nu

        public Task<RedisResult> ScriptEvaluateAsync(LuaScript script, object parameters = null, CommandFlags flags = CommandFlags.None)
        {
-            throw new NotImplementedException();
+            return this.Inner.ScriptEvaluateAsync(script, parameters, flags);
        }

        public Task<RedisResult> ScriptEvaluateAsync(LoadedLuaScript script, object parameters = null, CommandFlags flags = CommandFlags.None)
        {
-            throw new NotImplementedException();
+            return this.Inner.ScriptEvaluateAsync(script, parameters, flags);
        }

        public Task<long> SetAddAsync(RedisKey key, RedisValue[] values, CommandFlags flags = CommandFlags.None)

--- a/StackExchange.Redis/StackExchange/Redis/PhysicalConnection.cs
+++ b/StackExchange.Redis/StackExchange/Redis/PhysicalConnection.cs
@@ -10,7 +10,7 @@
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
 using System.Threading;
-#if DNXCORE50
+#if CORE_CLR
 using System.Threading.Tasks;
 #endif

@@ -1113,7 +1113,7 @@ public void CheckForStaleConnection(ref SocketManager.ManagerState managerState)
        }
    }

-#if DNXCORE50
+#if CORE_CLR
    internal static class StreamExtensions
    {
        internal static IAsyncResult BeginRead(this Stream stream, byte[] buffer, int offset, int count, AsyncCallback ac, object state)

--- a/StackExchange.Redis/StackExchange/Redis/RedisValue.cs
+++ b/StackExchange.Redis/StackExchange/Redis/RedisValue.cs
 using System;
-#if DNXCORE50
+#if CORE_CLR
 using System.Collections.Generic;
 using System.Reflection;
 #endif
@@ -716,7 +716,7 @@ public bool TryParse(out double val)

    internal static class ReflectionExtensions
    {
-#if DNXCORE50
+#if CORE_CLR
        internal static TypeCode GetTypeCode(this Type type)
        {
            if (type == null) return TypeCode.Empty;

--- a/StackExchange.Redis/StackExchange/Redis/SocketManager.cs
+++ b/StackExchange.Redis/StackExchange/Redis/SocketManager.cs
@@ -180,7 +180,11 @@ internal SocketToken BeginConnect(EndPoint endpoint, ISocketCallback callback, C
                        (cb) =>
                        {
                            multiplexer.LogLocked(log, "BeginConnect: {0}", formattedEndpoint);
+#if CORE_CLR
+                            throw new NotImplementedException("TODO CORE CLR");
+#else
                            return socket.BeginConnect(dnsEndpoint.Host, dnsEndpoint.Port, cb, Tuple.Create(socket, callback));
+#endif
                        },
                        (ar) =>
                        {
@@ -195,7 +199,11 @@ internal SocketToken BeginConnect(EndPoint endpoint, ISocketCallback callback, C
                    CompletionTypeHelper.RunWithCompletionType(
                        (cb) => {
                            multiplexer.LogLocked(log, "BeginConnect: {0}", formattedEndpoint);
+#if CORE_CLR
+                            throw new NotImplementedException("TODO CORE CLR");
+#else
                            return socket.BeginConnect(endpoint, cb, Tuple.Create(socket, callback));
+#endif
                        },
                        (ar) => {
                            multiplexer.LogLocked(log, "EndConnect: {0}", formattedEndpoint);
@@ -276,7 +284,11 @@ private void EndConnectImpl(IAsyncResult ar, ConnectionMultiplexer multiplexer,
                if (ignoreConnect) return;
                var socket = tuple.Item1;
                var callback = tuple.Item2;
+#if CORE_CLR
+                throw new NotImplementedException("TODO CORE CLR");
+#else
                socket.EndConnect(ar);
+
                var netStream = new NetworkStream(socket, false);
                var socketMode = callback == null ? SocketMode.Abort : callback.Connected(netStream, log);
                switch (socketMode)
@@ -300,8 +312,9 @@ private void EndConnectImpl(IAsyncResult ar, ConnectionMultiplexer multiplexer,
                        Shutdown(socket);
                        break;
                }
+#endif
            }
-            catch(ObjectDisposedException)
+            catch (ObjectDisposedException)
            {
                multiplexer.LogLocked(log, "(socket shutdown)");
                if (tuple != null)

--- a/StackExchange.Redis/packages/NUnit.2.6.3/lib/nunit.framework.dll
+++ b/StackExchange.Redis/packages/NUnit.2.6.3/lib/nunit.framework.dll
--- a/StackExchange.Redis/packages/NUnit.2.6.3/lib/nunit.framework.xml
+++ b/StackExchange.Redis/packages/NUnit.2.6.3/lib/nunit.framework.xml
--- a/StackExchange.Redis/packages/NUnit.2.6.3/license.txt
+++ b/StackExchange.Redis/packages/NUnit.2.6.3/license.txt
-Copyright © 2002-2013 Charlie Poole
-Copyright © 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov
-Copyright © 2000-2002 Philip A. Craig
-
-This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment (see the following) in the product documentation is required.
-
-Portions Copyright © 2002-2013 Charlie Poole or Copyright © 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov or Copyright © 2000-2002 Philip A. Craig
-
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source distribution.
--- a/StackExchange.Redis/packages/repositories.config
+++ b/StackExchange.Redis/packages/repositories.config
-<?xml version="1.0" encoding="utf-8"?>
-<repositories>
-  <repository path="..\..\StackExchange.Redis.Tests\packages.config" />
-</repositories>
\ No newline at end of file
--- a/StackExchange.Redis_dnxcore50/StackExchange.Redis/project.json
+++ b/StackExchange.Redis_dnxcore50/StackExchange.Redis/project.json
-{
-  "version": "1.1.0-alpha1",
-  "description": "High performance Redis client, incorporating both synchronous and asynchronous usage.",
-  "authors": [ "Stack Exchange inc., marc.gravell" ],
-  "owners": [ "marc.gravell" ],
-  "tags": [ "Async", "Redis", "Cache", "PubSub", "Messaging" ],
-  "projectUrl": "https://github.com/StackExchange/StackExchange.Redis",
-  "licenseUrl": "https://raw.github.com/StackExchange/StackExchange.Redis/master/LICENSE",
-  "copyright": "Stack Exchange inc. 2014-",
-  "requireLicenseAcceptance": false,
-  "summary": "Redis client library",
-  "compile": [
-    "../../StackExchange.Redis/**/*.cs"
-  ],
-  "dependencies": {
-  },
-  "compilationOptions": {
-    "allowUnsafe": true    
-  },
-  "frameworks": {
-    "dnxcore50": {
-      "compilationOptions": {
-        "define": [ "PLAT_SAFE_CONTINUATIONS", "CORE_CLR" ]
-      },
-      "dependencies": {
-        "System.Collections.Concurrent": "4.0.11-beta-23516",
-        "System.Collections.NonGeneric": "4.0.1-beta-23516",
-        "System.Diagnostics.Debug": "4.0.11-beta-23516",
-        "System.Diagnostics.Tools": "4.0.1-beta-23516",
-        "System.Diagnostics.TraceSource": "4.0.0-beta-23516",
-        "System.Globalization": "4.0.11-beta-23516",
-        "System.IO": "4.0.11-beta-23516",
-        "System.IO.Compression": "4.1.0-beta-23516",
-        "System.IO.FileSystem": "4.0.1-beta-23516",
-        "System.Linq": "4.0.1-beta-23516",
-        "System.Net.NameResolution": "4.0.0-beta-23516",
-        "System.Net.Primitives": "4.0.11-beta-23516",
-        "System.Net.Security": "4.0.0-beta-23516",
-        "System.Net.Sockets": "4.1.0-beta-23516",
-        "System.Reflection": "4.1.0-beta-23516",
-        "System.Reflection.Emit": "4.0.1-beta-23516",
-        "System.Reflection.Emit.Lightweight": "4.0.1-beta-23516",
-        "System.Reflection.Primitives": "4.0.1-beta-23516",
-        "System.Reflection.TypeExtensions": "4.1.0-beta-23516",
-        "System.Security.Cryptography.Algorithms": "4.0.0-beta-23516",
-        "System.Security.Cryptography.X509Certificates": "4.0.0-beta-23516",
-        "System.Text.Encoding": "4.0.11-beta-23516",
-        "System.Text.RegularExpressions": "4.0.11-beta-23516",
-        "System.Threading": "4.0.11-beta-23516",
-        "System.Threading.Tasks": "4.0.11-beta-23516",
-        "System.Threading.Thread": "4.0.0-beta-23516",
-        "System.Threading.ThreadPool": "4.0.10-beta-23516",
-        "System.Threading.Timer": "4.0.1-beta-23516"
-      }
-    }
-  }
+{
+  "version": "1.1.0-alpha1",
+  "description": "High performance Redis client, incorporating both synchronous and asynchronous usage.",
+  "authors": [ "Stack Exchange inc., marc.gravell" ],
+  "owners": [ "marc.gravell" ],
+  "tags": [ "Async", "Redis", "Cache", "PubSub", "Messaging" ],
+  "projectUrl": "https://github.com/StackExchange/StackExchange.Redis",
+  "licenseUrl": "https://raw.github.com/StackExchange/StackExchange.Redis/master/LICENSE",
+  "copyright": "Stack Exchange inc. 2014-",
+  "requireLicenseAcceptance": false,
+  "summary": "Redis client library",
+  "dependencies": {
+  },
+  "compilationOptions": {
+    "allowUnsafe": true    
+  },
+  "frameworks": {
+    "net40": {
+      "dependencies": {
+        "Microsoft.Bcl": "1.1.10",
+        "Microsoft.Bcl.Async": "1.0.168"
+      }
+    },
+    "net45": {
+      "frameworkAssemblies": {
+        "System.IO.Compression": "4.0.0.0"
+      }
+    },
+    "net46": {
+      "frameworkAssemblies": {
+        "System.IO.Compression": "4.0.0.0"
+      },
+      "define": [ "PLAT_SAFE_CONTINUATIONS" ]
+    },
+    "dnxcore50": {
+      "compilationOptions": {
+        "define": [ "PLAT_SAFE_CONTINUATIONS", "CORE_CLR" ]
+      },
+      "dependencies": {
+        "System.Collections.Concurrent": "4.0.11-beta-23516",
+        "System.Collections.NonGeneric": "4.0.1-beta-23516",
+        "System.Diagnostics.Debug": "4.0.11-beta-23516",
+        "System.Diagnostics.Tools": "4.0.1-beta-23516",
+        "System.Diagnostics.TraceSource": "4.0.0-beta-23516",
+        "System.Globalization": "4.0.11-beta-23516",
+        "System.IO": "4.0.11-beta-23516",
+        "System.IO.Compression": "4.1.0-beta-23516",
+        "System.IO.FileSystem": "4.0.1-beta-23516",
+        "System.Linq": "4.0.1-beta-23516",
+        "System.Net.NameResolution": "4.0.0-beta-23516",
+        "System.Net.Primitives": "4.0.11-beta-23516",
+        "System.Net.Security": "4.0.0-beta-23516",
+        "System.Net.Sockets": "4.1.0-beta-23516",
+        "System.Reflection": "4.1.0-beta-23516",
+        "System.Reflection.Emit": "4.0.1-beta-23516",
+        "System.Reflection.Emit.Lightweight": "4.0.1-beta-23516",
+        "System.Reflection.Primitives": "4.0.1-beta-23516",
+        "System.Reflection.TypeExtensions": "4.1.0-beta-23516",
+        "System.Security.Cryptography.Algorithms": "4.0.0-beta-23516",
+        "System.Security.Cryptography.X509Certificates": "4.0.0-beta-23516",
+        "System.Text.Encoding": "4.0.11-beta-23516",
+        "System.Text.RegularExpressions": "4.0.11-beta-23516",
+        "System.Threading": "4.0.11-beta-23516",
+        "System.Threading.Tasks": "4.0.11-beta-23516",
+        "System.Threading.Thread": "4.0.0-beta-23516",
+        "System.Threading.ThreadPool": "4.0.10-beta-23516",
+        "System.Threading.Timer": "4.0.1-beta-23516"
+      }
+    },
+    "dotnet5.5": {
+      "compilationOptions": {
+        "define": [ "PLAT_SAFE_CONTINUATIONS", "CORE_CLR" ]
+      },
+      "dependencies": {
+        "System.Collections.Concurrent": "4.0.11-beta-23516",
+        "System.Collections.NonGeneric": "4.0.1-beta-23516",
+        "System.Diagnostics.Debug": "4.0.11-beta-23516",
+        "System.Diagnostics.Tools": "4.0.1-beta-23516",
+        "System.Diagnostics.TraceSource": "4.0.0-beta-23516",
+        "System.Globalization": "4.0.11-beta-23516",
+        "System.IO": "4.0.11-beta-23516",
+        "System.IO.Compression": "4.1.0-beta-23516",
+        "System.IO.FileSystem": "4.0.1-beta-23516",
+        "System.Linq": "4.0.1-beta-23516",
+        "System.Net.NameResolution": "4.0.0-beta-23516",
+        "System.Net.Primitives": "4.0.11-beta-23516",
+        "System.Net.Security": "4.0.0-beta-23516",
+        "System.Net.Sockets": "4.1.0-beta-23516",
+        "System.Reflection": "4.1.0-beta-23516",
+        "System.Reflection.Emit": "4.0.1-beta-23516",
+        "System.Reflection.Emit.Lightweight": "4.0.1-beta-23516",
+        "System.Reflection.Primitives": "4.0.1-beta-23516",
+        "System.Reflection.TypeExtensions": "4.1.0-beta-23516",
+        "System.Security.Cryptography.Algorithms": "4.0.0-beta-23516",
+        "System.Security.Cryptography.X509Certificates": "4.0.0-beta-23516",
+        "System.Text.Encoding": "4.0.11-beta-23516",
+        "System.Text.RegularExpressions": "4.0.11-beta-23516",
+        "System.Threading": "4.0.11-beta-23516",
+        "System.Threading.Tasks": "4.0.11-beta-23516",
+        "System.Threading.Thread": "4.0.0-beta-23516",
+        "System.Threading.ThreadPool": "4.0.10-beta-23516",
+        "System.Threading.Timer": "4.0.1-beta-23516"
+      }
+    }
+  }
 }
\ No newline at end of file
--- a/StackExchange.Redis_Net40/StackExchange.Redis.snk
+++ b/StackExchange.Redis_Net40/StackExchange.Redis.snk
--- a/StackExchange.Redis_Net40/StackExchange.Redis_Net40.StrongName.csproj
+++ b/StackExchange.Redis_Net40/StackExchange.Redis_Net40.StrongName.csproj
@@ -39,7 +39,7 @@
    <SignAssembly>true</SignAssembly>
  </PropertyGroup>
  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>StackExchange.Redis.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\StackExchange.Redis.snk</AssemblyOriginatorKeyFile>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Mono|AnyCPU'">
    <OutputPath>bin\Mono\</OutputPath>
@@ -76,119 +76,11 @@
      <HintPath>..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.Threading.Tasks.dll</HintPath>
    </Reference>
  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\StackExchange.Redis\Properties\AssemblyInfo.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\Aggregate.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\Bitwise.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ClientFlags.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ClientInfo.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ClientType.cs">
-      <Link>ClientType.cs</Link>
-    </Compile>
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\Compat\ConvertHelper.cs">
-      <Link>ConvertHelper.cs</Link>
-    </Compile>
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\Compat\VolatileWrapper.cs">
-      <Link>VolatileWrapper.cs</Link>
-    </Compile>
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ConcurrentProfileStorageCollection.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ConnectionMultiplexer.Profiling.cs">
-      <DependentUpon>ConnectionMultiplexer.cs</DependentUpon>
-    </Compile>
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ClusterConfiguration.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\CommandFlags.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\CommandMap.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\CommandTrace.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\CompletedDefaultTask.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\CompletionManager.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\Condition.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ConfigurationOptions.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ConnectionCounters.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ConnectionFailedEventArgs.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ConnectionFailureType.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ConnectionMultiplexer.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ConnectionMultiplexer.ReaderWriter.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ConnectionType.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\DebuggingAids.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\EndPointCollection.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\EndPointEventArgs.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ExceptionFactory.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\Exclude.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ExportOptions.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ExtensionMethods.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\Format.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\HashEntry.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\HashSlotMovedEventArgs.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\IBatch.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ICompletable.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\IConnectionMultiplexer.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\IDatabase.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\IDatabaseAsync.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\IMultiMessage.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\InternalErrorEventArgs.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\InternalRegexCompiledOption.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\IProfiler.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\IRedis.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\IRedisAsync.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\IServer.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ISubscriber.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ITransaction.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\LoggingTextStream.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\Message.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\MessageCompletable.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\MessageQueue.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\MigrateOptions.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ProfileContextTracker.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ProfileStorage.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\LuaScript.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\Order.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\PhysicalBridge.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\PhysicalConnection.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RawResult.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisBase.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisBatch.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisChannel.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisCommand.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisDatabase.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisErrorEventArgs.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisFeatures.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisKey.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisLiterals.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisResult.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisServer.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisSubscriber.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisTransaction.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisType.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisValue.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ReplicationChangeOptions.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ResultBox.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ResultProcessor.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ResultType.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ScriptParameterMapper.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\SaveType.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ServerCounters.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ServerEndPoint.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ServerSelectionStrategy.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ServerType.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\SetOperation.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ShutdownMode.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\SocketManager.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\SocketManager.NoPoll.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\SocketManager.Poll.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\SortedSetEntry.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\SortType.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\StringSplits.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\TaskSource.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\When.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\KeyspaceIsolation\BatchWrapper.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\KeyspaceIsolation\DatabaseExtension.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\KeyspaceIsolation\DatabaseWrapper.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\KeyspaceIsolation\TransactionWrapper.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\KeyspaceIsolation\WrapperBase.cs" />
+    <ItemGroup>
+    <Compile Include="..\StackExchange.Redis\**\*.cs"/>
  </ItemGroup>
  <ItemGroup>
    <None Include="packages.config" />
-    <None Include="StackExchange.Redis.snk" />
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />

--- a/StackExchange.Redis_Net40/StackExchange.Redis_Net40.csproj
+++ b/StackExchange.Redis_Net40/StackExchange.Redis_Net40.csproj
@@ -73,115 +73,8 @@
      <Private>True</Private>
    </Reference>
  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\StackExchange.Redis\Properties\AssemblyInfo.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\Aggregate.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\Bitwise.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ClientFlags.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ClientInfo.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ClientType.cs">
-      <Link>ClientType.cs</Link>
-    </Compile>
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\Compat\ConvertHelper.cs">
-      <Link>ConvertHelper.cs</Link>
-    </Compile>
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\Compat\VolatileWrapper.cs">
-      <Link>VolatileWrapper.cs</Link>
-    </Compile>
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ConcurrentProfileStorageCollection.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ConnectionMultiplexer.Profiling.cs">
-      <DependentUpon>ConnectionMultiplexer.cs</DependentUpon>
-    </Compile>
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ClusterConfiguration.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\CommandFlags.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\CommandMap.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\CommandTrace.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\CompletedDefaultTask.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\CompletionManager.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\Condition.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ConfigurationOptions.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ConnectionCounters.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ConnectionFailedEventArgs.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ConnectionFailureType.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ConnectionMultiplexer.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ConnectionMultiplexer.ReaderWriter.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ConnectionType.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\DebuggingAids.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\EndPointCollection.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\EndPointEventArgs.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ExceptionFactory.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\Exclude.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ExportOptions.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ExtensionMethods.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\Format.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\HashEntry.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\HashSlotMovedEventArgs.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\IBatch.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ICompletable.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\IConnectionMultiplexer.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\IDatabase.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\IDatabaseAsync.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\IMultiMessage.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\InternalErrorEventArgs.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\InternalRegexCompiledOption.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\IProfiler.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\IRedis.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\IRedisAsync.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\IServer.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ISubscriber.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ITransaction.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\LoggingTextStream.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\Message.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\MessageCompletable.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\MessageQueue.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\MigrateOptions.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ProfileContextTracker.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ProfileStorage.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\LuaScript.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\Order.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\PhysicalBridge.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\PhysicalConnection.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RawResult.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisBase.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisBatch.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisChannel.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisCommand.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisDatabase.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisErrorEventArgs.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisFeatures.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisKey.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisLiterals.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisResult.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisServer.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisSubscriber.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisTransaction.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisType.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisValue.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ReplicationChangeOptions.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ResultBox.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ResultProcessor.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ResultType.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ScriptParameterMapper.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\SaveType.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ServerCounters.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ServerEndPoint.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ServerSelectionStrategy.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ServerType.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\SetOperation.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ShutdownMode.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\SocketManager.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\SocketManager.NoPoll.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\SocketManager.Poll.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\SortedSetEntry.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\SortType.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\StringSplits.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\TaskSource.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\When.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\KeyspaceIsolation\BatchWrapper.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\KeyspaceIsolation\DatabaseExtension.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\KeyspaceIsolation\DatabaseWrapper.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\KeyspaceIsolation\TransactionWrapper.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\KeyspaceIsolation\WrapperBase.cs" />
+    <ItemGroup>
+    <Compile Include="..\StackExchange.Redis\**\*.cs"/>
  </ItemGroup>
  <ItemGroup>
    <None Include="app.config" />

--- a/StackExchange.Redis/StackExchange.Redis.StrongName.csproj
+++ b/StackExchange.Redis/StackExchange.Redis.StrongName.csproj
@@ -60,7 +60,7 @@
    <SignAssembly>true</SignAssembly>
  </PropertyGroup>
  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>StackExchange.Redis.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\StackExchange.Redis.snk</AssemblyOriginatorKeyFile>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Mono|AnyCPU'">
    <OutputPath>bin\Mono\</OutputPath>
@@ -79,119 +79,7 @@
    <Reference Include="System.IO.Compression" />
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="StackExchange\Redis\Aggregate.cs" />
-    <Compile Include="StackExchange\Redis\ClientType.cs" />
-    <Compile Include="StackExchange\Redis\Compat\ConvertHelper.cs" />
-    <Compile Include="StackExchange\Redis\Compat\VolatileWrapper.cs" />
-    <Compile Include="StackExchange\Redis\ConcurrentProfileStorageCollection.cs" />
-    <Compile Include="StackExchange\Redis\ConnectionMultiplexer.Profiling.cs">
-      <DependentUpon>ConnectionMultiplexer.cs</DependentUpon>
-    </Compile>
-    <Compile Include="StackExchange\Redis\ExtensionMethods.cs" />
-    <Compile Include="StackExchange\Redis\HashEntry.cs" />
-    <Compile Include="StackExchange\Redis\IConnectionMultiplexer.cs" />
-    <Compile Include="StackExchange\Redis\InternalErrorEventArgs.cs" />
-    <Compile Include="StackExchange\Redis\InternalRegexCompiledOption.cs" />
-    <Compile Include="StackExchange\Redis\IProfiler.cs" />
-    <Compile Include="StackExchange\Redis\MigrateOptions.cs" />
-    <Compile Include="StackExchange\Redis\ProfileContextTracker.cs" />
-    <Compile Include="StackExchange\Redis\ProfileStorage.cs" />
-    <Compile Include="StackExchange\Redis\LuaScript.cs" />
-    <Compile Include="StackExchange\Redis\RedisChannel.cs" />
-    <Compile Include="StackExchange\Redis\Bitwise.cs" />
-    <Compile Include="StackExchange\Redis\ClientFlags.cs" />
-    <Compile Include="StackExchange\Redis\ClientInfo.cs" />
-    <Compile Include="StackExchange\Redis\ClusterConfiguration.cs" />
-    <Compile Include="StackExchange\Redis\CommandTrace.cs" />
-    <Compile Include="StackExchange\Redis\Condition.cs" />
-    <Compile Include="StackExchange\Redis\ConfigurationOptions.cs" />
-    <Compile Include="StackExchange\Redis\ConnectionCounters.cs" />
-    <Compile Include="StackExchange\Redis\ConnectionFailedEventArgs.cs" />
-    <Compile Include="StackExchange\Redis\ConnectionFailureType.cs" />
-    <Compile Include="StackExchange\Redis\ConnectionMultiplexer.ReaderWriter.cs">
-      <DependentUpon>ConnectionMultiplexer.cs</DependentUpon>
-    </Compile>
-    <Compile Include="StackExchange\Redis\ConnectionType.cs" />
-    <Compile Include="StackExchange\Redis\DebuggingAids.cs" />
-    <Compile Include="StackExchange\Redis\EndPointCollection.cs" />
-    <Compile Include="StackExchange\Redis\EndPointEventArgs.cs" />
-    <Compile Include="StackExchange\Redis\ExceptionFactory.cs" />
-    <Compile Include="StackExchange\Redis\Exclude.cs" />
-    <Compile Include="StackExchange\Redis\ExportOptions.cs" />
-    <Compile Include="StackExchange\Redis\Format.cs" />
-    <Compile Include="StackExchange\Redis\IBatch.cs" />
-    <Compile Include="StackExchange\Redis\IMultiMessage.cs" />
-    <Compile Include="StackExchange\Redis\Order.cs" />
-    <Compile Include="StackExchange\Redis\RedisBatch.cs" />
-    <Compile Include="StackExchange\Redis\RedisCommand.cs" />
-    <Compile Include="StackExchange\Redis\RedisErrorEventArgs.cs" />
-    <Compile Include="StackExchange\Redis\HashSlotMovedEventArgs.cs" />
-    <Compile Include="StackExchange\Redis\ITransaction.cs" />
-    <Compile Include="StackExchange\Redis\IRedis.cs" />
-    <Compile Include="StackExchange\Redis\IRedisAsync.cs" />
-    <Compile Include="StackExchange\Redis\IDatabase.cs" />
-    <Compile Include="StackExchange\Redis\IDatabaseAsync.cs" />
-    <Compile Include="StackExchange\Redis\IServer.cs" />
-    <Compile Include="StackExchange\Redis\ISubscriber.cs" />
-    <Compile Include="StackExchange\Redis\MessageCompletable.cs" />
-    <Compile Include="StackExchange\Redis\RedisBase.cs" />
-    <Compile Include="StackExchange\Redis\CommandFlags.cs" />
-    <Compile Include="StackExchange\Redis\CommandMap.cs" />
-    <Compile Include="StackExchange\Redis\CompletionManager.cs" />
-    <Compile Include="StackExchange\Redis\ConnectionMultiplexer.cs" />
-    <Compile Include="StackExchange\Redis\CompletedDefaultTask.cs" />
-    <Compile Include="StackExchange\Redis\ICompletable.cs" />
-    <Compile Include="StackExchange\Redis\LoggingTextStream.cs" />
-    <Compile Include="StackExchange\Redis\PhysicalBridge.cs" />
-    <Compile Include="StackExchange\Redis\Message.cs" />
-    <Compile Include="StackExchange\Redis\MessageQueue.cs" />
-    <Compile Include="StackExchange\Redis\PhysicalConnection.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="StackExchange\Redis\RedisResult.cs" />
-    <Compile Include="StackExchange\Redis\RedisTransaction.cs" />
-    <Compile Include="StackExchange\Redis\RedisDatabase.cs" />
-    <Compile Include="StackExchange\Redis\RedisFeatures.cs" />
-    <Compile Include="StackExchange\Redis\RedisKey.cs" />
-    <Compile Include="StackExchange\Redis\RedisLiterals.cs" />
-    <Compile Include="StackExchange\Redis\RedisServer.cs" />
-    <Compile Include="StackExchange\Redis\RedisType.cs" />
-    <Compile Include="StackExchange\Redis\RedisValue.cs" />
-    <Compile Include="StackExchange\Redis\ReplicationChangeOptions.cs" />
-    <Compile Include="StackExchange\Redis\RawResult.cs" />
-    <Compile Include="StackExchange\Redis\ResultBox.cs" />
-    <Compile Include="StackExchange\Redis\ResultProcessor.cs" />
-    <Compile Include="StackExchange\Redis\RedisSubscriber.cs" />
-    <Compile Include="StackExchange\Redis\ResultType.cs" />
-    <Compile Include="StackExchange\Redis\ScriptParameterMapper.cs" />
-    <Compile Include="StackExchange\Redis\ServerCounters.cs" />
-    <Compile Include="StackExchange\Redis\ServerEndPoint.cs" />
-    <Compile Include="StackExchange\Redis\ServerSelectionStrategy.cs" />
-    <Compile Include="StackExchange\Redis\ServerType.cs" />
-    <Compile Include="StackExchange\Redis\SetOperation.cs" />
-    <Compile Include="StackExchange\Redis\SocketManager.cs" />
-    <Compile Include="StackExchange\Redis\SocketManager.NoPoll.cs">
-      <DependentUpon>SocketManager.cs</DependentUpon>
-    </Compile>
-    <Compile Include="StackExchange\Redis\SortedSetEntry.cs" />
-    <Compile Include="StackExchange\Redis\SortType.cs" />
-    <Compile Include="StackExchange\Redis\StringSplits.cs" />
-    <Compile Include="StackExchange\Redis\TaskSource.cs" />
-    <Compile Include="StackExchange\Redis\When.cs" />
-    <Compile Include="StackExchange\Redis\ShutdownMode.cs" />
-    <Compile Include="StackExchange\Redis\SaveType.cs" />
-    <Compile Include="StackExchange\Redis\KeyspaceIsolation\BatchWrapper.cs" />
-    <Compile Include="StackExchange\Redis\KeyspaceIsolation\DatabaseExtension.cs" />
-    <Compile Include="StackExchange\Redis\KeyspaceIsolation\DatabaseWrapper.cs" />
-    <Compile Include="StackExchange\Redis\KeyspaceIsolation\TransactionWrapper.cs" />
-    <Compile Include="StackExchange\Redis\KeyspaceIsolation\WrapperBase.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="StackExchange\Redis\SocketManager.Poll.cs">
-      <DependentUpon>SocketManager.cs</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="StackExchange.Redis.snk" />
+    <Compile Include="..\StackExchange.Redis\**\*.cs"/>
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

--- a/StackExchange.Redis/StackExchange.Redis.csproj
+++ b/StackExchange.Redis/StackExchange.Redis.csproj
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{7CEC07F2-8C03-4C42-B048-738B215824C1}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>StackExchange.Redis</RootNamespace>
-    <AssemblyName>StackExchange.Redis</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;FEATURE_SERIALIZATION FEATURE_SOCKET_MODE_POLL</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DocumentationFile>bin\Debug\StackExchange.Redis.XML</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;FEATURE_SERIALIZATION FEATURE_SOCKET_MODE_POLL</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DocumentationFile>bin\Release\StackExchange.Redis.xml</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Verbose|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Verbose\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;VERBOSE;FEATURE_SERIALIZATION FEATURE_SOCKET_MODE_POLL</DefineConstants>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DocumentationFile>bin\Debug\StackExchange.Redis.xml</DocumentationFile>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Log Output|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Log Output\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;LOGOUTPUT FEATURE_SERIALIZATION FEATURE_SOCKET_MODE_POLL</DefineConstants>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DocumentationFile>bin\Debug\StackExchange.Redis.xml</DocumentationFile>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Mono|AnyCPU'">
-    <OutputPath>bin\Mono\</OutputPath>
-    <DefineConstants>TRACE;__MonoCS__ FEATURE_SERIALIZATION</DefineConstants>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DocumentationFile>bin\Release\StackExchange.Redis.xml</DocumentationFile>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.IO.Compression" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="StackExchange\Redis\Aggregate.cs" />
-    <Compile Include="StackExchange\Redis\ClientType.cs" />
-    <Compile Include="StackExchange\Redis\Compat\ConvertHelper.cs" />
-    <Compile Include="StackExchange\Redis\Compat\VolatileWrapper.cs" />
-    <Compile Include="StackExchange\Redis\ConcurrentProfileStorageCollection.cs" />
-    <Compile Include="StackExchange\Redis\ConnectionMultiplexer.Profiling.cs">
-      <DependentUpon>ConnectionMultiplexer.cs</DependentUpon>
-    </Compile>
-    <Compile Include="StackExchange\Redis\ExtensionMethods.cs" />
-    <Compile Include="StackExchange\Redis\HashEntry.cs" />
-    <Compile Include="StackExchange\Redis\IConnectionMultiplexer.cs" />
-    <Compile Include="StackExchange\Redis\InternalErrorEventArgs.cs" />
-    <Compile Include="StackExchange\Redis\InternalRegexCompiledOption.cs" />
-    <Compile Include="StackExchange\Redis\IProfiler.cs" />
-    <Compile Include="StackExchange\Redis\MigrateOptions.cs" />
-    <Compile Include="StackExchange\Redis\ProfileContextTracker.cs" />
-    <Compile Include="StackExchange\Redis\ProfileStorage.cs" />
-    <Compile Include="StackExchange\Redis\LuaScript.cs" />
-    <Compile Include="StackExchange\Redis\RedisChannel.cs" />
-    <Compile Include="StackExchange\Redis\Bitwise.cs" />
-    <Compile Include="StackExchange\Redis\ClientFlags.cs" />
-    <Compile Include="StackExchange\Redis\ClientInfo.cs" />
-    <Compile Include="StackExchange\Redis\ClusterConfiguration.cs" />
-    <Compile Include="StackExchange\Redis\CommandTrace.cs" />
-    <Compile Include="StackExchange\Redis\Condition.cs" />
-    <Compile Include="StackExchange\Redis\ConfigurationOptions.cs" />
-    <Compile Include="StackExchange\Redis\ConnectionCounters.cs" />
-    <Compile Include="StackExchange\Redis\ConnectionFailedEventArgs.cs" />
-    <Compile Include="StackExchange\Redis\ConnectionFailureType.cs" />
-    <Compile Include="StackExchange\Redis\ConnectionMultiplexer.ReaderWriter.cs">
-      <DependentUpon>ConnectionMultiplexer.cs</DependentUpon>
-    </Compile>
-    <Compile Include="StackExchange\Redis\ConnectionType.cs" />
-    <Compile Include="StackExchange\Redis\DebuggingAids.cs" />
-    <Compile Include="StackExchange\Redis\EndPointCollection.cs" />
-    <Compile Include="StackExchange\Redis\EndPointEventArgs.cs" />
-    <Compile Include="StackExchange\Redis\ExceptionFactory.cs" />
-    <Compile Include="StackExchange\Redis\Exclude.cs" />
-    <Compile Include="StackExchange\Redis\ExportOptions.cs" />
-    <Compile Include="StackExchange\Redis\Format.cs" />
-    <Compile Include="StackExchange\Redis\IBatch.cs" />
-    <Compile Include="StackExchange\Redis\IMultiMessage.cs" />
-    <Compile Include="StackExchange\Redis\Order.cs" />
-    <Compile Include="StackExchange\Redis\RedisBatch.cs" />
-    <Compile Include="StackExchange\Redis\RedisCommand.cs" />
-    <Compile Include="StackExchange\Redis\RedisErrorEventArgs.cs" />
-    <Compile Include="StackExchange\Redis\HashSlotMovedEventArgs.cs" />
-    <Compile Include="StackExchange\Redis\ITransaction.cs" />
-    <Compile Include="StackExchange\Redis\IRedis.cs" />
-    <Compile Include="StackExchange\Redis\IRedisAsync.cs" />
-    <Compile Include="StackExchange\Redis\IDatabase.cs" />
-    <Compile Include="StackExchange\Redis\IDatabaseAsync.cs" />
-    <Compile Include="StackExchange\Redis\IServer.cs" />
-    <Compile Include="StackExchange\Redis\ISubscriber.cs" />
-    <Compile Include="StackExchange\Redis\MessageCompletable.cs" />
-    <Compile Include="StackExchange\Redis\RedisBase.cs" />
-    <Compile Include="StackExchange\Redis\CommandFlags.cs" />
-    <Compile Include="StackExchange\Redis\CommandMap.cs" />
-    <Compile Include="StackExchange\Redis\CompletionManager.cs" />
-    <Compile Include="StackExchange\Redis\ConnectionMultiplexer.cs" />
-    <Compile Include="StackExchange\Redis\CompletedDefaultTask.cs" />
-    <Compile Include="StackExchange\Redis\ICompletable.cs" />
-    <Compile Include="StackExchange\Redis\LoggingTextStream.cs" />
-    <Compile Include="StackExchange\Redis\PhysicalBridge.cs" />
-    <Compile Include="StackExchange\Redis\Message.cs" />
-    <Compile Include="StackExchange\Redis\MessageQueue.cs" />
-    <Compile Include="StackExchange\Redis\PhysicalConnection.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="StackExchange\Redis\RedisResult.cs" />
-    <Compile Include="StackExchange\Redis\RedisTransaction.cs" />
-    <Compile Include="StackExchange\Redis\RedisDatabase.cs" />
-    <Compile Include="StackExchange\Redis\RedisFeatures.cs" />
-    <Compile Include="StackExchange\Redis\RedisKey.cs" />
-    <Compile Include="StackExchange\Redis\RedisLiterals.cs" />
-    <Compile Include="StackExchange\Redis\RedisServer.cs" />
-    <Compile Include="StackExchange\Redis\RedisType.cs" />
-    <Compile Include="StackExchange\Redis\RedisValue.cs" />
-    <Compile Include="StackExchange\Redis\ReplicationChangeOptions.cs" />
-    <Compile Include="StackExchange\Redis\RawResult.cs" />
-    <Compile Include="StackExchange\Redis\ResultBox.cs" />
-    <Compile Include="StackExchange\Redis\ResultProcessor.cs" />
-    <Compile Include="StackExchange\Redis\RedisSubscriber.cs" />
-    <Compile Include="StackExchange\Redis\ResultType.cs" />
-    <Compile Include="StackExchange\Redis\ScriptParameterMapper.cs" />
-    <Compile Include="StackExchange\Redis\ServerCounters.cs" />
-    <Compile Include="StackExchange\Redis\ServerEndPoint.cs" />
-    <Compile Include="StackExchange\Redis\ServerSelectionStrategy.cs" />
-    <Compile Include="StackExchange\Redis\ServerType.cs" />
-    <Compile Include="StackExchange\Redis\SetOperation.cs" />
-    <Compile Include="StackExchange\Redis\SocketManager.cs" />
-    <Compile Include="StackExchange\Redis\SocketManager.NoPoll.cs">
-      <DependentUpon>SocketManager.cs</DependentUpon>
-    </Compile>
-    <Compile Include="StackExchange\Redis\SortedSetEntry.cs" />
-    <Compile Include="StackExchange\Redis\SortType.cs" />
-    <Compile Include="StackExchange\Redis\StringSplits.cs" />
-    <Compile Include="StackExchange\Redis\TaskSource.cs" />
-    <Compile Include="StackExchange\Redis\When.cs" />
-    <Compile Include="StackExchange\Redis\ShutdownMode.cs" />
-    <Compile Include="StackExchange\Redis\SaveType.cs" />
-    <Compile Include="StackExchange\Redis\KeyspaceIsolation\BatchWrapper.cs" />
-    <Compile Include="StackExchange\Redis\KeyspaceIsolation\DatabaseExtension.cs" />
-    <Compile Include="StackExchange\Redis\KeyspaceIsolation\DatabaseWrapper.cs" />
-    <Compile Include="StackExchange\Redis\KeyspaceIsolation\TransactionWrapper.cs" />
-    <Compile Include="StackExchange\Redis\KeyspaceIsolation\WrapperBase.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="StackExchange\Redis\SocketManager.Poll.cs">
-      <DependentUpon>SocketManager.cs</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{7CEC07F2-8C03-4C42-B048-738B215824C1}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>StackExchange.Redis</RootNamespace>
+    <AssemblyName>StackExchange.Redis</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;FEATURE_SERIALIZATION FEATURE_SOCKET_MODE_POLL</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DocumentationFile>bin\Debug\StackExchange.Redis.XML</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE;FEATURE_SERIALIZATION FEATURE_SOCKET_MODE_POLL</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DocumentationFile>bin\Release\StackExchange.Redis.xml</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Verbose|AnyCPU'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Verbose\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;VERBOSE;FEATURE_SERIALIZATION FEATURE_SOCKET_MODE_POLL</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DocumentationFile>bin\Debug\StackExchange.Redis.xml</DocumentationFile>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Log Output|AnyCPU'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Log Output\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;LOGOUTPUT FEATURE_SERIALIZATION FEATURE_SOCKET_MODE_POLL</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DocumentationFile>bin\Debug\StackExchange.Redis.xml</DocumentationFile>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Mono|AnyCPU'">
+    <OutputPath>bin\Mono\</OutputPath>
+    <DefineConstants>TRACE;__MonoCS__ FEATURE_SERIALIZATION</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DocumentationFile>bin\Release\StackExchange.Redis.xml</DocumentationFile>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.IO.Compression" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\StackExchange.Redis\**\*.cs"/>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
 </Project>
\ No newline at end of file
--- a/StackExchange.Redis_Net46/StackExchange.Redis.snk
+++ b/StackExchange.Redis_Net46/StackExchange.Redis.snk
--- a/StackExchange.Redis_Net46/StackExchange.Redis_Net46.StrongName.csproj
+++ b/StackExchange.Redis_Net46/StackExchange.Redis_Net46.StrongName.csproj
@@ -42,7 +42,7 @@
    <SignAssembly>true</SignAssembly>
  </PropertyGroup>
  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>StackExchange.Redis.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\StackExchange.Redis.snk</AssemblyOriginatorKeyFile>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Mono|AnyCPU'">
    <OutputPath>bin\Mono\</OutputPath>
@@ -62,119 +62,11 @@
    <Reference Include="System.Core" />
    <Reference Include="System.IO.Compression" />
  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\StackExchange.Redis\Properties\AssemblyInfo.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\Aggregate.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\Bitwise.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ClientFlags.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ClientInfo.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ClientType.cs">
-      <Link>ClientType.cs</Link>
-    </Compile>
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\Compat\ConvertHelper.cs">
-      <Link>ConvertHelper.cs</Link>
-    </Compile>
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\Compat\VolatileWrapper.cs">
-      <Link>VolatileWrapper.cs</Link>
-    </Compile>
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ConcurrentProfileStorageCollection.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ConnectionMultiplexer.Profiling.cs">
-      <DependentUpon>ConnectionMultiplexer.cs</DependentUpon>
-    </Compile>
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ClusterConfiguration.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\CommandFlags.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\CommandMap.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\CommandTrace.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\CompletedDefaultTask.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\CompletionManager.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\Condition.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ConfigurationOptions.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ConnectionCounters.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ConnectionFailedEventArgs.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ConnectionFailureType.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ConnectionMultiplexer.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ConnectionMultiplexer.ReaderWriter.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ConnectionType.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\DebuggingAids.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\EndPointCollection.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\EndPointEventArgs.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ExceptionFactory.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\Exclude.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ExportOptions.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ExtensionMethods.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\Format.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\HashEntry.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\HashSlotMovedEventArgs.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\IBatch.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ICompletable.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\IConnectionMultiplexer.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\IDatabase.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\IDatabaseAsync.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\IMultiMessage.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\InternalErrorEventArgs.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\InternalRegexCompiledOption.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\IProfiler.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\IRedis.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\IRedisAsync.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\IServer.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ISubscriber.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ITransaction.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\LoggingTextStream.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\Message.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\MessageCompletable.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\MessageQueue.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\MigrateOptions.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ProfileContextTracker.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ProfileStorage.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\LuaScript.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\Order.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\PhysicalBridge.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\PhysicalConnection.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RawResult.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisBase.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisBatch.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisChannel.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisCommand.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisDatabase.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisErrorEventArgs.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisFeatures.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisKey.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisLiterals.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisResult.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisServer.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisSubscriber.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisTransaction.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisType.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisValue.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ReplicationChangeOptions.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ResultBox.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ResultProcessor.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ResultType.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ScriptParameterMapper.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\SaveType.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ServerCounters.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ServerEndPoint.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ServerSelectionStrategy.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ServerType.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\SetOperation.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ShutdownMode.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\SocketManager.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\SocketManager.NoPoll.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\SocketManager.Poll.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\SortedSetEntry.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\SortType.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\StringSplits.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\TaskSource.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\When.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\KeyspaceIsolation\BatchWrapper.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\KeyspaceIsolation\DatabaseExtension.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\KeyspaceIsolation\DatabaseWrapper.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\KeyspaceIsolation\TransactionWrapper.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\KeyspaceIsolation\WrapperBase.cs" />
+    <ItemGroup>
+    <Compile Include="..\StackExchange.Redis\**\*.cs"/>
  </ItemGroup>
  <ItemGroup>
    <None Include="packages.config" />
-    <None Include="StackExchange.Redis.snk" />
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />

--- a/StackExchange.Redis_Net46/StackExchange.Redis_Net46.csproj
+++ b/StackExchange.Redis_Net46/StackExchange.Redis_Net46.csproj
@@ -56,115 +56,8 @@
    <Reference Include="System.Core" />
    <Reference Include="System.IO.Compression" />
  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\StackExchange.Redis\Properties\AssemblyInfo.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\Aggregate.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\Bitwise.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ClientFlags.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ClientInfo.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ClientType.cs">
-      <Link>ClientType.cs</Link>
-    </Compile>
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\Compat\ConvertHelper.cs">
-      <Link>ConvertHelper.cs</Link>
-    </Compile>
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\Compat\VolatileWrapper.cs">
-      <Link>VolatileWrapper.cs</Link>
-    </Compile>
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ConcurrentProfileStorageCollection.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ConnectionMultiplexer.Profiling.cs">
-      <DependentUpon>ConnectionMultiplexer.cs</DependentUpon>
-    </Compile>
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ClusterConfiguration.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\CommandFlags.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\CommandMap.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\CommandTrace.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\CompletedDefaultTask.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\CompletionManager.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\Condition.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ConfigurationOptions.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ConnectionCounters.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ConnectionFailedEventArgs.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ConnectionFailureType.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ConnectionMultiplexer.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ConnectionMultiplexer.ReaderWriter.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ConnectionType.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\DebuggingAids.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\EndPointCollection.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\EndPointEventArgs.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ExceptionFactory.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\Exclude.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ExportOptions.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ExtensionMethods.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\Format.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\HashEntry.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\HashSlotMovedEventArgs.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\IBatch.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ICompletable.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\IConnectionMultiplexer.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\IDatabase.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\IDatabaseAsync.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\IMultiMessage.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\InternalErrorEventArgs.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\InternalRegexCompiledOption.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\IProfiler.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\IRedis.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\IRedisAsync.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\IServer.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ISubscriber.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ITransaction.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\LoggingTextStream.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\Message.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\MessageCompletable.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\MessageQueue.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\MigrateOptions.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ProfileContextTracker.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ProfileStorage.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\LuaScript.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\Order.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\PhysicalBridge.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\PhysicalConnection.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RawResult.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisBase.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisBatch.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisChannel.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisCommand.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisDatabase.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisErrorEventArgs.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisFeatures.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisKey.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisLiterals.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisResult.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisServer.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisSubscriber.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisTransaction.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisType.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\RedisValue.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ReplicationChangeOptions.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ResultBox.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ResultProcessor.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ResultType.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ScriptParameterMapper.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\SaveType.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ServerCounters.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ServerEndPoint.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ServerSelectionStrategy.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ServerType.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\SetOperation.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ShutdownMode.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\SocketManager.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\SocketManager.NoPoll.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\SocketManager.Poll.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\SortedSetEntry.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\SortType.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\StringSplits.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\TaskSource.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\When.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\KeyspaceIsolation\BatchWrapper.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\KeyspaceIsolation\DatabaseExtension.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\KeyspaceIsolation\DatabaseWrapper.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\KeyspaceIsolation\TransactionWrapper.cs" />
-    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\KeyspaceIsolation\WrapperBase.cs" />
+    <ItemGroup>
+    <Compile Include="..\StackExchange.Redis\**\*.cs"/>
  </ItemGroup>
  <ItemGroup>
    <None Include="app.config" />

--- a/packages/NUnit.3.0.0/lib/net20/nunit.framework.dll
+++ b/packages/NUnit.3.0.0/lib/net20/nunit.framework.dll
--- a/packages/NUnit.3.0.0/lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/nunit.framework.dll
+++ b/packages/NUnit.3.0.0/lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10/nunit.framework.dll