Show project name in Manage Packages dialog title.

src/AddIns/Misc/PackageManagement/Cmdlets/Test/Src/GetPackageCmdletTests.cs

@@ -26,7 +26,7 @@ namespace PackageManagement.Cmdlets.Tests
 			fakeSolution = new FakePackageManagementSolution();
 			fakeRegisteredPackageRepositories = cmdlet.FakeRegisteredPackageRepositories;
 			fakeConsoleHost = cmdlet.FakePackageManagementConsoleHost;
-			fakeConsoleHost.FakeProject = fakeSolution.FakeProject;
+			fakeConsoleHost.FakeProject = fakeSolution.FakeActiveProject;
 			fakeCommandRuntime = cmdlet.FakeCommandRuntime;
 			fakeTerminatingError = cmdlet.FakeCmdletTerminatingError;
 			

src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManagementProject.cs

@@ -18,12 +18,16 @@ namespace ICSharpCode.PackageManagement.Design
 			FakeInstallPackageAction = new FakeInstallPackageAction(this);
 			FakeUninstallPackageAction = new FakeUninstallPackageAction(this);
 			FakeUpdatePackageAction = new FakeUpdatePackageAction(this);
+			
+			Name = "Test";
 		}
 		
 		public FakeInstallPackageAction FakeInstallPackageAction;
 		public FakeUpdatePackageAction FakeUpdatePackageAction;
 		public FakeUninstallPackageAction FakeUninstallPackageAction;
 		
+		public string Name { get; set; }
+		
 		public bool IsInstalledReturnValue;
 		public IPackage PackagePassedToIsInstalled;
 		

src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManagementSolution.cs

@@ -15,7 +15,7 @@ namespace ICSharpCode.PackageManagement.Design
 	{
 		public void AddPackageToActiveProjectLocalRepository(FakePackage package)
 		{
-			FakeProject.FakePackages.Add(package);
+			FakeActiveProject.FakePackages.Add(package);
 		}
 		
 		public FakePackage AddPackageToActiveProjectLocalRepository(string packageId)
@@ -26,13 +26,13 @@ namespace ICSharpCode.PackageManagement.Design
 		}
 		
 		public int GetActiveProjectCallCount;
-		public FakePackageManagementProject FakeProject = new FakePackageManagementProject();
+		public FakePackageManagementProject FakeActiveProject = new FakePackageManagementProject();
 		
 		public virtual IPackageManagementProject GetActiveProject()
 		{
 			GetActiveProjectCallCount++;
 			
-			return FakeProject;
+			return FakeActiveProject;
 		}
 		
 		public IPackageRepository RepositoryPassedToGetActiveProject;
@@ -40,7 +40,7 @@ namespace ICSharpCode.PackageManagement.Design
 		public virtual IPackageManagementProject GetActiveProject(IPackageRepository sourceRepository)
 		{
 			RepositoryPassedToGetActiveProject = sourceRepository;
-			return FakeProject;
+			return FakeActiveProject;
 		}
 		
 		public PackageSource PackageSourcePassedToGetProject;
@@ -50,7 +50,7 @@ namespace ICSharpCode.PackageManagement.Design
 		{
 			PackageSourcePassedToGetProject = source;
 			ProjectNamePassedToGetProject = projectName;
-			return FakeProject;
+			return FakeActiveProject;
 		}
 		
 		public IPackageRepository RepositoryPassedToGetProject;
@@ -59,7 +59,7 @@ namespace ICSharpCode.PackageManagement.Design
 		{
 			RepositoryPassedToGetProject = sourceRepository;
 			ProjectNamePassedToGetProject = projectName;
-			return FakeProject;
+			return FakeActiveProject;
 		}
 		
 		public List<IProject> FakeMSBuildProjects = new List<IProject>();

src/AddIns/Misc/PackageManagement/Project/Src/IPackageManagementProject.cs

