2007-07-18 Jb Evain <jbevain@novell.com>

	* Mono.Linker/AssemblyResolver.cs:
		Use the assembly name only as a key for the
		assembly cache.

svn path=/trunk/mcs/; revision=82190

diff --git a/mcs/tools/linker/ChangeLog b/mcs/tools/linker/ChangeLog
index 18edaa51fb5ea269af30cf3ab0136b366c36f489..cabb4cdc8830e1f838cd85709d318f140dee9944 100644 (file)
--- a/mcs/tools/linker/ChangeLog
+++ b/mcs/tools/linker/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-18  Jb Evain  <jbevain@novell.com>
+
+       * Mono.Linker/AssemblyResolver.cs:
+               Use the assembly name only as a key for the
+               assembly cache.
+
 2007-07-05  Jb Evain  <jbevain@novell.com>
 
        * Mono.Linker/Driver.cs

diff --git a/mcs/tools/linker/Mono.Linker/AssemblyResolver.cs b/mcs/tools/linker/Mono.Linker/AssemblyResolver.cs
index a0b10372d7c8f4a687eb6fc8c0e02bbe9b042d7b..ec95ae141df4c8201de3fea70b4f6e54015c470c 100644 (file)
--- a/mcs/tools/linker/Mono.Linker/AssemblyResolver.cs
+++ b/mcs/tools/linker/Mono.Linker/AssemblyResolver.cs
@@ -48,11 +48,11 @@ namespace Mono.Linker {
 
                public override AssemblyDefinition Resolve (AssemblyNameReference name)
                {
-                       AssemblyDefinition asm = (AssemblyDefinition) _assemblies [name.FullName];
+                       AssemblyDefinition asm = (AssemblyDefinition) _assemblies [name.Name];
                        if (asm == null) {
                                asm = base.Resolve (name);
                                asm.Resolver = this;
-                               _assemblies [name.FullName] = asm;
+                               _assemblies [name.Name] = asm;
                        }
 
                        return asm;

diff --git a/mcs/tools/linker/Tests/Mono.Linker.Tests.csproj b/mcs/tools/linker/Tests/Mono.Linker.Tests.csproj
index e591da95186e35708b3a79d3d7d75c43d68eae24..a83021f1e64652479fb1386ad4b4f9d2ef03a10c 100644 (file)
--- a/mcs/tools/linker/Tests/Mono.Linker.Tests.csproj
+++ b/mcs/tools/linker/Tests/Mono.Linker.Tests.csproj
@@ -46,7 +46,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\lib\Mono.Cecil.csproj">
+    <ProjectReference Include="..\..\..\class\Mono.Cecil\Mono.Cecil.csproj">
       <Project>{D8F63DFF-5230-43E4-9AB2-DA6E721A1FAE}</Project>
       <Name>Mono.Cecil</Name>
     </ProjectReference>