Browse Source

Fix: Retrieving pre-release updates didn't work even if setting was activated.

pull/32/head
Andreas Weizel 13 years ago
parent
commit
5cf72492bc
  1. 1
      src/AddIns/Misc/AddInManager2/AddInManager2.Tests/AddInManager2.Tests.csproj
  2. 57
      src/AddIns/Misc/AddInManager2/AddInManager2.Tests/ExtensionsTests.cs
  3. 2
      src/AddIns/Misc/AddInManager2/Project/AddInManager2.csproj
  4. 14
      src/AddIns/Misc/AddInManager2/Project/Src/Extensions.cs
  5. 2
      src/AddIns/Misc/AddInManager2/Project/Src/ViewModel/NuGetAddInsViewModelBase.cs
  6. 2
      src/AddIns/Misc/AddInManager2/Project/Src/ViewModel/NuGetPackageViewModel.cs

1
src/AddIns/Misc/AddInManager2/AddInManager2.Tests/AddInManager2.Tests.csproj

@ -71,6 +71,7 @@ @@ -71,6 +71,7 @@
<Compile Include="AddInSetupTests.cs" />
<Compile Include="AvailableAddInsViewModelTests.cs" />
<Compile Include="Configuration\AssemblyInfo.cs" />
<Compile Include="ExtensionsTests.cs" />
<Compile Include="Fakes\FakeAddInManagerServices.cs" />
<Compile Include="Fakes\FakeAddInSetup.cs" />
<Compile Include="Fakes\FakeAddInTree.cs" />

57
src/AddIns/Misc/AddInManager2/AddInManager2.Tests/ExtensionsTests.cs

@ -0,0 +1,57 @@ @@ -0,0 +1,57 @@
// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
using System;
using NuGet;
using NUnit;
using NUnit.Framework;
namespace ICSharpCode.AddInManager2.Tests
{
public class ExtensionsTests
{
[Test]
public void SemanticVersionConvertShortVersion()
{
SemanticVersion semVersion = new SemanticVersion("2.1");
Version convertedVersion = semVersion.ToVersion();
Assert.That(convertedVersion.Major, Is.EqualTo(2));
Assert.That(convertedVersion.Minor, Is.EqualTo(1));
Assert.That(convertedVersion.Build, Is.EqualTo(-1));
Assert.That(convertedVersion.Revision, Is.EqualTo(-1));
}
[Test]
public void SemanticVersionConvertShortVersionWithZeros()
{
SemanticVersion semVersion = new SemanticVersion("2.1.0.0");
Version convertedVersion = semVersion.ToVersion();
Assert.That(convertedVersion.Major, Is.EqualTo(2));
Assert.That(convertedVersion.Minor, Is.EqualTo(1));
Assert.That(convertedVersion.Build, Is.EqualTo(0));
Assert.That(convertedVersion.Revision, Is.EqualTo(0));
}
[Test]
public void SemanticVersionConvertFullVersion()
{
SemanticVersion semVersion = new SemanticVersion("2.1.3.4");
Version convertedVersion = semVersion.ToVersion();
Assert.That(convertedVersion.Major, Is.EqualTo(2));
Assert.That(convertedVersion.Minor, Is.EqualTo(1));
Assert.That(convertedVersion.Build, Is.EqualTo(3));
Assert.That(convertedVersion.Revision, Is.EqualTo(4));
}
[Test]
public void SemanticVersionConvertFullVersionWithSpecial()
{
SemanticVersion semVersion = new SemanticVersion(new Version("2.1.3.4"), "56789");
Version convertedVersion = semVersion.ToVersion();
Assert.That(convertedVersion.Major, Is.EqualTo(2));
Assert.That(convertedVersion.Minor, Is.EqualTo(1));
Assert.That(convertedVersion.Build, Is.EqualTo(3));
Assert.That(convertedVersion.Revision, Is.EqualTo(4));
}
}
}

2
src/AddIns/Misc/AddInManager2/Project/AddInManager2.csproj

@ -94,7 +94,7 @@ @@ -94,7 +94,7 @@
<Compile Include="Src\BooleanToFontWeightConverter.cs" />
<Compile Include="Src\Commands.cs" />
<Compile Include="Src\DelegateCommand.cs" />
<Compile Include="Src\EnumerableExtensions.cs" />
<Compile Include="Src\Extensions.cs" />
<Compile Include="Src\Model\AcceptLicensesEventArgs.cs" />
<Compile Include="Src\Model\AddInDependency.cs" />
<Compile Include="Src\Model\AddInInstallationEventArgs.cs" />

14
src/AddIns/Misc/AddInManager2/Project/Src/EnumerableExtensions.cs → src/AddIns/Misc/AddInManager2/Project/Src/Extensions.cs

@ -31,4 +31,18 @@ namespace ICSharpCode.AddInManager2 @@ -31,4 +31,18 @@ namespace ICSharpCode.AddInManager2
}
}
}
public static class SemanticVersionExtensions
{
public static Version ToVersion(this SemanticVersion semanticVersion)
{
string versionString = semanticVersion.ToString();
if (!String.IsNullOrEmpty(semanticVersion.SpecialVersion))
{
// Remove special version from string (-1 for the "-" added before the version)
versionString = versionString.Substring(0, versionString.Length - semanticVersion.SpecialVersion.Length - 1);
}
return new Version(versionString);
}
}
}

2
src/AddIns/Misc/AddInManager2/Project/Src/ViewModel/NuGetAddInsViewModelBase.cs

@ -186,7 +186,7 @@ namespace ICSharpCode.AddInManager2.ViewModel @@ -186,7 +186,7 @@ namespace ICSharpCode.AddInManager2.ViewModel
protected virtual IEnumerable<IPackage> GetFilteredPackagesBeforePagingResults(IQueryable<IPackage> allPackages)
{
return GetBufferedPackages(allPackages)
.Where(package => package.IsReleaseVersion())
.Where(package => ShowPrereleases || package.IsReleaseVersion())
.DistinctLast(PackageEqualityComparer.Id);
}

2
src/AddIns/Misc/AddInManager2/Project/Src/ViewModel/NuGetPackageViewModel.cs

@ -257,7 +257,7 @@ namespace ICSharpCode.AddInManager2.ViewModel @@ -257,7 +257,7 @@ namespace ICSharpCode.AddInManager2.ViewModel
{
if (_package.Version != null)
{
return new Version(_package.Version.ToString());
return _package.Version.ToVersion();
}
else
{

Loading…
Cancel
Save