Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 29 additions & 21 deletions src/Aspire.Cli/DotNetCliRunner.cs
Original file line number Diff line number Diff line change
Expand Up @@ -659,34 +659,42 @@ public async Task<int> AddPackageAsync(FileInfo projectFilePath, string packageN
}

var foundPackages = new List<NuGetPackage>();
var document = JsonDocument.Parse(stdout);

var searchResultsArray = document.RootElement.GetProperty("searchResult");

foreach (var sourceResult in searchResultsArray.EnumerateArray())
try
{
var source = sourceResult.GetProperty("sourceName").GetString();
var sourcePackagesArray = sourceResult.GetProperty("packages");

foreach (var packageResult in sourcePackagesArray.EnumerateArray())
{
var id = packageResult.GetProperty("id").GetString();
using var document = JsonDocument.Parse(stdout);

// var version = prerelease switch {
// true => packageResult.GetProperty("version").GetString(),
// false => packageResult.GetProperty("latestVersion").GetString()
// };
var searchResultsArray = document.RootElement.GetProperty("searchResult");

var version = packageResult.GetProperty("latestVersion").GetString();
foreach (var sourceResult in searchResultsArray.EnumerateArray())
{
var source = sourceResult.GetProperty("sourceName").GetString();
var sourcePackagesArray = sourceResult.GetProperty("packages");

foundPackages.Add(new NuGetPackage
foreach (var packageResult in sourcePackagesArray.EnumerateArray())
{
Id = id!,
Version = version!,
Source = source!
});
var id = packageResult.GetProperty("id").GetString();

// var version = prerelease switch {
// true => packageResult.GetProperty("version").GetString(),
// false => packageResult.GetProperty("latestVersion").GetString()
// };

var version = packageResult.GetProperty("latestVersion").GetString();

foundPackages.Add(new NuGetPackage
{
Id = id!,
Version = version!,
Source = source!
});
}
}
}
catch (JsonException ex)
{
logger.LogError($"Failed to read JSON returned by the package search. {ex.Message}");
return (ExitCodeConstants.FailedToAddPackage, null);
}

return (result, foundPackages.ToArray());
}
Expand Down