Merge branch '4.x'

Conflicts:
	src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementSolution.cs
	src/AddIns/Misc/PackageManagement/Test/Src/PackageManagementSolutionTests.cs

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

@@ -141,7 +141,7 @@ namespace ICSharpCode.PackageManagement
 		
 		public IEnumerable<IProject> GetMSBuildProjects()
 		{
-			return projectService.AllProjects;
+			return projectService.AllProjects.OfType<MSBuildBasedProject>();;
 		}
 		
 		public bool IsOpen {
@@ -195,7 +195,7 @@ namespace ICSharpCode.PackageManagement
 		
 		public IEnumerable<IPackageManagementProject> GetProjects(IPackageRepository sourceRepository)
 		{
-			foreach (MSBuildBasedProject msbuildProject in GetMSBuildProjects().OfType<MSBuildBasedProject>()) {
+			foreach (MSBuildBasedProject msbuildProject in GetMSBuildProjects()) {
 				yield return projectFactory.CreateProject(sourceRepository, msbuildProject);
 			}
 		}

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

@@ -19,7 +19,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-
 using ICSharpCode.Core;
 using ICSharpCode.PackageManagement;
 using ICSharpCode.PackageManagement.Design;
@@ -28,6 +27,7 @@ using NuGet;
 using NUnit.Framework;
 using Rhino.Mocks;
 using PackageManagement.Tests.Helpers;
+using Rhino.Mocks;
 
 namespace PackageManagement.Tests
 {
@@ -89,6 +89,12 @@ namespace PackageManagement.Tests
 			return package;
 		}
 		
+		void AddNonMSBuildBasedProjectToOpenProjects()
+		{
+			IProject project = MockRepository.GenerateStub<IProject>();
+			fakeProjectService.AddProject(project);
+		}
+		
 		[Test]
 		public void GetActiveProject_ProjectIsSelected_CreatesProjectUsingCurrentProjectSelectedInSharpDevelop()
 		{
@@ -614,5 +620,18 @@ namespace PackageManagement.Tests
 			Assert.AreEqual(fakeRegisteredPackageRepositories.ActiveRepository, fakeProjectFactory.RepositoriesPassedToCreateProject[0]);
 			Assert.AreEqual(fakeRegisteredPackageRepositories.ActiveRepository, fakeProjectFactory.RepositoriesPassedToCreateProject[1]);
 		}
+		
+		[Test]
+		public void GetMSBuildProjects_TwoProjectsInOpenSolutionButOneIsNotMSBuildBased_ReturnsOneMSBuildBasedProject()
+		{
+			CreateSolution();
+			TestableProject project = AddProjectToOpenProjects("A");
+			AddNonMSBuildBasedProjectToOpenProjects();
+			
+			IEnumerable<IProject> projects = solution.GetMSBuildProjects();
+			var expectedProjects = new IProject[] { project };
+			
+			CollectionAssert.AreEqual(expectedProjects, projects);
+		}
 	}
 }