From 07ddec8a3183eb1a3d6db1c878ced150ca4ade7f Mon Sep 17 00:00:00 2001
From: cureos <anders@cureos.com>
Date: Sun, 5 Feb 2012 21:54:18 +0100
Subject: [PATCH] Assembly.Load in CompositeSolver classes use the assembly
 name string to avoid build errors in Silverlight 5. Fixes issue #27 in
 mathnet fork

---
 .../Complex/Solvers/Iterative/CompositeSolver.cs              | 4 ++--
 .../Complex32/Solvers/Iterative/CompositeSolver.cs            | 4 ++--
 .../LinearAlgebra/Double/Solvers/Iterative/CompositeSolver.cs | 4 ++--
 .../LinearAlgebra/Single/Solvers/Iterative/CompositeSolver.cs | 4 ++--
 src/Silverlight/Silverlight.csproj                            | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Numerics/LinearAlgebra/Complex/Solvers/Iterative/CompositeSolver.cs b/src/Numerics/LinearAlgebra/Complex/Solvers/Iterative/CompositeSolver.cs
index 6b5da13b..0fc67ea6 100644
--- a/src/Numerics/LinearAlgebra/Complex/Solvers/Iterative/CompositeSolver.cs
+++ b/src/Numerics/LinearAlgebra/Complex/Solvers/Iterative/CompositeSolver.cs
@@ -161,7 +161,7 @@ namespace MathNet.Numerics.LinearAlgebra.Complex.Solvers.Iterative
 
             // Now load the assembly with an AssemblyName
             var assemblyName = new AssemblyName(assemblyFileName);
-            var assembly = Assembly.Load(assemblyName);
+            var assembly = Assembly.Load(assemblyName.FullName);
             
             // <ay throws:
             // ArgumentNullException --> Can't get this because we checked that the file exists.
@@ -193,7 +193,7 @@ namespace MathNet.Numerics.LinearAlgebra.Complex.Solvers.Iterative
                 throw new ArgumentNullException("assemblyName");
             }
 
-            var assembly = Assembly.Load(assemblyName);
+            var assembly = Assembly.Load(assemblyName.FullName);
 
             // May throw:
             // ArgumentNullException --> Can't get this because we checked it.
diff --git a/src/Numerics/LinearAlgebra/Complex32/Solvers/Iterative/CompositeSolver.cs b/src/Numerics/LinearAlgebra/Complex32/Solvers/Iterative/CompositeSolver.cs
index e9e2a179..087ba3f3 100644
--- a/src/Numerics/LinearAlgebra/Complex32/Solvers/Iterative/CompositeSolver.cs
+++ b/src/Numerics/LinearAlgebra/Complex32/Solvers/Iterative/CompositeSolver.cs
@@ -158,7 +158,7 @@ namespace MathNet.Numerics.LinearAlgebra.Complex32.Solvers.Iterative
 
             // Now load the assembly with an AssemblyName
             var assemblyName = new AssemblyName(assemblyFileName);
-            var assembly = Assembly.Load(assemblyName);
+            var assembly = Assembly.Load(assemblyName.FullName);
             
             // <ay throws:
             // ArgumentNullException --> Can't get this because we checked that the file exists.
@@ -190,7 +190,7 @@ namespace MathNet.Numerics.LinearAlgebra.Complex32.Solvers.Iterative
                 throw new ArgumentNullException("assemblyName");
             }
 
-            var assembly = Assembly.Load(assemblyName);
+            var assembly = Assembly.Load(assemblyName.FullName);
 
             // May throw:
             // ArgumentNullException --> Can't get this because we checked it.
diff --git a/src/Numerics/LinearAlgebra/Double/Solvers/Iterative/CompositeSolver.cs b/src/Numerics/LinearAlgebra/Double/Solvers/Iterative/CompositeSolver.cs
index 4d9a0ab8..fcdd0492 100644
--- a/src/Numerics/LinearAlgebra/Double/Solvers/Iterative/CompositeSolver.cs
+++ b/src/Numerics/LinearAlgebra/Double/Solvers/Iterative/CompositeSolver.cs
@@ -156,7 +156,7 @@ namespace MathNet.Numerics.LinearAlgebra.Double.Solvers.Iterative
 
             // Now load the assembly with an AssemblyName
             var assemblyName = new AssemblyName(assemblyFileName);
-            var assembly = Assembly.Load(assemblyName);
+            var assembly = Assembly.Load(assemblyName.FullName);
             
             // <ay throws:
             // ArgumentNullException --> Can't get this because we checked that the file exists.
@@ -188,7 +188,7 @@ namespace MathNet.Numerics.LinearAlgebra.Double.Solvers.Iterative
                 throw new ArgumentNullException("assemblyName");
             }
 
-            var assembly = Assembly.Load(assemblyName);
+            var assembly = Assembly.Load(assemblyName.FullName);
 
             // May throw:
             // ArgumentNullException --> Can't get this because we checked it.
diff --git a/src/Numerics/LinearAlgebra/Single/Solvers/Iterative/CompositeSolver.cs b/src/Numerics/LinearAlgebra/Single/Solvers/Iterative/CompositeSolver.cs
index caf74438..fd1c1614 100644
--- a/src/Numerics/LinearAlgebra/Single/Solvers/Iterative/CompositeSolver.cs
+++ b/src/Numerics/LinearAlgebra/Single/Solvers/Iterative/CompositeSolver.cs
@@ -158,7 +158,7 @@ namespace MathNet.Numerics.LinearAlgebra.Single.Solvers.Iterative
 
             // Now load the assembly with an AssemblyName
             var assemblyName = new AssemblyName(assemblyFileName);
-            var assembly = Assembly.Load(assemblyName);
+            var assembly = Assembly.Load(assemblyName.FullName);
             
             // <ay throws:
             // ArgumentNullException --> Can't get this because we checked that the file exists.
@@ -190,7 +190,7 @@ namespace MathNet.Numerics.LinearAlgebra.Single.Solvers.Iterative
                 throw new ArgumentNullException("assemblyName");
             }
 
-            var assembly = Assembly.Load(assemblyName);
+            var assembly = Assembly.Load(assemblyName.FullName);
 
             // May throw:
             // ArgumentNullException --> Can't get this because we checked it.
diff --git a/src/Silverlight/Silverlight.csproj b/src/Silverlight/Silverlight.csproj
index d7f1adb0..63d9d775 100644
--- a/src/Silverlight/Silverlight.csproj
+++ b/src/Silverlight/Silverlight.csproj
@@ -12,7 +12,7 @@
     <RootNamespace>MathNet.Numerics</RootNamespace>
     <AssemblyName>MathNet.Numerics</AssemblyName>
     <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
     <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
     <SilverlightApplication>false</SilverlightApplication>
     <ValidateXaml>true</ValidateXaml>