Changeset 7669 for branches/HeuristicLab.Hive.Azure/HeuristicLab.PluginInfrastructure/3.3

Timestamp:

03/28/12 15:47:26 (12 years ago)

Author:

spimming

Message:

#1680: merged changes from trunk into branch

Location:

branches/HeuristicLab.Hive.Azure

Files:

• . (modified) (2 props)
• HeuristicLab.PluginInfrastructure/3.3/HeuristicLab.PluginInfrastructure-3.3.csproj (modified) (2 diffs)
• HeuristicLab.PluginInfrastructure/3.3/LightweightApplicationManager.cs (modified) (4 diffs)
• HeuristicLab.PluginInfrastructure/3.3/SandboxApplicationManager.cs (modified) (4 diffs)
• HeuristicLab.PluginInfrastructure/3.3/app.config (modified) (2 diffs)

branches/HeuristicLab.Hive.Azure

@@ -3 +3 @@
 *.resharper
 *.suo
+*.user
 *.vsp
 Doxygen
+FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user

@@ -3 +3 @@
 *.resharper
 *.suo
+*.user
 *.vsp
 Doxygen
+FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user

branches/HeuristicLab.Hive.Azure/HeuristicLab.PluginInfrastructure/3.3/HeuristicLab.PluginInfrastructure-3.3.csproj

@@ -102 +102 @@
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ICSharpCode.SharpZipLib, Version=0.85.4.369, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL" />
+    <Reference Include="ICSharpCode.SharpZipLib, Version=0.85.4.369, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
+      <Private>False</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
@@ -309 +311 @@
   <ItemGroup>
     <Content Include="ICSharpCode.SharpZipLib License.txt">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <Content Include="ICSharpCode.SharpZipLib.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <EmbeddedResource Include="Advanced\DeploymentService\services.heuristiclab.com.cer" />

branches/HeuristicLab.Hive.Azure/HeuristicLab.PluginInfrastructure/3.3/LightweightApplicationManager.cs

@@ -75 +75 @@
       foreach (Type t in GetTypes(type)) {
         object instance = null;
-        try { instance = Activator.CreateInstance(t); }
-        catch { }
+        try { instance = Activator.CreateInstance(t); } catch { }
         if (instance != null) instances.Add(instance);
       }
@@ -124 +123 @@
     private static IEnumerable<Type> GetTypes(Type type, Assembly assembly, bool onlyInstantiable = true, bool includeGenericTypeDefinitions = false) {
       try {
+        // necessary to make sure the exception is immediately thrown
+        // instead of later when the enumerable is iterated?
         var assemblyTypes = assembly.GetTypes();
 
-        var buildTypes = from t in assemblyTypes
+        var buildTypes = from t in assembly.GetTypes()
+                         where CheckTypeCompatibility(type, t)
                          where !IsNonDiscoverableType(t)
-                         where CheckTypeCompatibility(type, t)
-                         where onlyInstantiable == false || (!t.IsAbstract && !t.IsInterface && !t.HasElementType)
+                         where onlyInstantiable == false ||
+                               (!t.IsAbstract && !t.IsInterface && !t.HasElementType)
                          select BuildType(t, type);
 
@@ -135 +137 @@
                where includeGenericTypeDefinitions || !t.IsGenericTypeDefinition
                select t;
-      }
-      catch (TypeLoadException) {
+      } catch (TypeLoadException) {
         return Enumerable.Empty<Type>();
-      }
-      catch (ReflectionTypeLoadException) {
+      } catch (ReflectionTypeLoadException) {
         return Enumerable.Empty<Type>();
       }
@@ -152 +152 @@
         return true;
       if (type.IsGenericType && other.IsGenericType) {
+        var otherGenericArguments = other.GetGenericArguments();
+        var typeGenericArguments = type.GetGenericArguments();
+
+        //check type arguments count
+        if (otherGenericArguments.Length != typeGenericArguments.Length)
+          return false;
+
+        //check type arguments & constraints
+        int i = 0;
+        foreach (var genericArgument in typeGenericArguments) {
+          if (otherGenericArguments[i].IsGenericParameter) {
+            foreach (var constraint in otherGenericArguments[i].GetGenericParameterConstraints())
+              if (!constraint.IsAssignableFrom(genericArgument)) return false;
+          } else if (genericArgument != otherGenericArguments[i]) return false;
+          i++;
+        }
+        //check types
         try {
-          if (type.IsAssignableFrom(other.GetGenericTypeDefinition().MakeGenericType(type.GetGenericArguments())))
+          var otherGenericTypeDefinition = other.GetGenericTypeDefinition();
+          if (type.IsAssignableFrom(otherGenericTypeDefinition.MakeGenericType(typeGenericArguments)))
             return true;
-        }
-        catch (Exception) { }
+        } catch (Exception) { }
       }
       return false;

