Browse Source

Update to NuGet 1.6

pull/18/head
Matt Ward 14 years ago
parent
commit
9a36c5964b
  1. 2
      src/AddIns/Misc/PackageManagement/Cmdlets/Project/Src/InstallPackageCmdlet.cs
  2. 2
      src/AddIns/Misc/PackageManagement/Cmdlets/Project/Src/UninstallPackageCmdlet.cs
  3. 2
      src/AddIns/Misc/PackageManagement/Cmdlets/Project/Src/UpdatePackageCmdlet.cs
  4. 6
      src/AddIns/Misc/PackageManagement/Cmdlets/Test/Src/InstallPackageCmdletTests.cs
  5. 19
      src/AddIns/Misc/PackageManagement/Cmdlets/Test/Src/UninstallPackageCmdletTests.cs
  6. 8
      src/AddIns/Misc/PackageManagement/Cmdlets/Test/Src/UpdatePackageCmdletTests.cs
  7. 6
      src/AddIns/Misc/PackageManagement/Project/Src/Design/DesignTimeRegisteredPackageRepositories.cs
  8. 20
      src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackage.cs
  9. 6
      src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManagementProject.cs
  10. 66
      src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManager.cs
  11. 1
      src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageRepository.cs
  12. 24
      src/AddIns/Misc/PackageManagement/Project/Src/Design/FakeProjectManager.cs
  13. 6
      src/AddIns/Misc/PackageManagement/Project/Src/IPackageManagementProject.cs
  14. 3
      src/AddIns/Misc/PackageManagement/Project/Src/IPackageOperationResolverFactory.cs
  15. 2
      src/AddIns/Misc/PackageManagement/Project/Src/IPackageReferenceFile.cs
  16. 6
      src/AddIns/Misc/PackageManagement/Project/Src/ISharpDevelopPackageManager.cs
  17. 5
      src/AddIns/Misc/PackageManagement/Project/Src/InstallPackageAction.cs
  18. 22
      src/AddIns/Misc/PackageManagement/Project/Src/PackageFromRepository.cs
  19. 2
      src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementOptions.cs
  20. 12
      src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementProject.cs
  21. 5
      src/AddIns/Misc/PackageManagement/Project/Src/PackageOperationsResolverFactory.cs
  22. 3
      src/AddIns/Misc/PackageManagement/Project/Src/PackageReferenceFile.cs
  23. 11
      src/AddIns/Misc/PackageManagement/Project/Src/PackageViewModel.cs
  24. 2
      src/AddIns/Misc/PackageManagement/Project/Src/ProcessPackageAction.cs
  25. 6
      src/AddIns/Misc/PackageManagement/Project/Src/RecentPackageInfo.cs
  26. 4
      src/AddIns/Misc/PackageManagement/Project/Src/RecentPackageRepository.cs
  27. 2
      src/AddIns/Misc/PackageManagement/Project/Src/SettingsFactory.cs
  28. 34
      src/AddIns/Misc/PackageManagement/Project/Src/SharpDevelopPackageManager.cs
  29. 5
      src/AddIns/Misc/PackageManagement/Project/Src/UpdatePackageAction.cs
  30. 2
      src/AddIns/Misc/PackageManagement/Project/Src/UpdatedPackages.cs
  31. 31
      src/AddIns/Misc/PackageManagement/RequiredLibraries/NuGet.Cmdlets.dll-Help.xml
  32. BIN
      src/AddIns/Misc/PackageManagement/RequiredLibraries/NuGet.Core.dll
  33. 22
      src/AddIns/Misc/PackageManagement/Test/Src/AvailablePackagesViewModelTests.cs
  34. 4
      src/AddIns/Misc/PackageManagement/Test/Src/Helpers/ExceptionThrowingPackageManagementProject.cs
  35. 3
      src/AddIns/Misc/PackageManagement/Test/Src/Helpers/FakePackageOperationResolverFactory.cs
  36. 6
      src/AddIns/Misc/PackageManagement/Test/Src/Helpers/FakePackagePathResolver.cs
  37. 4
      src/AddIns/Misc/PackageManagement/Test/Src/Helpers/FakePackageReferenceFile.cs
  38. 13
      src/AddIns/Misc/PackageManagement/Test/Src/Helpers/FakePackageTests.cs
  39. 1
      src/AddIns/Misc/PackageManagement/Test/Src/Helpers/FakeRecentPackageRepository.cs
  40. 4
      src/AddIns/Misc/PackageManagement/Test/Src/Helpers/FakeSharedPackageRepository.cs
  41. 2
      src/AddIns/Misc/PackageManagement/Test/Src/Helpers/InstallPackageHelper.cs
  42. 4
      src/AddIns/Misc/PackageManagement/Test/Src/Helpers/PackageReferenceRepositoryHelper.cs
  43. 6
      src/AddIns/Misc/PackageManagement/Test/Src/Helpers/TestableProjectManager.cs
  44. 2
      src/AddIns/Misc/PackageManagement/Test/Src/Helpers/UninstallPackageHelper.cs
  45. 2
      src/AddIns/Misc/PackageManagement/Test/Src/Helpers/UpdatePackageHelper.cs
  46. 6
      src/AddIns/Misc/PackageManagement/Test/Src/InstallPackageActionTests.cs
  47. 2
      src/AddIns/Misc/PackageManagement/Test/Src/InstalledPackageViewModelTests.cs
  48. 4
      src/AddIns/Misc/PackageManagement/Test/Src/ManagePackagesViewModelTests.cs
  49. 24
      src/AddIns/Misc/PackageManagement/Test/Src/PackageFromRepositoryTests.cs
  50. 2
      src/AddIns/Misc/PackageManagement/Test/Src/PackageManagementOptionsTests.cs
  51. 24
      src/AddIns/Misc/PackageManagement/Test/Src/PackageManagementProjectTests.cs
  52. 4
      src/AddIns/Misc/PackageManagement/Test/Src/PackageReferenceInstallerTests.cs
  53. 2
      src/AddIns/Misc/PackageManagement/Test/Src/PackageRepositoryCacheTests.cs
  54. 8
      src/AddIns/Misc/PackageManagement/Test/Src/PackageViewModelTests.cs
  55. 14
      src/AddIns/Misc/PackageManagement/Test/Src/RecentPackageInfoTests.cs
  56. 2
      src/AddIns/Misc/PackageManagement/Test/Src/RecentPackageRepositoryTests.cs
  57. 6
      src/AddIns/Misc/PackageManagement/Test/Src/SharpDevelopPackageManagerFactoryTests.cs
  58. 27
      src/AddIns/Misc/PackageManagement/Test/Src/SharpDevelopPackageManagerTests.cs
  59. 9
      src/AddIns/Misc/PackageManagement/Test/Src/SolutionPackageRepositoryTests.cs
  60. 19
      src/AddIns/Misc/PackageManagement/Test/Src/UninstallPackageActionTests.cs
  61. 2
      src/AddIns/Misc/PackageManagement/Test/Src/UpdateAllPackagesInProjectTests.cs
  62. 8
      src/AddIns/Misc/PackageManagement/Test/Src/UpdatePackageInAllProjectsTests.cs

2
src/AddIns/Misc/PackageManagement/Cmdlets/Project/Src/InstallPackageCmdlet.cs

@ -33,7 +33,7 @@ namespace ICSharpCode.PackageManagement.Cmdlets @@ -33,7 +33,7 @@ namespace ICSharpCode.PackageManagement.Cmdlets
public string ProjectName { get; set; }
[Parameter(Position = 2)]
public Version Version { get; set; }
public SemanticVersion Version { get; set; }
[Parameter(Position = 3)]
public string Source { get; set; }

2
src/AddIns/Misc/PackageManagement/Cmdlets/Project/Src/UninstallPackageCmdlet.cs

@ -33,7 +33,7 @@ namespace ICSharpCode.PackageManagement.Cmdlets @@ -33,7 +33,7 @@ namespace ICSharpCode.PackageManagement.Cmdlets
public string ProjectName { get; set; }
[Parameter(Position = 2)]
public Version Version { get; set; }
public SemanticVersion Version { get; set; }
[Parameter]
public SwitchParameter Force { get; set; }

2
src/AddIns/Misc/PackageManagement/Cmdlets/Project/Src/UpdatePackageCmdlet.cs

@ -40,7 +40,7 @@ namespace ICSharpCode.PackageManagement.Cmdlets @@ -40,7 +40,7 @@ namespace ICSharpCode.PackageManagement.Cmdlets
public string ProjectName { get; set; }
[Parameter(Position = 2, ParameterSetName = "Project")]
public Version Version { get; set; }
public SemanticVersion Version { get; set; }
[Parameter(Position = 3)]
public string Source { get; set; }

6
src/AddIns/Misc/PackageManagement/Cmdlets/Test/Src/InstallPackageCmdletTests.cs

@ -57,7 +57,7 @@ namespace PackageManagement.Cmdlets.Tests @@ -57,7 +57,7 @@ namespace PackageManagement.Cmdlets.Tests
cmdlet.Source = source;
}
void SetVersionParameter(Version version)
void SetVersionParameter(SemanticVersion version)
{
cmdlet.Version = version;
}
@ -138,11 +138,11 @@ namespace PackageManagement.Cmdlets.Tests @@ -138,11 +138,11 @@ namespace PackageManagement.Cmdlets.Tests
CreateCmdletWithActivePackageSourceAndProject();
SetIdParameter("Test");
var version = new Version("1.0.1");
var version = new SemanticVersion("1.0.1");
SetVersionParameter(version);
RunCmdlet();
var actualVersion = fakeInstallPackageAction.PackageVersion;
SemanticVersion actualVersion = fakeInstallPackageAction.PackageVersion;
Assert.AreEqual(version, actualVersion);
}

19
src/AddIns/Misc/PackageManagement/Cmdlets/Test/Src/UninstallPackageCmdletTests.cs

