Changeset 1425

Timestamp:

03/26/09 10:42:56 (16 years ago)

Author:

epitzer

Message:

Use version invariant assembly qualified name and update plug-in assembly name. (#506)

Location:

branches/New Persistence Exploration/Persistence

Files:

• HeuristicLab.Persistence.GUI/HeuristicLab.Persistence.GUI.csproj (modified) (1 diff)
• HeuristicLab.Persistence.GUI/PersistenceConfigurationForm.cs (modified) (6 diffs)
• Persistence.sln (modified) (1 diff)
• Persistence/Core/ConfigurationService.cs (modified) (2 diffs)
• Persistence/Core/DeSerializer.cs (modified) (2 diffs)
• Persistence/Core/Serializer.cs (modified) (2 diffs)
• Persistence/Default/Decomposers/TypeDecomposer.cs (modified) (1 diff)
• Persistence/HeuristicLab.Persistence-3.3.csproj (added)
• Persistence/HeuristicLab.Persistence.csproj (deleted)
• Test/HeuristicLab.Persistence.Test.csproj (modified) (1 diff)

branches/New Persistence Exploration/Persistence/HeuristicLab.Persistence.GUI/HeuristicLab.Persistence.GUI.csproj

@@ -42 +42 @@
   -->
   <ItemGroup>
-    <ProjectReference Include="..\Persistence\HeuristicLab.Persistence.csproj">
+    <ProjectReference Include="..\Persistence\HeuristicLab.Persistence-3.3.csproj">
       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
-      <Name>HeuristicLab.Persistence</Name>
+      <Name>HeuristicLab.Persistence-3.3</Name>
     </ProjectReference>
   </ItemGroup>

branches/New Persistence Exploration/Persistence/HeuristicLab.Persistence.GUI/PersistenceConfigurationForm.cs

@@ -37 +37 @@
           } else {
             foreach (var pair in formatterTable) {
-              if (pair.Value.GetType().FullName == formatter.GetType().FullName) {
+              if (pair.Value.GetType().VersionInvariantName() == formatter.GetType().VersionInvariantName()) {
                 row.Cells["Formatter"].Value = pair.Key;
                 row.Cells["Active"].Value = true;
@@ -52 +52 @@
       var availableDecomposers = new Dictionary<string, IDecomposer>();
       foreach (IDecomposer d in ConfigurationService.Instance.Decomposers) {        
-        availableDecomposers.Add(d.GetType().FullName, d);
+        availableDecomposers.Add(d.GetType().VersionInvariantName(), d);
       }      
       foreach (IDecomposer decomposer in config.Decomposers) {       
@@ -58 +58 @@
         item.Checked = true;
         item.Tag = decomposer;
-        availableDecomposers.Remove(decomposer.GetType().FullName);
+        availableDecomposers.Remove(decomposer.GetType().VersionInvariantName());
       }      
       foreach (KeyValuePair<string, IDecomposer> pair in availableDecomposers) {
@@ -211 +211 @@
           formatterTable.Remove(formatterName);
           reverseFormatterTable.Remove(otherFormatter);
-          formatterTable.Add(otherFormatter.GetType().FullName, otherFormatter);
-          reverseFormatterTable.Add(otherFormatter, otherFormatter.GetType().FullName);
-          formatterName = formatter.GetType().FullName;
+          formatterTable.Add(otherFormatter.GetType().VersionInvariantName(), otherFormatter);
+          reverseFormatterTable.Add(otherFormatter, otherFormatter.GetType().VersionInvariantName());
+          formatterName = formatter.GetType().VersionInvariantName();
         }
         formatterTable.Add(formatterName, formatter);
@@ -226 +226 @@
             typeNameTable.Remove(typeName);
             reverseTypeNameTable.Remove(otherType);
-            typeNameTable.Add(otherType.FullName, otherType);
-            reverseTypeNameTable.Add(otherType, otherType.FullName);
-            typeName = formatter.Type.FullName;
+            typeNameTable.Add(otherType.VersionInvariantName(), otherType);
+            reverseTypeNameTable.Add(otherType, otherType.VersionInvariantName());
+            typeName = formatter.Type.VersionInvariantName();
             typeNameTable.Add(typeName, formatter.Type);
             reverseTypeNameTable.Add(formatter.Type, typeName);
@@ -249 +249 @@
 
     private void decomposerList_DragEnter(object sender, DragEventArgs e) {      
-      if ( e.Data.GetDataPresent(typeof(ListView.SelectedListViewItemCollection).FullName)) {
+      if ( e.Data.GetDataPresent(typeof(ListView.SelectedListViewItemCollection).VersionInvariantName())) {
         e.Effect = DragDropEffects.Move;
       } 

branches/New Persistence Exploration/Persistence/Persistence.sln

@@ -2 +2 @@
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Persistence", "Persistence\HeuristicLab.Persistence.csproj", "{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Persistence-3.3", "Persistence\HeuristicLab.Persistence-3.3.csproj", "{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Persistence.Test", "Test\HeuristicLab.Persistence.Test.csproj", "{E2245078-6F40-449E-A370-01A97A7C5E6A}"

branches/New Persistence Exploration/Persistence/Persistence/Core/ConfigurationService.cs

@@ -97 +97 @@
             Formatters[formatter.Format].Add(formatter);
           } catch (MissingMethodException) {
-            Console.WriteLine("WARNING: Could not instantiate {0}", t.FullName);
+            Console.WriteLine("WARNING: Could not instantiate {0}", t.VersionInvariantName());
           }          
         }
@@ -104 +104 @@
             Decomposers.Add((IDecomposer) Activator.CreateInstance(t, true));
           } catch (MissingMethodException) {
-            Console.WriteLine("WARNING: Could not instantiate {0}", t.FullName);
+            Console.WriteLine("WARNING: Could not instantiate {0}", t.VersionInvariantName());
           }
         }

branches/New Persistence Exploration/Persistence/Persistence/Core/DeSerializer.cs

@@ -89 +89 @@
         throw new ApplicationException(String.Format(
           "No suitable method for deserialization of type \"{0}\" found.",
-          type.FullName));
+          type.VersionInvariantName()));
       }
       if ( start.Id != null )
@@ -111 +111 @@
         throw new ApplicationException(String.Format(
           "No suitable method for deserialization of type \"{0}\" found.",
-          type.FullName));
+          type.VersionInvariantName()));
       }
     }