@@ -16,7 +16,8 @@ namespace ICSharpCode.PackageManagement
 		event EventHandler<PackageOperationEventArgs> PackageUninstalled;
 		event EventHandler<PackageOperationEventArgs> PackageReferenceAdded;
 		event EventHandler<PackageOperationEventArgs> PackageReferenceRemoved;
-			
+		
+		string Name { get; }
 		ILogger Logger { get; set; }
 		IPackageRepository SourceRepository { get; }
 		

src/AddIns/Misc/PackageManagement/Project/Src/ManagePackagesView.cs

@@ -15,7 +15,7 @@ namespace ICSharpCode.PackageManagement
 		
 		public void Dispose()
 		{
-			var viewModel = MainPanel.DataContext as ManagePackagesViewModel;
+			var viewModel = DataContext as ManagePackagesViewModel;
 			viewModel.Dispose();
 		}
 	}

src/AddIns/Misc/PackageManagement/Project/Src/ManagePackagesView.xaml

@@ -9,7 +9,6 @@
 	MinHeight="380"
 	MinWidth="440"
 	Style="{x:Static core:GlobalStyles.DialogWindowStyle}"
-	Title="Manage Packages"
 	WindowStartupLocation="CenterOwner">
 	
 	<Window.Resources>
@@ -21,12 +20,15 @@
 			UriSource="pack://application:,,,/PackageManagement;component/Resources/exclamation.png"/>
     </Window.Resources>
 	
+	<Window.DataContext>
+		<Binding Source="{StaticResource ViewModels}" Path="ManagePackagesViewModel"/>	
+	</Window.DataContext>
+	
+	<Window.Title>
+		<Binding Path="Title"/>
+	</Window.Title>
+	
 	<DockPanel x:Name="MainPanel">
-		<!-- Use DockPanel.DataContext instead of Window.DataContext otherwise Visual Studio does not show
-			design time data -->
-		<DockPanel.DataContext>
-			<Binding Source="{StaticResource ViewModels}" Path="ManagePackagesViewModel"/>
-		</DockPanel.DataContext>
 		<Grid
 			DockPanel.Dock="Bottom"
 			Margin="4, 4">

src/AddIns/Misc/PackageManagement/Project/Src/ManagePackagesViewModel.cs

@@ -52,6 +52,16 @@ namespace ICSharpCode.PackageManagement
 		public RecentPackagesViewModel RecentPackagesViewModel { get; private set; }
 		public UpdatedPackagesViewModel UpdatedPackagesViewModel { get; private set; }
 		
+		public string Title {
+			get { return GetTitle(); }
+		}
+		
+		string GetTitle()
+		{
+			IPackageManagementProject project = solution.GetActiveProject();
+			return String.Format("{0} - Manage Packages", project.Name);
+		}
+		
 		public void Dispose()
 		{
 			AvailablePackagesViewModel.Dispose();

src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementProject.cs

@@ -32,6 +32,10 @@ namespace ICSharpCode.PackageManagement
 			projectManager = packageManager.ProjectManager;
 		}
 		
+		public string Name {
+			get { return msbuildProject.Name; }
+		}
+		
 		public IPackageRepository SourceRepository { get; private set; }
 		
 		public ILogger Logger {

src/AddIns/Misc/PackageManagement/Test/Src/Helpers/TestablePackageViewModel.cs

@@ -62,7 +62,7 @@ namespace PackageManagement.Tests.Helpers
 			var operation = new PackageOperation(FakePackage, PackageAction.Install);
 			
 			FakeSolution
-				.FakeProject
+				.FakeActiveProject
 				.FakeInstallOperations
 				.Add(operation);
 			
@@ -73,7 +73,7 @@ namespace PackageManagement.Tests.Helpers
 		{
 			var package = new FakePackage("PackageToUninstall");			
 			var operation = new PackageOperation(package, PackageAction.Uninstall);
-			FakeSolution.FakeProject.FakeInstallOperations.Add(operation);
+			FakeSolution.FakeActiveProject.FakeInstallOperations.Add(operation);
 			return operation;
 		}
 	}