@ -5,6 +5,7 @@ using System; @@ -5,6 +5,7 @@ using System;
using System.Management.Automation;
using ICSharpCode.PackageManagement.Design;
using ICSharpCode.PackageManagement.Scripting;
using NuGet;
using NUnit.Framework;
using PackageManagement.Cmdlets.Tests.Helpers;
using PackageManagement.Tests.Helpers;
@ -55,7 +56,7 @@ namespace PackageManagement.Cmdlets.Tests @@ -55,7 +56,7 @@ namespace PackageManagement.Cmdlets.Tests
cmdlet.RemoveDependencies = new SwitchParameter(true);
}
void SetVersionParameter(Version version)
void SetVersionParameter(SemanticVersion version)
{
cmdlet.Version = version;
}
@ -148,11 +149,11 @@ namespace PackageManagement.Cmdlets.Tests @@ -148,11 +149,11 @@ namespace PackageManagement.Cmdlets.Tests
CreateCmdletWithActivePackageSourceAndProject();
SetIdParameter("Test");
var version = new Version("1.0.1");
var version = new SemanticVersion("1.0.1");
SetVersionParameter(version);
RunCmdlet();
var actualVersion = uninstallPackageAction.PackageVersion;
SemanticVersion actualVersion = uninstallPackageAction.PackageVersion;
Assert.AreEqual(version, actualVersion);
}
@ -165,7 +166,7 @@ namespace PackageManagement.Cmdlets.Tests @@ -165,7 +166,7 @@ namespace PackageManagement.Cmdlets.Tests
SetIdParameter("Test");
RunCmdlet();
var actualVersion = uninstallPackageAction.PackageVersion;
SemanticVersion actualVersion = uninstallPackageAction.PackageVersion;
Assert.IsNull(actualVersion);
}
@ -179,7 +180,7 @@ namespace PackageManagement.Cmdlets.Tests @@ -179,7 +180,7 @@ namespace PackageManagement.Cmdlets.Tests
SetProjectNameParameter("MyProject");
RunCmdlet();
var actualProjectName = fakeConsoleHost.ProjectNamePassedToGetProject;
string actualProjectName = fakeConsoleHost.ProjectNamePassedToGetProject;
Assert.AreEqual("MyProject", actualProjectName);
}
@ -193,8 +194,8 @@ namespace PackageManagement.Cmdlets.Tests @@ -193,8 +194,8 @@ namespace PackageManagement.Cmdlets.Tests
SetProjectNameParameter("MyProject");
RunCmdlet();
var actual = fakeConsoleHost.ProjectNamePassedToGetProject;
var expected = "MyProject";
string actual = fakeConsoleHost.ProjectNamePassedToGetProject;
string expected = "MyProject";
Assert.AreEqual(expected, actual);
}
@ -204,7 +205,7 @@ namespace PackageManagement.Cmdlets.Tests @@ -204,7 +205,7 @@ namespace PackageManagement.Cmdlets.Tests
{
CreateCmdletWithoutActiveProject();
AddDefaultProjectToConsoleHost();
var packageSource = AddPackageSourceToConsoleHost();
PackageSource packageSource = AddPackageSourceToConsoleHost();
SetIdParameter("Test");
RunCmdlet();
@ -216,7 +217,7 @@ namespace PackageManagement.Cmdlets.Tests @@ -216,7 +217,7 @@ namespace PackageManagement.Cmdlets.Tests
{
CreateCmdletWithoutActiveProject();
AddDefaultProjectToConsoleHost();
var packageSource = AddPackageSourceToConsoleHost();
PackageSource packageSource = AddPackageSourceToConsoleHost();
SetIdParameter("Test");
RunCmdlet();

8
src/AddIns/Misc/PackageManagement/Cmdlets/Test/Src/UpdatePackageCmdletTests.cs

@ -108,7 +108,7 @@ namespace PackageManagement.Cmdlets.Tests @@ -108,7 +108,7 @@ namespace PackageManagement.Cmdlets.Tests
cmdlet.Source = source;
}
void SetVersionParameter(Version version)
void SetVersionParameter(SemanticVersion version)
{
cmdlet.Version = version;
}
@ -273,11 +273,11 @@ namespace PackageManagement.Cmdlets.Tests @@ -273,11 +273,11 @@ namespace PackageManagement.Cmdlets.Tests
SetIdParameter("Test");
SetProjectNameParameter("MyProject");
var version = new Version("1.0.1");
var version = new SemanticVersion("1.0.1");
SetVersionParameter(version);
RunCmdlet();
Version actualVersion = UpdatePackageInSingleProjectAction.PackageVersion;
SemanticVersion actualVersion = UpdatePackageInSingleProjectAction.PackageVersion;
Assert.AreEqual(version, actualVersion);
}
@ -658,7 +658,7 @@ namespace PackageManagement.Cmdlets.Tests @@ -658,7 +658,7 @@ namespace PackageManagement.Cmdlets.Tests
{
CreateCmdletWithActivePackageSourceAndProject();
SetIdParameter("MyPackage");
var expectedVersion = new Version("1.0");
var expectedVersion = new SemanticVersion("1.0");
SetVersionParameter(expectedVersion);
RunCmdlet();

6
src/AddIns/Misc/PackageManagement/Project/Src/Design/DesignTimeRegisteredPackageRepositories.cs

@ -38,12 +38,12 @@ namespace ICSharpCode.PackageManagement.Design @@ -38,12 +38,12 @@ namespace ICSharpCode.PackageManagement.Design
package.LicenseUrl = new Uri("http://www.google.com/license");
package.ProjectUrl = new Uri("http://www.codeplex.com");
package.ReportAbuseUrl = new Uri("http://www.google.com");
package.Version = Version.Parse("1.0.4.5");
package.Version = SemanticVersion.Parse("1.0.4.5");
package.LastUpdated = new DateTime(2011, 1, 2);
package.AddAuthor("A User");
package.AddAuthor("B User");
package.AddDependency("NuGet.Package." + i, Version.Parse("1.0.0.1"), Version.Parse("1.2.0.2"));
package.AddDependency("NuGet.Package." + i + 1, Version.Parse("1.2.0.2"), Version.Parse("2.2.0.0"));
package.AddDependency("NuGet.Package." + i, SemanticVersion.Parse("1.0.0.1"), SemanticVersion.Parse("1.2.0.2"));
package.AddDependency("NuGet.Package." + i + 1, SemanticVersion.Parse("1.2.0.2"), SemanticVersion.Parse("2.2.0.0"));
return package;
}
}

20
src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackage.cs

@ -27,17 +27,16 @@ namespace ICSharpCode.PackageManagement.Design @@ -27,17 +27,16 @@ namespace ICSharpCode.PackageManagement.Design
}
public FakePackage(string id)
: this(id, "1.0.0.0")
{
this.Id = id;
this.Description = String.Empty;
this.Version = new Version(1, 0, 0, 0);
}
public FakePackage(string id, string version)
{
this.Id = id;
this.Description = String.Empty;
this.Version = new Version(version);
this.Version = new SemanticVersion(version);
this.Listed = true;
}
public static FakePackage CreatePackageWithVersion(string version)
@ -47,16 +46,11 @@ namespace ICSharpCode.PackageManagement.Design @@ -47,16 +46,11 @@ namespace ICSharpCode.PackageManagement.Design
public static FakePackage CreatePackageWithVersion(string id, string version)
{
var package = new FakePackage() {
Id = id,
Description = String.Empty,
Version = new Version(version)
};
return package;
return new FakePackage(id, version);
}
public string Id { get; set; }
public Version Version { get; set; }
public SemanticVersion Version { get; set; }
public string Title { get; set; }
public Uri IconUrl { get; set; }
public Uri LicenseUrl { get; set; }
@ -121,7 +115,7 @@ namespace ICSharpCode.PackageManagement.Design @@ -121,7 +115,7 @@ namespace ICSharpCode.PackageManagement.Design
AuthorsList.Add(author);
}
public void AddDependency(string id, Version minVersion, Version maxVersion)
public void AddDependency(string id, SemanticVersion minVersion, SemanticVersion maxVersion)
{
var versionSpec = new VersionSpec();
versionSpec.MinVersion = minVersion;
@ -162,5 +156,7 @@ namespace ICSharpCode.PackageManagement.Design @@ -162,5 +156,7 @@ namespace ICSharpCode.PackageManagement.Design
public Nullable<DateTimeOffset> Published { get; set; }
public string ReleaseNotes { get; set; }
public string Copyright { get; set; }
public bool IsAbsoluteLatestVersion { get; set; }
public bool Listed { get; set; }
}
}

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

@ -63,7 +63,7 @@ namespace ICSharpCode.PackageManagement.Design @@ -63,7 +63,7 @@ namespace ICSharpCode.PackageManagement.Design
public IPackage PackagePassedToGetInstallPackageOperations;
public bool IgnoreDependenciesPassedToGetInstallPackageOperations;
public virtual IEnumerable<PackageOperation> GetInstallPackageOperations(IPackage package, bool ignoreDependencies)
public virtual IEnumerable<PackageOperation> GetInstallPackageOperations(IPackage package, bool ignoreDependencies, bool allowPrereleaseVersions)
{
PackagePassedToGetInstallPackageOperations = package;
IgnoreDependenciesPassedToGetInstallPackageOperations = ignoreDependencies;
@ -77,7 +77,7 @@ namespace ICSharpCode.PackageManagement.Design @@ -77,7 +77,7 @@ namespace ICSharpCode.PackageManagement.Design
public IEnumerable<PackageOperation> PackageOperationsPassedToInstallPackage;
public bool IgnoreDependenciesPassedToInstallPackage;
public void InstallPackage(IPackage package, IEnumerable<PackageOperation> operations, bool ignoreDependencies)
public void InstallPackage(IPackage package, IEnumerable<PackageOperation> operations, bool ignoreDependencies, bool allowPrereleaseVersions)
{
PackagePassedToInstallPackage = package;
PackageOperationsPassedToInstallPackage = operations;
@ -122,7 +122,7 @@ namespace ICSharpCode.PackageManagement.Design @@ -122,7 +122,7 @@ namespace ICSharpCode.PackageManagement.Design
public bool UpdateDependenciesPassedToUpdatePackage;
public bool IsUpdatePackageCalled;
public void UpdatePackage(IPackage package, IEnumerable<PackageOperation> operations, bool updateDependencies)
public void UpdatePackage(IPackage package, IEnumerable<PackageOperation> operations, bool updateDependencies, bool allowPrereleaseVersions)
{
PackagePassedToUpdatePackage = package;
PackageOperationsPassedToUpdatePackage = operations;

66
src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManager.cs

@ -63,16 +63,6 @@ namespace ICSharpCode.PackageManagement.Design @@ -63,16 +63,6 @@ namespace ICSharpCode.PackageManagement.Design
SourceRepository = FakeSourceRepository;
}
public void InstallPackage(IPackage package, bool ignoreDependencies)
{
throw new NotImplementedException();
}
public void InstallPackage(string packageId, Version version, bool ignoreDependencies)
{
throw new NotImplementedException();
}
public bool ForceRemovePassedToUninstallPackage;
public bool RemoveDependenciesPassedToUninstallPackage;
@ -84,29 +74,9 @@ namespace ICSharpCode.PackageManagement.Design @@ -84,29 +74,9 @@ namespace ICSharpCode.PackageManagement.Design
IsRefreshProjectBrowserCalledWhenUninstallPackageCalled = FakeProjectService.IsRefreshProjectBrowserCalled;
}
public void UninstallPackage(string packageId, Version version, bool forceRemove, bool removeDependencies)
{
throw new NotImplementedException();
}
public void UninstallPackage(IPackage package)
{
throw new NotImplementedException();
}
public void UpdatePackage(IPackage oldPackage, IPackage newPackage, bool updateDependencies)
{
throw new NotImplementedException();
}
public void UpdatePackage(string packageId, Version version, bool updateDependencies)
{
throw new NotImplementedException();
}
public IEnumerable<PackageOperation> PackageOperationsPassedToInstallPackage;
public void InstallPackage(IPackage package, IEnumerable<PackageOperation> operations, bool ignoreDependencies)
public void InstallPackage(IPackage package, IEnumerable<PackageOperation> operations, bool ignoreDependencies, bool allowPrereleaseVersions)
{
PackagePassedToInstallPackage = package;
@ -124,7 +94,7 @@ namespace ICSharpCode.PackageManagement.Design @@ -124,7 +94,7 @@ namespace ICSharpCode.PackageManagement.Design
public IPackage PackagePassedToGetInstallPackageOperations;
public bool IgnoreDependenciesPassedToGetInstallPackageOperations;
public IEnumerable<PackageOperation> GetInstallPackageOperations(IPackage package, bool ignoreDependencies)
public IEnumerable<PackageOperation> GetInstallPackageOperations(IPackage package, bool ignoreDependencies, bool allowPrereleaseVersions)
{
PackagePassedToGetInstallPackageOperations = package;
IgnoreDependenciesPassedToGetInstallPackageOperations = ignoreDependencies;
@ -135,7 +105,7 @@ namespace ICSharpCode.PackageManagement.Design @@ -135,7 +105,7 @@ namespace ICSharpCode.PackageManagement.Design
public IEnumerable<PackageOperation> PackageOperationsPassedToUpdatePackage;
public bool UpdateDependenciesPassedToUpdatePackage;
public void UpdatePackage(IPackage package, IEnumerable<PackageOperation> operations, bool updateDependencies)
public void UpdatePackage(IPackage package, IEnumerable<PackageOperation> operations, bool updateDependencies, bool allowPrereleaseVersions)
{
PackagePassedToUpdatePackage = package;
PackageOperationsPassedToUpdatePackage = operations;
@ -167,5 +137,35 @@ namespace ICSharpCode.PackageManagement.Design @@ -167,5 +137,35 @@ namespace ICSharpCode.PackageManagement.Design
{
throw new NotImplementedException();
}
public void InstallPackage(IPackage package, bool ignoreDependencies, bool allowPrereleaseVersions)
{
throw new NotImplementedException();
}
public void InstallPackage(string packageId, SemanticVersion version, bool ignoreDependencies, bool allowPrereleaseVersions)
{
throw new NotImplementedException();
}
public void UpdatePackage(IPackage newPackage, bool updateDependencies, bool allowPrereleaseVersions)
{
throw new NotImplementedException();
}
public void UpdatePackage(string packageId, SemanticVersion version, bool updateDependencies, bool allowPrereleaseVersions)
{
throw new NotImplementedException();
}
public void UpdatePackage(string packageId, IVersionSpec versionSpec, bool updateDependencies, bool allowPrereleaseVersions)
{
throw new NotImplementedException();
}
public void UninstallPackage(string packageId, SemanticVersion version, bool forceRemove, bool removeDependencies)
{
throw new NotImplementedException();
}
}
}

1
src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageRepository.cs

@ -55,5 +55,6 @@ namespace ICSharpCode.PackageManagement.Design @@ -55,5 +55,6 @@ namespace ICSharpCode.PackageManagement.Design
}
public bool HasRecentPackages { get; set; }
public bool SupportsPrereleasePackages { get; set; }
}
}

24
src/AddIns/Misc/PackageManagement/Project/Src/Design/FakeProjectManager.cs

@ -61,21 +61,11 @@ namespace ICSharpCode.PackageManagement.Design @@ -61,21 +61,11 @@ namespace ICSharpCode.PackageManagement.Design
public FakeProjectSystem FakeProjectSystem = new FakeProjectSystem();
public void AddPackageReference(string packageId, Version version, bool ignoreDependencies)
{
throw new NotImplementedException();
}
public void RemovePackageReference(string packageId, bool forceRemove, bool removeDependencies)
{
throw new NotImplementedException();
}
public void UpdatePackageReference(string packageId, Version version, bool updateDependencies)
{
throw new NotImplementedException();
}
public IPackage PackagePassedToIsInstalled;
public bool IsInstalled(IPackage package)
@ -102,7 +92,7 @@ namespace ICSharpCode.PackageManagement.Design @@ -102,7 +92,7 @@ namespace ICSharpCode.PackageManagement.Design
OnPackageReferenceRemoved(package);
}
public void AddPackageReference(IPackage package, bool ignoreDependencies)
public void AddPackageReference(IPackage package, bool ignoreDependencies, bool allowPrereleaseVersions)
{
throw new NotImplementedException();
}
@ -112,7 +102,17 @@ namespace ICSharpCode.PackageManagement.Design @@ -112,7 +102,17 @@ namespace ICSharpCode.PackageManagement.Design
throw new NotImplementedException();
}
public void UpdatePackageReference(string packageId, IVersionSpec versionSpec, bool updateDependencies)
public void AddPackageReference(string packageId, SemanticVersion version, bool ignoreDependencies, bool allowPrereleaseVersions)
{
throw new NotImplementedException();
}
public void UpdatePackageReference(string packageId, SemanticVersion version, bool updateDependencies, bool allowPrereleaseVersions)
{
throw new NotImplementedException();
}
public void UpdatePackageReference(string packageId, IVersionSpec versionSpec, bool updateDependencies, bool allowPrereleaseVersions)
{
throw new NotImplementedException();
}

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

@ -29,10 +29,10 @@ namespace ICSharpCode.PackageManagement @@ -29,10 +29,10 @@ namespace ICSharpCode.PackageManagement
IQueryable<IPackage> GetPackages();
IEnumerable<IPackage> GetPackagesInReverseDependencyOrder();
IEnumerable<PackageOperation> GetInstallPackageOperations(IPackage package, bool ignoreDependencies);
IEnumerable<PackageOperation> GetInstallPackageOperations(IPackage package, bool ignoreDependencies, bool allowPrereleaseVersions);
void InstallPackage(IPackage package, IEnumerable<PackageOperation> operations, bool ignoreDependencies);
void UpdatePackage(IPackage package, IEnumerable<PackageOperation> operations, bool updateDependencies);
void InstallPackage(IPackage package, IEnumerable<PackageOperation> operations, bool ignoreDependencies, bool allowPrereleaseVersions);
void UpdatePackage(IPackage package, IEnumerable<PackageOperation> operations, bool updateDependencies, bool allowPrereleaseVersions);
void UninstallPackage(IPackage package, bool forceRemove, bool removeDependencies);
InstallPackageAction CreateInstallPackageAction();

3
src/AddIns/Misc/PackageManagement/Project/Src/IPackageOperationResolverFactory.cs

@ -12,6 +12,7 @@ namespace ICSharpCode.PackageManagement @@ -12,6 +12,7 @@ namespace ICSharpCode.PackageManagement
IPackageRepository localRepository,
IPackageRepository sourceRepository,
ILogger logger,
bool ignoreDependencies);
bool ignoreDependencies,
bool allowPrereleaseVersions);
}
}

2
src/AddIns/Misc/PackageManagement/Project/Src/IPackageReferenceFile.cs

@ -10,7 +10,7 @@ namespace ICSharpCode.PackageManagement @@ -10,7 +10,7 @@ namespace ICSharpCode.PackageManagement
public interface IPackageReferenceFile
{
IEnumerable<PackageReference> GetPackageReferences();
void DeleteEntry(string id, Version version);
void DeleteEntry(string id, SemanticVersion version);
void Delete();
}
}

6
src/AddIns/Misc/PackageManagement/Project/Src/ISharpDevelopPackageManager.cs

@ -11,9 +11,9 @@ namespace ICSharpCode.PackageManagement @@ -11,9 +11,9 @@ namespace ICSharpCode.PackageManagement
{
ISharpDevelopProjectManager ProjectManager { get; }
void InstallPackage(IPackage package, IEnumerable<PackageOperation> operations, bool ignoreDependencies);
void UpdatePackage(IPackage package, IEnumerable<PackageOperation> operations, bool updateDependencies);
void InstallPackage(IPackage package, IEnumerable<PackageOperation> operations, bool ignoreDependencies, bool allowPrereleaseVersions);
void UpdatePackage(IPackage package, IEnumerable<PackageOperation> operations, bool updateDependencies, bool allowPrereleaseVersions);
IEnumerable<PackageOperation> GetInstallPackageOperations(IPackage package, bool ignoreDependencies);
IEnumerable<PackageOperation> GetInstallPackageOperations(IPackage package, bool ignoreDependencies, bool allowPrereleaseVersions);
}
}

5
src/AddIns/Misc/PackageManagement/Project/Src/InstallPackageAction.cs

@ -19,15 +19,16 @@ namespace ICSharpCode.PackageManagement @@ -19,15 +19,16 @@ namespace ICSharpCode.PackageManagement
}
public bool IgnoreDependencies { get; set; }
public bool AllowPrereleaseVersions { get; set; }
protected override IEnumerable<PackageOperation> GetPackageOperations()
{
return Project.GetInstallPackageOperations(Package, IgnoreDependencies);
return Project.GetInstallPackageOperations(Package, IgnoreDependencies, AllowPrereleaseVersions);
}
protected override void ExecuteCore()
{
Project.InstallPackage(Package, Operations, IgnoreDependencies);
Project.InstallPackage(Package, Operations, IgnoreDependencies, AllowPrereleaseVersions);
OnParentPackageInstalled();
}
}

22
src/AddIns/Misc/PackageManagement/Project/Src/PackageFromRepository.cs

@ -30,7 +30,7 @@ namespace ICSharpCode.PackageManagement @@ -30,7 +30,7 @@ namespace ICSharpCode.PackageManagement
get { return package.Id; }
}
public Version Version {
public SemanticVersion Version {
get { return package.Version; }
}
@ -94,14 +94,6 @@ namespace ICSharpCode.PackageManagement @@ -94,14 +94,6 @@ namespace ICSharpCode.PackageManagement
get { return package.DownloadCount; }
}
public int RatingsCount {
get { return package.RatingsCount; }
}
public double Rating {
get { return package.Rating; }
}
public DateTime? LastUpdated {
get { return GetLastUpdated(); }
}
@ -159,5 +151,17 @@ namespace ICSharpCode.PackageManagement @@ -159,5 +151,17 @@ namespace ICSharpCode.PackageManagement
public string Copyright {
get { return package.Copyright; }
}
public bool IsAbsoluteLatestVersion {
get {
throw new NotImplementedException();
}
}
public bool Listed {
get {
throw new NotImplementedException();
}
}
}
}

2
src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementOptions.cs

@ -26,7 +26,7 @@ namespace ICSharpCode.PackageManagement @@ -26,7 +26,7 @@ namespace ICSharpCode.PackageManagement
}
public PackageManagementOptions(Properties properties)
: this(properties, Settings.UserSettings)
: this(properties, Settings.DefaultSettings)
{
}

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

@ -84,14 +84,14 @@ namespace ICSharpCode.PackageManagement @@ -84,14 +84,14 @@ namespace ICSharpCode.PackageManagement
return projectManager.LocalRepository.GetPackages();
}
public IEnumerable<PackageOperation> GetInstallPackageOperations(IPackage package, bool ignoreDependencies)
public IEnumerable<PackageOperation> GetInstallPackageOperations(IPackage package, bool ignoreDependencies, bool allowPrereleaseVersions)
{
return packageManager.GetInstallPackageOperations(package, ignoreDependencies);
return packageManager.GetInstallPackageOperations(package, ignoreDependencies, allowPrereleaseVersions);
}
public void InstallPackage(IPackage package, IEnumerable<PackageOperation> operations, bool ignoreDependencies)
public void InstallPackage(IPackage package, IEnumerable<PackageOperation> operations, bool ignoreDependencies, bool allowPrereleaseVersions)
{
packageManager.InstallPackage(package, operations, ignoreDependencies);
packageManager.InstallPackage(package, operations, ignoreDependencies, allowPrereleaseVersions);
}
public void UninstallPackage(IPackage package, bool forceRemove, bool removeDependencies)
@ -99,9 +99,9 @@ namespace ICSharpCode.PackageManagement @@ -99,9 +99,9 @@ namespace ICSharpCode.PackageManagement
packageManager.UninstallPackage(package, forceRemove, removeDependencies);
}
public void UpdatePackage(IPackage package, IEnumerable<PackageOperation> operations, bool updateDependencies)
public void UpdatePackage(IPackage package, IEnumerable<PackageOperation> operations, bool updateDependencies, bool allowPrereleaseVersions)
{
packageManager.UpdatePackage(package, operations, updateDependencies);
packageManager.UpdatePackage(package, operations, updateDependencies, allowPrereleaseVersions);
}
public InstallPackageAction CreateInstallPackageAction()

5
src/AddIns/Misc/PackageManagement/Project/Src/PackageOperationsResolverFactory.cs

@ -12,9 +12,10 @@ namespace ICSharpCode.PackageManagement @@ -12,9 +12,10 @@ namespace ICSharpCode.PackageManagement
IPackageRepository localRepository,
IPackageRepository sourceRepository,
ILogger logger,
bool ignoreDependencies)
bool ignoreDependencies,
bool allowPrereleaseVersions)
{
return new InstallWalker(localRepository, sourceRepository, logger, ignoreDependencies);
return new InstallWalker(localRepository, sourceRepository, logger, ignoreDependencies, allowPrereleaseVersions);
}
}
}

3
src/AddIns/Misc/PackageManagement/Project/Src/PackageReferenceFile.cs

@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
using System;
using System.Collections.Generic;
using ICSharpCode.SharpDevelop;
using NuGet;
namespace ICSharpCode.PackageManagement
{
@ -23,7 +24,7 @@ namespace ICSharpCode.PackageManagement @@ -23,7 +24,7 @@ namespace ICSharpCode.PackageManagement
return file.GetPackageReferences();
}
public void DeleteEntry(string id, Version version)
public void DeleteEntry(string id, SemanticVersion version)
{
file.DeleteEntry(id, version);
}

11
src/AddIns/Misc/PackageManagement/Project/Src/PackageViewModel.cs

@ -133,8 +133,7 @@ namespace ICSharpCode.PackageManagement @@ -133,8 +133,7 @@ namespace ICSharpCode.PackageManagement
get { return package.Summary; }
}
public Version Version {
public SemanticVersion Version {
get { return package.Version; }
}
@ -142,10 +141,6 @@ namespace ICSharpCode.PackageManagement @@ -142,10 +141,6 @@ namespace ICSharpCode.PackageManagement
get { return package.DownloadCount; }
}
public double Rating {
get { return package.Rating; }
}
public string Description {
get { return package.Description; }
}
@ -175,7 +170,7 @@ namespace ICSharpCode.PackageManagement @@ -175,7 +170,7 @@ namespace ICSharpCode.PackageManagement
{
IPackageManagementProject project = GetSingleProjectSelected();
project.Logger = logger;
packageOperations = project.GetInstallPackageOperations(package, false);
packageOperations = project.GetInstallPackageOperations(package, false, false);
}
IPackageManagementProject GetSingleProjectSelected()
@ -409,7 +404,7 @@ namespace ICSharpCode.PackageManagement @@ -409,7 +404,7 @@ namespace ICSharpCode.PackageManagement
{
IPackageManagementProject project = selectedProject.Project;
project.Logger = logger;
IEnumerable<PackageOperation> operations = project.GetInstallPackageOperations(package, false);
IEnumerable<PackageOperation> operations = project.GetInstallPackageOperations(package, false, false);
return GetPackagesRequiringLicenseAcceptance(operations);
}

2
src/AddIns/Misc/PackageManagement/Project/Src/ProcessPackageAction.cs

@ -23,7 +23,7 @@ namespace ICSharpCode.PackageManagement @@ -23,7 +23,7 @@ namespace ICSharpCode.PackageManagement
public IPackageManagementProject Project { get; set; }
public ILogger Logger { get; set; }
public IPackage Package { get; set; }
public Version PackageVersion { get; set; }
public SemanticVersion PackageVersion { get; set; }
public string PackageId { get; set; }
public IPackageScriptRunner PackageScriptRunner { get; set; }

6
src/AddIns/Misc/PackageManagement/Project/Src/RecentPackageInfo.cs

@ -8,7 +8,7 @@ namespace ICSharpCode.PackageManagement @@ -8,7 +8,7 @@ namespace ICSharpCode.PackageManagement
{
public class RecentPackageInfo
{
Version version;
SemanticVersion version;
public RecentPackageInfo()
{
@ -19,7 +19,7 @@ namespace ICSharpCode.PackageManagement @@ -19,7 +19,7 @@ namespace ICSharpCode.PackageManagement
{
}
public RecentPackageInfo(string id, Version version)
public RecentPackageInfo(string id, SemanticVersion version)
{
this.Id = id;
this.version = version;
@ -29,7 +29,7 @@ namespace ICSharpCode.PackageManagement @@ -29,7 +29,7 @@ namespace ICSharpCode.PackageManagement
public string Version {
get { return version.ToString(); }
set { version = new Version(value); }
set { version = new SemanticVersion(value); }
}
public override string ToString()

4
src/AddIns/Misc/PackageManagement/Project/Src/RecentPackageRepository.cs

@ -162,5 +162,9 @@ namespace ICSharpCode.PackageManagement @@ -162,5 +162,9 @@ namespace ICSharpCode.PackageManagement
packages.Clear();
UpdateRecentPackagesInOptions();
}
public bool SupportsPrereleasePackages {
get { return false; }
}
}
}

2
src/AddIns/Misc/PackageManagement/Project/Src/SettingsFactory.cs

@ -11,7 +11,7 @@ namespace ICSharpCode.PackageManagement @@ -11,7 +11,7 @@ namespace ICSharpCode.PackageManagement
public ISettings CreateSettings(string directory)
{
var fileSystem = new PhysicalFileSystem(directory);
return new UserSettings(fileSystem);
return new Settings(fileSystem);
}
}
}

34
src/AddIns/Misc/PackageManagement/Project/Src/SharpDevelopPackageManager.cs

@ -60,26 +60,27 @@ namespace ICSharpCode.PackageManagement @@ -60,26 +60,27 @@ namespace ICSharpCode.PackageManagement
public void InstallPackage(IPackage package)
{
bool ignoreDependencies = false;
InstallPackage(package, ignoreDependencies);
bool allowPreleaseVersions = true;
InstallPackage(package, ignoreDependencies, allowPreleaseVersions);
}
public void InstallPackage(IPackage package, IEnumerable<PackageOperation> operations, bool ignoreDependencies)
public void InstallPackage(IPackage package, IEnumerable<PackageOperation> operations, bool ignoreDependencies, bool allowPrereleaseVersions)
{
foreach (PackageOperation operation in operations) {
Execute(operation);
}
AddPackageReference(package, ignoreDependencies);
AddPackageReference(package, ignoreDependencies, allowPrereleaseVersions);
}
void AddPackageReference(IPackage package, bool ignoreDependencies)
void AddPackageReference(IPackage package, bool ignoreDependencies, bool allowPrereleaseVersions)
{
ProjectManager.AddPackageReference(package.Id, package.Version, ignoreDependencies);
ProjectManager.AddPackageReference(package.Id, package.Version, ignoreDependencies, allowPrereleaseVersions);
}
public override void InstallPackage(IPackage package, bool ignoreDependencies)
public override void InstallPackage(IPackage package, bool ignoreDependencies, bool allowPrereleaseVersions)
{
base.InstallPackage(package, ignoreDependencies);
AddPackageReference(package, ignoreDependencies);
base.InstallPackage(package, ignoreDependencies, allowPrereleaseVersions);
AddPackageReference(package, ignoreDependencies, allowPrereleaseVersions);
}
public override void UninstallPackage(IPackage package, bool forceRemove, bool removeDependencies)
@ -96,32 +97,33 @@ namespace ICSharpCode.PackageManagement @@ -96,32 +97,33 @@ namespace ICSharpCode.PackageManagement
return sharedRepository.IsReferenced(package.Id, package.Version);
}
public IEnumerable<PackageOperation> GetInstallPackageOperations(IPackage package, bool ignoreDependencies)
public IEnumerable<PackageOperation> GetInstallPackageOperations(IPackage package, bool ignoreDependencies, bool allowPrereleaseVersions)
{
IPackageOperationResolver resolver = CreateInstallPackageOperationResolver(ignoreDependencies);
IPackageOperationResolver resolver = CreateInstallPackageOperationResolver(ignoreDependencies, allowPrereleaseVersions);
return resolver.ResolveOperations(package);
}
IPackageOperationResolver CreateInstallPackageOperationResolver(bool ignoreDependencies)
IPackageOperationResolver CreateInstallPackageOperationResolver(bool ignoreDependencies, bool allowPrereleaseVersions)
{
return packageOperationResolverFactory.CreateInstallPackageOperationResolver(
LocalRepository,
SourceRepository,
Logger,
ignoreDependencies);
ignoreDependencies,
allowPrereleaseVersions);
}
public void UpdatePackage(IPackage package, IEnumerable<PackageOperation> operations, bool updateDependencies)
public void UpdatePackage(IPackage package, IEnumerable<PackageOperation> operations, bool updateDependencies, bool allowPrereleaseVersions)
{
foreach (PackageOperation operation in operations) {
Execute(operation);
}
UpdatePackageReference(package, updateDependencies);
UpdatePackageReference(package, updateDependencies, allowPrereleaseVersions);
}
void UpdatePackageReference(IPackage package, bool updateDependencies)
void UpdatePackageReference(IPackage package, bool updateDependencies, bool allowPrereleaseVersions)
{
ProjectManager.UpdatePackageReference(package.Id, package.Version, updateDependencies);
ProjectManager.UpdatePackageReference(package.Id, package.Version, updateDependencies, allowPrereleaseVersions);
}
}
}

