1 files changed, 22 insertions, 3 deletions

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementServices.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementServices.cs
index 30670dbd14..ccf2cb438c 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementServices.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementServices.cs
@@ -29,6 +29,7 @@
 using System;

 using NuGet;

 using MonoDevelop.PackageManagement;

+using MonoDevelop.Core;

 

 namespace ICSharpCode.PackageManagement

 {

@@ -49,8 +50,9 @@ namespace ICSharpCode.PackageManagement
 		static readonly IPackageManagementProgressMonitorFactory progressMonitorFactory;

 		static readonly PackageManagementProgressProvider progressProvider;

 		static readonly ProjectTargetFrameworkMonitor projectTargetFrameworkMonitor;

-		static readonly PackageCompatibilityHandler packageCompatibilityHander;

+		static readonly PackageCompatibilityHandler packageCompatibilityHandler;

 		static readonly UpdatedPackagesInSolution updatedPackagesInSolution;

+		static readonly PackageManagementProjectOperations projectOperations;

 

 		static PackageManagementServices()

 		{

@@ -71,10 +73,13 @@ namespace ICSharpCode.PackageManagement
 			backgroundPackageActionRunner = new BackgroundPackageActionRunner (progressMonitorFactory, packageManagementEvents, progressProvider);

 

 			projectTargetFrameworkMonitor = new ProjectTargetFrameworkMonitor (projectService);

-			packageCompatibilityHander = new PackageCompatibilityHandler (projectTargetFrameworkMonitor);

+			packageCompatibilityHandler = new PackageCompatibilityHandler ();

+			packageCompatibilityHandler.MonitorTargetFrameworkChanges (projectTargetFrameworkMonitor);

 

 			updatedPackagesInSolution = new UpdatedPackagesInSolution (solution, registeredPackageRepositories, packageManagementEvents);

 

+			projectOperations = new PackageManagementProjectOperations (solution, registeredPackageRepositories, backgroundPackageActionRunner, packageManagementEvents);

+

 			InitializeCredentialProvider();

 		}

 		

@@ -85,11 +90,21 @@ namespace ICSharpCode.PackageManagement
 

 		static SettingsCredentialProvider CreateSettingsCredentialProvider (ICredentialProvider credentialProvider)

 		{

-			ISettings settings = Settings.LoadDefaultSettings (null, null, null);

+			ISettings settings = LoadSettings ();

 			var packageSourceProvider = new PackageSourceProvider (settings);

 			return new SettingsCredentialProvider(credentialProvider, packageSourceProvider);

 		}

 

+		static ISettings LoadSettings ()

+		{

+			try {

+				return Settings.LoadDefaultSettings (null, null, null);

+			} catch (Exception ex) {

+				LoggingService.LogInternalError ("Unable to load NuGet.Config.", ex);

+			}

+			return NullSettings.Instance;

+		}

+

 		public static PackageManagementOptions Options {

 			get { return options; }

 		}

@@ -149,5 +164,9 @@ namespace ICSharpCode.PackageManagement
 		public static IUpdatedPackagesInSolution UpdatedPackagesInSolution {

 			get { return updatedPackagesInSolution; }

 		}

+

+		public static IPackageManagementProjectOperations ProjectOperations {

+			get { return projectOperations; }

+		}

 	}

 }