Remove BCL35 references and code.

boblodgett · boblodgett · commit 11a12a687255 · 2025-07-03T20:31:48.000-07:00
diff --git a/sdk/src/Core/Amazon.Runtime/CredentialManagement/SharedCredentialsFile.cs b/sdk/src/Core/Amazon.Runtime/CredentialManagement/SharedCredentialsFile.cs
@@ -827,76 +827,37 @@ private bool TryGetProfile(string profileName, bool doRefresh, bool isSsoSession
                 AccountIdEndpointMode? accountIdEndpointMode = null;
                 if (reservedProperties.TryGetValue(AccountIdEndpointModeField, out var accountIdEndpointModeString))
                 {
-#if BCL35
-                    try
-                    {
-                        accountIdEndpointMode = (AccountIdEndpointMode)Enum.Parse(typeof(AccountIdEndpointMode), accountIdEndpointModeString, true);
-                    }
-                    catch (Exception)
-                    {
-                        _logger.InfoFormat("Invalid value {0} for {1} in profile {2}. A string preferred/disabled/required is expected.", accountIdEndpointModeString, AccountIdEndpointModeField, profileName);
-                        profile = null;
-                        return false;
-                    }
-#else
                     if (!Enum.TryParse<AccountIdEndpointMode>(accountIdEndpointModeString, true, out var accountIdEndpointModeTemp))
                     {
                         _logger.InfoFormat("Invalid value {0} for {1} in profile {2}. A string  preferred/disabled/required is expected.", accountIdEndpointModeString, AccountIdEndpointModeField, profileName);
                         profile = null;
                         return false;
                     }
                     accountIdEndpointMode = accountIdEndpointModeTemp;
-#endif
                 }
 
                 RequestChecksumCalculation? requestChecksumCalculation = null;
                 if (reservedProperties.TryGetValue(RequestChecksumCalculationField, out var requestChecksumCalculationString))
                 {
-#if BCL35
-                    try
-                    {
-                        requestChecksumCalculation = (RequestChecksumCalculation)Enum.Parse(typeof(RequestChecksumCalculation), requestChecksumCalculationString, true);
-                    }
-                    catch (Exception)
-                    {
-                        _logger.InfoFormat("Invalid value {0} for {1} in profile {2}. A string WHEN_SUPPORTED or WHEN_REQUIRED is expected.", requestChecksumCalculationString, RequestChecksumCalculationField, profileName);
-                        profile = null;
-                        return false;
-                    }
-#else
                     if (!Enum.TryParse<RequestChecksumCalculation>(requestChecksumCalculationString, true, out var requestChecksumCalculationTemp))
                     {
                         _logger.InfoFormat("Invalid value {0} for {1} in profile {2}. A string WHEN_SUPPORTED or WHEN_REQUIRED is expected.", requestChecksumCalculationString, RequestChecksumCalculationField, profileName);
                         profile = null;
                         return false;
                     }
                     requestChecksumCalculation = requestChecksumCalculationTemp;
-#endif
                 }
 
                 ResponseChecksumValidation? responseChecksumValidation = null;
                 if (reservedProperties.TryGetValue(ResponseChecksumValidationField, out var responseChecksumValidationString))
                 {
-#if BCL35
-                    try
-                    {
-                        responseChecksumValidation = (ResponseChecksumValidation)Enum.Parse(typeof(ResponseChecksumValidation), responseChecksumValidationString, true);
-                    }
-                    catch (Exception)
-                    {
-                        _logger.InfoFormat("Invalid value {0} for {1} in profile {2}. A string WHEN_SUPPORTED or WHEN_REQUIRED is expected.", responseChecksumValidationString, ResponseChecksumValidationField, profileName);
-                        profile = null;
-                        return false;
-                    }
-#else
                     if (!Enum.TryParse<ResponseChecksumValidation>(responseChecksumValidationString, true, out var responseChecksumValidationTemp))
                     {
                         _logger.InfoFormat("Invalid value {0} for {1} in profile {2}. A string WHEN_SUPPORTED or WHEN_REQUIRED is expected.", responseChecksumValidationString, ResponseChecksumValidationField, profileName);
                         profile = null;
                         return false;
                     }
                     responseChecksumValidation = responseChecksumValidationTemp;
-#endif
                 }
                     profile = new CredentialProfile(profileName, profileOptions)
                 {
diff --git a/sdk/src/Core/Amazon.Runtime/Internal/Util/MultiValueHeaderParser.cs b/sdk/src/Core/Amazon.Runtime/Internal/Util/MultiValueHeaderParser.cs
@@ -249,18 +249,5 @@ private static int AdvanceIndexIfComma(byte[] input, int index)
                 throw new ArgumentException($"Expected delimiter `{Delimiter}` in input data at index {index}.");
             }
         }
-
-#if BCL35
-        private class Tuple<T1, T2>
-        {
-            internal T1 Item1 { get; private set; }
-            internal T2 Item2 { get; private set; }
-            internal Tuple(T1 item1, T2 item2)
-            {
-                Item1 = item1;
-                Item2 = item2;
-            }
-        }
-#endif
     }
 }
