Browse Source

Update PackageVersionCheckerService.cs

pull/17943/head
Engincan VESKE 2 years ago
parent
commit
85d32f2378
  1. 27
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Version/PackageVersionCheckerService.cs

27
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Version/PackageVersionCheckerService.cs

@ -46,7 +46,7 @@ public class PackageVersionCheckerService : ITransientDependency
{ {
var versionList = await GetPackageVersionListAsync(packageId, false); var versionList = await GetPackageVersionListAsync(packageId, false);
if (versionList == null) if (!versionList.Any())
{ {
return false; return false;
} }
@ -121,10 +121,10 @@ public class PackageVersionCheckerService : ITransientDependency
} }
var searchUrl = CliUrls.GetNuGetPackageSearchUrl(_apiKeyResult.ApiKey, packageId); var searchUrl = CliUrls.GetNuGetPackageSearchUrl(_apiKeyResult.ApiKey, packageId);
return await HasAnyPackageAsync(searchUrl); return await HasAnyPackageAsync(searchUrl, packageId);
} }
private async Task<bool> HasAnyPackageAsync(string url) private async Task<bool> HasAnyPackageAsync(string url, string packageId)
{ {
try try
{ {
@ -139,8 +139,9 @@ public class PackageVersionCheckerService : ITransientDependency
await RemoteServiceExceptionHandler.EnsureSuccessfulHttpResponseAsync(responseMessage); await RemoteServiceExceptionHandler.EnsureSuccessfulHttpResponseAsync(responseMessage);
var responseContent = await responseMessage.Content.ReadAsStringAsync(); var responseContent = await responseMessage.Content.ReadAsStringAsync();
var nugetSearchResult = JsonSerializer.Deserialize<NuGetSearchResultDto>(responseContent);
return JsonSerializer.Deserialize<NuGetSearchResultDto>(responseContent).TotalHits > 0;
return nugetSearchResult.TotalHits > 0 && nugetSearchResult.Packages.Any(package => package.Id.ToLowerInvariant() == packageId.ToLowerInvariant());
} }
} }
catch (Exception) catch (Exception)
@ -182,7 +183,7 @@ public class PackageVersionCheckerService : ITransientDependency
if (responseMessage.StatusCode == HttpStatusCode.NotFound) if (responseMessage.StatusCode == HttpStatusCode.NotFound)
{ {
//the package doesn't exist... //the package doesn't exist...
return null; return new List<string>();
} }
await RemoteServiceExceptionHandler.EnsureSuccessfulHttpResponseAsync(responseMessage); await RemoteServiceExceptionHandler.EnsureSuccessfulHttpResponseAsync(responseMessage);
@ -193,7 +194,7 @@ public class PackageVersionCheckerService : ITransientDependency
} }
catch (Exception) catch (Exception)
{ {
return null; return new List<string>();
} }
} }
@ -238,6 +239,18 @@ public class PackageVersionCheckerService : ITransientDependency
{ {
[JsonProperty("totalHits")] [JsonProperty("totalHits")]
public int TotalHits { get; set; } public int TotalHits { get; set; }
[JsonProperty("data")]
public NuGetSearchResultPackagesDto[] Packages { get; set; }
}
public class NuGetSearchResultPackagesDto
{
[JsonProperty("id")]
public string Id { get; set; }
[JsonProperty("version")]
public string Version { get; set; }
} }
public class NuGetVersionResultDto public class NuGetVersionResultDto

Loading…
Cancel
Save