Share more package checking code between CLI and app host (#10372)

* Share more package checking code between CLI and app host

* Clean up

* Update

* Fix

Author: JamesNK

src/Aspire.Cli/Aspire.Cli.csproj

@@ -48,6 +48,7 @@
     <Compile Include="$(SharedDir)CircularBuffer.cs" Link="Utils\CircularBuffer.cs" />
     <Compile Include="$(SharedDir)StringComparers.cs" Link="StringComparers.cs" />
     <Compile Include="$(RepoRoot)src\Aspire.Hosting\Backchannel\BackchannelDataTypes.cs" Link="Backchannel\CliBackchannelDataTypes.cs" />
+    <Compile Include="$(SharedDir)PackageUpdateHelpers.cs" Link="Utils\PackageUpdateHelpers.cs" />
   </ItemGroup>
 
   <ItemGroup>

src/Aspire.Cli/Commands/AddCommand.cs

@@ -12,6 +12,7 @@
 using Aspire.Cli.Telemetry;
 using Aspire.Cli.Utils;
 using Semver;
+using NuGetPackage = Aspire.Shared.NuGetPackageCli;
 
 namespace Aspire.Cli.Commands;
 

src/Aspire.Cli/Commands/BaseCommand.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.CommandLine;
+using System.Diagnostics;
 using Aspire.Cli.Configuration;
 using Aspire.Cli.Utils;
 
@@ -29,7 +30,9 @@ protected BaseCommand(string name, string description, IFeatures features, ICliU
                     // but we'll only wait so long before we get details back about updates
                     // being available (it should already be in the cache for longer running
                     // commands and some commands will opt out entirely)
-                    var cts = new CancellationTokenSource(TimeSpan.FromSeconds(10));
+                    var cts = !Debugger.IsAttached
+                        ? new CancellationTokenSource(TimeSpan.FromSeconds(10))
+                        : new CancellationTokenSource();
                     await updateNotifier.NotifyIfUpdateAvailableAsync(currentDirectory, cancellationToken: cts.Token);
                 }
                 catch

src/Aspire.Cli/Commands/NewCommand.cs

@@ -12,6 +12,8 @@
 using Aspire.Cli.Templating;
 using Aspire.Cli.Utils;
 using Spectre.Console;
+using NuGetPackage = Aspire.Shared.NuGetPackageCli;
+
 namespace Aspire.Cli.Commands;
 
 internal sealed class NewCommand : BaseCommand

src/Aspire.Cli/DotNetCliRunner.cs

@@ -11,9 +11,11 @@
 using Aspire.Cli.Resources;
 using Aspire.Cli.Telemetry;
 using Aspire.Hosting;
+using Aspire.Shared;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using NuGetPackage = Aspire.Shared.NuGetPackageCli;
 
 namespace Aspire.Cli;
 
@@ -716,52 +718,17 @@ public async Task<int> AddPackageAsync(FileInfo projectFilePath, string packageN
                 return (ExitCodeConstants.FailedToAddPackage, null);
             }
 
-            var foundPackages = new List<NuGetPackage>();
             try
             {
-                using var document = JsonDocument.Parse(stdout);
-
-                var searchResultsArray = document.RootElement.GetProperty("searchResult");
-
-                foreach (var sourceResult in searchResultsArray.EnumerateArray())
-                {
-                    var source = sourceResult.GetProperty("sourceName").GetString();
-                    var sourcePackagesArray = sourceResult.GetProperty("packages");
-
-                    foreach (var packageResult in sourcePackagesArray.EnumerateArray())
-                    {
-                        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!
-                        });
-                    }
-                }
+                var foundPackages = PackageUpdateHelpers.ParsePackageSearchResults(stdout);
+                return (result, foundPackages.ToArray());
             }
             catch (JsonException ex)
             {
                 logger.LogError($"Failed to read JSON returned by the package search. {ex.Message}");
                 return (ExitCodeConstants.FailedToAddPackage, null);
             }
 
-            return (result, foundPackages.ToArray());
         }
     }
 }
-
-internal class NuGetPackage
-{
-    public string Id { get; set; } = string.Empty;
-    public string Version { get; set; } = string.Empty;
-    public string Source { get; set; } = string.Empty;
-}

src/Aspire.Cli/NuGet/NuGetPackageCache.cs

@@ -6,6 +6,7 @@
 using Aspire.Cli.Telemetry;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Logging;
+using NuGetPackage = Aspire.Shared.NuGetPackageCli;
 
 namespace Aspire.Cli.NuGet;
 

src/Aspire.Cli/Utils/CliUpdateNotifier.cs

@@ -3,6 +3,7 @@
 
 using Aspire.Cli.Interaction;
 using Aspire.Cli.NuGet;
+using Aspire.Shared;
 using Microsoft.Extensions.Logging;
 using Semver;
 
@@ -31,7 +32,7 @@ public async Task NotifyIfUpdateAvailableAsync(DirectoryInfo workingDirectory, C
             }
 
             var availablePackages = await nuGetPackageCache.GetCliPackagesAsync(workingDirectory, prerelease: true, source: null, cancellationToken);
