Browse Source

Assembly.Load in CompositeSolver classes use the assembly name string to avoid build errors in Silverlight 5. Fixes issue #27 in mathnet fork

pull/36/head
cureos 15 years ago
committed by Christoph Ruegg
parent
commit
07ddec8a31
  1. 4
      src/Numerics/LinearAlgebra/Complex/Solvers/Iterative/CompositeSolver.cs
  2. 4
      src/Numerics/LinearAlgebra/Complex32/Solvers/Iterative/CompositeSolver.cs
  3. 4
      src/Numerics/LinearAlgebra/Double/Solvers/Iterative/CompositeSolver.cs
  4. 4
      src/Numerics/LinearAlgebra/Single/Solvers/Iterative/CompositeSolver.cs
  5. 2
      src/Silverlight/Silverlight.csproj

4
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.

4
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.

4
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.

4
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.

2
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>

Loading…
Cancel
Save