diff options
author | Lluis Sanchez <lluis@xamarin.com> | 2017-03-07 02:57:01 +0300 |
---|---|---|
committer | Lluis Sanchez <lluis@xamarin.com> | 2017-03-07 02:57:01 +0300 |
commit | a2a123a795bce31eba9382eb3abc4371e1645d8a (patch) | |
tree | be91a67b8d8c8e9bd82af2ea1f75ece88eb76c1b /main/src/addins/TextTemplating | |
parent | efc452b94a982ee175828cd03debd8967e3dcf87 (diff) | |
parent | 2ac22afb2d71bfe2730725e9196fe4e038d48eeb (diff) |
Merge remote-tracking branch 'origin/master' into vNext
Diffstat (limited to 'main/src/addins/TextTemplating')
-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; |