-            var newerVersion = GetNewerVersion(currentVersion, availablePackages);
+            var newerVersion = PackageUpdateHelpers.GetNewerVersion(currentVersion, availablePackages);
 
             if (newerVersion is not null)
             {
@@ -46,63 +47,6 @@ public async Task NotifyIfUpdateAvailableAsync(DirectoryInfo workingDirectory, C
 
     protected virtual SemVersion? GetCurrentVersion()
     {
-        try
-        {
-            var versionString = VersionHelper.GetDefaultTemplateVersion();
-            // Remove any build metadata (e.g., +sha.12345) for comparison
-            var cleanVersionString = versionString.Split('+')[0];
-            return SemVersion.Parse(cleanVersionString, SemVersionStyles.Strict);
-        }
-        catch
-        {
-            return null;
-        }
+        return PackageUpdateHelpers.GetCurrentPackageVersion();
     }
-
-    private static SemVersion? GetNewerVersion(SemVersion currentVersion, IEnumerable<NuGetPackage> availablePackages)
-    {
-        SemVersion? newestStable = null;
-        SemVersion? newestPrerelease = null;
-
-        foreach (var package in availablePackages)
-        {
-            if (SemVersion.TryParse(package.Version, SemVersionStyles.Strict, out var version))
-            {
-                if (version.IsPrerelease)
-                {
-                    newestPrerelease = newestPrerelease is null || SemVersion.PrecedenceComparer.Compare(version, newestPrerelease) > 0 ? version : newestPrerelease;
-                }
-                else
-                {
-                    newestStable = newestStable is null || SemVersion.PrecedenceComparer.Compare(version, newestStable) > 0 ? version : newestStable;
-                }
-            }
-        }
-
-        // Apply notification rules
-        if (currentVersion.IsPrerelease)
-        {
-            // Rule 1: If using a prerelease version where the version is lower than the latest stable version, prompt to upgrade
-            if (newestStable is not null && SemVersion.PrecedenceComparer.Compare(currentVersion, newestStable) < 0)
-            {
-                return newestStable;
-            }
-
-            // Rule 2: If using a prerelease version and there is a newer prerelease version, prompt to upgrade
-            if (newestPrerelease is not null && SemVersion.PrecedenceComparer.Compare(currentVersion, newestPrerelease) < 0)
-            {
-                return newestPrerelease;
-            }
-        }
-        else
-        {
-            // Rule 3: If using a stable version and there is a newer stable version, prompt to upgrade
-            if (newestStable is not null && SemVersion.PrecedenceComparer.Compare(currentVersion, newestStable) < 0)
-            {
-                return newestStable;
-            }
-        }
-
-        return null;
-    }
-}
+}

src/Aspire.Cli/Utils/VersionHelper.cs

@@ -2,20 +2,14 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Aspire.Cli.Resources;
+using Aspire.Shared;
 
 namespace Aspire.Cli.Utils;
 
 internal static class VersionHelper
 {
     public static string GetDefaultTemplateVersion()
     {
-        // Write some code that gets the informational assembly version of the current assembly and returns it as a string.
-        var assembly = typeof(VersionHelper).Assembly;
-        var informationalVersion = assembly
-            .GetCustomAttributes(typeof(System.Reflection.AssemblyInformationalVersionAttribute), false)
-            .OfType<System.Reflection.AssemblyInformationalVersionAttribute>()
-            .FirstOrDefault()?.InformationalVersion;
-
-        return informationalVersion ?? throw new InvalidOperationException(ErrorStrings.UnableToRetrieveAssemblyVersion);
+        return PackageUpdateHelpers.GetCurrentAssemblyVersion() ?? throw new InvalidOperationException(ErrorStrings.UnableToRetrieveAssemblyVersion);
     }
 }

src/Aspire.Hosting/Aspire.Hosting.csproj

@@ -41,6 +41,7 @@
     <Compile Include="$(SharedDir)LaunchProfiles\*.cs" />
     <Compile Include="$(SharedDir)PortAllocator.cs" Link="Publishing\PortAllocator.cs" />
     <Compile Include="$(SharedDir)OverloadResolutionPriorityAttribute.cs" Link="Utils\OverloadResolutionPriorityAttribute.cs" />
+    <Compile Include="$(SharedDir)PackageUpdateHelpers.cs" Link="Utils\PackageUpdateHelpers.cs" />
   </ItemGroup>
 
   <ItemGroup>

src/Aspire.Hosting/DistributedApplicationBuilder.cs

@@ -241,7 +241,7 @@ public DistributedApplicationBuilder(DistributedApplicationOptions options)
         _innerBuilder.Services.AddHostedService<DistributedApplicationLifecycle>();
         _innerBuilder.Services.AddHostedService<DistributedApplicationRunner>();
         _innerBuilder.Services.AddHostedService<VersionCheckService>();
-        _innerBuilder.Services.AddSingleton<IVersionFetcher, VersionFetcher>();
+        _innerBuilder.Services.AddSingleton<IPackageFetcher, PackageFetcher>();
         _innerBuilder.Services.AddSingleton(options);
         _innerBuilder.Services.AddSingleton<ResourceNotificationService>();
         _innerBuilder.Services.AddSingleton<ResourceLoggerService>();