Browse Source

Log loading of AddIns instead of loading of AddIn Runtimes

pull/1/head
Daniel Grunwald 15 years ago
parent
commit
ee5cb9d895
  1. 2
      src/Main/Core/Project/Src/AddInTree/AddIn/AddIn.cs
  2. 2
      src/Main/Core/Project/Src/AddInTree/AddIn/Runtime.cs

2
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, // 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. // so "bool dependenciesLoaded" must be volatile and set only at the very end of this method.
if (!dependenciesLoaded) { if (!dependenciesLoaded) {
LoggingService.Info("Loading addin " + this.Name);
AssemblyLocator.Init(); AssemblyLocator.Init();
foreach (AddInReference r in manifest.Dependencies) { foreach (AddInReference r in manifest.Dependencies) {
if (r.RequirePreload) { if (r.RequirePreload) {

2
src/Main/Core/Project/Src/AddInTree/AddIn/Runtime.cs

@ -59,8 +59,6 @@ namespace ICSharpCode.Core
{ {
lock (lockObj) { lock (lockObj) {
if (!isAssemblyLoaded) { if (!isAssemblyLoaded) {
LoggingService.Info("Loading addin " + assembly);
if (!this.IsActive) if (!this.IsActive)
throw new InvalidOperationException("Cannot load inactive AddIn runtime"); throw new InvalidOperationException("Cannot load inactive AddIn runtime");

Loading…
Cancel
Save