Remove dead .NET Framework 3.5 code (#3752)

normj · web-flow · commit c618252edd71 · 2025-04-10T12:48:11.000-07:00
diff --git a/generator/.DevConfigs/9EB387DE-2F05-4D61-9414-357109AC3055.json b/generator/.DevConfigs/9EB387DE-2F05-4D61-9414-357109AC3055.json
@@ -0,0 +1,9 @@
+{
+    "core": {
+        "changeLogMessages": [
+            "Remove unused internal legacy .NET Framework 3.5 code."
+        ],
+		"type": "Patch",
+        "updateMinimum": true
+    }
+}
diff --git a/sdk/src/Core/Amazon.Runtime/Pipeline/Contexts.cs b/sdk/src/Core/Amazon.Runtime/Pipeline/Contexts.cs
@@ -63,29 +63,11 @@ public interface IResponseContext
         IWebResponseData HttpResponse { get; set; }
     }
 
-    public interface IAsyncRequestContext : IRequestContext
-    {
-        AsyncCallback Callback { get; }
-        object State { get; }
-    }
-
-    public interface IAsyncResponseContext : IResponseContext
-    {
-    }
-
     public interface IExecutionContext
     {
         IResponseContext ResponseContext { get; }
         IRequestContext RequestContext { get; }
     }
-
-    public interface IAsyncExecutionContext
-    {
-        IAsyncResponseContext ResponseContext { get; }
-        IAsyncRequestContext RequestContext { get; }
-
-        object RuntimeState { get; set; }
-    }
 }
 
 namespace Amazon.Runtime.Internal
@@ -124,9 +106,7 @@ public RequestContext(bool enableMetrics, ISigner clientSigner)
         public BaseIdentity Identity { get; set; }
         public UserAgentDetails UserAgentDetails { get => ((IAmazonWebServiceRequest)OriginalRequest).UserAgentDetails; }
 
-#if AWS_ASYNC_API
         public System.Threading.CancellationToken CancellationToken { get; set; }
-#endif
 
         public string RequestName
         {
@@ -177,27 +157,12 @@ public IDictionary<string, object> ContextAttributes
         public IHttpRequestStreamHandle RequestStreamHandle { get; set; }
     }
 
-    public class AsyncRequestContext : RequestContext, IAsyncRequestContext
-    {
-        public AsyncRequestContext(bool enableMetrics, ISigner clientSigner) :
-            base(enableMetrics, clientSigner)
-        {
-        }
-
-        public AsyncCallback Callback { get; set; }
-        public object State { get; set; }
-    }
-
     public class ResponseContext : IResponseContext
     {
         public AmazonWebServiceResponse Response { get; set; }
         public IWebResponseData HttpResponse { get; set; }
     }
 
-    public class AsyncResponseContext : ResponseContext, IAsyncResponseContext
-    {
-    }
-
     public class ExecutionContext : IExecutionContext
     {
         public IRequestContext RequestContext { get; private set; }
@@ -214,29 +179,5 @@ public ExecutionContext(IRequestContext requestContext, IResponseContext respons
             this.RequestContext = requestContext;
             this.ResponseContext = responseContext;
         }
-        public static IExecutionContext CreateFromAsyncContext(IAsyncExecutionContext asyncContext)
-        {
-            return new ExecutionContext(asyncContext.RequestContext,
-                asyncContext.ResponseContext);
-        }
-    }
-
-    public class AsyncExecutionContext : IAsyncExecutionContext
-    {
-        public IAsyncResponseContext ResponseContext { get; private set; }
-        public IAsyncRequestContext RequestContext { get; private set; }
-        public object RuntimeState { get; set; }
-
-        public AsyncExecutionContext(bool enableMetrics, ISigner clientSigner)
-        {
-            this.RequestContext = new AsyncRequestContext(enableMetrics, clientSigner);
-            this.ResponseContext = new AsyncResponseContext();
-        }
-
-        public AsyncExecutionContext(IAsyncRequestContext requestContext, IAsyncResponseContext responseContext)
-        {
-            this.RequestContext = requestContext;
-            this.ResponseContext = responseContext;
-        }
     }
 }
