From 25c9dac11b3b0175a7762aaf9ac4aad0c6843e74 Mon Sep 17 00:00:00 2001 From: Dragan Date: Wed, 26 Feb 2014 17:23:29 +0100 Subject: [PATCH] PM: Remove conflict files --- .../Src/PackageManagementSolution.cs.BASE.cs | 203 ----------------- .../Src/PackageManagementSolution.cs.LOCAL.cs | 204 ----------------- .../PackageManagementSolution.cs.REMOTE.cs | 208 ------------------ 3 files changed, 615 deletions(-) delete mode 100644 src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementSolution.cs.BASE.cs delete mode 100644 src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementSolution.cs.LOCAL.cs delete mode 100644 src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementSolution.cs.REMOTE.cs diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementSolution.cs.BASE.cs b/src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementSolution.cs.BASE.cs deleted file mode 100644 index 570e987a81..0000000000 --- a/src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementSolution.cs.BASE.cs +++ /dev/null @@ -1,203 +0,0 @@ -// Copyright (c) 2014 AlphaSierraPapa for the SharpDevelop Team -// -// Permission is hereby granted, free of charge, to any person obtaining a copy of this -// software and associated documentation files (the "Software"), to deal in the Software -// without restriction, including without limitation the rights to use, copy, modify, merge, -// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all copies or -// substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, -// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR -// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE -// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. - -using System; -using System.Collections.Generic; -using System.Linq; -using ICSharpCode.Core; -using ICSharpCode.SharpDevelop.Project; -using NuGet; - -namespace ICSharpCode.PackageManagement -{ - public class PackageManagementSolution : IPackageManagementSolution - { - IRegisteredPackageRepositories registeredPackageRepositories; - IPackageManagementProjectService projectService; - IPackageManagementProjectFactory projectFactory; - ISolutionPackageRepositoryFactory solutionPackageRepositoryFactory; - - public PackageManagementSolution( - IRegisteredPackageRepositories registeredPackageRepositories, - IPackageManagementEvents packageManagementEvents) - : this( - registeredPackageRepositories, - new PackageManagementProjectService(), - new PackageManagementProjectFactory(packageManagementEvents), - new SolutionPackageRepositoryFactory()) - { - } - - public PackageManagementSolution( - IRegisteredPackageRepositories registeredPackageRepositories, - IPackageManagementProjectService projectService, - IPackageManagementProjectFactory projectFactory, - ISolutionPackageRepositoryFactory solutionPackageRepositoryFactory) - { - this.registeredPackageRepositories = registeredPackageRepositories; - this.projectFactory = projectFactory; - this.projectService = projectService; - this.solutionPackageRepositoryFactory = solutionPackageRepositoryFactory; - } - - public string FileName { - get { return OpenSolution.FileName; } - } - - ISolution OpenSolution { - get { return projectService.OpenSolution; } - } - - public IPackageManagementProject GetActiveProject() - { - if (HasActiveProject()) { - return GetActiveProject(ActivePackageRepository); - } - return null; - } - - bool HasActiveProject() - { - return GetActiveMSBuildBasedProject() != null; - } - - public IProject GetActiveMSBuildProject() - { - return projectService.CurrentProject; - } - - IPackageRepository ActivePackageRepository { - get { return registeredPackageRepositories.ActiveRepository; } - } - - public IPackageManagementProject GetActiveProject(IPackageRepository sourceRepository) - { - MSBuildBasedProject activeProject = GetActiveMSBuildBasedProject(); - if (activeProject != null) { - return CreateProject(sourceRepository, activeProject); - } - return null; - } - - MSBuildBasedProject GetActiveMSBuildBasedProject() - { - return GetActiveMSBuildProject() as MSBuildBasedProject; - } - - IPackageManagementProject CreateProject(IPackageRepository sourceRepository, MSBuildBasedProject project) - { - return projectFactory.CreateProject(sourceRepository, project); - } - - IPackageRepository CreatePackageRepository(PackageSource source) - { - return registeredPackageRepositories.CreateRepository(source); - } - - public IPackageManagementProject GetProject(PackageSource source, string projectName) - { - MSBuildBasedProject msbuildProject = GetMSBuildProject(projectName); - return CreateProject(source, msbuildProject); - } - - MSBuildBasedProject GetMSBuildProject(string name) - { - var openProjects = new OpenMSBuildProjects(projectService); - return openProjects.FindProject(name); - } - - IPackageManagementProject CreateProject(PackageSource source, MSBuildBasedProject project) - { - IPackageRepository sourceRepository = CreatePackageRepository(source); - return CreateProject(sourceRepository, project); - } - - public IPackageManagementProject GetProject(IPackageRepository sourceRepository, string projectName) - { - MSBuildBasedProject msbuildProject = GetMSBuildProject(projectName); - return CreateProject(sourceRepository, msbuildProject); - } - - public IPackageManagementProject GetProject(IPackageRepository sourceRepository, IProject project) - { - var msbuildProject = project as MSBuildBasedProject; - return CreateProject(sourceRepository, msbuildProject); - } - - public IEnumerable GetMSBuildProjects() - { - return projectService.AllProjects.OfType();; - } - - public bool IsOpen { - get { return OpenSolution != null; } - } - - public bool HasMultipleProjects() - { - return projectService.AllProjects.Count > 1; - } - - public bool IsPackageInstalled(IPackage package) - { - ISolutionPackageRepository repository = CreateSolutionPackageRepository(); - return repository.IsInstalled(package); - } - - ISolutionPackageRepository CreateSolutionPackageRepository() - { - return solutionPackageRepositoryFactory.CreateSolutionPackageRepository(OpenSolution); - } - - public IQueryable GetPackages() - { - ISolutionPackageRepository repository = CreateSolutionPackageRepository(); - List projects = GetProjects(ActivePackageRepository).ToList(); - return repository - .GetPackages() - .Where(package => IsPackageInstalledInSolutionOrAnyProject(projects, package)); - } - - bool IsPackageInstalledInSolutionOrAnyProject(IList projects, IPackage package) - { - if (projects.Any(project => project.IsPackageInstalled(package))) { - return true; - } - return false; - } - - public string GetInstallPath(IPackage package) - { - ISolutionPackageRepository repository = CreateSolutionPackageRepository(); - return repository.GetInstallPath(package); - } - - public IEnumerable GetPackagesInReverseDependencyOrder() - { - ISolutionPackageRepository repository = CreateSolutionPackageRepository(); - return repository.GetPackagesByReverseDependencyOrder(); - } - - public IEnumerable GetProjects(IPackageRepository sourceRepository) - { - foreach (MSBuildBasedProject msbuildProject in GetMSBuildProjects()) { - yield return projectFactory.CreateProject(sourceRepository, msbuildProject); - } - } - } -} diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementSolution.cs.LOCAL.cs b/src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementSolution.cs.LOCAL.cs deleted file mode 100644 index 86b2315639..0000000000 --- a/src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementSolution.cs.LOCAL.cs +++ /dev/null @@ -1,204 +0,0 @@ -// Copyright (c) 2014 AlphaSierraPapa for the SharpDevelop Team -// -// Permission is hereby granted, free of charge, to any person obtaining a copy of this -// software and associated documentation files (the "Software"), to deal in the Software -// without restriction, including without limitation the rights to use, copy, modify, merge, -// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all copies or -// substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, -// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR -// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE -// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. - -using System; -using System.Collections.Generic; -using System.Linq; -using ICSharpCode.Core; -using ICSharpCode.SharpDevelop.Project; -using NuGet; - -namespace ICSharpCode.PackageManagement -{ - public class PackageManagementSolution : IPackageManagementSolution - { - IRegisteredPackageRepositories registeredPackageRepositories; - IPackageManagementProjectService projectService; - IPackageManagementProjectFactory projectFactory; - ISolutionPackageRepositoryFactory solutionPackageRepositoryFactory; - - public PackageManagementSolution( - IRegisteredPackageRepositories registeredPackageRepositories, - IPackageManagementEvents packageManagementEvents) - : this( - registeredPackageRepositories, - new PackageManagementProjectService(), - new PackageManagementProjectFactory(packageManagementEvents), - new SolutionPackageRepositoryFactory()) - { - } - - public PackageManagementSolution( - IRegisteredPackageRepositories registeredPackageRepositories, - IPackageManagementProjectService projectService, - IPackageManagementProjectFactory projectFactory, - ISolutionPackageRepositoryFactory solutionPackageRepositoryFactory) - { - this.registeredPackageRepositories = registeredPackageRepositories; - this.projectFactory = projectFactory; - this.projectService = projectService; - this.solutionPackageRepositoryFactory = solutionPackageRepositoryFactory; - } - - public string FileName { - get { return OpenSolution.FileName; } - } - - ISolution OpenSolution { - get { return projectService.OpenSolution; } - } - - public IPackageManagementProject GetActiveProject() - { - if (HasActiveProject()) { - return GetActiveProject(ActivePackageRepository); - } - return null; - } - - bool HasActiveProject() - { - return GetActiveMSBuildBasedProject() != null; - } - - public IProject GetActiveMSBuildProject() - { - return projectService.CurrentProject; - } - - IPackageRepository ActivePackageRepository { - get { return registeredPackageRepositories.ActiveRepository; } - } - - public IPackageManagementProject GetActiveProject(IPackageRepository sourceRepository) - { - MSBuildBasedProject activeProject = GetActiveMSBuildBasedProject(); - if (activeProject != null) { - return CreateProject(sourceRepository, activeProject); - } - return null; - } - - MSBuildBasedProject GetActiveMSBuildBasedProject() - { - return GetActiveMSBuildProject() as MSBuildBasedProject; - } - - IPackageManagementProject CreateProject(IPackageRepository sourceRepository, MSBuildBasedProject project) - { - return projectFactory.CreateProject(sourceRepository, project); - } - - IPackageRepository CreatePackageRepository(PackageSource source) - { - return registeredPackageRepositories.CreateRepository(source); - } - - public IPackageManagementProject GetProject(PackageSource source, string projectName) - { - MSBuildBasedProject msbuildProject = GetMSBuildProject(projectName); - return CreateProject(source, msbuildProject); - } - - MSBuildBasedProject GetMSBuildProject(string name) - { - var openProjects = new OpenMSBuildProjects(projectService); - return openProjects.FindProject(name); - } - - IPackageManagementProject CreateProject(PackageSource source, MSBuildBasedProject project) - { - IPackageRepository sourceRepository = CreatePackageRepository(source); - return CreateProject(sourceRepository, project); - } - - public IPackageManagementProject GetProject(IPackageRepository sourceRepository, string projectName) - { - MSBuildBasedProject msbuildProject = GetMSBuildProject(projectName); - return CreateProject(sourceRepository, msbuildProject); - } - - public IPackageManagementProject GetProject(IPackageRepository sourceRepository, IProject project) - { - var msbuildProject = project as MSBuildBasedProject; - return CreateProject(sourceRepository, msbuildProject); - } - - public IEnumerable GetMSBuildProjects() - { - return projectService.AllProjects.OfType();; - } - - public bool IsOpen { - get { return OpenSolution != null; } - } - - public bool HasMultipleProjects() - { - return projectService.AllProjects.Count > 1; - } - - public bool IsPackageInstalled(IPackage package) - { - return CreateSolutionPackageRepository().IsInstalled(package); - } - - public ISolutionPackageRepository CreateSolutionPackageRepository() - { - return solutionPackageRepositoryFactory.CreateSolutionPackageRepository(OpenSolution); - } - - public IQueryable GetPackages() - { - List projects = GetProjects(ActivePackageRepository).ToList(); - return CreateSolutionPackageRepository() - .GetPackages() - .Where(package => IsPackageInstalledInSolutionOrAnyProject(projects, package)); - } - - bool IsPackageInstalledInSolutionOrAnyProject(IList projects, IPackage package) - { - return IsPackageInstalled(package) || IsPackageInstalledInAnyProject(projects, package); - } - - bool IsPackageInstalledInAnyProject(IList projects, IPackage package) - { - if (projects.Any(project => project.IsPackageInstalled(package))) { - return true; - } - return false; - } - - public string GetInstallPath(IPackage package) - { - return CreateSolutionPackageRepository().GetInstallPath(package); - } - - public IEnumerable GetPackagesInReverseDependencyOrder() - { - return CreateSolutionPackageRepository().GetPackagesByReverseDependencyOrder(); - } - - public IEnumerable GetProjects(IPackageRepository sourceRepository) - { - foreach (MSBuildBasedProject msbuildProject in GetMSBuildProjects()) { - yield return projectFactory.CreateProject(sourceRepository, msbuildProject); - } - } - } -} diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementSolution.cs.REMOTE.cs b/src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementSolution.cs.REMOTE.cs deleted file mode 100644 index 6e299ac6d0..0000000000 --- a/src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementSolution.cs.REMOTE.cs +++ /dev/null @@ -1,208 +0,0 @@ -// Copyright (c) 2014 AlphaSierraPapa for the SharpDevelop Team -// -// Permission is hereby granted, free of charge, to any person obtaining a copy of this -// software and associated documentation files (the "Software"), to deal in the Software -// without restriction, including without limitation the rights to use, copy, modify, merge, -// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all copies or -// substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, -// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR -// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE -// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. - -using System; -using System.Collections.Generic; -using System.Linq; -using ICSharpCode.SharpDevelop.Project; -using NuGet; - -namespace ICSharpCode.PackageManagement -{ - public class PackageManagementSolution : IPackageManagementSolution - { - IRegisteredPackageRepositories registeredPackageRepositories; - IPackageManagementProjectService projectService; - IPackageManagementProjectFactory projectFactory; - ISolutionPackageRepositoryFactory solutionPackageRepositoryFactory; - - public PackageManagementSolution( - IRegisteredPackageRepositories registeredPackageRepositories, - IPackageManagementEvents packageManagementEvents) - : this( - registeredPackageRepositories, - new PackageManagementProjectService(), - new PackageManagementProjectFactory(packageManagementEvents), - new SolutionPackageRepositoryFactory()) - { - } - - public PackageManagementSolution( - IRegisteredPackageRepositories registeredPackageRepositories, - IPackageManagementProjectService projectService, - IPackageManagementProjectFactory projectFactory, - ISolutionPackageRepositoryFactory solutionPackageRepositoryFactory) - { - this.registeredPackageRepositories = registeredPackageRepositories; - this.projectFactory = projectFactory; - this.projectService = projectService; - this.solutionPackageRepositoryFactory = solutionPackageRepositoryFactory; - } - - public string FileName { - get { return OpenSolution.FileName; } - } - - ISolution OpenSolution { - get { return projectService.OpenSolution; } - } - - public IPackageManagementProject GetActiveProject() - { - if (HasActiveProject()) { - return GetActiveProject(ActivePackageRepository); - } - return null; - } - - bool HasActiveProject() - { - return GetActiveMSBuildBasedProject() != null; - } - - public IProject GetActiveMSBuildProject() - { - return projectService.CurrentProject; - } - - IPackageRepository ActivePackageRepository { - get { return registeredPackageRepositories.ActiveRepository; } - } - - public IPackageManagementProject GetActiveProject(IPackageRepository sourceRepository) - { - MSBuildBasedProject activeProject = GetActiveMSBuildBasedProject(); - if (activeProject != null) { - return CreateProject(sourceRepository, activeProject); - } - return null; - } - - MSBuildBasedProject GetActiveMSBuildBasedProject() - { - return GetActiveMSBuildProject() as MSBuildBasedProject; - } - - IPackageManagementProject CreateProject(IPackageRepository sourceRepository, MSBuildBasedProject project) - { - return projectFactory.CreateProject(sourceRepository, project); - } - - IPackageRepository CreatePackageRepository(PackageSource source) - { - return registeredPackageRepositories.CreateRepository(source); - } - - public IPackageManagementProject GetProject(PackageSource source, string projectName) - { - MSBuildBasedProject msbuildProject = GetMSBuildProject(projectName); - return CreateProject(source, msbuildProject); - } - - MSBuildBasedProject GetMSBuildProject(string name) - { - var openProjects = new OpenMSBuildProjects(projectService); - return openProjects.FindProject(name); - } - - IPackageManagementProject CreateProject(PackageSource source, MSBuildBasedProject project) - { - IPackageRepository sourceRepository = CreatePackageRepository(source); - return CreateProject(sourceRepository, project); - } - - public IPackageManagementProject GetProject(IPackageRepository sourceRepository, string projectName) - { - MSBuildBasedProject msbuildProject = GetMSBuildProject(projectName); - return CreateProject(sourceRepository, msbuildProject); - } - - public IPackageManagementProject GetProject(IPackageRepository sourceRepository, IProject project) - { - var msbuildProject = project as MSBuildBasedProject; - return CreateProject(sourceRepository, msbuildProject); - } - - public IEnumerable GetMSBuildProjects() - { - return projectService.AllProjects.OfType();; - } - - public bool IsOpen { - get { return OpenSolution != null; } - } - - public bool HasMultipleProjects() - { - return projectService.AllProjects.Count > 1; - } - - public bool IsPackageInstalled(IPackage package) - { - ISolutionPackageRepository repository = CreateSolutionPackageRepository(); - return repository.IsInstalled(package); - } - - ISolutionPackageRepository CreateSolutionPackageRepository() - { - return solutionPackageRepositoryFactory.CreateSolutionPackageRepository(OpenSolution); - } - - public IQueryable GetPackages() - { - ISolutionPackageRepository repository = CreateSolutionPackageRepository(); - return repository.GetPackages(); - } - - public IQueryable GetInstalledPackages() - { - ISolutionPackageRepository repository = CreateSolutionPackageRepository(); - List projects = GetProjects(ActivePackageRepository).ToList(); - return repository - .GetPackages() - .Where(package => IsPackageInstalledInSolutionOrAnyProject(projects, package)); - } - - bool IsPackageInstalledInSolutionOrAnyProject(IList projects, IPackage package) - { - if (projects.Any(project => project.IsPackageInstalled(package))) { - return true; - } - return false; - } - - public string GetInstallPath(IPackage package) - { - ISolutionPackageRepository repository = CreateSolutionPackageRepository(); - return repository.GetInstallPath(package); - } - - public IEnumerable GetPackagesInReverseDependencyOrder() - { - ISolutionPackageRepository repository = CreateSolutionPackageRepository(); - return repository.GetPackagesByReverseDependencyOrder(); - } - - public IEnumerable GetProjects(IPackageRepository sourceRepository) - { - foreach (MSBuildBasedProject msbuildProject in GetMSBuildProjects()) { - yield return projectFactory.CreateProject(sourceRepository, msbuildProject); - } - } - } -}