5
src/AddIns/Misc/PackageManagement/Project/Src/UpdatePackageAction.cs

@ -20,16 +20,17 @@ namespace ICSharpCode.PackageManagement @@ -20,16 +20,17 @@ namespace ICSharpCode.PackageManagement
public bool UpdateDependencies { get; set; }
public bool UpdateIfPackageDoesNotExistInProject { get; set; }
public bool AllowPrereleaseVersions { get; set; }
protected override IEnumerable<PackageOperation> GetPackageOperations()
{
return Project.GetInstallPackageOperations(Package, !UpdateDependencies);
return Project.GetInstallPackageOperations(Package, !UpdateDependencies, AllowPrereleaseVersions);
}
protected override void ExecuteCore()
{
if (ShouldUpdatePackage()) {
Project.UpdatePackage(Package, Operations, UpdateDependencies);
Project.UpdatePackage(Package, Operations, UpdateDependencies, AllowPrereleaseVersions);
OnParentPackageInstalled();
}
}

2
src/AddIns/Misc/PackageManagement/Project/Src/UpdatedPackages.cs

@ -53,7 +53,7 @@ namespace ICSharpCode.PackageManagement @@ -53,7 +53,7 @@ namespace ICSharpCode.PackageManagement
IEnumerable<IPackage> GetUpdatedPackages(IPackageRepository sourceRepository, IQueryable<IPackage> localPackages)
{
return sourceRepository.GetUpdates(localPackages);
return sourceRepository.GetUpdates(localPackages, false);
}
}
}

31
src/AddIns/Misc/PackageManagement/RequiredLibraries/NuGet.Cmdlets.dll-Help.xml

@ -39,14 +39,17 @@ @@ -39,14 +39,17 @@
<maml:name>ProjectName</maml:name>
<command:parameterValue required="true">string</command:parameterValue>
</command:parameter>
<command:parameter required="false" position="named">
<command:parameter required="false" position="2">
<maml:name>Version</maml:name>
<command:parameterValue required="true">string</command:parameterValue>
</command:parameter>
<command:parameter required="false" position="named">
<command:parameter required="false" position="3">
<maml:name>Source</maml:name>
<command:parameterValue required="true">string</command:parameterValue>
</command:parameter>
<command:parameter required="false" position="named">
<maml:name>IncludePrerelease</maml:name>
</command:parameter>
</command:syntaxItem>
</command:syntax>
@ -95,6 +98,12 @@ @@ -95,6 +98,12 @@
string
</command:parameterValue>
</command:parameter>
<command:parameter required="false" position="named">
<maml:name>IncludePrerelease</maml:name>
<maml:description>
<maml:para>Indicates whether this command will consider prerelease packages. If omitted, only stable packages are considered.</maml:para>
</maml:description>
</command:parameter>
</command:parameters>
<!-- Examples section -->
@ -212,6 +221,9 @@ c:\temp\packages to find the package. @@ -212,6 +221,9 @@ c:\temp\packages to find the package.
<command:parameter required="false" position="named">
<maml:name>AllVersions</maml:name>
</command:parameter>
<command:parameter required="false" position="named">
<maml:name>IncludePrerelease</maml:name>
</command:parameter>
</command:syntaxItem>
</command:syntax>
@ -274,6 +286,12 @@ c:\temp\packages to find the package. @@ -274,6 +286,12 @@ c:\temp\packages to find the package.
<maml:para>Displays all available versions of a package. The latest version of each package is listed by default. </maml:para>
</maml:description>
</command:parameter>
<command:parameter required="false" position="named">
<maml:name>IncludePrerelease</maml:name>
<maml:description>
<maml:para>Indicates whether to include prerelease packages in the returned results.</maml:para>
</maml:description>
</command:parameter>
</command:parameters>
<!-- Examples section -->
@ -554,6 +572,9 @@ Uninstalls the Elmah package even if another package depends on it. @@ -554,6 +572,9 @@ Uninstalls the Elmah package even if another package depends on it.
<maml:name>Source</maml:name>
<command:parameterValue required="true">string</command:parameterValue>
</command:parameter>
<command:parameter required="false" position="named">
<maml:name>IncludePrerelease</maml:name>
</command:parameter>
</command:syntaxItem>
</command:syntax>
@ -608,6 +629,12 @@ Uninstalls the Elmah package even if another package depends on it. @@ -608,6 +629,12 @@ Uninstalls the Elmah package even if another package depends on it.
string
</command:parameterValue>
</command:parameter>
<command:parameter required="false" position="named">
<maml:name>IncludePrerelease</maml:name>
<maml:description>
<maml:para>Indicates whether to include prereleases when searching for updates. If omitted, only stable packages are considered.</maml:para>
</maml:description>
</command:parameter>
</command:parameters>
<command:examples>

BIN
src/AddIns/Misc/PackageManagement/RequiredLibraries/NuGet.Core.dll

Binary file not shown.

22
src/AddIns/Misc/PackageManagement/Test/Src/AvailablePackagesViewModelTests.cs

@ -113,15 +113,15 @@ namespace PackageManagement.Tests @@ -113,15 +113,15 @@ namespace PackageManagement.Tests
var package1 = new FakePackage() {
Id = "Test",
Version = new Version(0, 1, 0, 0)
Version = new SemanticVersion(0, 1, 0, 0)
};
var package2 = new FakePackage() {
Id = "Test",
Version = new Version(0, 2, 0, 0)
Version = new SemanticVersion(0, 2, 0, 0)
};
var package3 = new FakePackage() {
Id = "Test",
Version = new Version(0, 3, 0, 0)
Version = new SemanticVersion(0, 3, 0, 0)
};
var packages = new FakePackage[] {
package1, package2, package3
@ -154,17 +154,17 @@ namespace PackageManagement.Tests @@ -154,17 +154,17 @@ namespace PackageManagement.Tests
var package1 = new FakePackage() {
Id = "Test",
Description = "",
Version = new Version(0, 1, 0, 0)
Version = new SemanticVersion(0, 1, 0, 0)
};
var package2 = new FakePackage() {
Id = "Test",
Description = "",
Version = new Version(0, 2, 0, 0)
Version = new SemanticVersion(0, 2, 0, 0)
};
var package3 = new FakePackage() {
Id = "Test",
Description = "",
Version = new Version(0, 3, 0, 0)
Version = new SemanticVersion(0, 3, 0, 0)
};
var packages = new FakePackage[] {
package1, package2, package3
@ -192,22 +192,22 @@ namespace PackageManagement.Tests @@ -192,22 +192,22 @@ namespace PackageManagement.Tests
var package1 = new FakePackage() {
Id = "First",
Description = "",
Version = new Version(0, 1, 0, 0)
Version = new SemanticVersion(0, 1, 0, 0)
};
var package2 = new FakePackage() {
Id = "Secon",
Id = "Second",
Description = "",
Version = new Version(0, 2, 0, 0)
Version = new SemanticVersion(0, 2, 0, 0)
};
var package3 = new FakePackage() {
Id = "Test",
Description = "",
Version = new Version(0, 3, 0, 0)
Version = new SemanticVersion(0, 3, 0, 0)
};
var package4 = new FakePackage() {
Id = "Test",
Description = "",
Version = new Version(0, 4, 0, 0)
Version = new SemanticVersion(0, 4, 0, 0)
};
var packages = new FakePackage[] {
package1, package2, package3, package4

4
src/AddIns/Misc/PackageManagement/Test/Src/Helpers/ExceptionThrowingPackageManagementProject.cs

@ -25,12 +25,12 @@ namespace PackageManagement.Tests.Helpers @@ -25,12 +25,12 @@ namespace PackageManagement.Tests.Helpers
throw ExceptionToThrowWhenCreateUninstallPackageActionCalled;
}
public override IEnumerable<PackageOperation> GetInstallPackageOperations(IPackage package, bool ignoreDependencies)
public override IEnumerable<PackageOperation> GetInstallPackageOperations(IPackage package, bool ignoreDependencies, bool allowPrereleaseVersions)
{
if (ExceptionToThrowWhenGetInstallPackageOperationsCalled != null) {
throw ExceptionToThrowWhenGetInstallPackageOperationsCalled;
}
return base.GetInstallPackageOperations(package, ignoreDependencies);
return base.GetInstallPackageOperations(package, ignoreDependencies, allowPrereleaseVersions);
}
}
}

3
src/AddIns/Misc/PackageManagement/Test/Src/Helpers/FakePackageOperationResolverFactory.cs

@ -19,7 +19,8 @@ namespace PackageManagement.Tests.Helpers @@ -19,7 +19,8 @@ namespace PackageManagement.Tests.Helpers
IPackageRepository localRepository,
IPackageRepository sourceRepository,
ILogger logger,
bool ignoreDependencies)
bool ignoreDependencies,
bool allowPrereleaseVersions)
{
LocalRepositoryPassedToCreateInstallPackageOperationsResolver = localRepository;
SourceRepositoryPassedToCreateInstallPackageOperationsResolver = sourceRepository;

6
src/AddIns/Misc/PackageManagement/Test/Src/Helpers/FakePackagePathResolver.cs

@ -18,17 +18,17 @@ namespace PackageManagement.Tests.Helpers @@ -18,17 +18,17 @@ namespace PackageManagement.Tests.Helpers
throw new NotImplementedException();
}
public string GetPackageFileName(IPackage package)
public string GetPackageDirectory(string packageId, SemanticVersion version)
{
throw new NotImplementedException();
}
public string GetPackageDirectory(string packageId, Version version)
public string GetPackageFileName(IPackage package)
{
throw new NotImplementedException();
}
public string GetPackageFileName(string packageId, Version version)
public string GetPackageFileName(string packageId, SemanticVersion version)
{
throw new NotImplementedException();
}

4
src/AddIns/Misc/PackageManagement/Test/Src/Helpers/FakePackageReferenceFile.cs