diff --git a/sdk/src/Core/Amazon.Runtime/Pipeline/_bcl/RuntimeAsyncResult.cs b/sdk/src/Core/Amazon.Runtime/Pipeline/_bcl/RuntimeAsyncResult.cs
diff --git a/sdk/src/Core/GlobalSuppressions.cs b/sdk/src/Core/GlobalSuppressions.cs
@@ -457,7 +457,6 @@
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:Do not catch general exception types", Scope = "member", Target = "~M:Amazon.Runtime.Internal.HttpHandler`1.GetRequestStreamCallbackHelper(System.Object)")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:Do not catch general exception types", Scope = "member", Target = "~M:Amazon.Runtime.Internal.HttpHandler`1.GetResponseCallbackHelper(System.Object)")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:Do not catch general exception types", Scope = "member", Target = "~M:Amazon.Runtime.AmazonServiceClient.UpdateSecurityProtocol")]
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:Do not catch general exception types", Scope = "member", Target = "~M:Amazon.Runtime.Internal.RuntimeAsyncResult.InvokeCallback")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:Do not catch general exception types", Scope = "member", Target = "~M:Amazon.Runtime.Internal.Util.GuidUtils.TryParseGuid(System.String,System.Guid@)~System.Boolean")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:Do not catch general exception types", Scope = "member", Target = "~M:Amazon.Runtime.MonitoringListener.BeginPostMessagesOverUDPInvoke(System.String)")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:Do not catch general exception types", Scope = "member", Target = "~M:Amazon.Runtime.MonitoringListener.EndSendMessagesOverUDPInvoke(System.IAsyncResult)")]
diff --git a/sdk/test/ProtocolTests/Custom/ProtocolTestUtils.cs b/sdk/test/ProtocolTests/Custom/ProtocolTestUtils.cs
@@ -131,16 +131,6 @@ public class NoopPipelineHandler : IPipelineHandler
             public IPipelineHandler InnerHandler { get; set; }
             public IPipelineHandler OuterHandler { get; set; }
 
