From ee5cb9d895199b9b51d0d9086d70414c49add89b Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Tue, 28 Sep 2010 01:32:30 +0200 Subject: [PATCH] Log loading of AddIns instead of loading of AddIn Runtimes --- src/Main/Core/Project/Src/AddInTree/AddIn/AddIn.cs | 2 ++ src/Main/Core/Project/Src/AddInTree/AddIn/Runtime.cs | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Main/Core/Project/Src/AddInTree/AddIn/AddIn.cs b/src/Main/Core/Project/Src/AddInTree/AddIn/AddIn.cs index 2b38b8b3d0..d7e553d90c 100644 --- a/src/Main/Core/Project/Src/AddInTree/AddIn/AddIn.cs +++ b/src/Main/Core/Project/Src/AddInTree/AddIn/AddIn.cs @@ -85,6 +85,8 @@ namespace ICSharpCode.Core // However, we need to make sure we don't return before the dependencies are ready, // so "bool dependenciesLoaded" must be volatile and set only at the very end of this method. if (!dependenciesLoaded) { + LoggingService.Info("Loading addin " + this.Name); + AssemblyLocator.Init(); foreach (AddInReference r in manifest.Dependencies) { if (r.RequirePreload) { diff --git a/src/Main/Core/Project/Src/AddInTree/AddIn/Runtime.cs b/src/Main/Core/Project/Src/AddInTree/AddIn/Runtime.cs index e29a7e90b3..7aaf41a2f2 100644 --- a/src/Main/Core/Project/Src/AddInTree/AddIn/Runtime.cs +++ b/src/Main/Core/Project/Src/AddInTree/AddIn/Runtime.cs @@ -59,8 +59,6 @@ namespace ICSharpCode.Core { lock (lockObj) { if (!isAssemblyLoaded) { - LoggingService.Info("Loading addin " + assembly); - if (!this.IsActive) throw new InvalidOperationException("Cannot load inactive AddIn runtime");