Author: brett
Date: Wed Feb 8 12:24:05 2012
New Revision: 1241881
URL: http://svn.apache.org/viewvc?rev=1241881&view=rev
Log:
use the processor architecture originally found in the GAC & project, not the
one loaded via reflection as that will get the one currently executing.
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs?rev=1241881&r1=1241880&r2=1241881&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs
Wed Feb 8 12:24:05 2012
@@ -766,13 +766,14 @@ namespace NPanday.ProjectImporter.Conver
log.Warn("Found more than one reference for a single
version, using the first only");
}
- System.Reflection.Assembly a =
System.Reflection.Assembly.ReflectionOnlyLoad(new
System.Reflection.AssemblyName(refs[0]).FullName);
+ System.Reflection.AssemblyName name = new
System.Reflection.AssemblyName(refs[0]);
+ System.Reflection.Assembly a =
System.Reflection.Assembly.ReflectionOnlyLoad(name.FullName);
Dependency refDependency = new Dependency();
refDependency.artifactId = reference.Name;
refDependency.groupId = reference.Name;
- refDependency.type = GacUtility.GetNPandayGacType(a,
reference.PublicKeyToken);
+ refDependency.type =
GacUtility.GetNPandayGacType(a.ImageRuntimeVersion, name.ProcessorArchitecture,
reference.PublicKeyToken);
refDependency.version = reference.Version ?? "1.0.0.0";