- AddInManager2: Settings are now managed by an additional service.

- Added possibility to set a different service environment for view models (needed for unit testing).

src/AddIns/Misc/AddInManager2/Project/AddInManager2.csproj

@@ -97,7 +97,9 @@
     <Compile Include="Src\Model\AcceptLicensesEventArgs.cs" />
     <Compile Include="Src\Model\AddInDependency.cs" />
     <Compile Include="Src\Model\AddInInstallationEventArgs.cs" />
+    <Compile Include="Src\Model\AddInManagerSettings.cs" />
     <Compile Include="Src\Model\Interfaces\IAddInManagerServices.cs" />
+    <Compile Include="Src\Model\Interfaces\IAddInManagerSettings.cs" />
     <Compile Include="Src\Model\ManagedAddIn.cs" />
     <Compile Include="Src\Model\Interfaces\IAddInManagerEvents.cs" />
     <Compile Include="Src\Model\Interfaces\IAddInPackage.cs" />

src/AddIns/Misc/AddInManager2/Project/Src/AddInManagerServices.cs

@@ -3,7 +3,6 @@
 
 using System;
 using ICSharpCode.AddInManager2.Model;
-using ICSharpCode.AddInManager2.Model.Interfaces;
 
 namespace ICSharpCode.AddInManager2
 {
@@ -37,6 +36,12 @@ namespace ICSharpCode.AddInManager2
 				get;
 				set;
 			}
+    		
+			public IAddInManagerSettings Settings
+			{
+				get;
+				set;
+			}
     	}
     	
     	private static AddInManagerServiceContainer _container;
@@ -44,8 +49,9 @@ namespace ICSharpCode.AddInManager2
         static AddInManagerServices()
 		{
         	_container = new AddInManagerServiceContainer();
+        	_container.Settings = new AddInManagerSettings();
 			_container.Events = new AddInManagerEvents();
-			_container.Repositories = new PackageRepositories(_container.Events);
+			_container.Repositories = new PackageRepositories(_container.Events, _container.Settings);
 			_container.NuGet = new NuGetPackageManager(_container.Repositories, _container.Events);
 			_container.Setup = new AddInSetup(_container.Events, _container.NuGet);
 		}
@@ -82,6 +88,14 @@ namespace ICSharpCode.AddInManager2
             }
         }
         
+        public static IAddInManagerSettings Settings
+        {
+            get
+            {
+                return _container.Settings;
+            }
+        }
+        
         public static IAddInManagerServices Services
         {
         	get

src/AddIns/Misc/AddInManager2/Project/Src/Model/AddInManagerSettings.cs

@@ -0,0 +1,50 @@
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
+// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
+
+using System;
+using ICSharpCode.SharpDevelop;
+
+namespace ICSharpCode.AddInManager2.Model
+{
+	/// <summary>
+	/// Handler for managing all persisted settings of AddInManager AddIn.
+	/// </summary>
+	public class AddInManagerSettings : IAddInManagerSettings
+	{
+		public string[] PackageRepositories
+		{
+			get
+			{
+				return SD.PropertyService.Get<string[]>("AddInManager2.PackageRepositories", null);
+			}
+			set
+			{
+				SD.PropertyService.Set<string[]>("AddInManager2.PackageRepositories", value ?? new string[0]);
+			}
+		}
+		
+		public bool ShowPreinstalledAddIns
+		{
+			get
+			{
+				return SD.PropertyService.Get<bool>("AddInManager2.ShowPreinstalledAddIns", false);
+			}
+			set
+			{
+				SD.PropertyService.Set<bool>("AddInManager2.ShowPreinstalledAddIns", value);
+			}
+		}
+		
+		public bool ShowPrereleases
+		{
+			get
+			{
+				return SD.PropertyService.Get<bool>("AddInManager2.ShowPrereleases", false);
+			}
+			set
+			{
+				SD.PropertyService.Set<bool>("AddInManager2.ShowPrereleases", value);
+			}
+		}
+	}
+}

src/AddIns/Misc/AddInManager2/Project/Src/Model/Interfaces/IAddInManagerServices.cs

@@ -3,7 +3,7 @@
 
 using System;
 
-namespace ICSharpCode.AddInManager2.Model.Interfaces
+namespace ICSharpCode.AddInManager2.Model
 {
 	/// <summary>
 	/// Basic interface providing instances to all services of AddInManager AddIn.
@@ -29,5 +29,10 @@ namespace ICSharpCode.AddInManager2.Model.Interfaces
 		{
 			get;
 		}
+		
+		IAddInManagerSettings Settings
+		{
+			get;
+		}
 	}
 }

