Make all exception types serializable

castleproject · Jun 15, 2020 · 2f28225 · 2f28225
1 parent 3bce28e
commit 2f28225
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 27 deletions.
diff --git a/ref/Castle.Core-net45.cs b/ref/Castle.Core-net45.cs
@@ -2615,6 +2615,7 @@ public class InvalidProxyConstructorArgumentsException : System.ArgumentExceptio
  {
  public System.Type ClassToProxy { get; }
  public System.Type ProxyType { get; }
+ public override void GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { }
  }
  public class MixinData
  {

diff --git a/ref/Castle.Core-netstandard2.0.cs b/ref/Castle.Core-netstandard2.0.cs
@@ -2169,6 +2169,7 @@ public class LoggerException : System.Exception
  {
  public LoggerException() { }
  public LoggerException(string message) { }
+ protected LoggerException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { }
  public LoggerException(string message, System.Exception innerException) { }
  }
  public enum LoggerLevel
@@ -2367,6 +2368,7 @@ public class ResourceException : System.Exception
  {
  public ResourceException() { }
  public ResourceException(string message) { }
+ protected ResourceException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { }
  public ResourceException(string message, System.Exception innerException) { }
  }
  public class StaticContentResource : Castle.Core.Resource.AbstractResource
@@ -2595,6 +2597,7 @@ public class InvalidProxyConstructorArgumentsException : System.ArgumentExceptio
  {
  public System.Type ClassToProxy { get; }
  public System.Type ProxyType { get; }
+ public override void GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { }
  }
  public class MixinData
  {

diff --git a/ref/Castle.Core-netstandard2.1.cs b/ref/Castle.Core-netstandard2.1.cs
@@ -2169,6 +2169,7 @@ public class LoggerException : System.Exception
  {
  public LoggerException() { }
  public LoggerException(string message) { }
+ protected LoggerException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { }
  public LoggerException(string message, System.Exception innerException) { }
  }
  public enum LoggerLevel
@@ -2367,6 +2368,7 @@ public class ResourceException : System.Exception
  {
  public ResourceException() { }
  public ResourceException(string message) { }
+ protected ResourceException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { }
  public ResourceException(string message, System.Exception innerException) { }
  }
  public class StaticContentResource : Castle.Core.Resource.AbstractResource
@@ -2595,6 +2597,7 @@ public class InvalidProxyConstructorArgumentsException : System.ArgumentExceptio
  {
  public System.Type ClassToProxy { get; }
  public System.Type ProxyType { get; }
+ public override void GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { }
  }
  public class MixinData
  {

diff --git a/src/Castle.Core/Core/Logging/LoggerException.cs b/src/Castle.Core/Core/Logging/LoggerException.cs
@@ -15,13 +15,9 @@
 namespace Castle.Core.Logging
 {
  using System;
-#if FEATURE_SERIALIZATION
  using System.Runtime.Serialization;
-#endif
 
-#if FEATURE_SERIALIZATION
  [Serializable]
-#endif
  public class LoggerException : Exception
  {
  public LoggerException()
@@ -36,10 +32,8 @@ public LoggerException(String message, Exception innerException) : base(message,
  {
  }
 
-#if FEATURE_SERIALIZATION
  protected LoggerException(SerializationInfo info, StreamingContext context) : base(info, context)
  {
  }
-#endif
  }
 }
diff --git a/src/Castle.Core/Core/Resource/ResourceException.cs b/src/Castle.Core/Core/Resource/ResourceException.cs
@@ -15,13 +15,9 @@
 namespace Castle.Core.Resource
 {
  using System;
-#if FEATURE_SERIALIZATION
  using System.Runtime.Serialization;
-#endif
 
-#if FEATURE_SERIALIZATION
  [Serializable]
-#endif
  public class ResourceException : Exception
  {
  public ResourceException()
@@ -35,10 +31,9 @@ public ResourceException(string message) : base(message)
  public ResourceException(string message, Exception innerException) : base(message, innerException)
  {
  }
-#if FEATURE_SERIALIZATION
+
  protected ResourceException(SerializationInfo info, StreamingContext context) : base(info, context)
  {
  }
-#endif
  }
 }
diff --git a/src/Castle.Core/DynamicProxy/Generators/GeneratorException.cs b/src/Castle.Core/DynamicProxy/Generators/GeneratorException.cs
@@ -15,13 +15,9 @@
 namespace Castle.DynamicProxy.Generators
 {
  using System;
-#if FEATURE_SERIALIZATION
  using System.Runtime.Serialization;
-#endif
 
-#if FEATURE_SERIALIZATION
  [Serializable]
-#endif
  public class GeneratorException : Exception
  {
  internal GeneratorException(string message) : base(message)
@@ -32,10 +28,8 @@ internal GeneratorException(string message, Exception innerException) : base(mes
  {
  }
 
-#if FEATURE_SERIALIZATION
  private protected GeneratorException(SerializationInfo info, StreamingContext context) : base(info, context)
  {
  }
-#endif
  }
 }
diff --git a/src/Castle.Core/DynamicProxy/InvalidMixinConfigurationException.cs b/src/Castle.Core/DynamicProxy/InvalidMixinConfigurationException.cs
@@ -15,13 +15,9 @@
 namespace Castle.DynamicProxy
 {
  using System;
-#if FEATURE_SERIALIZATION
  using System.Runtime.Serialization;
-#endif
 
-#if FEATURE_SERIALIZATION
  [Serializable]
-#endif
  public class InvalidMixinConfigurationException : Exception
  {
  internal InvalidMixinConfigurationException(string message)
@@ -33,10 +29,8 @@ internal InvalidMixinConfigurationException(string message, Exception innerExcep
  {
  }
 
-#if FEATURE_SERIALIZATION
  private protected InvalidMixinConfigurationException(SerializationInfo info, StreamingContext context) : base(info, context)
  {
  }
-#endif
  }
 }
diff --git a/src/Castle.Core/DynamicProxy/InvalidProxyConstructorArgumentsException.cs b/src/Castle.Core/DynamicProxy/InvalidProxyConstructorArgumentsException.cs
@@ -15,19 +15,33 @@
 namespace Castle.DynamicProxy
 {
  using System;
+ using System.Runtime.Serialization;
 
-#if FEATURE_SERIALIZATION
  [Serializable]
-#endif
  public class InvalidProxyConstructorArgumentsException : ArgumentException
  {
  internal InvalidProxyConstructorArgumentsException(string message, Type proxyType, Type classToProxy) : base(message)
  {
- ProxyType = proxyType;
  ClassToProxy = classToProxy;
+ ProxyType = proxyType;
+ }
+
+ private protected InvalidProxyConstructorArgumentsException(SerializationInfo info, StreamingContext context) : base(info, context)
+ {
+ // Binary serialization on .NET Core does not support `Type`,
+ // so we need to make do with type name strings:
+ ClassToProxy = Type.GetType(info.GetString("classToProxy"));
+ ProxyType = Type.GetType(info.GetString("proxyType"));
  }
 
  public Type ClassToProxy { get; private set; }
  public Type ProxyType { get; private set; }
+
+ public override void GetObjectData(SerializationInfo info, StreamingContext context)
+ {
+ base.GetObjectData(info, context);
+ info.AddValue("classToProxy", ClassToProxy.AssemblyQualifiedName);
+ info.AddValue("proxyType", ProxyType.AssemblyQualifiedName);
+ }
  }
 }