Skip to content

S
StackExchange.Redis
Commit 651c5604 authored by Marc Gravell's avatar Marc Gravell
Browse files
Options

Update nuget packages

parent ecb9e3fe
Show whitespace changes
Inline Side-by-side
Showing with 78 additions and 114 deletions
.nuget/packages.config
View file @ 651c5604
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NuGet.CommandLine" version="2.8.2" />
<package id="Redis-64" version="2.8.9" />
<package id="Redis-64" version="2.8.12" />
</packages>
\ No newline at end of file
MigratedBookSleeveTestSuite/Scripting.cs
View file @ 651c5604
......@@ -210,16 +210,8 @@ public void FlushDetection()
// now cause all kinds of problems
Config.GetServer(muxer).ScriptFlush();
//expect this one to fail
try
{
//expect this one to <strike>fail</strike> just work fine (self-fix)
conn.ScriptEvaluate("return redis.call('get', KEYS[1])", new RedisKey[] { "foo" }, null);
Assert.Fail("Shouldn't have got here");
}
catch (RedisException)
{ }
catch
{ Assert.Fail("Expected RedisException"); }
result = (string)conn.ScriptEvaluate("return redis.call('get', KEYS[1])", new RedisKey[] { "foo" }, null);
Assert.AreEqual("bar", result);
......
Redis Configs/redis-cli 7000.cmd
View file @ 651c5604
@..\packages\Redis-64.2.8.9\redis-cli.exe -h cluster -p 7000
\ No newline at end of file
@..\packages\Redis-64.2.8.12\redis-cli.exe -h cluster -p 7000
\ No newline at end of file
Redis Configs/redis-cli 7001.cmd
View file @ 651c5604
@..\packages\Redis-64.2.8.9\redis-cli.exe -h cluster -p 7001
@..\packages\Redis-64.2.8.12\redis-cli.exe -h cluster -p 7001
Redis Configs/redis-cli 7002.cmd
View file @ 651c5604
@..\packages\Redis-64.2.8.9\redis-cli.exe -h cluster -p 7002
@..\packages\Redis-64.2.8.12\redis-cli.exe -h cluster -p 7002
Redis Configs/redis-cli 7003.cmd
View file @ 651c5604
@..\packages\Redis-64.2.8.9\redis-cli.exe -h cluster -p 7003
@..\packages\Redis-64.2.8.12\redis-cli.exe -h cluster -p 7003
Redis Configs/redis-cli 7004.cmd
View file @ 651c5604
@..\packages\Redis-64.2.8.9\redis-cli.exe -h cluster -p 7004
@..\packages\Redis-64.2.8.12\redis-cli.exe -h cluster -p 7004
Redis Configs/redis-cli 7005.cmd
View file @ 651c5604
@..\packages\Redis-64.2.8.9\redis-cli.exe -h cluster -p 7005
@..\packages\Redis-64.2.8.12\redis-cli.exe -h cluster -p 7005
Redis Configs/redis-cli master.cmd
View file @ 651c5604
@..\packages\Redis-64.2.8.9\redis-cli.exe -p 6379
@..\packages\Redis-64.2.8.12\redis-cli.exe -p 6379
Redis Configs/redis-cli secure.cmd
View file @ 651c5604
@..\packages\Redis-64.2.8.9\redis-cli.exe -p 6381
@..\packages\Redis-64.2.8.12\redis-cli.exe -p 6381
Redis Configs/redis-cli slave.cmd
View file @ 651c5604
@..\packages\Redis-64.2.8.9\redis-cli.exe -p 6380
@..\packages\Redis-64.2.8.12\redis-cli.exe -p 6380
Redis Configs/redis-server alll local.cmd
View file @ 651c5604
@start ..\packages\Redis-64.2.8.9\redis-server.exe master.conf
@start ..\packages\Redis-64.2.8.9\redis-server.exe slave.conf
@start ..\packages\Redis-64.2.8.9\redis-server.exe secure.conf
@start ..\packages\Redis-64.2.8.12\redis-server.exe master.conf
@start ..\packages\Redis-64.2.8.12\redis-server.exe slave.conf
@start ..\packages\Redis-64.2.8.12\redis-server.exe secure.conf
Redis Configs/redis-server master.cmd
View file @ 651c5604
@..\packages\Redis-64.2.8.9\redis-server.exe master.conf
@..\packages\Redis-64.2.8.12\redis-server.exe master.conf
Redis Configs/redis-server secure.cmd
View file @ 651c5604
@..\packages\Redis-64.2.8.9\redis-server.exe secure.conf
@..\packages\Redis-64.2.8.12\redis-server.exe secure.conf
Redis Configs/redis-server slave.cmd
View file @ 651c5604
@..\packages\Redis-64.2.8.9\redis-server.exe slave.conf
@..\packages\Redis-64.2.8.12\redis-server.exe slave.conf
StackExchange.Redis.StrongName.nuspec
View file @ 651c5604
......@@ -17,7 +17,6 @@
<group targetFramework="net40">
<dependency id="Microsoft.Bcl" version="1.1.9"/>
<dependency id="Microsoft.Bcl.Async" version="1.0.168"/>
<dependency id="Microsoft.Bcl.Build" version="1.0.14"/>
</group>
<group targetFramework="net45">
</group>
......
StackExchange.Redis.nuspec
View file @ 651c5604
......@@ -17,7 +17,6 @@
<group targetFramework="net40">
<dependency id="Microsoft.Bcl" version="1.1.9"/>
<dependency id="Microsoft.Bcl.Async" version="1.0.168"/>
<dependency id="Microsoft.Bcl.Build" version="1.0.14"/>
</group>
<group targetFramework="net45">
</group>
......
StackExchange.Redis/StackExchange/Redis/ServerEndPoint.cs
View file @ 651c5604
......@@ -43,7 +43,7 @@ internal sealed partial class ServerEndPoint : IDisposable
private bool slaveReadOnly, isSlave;
internal volatile UnselectableFlags unselectableReasons;
private volatile UnselectableFlags unselectableReasons;
private Version version;
......@@ -122,12 +122,15 @@ public long OperationCount
public void ClearUnselectable(UnselectableFlags flags)
{
var oldFlags = unselectableReasons;
if (oldFlags != 0)
{
unselectableReasons &= ~flags;
if (unselectableReasons != oldFlags)
{
multiplexer.Trace(unselectableReasons == 0 ? "Now usable" : ("Now unusable: " + flags), ToString());
}
}
}
public void Dispose()
{
......@@ -208,6 +211,8 @@ public void SetClusterConfiguration(ClusterConfiguration configuration)
}
public void SetUnselectable(UnselectableFlags flags)
{
if (flags != 0)
{
var oldFlags = unselectableReasons;
unselectableReasons |= flags;
......@@ -216,6 +221,7 @@ public void SetUnselectable(UnselectableFlags flags)
multiplexer.Trace(unselectableReasons == 0 ? "Now usable" : ("Now unusable: " + flags), ToString());
}
}
}
public override string ToString()
{
return Format.ToString(EndPoint);
......
StackExchange.Redis_Net40/StackExchange.Redis_Net40.StrongName.csproj
View file @ 651c5604
......@@ -157,10 +157,10 @@
<None Include="StackExchange.Redis.snk" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.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')" />
<Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
<Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
<Error Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
<Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
<Error Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
</Target>
<!-- 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.
......
StackExchange.Redis_Net40/StackExchange.Redis_Net40.csproj
View file @ 651c5604
......@@ -151,10 +151,10 @@
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.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')" />
<Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
<Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
<Error Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
<Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
<Error Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
</Target>
<!-- 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.
......
StackExchange.Redis_Net40/packages.config
View file @ 651c5604
......@@ -2,5 +2,5 @@
<packages>
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net40" />
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net40" />
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net40" />
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net40" />
</packages>
\ No newline at end of file
packages/Microsoft.Bcl.Build.1.0.14/tools/Install.ps1 deleted 100644 → 0
View file @ ecb9e3fe
param($installPath, $toolsPath, $package, $project)
# This is the MSBuild targets file to add
$targetsFile = [System.IO.Path]::Combine($toolsPath, $package.Id + '.targets')
# Need to load MSBuild assembly if it's not loaded yet.
Add-Type -AssemblyName 'Microsoft.Build, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'
# Grab the loaded MSBuild project for the project
# Normalize project path before calling GetLoadedProjects as it performs a string based match
$msbuild = [Microsoft.Build.Evaluation.ProjectCollection]::GlobalProjectCollection.GetLoadedProjects([System.IO.Path]::GetFullPath($project.FullName)) | Select-Object -First 1
# Make the path to the targets file relative.
$projectUri = new-object Uri($project.FullName, [System.UriKind]::Absolute)
$targetUri = new-object Uri($targetsFile, [System.UriKind]::Absolute)
$relativePath = [System.Uri]::UnescapeDataString($projectUri.MakeRelativeUri($targetUri).ToString()).Replace([System.IO.Path]::AltDirectorySeparatorChar, [System.IO.Path]::DirectorySeparatorChar)
# Add the import with a condition, to allow the project to load without the targets present.
$import = $msbuild.Xml.AddImport($relativePath)
$import.Condition = "Exists('$relativePath')"
# Add a target to fail the build when our targets are not imported
$target = $msbuild.Xml.AddTarget("EnsureBclBuildImported")
$target.BeforeTargets = "BeforeBuild"
$target.Condition = "'`$(BclBuildImported)' == ''"
# if the targets don't exist at the time the target runs, package restore didn't run
$errorTask = $target.AddTask("Error")
$errorTask.Condition = "!Exists('$relativePath')"
$errorTask.SetParameter("Text", "This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567.");
$errorTask.SetParameter("HelpKeyword", "BCLBUILD2001");
# if the targets exist at the time the target runs, package restore ran but the build didn't import the targets.
$errorTask = $target.AddTask("Error")
$errorTask.Condition = "Exists('$relativePath')"
$errorTask.SetParameter("Text", "The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568.");
$errorTask.SetParameter("HelpKeyword", "BCLBUILD2002");
$project.Save()
\ No newline at end of file
packages/Microsoft.Bcl.Build.1.0.14/tools/Uninstall.ps1 deleted 100644 → 0
View file @ ecb9e3fe
param($installPath, $toolsPath, $package, $project)
# Need to load MSBuild assembly if it's not loaded yet.
Add-Type -AssemblyName 'Microsoft.Build, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'
# Grab the loaded MSBuild project for the project
# Normalize project path before calling GetLoadedProjects as it performs a string based match
$msbuild = [Microsoft.Build.Evaluation.ProjectCollection]::GlobalProjectCollection.GetLoadedProjects([System.IO.Path]::GetFullPath($project.FullName)) | Select-Object -First 1
# Find all the imports and targets added by this package.
$itemsToRemove = @()
# Allow many in case a past package was incorrectly uninstalled
$itemsToRemove += $msbuild.Xml.Imports | Where-Object { $_.Project.EndsWith($package.Id + '.targets') }
$itemsToRemove += $msbuild.Xml.Targets | Where-Object { $_.Name -eq "EnsureBclBuildImported" }
# Remove the elements and save the project
if ($itemsToRemove -and $itemsToRemove.length)
{
foreach ($itemToRemove in $itemsToRemove)
{
$msbuild.Xml.RemoveChild($itemToRemove) | out-null
}
$project.Save()
}
\ No newline at end of file
packages/Microsoft.Bcl.Build.1.0.14/tools/Microsoft.Bcl.Build.targets → packages/Microsoft.Bcl.Build.1.0.21/build/Microsoft.Bcl.Build.targets
View file @ 651c5604
......@@ -41,8 +41,26 @@ Copyright (C) Microsoft Corporation. All rights reserved.
-->
<PropertyGroup>
<__IntermediateAppConfig>$(IntermediateOutputPath)$(MSBuildProjectFile).App.config</__IntermediateAppConfig>
<SkipEnsureBindingRedirects Condition="'$(TargetFrameworkIdentifier)' == 'Silverlight' or '$(OutputType)' == 'AppContainerExe'">true</SkipEnsureBindingRedirects>
<!-- Default logic is to use existing Bcl.Build code for any binding redirects which are not now supported by the
framework functionality which is controlled by existing MSBUILD properties, that were added in Dev12
Supported Dev12 scenarios are:
Project Output Type exe, winexe
<AutoGenerateBindingRedirects> in project file set to true
All others outside of this should continue to use existing mechanism in BCL.Build to ensure behavioural compatbility
for output types. -->
<SkipEnsureBindingRedirects Condition="'$(SkipEnsureBindingRedirects)' == ''">false</SkipEnsureBindingRedirects>
<SkipEnsureBindingRedirects Condition="'$(AutoGenerateBindingRedirects)' =='true' and '$(GenerateBindingRedirectsOutputType)' == 'true'">true</SkipEnsureBindingRedirects>
</PropertyGroup>
<!-- we haven't already been told to skip binding redirects, the project supports bindingredirect generation, and hasn't yet opted-in, force the opt in and disable our own bindingRedirect generation. -->
<PropertyGroup Condition="'$(SkipEnsureBindingRedirects)' != 'true' and ('$(AutoGenerateBindingRedirects)' =='' and '$(GenerateBindingRedirectsOutputType)' == 'true')">
<SkipEnsureBindingRedirects>true</SkipEnsureBindingRedirects>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
</PropertyGroup>
<UsingTask TaskName="EnsureBindingRedirects" AssemblyFile="$(MSBuildThisFileDirectory)Microsoft.Bcl.Build.Tasks.dll" />
......
packages/Redis-64.2.8.9/redis.windows.conf → packages/Redis-64.2.8.12/redis.windows.conf
View file @ 651c5604
......@@ -137,7 +137,8 @@ dbfilename dump.rdb
# The DB will be written inside this directory, with the filename specified
# above using the 'dbfilename' configuration directive.
#
# The Append Only File will also be created inside this directory.
# The Append Only File and the QFork memory mapped file will also be created
# inside this directory.
#
# Note that you must specify a directory here, not a file name.
dir ./
......@@ -288,7 +289,9 @@ slave-priority 100
# be shared with a child process.
#
# *** There must be disk space available for this file in order for Redis
# to launch. ***
# to launch. *** The default configuration places this file in the local
# appdata directory. If you wish to move this file to another local disk,
# use the heapdir flag as described below.
#
# The maxheap flag controls the maximum size of this memory mapped file,
# as well as the total usable space for the Redis heap. Running Redis
......@@ -313,6 +316,17 @@ slave-priority 100
#
# maxheap <bytes>
# The heap memory mapped file must reside on a local path for heap sharing
# between processes to work. A UNC path will not suffice here. For maximum
# performance this should be located on the fastest local drive available.
# This value defaults to the local application data folder(e.g.,
# "%USERPROFILE%\AppData\Local"). Since this file can be very large, you
# may wish to place this on a drive other than the one the operating system
# is installed on.
#
# Note that you must specify a directory here, not a file name.
# heapdir <directory path(absolute or relative)>
# Don't use more memory than the specified amount of bytes.
# When the memory limit is reached Redis will try to remove keys
# accordingly to the eviction policy selected (see maxmemmory-policy).
......
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