Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/StackExchange.Redis/ClusterConfiguration.cs
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ public IList<ClusterNode> Children
/// <summary>
/// Gets whether this node is a replica.
/// </summary>
[Obsolete("Starting with Redis version 5, Redis has moved to 'replica' terminology. Please use " + nameof(IsReplica) + " instead, this will be removed in 3.2.", error: true)]
[Obsolete("Starting with Redis version 5, Redis has moved to 'replica' terminology. Please use " + nameof(IsReplica) + " instead, this will be removed in 4.0.", error: true)]
[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
public bool IsSlave => IsReplica;

Expand Down
10 changes: 5 additions & 5 deletions src/StackExchange.Redis/ConfigurationOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ public int AsyncTimeout
/// <summary>
/// Indicates whether the connection should be encrypted.
/// </summary>
[Obsolete("Please use .Ssl instead of .UseSsl, will be removed in 3.2.", error: true),
[Obsolete("Please use .Ssl instead of .UseSsl, will be removed in 4.0.", error: true),
Browsable(false),
EditorBrowsable(EditorBrowsableState.Never)]
public bool UseSsl
Expand Down Expand Up @@ -683,7 +683,7 @@ public TimeSpan HeartbeatInterval
/// Use ThreadPriority.AboveNormal for SocketManager reader and writer threads (true by default).
/// If <see langword="false"/>, <see cref="ThreadPriority.Normal"/> will be used.
/// </summary>
[Obsolete($"This setting no longer has any effect, please use {nameof(SocketManager.SocketManagerOptions)}.{nameof(SocketManager.SocketManagerOptions.UseHighPrioritySocketThreads)} instead - this setting will be removed in 3.2.", error: true)]
[Obsolete($"This setting no longer has any effect, please use {nameof(SocketManager.SocketManagerOptions)}.{nameof(SocketManager.SocketManagerOptions.UseHighPrioritySocketThreads)} instead - this setting will be removed in 4.0.", error: true)]
[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
public bool HighPrioritySocketThreads
{
Expand Down Expand Up @@ -782,7 +782,7 @@ public string? SentinelPassword
/// <summary>
/// Specifies whether asynchronous operations should be invoked in a way that guarantees their original delivery order.
/// </summary>
[Obsolete("Not supported; if you require ordered pub/sub, please see " + nameof(ChannelMessageQueue) + " - this will be removed in 3.2.", error: true)]
[Obsolete("Not supported; if you require ordered pub/sub, please see " + nameof(ChannelMessageQueue) + " - this will be removed in 4.0.", error: true)]
[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
public bool PreserveAsyncOrder
{
Expand Down Expand Up @@ -830,7 +830,7 @@ public bool ResolveDns
/// <summary>
/// Specifies the time in milliseconds that the system should allow for responses before concluding that the socket is unhealthy.
/// </summary>
[Obsolete("This setting no longer has any effect, and should not be used - will be removed in 3.2.", error: true)]
[Obsolete("This setting no longer has any effect, and should not be used - will be removed in 4.0.", error: true)]
[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
public int ResponseTimeout
{
Expand Down Expand Up @@ -910,7 +910,7 @@ public string TieBreaker
/// <summary>
/// The size of the output buffer to use.
/// </summary>
[Obsolete("This setting no longer has any effect, and should not be used - will be removed in 3.2.", error: true)]
[Obsolete("This setting no longer has any effect, and should not be used - will be removed in 4.0.", error: true)]
[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
public int WriteBuffer
{
Expand Down
4 changes: 2 additions & 2 deletions src/StackExchange.Redis/ConnectionMultiplexer.Compat.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ public partial class ConnectionMultiplexer
/// <summary>
/// No longer used.
/// </summary>
[Obsolete("No longer used, will be removed in 3.2.", error: true)]
[Obsolete("No longer used, will be removed in 4.0.", error: true)]
[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
public static TaskFactory Factory { get => Task.Factory; set { } }

/// <summary>
/// Gets or sets whether asynchronous operations should be invoked in a way that guarantees their original delivery order.
/// </summary>
[Obsolete("Not supported; if you require ordered pub/sub, please see " + nameof(ChannelMessageQueue) + ", will be removed in 3.2", error: true)]
[Obsolete("Not supported; if you require ordered pub/sub, please see " + nameof(ChannelMessageQueue) + ", will be removed in 4.0", error: true)]
[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
public bool PreserveAsyncOrder { get => false; set { } }
}
4 changes: 2 additions & 2 deletions src/StackExchange.Redis/ConnectionMultiplexer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ pulse is null
unchecked(Environment.TickCount - Volatile.Read(ref lastGlobalHeartbeatTicks)) / 1000;

/// <inheritdoc cref="ConfigurationOptions.IncludeDetailInExceptions"/>
[Obsolete($"Please use {nameof(ConfigurationOptions)}.{nameof(ConfigurationOptions.IncludeDetailInExceptions)} instead - this will be removed in 3.2.", error: true)]
[Obsolete($"Please use {nameof(ConfigurationOptions)}.{nameof(ConfigurationOptions.IncludeDetailInExceptions)} instead - this will be removed in 4.0.", error: true)]
[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
public bool IncludeDetailInExceptions
{
Expand All @@ -102,7 +102,7 @@ public bool IncludeDetailInExceptions
}

/// <inheritdoc cref="ConfigurationOptions.IncludePerformanceCountersInExceptions"/>
[Obsolete($"Please use {nameof(ConfigurationOptions)}.{nameof(ConfigurationOptions.IncludePerformanceCountersInExceptions)} instead - this will be removed in 3.2.", error: true)]
[Obsolete($"Please use {nameof(ConfigurationOptions)}.{nameof(ConfigurationOptions.IncludePerformanceCountersInExceptions)} instead - this will be removed in 4.0.", error: true)]
[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
public bool IncludePerformanceCountersInExceptions
{
Expand Down
4 changes: 2 additions & 2 deletions src/StackExchange.Redis/Enums/ClientFlags.cs
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public enum ClientFlags : long
/// <summary>
/// The client is a replica in MONITOR mode.
/// </summary>
[Obsolete("Starting with Redis version 5, Redis has moved to 'replica' terminology. Please use " + nameof(ReplicaMonitor) + " instead, this will be removed in 3.2.", error: true)]
[Obsolete("Starting with Redis version 5, Redis has moved to 'replica' terminology. Please use " + nameof(ReplicaMonitor) + " instead, this will be removed in 4.0.", error: true)]
[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
SlaveMonitor = 1,

Expand All @@ -101,7 +101,7 @@ public enum ClientFlags : long
/// <summary>
/// The client is a normal replica server.
/// </summary>
[Obsolete("Starting with Redis version 5, Redis has moved to 'replica' terminology. Please use " + nameof(Replica) + " instead, this will be removed in 3.2.", error: true)]
[Obsolete("Starting with Redis version 5, Redis has moved to 'replica' terminology. Please use " + nameof(Replica) + " instead, this will be removed in 4.0.", error: true)]
[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
Slave = 2,

Expand Down
2 changes: 1 addition & 1 deletion src/StackExchange.Redis/Enums/ClientType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public enum ClientType
/// <summary>
/// Replication connections.
/// </summary>
[Obsolete("Starting with Redis version 5, Redis has moved to 'replica' terminology. Please use " + nameof(Replica) + " instead, this will be removed in 3.2.", error: true)]
[Obsolete("Starting with Redis version 5, Redis has moved to 'replica' terminology. Please use " + nameof(Replica) + " instead, this will be removed in 4.0.", error: true)]
[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
Slave = 1,

Expand Down
6 changes: 3 additions & 3 deletions src/StackExchange.Redis/Enums/CommandFlags.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public enum CommandFlags
/// <summary>
/// From 2.0, this flag is not used.
/// </summary>
[Obsolete("From 2.0, this flag is not used, this will be removed in 3.2.", error: true)]
[Obsolete("From 2.0, this flag is not used, this will be removed in 4.0.", error: true)]
[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
HighPriority = 1,

Expand All @@ -51,14 +51,14 @@ public enum CommandFlags
/// This operation should be performed on the replica if it is available, but will be performed on
/// a primary if no replicas are available. Suitable for read operations only.
/// </summary>
[Obsolete("Starting with Redis version 5, Redis has moved to 'replica' terminology. Please use " + nameof(PreferReplica) + " instead, this will be removed in 3.2.", error: true)]
[Obsolete("Starting with Redis version 5, Redis has moved to 'replica' terminology. Please use " + nameof(PreferReplica) + " instead, this will be removed in 4.0.", error: true)]
[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
PreferSlave = 8,

/// <summary>
/// This operation should only be performed on a replica. Suitable for read operations only.
/// </summary>
[Obsolete("Starting with Redis version 5, Redis has moved to 'replica' terminology. Please use " + nameof(DemandReplica) + " instead, this will be removed in 3.2.", error: true)]
[Obsolete("Starting with Redis version 5, Redis has moved to 'replica' terminology. Please use " + nameof(DemandReplica) + " instead, this will be removed in 4.0.", error: true)]
[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
DemandSlave = 12,

Expand Down
2 changes: 1 addition & 1 deletion src/StackExchange.Redis/Enums/ReplicationChangeOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public enum ReplicationChangeOptions
/// <summary>
/// Issue a REPLICAOF to all other known nodes, making this primary of all.
/// </summary>
[Obsolete("Starting with Redis version 5, Redis has moved to 'replica' terminology. Please use " + nameof(ReplicateToOtherEndpoints) + " instead, this will be removed in 3.2.", error: true)]
[Obsolete("Starting with Redis version 5, Redis has moved to 'replica' terminology. Please use " + nameof(ReplicateToOtherEndpoints) + " instead, this will be removed in 4.0.", error: true)]
[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
EnslaveSubordinates = 4,

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public interface IConnectionMultiplexer : IDisposable, IAsyncDisposable
/// <summary>
/// Should exceptions include identifiable details? (key names, additional <see cref="Exception.Data"/> annotations).
/// </summary>
[Obsolete($"Please use {nameof(ConfigurationOptions)}.{nameof(ConfigurationOptions.IncludeDetailInExceptions)} instead - this will be removed in 3.2.", error: true)]
[Obsolete($"Please use {nameof(ConfigurationOptions)}.{nameof(ConfigurationOptions.IncludeDetailInExceptions)} instead - this will be removed in 4.0.", error: true)]
[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
bool IncludeDetailInExceptions { get; set; }

Expand Down
16 changes: 8 additions & 8 deletions src/StackExchange.Redis/Interfaces/IServer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public partial interface IServer : IRedis
/// <summary>
/// Gets whether the connected server is a replica.
/// </summary>
[Obsolete("Starting with Redis version 5, Redis has moved to 'replica' terminology. Please use " + nameof(IsReplica) + " instead, this will be removed in 3.2.", error: true)]
[Obsolete("Starting with Redis version 5, Redis has moved to 'replica' terminology. Please use " + nameof(IsReplica) + " instead, this will be removed in 4.0.", error: true)]
[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
bool IsSlave { get; }

Expand All @@ -53,7 +53,7 @@ public partial interface IServer : IRedis
/// <summary>
/// Explicitly opt in for replica writes on writable replica.
/// </summary>
[Obsolete("Starting with Redis version 5, Redis has moved to 'replica' terminology. Please use " + nameof(AllowReplicaWrites) + " instead, this will be removed in 3.2.", error: true)]
[Obsolete("Starting with Redis version 5, Redis has moved to 'replica' terminology. Please use " + nameof(AllowReplicaWrites) + " instead, this will be removed in 4.0.", error: true)]
[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
bool AllowSlaveWrites { get; set; }

Expand Down Expand Up @@ -401,7 +401,7 @@ public partial interface IServer : IRedis
Task<DateTime> LastSaveAsync(CommandFlags flags = CommandFlags.None);

/// <inheritdoc cref="MakePrimaryAsync(ReplicationChangeOptions, TextWriter?)"/>
[Obsolete("Please use " + nameof(MakePrimaryAsync) + ", this will be removed in 3.2.", error: true)]
[Obsolete("Please use " + nameof(MakePrimaryAsync) + ", this will be removed in 4.0.", error: true)]
[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
void MakeMaster(ReplicationChangeOptions options, TextWriter? log = null);

Expand Down Expand Up @@ -504,17 +504,17 @@ public partial interface IServer : IRedis
void Shutdown(ShutdownMode shutdownMode = ShutdownMode.Default, CommandFlags flags = CommandFlags.None);

/// <inheritdoc cref="ReplicaOfAsync(System.Net.EndPoint,CommandFlags)"/>
[Obsolete("Starting with Redis version 5, Redis has moved to 'replica' terminology. Please use " + nameof(ReplicaOfAsync) + " instead, this will be removed in 3.2.", error: true)]
[Obsolete("Starting with Redis version 5, Redis has moved to 'replica' terminology. Please use " + nameof(ReplicaOfAsync) + " instead, this will be removed in 4.0.", error: true)]
[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
void SlaveOf(EndPoint master, CommandFlags flags = CommandFlags.None);

/// <inheritdoc cref="ReplicaOfAsync(System.Net.EndPoint,CommandFlags)"/>
[Obsolete("Starting with Redis version 5, Redis has moved to 'replica' terminology. Please use " + nameof(ReplicaOfAsync) + " instead, this will be removed in 3.2.", error: true)]
[Obsolete("Starting with Redis version 5, Redis has moved to 'replica' terminology. Please use " + nameof(ReplicaOfAsync) + " instead, this will be removed in 4.0.", error: true)]
[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
Task SlaveOfAsync(EndPoint master, CommandFlags flags = CommandFlags.None);

/// <inheritdoc cref="ReplicaOfAsync(System.Net.EndPoint,CommandFlags)"/>
[Obsolete("Please use " + nameof(ReplicaOfAsync) + ", this will be removed in 3.2.", error: true)]
[Obsolete("Please use " + nameof(ReplicaOfAsync) + ", this will be removed in 4.0.", error: true)]
[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
void ReplicaOf(EndPoint master, CommandFlags flags = CommandFlags.None);

Expand Down Expand Up @@ -769,12 +769,12 @@ public partial interface IServer : IRedis
Task<KeyValuePair<string, string>[][]> SentinelMastersAsync(CommandFlags flags = CommandFlags.None);

/// <inheritdoc cref="SentinelReplicas(string, CommandFlags)"/>
[Obsolete("Starting with Redis version 5, Redis has moved to 'replica' terminology. Please use " + nameof(SentinelReplicas) + " instead, this will be removed in 3.2.", error: true)]
[Obsolete("Starting with Redis version 5, Redis has moved to 'replica' terminology. Please use " + nameof(SentinelReplicas) + " instead, this will be removed in 4.0.", error: true)]
[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
KeyValuePair<string, string>[][] SentinelSlaves(string serviceName, CommandFlags flags = CommandFlags.None);

/// <inheritdoc cref="SentinelReplicas(string, CommandFlags)"/>
[Obsolete("Starting with Redis version 5, Redis has moved to 'replica' terminology. Please use " + nameof(SentinelReplicasAsync) + " instead, this will be removed in 3.2.", error: true)]
[Obsolete("Starting with Redis version 5, Redis has moved to 'replica' terminology. Please use " + nameof(SentinelReplicasAsync) + " instead, this will be removed in 4.0.", error: true)]
[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
Task<KeyValuePair<string, string>[][]> SentinelSlavesAsync(string serviceName, CommandFlags flags = CommandFlags.None);

Expand Down
2 changes: 1 addition & 1 deletion src/StackExchange.Redis/RedisFeatures.cs
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ public RedisFeatures(Version version)
public bool ScriptingDatabaseSafe => Version.IsAtLeast(v2_8_12);

/// <inheritdoc cref="HyperLogLogCountReplicaSafe"/>
[Obsolete("Starting with Redis version 5, Redis has moved to 'replica' terminology. Please use " + nameof(HyperLogLogCountReplicaSafe) + " instead, this will be removed in 3.2.", error: true)]
[Obsolete("Starting with Redis version 5, Redis has moved to 'replica' terminology. Please use " + nameof(HyperLogLogCountReplicaSafe) + " instead, this will be removed in 4.0.", error: true)]
[Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
public bool HyperLogLogCountSlaveSafe => HyperLogLogCountReplicaSafe;

Expand Down
Loading