Merge pull request #32 from returnString/master

Fix compilation for MD/XS

StackExchange.Redis/StackExchange.Redis.md.csproj

@@ -3,23 +3,25 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>10.0.0</ProductVersion>
+    <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8EA21FC8-9CF7-438B-94F2-42E3810C3641}</ProjectGuid>
-    <OutputType>Exe</OutputType>
+    <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;</DefineConstants>
+    <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>
@@ -29,13 +31,14 @@
     <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\ChannelWrapper.cs" />
     <Compile Include="StackExchange\Redis\ClientFlags.cs" />
     <Compile Include="StackExchange\Redis\ClientInfo.cs" />
     <Compile Include="StackExchange\Redis\ClusterConfiguration.cs" />
@@ -110,8 +113,17 @@
     <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

StackExchange.Redis/StackExchange/Redis/ConnectionMultiplexer.cs

@@ -169,7 +169,7 @@ internal void OnErrorMessage(EndPoint endpoint, string message)
         static void Write<T>(ZipArchive zip, string name, Task task, Action<T, StreamWriter> callback)
         {
             var entry = zip.CreateEntry(name,
-#if MONO
+#if __MonoCS__
                 CompressionLevel.Fastest
 #else
                 CompressionLevel.Optimal

StackExchange.Redis/StackExchange/Redis/PhysicalConnection.cs

@@ -539,7 +539,7 @@ SocketMode ISocketCallback.Connected(Stream stream)
                     if (string.IsNullOrWhiteSpace(host)) host = Format.ToStringHostOnly(bridge.ServerEndPoint.EndPoint);
 
                     var ssl = new SslStream(stream, false, config.CertificateValidationCallback, config.CertificateSelectionCallback
-#if !MONO
+#if !__MonoCS__
                         , EncryptionPolicy.RequireEncryption
 #endif
                         );

StackExchange.Redis/StackExchange/Redis/SocketManager.NoPoll.cs

-#if MONO
+#if __MonoCS__
 
 namespace StackExchange.Redis
 {

StackExchange.Redis/StackExchange/Redis/SocketManager.Poll.cs

@@ -5,7 +5,7 @@
 using System.Runtime.InteropServices;
 using System.Threading;
 
-#if !MONO
+#if !__MonoCS__
 namespace StackExchange.Redis
 {