Browse Source

Github releases: ensure versions are listed by semantic compare

pull/4782/head
Yunus Emre Kalkan 6 years ago
parent
commit
33b53d012e
  1. 5
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/NuGetService.cs
  2. 3
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmPackagesUpdater.cs
  3. 2
      modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs
  4. 1
      modules/docs/src/Volo.Docs.Web/Volo.Docs.Web.csproj

5
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/NuGetService.cs

@ -78,11 +78,12 @@ namespace Volo.Abp.Cli.NuGet
var versions = JsonSerializer var versions = JsonSerializer
.Deserialize<NuGetVersionResultDto>(responseContent) .Deserialize<NuGetVersionResultDto>(responseContent)
.Versions .Versions
.Select(SemanticVersion.Parse); .Select(SemanticVersion.Parse)
.OrderByDescending(v=> v, new VersionComparer()).ToList();
if (!includePreviews && !includeNightly && !includeReleaseCandidates) if (!includePreviews && !includeNightly && !includeReleaseCandidates)
{ {
versions = versions.Where(x => !x.IsPrerelease); versions = versions.Where(x => !x.IsPrerelease).ToList();
} }
var semanticVersions = versions.ToList(); var semanticVersions = versions.ToList();

3
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmPackagesUpdater.cs

@ -10,6 +10,7 @@ using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions; using Microsoft.Extensions.Logging.Abstractions;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using NuGet.Versioning;
using Volo.Abp.Cli.Http; using Volo.Abp.Cli.Http;
using Volo.Abp.Cli.Utils; using Volo.Abp.Cli.Utils;
using Volo.Abp.DependencyInjection; using Volo.Abp.DependencyInjection;
@ -259,6 +260,8 @@ namespace Volo.Abp.Cli.ProjectModification
var versionListAsJson = CmdHelper.RunCmdAndGetOutput($"npm show {package.Name} versions"); var versionListAsJson = CmdHelper.RunCmdAndGetOutput($"npm show {package.Name} versions");
var versionList = JsonConvert.DeserializeObject<string[]>(versionListAsJson); var versionList = JsonConvert.DeserializeObject<string[]>(versionListAsJson);
versionList = versionList.OrderByDescending(SemanticVersion.Parse, new VersionComparer()).ToArray();
var newVersion = includeReleaseCandidates var newVersion = includeReleaseCandidates
? versionList.Last() ? versionList.Last()
: versionList.LastOrDefault(v => v.Split("-").Length < 2); : versionList.LastOrDefault(v => v.Split("-").Length < 2);

2
modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs

@ -17,6 +17,7 @@ using Volo.Docs.HtmlConverting;
using Volo.Docs.Models; using Volo.Docs.Models;
using Volo.Docs.Projects; using Volo.Docs.Projects;
using Volo.Docs.Utils; using Volo.Docs.Utils;
using NuGet.Versioning;
namespace Volo.Docs.Pages.Documents.Project namespace Volo.Docs.Pages.Documents.Project
{ {
@ -252,6 +253,7 @@ namespace Volo.Docs.Pages.Documents.Project
var output = await _projectAppService.GetVersionsAsync(Project.ShortName); var output = await _projectAppService.GetVersionsAsync(Project.ShortName);
var versions = output.Items var versions = output.Items
.OrderByDescending(i => SemanticVersion.Parse(i.Name), new VersionComparer())
.Select(v => new VersionInfoViewModel(v.DisplayName, v.Name)) .Select(v => new VersionInfoViewModel(v.DisplayName, v.Name))
.ToList(); .ToList();

1
modules/docs/src/Volo.Docs.Web/Volo.Docs.Web.csproj

@ -25,6 +25,7 @@
<PackageReference Include="Markdig.Signed" Version="0.20.0" /> <PackageReference Include="Markdig.Signed" Version="0.20.0" />
<PackageReference Include="Scriban" Version="2.1.3" /> <PackageReference Include="Scriban" Version="2.1.3" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.1.5" /> <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.1.5" />
<PackageReference Include="NuGet.Versioning" Version="5.6.0" />
</ItemGroup> </ItemGroup>

Loading…
Cancel
Save