src/AddIns/Misc/PackageManagement/Test/Src/InstalledPackagesViewModelTests.cs

@@ -65,7 +65,7 @@ namespace PackageManagement.Tests
 		FakePackage AddPackageToProjectLocalRepository()
 		{
 			var package = new FakePackage("Test");
-			solution.FakeProject.FakePackages.Add(package);
+			solution.FakeActiveProject.FakePackages.Add(package);
 			return package;
 		}
 		
@@ -93,7 +93,7 @@ namespace PackageManagement.Tests
 			viewModel.ReadPackages();
 			CompleteReadPackagesTask();
 			
-			solution.FakeProject.FakePackages.Clear();
+			solution.FakeActiveProject.FakePackages.Clear();
 
 			ClearReadPackagesTasks();
 			packageManagementEvents.OnParentPackageUninstalled(new FakePackage());
@@ -122,7 +122,7 @@ namespace PackageManagement.Tests
 			CreateViewModel(solution);
 			viewModel.ReadPackages();
 			
-			solution.FakeProject = null;
+			solution.FakeActiveProject = null;
 			CompleteReadPackagesTask();
 			
 			Assert.AreEqual(1, viewModel.PackageViewModels.Count);
@@ -152,7 +152,7 @@ namespace PackageManagement.Tests
 			viewModel.ReadPackages();
 			CompleteReadPackagesTask();
 			
-			solution.FakeProject.FakePackages.Clear();
+			solution.FakeActiveProject.FakePackages.Clear();
 			
 			ClearReadPackagesTasks();
 			viewModel.Dispose();

src/AddIns/Misc/PackageManagement/Test/Src/ManagePackagesViewModelTests.cs

@@ -110,10 +110,10 @@ namespace PackageManagement.Tests
 		{
 			CreateSolution();
 			FakePackage package = new FakePackage();
-			fakeSolution.FakeProject.FakePackages.Add(package);
+			fakeSolution.FakeActiveProject.FakePackages.Add(package);
 			CreateViewModel(fakeSolution);
 			
-			IEnumerable<IPackage> expectedPackages = fakeSolution.FakeProject.FakePackages;
+			IEnumerable<IPackage> expectedPackages = fakeSolution.FakeActiveProject.FakePackages;
 			IEnumerable<PackageViewModel> actualPackageViewModels = viewModel.InstalledPackagesViewModel.PackageViewModels;
 			
 			PackageCollectionAssert.AreEqual(expectedPackages, actualPackageViewModels);
@@ -370,5 +370,18 @@ namespace PackageManagement.Tests
 			
 			Assert.IsTrue(disposed);
 		}
+		
+		[Test]
+		public void Title_ProjectSelected_ReturnsProjectInTitle()
+		{
+			CreateViewModel();
+			fakeSolution.FakeActiveProject.Name = "Test";
+			
+			string title = viewModel.Title;
+			
+			string expectedTitle = "Test - Manage Packages";
+			
+			Assert.AreEqual(expectedTitle, title);
+		}
 	}
 }

src/AddIns/Misc/PackageManagement/Test/Src/PackageManagementProjectTests.cs

@@ -3,8 +3,12 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
+
 using ICSharpCode.PackageManagement;
 using ICSharpCode.PackageManagement.Design;
+using ICSharpCode.PackageManagement.EnvDTE;
+using ICSharpCode.SharpDevelop.Project;
 using NuGet;
 using NUnit.Framework;
 using PackageManagement.Tests.Helpers;
@@ -70,7 +74,7 @@ namespace PackageManagement.Tests
 			var expectedPackage = new FakePackage("Test");
 			
 			project.IsInstalled(expectedPackage);
-			var actualPackage = fakeProjectManager.PackagePassedToIsInstalled;
+			IPackage actualPackage = fakeProjectManager.PackagePassedToIsInstalled;
 			
 			Assert.AreEqual(expectedPackage, actualPackage);
 		}
