You are viewing a plain text version of this content. The canonical link for it is here.
Posted to npanday-dev@incubator.apache.org by Brett Porter <br...@apache.org> on 2010/10/08 02:25:44 UTC
Re: svn commit: r1005392 - /incubator/npanday/branches/npanday-vs2010-support/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/AbstractPomConverter.cs
Hi,
Was this a patch being applied? If so, you should be sure to attribute that. The usual template would look like this:
[NPANDAY-288] revised loading of assembly to fix FileLoadException in 64bit
Submitted by: crimmc (via http://npanday.codeplex.com/Project/Download/FileDownload.aspx?DownloadId=124562)
You can edit it with the svn pe svn:log -r1005392 --revprop . command I showed earlier (did you get a chance to edit the earlier log too?)
On 07/10/2010, at 9:09 PM, apadilla@apache.org wrote:
> Author: apadilla
> Date: Thu Oct 7 10:09:11 2010
> New Revision: 1005392
>
> URL: http://svn.apache.org/viewvc?rev=1005392&view=rev
> Log:
> https://issues.apache.org/jira/browse/NPANDAY-288 - revised loading of assembly to fix FileLoadException in 64bit
>
> Modified:
> incubator/npanday/branches/npanday-vs2010-support/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/AbstractPomConverter.cs
>
> Modified: incubator/npanday/branches/npanday-vs2010-support/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/AbstractPomConverter.cs
> URL: http://svn.apache.org/viewvc/incubator/npanday/branches/npanday-vs2010-support/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/AbstractPomConverter.cs?rev=1005392&r1=1005391&r2=1005392&view=diff
> ==============================================================================
> --- incubator/npanday/branches/npanday-vs2010-support/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/AbstractPomConverter.cs (original)
> +++ incubator/npanday/branches/npanday-vs2010-support/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/NPanday/ProjectImporter/Converter/Algorithms/AbstractPomConverter.cs Thu Oct 7 10:09:11 2010
> @@ -760,9 +760,10 @@ namespace NPanday.ProjectImporter.Conver
>
> refDependency.version = reference.Version ?? "1.0.0.0";
>
> - System.Reflection.Assembly a = System.Reflection.Assembly.Load(gacUtil.GetAssemblyInfo(reference.Name));
> -
> - if (reference.PublicKeyToken != null)
> + //exclude ProcessArchitecture when loading assembly on a non-32 bit machine
> + System.Reflection.Assembly a = System.Reflection.Assembly.Load(new System.Reflection.AssemblyName(gacUtil.GetAssemblyInfo(reference.Name)).FullName);
> +
> + if (reference.PublicKeyToken != null)
> {
> refDependency.classifier = reference.PublicKeyToken;
> }
>
>
--
Brett Porter
brett@apache.org
http://brettporter.wordpress.com/