From 6c3b5f18e2be03b405e8cedd2e930fa937a84d3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Karlas=CC=8C?= Date: Wed, 1 Mar 2017 12:25:31 +0100 Subject: =?UTF-8?q?Bug=2052855=20-=20Failure=20to=20resolve=20System.Core?= =?UTF-8?q?=20when=20executing=20a=20t4=20script=20Problem=20started=20wit?= =?UTF-8?q?h=20ca287231cfe2d12=20where=20I=20required=20resolving=20of=20f?= =?UTF-8?q?ull=20path=20of=20assembly=20to=20be=20able=20to=20remove=20dup?= =?UTF-8?q?licates=20by=20comparing=20FullName=20of=20assembly.=20Which=20?= =?UTF-8?q?works=20fine=20in=20case=20of=20running=20inside=20IDE=20but=20?= =?UTF-8?q?when=20TextTransform.exe=20is=20used=20engine=20doesn=E2=80=99t?= =?UTF-8?q?=20resolve=20to=20full=20path=20but=20leaves=20GAC=20assemblies?= =?UTF-8?q?=20unresolved,=20which=20is=20OK=20since=20compiler=20can=20res?= =?UTF-8?q?olve=20this=20just=20fine=20later=20in=20process.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Mono.TextTemplating/Mono.TextTemplating/TemplatingEngine.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'main/src/addins/TextTemplating') diff --git a/main/src/addins/TextTemplating/Mono.TextTemplating/Mono.TextTemplating/TemplatingEngine.cs b/main/src/addins/TextTemplating/Mono.TextTemplating/Mono.TextTemplating/TemplatingEngine.cs index bac0fd4ec0..7720093b36 100644 --- a/main/src/addins/TextTemplating/Mono.TextTemplating/Mono.TextTemplating/TemplatingEngine.cs +++ b/main/src/addins/TextTemplating/Mono.TextTemplating/Mono.TextTemplating/TemplatingEngine.cs @@ -183,8 +183,11 @@ namespace Mono.TextTemplating continue; string resolvedAssem = host.ResolveAssemblyReference (assem); - if (!string.IsNullOrEmpty (resolvedAssem) && File.Exists (resolvedAssem)) { - resolved [AssemblyName.GetAssemblyName (resolvedAssem).FullName] = resolvedAssem; + if (!string.IsNullOrEmpty (resolvedAssem)) { + var assemblyName = resolvedAssem; + if (File.Exists (resolvedAssem)) + assemblyName = AssemblyName.GetAssemblyName (resolvedAssem).FullName; + resolved [assemblyName] = resolvedAssem; } else { pt.LogError ("Could not resolve assembly reference '" + assem + "'"); return null; -- cgit v1.2.3