Changeset 5172 for trunk/sources/HeuristicLab.Persistence

Timestamp:

12/23/10 20:17:59 (14 years ago)

Author:

epitzer

Message:

explicitly allow different versions for mscorlib, this facilitates upgrading (#1350)

File:

• trunk/sources/HeuristicLab.Persistence/3.3/Auxiliary/TypeName.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Persistence/3.3/Auxiliary/TypeName.cs

@@ -235 +235 @@
         }
         return false;
-      }
-      catch (KeyNotFoundException) {
+      } catch (KeyNotFoundException) {
         throw new Exception("Could not extract version information from type string");
       }
@@ -258 +257 @@
         Version thisVersion = new Version(this.AssemblyAttribues["Version"]);
         Version tVersion = new Version(typeName.AssemblyAttribues["Version"]);
-        if (thisVersion.Major != tVersion.Major ||
-          thisVersion.Minor != tVersion.Minor)
+        if (this.AssemblyName == "mscorlib" &&
+          (thisVersion.Major == 2 || thisVersion.Major == 4) &&
+          (tVersion.Major == 2 || tVersion.Major == 4)) {
+          // skip version check
+        } else if (thisVersion.Major != tVersion.Major ||
+                   thisVersion.Minor != tVersion.Minor)
           return false;
         IEnumerator<TypeName> thisIt = this.GenericArgs.GetEnumerator();
@@ -269 +272 @@
         }
         return true;
-      }
-      catch (KeyNotFoundException) {
+      } catch (KeyNotFoundException) {
         throw new Exception("Could not extract version infomration from type string");
       }