@@ -79,7 +83,7 @@ namespace PackageManagement.Tests
 		public void Constructor_RepositoryAndProjectPassed_RepositoryUsedToCreatePackageManager()
 		{
 			CreateProject();
-			var actualrepository = fakePackageManagerFactory.PackageRepositoryPassedToCreatePackageManager;
+			IPackageRepository actualrepository = fakePackageManagerFactory.PackageRepositoryPassedToCreatePackageManager;
 			
 			Assert.AreEqual(fakeSourceRepository, actualrepository);
 		}
@@ -88,7 +92,7 @@ namespace PackageManagement.Tests
 		public void Constructor_RepositoryAndProjectPassed_ProjecUsedToCreatePackageManager()
 		{
 			CreateProject();
-			var actualProject = fakePackageManagerFactory.ProjectPassedToCreateRepository;
+			MSBuildBasedProject actualProject = fakePackageManagerFactory.ProjectPassedToCreateRepository;
 			
 			Assert.AreEqual(fakeMSBuildProject, actualProject);
 		}
@@ -97,11 +101,11 @@ namespace PackageManagement.Tests
 		public void GetPackages_ProjectManagerLocalRepositoryHasTwoPackages_ReturnsTwoPackages()
 		{
 			CreateProject();
-			var repository = fakeProjectManager.FakeLocalRepository;
-			var packageA = repository.AddFakePackage("A");
-			var packageB = repository.AddFakePackage("B");
+			FakePackageRepository repository = fakeProjectManager.FakeLocalRepository;
+			FakePackage packageA = repository.AddFakePackage("A");
+			FakePackage packageB = repository.AddFakePackage("B");
 			
-			var actualPackages = project.GetPackages();
+			IQueryable<IPackage> actualPackages = project.GetPackages();
 			
 			var expectedPackages = new FakePackage[] {
 				packageA,
@@ -141,7 +145,7 @@ namespace PackageManagement.Tests
 			
 			project.GetInstallPackageOperations(expectedPackage, true);
 			
-			var actualPackage = fakePackageManager.PackagePassedToGetInstallPackageOperations;
+			IPackage actualPackage = fakePackageManager.PackagePassedToGetInstallPackageOperations;
 			
 			Assert.AreEqual(expectedPackage, actualPackage);
 		}
@@ -152,9 +156,9 @@ namespace PackageManagement.Tests
 			CreateProject();
 			var package = new FakePackage();
 			
-			var operations = project.GetInstallPackageOperations(package, true);
+			IEnumerable<PackageOperation> operations = project.GetInstallPackageOperations(package, true);
 			
-			var expectedOperations = fakePackageManager.PackageOperationsToReturnFromGetInstallPackageOperations;
+			IEnumerable<PackageOperation> expectedOperations = fakePackageManager.PackageOperationsToReturnFromGetInstallPackageOperations;
 			
 			Assert.AreEqual(expectedOperations, operations);
 		}
@@ -175,8 +179,8 @@ namespace PackageManagement.Tests
 		{
 			CreateProject();
 			
-			var logger = project.Logger;
-			var expectedLogger = fakePackageManager.Logger;
+			ILogger logger = project.Logger;
+			ILogger expectedLogger = fakePackageManager.Logger;
 			
 			Assert.AreEqual(expectedLogger, logger);
 		}
@@ -189,7 +193,7 @@ namespace PackageManagement.Tests
 			
 			project.InstallPackage(package, null, true);
 			
-			var expectedPackage = fakePackageManager.PackagePassedToInstallPackage;
+			IPackage expectedPackage = fakePackageManager.PackagePassedToInstallPackage;
 			
 			Assert.AreEqual(expectedPackage, package);
 		}
@@ -219,7 +223,7 @@ namespace PackageManagement.Tests
 			var expectedOperations = new List<PackageOperation>();
 			project.InstallPackage(null, expectedOperations, false);
 			