diff --git a/sdk/src/Services/S3/Custom/Model/EncryptionTypeMismatchException.cs b/sdk/src/Services/S3/Custom/Model/EncryptionTypeMismatchException.cs
@@ -115,11 +115,6 @@ protected EncryptionTypeMismatchException(System.Runtime.Serialization.Serializa
         /// <param name="info">The <see cref="T:System.Runtime.Serialization.SerializationInfo" /> that holds the serialized object data about the exception being thrown.</param>
         /// <param name="context">The <see cref="T:System.Runtime.Serialization.StreamingContext" /> that contains contextual information about the source or destination.</param>
         /// <exception cref="T:System.ArgumentNullException">The <paramref name="info" /> parameter is a null reference (Nothing in Visual Basic). </exception>
-#if BCL35
-        [System.Security.Permissions.SecurityPermission(
-            System.Security.Permissions.SecurityAction.LinkDemand,
-            Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)]
-#endif
         [System.Security.SecurityCritical]
         // These FxCop rules are giving false-positives for this method
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]
diff --git a/sdk/src/Services/S3/Custom/Model/IdempotencyParameterMismatchException.cs b/sdk/src/Services/S3/Custom/Model/IdempotencyParameterMismatchException.cs
@@ -119,11 +119,6 @@ protected IdempotencyParameterMismatchException(System.Runtime.Serialization.Ser
         /// <param name="info">The <see cref="T:System.Runtime.Serialization.SerializationInfo" /> that holds the serialized object data about the exception being thrown.</param>
         /// <param name="context">The <see cref="T:System.Runtime.Serialization.StreamingContext" /> that contains contextual information about the source or destination.</param>
         /// <exception cref="T:System.ArgumentNullException">The <paramref name="info" /> parameter is a null reference (Nothing in Visual Basic). </exception>
-#if BCL35
-        [System.Security.Permissions.SecurityPermission(
-            System.Security.Permissions.SecurityAction.LinkDemand,
-            Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)]
-#endif
         [System.Security.SecurityCritical]
         // These FxCop rules are giving false-positives for this method
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]
diff --git a/sdk/src/Services/S3/Custom/Model/InvalidRequestException.cs b/sdk/src/Services/S3/Custom/Model/InvalidRequestException.cs
@@ -114,11 +114,6 @@ protected InvalidRequestException(System.Runtime.Serialization.SerializationInfo
         /// <param name="info">The <see cref="T:System.Runtime.Serialization.SerializationInfo" /> that holds the serialized object data about the exception being thrown.</param>
         /// <param name="context">The <see cref="T:System.Runtime.Serialization.StreamingContext" /> that contains contextual information about the source or destination.</param>
         /// <exception cref="T:System.ArgumentNullException">The <paramref name="info" /> parameter is a null reference (Nothing in Visual Basic). </exception>
-#if BCL35
-        [System.Security.Permissions.SecurityPermission(
-            System.Security.Permissions.SecurityAction.LinkDemand,
-            Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)]
-#endif
         [System.Security.SecurityCritical]
         // These FxCop rules are giving false-positives for this method
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]
diff --git a/sdk/src/Services/S3/Custom/Model/InvalidWriteOffsetException.cs b/sdk/src/Services/S3/Custom/Model/InvalidWriteOffsetException.cs
@@ -114,11 +114,6 @@ protected InvalidWriteOffsetException(System.Runtime.Serialization.Serialization
         /// <param name="info">The <see cref="T:System.Runtime.Serialization.SerializationInfo" /> that holds the serialized object data about the exception being thrown.</param>
         /// <param name="context">The <see cref="T:System.Runtime.Serialization.StreamingContext" /> that contains contextual information about the source or destination.</param>
         /// <exception cref="T:System.ArgumentNullException">The <paramref name="info" /> parameter is a null reference (Nothing in Visual Basic). </exception>
-#if BCL35
-        [System.Security.Permissions.SecurityPermission(
-            System.Security.Permissions.SecurityAction.LinkDemand,
-            Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)]
-#endif
         [System.Security.SecurityCritical]
         // These FxCop rules are giving false-positives for this method
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]
diff --git a/sdk/src/Services/S3/Custom/Model/TooManyPartsException.cs b/sdk/src/Services/S3/Custom/Model/TooManyPartsException.cs
@@ -114,11 +114,6 @@ protected TooManyPartsException(System.Runtime.Serialization.SerializationInfo i
         /// <param name="info">The <see cref="T:System.Runtime.Serialization.SerializationInfo" /> that holds the serialized object data about the exception being thrown.</param>
         /// <param name="context">The <see cref="T:System.Runtime.Serialization.StreamingContext" /> that contains contextual information about the source or destination.</param>
         /// <exception cref="T:System.ArgumentNullException">The <paramref name="info" /> parameter is a null reference (Nothing in Visual Basic). </exception>
-#if BCL35
-        [System.Security.Permissions.SecurityPermission(
-            System.Security.Permissions.SecurityAction.LinkDemand,
-            Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)]
-#endif
         [System.Security.SecurityCritical]
         // These FxCop rules are giving false-positives for this method
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2123:OverrideLinkDemandsShouldBeIdenticalToBase")]

Original file line number	Diff line number	Diff line change
`@@ -249,18 +249,5 @@ private static int AdvanceIndexIfComma(byte[] input, int index)`
`249`	`249`	throw new ArgumentException($"Expected delimiter `{Delimiter}` in input data at index {index}.");
`250`	`250`	`}`
`251`	`251`	`}`
`252`		`-`
`253`		`-#if BCL35`
`254`		`- private class Tuple<T1, T2>`
`255`		`- {`
`256`		`- internal T1 Item1 { get; private set; }`
`257`		`- internal T2 Item2 { get; private set; }`
`258`		`- internal Tuple(T1 item1, T2 item2)`
`259`		`- {`
`260`		`- Item1 = item1;`
`261`		`- Item2 = item2;`
`262`		`- }`
`263`		`- }`
`264`		`-#endif`
`265`	`252`	`}`
`266`	`253`	`}`