src/AddIns/Misc/AddInManager2/Project/Src/Model/Interfaces/IAddInManagerSettings.cs

@@ -0,0 +1,31 @@
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
+// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
+
+using System;
+
+namespace ICSharpCode.AddInManager2.Model
+{
+	/// <summary>
+	/// Description of ISettings.
+	/// </summary>
+	public interface IAddInManagerSettings
+	{
+		string[] PackageRepositories
+		{
+			get;
+			set;
+		}
+		
+		bool ShowPreinstalledAddIns
+		{
+			get;
+			set;
+		}
+		
+		bool ShowPrereleases
+		{
+			get;
+			set;
+		}
+	}
+}

src/AddIns/Misc/AddInManager2/Project/Src/Model/Model.cs

@@ -4,16 +4,26 @@
 using System;
 using System.ComponentModel;
 using System.Linq.Expressions;
-using ICSharpCode.AddInManager2.Model.Interfaces;
 
 namespace ICSharpCode.AddInManager2.Model
 {
 	public abstract class Model<TModel> : INotifyPropertyChanged
 	{
-		private IAddInManagerServices _addInManager = null;
+		private IAddInManagerServices _services = null;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
 		
+		public Model()
+		{
+			// Use default services container
+			_services = AddInManagerServices.Services;
+		}
+		
+		public Model(IAddInManagerServices services)
+		{
+			_services = services;
+		}
+		
 		public string PropertyChangedFor<TProperty>(Expression<Func<TModel, TProperty>> expression)
 		{
 			MemberExpression memberExpression = expression.Body as MemberExpression;
@@ -47,18 +57,11 @@ namespace ICSharpCode.AddInManager2.Model
 		{
 			get
 			{
-				if (_addInManager == null)
-				{
-					return AddInManagerServices.Services;
-				}
-				else
-				{
-					return _addInManager;
-				}
+				return _services;
 			}
 			set
 			{
-				_addInManager = value;
+				_services = value;
 			}
 		}
 	}

src/AddIns/Misc/AddInManager2/Project/Src/Model/NuGetPackageManager.cs

@@ -7,6 +7,7 @@ using System.IO;
 using System.Linq;
 using System.Runtime.Versioning;
 using ICSharpCode.Core;
+using ICSharpCode.SharpDevelop;
 using NuGet;
 
 namespace ICSharpCode.AddInManager2.Model
@@ -44,7 +45,7 @@ namespace ICSharpCode.AddInManager2.Model
 		{
 			_repositories = repositories;
 			_events = events;
-			_packageOutputDirectory = Path.Combine(PropertyService.ConfigDirectory, "NuGet");
+			_packageOutputDirectory = Path.Combine(SD.PropertyService.ConfigDirectory, "NuGet");
 			
 			_logger = new PackageMessageLogger(_events);
 			

src/AddIns/Misc/AddInManager2/Project/Src/Model/PackageRepositories.cs

@@ -23,10 +23,12 @@ namespace ICSharpCode.AddInManager2.Model
 		private List<PackageSource> _registeredPackageSources;
 		
 		private IAddInManagerEvents _events;
+		private IAddInManagerSettings _settings;
 
-		public PackageRepositories(IAddInManagerEvents events)
+		public PackageRepositories(IAddInManagerEvents events, IAddInManagerSettings settings)
 		{
 			_events = events;
+			_settings = settings;
 			
 			_registeredPackageSources = new List<PackageSource>();
 			
@@ -84,7 +86,7 @@ namespace ICSharpCode.AddInManager2.Model
 		private void LoadPackageSources()
 		{
 			_registeredPackageSources.Clear();
-			var savedRepositories = SD.PropertyService.Get<string[]>("AddInManager2.PackageRepositories", null);
+			var savedRepositories = _settings.PackageRepositories;
 			if ((savedRepositories != null) && (savedRepositories.Length > 0))
 			{
 				foreach (string repositoryEntry in savedRepositories)
@@ -114,7 +116,7 @@ namespace ICSharpCode.AddInManager2.Model
 		private void SavePackageSources()
 		{
 			var savedRepositories = _registeredPackageSources.Select(ps => ps.Name + "=" + ps.Source);
-			SD.PropertyService.Set<string[]>("AddInManager2.PackageRepositories", savedRepositories.ToArray());
+			_settings.PackageRepositories = savedRepositories.ToArray();
 			UpdateCurrentRepository();
 		}
 		

src/AddIns/Misc/AddInManager2/Project/Src/View/AddInsView.xaml

@@ -535,7 +535,7 @@
 								x:Name="prereleaseAddInsCheckBox"
 								Margin="4"
 								Content="{core:Localize AddInManager2.AddInsView.ShowPrereleaseAddIns}"
-								IsChecked="{Binding Path=ShowPrereleaseAddins, UpdateSourceTrigger=PropertyChanged}"
+								IsChecked="{Binding Path=ShowPrereleases, UpdateSourceTrigger=PropertyChanged}"
 								Command="{Binding Path=UpdatePrereleaseFilterCommand}" />
 						</Grid>
 					</StackPanel>

src/AddIns/Misc/AddInManager2/Project/Src/ViewModel/AddInManagerViewModel.cs

@@ -21,6 +21,18 @@ namespace ICSharpCode.AddInManager2.ViewModel
 		private bool _hasError;
 		
 		public AddInManagerViewModel()
+			: base()
+		{
+			Initialize();
+		}
+		
+		public AddInManagerViewModel(IAddInManagerServices services)
+			: base(services)
+		{
+			Initialize();
+		}
+		
+		private void Initialize()
 		{
 			// Visuals
 			this.Title = SD.ResourceService.GetString("AddInManager.Title");

src/AddIns/Misc/AddInManager2/Project/Src/ViewModel/AddInPackageViewModelBase.cs

@@ -22,6 +22,13 @@ namespace ICSharpCode.AddInManager2.ViewModel
 		private DelegateCommand optionsCommand;
 
 		public AddInPackageViewModelBase()
+			: base()
+		{
+			CreateCommands();
+		}
+		
+		public AddInPackageViewModelBase(IAddInManagerServices services)
+			: base(services)
 		{
 			CreateCommands();
 		}

src/AddIns/Misc/AddInManager2/Project/Src/ViewModel/AddInsViewModelBase.cs

@@ -22,6 +22,18 @@ namespace ICSharpCode.AddInManager2.ViewModel
 		private ObservableCollection<PackageSource> _packageSources;
 		
 		public AddInsViewModelBase()
+			:base()
+		{
+			Initialize();
+		}
+		
+		public AddInsViewModelBase(IAddInManagerServices services)
+			: base(services)
+		{
+			Initialize();
+		}
+		
+		private void Initialize()
 		{
 			// Initialization of internal lists
 			_pages = new Pages();
@@ -37,7 +49,7 @@ namespace ICSharpCode.AddInManager2.ViewModel
 			CreateCommands();
 		}
 		
-		void CreateCommands()
+		private void CreateCommands()
 		{
 			ShowNextPageCommand = new DelegateCommand(param => ShowNextPage());
 			ShowPreviousPageCommand = new DelegateCommand(param => ShowPreviousPage());

src/AddIns/Misc/AddInManager2/Project/Src/ViewModel/AvailableAddInsViewModel.cs

@@ -19,6 +19,17 @@ namespace ICSharpCode.AddInManager2.ViewModel
 	{
 		public AvailableAddInsViewModel()
 			: base()
+		{
+			Initialize();
+		}
+		
+		public AvailableAddInsViewModel(IAddInManagerServices services)
+			: base(services)
+		{
+			Initialize();
+		}
+		
+		private void Initialize()
 		{
 			IsSearchable = true;
 			ShowPackageSources = true;

src/AddIns/Misc/AddInManager2/Project/Src/ViewModel/InstalledAddInsViewModel.cs

@@ -20,6 +20,17 @@ namespace ICSharpCode.AddInManager2.ViewModel
 	{
 		public InstalledAddInsViewModel()
 			: base()
+		{
+			Initialize();
+		}
+		
+		public InstalledAddInsViewModel(IAddInManagerServices services)
+			: base(services)
+		{
+			Initialize();
+		}
+		
+		private void Initialize()
 		{
 			AllowInstallFromArchive = true;
 			HasFilterForPreinstalled = true;
@@ -140,12 +151,12 @@ namespace ICSharpCode.AddInManager2.ViewModel
 		
 		private void LoadPreinstalledAddInFilter()
 		{
-			ShowPreinstalledAddIns = SD.PropertyService.Get<bool>("AddInManager2.ShowPreinstalledAddIns", false);
+			ShowPreinstalledAddIns = AddInManager.Settings.ShowPreinstalledAddIns;
 		}
 		
 		private void SavePreinstalledAddInFilter()
 		{
-			SD.PropertyService.Set<bool>("AddInManager2.ShowPreinstalledAddIns", ShowPreinstalledAddIns);
+			AddInManager.Settings.ShowPreinstalledAddIns = ShowPreinstalledAddIns;
 		}
 		
 		protected override void InstallFromArchive()

src/AddIns/Misc/AddInManager2/Project/Src/ViewModel/NuGetAddInsViewModelBase.cs

@@ -23,6 +23,11 @@ namespace ICSharpCode.AddInManager2.ViewModel
 		{
 		}
 		
+		public NuGetAddInsViewModelBase(IAddInManagerServices services)
+			: base(services)
+		{
+		}
+		
 		/// <summary>
 		/// Returns all the packages.
 		/// </summary>

src/AddIns/Misc/AddInManager2/Project/Src/ViewModel/NuGetPackageViewModel.cs

@@ -23,6 +23,12 @@ namespace ICSharpCode.AddInManager2.ViewModel
 		{
 			this._package = package;
 		}
+		
+		public NuGetPackageViewModel(IAddInManagerServices services, IPackage package)
+			: base(services)
+		{
+			this._package = package;
+		}
 
 		public IPackage Package
 		{

src/AddIns/Misc/AddInManager2/Project/Src/ViewModel/OfflineAddInViewModel.cs

@@ -35,6 +35,17 @@ namespace ICSharpCode.AddInManager2.ViewModel
 		
 		public OfflineAddInsViewModelBase(ManagedAddIn addIn)
 			: base()
+		{
+			Initialize(addIn);
+		}
+		
+		public OfflineAddInsViewModelBase(IAddInManagerServices services, ManagedAddIn addIn)
+			: base(services)
+		{
+			Initialize(addIn);
+		}
+		
+		private void Initialize(ManagedAddIn addIn)
 		{
 			_markedAddIn = addIn;
 			if (_markedAddIn != null)

src/AddIns/Misc/AddInManager2/Project/Src/ViewModel/PackageRepositoriesViewModel.cs

@@ -31,6 +31,18 @@ namespace ICSharpCode.AddInManager2.ViewModel
 		PackageRepository selectedPackageRepository;
 		
 		public PackageRepositoriesViewModel()
+			: base()
+		{
+			Initialize();
+		}
+		
+		public PackageRepositoriesViewModel(IAddInManagerServices services)
+			: base(services)
+		{
+			Initialize();
+		}
+		
+		private void Initialize()
 		{
 			this.packageSources = new ObservableCollection<PackageSource>();
 			CreateCommands();

src/AddIns/Misc/AddInManager2/Project/Src/ViewModel/UpdatedAddInsViewModel.cs

@@ -23,10 +23,23 @@ namespace ICSharpCode.AddInManager2.ViewModel
 		
 		public UpdatedAddInsViewModel()
 			: base()
+		{
+			Initialize();
+		}
+		
+		public UpdatedAddInsViewModel(IAddInManagerServices services)
+			: base(services)
+		{
+			Initialize();
+		}
+		
+		private void Initialize()
 		{
 			IsSearchable = true;
 			HasFilterForPrereleases = true;
-			Title = SD.ResourceService.GetString("AddInManager2.Views.Updates");;
+			Title = SD.ResourceService.GetString("AddInManager2.Views.Updates");
+			
+			ShowPrereleases = AddInManager.Settings.ShowPrereleases;
 			
 			AddInManager.Events.AddInInstalled += NuGetPackagesChanged;
 			AddInManager.Events.AddInUninstalled += NuGetPackagesChanged;
@@ -93,6 +106,7 @@ namespace ICSharpCode.AddInManager2.ViewModel
 		
 		protected override void UpdatePrereleaseFilter()
 		{
+			AddInManager.Settings.ShowPrereleases = ShowPrereleases;
 			ReadPackages();
 		}