-			var actualOperations = fakePackageManager.PackageOperationsPassedToInstallPackage;
+			IEnumerable<PackageOperation> actualOperations = fakePackageManager.PackageOperationsPassedToInstallPackage;
 			
 			Assert.AreEqual(expectedOperations, actualOperations);
 		}
@@ -228,7 +232,7 @@ namespace PackageManagement.Tests
 		public void SourceRepository_NewInstance_ReturnsRepositoryUsedToCreateInstance()
 		{
 			CreateProject();
-			var repository = project.SourceRepository;
+			IPackageRepository repository = project.SourceRepository;
 			
 			Assert.AreEqual(fakeSourceRepository, repository);
 		}
@@ -241,7 +245,7 @@ namespace PackageManagement.Tests
 			
 			project.UninstallPackage(package, true, true);
 			
-			var expectedPackage = fakePackageManager.PackagePassedToUninstallPackage;
+			IPackage expectedPackage = fakePackageManager.PackagePassedToUninstallPackage;
 			
 			Assert.AreEqual(expectedPackage, package);
 		}
@@ -290,7 +294,7 @@ namespace PackageManagement.Tests
 			
 			project.UpdatePackage(package, null, true);
 			
-			var expectedPackage = fakePackageManager.PackagePassedToUpdatePackage;
+			IPackage expectedPackage = fakePackageManager.PackagePassedToUpdatePackage;
 			
 			Assert.AreEqual(expectedPackage, package);
 		}
@@ -320,7 +324,7 @@ namespace PackageManagement.Tests
 			var expectedOperations = new List<PackageOperation>();
 			project.UpdatePackage(null, expectedOperations, false);
 			
-			var actualOperations = fakePackageManager.PackageOperationsPassedToUpdatePackage;
+			IEnumerable<PackageOperation> actualOperations = fakePackageManager.PackageOperationsPassedToUpdatePackage;
 			
 			Assert.AreEqual(expectedOperations, actualOperations);
 		}
@@ -426,9 +430,22 @@ namespace PackageManagement.Tests
 		{
 			CreateProject();
 			fakeMSBuildProject.Name = "Test";
-			var dteProject = project.ConvertToDTEProject();
+			Project dteProject = project.ConvertToDTEProject();
+			
+			string name = dteProject.Name;
+			
+			Assert.AreEqual("Test", name);
+		}
+		
+		[Test]
+		public void Name_MSBuildProjectNameIsSet_ReturnsMSBuildProjectName()
+		{
+			CreateProject();
+			fakeMSBuildProject.Name = "MyProject";
+			
+			string name = project.Name;
 			
-			Assert.AreEqual("Test", dteProject.Name);
+			Assert.AreEqual("MyProject", name);
 		}
 	}
 }

src/AddIns/Misc/PackageManagement/Test/Src/PackageViewModelTests.cs

@@ -41,7 +41,7 @@ namespace PackageManagement.Tests
 		{
 			CreateViewModel();
 			exceptionThrowingProject = new ExceptionThrowingPackageManagementProject();
-			viewModel.FakeSolution.FakeProject = exceptionThrowingProject;
+			viewModel.FakeSolution.FakeActiveProject = exceptionThrowingProject;
 		}
 		
 		void CreateViewModel(FakePackageManagementSolution solution)
@@ -51,8 +51,8 @@ namespace PackageManagement.Tests
 			this.fakeSolution = solution;
 			packageManagementEvents = viewModel.FakePackageManagementEvents;
 			fakeLogger = viewModel.FakeLogger;
-			fakeInstallPackageAction = solution.FakeProject.FakeInstallPackageAction;
-			fakeUninstallPackageAction = solution.FakeProject.FakeUninstallPackageAction;
+			fakeInstallPackageAction = solution.FakeActiveProject.FakeInstallPackageAction;
+			fakeUninstallPackageAction = solution.FakeActiveProject.FakeUninstallPackageAction;
 			fakeActionRunner = viewModel.FakeActionRunner;
 		}
 
