Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
StackExchange.Redis
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
tsai
StackExchange.Redis
Commits
ff1b155a
Commit
ff1b155a
authored
Jan 25, 2018
by
Marc Gravell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.2.7 alpha 2; change System.IO.Compression to package ref
parent
2931ed44
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
14 deletions
+13
-14
Directory.build.props
Directory.build.props
+1
-1
StackExchange.Redis.StrongName.csproj
...ge.Redis.StrongName/StackExchange.Redis.StrongName.csproj
+3
-1
PubSub.cs
StackExchange.Redis.Tests/PubSub.cs
+5
-10
StackExchange.Redis.csproj
StackExchange.Redis/StackExchange.Redis.csproj
+4
-2
No files found.
Directory.build.props
View file @
ff1b155a
<Project>
<PropertyGroup>
<VersionPrefix>1.2.
6
</VersionPrefix>
<VersionPrefix>1.2.
7
</VersionPrefix>
<Copyright>2017 Stack Exchange, Inc.</Copyright>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
...
...
StackExchange.Redis.StrongName/StackExchange.Redis.StrongName.csproj
View file @
ff1b155a
...
...
@@ -16,7 +16,6 @@
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' OR '$(TargetFramework)' == 'net46' ">
<Reference Include="System.IO.Compression" />
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>
...
...
@@ -29,6 +28,9 @@
<DefineConstants>$(DefineConstants);CORE_CLR</DefineConstants>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="System.IO.Compression" Version="$(CoreFxVersion)" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
<PackageReference Include="System.Collections.NonGeneric" Version="$(CoreFxVersion)" />
<PackageReference Include="System.Net.NameResolution" Version="$(CoreFxVersion)" />
...
...
StackExchange.Redis.Tests/PubSub.cs
View file @
ff1b155a
...
...
@@ -10,7 +10,7 @@ namespace StackExchange.Redis.Tests
[
Collection
(
NonParallelCollection
.
Name
)]
public
class
PubSub
:
TestBase
{
public
PubSub
(
ITestOutputHelper
output
)
:
base
(
output
)
{
}
public
PubSub
(
ITestOutputHelper
output
)
:
base
(
output
)
{
}
[
Fact
]
public
void
ExplicitPublishMode
()
...
...
@@ -252,12 +252,11 @@ public void TestPatternPubSub(bool preserveOrder)
}
}
#if DEBUG
[
Fact
]
public
void
SubscriptionsSurviveConnectionFailure
()
{
#if !DEBUG
Assert
.
Inconclusive
(
"Needs #DEBUG"
);
#endif
using
(
var
muxer
=
Create
(
allowAdmin
:
true
))
{
RedisChannel
channel
=
Me
();
...
...
@@ -273,23 +272,19 @@ public void SubscriptionsSurviveConnectionFailure()
var
server
=
GetServer
(
muxer
);
Assert
.
Equal
(
1
,
server
.
GetCounters
().
Subscription
.
SocketCount
);
#if DEBUG
server
.
SimulateConnectionFailure
();
SetExpectedAmbientFailureCount
(
2
);
#endif
Thread
.
Sleep
(
100
);
sub
.
Ping
();
#if DEBUG
Assert
.
Equal
(
2
,
server
.
GetCounters
().
Subscription
.
SocketCount
);
#endif
sub
.
Publish
(
channel
,
"abc"
);
sub
.
Ping
();
Assert
.
Equal
(
2
,
VolatileWrapper
.
Read
(
ref
counter
));
}
}
#endif
}
internal
static
class
VolatileWrapper
internal
static
class
VolatileWrapper
{
public
static
int
Read
(
ref
int
location
)
{
...
...
StackExchange.Redis/StackExchange.Redis.csproj
View file @
ff1b155a
...
...
@@ -11,7 +11,6 @@
</PropertyGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' OR '$(TargetFramework)' == 'net46' ">
<Reference Include="System.IO.Compression" />
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>
...
...
@@ -23,7 +22,10 @@
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
<DefineConstants>$(DefineConstants);CORE_CLR</DefineConstants>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="System.IO.Compression" Version="$(CoreFxVersion)" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
<PackageReference Include="System.Collections.NonGeneric" Version="$(CoreFxVersion)" />
<PackageReference Include="System.Net.NameResolution" Version="$(CoreFxVersion)" />
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment