pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

PM: Remove conflict files

pull/374/head
Dragan 12 years ago
parent
a2191c7745
commit
25c9dac11b
3 changed files with 0 additions and 615 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 203
      src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementSolution.cs.BASE.cs
  2. 204
      src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementSolution.cs.LOCAL.cs
  3. 208
      src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementSolution.cs.REMOTE.cs

203
src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementSolution.cs.BASE.cs
Unescape View File

@ -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<IProject> GetMSBuildProjects()
{
return projectService.AllProjects.OfType<MSBuildBasedProject>();;
}
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<IPackage> GetPackages()
{
ISolutionPackageRepository repository = CreateSolutionPackageRepository();
List<IPackageManagementProject> projects = GetProjects(ActivePackageRepository).ToList();
return repository
.GetPackages()
.Where(package => IsPackageInstalledInSolutionOrAnyProject(projects, package));
}
bool IsPackageInstalledInSolutionOrAnyProject(IList<IPackageManagementProject> 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<IPackage> GetPackagesInReverseDependencyOrder()
{
ISolutionPackageRepository repository = CreateSolutionPackageRepository();
return repository.GetPackagesByReverseDependencyOrder();
}
public IEnumerable<IPackageManagementProject> GetProjects(IPackageRepository sourceRepository)
{
foreach (MSBuildBasedProject msbuildProject in GetMSBuildProjects()) {
yield return projectFactory.CreateProject(sourceRepository, msbuildProject);
}
}
}
}

204
src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementSolution.cs.LOCAL.cs
Unescape View File

@ -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<IProject> GetMSBuildProjects()
{
return projectService.AllProjects.OfType<MSBuildBasedProject>();;
}
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<IPackage> GetPackages()
{
List<IPackageManagementProject> projects = GetProjects(ActivePackageRepository).ToList();
return CreateSolutionPackageRepository()
.GetPackages()
.Where(package => IsPackageInstalledInSolutionOrAnyProject(projects, package));
}
bool IsPackageInstalledInSolutionOrAnyProject(IList<IPackageManagementProject> projects, IPackage package)
{
return IsPackageInstalled(package) || IsPackageInstalledInAnyProject(projects, package);
}
bool IsPackageInstalledInAnyProject(IList<IPackageManagementProject> 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<IPackage> GetPackagesInReverseDependencyOrder()
{
return CreateSolutionPackageRepository().GetPackagesByReverseDependencyOrder();
}
public IEnumerable<IPackageManagementProject> GetProjects(IPackageRepository sourceRepository)
{
foreach (MSBuildBasedProject msbuildProject in GetMSBuildProjects()) {
yield return projectFactory.CreateProject(sourceRepository, msbuildProject);
}
}
}
}

208
src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementSolution.cs.REMOTE.cs
Unescape View File

@ -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<IProject> GetMSBuildProjects()
{
return projectService.AllProjects.OfType<MSBuildBasedProject>();;
}
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<IPackage> GetPackages()
{
ISolutionPackageRepository repository = CreateSolutionPackageRepository();
return repository.GetPackages();
}
public IQueryable<IPackage> GetInstalledPackages()
{
ISolutionPackageRepository repository = CreateSolutionPackageRepository();
List<IPackageManagementProject> projects = GetProjects(ActivePackageRepository).ToList();
return repository
.GetPackages()
.Where(package => IsPackageInstalledInSolutionOrAnyProject(projects, package));
}
bool IsPackageInstalledInSolutionOrAnyProject(IList<IPackageManagementProject> 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<IPackage> GetPackagesInReverseDependencyOrder()
{
ISolutionPackageRepository repository = CreateSolutionPackageRepository();
return repository.GetPackagesByReverseDependencyOrder();
}
public IEnumerable<IPackageManagementProject> GetProjects(IPackageRepository sourceRepository)
{
foreach (MSBuildBasedProject msbuildProject in GetMSBuildProjects()) {
yield return projectFactory.CreateProject(sourceRepository, msbuildProject);
}
}
}
}
Write Preview
Loading…
Cancel
Save