diff options
author | David Karlaš <david.karlas@xamarin.com> | 2017-03-01 14:25:31 +0300 |
---|---|---|
committer | David Karlaš <david.karlas@xamarin.com> | 2017-03-01 14:26:37 +0300 |
commit | 6c3b5f18e2be03b405e8cedd2e930fa937a84d3f (patch) | |
tree | 4b37816d836fa60db7e1c6c092e40fba8bc69e19 /main/src/addins | |
parent | 27bb81b7591ad4c33e9f59afeb018cfa37e1e8ae (diff) |
Bug 52855 - Failure to resolve System.Core when executing a t4 script
Problem started with ca287231cfe2d12 where I required resolving of full path of assembly to be able to remove duplicates by comparing FullName of assembly. Which works fine in case of running inside IDE but when TextTransform.exe is used engine doesn’t resolve to full path but leaves GAC assemblies unresolved, which is OK since compiler can resolve this just fine later in process.
Diffstat (limited to 'main/src/addins')
-rw-r--r-- | main/src/addins/TextTemplating/Mono.TextTemplating/Mono.TextTemplating/TemplatingEngine.cs | 7 |
1 files changed, 5 insertions, 2 deletions
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; |