@@ -189,7 +189,7 @@ namespace PackageManagement.Tests
 		public void IsAdded_ProjectHasPackageAdded_ReturnsTrue()
 		{
 			CreateViewModel();
-			fakeSolution.FakeProject.IsInstalledReturnValue = true;
+			fakeSolution.FakeActiveProject.IsInstalledReturnValue = true;
 			
 			Assert.IsTrue(viewModel.IsAdded);
 		}
@@ -198,7 +198,7 @@ namespace PackageManagement.Tests
 		public void IsAdded_ProjectDoesNotHavePackageInstalled_ReturnsFalse()
 		{
 			CreateViewModel();
-			fakeSolution.FakeProject.IsInstalledReturnValue = false;
+			fakeSolution.FakeActiveProject.IsInstalledReturnValue = false;
 			
 			Assert.IsFalse(viewModel.IsAdded);
 		}
@@ -407,7 +407,7 @@ namespace PackageManagement.Tests
 			viewModel.AddPackage();
 			
 			ILogger expectedLogger = viewModel.OperationLoggerCreated;
-			ILogger actualLogger = fakeSolution.FakeProject.Logger;
+			ILogger actualLogger = fakeSolution.FakeActiveProject.Logger;
 			Assert.AreEqual(expectedLogger, actualLogger);
 		}
 		
@@ -585,7 +585,7 @@ namespace PackageManagement.Tests
 			
 			var expectedPackage = package;
 			var actualPackage = fakeSolution
-				.FakeProject
+				.FakeActiveProject
 				.PackagePassedToGetInstallPackageOperations;
 			
 			Assert.AreEqual(expectedPackage, actualPackage);
@@ -599,7 +599,7 @@ namespace PackageManagement.Tests
 			viewModel.AddPackage();
 			
 			bool result = fakeSolution
-				.FakeProject
+				.FakeActiveProject
 				.IgnoreDependenciesPassedToGetInstallPackageOperations;
 			
 			Assert.IsFalse(result);

src/AddIns/Misc/PackageManagement/Test/Src/Scripting/PackageManagementConsoleHostTests.cs

@@ -380,7 +380,7 @@ namespace PackageManagement.Tests.Scripting
 			
 			IPackageManagementProject project = host.GetProject(source, "Test");
 			
-			FakePackageManagementProject expectedProject = fakeSolution.FakeProject;
+			FakePackageManagementProject expectedProject = fakeSolution.FakeActiveProject;
 			
 			Assert.AreEqual(expectedProject, project);
 		}
@@ -450,7 +450,7 @@ namespace PackageManagement.Tests.Scripting
 			
 			IPackageManagementProject project = host.GetProject(repository, "Test");
 			
-			var expectedProject = fakeSolution.FakeProject;
+			var expectedProject = fakeSolution.FakeActiveProject;
 			
 			Assert.AreEqual(expectedProject, project);
 		}

src/AddIns/Misc/PackageManagement/Test/Src/UpdatedPackageViewModelTests.cs

@@ -23,7 +23,7 @@ namespace PackageManagement.Tests
 		{
 			viewModel = new TestableUpdatedPackageViewModel();
 			fakeSolution = viewModel.FakeSolution;
-			fakeProject = fakeSolution.FakeProject;
+			fakeProject = fakeSolution.FakeActiveProject;
 			updatePackageAction = fakeProject.FakeUpdatePackageAction;
 			fakeActionRunner = viewModel.FakeActionRunner;
 		}

src/AddIns/Misc/PackageManagement/Test/Src/UpdatedPackagesViewModelTests.cs

@@ -108,7 +108,7 @@ namespace PackageManagement.Tests
 			viewModel.ReadPackages();
 			
 			registeredPackageRepositories.FakeAggregateRepository = null;
-			solution.FakeProject = null;
+			solution.FakeActiveProject = null;
 			CompleteReadPackagesTask();
 			
 			Assert.AreEqual(1, viewModel.PackageViewModels.Count);