branches/HeuristicLab.Hive.Azure/HeuristicLab.PluginInfrastructure/3.3/SandboxApplicationManager.cs

@@ -235 +235 @@
       PluginDescription pluginDesc = (PluginDescription)pluginDescription;
       return from asm in AppDomain.CurrentDomain.GetAssemblies()
-             where !IsDynamicAssembly(asm)
+             where !asm.IsDynamic && !string.IsNullOrEmpty(asm.Location)
              where pluginDesc.AssemblyLocations.Any(location => location.Equals(Path.GetFullPath(asm.Location), StringComparison.CurrentCultureIgnoreCase))
              from t in GetTypes(type, asm, onlyInstantiable, includeGenericTypeDefinitions)
@@ -249 +249 @@
       }
       return result;
-    }
-
-    private static bool IsDynamicAssembly(Assembly asm) {
-      return (asm is System.Reflection.Emit.AssemblyBuilder) || string.IsNullOrEmpty(asm.Location);
     }
 
@@ -266 +262 @@
     private static IEnumerable<Type> GetTypes(Type type, Assembly assembly, bool onlyInstantiable, bool includeGenericTypeDefinitions) {
       var buildTypes = from t in assembly.GetTypes()
+                       where CheckTypeCompatibility(type, t)
                        where !IsNonDiscoverableType(t)
-                       where CheckTypeCompatibility(type, t)
                        where onlyInstantiable == false ||
                              (!t.IsAbstract && !t.IsInterface && !t.HasElementType)
@@ -286 +282 @@
         return true;
       if (type.IsGenericType && other.IsGenericType) {
+        var otherGenericArguments = other.GetGenericArguments();
+        var typeGenericArguments = type.GetGenericArguments();
+
+        //check type arguments count
+        if (otherGenericArguments.Length != typeGenericArguments.Length)
+          return false;
+
+        //check type arguments & constraints
+        int i = 0;
+        foreach (var genericArgument in typeGenericArguments) {
+          if (otherGenericArguments[i].IsGenericParameter) {
+            foreach (var constraint in otherGenericArguments[i].GetGenericParameterConstraints())
+              if (!constraint.IsAssignableFrom(genericArgument)) return false;
+          } else if (genericArgument != otherGenericArguments[i]) return false;
+          i++;
+        }
+        //check types
         try {
-          if (type.IsAssignableFrom(other.GetGenericTypeDefinition().MakeGenericType(type.GetGenericArguments())))
+          var otherGenericTypeDefinition = other.GetGenericTypeDefinition();
+          if (type.IsAssignableFrom(otherGenericTypeDefinition.MakeGenericType(typeGenericArguments)))
             return true;
         }

branches/HeuristicLab.Hive.Azure/HeuristicLab.PluginInfrastructure/3.3/app.config

@@ -35 +35 @@
           maxBufferPoolSize="524288" maxReceivedMessageSize="200000000" messageEncoding="Text"
           textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
-          <readerQuotas maxDepth="32" maxStringContentLength="32000" maxArrayLength="200000000"
+          <readerQuotas maxDepth="32" maxStringContentLength="200000000" maxArrayLength="200000000"
             maxBytesPerRead="4096" maxNameTableCharCount="16384" />
           <reliableSession ordered="true" inactivityTimeout="00:10:00"
@@ -52 +52 @@
           maxBufferPoolSize="524288" maxReceivedMessageSize="200000000" messageEncoding="Text"
           textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
-          <readerQuotas maxDepth="32" maxStringContentLength="32000" maxArrayLength="200000000"
+          <readerQuotas maxDepth="32" maxStringContentLength="200000000" maxArrayLength="200000000"
             maxBytesPerRead="4096" maxNameTableCharCount="16384" />
           <reliableSession ordered="true" inactivityTimeout="00:10:00"

@@ -3 +3 @@
 *.resharper
 *.suo
+*.user
 *.vsp
 Doxygen
+FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user