Browse Source

Update NuGet to version 2.8

4.x
Matt Ward 12 years ago
parent
commit
c4610ad114
  1. 2
      src/AddIns/Misc/PackageManagement/Cmdlets/Project/Src/GetPackageCmdlet.cs
  2. 4
      src/AddIns/Misc/PackageManagement/Project/Src/AvailablePackagesViewModel.cs
  3. 13
      src/AddIns/Misc/PackageManagement/Project/Src/Design/FakeFileSystem.cs
  4. 2
      src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackage.cs
  5. 18
      src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageManager.cs
  6. 2
      src/AddIns/Misc/PackageManagement/Project/Src/Design/FakePackageRepository.cs
  7. 23
      src/AddIns/Misc/PackageManagement/Project/Src/Design/FakeProjectManager.cs
  8. 4
      src/AddIns/Misc/PackageManagement/Project/Src/PackageFromRepository.cs
  9. 6
      src/AddIns/Misc/PackageManagement/Project/Src/PackageOperationsResolverFactory.cs
  10. 2
      src/AddIns/Misc/PackageManagement/Project/Src/RecentPackageRepository.cs
  11. 2
      src/AddIns/Misc/PackageManagement/Project/Src/SharpDevelopPackageManager.cs
  12. 2
      src/AddIns/Misc/PackageManagement/Project/Src/UpdatedPackages.cs
  13. BIN
      src/AddIns/Misc/PackageManagement/RequiredLibraries/Microsoft.Web.XmlTransform.dll
  14. 60
      src/AddIns/Misc/PackageManagement/RequiredLibraries/NuGet.Cmdlets.dll-Help.xml
  15. BIN
      src/AddIns/Misc/PackageManagement/RequiredLibraries/NuGet.Console.Types.dll
  16. BIN
      src/AddIns/Misc/PackageManagement/RequiredLibraries/NuGet.Core.dll
  17. BIN
      src/AddIns/Misc/PackageManagement/RequiredLibraries/NuGet.exe
  18. 1
      src/AddIns/Misc/PackageManagement/Test/Src/Helpers/FakeRecentPackageRepository.cs
  19. 4
      src/AddIns/Misc/PackageManagement/Test/Src/Helpers/Tests/PackageReferenceRepositoryTests.cs
  20. 12
      src/AddIns/Misc/PackageManagement/Test/Src/PackageFromRepositoryTests.cs

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

@ -96,7 +96,7 @@ namespace ICSharpCode.PackageManagement.Cmdlets @@ -96,7 +96,7 @@ namespace ICSharpCode.PackageManagement.Cmdlets
IEnumerable<IPackage> DistinctPackagesById(IQueryable<IPackage> packages)
{
if (ListAvailable && !AllVersions) {
return packages.DistinctLast(PackageEqualityComparer.Id);
return packages.DistinctLast<IPackage>(PackageEqualityComparer.Id);
}
return packages;
}

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

@ -57,11 +57,11 @@ namespace ICSharpCode.PackageManagement @@ -57,11 +57,11 @@ namespace ICSharpCode.PackageManagement
{
if (IncludePrerelease) {
return base.GetFilteredPackagesBeforePagingResults(allPackages)
.DistinctLast(PackageEqualityComparer.Id);
.DistinctLast<IPackage>(PackageEqualityComparer.Id);
}
return base.GetFilteredPackagesBeforePagingResults(allPackages)
.Where(package => package.IsReleaseVersion())
.DistinctLast(PackageEqualityComparer.Id);
.DistinctLast<IPackage>(PackageEqualityComparer.Id);
}
}
}

13
src/AddIns/Misc/PackageManagement/Project/Src/Design/FakeFileSystem.cs

@ -109,5 +109,18 @@ namespace ICSharpCode.PackageManagement.Design @@ -109,5 +109,18 @@ namespace ICSharpCode.PackageManagement.Design
{
throw new NotImplementedException();
}
public void DeleteFiles(IEnumerable<IPackageFile> files, string rootDir)
{
}
public void AddFiles(IEnumerable<IPackageFile> files, string rootDir)
{
}
public void MoveFile(string source, string destination)
{
throw new NotImplementedException();
}
}
}

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

@ -195,5 +195,7 @@ namespace ICSharpCode.PackageManagement.Design @@ -195,5 +195,7 @@ namespace ICSharpCode.PackageManagement.Design
public Version MinClientVersion { get; set; }
public Uri GalleryUrl { get; set; }
public bool DevelopmentDependency { get; set; }
}
}

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

@ -198,5 +198,23 @@ namespace ICSharpCode.PackageManagement.Design @@ -198,5 +198,23 @@ namespace ICSharpCode.PackageManagement.Design
{
throw new NotImplementedException();
}
public DependencyVersion DependencyVersion {
get {
throw new NotImplementedException();
}
set {
throw new NotImplementedException();
}
}
public bool WhatIf {
get {
throw new NotImplementedException();
}
set {
throw new NotImplementedException();
}
}
}
}

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

@ -57,5 +57,7 @@ namespace ICSharpCode.PackageManagement.Design @@ -57,5 +57,7 @@ namespace ICSharpCode.PackageManagement.Design
public bool HasRecentPackages { get; set; }
public bool SupportsPrereleasePackages { get; set; }
public PackageSaveModes PackageSaveMode { get; set; }
}
}

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

@ -125,5 +125,28 @@ namespace ICSharpCode.PackageManagement.Design @@ -125,5 +125,28 @@ namespace ICSharpCode.PackageManagement.Design
PackagePassedToHasOlderPackageInstalled = package;
return HasOlderPackageInstalledReturnValue;
}
public DependencyVersion DependencyVersion {
get {
throw new NotImplementedException();
}
set {
throw new NotImplementedException();
}
}
public bool WhatIf {
get {
throw new NotImplementedException();
}
set {
throw new NotImplementedException();
}
}
public void UpdatePackageReference(IPackage remotePackage, bool updateDependencies, bool allowPrereleaseVersions)
{
throw new NotImplementedException();
}
}
}

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

@ -192,5 +192,9 @@ namespace ICSharpCode.PackageManagement @@ -192,5 +192,9 @@ namespace ICSharpCode.PackageManagement
return null;
}
}
public bool DevelopmentDependency {
get { return package.DevelopmentDependency; }
}
}
}

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

@ -20,7 +20,8 @@ namespace ICSharpCode.PackageManagement @@ -20,7 +20,8 @@ namespace ICSharpCode.PackageManagement
null,
logger,
installAction.IgnoreDependencies,
installAction.AllowPrereleaseVersions);
installAction.AllowPrereleaseVersions,
DependencyVersion.Lowest);
}
public IPackageOperationResolver CreateUpdatePackageOperationResolver(IPackageRepository localRepository, IPackageRepository sourceRepository, ILogger logger, IUpdatePackageSettings settings)
@ -31,7 +32,8 @@ namespace ICSharpCode.PackageManagement @@ -31,7 +32,8 @@ namespace ICSharpCode.PackageManagement
null,
logger,
!settings.UpdateDependencies,
settings.AllowPrereleaseVersions);
settings.AllowPrereleaseVersions,
DependencyVersion.Lowest);
}
}
}

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

@ -166,5 +166,7 @@ namespace ICSharpCode.PackageManagement @@ -166,5 +166,7 @@ namespace ICSharpCode.PackageManagement
public bool SupportsPrereleasePackages {
get { return false; }
}
public PackageSaveModes PackageSaveMode { get; set; }
}
}

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

@ -45,7 +45,7 @@ namespace ICSharpCode.PackageManagement @@ -45,7 +45,7 @@ namespace ICSharpCode.PackageManagement
PackageReferenceRepository CreatePackageReferenceRepository()
{
var sharedRepository = LocalRepository as ISharedPackageRepository;
var packageRefRepository = new PackageReferenceRepository(projectSystem, sharedRepository);
var packageRefRepository = new PackageReferenceRepository(projectSystem, projectSystem.ProjectName, sharedRepository);
packageRefRepository.RegisterIfNecessary();
return packageRefRepository;
}

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

@ -60,7 +60,7 @@ namespace ICSharpCode.PackageManagement @@ -60,7 +60,7 @@ namespace ICSharpCode.PackageManagement
List<IPackage> packages = localPackages.ToList();
if (packages.Any()) {
packages.Sort(PackageComparer.Version);
return packages.Distinct(PackageEqualityComparer.Id).ToList();
return packages.Distinct<IPackage>(PackageEqualityComparer.Id).ToList();
}
return packages;
}

BIN
src/AddIns/Misc/PackageManagement/RequiredLibraries/Microsoft.Web.XmlTransform.dll

Binary file not shown.

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

@ -53,6 +53,12 @@ @@ -53,6 +53,12 @@
<command:parameter required="false" position="named">
<maml:name>FileConflictAction</maml:name>
</command:parameter>
<command:parameter required="false" position="named">
<maml:name>DependencyVersion</maml:name>
</command:parameter>
<command:parameter required="false" position="named">
<maml:name>WhatIf</maml:name>
</command:parameter>
</command:syntaxItem>
</command:syntax>
@ -107,12 +113,24 @@ @@ -107,12 +113,24 @@
<maml:para>Indicates whether this command will consider prerelease packages. If omitted, only stable packages are considered.</maml:para>
</maml:description>
</command:parameter>
<command:parameter required="false" position="named">
<maml:name>FileConflictAction</maml:name>
<maml:description>
<maml:para>Indicates what this command should do if a file from the package's content folder already exists in the project.</maml:para>
</maml:description>
</command:parameter>
<command:parameter required="false" position="named">
<maml:name>FileConflictAction</maml:name>
<maml:description>
<maml:para>Indicates what this command should do if a file from the package's content folder already exists in the project.</maml:para>
</maml:description>
</command:parameter>
<command:parameter required="false" position="named">
<maml:name>DependencyVersion</maml:name>
<maml:description>
<maml:para>Specifies which dependency package version to install. If omitted, this defaults to the lowest required version.</maml:para>
</maml:description>
</command:parameter>
<command:parameter required="false" position="named">
<maml:name>WhatIf</maml:name>
<maml:description>
<maml:para>Displays the actions that would be taken and the effect of the command, instead of executing the command.</maml:para>
</maml:description>
</command:parameter>
</command:parameters>
<!-- Examples section -->
@ -420,6 +438,9 @@ @@ -420,6 +438,9 @@
<maml:name>Version</maml:name>
<command:parameterValue required="true">string</command:parameterValue>
</command:parameter>
<command:parameter required="false" position="named">
<maml:name>WhatIf</maml:name>
</command:parameter>
</command:syntaxItem>
</command:syntax>
@ -465,6 +486,12 @@ @@ -465,6 +486,12 @@
string
</command:parameterValue>
</command:parameter>
<command:parameter required="false" position="named">
<maml:name>WhatIf</maml:name>
<maml:description>
<maml:para>Displays the actions that would be taken and the effect of the command, instead of executing the command.</maml:para>
</maml:description>
</command:parameter>
</command:parameters>
<command:examples>
@ -580,6 +607,9 @@ @@ -580,6 +607,9 @@
<command:parameter required="false" position="named">
<maml:name>FileConflictAction</maml:name>
</command:parameter>
<command:parameter required="false" position="named">
<maml:name>WhatIf</maml:name>
</command:parameter>
</command:syntaxItem>
</command:syntax>
@ -646,12 +676,18 @@ @@ -646,12 +676,18 @@
<maml:para>Reinstall packages with the existing versions.</maml:para>
</maml:description>
</command:parameter>
<command:parameter required="false" position="named">
<maml:name>FileConflictAction</maml:name>
<maml:description>
<maml:para>Indicates what this command should do if a file from the package's content folder already exists in the project.</maml:para>
</maml:description>
</command:parameter>
<command:parameter required="false" position="named">
<maml:name>FileConflictAction</maml:name>
<maml:description>
<maml:para>Indicates what this command should do if a file from the package's content folder already exists in the project.</maml:para>
</maml:description>
</command:parameter>
<command:parameter required="false" position="named">
<maml:name>WhatIf</maml:name>
<maml:description>
<maml:para>Displays the actions that would be taken and the effect of the command, instead of executing the command.</maml:para>
</maml:description>
</command:parameter>
</command:parameters>
<command:examples>

BIN
src/AddIns/Misc/PackageManagement/RequiredLibraries/NuGet.Console.Types.dll

Binary file not shown.

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

Binary file not shown.

BIN
src/AddIns/Misc/PackageManagement/RequiredLibraries/NuGet.exe

Binary file not shown.

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

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

4
src/AddIns/Misc/PackageManagement/Test/Src/Helpers/Tests/PackageReferenceRepositoryTests.cs

@ -24,7 +24,7 @@ namespace PackageManagement.Tests.Helpers.Tests @@ -24,7 +24,7 @@ namespace PackageManagement.Tests.Helpers.Tests
fakeFileSystem = helper.FakeProjectSystem;
fakeFileSystem.PathToReturnFromGetFullPath = path;
sourceRepository = helper.FakeSharedSourceRepository;
repository = new PackageReferenceRepository(fakeFileSystem, sourceRepository);
repository = new PackageReferenceRepository(fakeFileSystem, helper.FakeProjectSystem.ProjectName, sourceRepository);
}
[Test]
@ -32,7 +32,7 @@ namespace PackageManagement.Tests.Helpers.Tests @@ -32,7 +32,7 @@ namespace PackageManagement.Tests.Helpers.Tests
{
string expectedPath = @"d:\temp";
CreatePackageReferenceRepository(expectedPath);
repository.RegisterIfNecessary();
Assert.AreEqual(expectedPath, sourceRepository.PathPassedToRegisterRepository);

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

@ -431,5 +431,17 @@ namespace PackageManagement.Tests @@ -431,5 +431,17 @@ namespace PackageManagement.Tests
Assert.AreEqual(expectedReferences, result);
}
[Test]
public void DevelopmentDependency_PackageHasDevelopmentDependencySetToTrue_ReturnsWrappedPackageDevelopmentDependency()
{
CreatePackage();
var expectedVersion = new Version("1.1");
fakePackage.DevelopmentDependency = true;
bool dependency = package.DevelopmentDependency;
Assert.IsTrue(dependency);
}
}
}

Loading…
Cancel
Save