From 3dd61a12981c7d86150ee56df21a2896084576ad Mon Sep 17 00:00:00 2001 From: Andreas Weizel Date: Tue, 5 Feb 2013 00:19:50 +0100 Subject: [PATCH] Some more debug logging of installation process. --- .../Project/Src/Model/AddInSetup.cs | 23 ++++++++++++++++++- .../Src/ViewModel/NuGetAddInsViewModelBase.cs | 10 ++++---- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/src/AddIns/Misc/AddInManager2/Project/Src/Model/AddInSetup.cs b/src/AddIns/Misc/AddInManager2/Project/Src/Model/AddInSetup.cs index d18959bd2b..c54fd44e68 100644 --- a/src/AddIns/Misc/AddInManager2/Project/Src/Model/AddInSetup.cs +++ b/src/AddIns/Misc/AddInManager2/Project/Src/Model/AddInSetup.cs @@ -286,6 +286,27 @@ namespace ICSharpCode.AddInManager2.Model _sdAddInManagement.AddToTree(addIn); } + // Some debug output about AddIn's manifest + if ((addIn.Manifest != null) && !String.IsNullOrEmpty(addIn.Manifest.PrimaryIdentity)) + { + SD.Log.DebugFormatted("[AddInManager2] AddIn's manifest states identity '{0}'", + addIn.Manifest.PrimaryIdentity); + } + else + { + SD.Log.DebugFormatted("[AddInManager2] AddIn's manifest states no identity."); + } + + if (addIn.Properties.Contains("nuGetPackageID")) + { + SD.Log.DebugFormatted("[AddInManager2] AddIn's manifest states NuGet ID '{0}'", + addIn.Properties["nuGetPackageID"]); + } + else + { + SD.Log.DebugFormatted("[AddInManager2] AddIn's manifest states no NuGet ID."); + } + // Mark this AddIn ManagedAddIn markedAddIn = new ManagedAddIn(addIn) { @@ -700,7 +721,7 @@ namespace ICSharpCode.AddInManager2.Model { // We decided to remove this package SD.Log.InfoFormatted("[AddInManager2] Removing unreferenced NuGet package {0} {1}.", - installedPackage.Id, installedPackage.Version.ToString()); + installedPackage.Id, installedPackage.Version.ToString()); _nuGet.Packages.UninstallPackage(installedPackage, true, false); } } diff --git a/src/AddIns/Misc/AddInManager2/Project/Src/ViewModel/NuGetAddInsViewModelBase.cs b/src/AddIns/Misc/AddInManager2/Project/Src/ViewModel/NuGetAddInsViewModelBase.cs index 232485f3c5..b94891e436 100644 --- a/src/AddIns/Misc/AddInManager2/Project/Src/ViewModel/NuGetAddInsViewModelBase.cs +++ b/src/AddIns/Misc/AddInManager2/Project/Src/ViewModel/NuGetAddInsViewModelBase.cs @@ -53,7 +53,7 @@ namespace ICSharpCode.AddInManager2.ViewModel CancelReadPackagesTask(); CreateReadPackagesTask(); _task.Start(); - SD.Log.Debug("[AddInManager2] NuGetAddInsViewModelBase: Started task"); +// SD.Log.Debug("[AddInManager2] NuGetAddInsViewModelBase: Started task"); } protected virtual void UpdateRepositoryBeforeReadPackagesTaskStarts() @@ -64,7 +64,7 @@ namespace ICSharpCode.AddInManager2.ViewModel { if (_task != null) { - SD.Log.Debug("[AddInManager2] NuGetAddInsViewModelBase: Cancelled task"); +// SD.Log.Debug("[AddInManager2] NuGetAddInsViewModelBase: Cancelled task"); _task.Cancel(); } } @@ -74,7 +74,7 @@ namespace ICSharpCode.AddInManager2.ViewModel _task = AddInManagerTask.Create( () => GetPackagesForSelectedPageResult(), (result) => OnPackagesReadForSelectedPage(result)); - SD.Log.Debug("[AddInManager2] NuGetAddInsViewModelBase: Created task"); +// SD.Log.Debug("[AddInManager2] NuGetAddInsViewModelBase: Created task"); } private ReadPackagesResult GetPackagesForSelectedPageResult() @@ -85,7 +85,7 @@ namespace ICSharpCode.AddInManager2.ViewModel private void OnPackagesReadForSelectedPage(AddInManagerTask task) { - SD.Log.Debug("[AddInManager2] NuGetAddInsViewModelBase: Task has returned"); +// SD.Log.Debug("[AddInManager2] NuGetAddInsViewModelBase: Task has returned"); IsReadingPackages = false; if (task.IsFaulted) @@ -95,7 +95,7 @@ namespace ICSharpCode.AddInManager2.ViewModel else if (task.IsCancelled) { // Ignore - SD.Log.Debug("[AddInManager2] NuGetAddInsViewModelBase: Task ignored, because cancelled"); +// SD.Log.Debug("[AddInManager2] NuGetAddInsViewModelBase: Task ignored, because cancelled"); } else {