Remove FEATURE_BINARY_SERIALIZATION

scott-xu · scott-xu · commit 09365c240038 · 2024-02-16T22:21:44.000+08:00
diff --git a/src/Renci.SshNet/Common/NetConfServerException.cs b/src/Renci.SshNet/Common/NetConfServerException.cs
@@ -1,16 +1,12 @@
 ﻿using System;
-#if FEATURE_BINARY_SERIALIZATION
 using System.Runtime.Serialization;
-#endif // FEATURE_BINARY_SERIALIZATION
 
 namespace Renci.SshNet.Common
 {
     /// <summary>
     /// The exception that is thrown when there is something wrong with the server capabilities.
     /// </summary>
-#if FEATURE_BINARY_SERIALIZATION
     [Serializable]
-#endif // FEATURE_BINARY_SERIALIZATION
     public class NetConfServerException : SshException
     {
         /// <summary>
@@ -39,7 +35,6 @@ public NetConfServerException(string message, Exception innerException)
         {
         }
 
-#if FEATURE_BINARY_SERIALIZATION
         /// <summary>
         /// Initializes a new instance of the <see cref="NetConfServerException"/> class.
         /// </summary>
@@ -51,6 +46,5 @@ protected NetConfServerException(SerializationInfo info, StreamingContext contex
             : base(info, context)
         {
         }
-#endif // FEATURE_BINARY_SERIALIZATION
     }
 }
diff --git a/src/Renci.SshNet/Common/ProxyException.cs b/src/Renci.SshNet/Common/ProxyException.cs
@@ -1,16 +1,12 @@
 ﻿using System;
-#if FEATURE_BINARY_SERIALIZATION
 using System.Runtime.Serialization;
-#endif // FEATURE_BINARY_SERIALIZATION
 
 namespace Renci.SshNet.Common
 {
     /// <summary>
     /// The exception that is thrown when a proxy connection cannot be established.
     /// </summary>
-#if FEATURE_BINARY_SERIALIZATION
     [Serializable]
-#endif // FEATURE_BINARY_SERIALIZATION
     public class ProxyException : SshException
     {
         /// <summary>
@@ -39,7 +35,6 @@ public ProxyException(string message, Exception innerException)
         {
         }
 
-#if FEATURE_BINARY_SERIALIZATION
         /// <summary>
         /// Initializes a new instance of the <see cref="ProxyException"/> class.
         /// </summary>
@@ -51,6 +46,5 @@ protected ProxyException(SerializationInfo info, StreamingContext context)
             : base(info, context)
         {
         }
-#endif // FEATURE_BINARY_SERIALIZATION
     }
 }
diff --git a/src/Renci.SshNet/Common/ScpException.cs b/src/Renci.SshNet/Common/ScpException.cs
@@ -1,16 +1,12 @@
 ﻿using System;
-#if FEATURE_BINARY_SERIALIZATION
 using System.Runtime.Serialization;
-#endif // FEATURE_BINARY_SERIALIZATION
 
 namespace Renci.SshNet.Common
 {
     /// <summary>
     /// The exception that is thrown when SCP error occurred.
     /// </summary>
-#if FEATURE_BINARY_SERIALIZATION
     [Serializable]
-#endif // FEATURE_BINARY_SERIALIZATION
     public class ScpException : SshException
     {
         /// <summary>
@@ -39,7 +35,6 @@ public ScpException(string message, Exception innerException)
         {
         }
 
-#if FEATURE_BINARY_SERIALIZATION
         /// <summary>
         /// Initializes a new instance of the <see cref="ScpException"/> class.
         /// </summary>
@@ -51,6 +46,5 @@ protected ScpException(SerializationInfo info, StreamingContext context)
             : base(info, context)
         {
         }
-#endif // FEATURE_BINARY_SERIALIZATION
     }
 }
diff --git a/src/Renci.SshNet/Common/SftpPathNotFoundException.cs b/src/Renci.SshNet/Common/SftpPathNotFoundException.cs
@@ -1,16 +1,12 @@
 ﻿using System;
-#if FEATURE_BINARY_SERIALIZATION
 using System.Runtime.Serialization;
-#endif // FEATURE_BINARY_SERIALIZATION
 
 namespace Renci.SshNet.Common
 {
     /// <summary>
     /// The exception that is thrown when file or directory is not found.
     /// </summary>
-#if FEATURE_BINARY_SERIALIZATION
     [Serializable]
-#endif // FEATURE_BINARY_SERIALIZATION
     public class SftpPathNotFoundException : SshException
     {
         /// <summary>
@@ -39,7 +35,6 @@ public SftpPathNotFoundException(string message, Exception innerException)
         {
         }
 
-#if FEATURE_BINARY_SERIALIZATION
         /// <summary>
         /// Initializes a new instance of the <see cref="SftpPathNotFoundException"/> class.
         /// </summary>
@@ -51,6 +46,5 @@ protected SftpPathNotFoundException(SerializationInfo info, StreamingContext con
             : base(info, context)
         {
         }
-#endif // FEATURE_BINARY_SERIALIZATION
     }
 }
diff --git a/src/Renci.SshNet/Common/SftpPermissionDeniedException.cs b/src/Renci.SshNet/Common/SftpPermissionDeniedException.cs
@@ -1,16 +1,12 @@
 ﻿using System;
-#if FEATURE_BINARY_SERIALIZATION
 using System.Runtime.Serialization;
-#endif // FEATURE_BINARY_SERIALIZATION
 
 namespace Renci.SshNet.Common
 {
     /// <summary>
     /// The exception that is thrown when operation permission is denied.
     /// </summary>
-#if FEATURE_BINARY_SERIALIZATION
     [Serializable]
-#endif // FEATURE_BINARY_SERIALIZATION
     public class SftpPermissionDeniedException : SshException
     {
         /// <summary>
@@ -39,7 +35,6 @@ public SftpPermissionDeniedException(string message, Exception innerException)
         {
         }
 
-#if FEATURE_BINARY_SERIALIZATION
         /// <summary>
         /// Initializes a new instance of the <see cref="SftpPermissionDeniedException"/> class.
         /// </summary>
@@ -51,6 +46,5 @@ protected SftpPermissionDeniedException(SerializationInfo info, StreamingContext
             : base(info, context)
         {
         }
-#endif // FEATURE_BINARY_SERIALIZATION
     }
 }
diff --git a/src/Renci.SshNet/Common/SshAuthenticationException.cs b/src/Renci.SshNet/Common/SshAuthenticationException.cs
@@ -1,16 +1,12 @@
 ﻿using System;
-#if FEATURE_BINARY_SERIALIZATION
 using System.Runtime.Serialization;
-#endif // FEATURE_BINARY_SERIALIZATION
 
 namespace Renci.SshNet.Common
 {
     /// <summary>
     /// The exception that is thrown when authentication failed.
     /// </summary>
-#if FEATURE_BINARY_SERIALIZATION
     [Serializable]
-#endif // FEATURE_BINARY_SERIALIZATION
     public class SshAuthenticationException : SshException
     {
         /// <summary>
@@ -39,7 +35,6 @@ public SshAuthenticationException(string message, Exception innerException)
         {
         }
 
-#if FEATURE_BINARY_SERIALIZATION
         /// <summary>
         /// Initializes a new instance of the <see cref="SshAuthenticationException"/> class.
         /// </summary>
@@ -51,6 +46,5 @@ protected SshAuthenticationException(SerializationInfo info, StreamingContext co
             : base(info, context)
         {
         }
-#endif // FEATURE_BINARY_SERIALIZATION
     }
 }
diff --git a/src/Renci.SshNet/Common/SshConnectionException.cs b/src/Renci.SshNet/Common/SshConnectionException.cs
@@ -1,17 +1,13 @@
 ﻿using System;
-#if FEATURE_BINARY_SERIALIZATION
 using System.Runtime.Serialization;
-#endif // FEATURE_BINARY_SERIALIZATION
 using Renci.SshNet.Messages.Transport;
 
 namespace Renci.SshNet.Common
 {
     /// <summary>
     /// The exception that is thrown when connection was terminated.
     /// </summary>
-#if FEATURE_BINARY_SERIALIZATION
     [Serializable]
-#endif // FEATURE_BINARY_SERIALIZATION
     public class SshConnectionException : SshException
     {
         /// <summary>
@@ -70,7 +66,6 @@ public SshConnectionException(string message, DisconnectReason disconnectReasonC
             DisconnectReason = disconnectReasonCode;
         }
 
-#if FEATURE_BINARY_SERIALIZATION
         /// <summary>
         /// Initializes a new instance of the <see cref="SshConnectionException"/> class.
         /// </summary>
@@ -82,6 +77,5 @@ protected SshConnectionException(SerializationInfo info, StreamingContext contex
             : base(info, context)
         {
         }
-#endif // FEATURE_BINARY_SERIALIZATION
     }
 }
diff --git a/src/Renci.SshNet/Common/SshException.cs b/src/Renci.SshNet/Common/SshException.cs
@@ -1,16 +1,12 @@
 ﻿using System;
-#if FEATURE_BINARY_SERIALIZATION
 using System.Runtime.Serialization;
-#endif // FEATURE_BINARY_SERIALIZATION
 
 namespace Renci.SshNet.Common
 {
     /// <summary>
     /// The exception that is thrown when SSH exception occurs.
     /// </summary>
-#if FEATURE_BINARY_SERIALIZATION
     [Serializable]
-#endif // FEATURE_BINARY_SERIALIZATION
     public class SshException : Exception
     {
         /// <summary>
@@ -39,7 +35,6 @@ public SshException(string message, Exception inner)
         {
         }
 
-#if FEATURE_BINARY_SERIALIZATION
         /// <summary>
         /// Initializes a new instance of the <see cref="SshException"/> class.
         /// </summary>
@@ -51,6 +46,5 @@ protected SshException(SerializationInfo info, StreamingContext context)
             : base(info, context)
         {
         }
-#endif // FEATURE_BINARY_SERIALIZATION
     }
 }
diff --git a/src/Renci.SshNet/Common/SshOperationTimeoutException.cs b/src/Renci.SshNet/Common/SshOperationTimeoutException.cs
@@ -1,16 +1,12 @@
 ﻿using System;
-#if FEATURE_BINARY_SERIALIZATION
 using System.Runtime.Serialization;
-#endif // FEATURE_BINARY_SERIALIZATION
 
 namespace Renci.SshNet.Common
 {
     /// <summary>
     /// The exception that is thrown when operation is timed out.
     /// </summary>
-#if FEATURE_BINARY_SERIALIZATION
     [Serializable]
-#endif // FEATURE_BINARY_SERIALIZATION
     public class SshOperationTimeoutException : SshException
     {
         /// <summary>
@@ -39,7 +35,6 @@ public SshOperationTimeoutException(string message, Exception innerException)
         {
         }
 
-#if FEATURE_BINARY_SERIALIZATION
         /// <summary>
         /// Initializes a new instance of the <see cref="SshOperationTimeoutException"/> class.
         /// </summary>
@@ -51,6 +46,5 @@ protected SshOperationTimeoutException(SerializationInfo info, StreamingContext
             : base(info, context)
         {
         }
-#endif // FEATURE_BINARY_SERIALIZATION
     }
 }
diff --git a/src/Renci.SshNet/Common/SshPassPhraseNullOrEmptyException.cs b/src/Renci.SshNet/Common/SshPassPhraseNullOrEmptyException.cs
@@ -1,16 +1,12 @@
 ﻿using System;
-#if FEATURE_BINARY_SERIALIZATION
 using System.Runtime.Serialization;
-#endif // FEATURE_BINARY_SERIALIZATION
 
 namespace Renci.SshNet.Common
 {
     /// <summary>
     /// The exception that is thrown when pass phrase for key file is empty or <see langword="null"/>.
     /// </summary>
-#if FEATURE_BINARY_SERIALIZATION
     [Serializable]
-#endif // FEATURE_BINARY_SERIALIZATION
     public class SshPassPhraseNullOrEmptyException : SshException
     {
         /// <summary>
@@ -39,7 +35,6 @@ public SshPassPhraseNullOrEmptyException(string message, Exception innerExceptio
         {
         }
 
-#if FEATURE_BINARY_SERIALIZATION
         /// <summary>
         /// Initializes a new instance of the <see cref="SshPassPhraseNullOrEmptyException"/> class.
         /// </summary>
@@ -51,6 +46,5 @@ protected SshPassPhraseNullOrEmptyException(SerializationInfo info, StreamingCon
             : base(info, context)
         {
         }
-#endif // FEATURE_BINARY_SERIALIZATION
     }
 }
diff --git a/src/Renci.SshNet/Renci.SshNet.csproj b/src/Renci.SshNet/Renci.SshNet.csproj
@@ -28,10 +28,6 @@
     <EnableAotAnalyzer>true</EnableAotAnalyzer>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net462' ">
-    <DefineConstants>$(DefineConstants);FEATURE_BINARY_SERIALIZATION</DefineConstants>
-  </PropertyGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'netstandard2.0' ">
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.0.0" />
   </ItemGroup>
diff --git a/src/Renci.SshNet/Security/BouncyCastle/math/BigInteger.cs b/src/Renci.SshNet/Security/BouncyCastle/math/BigInteger.cs
@@ -10,9 +10,7 @@
 
 namespace Renci.SshNet.Security.Org.BouncyCastle.Math
 {
-#if FEATURE_BINARY_SERIALIZATION
     [Serializable]
-#endif
     internal class BigInteger
     {
         // The first few odd primes
diff --git a/src/Renci.SshNet/Security/BouncyCastle/security/SecurityUtilityException.cs b/src/Renci.SshNet/Security/BouncyCastle/security/SecurityUtilityException.cs
@@ -2,9 +2,7 @@
 
 namespace Renci.SshNet.Security.Org.BouncyCastle.Security
 {
-#if FEATURE_BINARY_SERIALIZATION
     [Serializable]
-#endif
     internal class SecurityUtilityException
 		: Exception
     {

Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,12 @@`
`1`	`1`	`using System;`
`2`		`-#if FEATURE_BINARY_SERIALIZATION`
`3`	`2`	`using System.Runtime.Serialization;`
`4`		`-#endif // FEATURE_BINARY_SERIALIZATION`
`5`	`3`
`6`	`4`	`namespace Renci.SshNet.Common`
`7`	`5`	`{`
`8`	`6`	`/// <summary>`
`9`	`7`	`/// The exception that is thrown when there is something wrong with the server capabilities.`
`10`	`8`	`/// </summary>`
`11`		`-#if FEATURE_BINARY_SERIALIZATION`
`12`	`9`	`[Serializable]`
`13`		`-#endif // FEATURE_BINARY_SERIALIZATION`
`14`	`10`	`public class NetConfServerException : SshException`
`15`	`11`	`{`
`16`	`12`	`/// <summary>`
`@@ -39,7 +35,6 @@ public NetConfServerException(string message, Exception innerException)`
`39`	`35`	`{`
`40`	`36`	`}`
`41`	`37`
`42`		`-#if FEATURE_BINARY_SERIALIZATION`
`43`	`38`	`/// <summary>`
`44`	`39`	`/// Initializes a new instance of the <see cref="NetConfServerException"/> class.`
`45`	`40`	`/// </summary>`
`@@ -51,6 +46,5 @@ protected NetConfServerException(SerializationInfo info, StreamingContext contex`
`51`	`46`	`: base(info, context)`
`52`	`47`	`{`
`53`	`48`	`}`
`54`		`-#endif // FEATURE_BINARY_SERIALIZATION`
`55`	`49`	`}`
`56`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,17 +1,13 @@`
`1`	`1`	`using System;`
`2`		`-#if FEATURE_BINARY_SERIALIZATION`
`3`	`2`	`using System.Runtime.Serialization;`
`4`		`-#endif // FEATURE_BINARY_SERIALIZATION`
`5`	`3`	`using Renci.SshNet.Messages.Transport;`
`6`	`4`
`7`	`5`	`namespace Renci.SshNet.Common`
`8`	`6`	`{`
`9`	`7`	`/// <summary>`
`10`	`8`	`/// The exception that is thrown when connection was terminated.`
`11`	`9`	`/// </summary>`
`12`		`-#if FEATURE_BINARY_SERIALIZATION`
`13`	`10`	`[Serializable]`
`14`		`-#endif // FEATURE_BINARY_SERIALIZATION`
`15`	`11`	`public class SshConnectionException : SshException`
`16`	`12`	`{`
`17`	`13`	`/// <summary>`
`@@ -70,7 +66,6 @@ public SshConnectionException(string message, DisconnectReason disconnectReasonC`
`70`	`66`	`DisconnectReason = disconnectReasonCode;`
`71`	`67`	`}`
`72`	`68`
`73`		`-#if FEATURE_BINARY_SERIALIZATION`
`74`	`69`	`/// <summary>`
`75`	`70`	`/// Initializes a new instance of the <see cref="SshConnectionException"/> class.`
`76`	`71`	`/// </summary>`
`@@ -82,6 +77,5 @@ protected SshConnectionException(SerializationInfo info, StreamingContext contex`
`82`	`77`	`: base(info, context)`
`83`	`78`	`{`
`84`	`79`	`}`
`85`		`-#endif // FEATURE_BINARY_SERIALIZATION`
`86`	`80`	`}`
`87`	`81`	`}`