Disable SERIALIZABLE for net8.0

jstedfast · Dec 10, 2023 · a2460cb · a2460cb
1 parent 15e111e
commit a2460cb
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 4 deletions.
diff --git a/MailKit/MailKit.csproj b/MailKit/MailKit.csproj
@@ -45,8 +45,8 @@
     <DebugType>full</DebugType>
   </PropertyGroup>
 
-  <!-- Enable serializable support for net4.x, net6.0 and net8.0 -->
-  <PropertyGroup Condition=" ! $(TargetFramework.StartsWith('netstandard')) ">
+  <!-- Enable serializable support for net4.x and net6.0 -->
+  <PropertyGroup Condition=" $(TargetFramework.StartsWith('net4')) Or $(TargetFramework.StartsWith('net6')) ">
     <DefineConstants>$(DefineConstants);SERIALIZABLE</DefineConstants>
   </PropertyGroup>
 

diff --git a/MailKit/MailKitLite.csproj b/MailKit/MailKitLite.csproj
@@ -46,8 +46,8 @@
     <DebugType>full</DebugType>
   </PropertyGroup>
 
-  <!-- Enable serializable support for net4.x, net6.0 and net8.0 -->
-  <PropertyGroup Condition=" ! $(TargetFramework.StartsWith('netstandard')) ">
+  <!-- Enable serializable support for net4.x and net6.0 -->
+  <PropertyGroup Condition=" $(TargetFramework.StartsWith('net4')) Or $(TargetFramework.StartsWith('net6')) ">
     <DefineConstants>$(DefineConstants);SERIALIZABLE</DefineConstants>
   </PropertyGroup>
 

diff --git a/UnitTests/ExceptionTests.cs b/UnitTests/ExceptionTests.cs
@@ -24,6 +24,8 @@
 // THE SOFTWARE.
 //
 
+#if NET6_0
+
 using System.Runtime.Serialization.Formatters.Binary;
 
 using MailKit;
@@ -342,3 +344,5 @@ public void TestPop3ProtocolException ()
 		}
 	}
 }
+
+#endif // NET6_0
diff --git a/UnitTests/Net/Imap/ImapCommandExceptionTests.cs b/UnitTests/Net/Imap/ImapCommandExceptionTests.cs
@@ -25,6 +25,8 @@
 // THE SOFTWARE.
 //
 
+#if NET6_0
+
 using System.Runtime.Serialization.Formatters.Binary;
 
 using MailKit.Net.Imap;
@@ -73,3 +75,5 @@ public void TestImapCommandException ()
 		}
 	}
 }
+
+#endif // NET6_0
diff --git a/UnitTests/Net/Pop3/Pop3CommandExceptionTests.cs b/UnitTests/Net/Pop3/Pop3CommandExceptionTests.cs
@@ -24,6 +24,8 @@
 // THE SOFTWARE.
 //
 
+#if NET6_0
+
 using System.Runtime.Serialization.Formatters.Binary;
 
 using MailKit.Net.Pop3;
@@ -94,3 +96,5 @@ public void TestPop3CommandException ()
 		}
 	}
 }
+
+#endif // NET6_0
diff --git a/UnitTests/Net/Proxy/ProxyProtocolExceptionTests.cs b/UnitTests/Net/Proxy/ProxyProtocolExceptionTests.cs
@@ -24,6 +24,8 @@
 // THE SOFTWARE.
 //
 
+#if NET6_0
+
 using System.Runtime.Serialization.Formatters.Binary;
 
 using MailKit.Net.Proxy;
@@ -70,3 +72,5 @@ public void TestSerialization ()
 		}
 	}
 }
+
+#endif // NET6_0
diff --git a/UnitTests/Net/Smtp/SmtpCommandExceptionTests.cs b/UnitTests/Net/Smtp/SmtpCommandExceptionTests.cs
@@ -24,6 +24,8 @@
 // THE SOFTWARE.
 //
 
+#if NET6_0
+
 using System.Runtime.Serialization.Formatters.Binary;
 
 using MimeKit;
@@ -66,3 +68,5 @@ public void TestSmtpCommandException ()
 		}
 	}
 }
+
+#endif // NET6_0
diff --git a/UnitTests/Net/Smtp/SmtpProtocolExceptionTests.cs b/UnitTests/Net/Smtp/SmtpProtocolExceptionTests.cs
@@ -24,6 +24,8 @@
 // THE SOFTWARE.
 //
 
+#if NET6_0
+
 using System.Runtime.Serialization.Formatters.Binary;
 
 using MailKit.Net.Smtp;
@@ -70,3 +72,5 @@ public void TestSerialization ()
 		}
 	}
 }
+
+#endif // NET6_0
diff --git a/UnitTests/Security/AuthenticationExceptionTests.cs b/UnitTests/Security/AuthenticationExceptionTests.cs
@@ -24,6 +24,8 @@
 // THE SOFTWARE.
 //
 
+#if NET6_0
+
 using System.Runtime.Serialization.Formatters.Binary;
 
 using MailKit.Security;
@@ -70,3 +72,5 @@ public void TestSerialization ()
 		}
 	}
 }
+
+#endif // NET6_0
diff --git a/UnitTests/Security/SaslExceptionTests.cs b/UnitTests/Security/SaslExceptionTests.cs
@@ -38,6 +38,8 @@ public void TestArgumentExceptions ()
 			Assert.Throws<ArgumentNullException> (() => new SaslException (null, SaslErrorCode.MissingChallenge, "message"));
 		}
 
+#if NET6_0
+
 		[Test]
 		public void TestSerialization ()
 		{
@@ -54,5 +56,6 @@ public void TestSerialization ()
 				Assert.AreEqual (expected.ErrorCode, ex.ErrorCode, "Unexpected ErrorCode.");
 			}
 		}
+#endif // NET6_0
 	}
 }
diff --git a/UnitTests/Security/SslHandshakeExceptionTests.cs b/UnitTests/Security/SslHandshakeExceptionTests.cs
@@ -41,6 +41,8 @@ public class SslHandshakeExceptionTests
 	{
 		const string HelpLink = "https://github.com/jstedfast/MailKit/blob/master/FAQ.md#ssl-handshake-exception";
 
+#if NET6_0
+
 		[Test]
 		public void TestSerialization ()
 		{
@@ -144,6 +146,8 @@ public void TestSerialization ()
 			}
 		}
 
+#endif // NET6_0
+
 		class FakeClient : MailService
 		{
 			SslCertificateValidationInfo sslValidationInfo;