diff options
| author | David Karlaš <david.karlas@xamarin.com> | 2017-03-07 17:28:34 +0300 |
|---|---|---|
| committer | David Karlaš <david.karlas@xamarin.com> | 2017-03-07 17:28:34 +0300 |
| commit | 41e227d8187ee05a3496375d514bcb08b9b8de6b (patch) | |
| tree | de01a949df06bba86b783bb7ca46550d3bc88cd6 /main/src/addins/TextTemplating | |
| parent | a11ede7183f77eaca433a9bffabafb940f9594ff (diff) | |
| parent | aa201bd070d1e1aa9f09dfe5b7a46f5573870a13 (diff) | |
Merge vNext into roslyn-ivt
# Conflicts:
# main/external/debugger-libs
# main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.csproj
# main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs
# main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
# main/src/core/MonoDevelop.Ide/packages.config
# version-checks
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; |