-            public void AsyncCallback(IAsyncExecutionContext executionContext)
-            {
-            }
-
-            public IAsyncResult InvokeAsync(IAsyncExecutionContext executionContext)
-            {
-                return null;
-            }
-
-
             public virtual System.Threading.Tasks.Task<T> InvokeAsync<T>(IExecutionContext executionContext)
                 where T : AmazonWebServiceResponse, new()
             {
diff --git a/sdk/test/Services/S3/UnitTests/Custom/S3ArnTestUtils.cs b/sdk/test/Services/S3/UnitTests/Custom/S3ArnTestUtils.cs
@@ -84,16 +84,6 @@ public class NoopPipelineHandler : IPipelineHandler
             public IPipelineHandler InnerHandler { get; set; }
             public IPipelineHandler OuterHandler { get; set; }
 
-            public void AsyncCallback(IAsyncExecutionContext executionContext)
-            {
-            }
-
-            public IAsyncResult InvokeAsync(IAsyncExecutionContext executionContext)
-            {
-                return null;
-            }
-
-
             public virtual System.Threading.Tasks.Task<T> InvokeAsync<T>(IExecutionContext executionContext)
                 where T : AmazonWebServiceResponse, new()
             {
diff --git a/sdk/test/UnitTests/Custom/Mocking/TestUtils.cs b/sdk/test/UnitTests/Custom/Mocking/TestUtils.cs
@@ -126,14 +126,6 @@ public class NoopPipelineHandler : IPipelineHandler
             public IPipelineHandler InnerHandler { get; set; }
             public IPipelineHandler OuterHandler { get; set; }
 
-            public void AsyncCallback(IAsyncExecutionContext executionContext)
-            {
-            }
-
-            public IAsyncResult InvokeAsync(IAsyncExecutionContext executionContext)
-            {
-                return null;
-            }
             public virtual System.Threading.Tasks.Task<T> InvokeAsync<T>(IExecutionContext executionContext)
                 where T : AmazonWebServiceResponse, new()
             {
diff --git a/sdk/test/UnitTests/Custom/Runtime/HttpHandlerTests.cs b/sdk/test/UnitTests/Custom/Runtime/HttpHandlerTests.cs
@@ -161,29 +161,6 @@ private ExecutionContext CreateExecutionContextForListBuckets()
             return executionContext;
         }
 
-        private AsyncExecutionContext CreateAsyncExecutionContextForListBuckets()
-        {
-            var listBucketsRequest = new ListBucketsRequest();
-            var executionContext = new AsyncExecutionContext(            
-                new AsyncRequestContext(true, new NullSigner())
-                {
-                    ClientConfig = new AmazonS3Config(),
-                    Marshaller = new ListBucketsRequestMarshaller(),
-                    OriginalRequest = listBucketsRequest,
-                    Request = new ListBucketsRequestMarshaller().Marshall(listBucketsRequest),
-                    Unmarshaller = new ListBucketsResponseUnmarshaller()
-                },
-                new AsyncResponseContext()
-            );
-
-            // Create and set the internal ServiceMetadata via reflection
-            var serviceMetaData = Assembly.GetAssembly(executionContext.GetType()).CreateInstance("Amazon.Runtime.Internal.ServiceMetadata");
-            executionContext.RequestContext.GetType().GetProperty("ServiceMetaData").SetValue(executionContext.RequestContext, serviceMetaData);
-
-            executionContext.RequestContext.Request.Endpoint = new Uri(@"http://ListBuckets");
-            return executionContext;
-        }
-
         /// <summary>
         /// Not thread safe, initialize once for each test.
         /// </summary>
diff --git a/sdk/test/UnitTests/Custom/Runtime/RuntimePipelineTestBase.cs b/sdk/test/UnitTests/Custom/Runtime/RuntimePipelineTestBase.cs
@@ -84,46 +84,6 @@ protected virtual IExecutionContext CreateTestContext(AbstractAWSSigner signer,
                     HttpResponse = new HttpWebRequestResponseData(putObjectResponse)
                 });
         }
-
-        protected IAsyncExecutionContext CreateAsyncTestContext()
-        {
-            return CreateAsyncTestContext(null);
-        }
-
-        protected IAsyncExecutionContext CreateAsyncTestContext(AbstractAWSSigner signer)
-        {
-            var putObjectRequest = new PutObjectRequest
-            {
-                Key = "Test",
-                BucketName = "Test",
-                ContentBody = "Test Content"
-            };
-            var requestContext = new AsyncRequestContext(true, signer == null ? new NullSigner() : signer)
-            {
-                OriginalRequest = putObjectRequest,
-                Request = new PutObjectRequestMarshaller().Marshall(putObjectRequest),
-                Unmarshaller = PutObjectResponseUnmarshaller.Instance,
-                ClientConfig = new AmazonS3Config{
-                    RegionEndpoint = RegionEndpoint.USEast1
-                }
-            };
-
-            // Create and set the internal ServiceMetadata via reflection
-            var serviceMetaData = Assembly.GetAssembly(requestContext.GetType()).CreateInstance("Amazon.Runtime.Internal.ServiceMetadata");
-            requestContext.GetType().GetProperty("ServiceMetaData").SetValue(requestContext, serviceMetaData);
-
-            requestContext.Request.Endpoint = new Uri("https://s3.amazonaws.com");
-
-            var putObjectResponse = MockWebResponse.CreateFromResource("PutObjectResponse.txt")
-                as HttpWebResponse;
-            return new Amazon.Runtime.Internal.AsyncExecutionContext(
-                requestContext,
-                new AsyncResponseContext
-                {
-                    HttpResponse = new HttpWebRequestResponseData(putObjectResponse)
-                }
-            );
-        }
     }
 
     public abstract class RuntimePipelineTestBase<T> : RuntimePipelineTestBase where T : IPipelineHandler