@ -14,7 +14,7 @@ namespace PackageManagement.Tests.Helpers @@ -14,7 +14,7 @@ namespace PackageManagement.Tests.Helpers
public void AddFakePackageReference(string packageId, string version)
{
var packageReference = new PackageReference(packageId, new Version(version), null);
var packageReference = new PackageReference(packageId, new SemanticVersion(version), null);
FakePackageReferences.Add(packageReference);
}
@ -25,7 +25,7 @@ namespace PackageManagement.Tests.Helpers @@ -25,7 +25,7 @@ namespace PackageManagement.Tests.Helpers
public List<PackageReference> EntriesDeleted = new List<PackageReference>();
public void DeleteEntry(string id, Version version)
public void DeleteEntry(string id, SemanticVersion version)
{
var packageReference = new PackageReference(id, version, null);
EntriesDeleted.Add(packageReference);

13
src/AddIns/Misc/PackageManagement/Test/Src/Helpers/FakePackageTests.cs

@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
using System;
using ICSharpCode.PackageManagement;
using ICSharpCode.PackageManagement.Design;
using NuGet;
using NUnit.Framework;
namespace PackageManagement.Tests
@ -25,9 +26,9 @@ namespace PackageManagement.Tests @@ -25,9 +26,9 @@ namespace PackageManagement.Tests
public void Equals_IdAndVersionAreSame_ReturnsTrue()
{
lhs.Id = "Test";
lhs.Version = new Version(1, 0, 0, 0);
lhs.Version = new SemanticVersion(1, 0, 0, 0);
rhs.Id = "Test";
rhs.Version = new Version(1, 0, 0, 0);
rhs.Version = new SemanticVersion(1, 0, 0, 0);
bool result = lhs.Equals(rhs);
@ -38,9 +39,9 @@ namespace PackageManagement.Tests @@ -38,9 +39,9 @@ namespace PackageManagement.Tests
public void Equals_DifferentIds_ReturnsFalse()
{
lhs.Id = "id 1";
lhs.Version = new Version(1, 0, 0, 0);
lhs.Version = new SemanticVersion(1, 0, 0, 0);
rhs.Id = "id 2";
rhs.Version = new Version(1, 0, 0, 0);
rhs.Version = new SemanticVersion(1, 0, 0, 0);
bool result = lhs.Equals(rhs);
@ -51,9 +52,9 @@ namespace PackageManagement.Tests @@ -51,9 +52,9 @@ namespace PackageManagement.Tests
public void Equals_DifferentVersions_ReturnsFalse()
{
lhs.Id = "test";
lhs.Version = new Version(1, 0, 0, 0);
lhs.Version = new SemanticVersion(1, 0, 0, 0);
rhs.Id = "test";
rhs.Version = new Version(2, 2, 0, 0);
rhs.Version = new SemanticVersion(2, 2, 0, 0);
bool result = lhs.Equals(rhs);

1
src/AddIns/Misc/PackageManagement/Test/Src/Helpers/FakeRecentPackageRepository.cs

@ -36,5 +36,6 @@ namespace PackageManagement.Tests.Helpers @@ -36,5 +36,6 @@ namespace PackageManagement.Tests.Helpers
}
public bool HasRecentPackages { get; set; }
public bool SupportsPrereleasePackages { get; set; }
}
}

4
src/AddIns/Misc/PackageManagement/Test/Src/Helpers/FakeSharedPackageRepository.cs

@ -15,9 +15,9 @@ namespace PackageManagement.Tests.Helpers @@ -15,9 +15,9 @@ namespace PackageManagement.Tests.Helpers
public List<string> PackageIdsReferences = new List<string>();
public string PackageIdPassedToIsReferenced;
public Version VersionPassedToIsReferenced;
public SemanticVersion VersionPassedToIsReferenced;
public bool IsReferenced(string packageId, Version version)
public bool IsReferenced(string packageId, SemanticVersion version)
{
PackageIdPassedToIsReferenced = packageId;
VersionPassedToIsReferenced = version;

2
src/AddIns/Misc/PackageManagement/Test/Src/Helpers/InstallPackageHelper.cs

@ -43,7 +43,7 @@ namespace PackageManagement.Tests.Helpers @@ -43,7 +43,7 @@ namespace PackageManagement.Tests.Helpers
public PackageSource PackageSource = new PackageSource("http://sharpdevelop/packages");
public bool IgnoreDependencies;
public Version Version;
public SemanticVersion Version;
public void InstallPackageById(string packageId)
{

4
src/AddIns/Misc/PackageManagement/Test/Src/Helpers/PackageReferenceRepositoryHelper.cs

@ -27,9 +27,7 @@ namespace PackageManagement.Tests.Helpers @@ -27,9 +27,7 @@ namespace PackageManagement.Tests.Helpers
FakeProjectSystem.FileExistsReturnValue = true;
FakeProjectSystem.FileToReturnFromOpenFile = config;
FakePackage package = new FakePackage();
package.Id = "Test";
package.Version = new Version(1, 0, 0, 0);
FakePackage package = new FakePackage("Test", "1.0.0.0");
FakeSharedSourceRepository.FakePackages.Add(package);
}

6
src/AddIns/Misc/PackageManagement/Test/Src/Helpers/TestableProjectManager.cs

@ -32,7 +32,7 @@ namespace PackageManagement.Tests.Helpers @@ -32,7 +32,7 @@ namespace PackageManagement.Tests.Helpers
{
}
public override void AddPackageReference(string packageId, Version version, bool ignoreDependencies)
public override void AddPackageReference(string packageId, SemanticVersion version, bool ignoreDependencies, bool allowPrereleaseVersions)
{
var package = new FakePackage();
package.Id = packageId;
@ -41,7 +41,7 @@ namespace PackageManagement.Tests.Helpers @@ -41,7 +41,7 @@ namespace PackageManagement.Tests.Helpers
IgnoreDependenciesPassedToAddPackageReference = ignoreDependencies;
}
public override void AddPackageReference(IPackage package, bool ignoreDependencies)
public override void AddPackageReference(IPackage package, bool ignoreDependencies, bool allowPrereleaseVersions)
{
PackagePassedToAddPackageReference = package;
IgnoreDependenciesPassedToAddPackageReference = ignoreDependencies;
@ -54,7 +54,7 @@ namespace PackageManagement.Tests.Helpers @@ -54,7 +54,7 @@ namespace PackageManagement.Tests.Helpers
RemoveDependenciesPassedToRemovePackageReference = removeDependencies;
}
public override void UpdatePackageReference(string packageId, Version version, bool updateDependencies)
public override void UpdatePackageReference(string packageId, SemanticVersion version, bool updateDependencies, bool allowPrereleaseVersions)
{
var package = new FakePackage();
package.Id = packageId;

2
src/AddIns/Misc/PackageManagement/Test/Src/Helpers/UninstallPackageHelper.cs

@ -28,7 +28,7 @@ namespace PackageManagement.Tests.Helpers @@ -28,7 +28,7 @@ namespace PackageManagement.Tests.Helpers
action.Execute();
}
public Version Version;
public SemanticVersion Version;
public PackageSource PackageSource = new PackageSource("http://sharpdevelop.net");
public bool ForceRemove;
public bool RemoveDependencies;

2
src/AddIns/Misc/PackageManagement/Test/Src/Helpers/UpdatePackageHelper.cs

@ -42,7 +42,7 @@ namespace PackageManagement.Tests.Helpers @@ -42,7 +42,7 @@ namespace PackageManagement.Tests.Helpers
public PackageSource PackageSource = new PackageSource("http://sharpdevelop/packages");
public bool UpdateDependencies;
public Version Version;
public SemanticVersion Version;
public void UpdatePackageById(string packageId)
{

6
src/AddIns/Misc/PackageManagement/Test/Src/InstallPackageActionTests.cs

@ -169,13 +169,13 @@ namespace PackageManagement.Tests @@ -169,13 +169,13 @@ namespace PackageManagement.Tests
CreateAction();
var recentPackage = AddOnePackageToProjectSourceRepository("PackageId");
recentPackage.Version = new Version("1.2.0");
recentPackage.Version = new SemanticVersion("1.2.0");
var oldPackage = AddOnePackageToProjectSourceRepository("PackageId");
oldPackage.Version = new Version("1.0.0");
oldPackage.Version = new SemanticVersion("1.0.0");
var package = AddOnePackageToProjectSourceRepository("PackageId");
var version = new Version("1.1.0");
var version = new SemanticVersion("1.1.0");
package.Version = version;
installPackageHelper.Version = version;

2
src/AddIns/Misc/PackageManagement/Test/Src/InstalledPackageViewModelTests.cs

@ -102,7 +102,7 @@ namespace PackageManagement.Tests @@ -102,7 +102,7 @@ namespace PackageManagement.Tests
void SetPackageIdAndVersion(string id, string version)
{
fakePackage.Id = id;
fakePackage.Version = new Version(version);
fakePackage.Version = new SemanticVersion(version);
}
[Test]

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

@ -167,13 +167,13 @@ namespace PackageManagement.Tests @@ -167,13 +167,13 @@ namespace PackageManagement.Tests
var oldPackage = new FakePackage() {
Id = "Test",
Version = new Version("1.0.0.0")
Version = new SemanticVersion("1.0.0.0")
};
fakeSolution.FakeProjectToReturnFromGetProject.FakePackages.Add(oldPackage);
var newPackage = new FakePackage() {
Id = "Test",
Version = new Version("2.0.0.0")
Version = new SemanticVersion("2.0.0.0")
};
fakeRegisteredPackageRepositories.FakeAggregateRepository.FakePackages.Add(newPackage);

24
src/AddIns/Misc/PackageManagement/Test/Src/PackageFromRepositoryTests.cs

@ -62,9 +62,9 @@ namespace PackageManagement.Tests @@ -62,9 +62,9 @@ namespace PackageManagement.Tests
public void Version_WrappedPackageVersionIsOnePointOne_ReturnsOnePointOne()
{
CreatePackage();
var expectedVersion = new Version("1.1");
var expectedVersion = new SemanticVersion("1.1");
fakePackage.Version = expectedVersion;
Version version = package.Version;
SemanticVersion version = package.Version;
Assert.AreEqual(expectedVersion, version);
}
@ -242,26 +242,6 @@ namespace PackageManagement.Tests @@ -242,26 +242,6 @@ namespace PackageManagement.Tests
Assert.AreEqual(10, count);
}
[Test]
public void RatingsCount_WrappedPackageRatingsCountIsTen_ReturnsTen()
{
CreatePackage();
fakePackage.RatingsCount = 10;
int count = package.RatingsCount;
Assert.AreEqual(10, count);
}
[Test]
public void Rating_WrappedPackageRatingIsFive_ReturnsFive()
{
CreatePackage();
fakePackage.Rating = 5.0;
double rating = package.Rating;
Assert.AreEqual(5.0, rating);
}
[Test]
public void GetStream_WrappedPackageHasStream_ReturnsWrappedPackageStream()
{

2
src/AddIns/Misc/PackageManagement/Test/Src/PackageManagementOptionsTests.cs

@ -67,7 +67,7 @@ namespace PackageManagement.Tests @@ -67,7 +67,7 @@ namespace PackageManagement.Tests
RecentPackageInfo AddRecentPackageToOptions(string id, string version)
{
var recentPackage = new RecentPackageInfo(id, new Version(version));
var recentPackage = new RecentPackageInfo(id, new SemanticVersion(version));
options.RecentPackages.Add(recentPackage);
return recentPackage;
}

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

@ -121,7 +121,7 @@ namespace PackageManagement.Tests @@ -121,7 +121,7 @@ namespace PackageManagement.Tests
CreateProject();
var package = new FakePackage();
project.GetInstallPackageOperations(package, true);
project.GetInstallPackageOperations(package, true, false);
Assert.IsTrue(fakePackageManager.IgnoreDependenciesPassedToGetInstallPackageOperations);
}
@ -132,7 +132,7 @@ namespace PackageManagement.Tests @@ -132,7 +132,7 @@ namespace PackageManagement.Tests
CreateProject();
var package = new FakePackage();
project.GetInstallPackageOperations(package, false);
project.GetInstallPackageOperations(package, false, false);
Assert.IsFalse(fakePackageManager.IgnoreDependenciesPassedToGetInstallPackageOperations);
}
@ -143,7 +143,7 @@ namespace PackageManagement.Tests @@ -143,7 +143,7 @@ namespace PackageManagement.Tests
CreateProject();
var expectedPackage = new FakePackage();
project.GetInstallPackageOperations(expectedPackage, true);
project.GetInstallPackageOperations(expectedPackage, true, false);
IPackage actualPackage = fakePackageManager.PackagePassedToGetInstallPackageOperations;
@ -156,7 +156,7 @@ namespace PackageManagement.Tests @@ -156,7 +156,7 @@ namespace PackageManagement.Tests
CreateProject();
var package = new FakePackage();
IEnumerable<PackageOperation> operations = project.GetInstallPackageOperations(package, true);
IEnumerable<PackageOperation> operations = project.GetInstallPackageOperations(package, true, false);
IEnumerable<PackageOperation> expectedOperations = fakePackageManager.PackageOperationsToReturnFromGetInstallPackageOperations;
@ -191,7 +191,7 @@ namespace PackageManagement.Tests @@ -191,7 +191,7 @@ namespace PackageManagement.Tests
CreateProject();
var package = new FakePackage();
project.InstallPackage(package, null, true);
project.InstallPackage(package, null, true, false);
IPackage expectedPackage = fakePackageManager.PackagePassedToInstallPackage;
@ -202,7 +202,7 @@ namespace PackageManagement.Tests @@ -202,7 +202,7 @@ namespace PackageManagement.Tests
public void InstallPackage_IgnoreDependenciesIsTrue_DependenciesAreIgnoredWhenPackageIsInstalled()
{
CreateProject();
project.InstallPackage(null, null, true);
project.InstallPackage(null, null, true, false);
Assert.IsTrue(fakePackageManager.IgnoreDependenciesPassedToInstallPackage);
}
@ -211,7 +211,7 @@ namespace PackageManagement.Tests @@ -211,7 +211,7 @@ namespace PackageManagement.Tests
public void InstallPackage_IgnoreDependenciesIsFalse_DependenciesAreNotIgnoredWhenPackageIsInstalled()
{
CreateProject();
project.InstallPackage(null, null, false);
project.InstallPackage(null, null, false, false);
Assert.IsFalse(fakePackageManager.IgnoreDependenciesPassedToInstallPackage);
}
@ -221,7 +221,7 @@ namespace PackageManagement.Tests @@ -221,7 +221,7 @@ namespace PackageManagement.Tests
{
CreateProject();
var expectedOperations = new List<PackageOperation>();
project.InstallPackage(null, expectedOperations, false);
project.InstallPackage(null, expectedOperations, false, false);
IEnumerable<PackageOperation> actualOperations = fakePackageManager.PackageOperationsPassedToInstallPackage;
@ -292,7 +292,7 @@ namespace PackageManagement.Tests @@ -292,7 +292,7 @@ namespace PackageManagement.Tests
CreateProject();
var package = new FakePackage();
project.UpdatePackage(package, null, true);
project.UpdatePackage(package, null, true, false);
IPackage expectedPackage = fakePackageManager.PackagePassedToUpdatePackage;
@ -303,7 +303,7 @@ namespace PackageManagement.Tests @@ -303,7 +303,7 @@ namespace PackageManagement.Tests
public void UpdatePackage_UpdateDependenciesIsTrue_DependenciesUpdatedWhenPackageIsUpdated()
{
CreateProject();
project.UpdatePackage(null, null, true);
project.UpdatePackage(null, null, true, false);
Assert.IsTrue(fakePackageManager.UpdateDependenciesPassedToUpdatePackage);
}
@ -312,7 +312,7 @@ namespace PackageManagement.Tests @@ -312,7 +312,7 @@ namespace PackageManagement.Tests
public void UpdatePackage_UpdateDependenciesIsFalse_DependenciesAreNotUpdatedWhenPackageIsUpdated()
{
CreateProject();
project.UpdatePackage(null, null, false);
project.UpdatePackage(null, null, false, false);
Assert.IsFalse(fakePackageManager.UpdateDependenciesPassedToUpdatePackage);
}
@ -322,7 +322,7 @@ namespace PackageManagement.Tests @@ -322,7 +322,7 @@ namespace PackageManagement.Tests
{
CreateProject();
var expectedOperations = new List<PackageOperation>();
project.UpdatePackage(null, expectedOperations, false);
project.UpdatePackage(null, expectedOperations, false, false);
IEnumerable<PackageOperation> actualOperations = fakePackageManager.PackageOperationsPassedToUpdatePackage;

4
src/AddIns/Misc/PackageManagement/Test/Src/PackageReferenceInstallerTests.cs

@ -38,7 +38,7 @@ namespace PackageManagement.Tests @@ -38,7 +38,7 @@ namespace PackageManagement.Tests
void AddPackageReference(string packageId, string version)
{
var packageReference = new PackageReference(packageId, new Version(version), null);
var packageReference = new PackageReference(packageId, new SemanticVersion(version), null);
packageReferences.Add(packageReference);
}
@ -52,7 +52,7 @@ namespace PackageManagement.Tests @@ -52,7 +52,7 @@ namespace PackageManagement.Tests
var actions = new List<ProcessPackageAction>(fakeActionRunner.ActionsRunInOneCall);
var action = actions[0] as InstallPackageAction;
var expectedVersion = new Version("1.3.4.5");
var expectedVersion = new SemanticVersion("1.3.4.5");
Assert.AreEqual("PackageId", action.PackageId);
Assert.AreEqual(expectedVersion, action.PackageVersion);

2
src/AddIns/Misc/PackageManagement/Test/Src/PackageRepositoryCacheTests.cs

@ -59,7 +59,7 @@ namespace PackageManagement.Tests @@ -59,7 +59,7 @@ namespace PackageManagement.Tests
RecentPackageInfo AddOneRecentPackage()
{
var recentPackage = new RecentPackageInfo("Id", new Version("1.0"));
var recentPackage = new RecentPackageInfo("Id", new SemanticVersion("1.0"));
packageSourcesHelper.Options.RecentPackages.Add(recentPackage);
return recentPackage;
}

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

@ -94,7 +94,7 @@ namespace PackageManagement.Tests @@ -94,7 +94,7 @@ namespace PackageManagement.Tests
void SetPackageIdAndVersion(string id, string version)
{
fakePackage.Id = id;
fakePackage.Version = new Version(version);
fakePackage.Version = new SemanticVersion(version);
}
void UserCancelsProjectSelection()
@ -512,7 +512,7 @@ namespace PackageManagement.Tests @@ -512,7 +512,7 @@ namespace PackageManagement.Tests
CreateViewModel();
viewModel.AddOneFakeInstallPackageOperationForViewModelPackage();
fakePackage.Id = "Test.Package";
fakePackage.Version = new Version(1, 2, 0, 55);
fakePackage.Version = new SemanticVersion(1, 2, 0, 55);
viewModel.AddPackage();
string expectedMessage = "------- Installing...Test.Package 1.2.0.55 -------";
@ -553,7 +553,7 @@ namespace PackageManagement.Tests @@ -553,7 +553,7 @@ namespace PackageManagement.Tests
CreateViewModel();
viewModel.AddOneFakeInstallPackageOperationForViewModelPackage();
fakePackage.Id = "Test.Package";
fakePackage.Version = new Version(1, 2, 0, 55);
fakePackage.Version = new SemanticVersion(1, 2, 0, 55);
viewModel.RemovePackage();
string expectedMessage = "------- Uninstalling...Test.Package 1.2.0.55 -------";
@ -1134,7 +1134,7 @@ namespace PackageManagement.Tests @@ -1134,7 +1134,7 @@ namespace PackageManagement.Tests
CreateViewModelWithTwoProjectsSelected("Project A", "Project B");
UserAcceptsProjectSelection();
fakePackage.Id = "Test.Package";
fakePackage.Version = new Version(1, 2, 0, 55);
fakePackage.Version = new SemanticVersion(1, 2, 0, 55);
viewModel.ManagePackage();
string expectedMessage = "------- Managing...Test.Package 1.2.0.55 -------";

14
src/AddIns/Misc/PackageManagement/Test/Src/RecentPackageInfoTests.cs

@ -5,9 +5,11 @@ using System; @@ -5,9 +5,11 @@ using System;
using System.IO;
using System.Text;
using System.Xml;
using ICSharpCode.Core;
using ICSharpCode.PackageManagement;
using ICSharpCode.PackageManagement.Design;
using NuGet;
using NUnit.Framework;
namespace PackageManagement.Tests
@ -18,7 +20,7 @@ namespace PackageManagement.Tests @@ -18,7 +20,7 @@ namespace PackageManagement.Tests
[Test]
public void ToString_IdAndVersionSpecified_ContainsIdAndVersion()
{
var recentPackageInfo = new RecentPackageInfo("id", new Version("1.0"));
var recentPackageInfo = new RecentPackageInfo("id", new SemanticVersion("1.0"));
string actual = recentPackageInfo.ToString();
@ -30,7 +32,7 @@ namespace PackageManagement.Tests @@ -30,7 +32,7 @@ namespace PackageManagement.Tests
public void IsMatch_PackageWithSameIdAndVersionPassed_ReturnsTrue()
{
string id = "id";
var version = new Version(1, 0);
var version = new SemanticVersion(1, 0, 0, 0);
var recentPackageInfo = new RecentPackageInfo(id, version);
var package = new FakePackage(id);
package.Version = version;
@ -44,10 +46,10 @@ namespace PackageManagement.Tests @@ -44,10 +46,10 @@ namespace PackageManagement.Tests
public void IsMatch_PackageWithSameIdButDifferentVersionPassed_ReturnsFalse()
{
string id = "id";
var version = new Version(1, 0);
var version = new SemanticVersion(1, 0, 0, 0);
var recentPackageInfo = new RecentPackageInfo(id, version);
var package = new FakePackage(id);
package.Version = new Version(2, 0);
package.Version = new SemanticVersion(2, 0, 0, 0);
bool result = recentPackageInfo.IsMatch(package);
@ -57,7 +59,7 @@ namespace PackageManagement.Tests @@ -57,7 +59,7 @@ namespace PackageManagement.Tests
[Test]
public void IsMatch_PackageWithDifferentIdButSameVersionPassed_ReturnsFalse()
{
var version = new Version(1, 0);
var version = new SemanticVersion(1, 0, 0, 0);
var recentPackageInfo = new RecentPackageInfo("id", version);
var package = new FakePackage("different-id");
package.Version = version;
@ -70,7 +72,7 @@ namespace PackageManagement.Tests @@ -70,7 +72,7 @@ namespace PackageManagement.Tests
[Test]
public void Version_SerializeThenDeserializeRecentPackageInfoInPropertiesObject_ReturnsSameValueAfterDeserialization()
{
var version = new Version(1, 0);
var version = new SemanticVersion(1, 0, 0, 0);
var recentPackageInfo = new RecentPackageInfo("id", version);
var properties = new Properties();
properties.Set<RecentPackageInfo>("RecentPackageInfo", recentPackageInfo);

2
src/AddIns/Misc/PackageManagement/Test/Src/RecentPackageRepositoryTests.cs

@ -197,7 +197,7 @@ namespace PackageManagement.Tests @@ -197,7 +197,7 @@ namespace PackageManagement.Tests
{
var package1 = CreateRepositoryWithOneRecentPackageSavedInOptions();
var package2 = new FakePackage(package1.Id);
package2.Version = new Version(2, 0);
package2.Version = new SemanticVersion(2, 0, 0, 0);
aggregateRepository.FakePackages.Add(package2);
var recentPackages = repository.GetPackages();

6
src/AddIns/Misc/PackageManagement/Test/Src/SharpDevelopPackageManagerFactoryTests.cs

@ -77,7 +77,7 @@ namespace PackageManagement.Tests @@ -77,7 +77,7 @@ namespace PackageManagement.Tests
CreatePackageManager();
FakePackage package = new FakePackage("Test.Package");
package.Version = new Version(1, 0, 0, 0);
package.Version = new SemanticVersion(1, 0, 0, 0);
string expectedDirectory = @"c:\projects\MyProject\MyPackages\Test.Package.1.0.0.0";
string actualDirectory =
fakePackageRepositoryFactory
@ -106,9 +106,7 @@ namespace PackageManagement.Tests @@ -106,9 +106,7 @@ namespace PackageManagement.Tests
options.PackagesDirectory = "packages";
CreatePackageManager();
FakePackage package = new FakePackage();
package.Id = "TestPackage";
package.Version = new Version(1, 0, 0, 0);
var package = new FakePackage("TestPackage", "1.0.0.0");
string expectedDirectory = @"c:\projects\MyProject\packages\TestPackage.1.0.0.0";

27
src/AddIns/Misc/PackageManagement/Test/Src/SharpDevelopPackageManagerTests.cs

@ -78,10 +78,7 @@ namespace PackageManagement.Tests @@ -78,10 +78,7 @@ namespace PackageManagement.Tests
FakePackage CreateFakePackage()
{
var package = new FakePackage();
package.Id = "Test";
package.Version = new Version(1, 0, 0, 0);
return package;
return new FakePackage("Test", "1.0.0.0");
}
FakePackage InstallPackage()
@ -105,7 +102,7 @@ namespace PackageManagement.Tests @@ -105,7 +102,7 @@ namespace PackageManagement.Tests
{
FakePackage package = CreateFakePackage();
var operations = new List<PackageOperation>();
packageManager.InstallPackage(package, operations, ignoreDependencies);
packageManager.InstallPackage(package, operations, ignoreDependencies, false);
return package;
}
@ -115,21 +112,21 @@ namespace PackageManagement.Tests @@ -115,21 +112,21 @@ namespace PackageManagement.Tests
operation
};
FakePackage package = CreateFakePackage();
packageManager.InstallPackage(package, operations, false);
packageManager.InstallPackage(package, operations, false, false);
return package;
}
FakePackage InstallPackageAndIgnoreDependencies()
{
FakePackage package = CreateFakePackage();
packageManager.InstallPackage(package, true);
packageManager.InstallPackage(package, true, false);
return package;
}
FakePackage InstallPackageAndDoNotIgnoreDependencies()
{
FakePackage package = CreateFakePackage();
packageManager.InstallPackage(package, false);
packageManager.InstallPackage(package, false, false);
return package;
}
@ -176,19 +173,19 @@ namespace PackageManagement.Tests @@ -176,19 +173,19 @@ namespace PackageManagement.Tests
IEnumerable<PackageOperation> GetInstallPackageOperations(FakePackage package)
{
return packageManager.GetInstallPackageOperations(package, false);
return packageManager.GetInstallPackageOperations(package, false, false);
}
IEnumerable<PackageOperation> GetInstallPackageOperationsAndIgnoreDependencies(FakePackage package)
{
return packageManager.GetInstallPackageOperations(package, true);
return packageManager.GetInstallPackageOperations(package, true, false);
}
FakePackage UpdatePackageWithNoPackageOperations()
{
FakePackage package = CreateFakePackage();
var operations = new List<PackageOperation>();
packageManager.UpdatePackage(package, operations, true);
packageManager.UpdatePackage(package, operations, true, false);
return package;
}
@ -198,7 +195,7 @@ namespace PackageManagement.Tests @@ -198,7 +195,7 @@ namespace PackageManagement.Tests
operation
};
FakePackage package = CreateFakePackage();
packageManager.UpdatePackage(package, operations, true);
packageManager.UpdatePackage(package, operations, true, false);
return package;
}
@ -206,7 +203,7 @@ namespace PackageManagement.Tests @@ -206,7 +203,7 @@ namespace PackageManagement.Tests
{
FakePackage package = CreateFakePackage();
var operations = new List<PackageOperation>();
packageManager.UpdatePackage(package, operations, false);
packageManager.UpdatePackage(package, operations, false, false);
return package;
}
@ -447,9 +444,7 @@ namespace PackageManagement.Tests @@ -447,9 +444,7 @@ namespace PackageManagement.Tests
CreatePackageManager();
CreateTestableProjectManager();
FakePackage package = CreateFakePackage();
package.Id = "MyPackageId";
package.Version = new Version("1.4.5.2");
var package = new FakePackage("MyPackageId", "1.4.5.2");
testableProjectManager.FakeLocalRepository.FakePackages.Add(package);
fakeSolutionSharedRepository.FakePackages.Add(package);

9
src/AddIns/Misc/PackageManagement/Test/Src/SolutionPackageRepositoryTests.cs

@ -65,6 +65,12 @@ namespace PackageManagement.Tests @@ -65,6 +65,12 @@ namespace PackageManagement.Tests
return sharedRepository.AddFakePackage(packageId);
}
FakePackage AddPackageToSharedRepository(string packageId, string version)
{
FakeSharedPackageRepository sharedRepository = fakeRepositoryFactory.FakeSharedRepository;
return sharedRepository.AddFakePackageWithVersion(packageId, version);
}
[Test]
public void GetInstallPath_GetInstallPathForPackage_ReturnsPackagePathInsideSolutionPackagesRepository()
{
@ -101,8 +107,7 @@ namespace PackageManagement.Tests @@ -101,8 +107,7 @@ namespace PackageManagement.Tests
{
CreateSolution(@"d:\projects\myproject\myproject.sln");
CreateRepository(solution);
FakePackage package = AddPackageToSharedRepository("Test");
package.Version = new Version("1.0");
FakePackage package = AddPackageToSharedRepository("Test", "1.0");
List<IPackage> actualPackages = repository.GetPackagesByDependencyOrder().ToList();

19
src/AddIns/Misc/PackageManagement/Test/Src/UninstallPackageActionTests.cs

@ -32,6 +32,11 @@ namespace PackageManagement.Tests @@ -32,6 +32,11 @@ namespace PackageManagement.Tests
return fakeProject.FakeSourceRepository.AddFakePackage(packageId);
}
FakePackage AddOnePackageToProjectSourceRepository(string packageId, string version)
{
return fakeProject.FakeSourceRepository.AddFakePackageWithVersion(packageId, version);
}
void AddFileToPackageBeingUninstalled(string fileName)
{
var package = new FakePackage();
@ -149,17 +154,11 @@ namespace PackageManagement.Tests @@ -149,17 +154,11 @@ namespace PackageManagement.Tests
{
CreateAction();
var recentPackage = AddOnePackageToProjectSourceRepository("PackageId");
recentPackage.Version = new Version("1.2.0");
var oldPackage = AddOnePackageToProjectSourceRepository("PackageId");
oldPackage.Version = new Version("1.0.0");
var package = AddOnePackageToProjectSourceRepository("PackageId");
var version = new Version("1.1.0");
package.Version = version;
FakePackage recentPackage = AddOnePackageToProjectSourceRepository("PackageId", "1.2.0.0");
FakePackage oldPackage = AddOnePackageToProjectSourceRepository("PackageId", "1.0.0.0");
FakePackage package = AddOnePackageToProjectSourceRepository("PackageId", "1.1.0");
uninstallPackageHelper.Version = version;
uninstallPackageHelper.Version = package.Version;
uninstallPackageHelper.UninstallPackageById("PackageId");
var actualPackage = fakeProject.PackagePassedToUninstallPackage;

2
src/AddIns/Misc/PackageManagement/Test/Src/UpdateAllPackagesInProjectTests.cs

@ -84,7 +84,7 @@ namespace PackageManagement.Tests @@ -84,7 +84,7 @@ namespace PackageManagement.Tests
AddPackageToProject("Test");
CallCreateActions();
Version version = FirstUpdateAction.PackageVersion;
SemanticVersion version = FirstUpdateAction.PackageVersion;
Assert.IsNull(version);
}

8
src/AddIns/Misc/PackageManagement/Test/Src/UpdatePackageInAllProjectsTests.cs

@ -24,10 +24,10 @@ namespace PackageManagement.Tests @@ -24,10 +24,10 @@ namespace PackageManagement.Tests
void CreateUpdatePackageInAllProjects(string packageId)
{
CreateUpdatePackageInAllProjects(packageId, new Version("1.0"));
CreateUpdatePackageInAllProjects(packageId, new SemanticVersion("1.0"));
}
void CreateUpdatePackageInAllProjects(string packageId, Version version)
void CreateUpdatePackageInAllProjects(string packageId, SemanticVersion version)
{
fakeSolution = new FakePackageManagementSolution();
fakeSourceRepository = new FakePackageRepository();
@ -146,12 +146,12 @@ namespace PackageManagement.Tests @@ -146,12 +146,12 @@ namespace PackageManagement.Tests
[Test]
public void CreateActions_SolutionHasOneProject_PackageVersionSetInUpdateAction()
{
var expectedVersion = new Version("1.2.3.4");
var expectedVersion = new SemanticVersion("1.2.3.4");
CreateUpdatePackageInAllProjects("MyPackage", expectedVersion);
AddProjectToSolution("MyProject");
CallCreateActions();
Version version = FirstUpdateAction.PackageVersion;
SemanticVersion version = FirstUpdateAction.PackageVersion;
Assert.AreEqual(expectedVersion, version);
}

Loading…
Cancel
Save