Replace FEATURE_BINARY_SERIALIZATION with NETFRAMEWORK

scott-xu · scott-xu · commit c447a8456210 · 2024-02-17T18:00:28.000+08:00
diff --git a/src/Renci.SshNet/Common/NetConfServerException.cs b/src/Renci.SshNet/Common/NetConfServerException.cs
@@ -1,16 +1,16 @@
 ﻿using System;
-#if FEATURE_BINARY_SERIALIZATION
+#if NETFRAMEWORK
 using System.Runtime.Serialization;
-#endif // FEATURE_BINARY_SERIALIZATION
+#endif // NETFRAMEWORK
 
 namespace Renci.SshNet.Common
 {
     /// <summary>
     /// The exception that is thrown when there is something wrong with the server capabilities.
     /// </summary>
-#if FEATURE_BINARY_SERIALIZATION
+#if NETFRAMEWORK
     [Serializable]
-#endif // FEATURE_BINARY_SERIALIZATION
+#endif // NETFRAMEWORK
     public class NetConfServerException : SshException
     {
         /// <summary>
@@ -39,7 +39,7 @@ public NetConfServerException(string message, Exception innerException)
         {
         }
 
-#if FEATURE_BINARY_SERIALIZATION
+#if NETFRAMEWORK
         /// <summary>
         /// Initializes a new instance of the <see cref="NetConfServerException"/> class.
         /// </summary>
@@ -51,6 +51,6 @@ protected NetConfServerException(SerializationInfo info, StreamingContext contex
             : base(info, context)
         {
         }
-#endif // FEATURE_BINARY_SERIALIZATION
+#endif // NETFRAMEWORK
     }
 }
diff --git a/src/Renci.SshNet/Common/ProxyException.cs b/src/Renci.SshNet/Common/ProxyException.cs
@@ -1,16 +1,16 @@
 ﻿using System;
-#if FEATURE_BINARY_SERIALIZATION
+#if NETFRAMEWORK
 using System.Runtime.Serialization;
-#endif // FEATURE_BINARY_SERIALIZATION
+#endif // NETFRAMEWORK
 
 namespace Renci.SshNet.Common
 {
     /// <summary>
     /// The exception that is thrown when a proxy connection cannot be established.
     /// </summary>
-#if FEATURE_BINARY_SERIALIZATION
+#if NETFRAMEWORK
     [Serializable]
-#endif // FEATURE_BINARY_SERIALIZATION
+#endif // NETFRAMEWORK
     public class ProxyException : SshException
     {
         /// <summary>
@@ -39,7 +39,7 @@ public ProxyException(string message, Exception innerException)
         {
         }
 
-#if FEATURE_BINARY_SERIALIZATION
+#if NETFRAMEWORK
         /// <summary>
         /// Initializes a new instance of the <see cref="ProxyException"/> class.
         /// </summary>
@@ -51,6 +51,6 @@ protected ProxyException(SerializationInfo info, StreamingContext context)
             : base(info, context)
         {
         }
-#endif // FEATURE_BINARY_SERIALIZATION
+#endif // NETFRAMEWORK
     }
 }
diff --git a/src/Renci.SshNet/Common/ScpException.cs b/src/Renci.SshNet/Common/ScpException.cs
@@ -1,16 +1,16 @@
 ﻿using System;
-#if FEATURE_BINARY_SERIALIZATION
+#if NETFRAMEWORK
 using System.Runtime.Serialization;
-#endif // FEATURE_BINARY_SERIALIZATION
+#endif // NETFRAMEWORK
 
 namespace Renci.SshNet.Common
 {
     /// <summary>
     /// The exception that is thrown when SCP error occurred.
     /// </summary>
-#if FEATURE_BINARY_SERIALIZATION
+#if NETFRAMEWORK
     [Serializable]
-#endif // FEATURE_BINARY_SERIALIZATION
+#endif // NETFRAMEWORK
     public class ScpException : SshException
     {
         /// <summary>
@@ -39,7 +39,7 @@ public ScpException(string message, Exception innerException)
         {
         }
 
-#if FEATURE_BINARY_SERIALIZATION
+#if NETFRAMEWORK
         /// <summary>
         /// Initializes a new instance of the <see cref="ScpException"/> class.
         /// </summary>
@@ -51,6 +51,6 @@ protected ScpException(SerializationInfo info, StreamingContext context)
             : base(info, context)
         {
         }
-#endif // FEATURE_BINARY_SERIALIZATION
+#endif // NETFRAMEWORK
     }
 }
diff --git a/src/Renci.SshNet/Common/SftpPathNotFoundException.cs b/src/Renci.SshNet/Common/SftpPathNotFoundException.cs
@@ -1,16 +1,16 @@
 ﻿using System;
-#if FEATURE_BINARY_SERIALIZATION
+#if NETFRAMEWORK
 using System.Runtime.Serialization;
-#endif // FEATURE_BINARY_SERIALIZATION
+#endif // NETFRAMEWORK
 
 namespace Renci.SshNet.Common
 {
     /// <summary>
     /// The exception that is thrown when file or directory is not found.
     /// </summary>
-#if FEATURE_BINARY_SERIALIZATION
+#if NETFRAMEWORK
     [Serializable]
-#endif // FEATURE_BINARY_SERIALIZATION
+#endif // NETFRAMEWORK
     public class SftpPathNotFoundException : SshException
     {
         /// <summary>
@@ -39,7 +39,7 @@ public SftpPathNotFoundException(string message, Exception innerException)
         {
         }
 
-#if FEATURE_BINARY_SERIALIZATION
+#if NETFRAMEWORK
         /// <summary>
         /// Initializes a new instance of the <see cref="SftpPathNotFoundException"/> class.
         /// </summary>
@@ -51,6 +51,6 @@ protected SftpPathNotFoundException(SerializationInfo info, StreamingContext con
             : base(info, context)
         {
         }
-#endif // FEATURE_BINARY_SERIALIZATION
+#endif // NETFRAMEWORK
     }
 }
diff --git a/src/Renci.SshNet/Common/SftpPermissionDeniedException.cs b/src/Renci.SshNet/Common/SftpPermissionDeniedException.cs
@@ -1,16 +1,16 @@
 ﻿using System;
-#if FEATURE_BINARY_SERIALIZATION
+#if NETFRAMEWORK
 using System.Runtime.Serialization;
-#endif // FEATURE_BINARY_SERIALIZATION
+#endif // NETFRAMEWORK
 
 namespace Renci.SshNet.Common
 {
     /// <summary>
     /// The exception that is thrown when operation permission is denied.
     /// </summary>
-#if FEATURE_BINARY_SERIALIZATION
+#if NETFRAMEWORK
     [Serializable]
-#endif // FEATURE_BINARY_SERIALIZATION
+#endif // NETFRAMEWORK
     public class SftpPermissionDeniedException : SshException
     {
         /// <summary>
@@ -39,7 +39,7 @@ public SftpPermissionDeniedException(string message, Exception innerException)
         {
         }
 
-#if FEATURE_BINARY_SERIALIZATION
+#if NETFRAMEWORK
         /// <summary>
         /// Initializes a new instance of the <see cref="SftpPermissionDeniedException"/> class.
         /// </summary>
@@ -51,6 +51,6 @@ protected SftpPermissionDeniedException(SerializationInfo info, StreamingContext
             : base(info, context)
         {
         }
-#endif // FEATURE_BINARY_SERIALIZATION
+#endif // NETFRAMEWORK
     }
 }
diff --git a/src/Renci.SshNet/Common/SshAuthenticationException.cs b/src/Renci.SshNet/Common/SshAuthenticationException.cs
@@ -1,16 +1,16 @@
 ﻿using System;
-#if FEATURE_BINARY_SERIALIZATION
+#if NETFRAMEWORK
 using System.Runtime.Serialization;
-#endif // FEATURE_BINARY_SERIALIZATION
+#endif // NETFRAMEWORK
 
 namespace Renci.SshNet.Common
 {
     /// <summary>
     /// The exception that is thrown when authentication failed.
     /// </summary>
-#if FEATURE_BINARY_SERIALIZATION
+#if NETFRAMEWORK
     [Serializable]
-#endif // FEATURE_BINARY_SERIALIZATION
+#endif // NETFRAMEWORK
     public class SshAuthenticationException : SshException
     {
         /// <summary>
@@ -39,7 +39,7 @@ public SshAuthenticationException(string message, Exception innerException)
         {
         }
 
-#if FEATURE_BINARY_SERIALIZATION
+#if NETFRAMEWORK
         /// <summary>
         /// Initializes a new instance of the <see cref="SshAuthenticationException"/> class.
         /// </summary>
@@ -51,6 +51,6 @@ protected SshAuthenticationException(SerializationInfo info, StreamingContext co
             : base(info, context)
         {
         }
-#endif // FEATURE_BINARY_SERIALIZATION
+#endif // NETFRAMEWORK
     }
 }
diff --git a/src/Renci.SshNet/Common/SshConnectionException.cs b/src/Renci.SshNet/Common/SshConnectionException.cs
@@ -1,17 +1,17 @@
 ﻿using System;
-#if FEATURE_BINARY_SERIALIZATION
+#if NETFRAMEWORK
 using System.Runtime.Serialization;
-#endif // FEATURE_BINARY_SERIALIZATION
+#endif // NETFRAMEWORK
 using Renci.SshNet.Messages.Transport;
 
 namespace Renci.SshNet.Common
 {
     /// <summary>
     /// The exception that is thrown when connection was terminated.
     /// </summary>
-#if FEATURE_BINARY_SERIALIZATION
+#if NETFRAMEWORK
     [Serializable]
-#endif // FEATURE_BINARY_SERIALIZATION
+#endif // NETFRAMEWORK
     public class SshConnectionException : SshException
     {
         /// <summary>
@@ -70,7 +70,7 @@ public SshConnectionException(string message, DisconnectReason disconnectReasonC
             DisconnectReason = disconnectReasonCode;
         }
 
-#if FEATURE_BINARY_SERIALIZATION
+#if NETFRAMEWORK
         /// <summary>
         /// Initializes a new instance of the <see cref="SshConnectionException"/> class.
         /// </summary>
@@ -82,6 +82,6 @@ protected SshConnectionException(SerializationInfo info, StreamingContext contex
             : base(info, context)
         {
         }
-#endif // FEATURE_BINARY_SERIALIZATION
+#endif // NETFRAMEWORK
     }
 }
diff --git a/src/Renci.SshNet/Common/SshException.cs b/src/Renci.SshNet/Common/SshException.cs
@@ -1,16 +1,16 @@
 ﻿using System;
-#if FEATURE_BINARY_SERIALIZATION
+#if NETFRAMEWORK
 using System.Runtime.Serialization;
-#endif // FEATURE_BINARY_SERIALIZATION
+#endif // NETFRAMEWORK
 
 namespace Renci.SshNet.Common
 {
     /// <summary>
     /// The exception that is thrown when SSH exception occurs.
     /// </summary>
-#if FEATURE_BINARY_SERIALIZATION
+#if NETFRAMEWORK
     [Serializable]
-#endif // FEATURE_BINARY_SERIALIZATION
+#endif // NETFRAMEWORK
     public class SshException : Exception
     {
         /// <summary>
@@ -39,7 +39,7 @@ public SshException(string message, Exception inner)
         {
         }
 
-#if FEATURE_BINARY_SERIALIZATION
+#if NETFRAMEWORK
         /// <summary>
         /// Initializes a new instance of the <see cref="SshException"/> class.
         /// </summary>
@@ -51,6 +51,6 @@ protected SshException(SerializationInfo info, StreamingContext context)
             : base(info, context)
         {
         }
-#endif // FEATURE_BINARY_SERIALIZATION
+#endif // NETFRAMEWORK
     }
 }
diff --git a/src/Renci.SshNet/Common/SshOperationTimeoutException.cs b/src/Renci.SshNet/Common/SshOperationTimeoutException.cs
@@ -1,16 +1,16 @@
 ﻿using System;
-#if FEATURE_BINARY_SERIALIZATION
+#if NETFRAMEWORK
 using System.Runtime.Serialization;
-#endif // FEATURE_BINARY_SERIALIZATION
+#endif // NETFRAMEWORK
 
 namespace Renci.SshNet.Common
 {
     /// <summary>
     /// The exception that is thrown when operation is timed out.
     /// </summary>
-#if FEATURE_BINARY_SERIALIZATION
+#if NETFRAMEWORK
     [Serializable]
-#endif // FEATURE_BINARY_SERIALIZATION
+#endif // NETFRAMEWORK
     public class SshOperationTimeoutException : SshException
     {
         /// <summary>
@@ -39,7 +39,7 @@ public SshOperationTimeoutException(string message, Exception innerException)
         {
         }
 
-#if FEATURE_BINARY_SERIALIZATION
+#if NETFRAMEWORK
         /// <summary>
         /// Initializes a new instance of the <see cref="SshOperationTimeoutException"/> class.
         /// </summary>
@@ -51,6 +51,6 @@ protected SshOperationTimeoutException(SerializationInfo info, StreamingContext
             : base(info, context)
         {
         }
-#endif // FEATURE_BINARY_SERIALIZATION
+#endif // NETFRAMEWORK
     }
 }
diff --git a/src/Renci.SshNet/Common/SshPassPhraseNullOrEmptyException.cs b/src/Renci.SshNet/Common/SshPassPhraseNullOrEmptyException.cs
@@ -1,16 +1,16 @@
 ﻿using System;
-#if FEATURE_BINARY_SERIALIZATION
+#if NETFRAMEWORK
 using System.Runtime.Serialization;
-#endif // FEATURE_BINARY_SERIALIZATION
+#endif // NETFRAMEWORK
 
 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
+#if NETFRAMEWORK
     [Serializable]
-#endif // FEATURE_BINARY_SERIALIZATION
+#endif // NETFRAMEWORK
     public class SshPassPhraseNullOrEmptyException : SshException
     {
         /// <summary>
@@ -39,7 +39,7 @@ public SshPassPhraseNullOrEmptyException(string message, Exception innerExceptio
         {
         }
 
-#if FEATURE_BINARY_SERIALIZATION
+#if NETFRAMEWORK
         /// <summary>
         /// Initializes a new instance of the <see cref="SshPassPhraseNullOrEmptyException"/> class.
         /// </summary>
@@ -51,6 +51,6 @@ protected SshPassPhraseNullOrEmptyException(SerializationInfo info, StreamingCon
             : base(info, context)
         {
         }
-#endif // FEATURE_BINARY_SERIALIZATION
+#endif // NETFRAMEWORK
     }
 }
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
diff --git a/src/Renci.SshNet/Security/BouncyCastle/security/SecurityUtilityException.cs b/src/Renci.SshNet/Security/BouncyCastle/security/SecurityUtilityException.cs

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