Cli: Get leptonx & framework versions separately

pull/14150/head
Yunus Emre Kalkan 3 years ago
parent 9ccbc89163
commit 01e7cdfdd5

@ -0,0 +1,21 @@
using System;
using Newtonsoft.Json;
namespace Volo.Abp.Cli.GitHub;
[JsonObject]
[Serializable]
public class GithubRelease
{
[JsonProperty("id")]
public int Id { get; set; }
[JsonProperty("name")]
public string Name { get; set; }
[JsonProperty("prerelease")]
public bool IsPrerelease { get; set; }
[JsonProperty("published_at")]
public DateTime PublishTime { get; set; }
}

@ -11,6 +11,7 @@ using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Volo.Abp.Cli.GitHub;
using Volo.Abp.Cli.Http; using Volo.Abp.Cli.Http;
using Volo.Abp.Cli.ProjectBuilding.Templates.App; using Volo.Abp.Cli.ProjectBuilding.Templates.App;
using Volo.Abp.Cli.ProjectBuilding.Templates.Console; using Volo.Abp.Cli.ProjectBuilding.Templates.Console;
@ -85,7 +86,7 @@ public class AbpIoSourceCodeStore : ISourceCodeStore, ITransientDependency
} }
else else
{ {
if (!await IsVersionExists(version)) if (!await IsVersionExists(name, version))
{ {
throw new Exception("There is no version found with given version: " + version); throw new Exception("There is no version found with given version: " + version);
} }
@ -201,7 +202,7 @@ public class AbpIoSourceCodeStore : ISourceCodeStore, ITransientDependency
} }
} }
private async Task<bool> IsVersionExists(string version) private async Task<bool> IsVersionExists(string templateName, string version)
{ {
var url = $"{CliUrls.WwwAbpIo}api/download/versions?includePreReleases=true"; var url = $"{CliUrls.WwwAbpIo}api/download/versions?includePreReleases=true";
@ -214,9 +215,11 @@ public class AbpIoSourceCodeStore : ISourceCodeStore, ITransientDependency
{ {
await RemoteServiceExceptionHandler.EnsureSuccessfulHttpResponseAsync(response); await RemoteServiceExceptionHandler.EnsureSuccessfulHttpResponseAsync(response);
var result = await response.Content.ReadAsStringAsync(); var result = await response.Content.ReadAsStringAsync();
var versions = JsonSerializer.Deserialize<List<GithubRelease>>(result); var versions = JsonSerializer.Deserialize<GithubReleaseVersions>(result);
return versions.Any(v => v.Name == version); return templateName.Contains("LeptonX") ?
versions.LeptonXVersions.Any(v => v.Name == version) :
versions.FrameworkAndCommercialVersions.Any(v => v.Name == version);
} }
} }
catch (Exception ex) catch (Exception ex)
@ -324,14 +327,10 @@ public class AbpIoSourceCodeStore : ISourceCodeStore, ITransientDependency
public string Version { get; set; } public string Version { get; set; }
} }
public class GithubRelease public class GithubReleaseVersions
{ {
public int Id { get; set; } public List<GithubRelease> FrameworkAndCommercialVersions { get; set; }
public string Name { get; set; } public List<GithubRelease> LeptonXVersions { get; set; }
public bool IsPrerelease { get; set; }
public DateTime PublishTime { get; set; }
} }
} }
Loading…
Cancel
Save