Commit ff1b155a authored by Marc Gravell's avatar Marc Gravell

1.2.7 alpha 2; change System.IO.Compression to package ref

parent 2931ed44
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<VersionPrefix>1.2.6</VersionPrefix> <VersionPrefix>1.2.7</VersionPrefix>
<Copyright>2017 Stack Exchange, Inc.</Copyright> <Copyright>2017 Stack Exchange, Inc.</Copyright>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors> <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
......
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' OR '$(TargetFramework)' == 'net46' "> <ItemGroup Condition=" '$(TargetFramework)' == 'net45' OR '$(TargetFramework)' == 'net46' ">
<Reference Include="System.IO.Compression" />
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
</ItemGroup> </ItemGroup>
...@@ -29,6 +28,9 @@ ...@@ -29,6 +28,9 @@
<DefineConstants>$(DefineConstants);CORE_CLR</DefineConstants> <DefineConstants>$(DefineConstants);CORE_CLR</DefineConstants>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<PackageReference Include="System.IO.Compression" Version="$(CoreFxVersion)" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' "> <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
<PackageReference Include="System.Collections.NonGeneric" Version="$(CoreFxVersion)" /> <PackageReference Include="System.Collections.NonGeneric" Version="$(CoreFxVersion)" />
<PackageReference Include="System.Net.NameResolution" Version="$(CoreFxVersion)" /> <PackageReference Include="System.Net.NameResolution" Version="$(CoreFxVersion)" />
......
...@@ -10,7 +10,7 @@ namespace StackExchange.Redis.Tests ...@@ -10,7 +10,7 @@ namespace StackExchange.Redis.Tests
[Collection(NonParallelCollection.Name)] [Collection(NonParallelCollection.Name)]
public class PubSub : TestBase public class PubSub : TestBase
{ {
public PubSub(ITestOutputHelper output) : base (output) { } public PubSub(ITestOutputHelper output) : base(output) { }
[Fact] [Fact]
public void ExplicitPublishMode() public void ExplicitPublishMode()
...@@ -252,12 +252,11 @@ public void TestPatternPubSub(bool preserveOrder) ...@@ -252,12 +252,11 @@ public void TestPatternPubSub(bool preserveOrder)
} }
} }
#if DEBUG
[Fact] [Fact]
public void SubscriptionsSurviveConnectionFailure() public void SubscriptionsSurviveConnectionFailure()
{ {
#if !DEBUG
Assert.Inconclusive("Needs #DEBUG");
#endif
using (var muxer = Create(allowAdmin: true)) using (var muxer = Create(allowAdmin: true))
{ {
RedisChannel channel = Me(); RedisChannel channel = Me();
...@@ -273,23 +272,19 @@ public void SubscriptionsSurviveConnectionFailure() ...@@ -273,23 +272,19 @@ public void SubscriptionsSurviveConnectionFailure()
var server = GetServer(muxer); var server = GetServer(muxer);
Assert.Equal(1, server.GetCounters().Subscription.SocketCount); Assert.Equal(1, server.GetCounters().Subscription.SocketCount);
#if DEBUG
server.SimulateConnectionFailure(); server.SimulateConnectionFailure();
SetExpectedAmbientFailureCount(2); SetExpectedAmbientFailureCount(2);
#endif
Thread.Sleep(100); Thread.Sleep(100);
sub.Ping(); sub.Ping();
#if DEBUG
Assert.Equal(2, server.GetCounters().Subscription.SocketCount); Assert.Equal(2, server.GetCounters().Subscription.SocketCount);
#endif
sub.Publish(channel, "abc"); sub.Publish(channel, "abc");
sub.Ping(); sub.Ping();
Assert.Equal(2, VolatileWrapper.Read(ref counter)); Assert.Equal(2, VolatileWrapper.Read(ref counter));
} }
} }
#endif
} }
internal static class VolatileWrapper
internal static class VolatileWrapper
{ {
public static int Read(ref int location) public static int Read(ref int location)
{ {
......
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' OR '$(TargetFramework)' == 'net46' "> <ItemGroup Condition=" '$(TargetFramework)' == 'net45' OR '$(TargetFramework)' == 'net46' ">
<Reference Include="System.IO.Compression" />
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
</ItemGroup> </ItemGroup>
...@@ -23,7 +22,10 @@ ...@@ -23,7 +22,10 @@
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' "> <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
<DefineConstants>$(DefineConstants);CORE_CLR</DefineConstants> <DefineConstants>$(DefineConstants);CORE_CLR</DefineConstants>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<PackageReference Include="System.IO.Compression" Version="$(CoreFxVersion)" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' "> <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
<PackageReference Include="System.Collections.NonGeneric" Version="$(CoreFxVersion)" /> <PackageReference Include="System.Collections.NonGeneric" Version="$(CoreFxVersion)" />
<PackageReference Include="System.Net.NameResolution" Version="$(CoreFxVersion)" /> <PackageReference Include="System.Net.NameResolution" Version="$(CoreFxVersion)" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment