Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove the obsolete ReadWriteTimeout property from ClientConfig for non-.NET Framework targets #3683

Merged
merged 2 commits into from
Mar 5, 2025
Merged
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"core": {
"changeLogMessages": [
"Remove the obsolete ReadWriteTimeout property from ClientConfig all targets except .NET Framework 4.7.2."
],
"type": "patch",
"updateMinimum": true
}
}
8 changes: 4 additions & 4 deletions sdk/src/Core/Amazon.Runtime/ClientConfig.cs
Original file line number Diff line number Diff line change
@@ -82,7 +82,6 @@ public abstract partial class ClientConfig : IClientConfig
private bool? useFIPSEndpoint;
private bool? disableRequestCompression;
private long? requestMinCompressionSizeBytes;
private TimeSpan? readWriteTimeout = null;
private bool disableHostPrefixInjection = false;
private bool? endpointDiscoveryEnabled = null;
private bool? ignoreConfiguredEndpointUrls;
@@ -1133,6 +1132,9 @@ public int HttpClientCacheSize
}
#endif

#if NETFRAMEWORK
private TimeSpan? readWriteTimeout = null;

/// <summary>
/// Overrides the default read-write timeout value.
/// </summary>
@@ -1145,9 +1147,6 @@ public int HttpClientCacheSize
/// <exception cref="System.ArgumentOutOfRangeException">The timeout specified is less than or equal to zero and is not Infinite.</exception>
/// </remarks>
/// <seealso cref="P:System.Net.HttpWebRequest.ReadWriteTimeout"/>
#if NETSTANDARD
[Obsolete("ReadWriteTimeout is not consumed in asynchronous HTTP requests. Please use a cancellation token to handle stream read/write timeouts.")]
#endif
public TimeSpan? ReadWriteTimeout
{
get { return this.readWriteTimeout; }
@@ -1157,6 +1156,7 @@ public TimeSpan? ReadWriteTimeout
this.readWriteTimeout = value;
}
}
#endif

/// <summary>
/// Gets and sets of the EndpointProvider property.
Original file line number Diff line number Diff line change
@@ -34,9 +34,9 @@ protected override void Initialize()
// Set Timeout and ReadWriteTimeout for Glacier client to max timeout as per-request
// timeouts are not supported.
this.Timeout = ClientConfig.MaxTimeout;
#pragma warning disable CS0612,CS0618
#if NETFRAMEWORK
this.ReadWriteTimeout = ClientConfig.MaxTimeout;
#pragma warning restore CS0612,CS0618
#endif
#endif
base.Initialize();
}
Original file line number Diff line number Diff line change
@@ -36,9 +36,9 @@ protected override void Initialize()
// Set Timeout and ReadWriteTimeout for Amazon IoTJobsDataPlane service to max timeout as per-request
// timeouts are not supported.
this.Timeout = ClientConfig.MaxTimeout;
#pragma warning disable CS0612,CS0618
#if NETFRAMEWORK
this.ReadWriteTimeout = ClientConfig.MaxTimeout;
#pragma warning restore CS0612,CS0618
#endif
#endif
}
}
Original file line number Diff line number Diff line change
@@ -36,9 +36,9 @@ protected override void Initialize()
// Set Timeout and ReadWriteTimeout for Amazon KinesisVideoArchivedMedia service to max timeout as per-request
// timeouts are not supported.
this.Timeout = ClientConfig.MaxTimeout;
#pragma warning disable CS0612,CS0618
#if NETFRAMEWORK
this.ReadWriteTimeout = ClientConfig.MaxTimeout;
#pragma warning restore CS0612, CS0618
#endif
#endif
}
}
Original file line number Diff line number Diff line change
@@ -36,9 +36,9 @@ protected override void Initialize()
// Set Timeout and ReadWriteTimeout for Amazon KinesisVideoMedia service to max timeout as per-request
// timeouts are not supported.
this.Timeout = ClientConfig.MaxTimeout;
#pragma warning disable CS0612,CS0618
#if NETFRAMEWORK
this.ReadWriteTimeout = ClientConfig.MaxTimeout;
#pragma warning restore CS0612,CS0618
#endif
#endif
}
}
Original file line number Diff line number Diff line change
@@ -36,9 +36,9 @@ protected override void Initialize()
// Set Timeout and ReadWriteTimeout for Amazon MediaStoreData service to max timeout as per-request
// timeouts are not supported.
this.Timeout = ClientConfig.MaxTimeout;
#pragma warning disable CS0612, CS0618
#if NETFRAMEWORK
this.ReadWriteTimeout = ClientConfig.MaxTimeout;
#pragma warning restore CS0612, CS0618
#endif
#endif
}
}
4 changes: 2 additions & 2 deletions sdk/src/Services/S3/Custom/AmazonS3Config.cs
Original file line number Diff line number Diff line change
@@ -265,9 +265,9 @@ protected override void Initialize()
// Set Timeout and ReadWriteTimeout for S3 to max timeout as per-request
// timeouts are not supported.
this.Timeout = ClientConfig.MaxTimeout;
#pragma warning disable CS0612,CS0618
#if NETFRAMEWORK
this.ReadWriteTimeout = ClientConfig.MaxTimeout;
#pragma warning restore CS0612, CS0618
#endif
#endif
}