fix for #194 Ignore assembly version for deserialized types

sancheolz · yallie · commit 311a6312bca7 · 2025-09-17T12:22:52.000+03:00
diff --git a/CoreRemoting/Serialization/Bson/Envelope.cs b/CoreRemoting/Serialization/Bson/Envelope.cs
@@ -17,6 +17,7 @@ public class Envelope
         private object _value;
         
         [JsonProperty]
+        [JsonConverter(typeof(TypeIgnoreVersionConverter))]
         private Type _type;
         
         /// <summary>
@@ -66,10 +67,10 @@ public object Value
 
                     // Special handling for enum values, because BSON serializes every integer as Int64!
                     if (_type.IsEnum)
-                        return Enum.ToObject(_type, _value);
-
-                    // Special handling for serialized DiffGrams
-                    if (_value is SerializedDiffGram serializedDiffGram)
+                        return Enum.ToObject(_type, _value);
+
+                    // Special handling for serialized DiffGrams
+                    if (_value is SerializedDiffGram serializedDiffGram)
                         return serializedDiffGram.Restore(_type);
 
                     // Special handling for encodings (Many encodings have its own class e.g. UTF8Encoding)
diff --git a/CoreRemoting/Serialization/Bson/TypeIgnoreVersionConverter.cs b/CoreRemoting/Serialization/Bson/TypeIgnoreVersionConverter.cs
@@ -0,0 +1,58 @@
+using System;
+using System.Linq;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace CoreRemoting.Serialization.Bson;
+
+internal class TypeIgnoreVersionConverter : JsonConverter
+{
+    public override bool CanConvert(Type objectType)
+    {
+        return objectType == typeof(Type);
+    }
+
+    public override object ReadJson(JsonReader reader, Type objectType, object existingValue,
+        JsonSerializer serializer)
+    {
+        if (reader.TokenType == JsonToken.Null)
+        {
+            return null;
+        }
+
+        string typeFullName = reader.Value as string;
+
+        Type resultType = GetTypeWithoutVersion(typeFullName);
+
+        return resultType;
+    }
+
+    public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+    {
+        writer.WriteValue(((Type)value)?.AssemblyQualifiedName);
+    }
+
+    private Type GetTypeWithoutVersion(string fullTypeName)
+    {
+        var resultType = Type.GetType(fullTypeName);
+
+        if (resultType != null || string.IsNullOrEmpty(fullTypeName)) 
+            return resultType;
+            
+        var commaIndex = fullTypeName.IndexOf(',');
+        if (commaIndex <= 0)
+            return null;
+        string simpleTypeName = fullTypeName.Substring(0, commaIndex).Trim();
+        string assemblyName = new AssemblyName(fullTypeName.Substring(commaIndex + 1).Trim()).Name;
+        resultType = FindTypeInLoadedAssemblies(simpleTypeName, assemblyName);
+
+        return resultType;
+    }
+        
+    private static Type FindTypeInLoadedAssemblies(string typeName, string assemblyName)
+    {
+        return (from assembly in AppDomain.CurrentDomain.GetAssemblies()
+            where assembly.FullName != null && assembly.FullName.Contains(assemblyName)
+            select assembly.GetType(typeName)).FirstOrDefault(foundType => foundType != null);
+    }
+}
