You are viewing a plain text version of this content. The canonical link for it is here.
Posted to npanday-commits@incubator.apache.org by br...@apache.org on 2012/02/08 10:29:48 UTC
svn commit: r1241848 -
/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs
Author: brett
Date: Wed Feb 8 10:29:47 2012
New Revision: 1241848
URL: http://svn.apache.org/viewvc?rev=1241848&view=rev
Log:
remove workaround added for NPANDAY-445 that doesn't have a very specific reason, as it is causing the tests to fail on Jenkins which runs on a 64-bit architecture
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=1241848&r1=1241847&r2=1241848&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 10:29:47 2012
@@ -758,19 +758,12 @@ namespace NPanday.ProjectImporter.Conver
if (refs.Count > 0)
{
// Assembly is found at the gac
-
- //exclude ProcessArchitecture when loading assembly on a non-32 bit machine
- List<string> versionRefs = GacUtility.GetInstance().GetAssemblyInfo(reference.Name, reference.Version, null);
- if (versionRefs.Count == 0)
- {
- throw new Exception("Unable to find assembly for '" + reference.Name + "' version '" + reference.Version + "', original refs were: " + string.Join(", ", refs.ToArray()));
- }
- else if (versionRefs.Count > 1)
+ if (refs.Count > 1)
{
- log.Warn("Found more than one reference for a single version, using the first only: " + string.Join(", ", versionRefs.ToArray()));
+ log.Warn("Found more than one reference for a single version, using the first only: " + string.Join(", ", refs.ToArray()));
}
- System.Reflection.Assembly a = System.Reflection.Assembly.ReflectionOnlyLoad(new System.Reflection.AssemblyName(versionRefs[0]).FullName);
+ System.Reflection.Assembly a = System.Reflection.Assembly.ReflectionOnlyLoad(new System.Reflection.AssemblyName(refs[0]).FullName);
Dependency refDependency = new Dependency();
refDependency.artifactId = reference.Name;