branches/New Persistence Exploration/Persistence/Persistence/Core/Serializer.cs

@@ -38 +38 @@
           IFormatter f = configuration.GetFormatter(pair.Key);
           if (f != null) {
-            serializer = f.GetType().AssemblyQualifiedName;
+            serializer = f.GetType().VersionInvariantName();
           } else {
             IDecomposer d = configuration.GetDecomposer(pair.Key);
             if (d != null)
-              serializer = d.GetType().AssemblyQualifiedName;
+              serializer = d.GetType().VersionInvariantName();
           }
-          result.Add(new TypeMapping(pair.Value, pair.Key.AssemblyQualifiedName, serializer));
+          result.Add(new TypeMapping(pair.Value, pair.Key.VersionInvariantName(), serializer));
         }
         return result;                                     
@@ -96 +96 @@
           String.Format(
           "No suitable method for serializing values of type \"{0}\" found.",
-          value.GetType().FullName));      
+          value.GetType().VersionInvariantName()));      
     }
 

branches/New Persistence Exploration/Persistence/Persistence/Default/Decomposers/TypeDecomposer.cs

@@ -10 +10 @@
     public bool CanDecompose(Type type) {
       return type == typeof (Type) ||
-             type.FullName == "System.RuntimeType";
+             type.VersionInvariantName() == "System.RuntimeType, mscorlib";
     }
 
     public IEnumerable<Tag> DeCompose(object obj) {
       Type t = (Type) obj;
-      yield return new Tag("AssemblyQualifiedName", t.AssemblyQualifiedName);
+      yield return new Tag("VersionInvariantName", t.VersionInvariantName());
     }
 

branches/New Persistence Exploration/Persistence/Test/HeuristicLab.Persistence.Test.csproj

@@ -41 +41 @@
   -->
   <ItemGroup>
-    <ProjectReference Include="..\Persistence\HeuristicLab.Persistence.csproj">
+    <ProjectReference Include="..\Persistence\HeuristicLab.Persistence-3.3.csproj">
       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
-      <Name>HeuristicLab.Persistence</Name>
+      <Name>HeuristicLab.Persistence-3.3</Name>
     </ProjectReference>
   </ItemGroup>