Revert "Replace Semver NuGet package with internal SmolSemVer implementation (#16033)"

Aspire.slnx

@@ -408,7 +408,6 @@
     <Project Path="tests/Aspire.Hosting.Sdk.Tests/Aspire.Hosting.Sdk.Tests.csproj" />
     <Project Path="tests/Aspire.Managed.Tests/Aspire.Managed.Tests.csproj" />
     <Project Path="tests/Aspire.Playground.Tests/Aspire.Playground.Tests.csproj" />
-    <Project Path="tests/Aspire.SmolSemVer.Tests/Aspire.SmolSemVer.Tests.csproj" />
     <Project Path="tests/Aspire.Templates.Tests/Aspire.Templates.Tests.csproj" />
     <Project Path="tests/Aspire.TestUtilities/Aspire.TestUtilities.csproj" />
     <Project Path="tests/ConfigurationSchemaGenerator.Tests/ConfigurationSchemaGenerator.Tests.csproj" />

Directory.Packages.props

@@ -129,6 +129,7 @@
     <PackageVersion Include="System.IO.Hashing" Version="10.0.3" />
     <PackageVersion Include="Yarp.ReverseProxy" Version="2.3.0" />
     <PackageVersion Include="StreamJsonRpc" Version="2.22.23" />
+    <PackageVersion Include="Semver" Version="3.0.0" />
     <PackageVersion Include="Sigstore" Version="0.4.0" />
     <PackageVersion Include="Tuf" Version="0.4.0" />
     <PackageVersion Include="Microsoft.DevTunnels.Connections" Version="1.3.12" />

src/Aspire.Cli/Agents/ClaudeCode/ClaudeCodeCliRunner.cs

@@ -3,6 +3,7 @@
 
 using System.Diagnostics;
 using Microsoft.Extensions.Logging;
+using Semver;
 
 namespace Aspire.Cli.Agents.ClaudeCode;
 

src/Aspire.Cli/Agents/ClaudeCode/IClaudeCodeCliRunner.cs

@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Semver;
+
 namespace Aspire.Cli.Agents.ClaudeCode;
 
 /// <summary>

src/Aspire.Cli/Agents/CopilotCli/CopilotCliRunner.cs

@@ -3,6 +3,7 @@
 
 using System.Diagnostics;
 using Microsoft.Extensions.Logging;
+using Semver;
 
 namespace Aspire.Cli.Agents.CopilotCli;
 

src/Aspire.Cli/Agents/CopilotCli/ICopilotCliRunner.cs

@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Semver;
+
 namespace Aspire.Cli.Agents.CopilotCli;
 
 /// <summary>

src/Aspire.Cli/Agents/OpenCode/IOpenCodeCliRunner.cs

@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Semver;
+
 namespace Aspire.Cli.Agents.OpenCode;
 
 /// <summary>

src/Aspire.Cli/Agents/OpenCode/OpenCodeCliRunner.cs

@@ -3,6 +3,7 @@
 
 using System.Diagnostics;
 using Microsoft.Extensions.Logging;
+using Semver;
 
 namespace Aspire.Cli.Agents.OpenCode;
 

src/Aspire.Cli/Agents/Playwright/IPlaywrightCliRunner.cs

@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Semver;
+
 namespace Aspire.Cli.Agents.Playwright;
 
 /// <summary>

src/Aspire.Cli/Agents/Playwright/PlaywrightCliInstaller.cs

@@ -8,6 +8,7 @@
 using Aspire.Cli.Resources;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
+using Semver;
 
 namespace Aspire.Cli.Agents.Playwright;
 
@@ -144,7 +145,8 @@ internal sealed class PlaywrightCliInstaller(
         var installedVersion = await playwrightCliRunner.GetVersionAsync(cancellationToken);
         if (installedVersion is not null)
         {
-            if (installedVersion.IsAtLeast(packageInfo.Version))
+            var comparison = SemVersion.ComparePrecedence(installedVersion, packageInfo.Version);
+            if (comparison >= 0)
             {
                 logger.LogDebug(
                     "playwright-cli {InstalledVersion} is already installed (target: {TargetVersion}), skipping installation.",

src/Aspire.Cli/Agents/Playwright/PlaywrightCliRunner.cs

@@ -3,6 +3,7 @@
 
 using System.Diagnostics;
 using Microsoft.Extensions.Logging;
+using Semver;
 
 namespace Aspire.Cli.Agents.Playwright;
 

src/Aspire.Cli/Agents/VsCode/IVsCodeCliRunner.cs

@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Semver;
+
 namespace Aspire.Cli.Agents.VsCode;
 
 /// <summary>

src/Aspire.Cli/Agents/VsCode/VsCodeCliRunner.cs

@@ -3,6 +3,7 @@
 
 using System.Diagnostics;
 using Microsoft.Extensions.Logging;
+using Semver;
 
 namespace Aspire.Cli.Agents.VsCode;
 

src/Aspire.Cli/Aspire.Cli.csproj

@@ -56,7 +56,7 @@
     <PackageReference Include="OpenTelemetry.Exporter.Console" />
     <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" />
     <PackageReference Include="OpenTelemetry.Extensions.Hosting" />
-
+    <PackageReference Include="Semver" />
     <PackageReference Include="Sigstore" />
     <PackageReference Include="System.IO.Hashing" />
     <PackageReference Include="Tuf" />
@@ -74,7 +74,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="$(SharedDir)SmolSemVer.cs" Link="SmolSemVer.cs" />
     <Compile Include="$(SharedDir)BundleDiscovery.cs" Link="Layout\BundleDiscovery.cs" />
     <Compile Include="$(SharedDir)EnumerableExtensions.cs" Link="Utils\EnumerableExtensions.cs" />
     <Compile Include="$(SharedDir)KnownConfigNames.cs" Link="Utils\KnownConfigNames.cs" />

src/Aspire.Cli/Commands/AddCommand.cs

@@ -12,6 +12,7 @@
 using Aspire.Cli.Resources;
 using Aspire.Cli.Telemetry;
 using Aspire.Cli.Utils;
+using Semver;
 using Spectre.Console;
 using NuGetPackage = Aspire.Shared.NuGetPackageCli;
 

src/Aspire.Cli/Commands/InitCommand.cs

@@ -18,6 +18,7 @@
 using Aspire.Cli.Utils;
 using Microsoft.Extensions.Configuration;
 using NuGetPackage = Aspire.Shared.NuGetPackageCli;
+using Semver;
 using Spectre.Console;
 
 namespace Aspire.Cli.Commands;
@@ -924,7 +925,7 @@ public string RequiredAppHostFramework
 
                     if (SemVersion.TryParse(versionString, SemVersionStyles.Strict, out var version))
                     {
-                        if (highestVersion is null || version.IsNewerThan(highestVersion))
+                        if (highestVersion is null || SemVersion.ComparePrecedence(version, highestVersion) > 0)
                         {
                             highestVersion = version;
                             highestTfm = tfm;

src/Aspire.Cli/Commands/NewCommand.cs

@@ -320,8 +320,8 @@ private async Task<ResolveTemplateVersionResult> ResolveCliTemplateVersionAsync(
 
                 var packages = await selectedChannel.GetTemplatePackagesAsync(ExecutionContext.WorkingDirectory, cancellationToken);
                 var package = packages
-                    .Where(p => SemVersion.TryParse(p.Version, SemVersionStyles.Strict, out _))
-                    .OrderByDescending(p => SemVersion.Parse(p.Version, SemVersionStyles.Strict), SemVersion.PrecedenceComparer)
+                    .Where(p => Semver.SemVersion.TryParse(p.Version, Semver.SemVersionStyles.Strict, out _))
+                    .OrderByDescending(p => Semver.SemVersion.Parse(p.Version, Semver.SemVersionStyles.Strict), Semver.SemVersion.PrecedenceComparer)
                     .FirstOrDefault();
 
                 if (package is null)
@@ -441,7 +441,7 @@ internal class NewCommandPrompter(IInteractionService interactionService) : INew
         if (explicitGroups.Length == 0 && implicitGroup is not null)
         {
             // Return the highest version from the implicit channel
-            return implicitGroup.OrderByDescending(p => SemVersion.Parse(p.Package.Version), SemVersion.PrecedenceComparer).First();
+            return implicitGroup.OrderByDescending(p => Semver.SemVersion.Parse(p.Package.Version), Semver.SemVersion.PrecedenceComparer).First();
         }
 
         // Create a hierarchical selection experience:

src/Aspire.Cli/Commands/Sdk/SdkDumpCommand.cs

@@ -12,6 +12,7 @@
 using Aspire.Cli.Telemetry;
 using Aspire.Cli.Utils;
 using Microsoft.Extensions.Logging;
+using Semver;
 using Spectre.Console;
 
 namespace Aspire.Cli.Commands.Sdk;

src/Aspire.Cli/DotNet/DotNetSdkInstaller.cs

@@ -4,6 +4,7 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using Microsoft.Extensions.Configuration;
+using Semver;
 
 namespace Aspire.Cli.DotNet;
 
@@ -71,7 +72,7 @@ internal sealed class DotNetSdkInstaller(IConfiguration configuration) : IDotNet
                     if (SemVersion.TryParse(versionString, SemVersionStyles.Strict, out var sdkVersion))
                     {
                         // Track the highest version
-                        if (highestDetectedVersion == null || sdkVersion.IsNewerThan(highestDetectedVersion))
+                        if (highestDetectedVersion == null || SemVersion.ComparePrecedence(sdkVersion, highestDetectedVersion) > 0)
                         {
                             highestDetectedVersion = sdkVersion;
                         }
@@ -148,6 +149,6 @@ private static bool MeetsMinimumRequirement(SemVersion installedVersion, SemVers
         }
 
         // For all other requirements, use strict version comparison
-        return installedVersion.IsAtLeast(requiredVersion);
+        return SemVersion.ComparePrecedence(installedVersion, requiredVersion) >= 0;
     }
 }

src/Aspire.Cli/Mcp/Tools/ListIntegrationsTool.cs

@@ -6,6 +6,7 @@
 using Aspire.Cli.Backchannel;
 using Aspire.Cli.Packaging;
 using ModelContextProtocol.Protocol;
+using Semver;
 
 namespace Aspire.Cli.Mcp.Tools;
 

src/Aspire.Cli/Npm/INpmRunner.cs

@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Semver;
+
 namespace Aspire.Cli.Npm;
 
 /// <summary>

src/Aspire.Cli/Npm/NpmRunner.cs

@@ -4,6 +4,7 @@
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.Extensions.Logging;
+using Semver;
 
 namespace Aspire.Cli.Npm;
 

src/Aspire.Cli/OpenCode/IOpenCodeCliRunner.cs

@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Semver;
+
 namespace Aspire.Cli.OpenCode;
 
 /// <summary>

src/Aspire.Cli/OpenCode/OpenCodeCliRunner.cs

@@ -3,6 +3,7 @@
 
 using System.Diagnostics;
 using Microsoft.Extensions.Logging;
+using Semver;
 
 namespace Aspire.Cli.OpenCode;
 

src/Aspire.Cli/Packaging/PackageChannel.cs

@@ -3,6 +3,7 @@
 
 using Aspire.Cli.NuGet;
 using Aspire.Cli.Resources;
+using Semver;
 using NuGetPackage = Aspire.Shared.NuGetPackageCli;
 
 namespace Aspire.Cli.Packaging;

src/Aspire.Cli/Projects/GuestAppHostProject.cs

@@ -17,6 +17,7 @@
 using Aspire.Shared.UserSecrets;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
+using Semver;
 using Spectre.Console;
 
 namespace Aspire.Cli.Projects;

src/Aspire.Cli/Projects/ProjectUpdater.cs

@@ -13,6 +13,7 @@
 using Aspire.Shared;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Logging;
+using Semver;
 using Spectre.Console;
 
 namespace Aspire.Cli.Projects;

src/Aspire.Cli/Templating/DotNetTemplateFactory.cs

@@ -15,6 +15,7 @@
 using Aspire.Cli.Telemetry;
 using Aspire.Cli.Utils;
 using NuGetPackage = Aspire.Shared.NuGetPackageCli;
+using Semver;
 using Spectre.Console;
 
 namespace Aspire.Cli.Templating;

src/Aspire.Cli/Utils/AppHostHelper.cs

@@ -5,6 +5,7 @@
 using Aspire.Cli.Interaction;
 using Aspire.Cli.Telemetry;
 using Aspire.Hosting.Backchannel;
+using Semver;
 using System.Diagnostics;
 using System.Globalization;
 using Aspire.Cli.Resources;
@@ -36,7 +37,7 @@ internal static class AppHostHelper
         }
 
         var minimumVersion = SemVersion.Parse("9.2.0");
-        if (aspireVersion.IsOlderThan(minimumVersion))
+        if (aspireVersion.ComparePrecedenceTo(minimumVersion) < 0)
         {
             interactionService.DisplayError(string.Format(CultureInfo.CurrentCulture, ErrorStrings.AspireSDKVersionNotSupported, appHostInformation.AspireHostingVersion));
             return (false, false, appHostInformation.AspireHostingVersion);

src/Aspire.Cli/Utils/CliUpdateNotifier.cs

@@ -5,6 +5,7 @@
 using Aspire.Cli.NuGet;
 using Aspire.Shared;
 using Microsoft.Extensions.Logging;
+using Semver;
 
 namespace Aspire.Cli.Utils;
 

src/Aspire.Hosting.CodeGeneration.TypeScript/Aspire.Hosting.CodeGeneration.TypeScript.csproj

@@ -25,11 +25,11 @@
 
   <ItemGroup>
     <Compile Include="$(SharedDir)NpmVersionHelper.cs" Link="NpmVersionHelper.cs" />
-    <Compile Include="$(SharedDir)SmolSemVer.cs" Link="SmolSemVer.cs" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Aspire.TypeSystem\Aspire.TypeSystem.csproj" />
+    <PackageReference Include="Semver" />
   </ItemGroup>
 
 </Project>

src/Aspire.Hosting.Kubernetes/HelmChartOptions.cs

@@ -3,6 +3,7 @@
 
 using System.Text.RegularExpressions;
 using Aspire.Hosting.ApplicationModel;
+using Semver;
 
 namespace Aspire.Hosting.Kubernetes;
 
@@ -129,7 +130,7 @@ private static void ValidateDnsLabel(string value, string target, int maxLength,
 
     private static void ValidateChartVersion(string version)
     {
-        if (!Aspire.SemVersion.TryParse(version, Aspire.SemVersionStyles.Strict, out _))
+        if (!SemVersion.TryParse(version, SemVersionStyles.Strict, out _))
         {
             throw new ArgumentException($"Helm chart version '{version}' is invalid. Use a semantic version such as '1.0.0' or '1.0.0-beta.1'.", nameof(version));
         }

src/Aspire.Hosting/Aspire.Hosting.csproj

@@ -49,7 +49,6 @@
     <Compile Include="$(SharedDir)LaunchProfiles\*.cs" />
     <Compile Include="$(SharedDir)OverloadResolutionPriorityAttribute.cs" Link="Utils\OverloadResolutionPriorityAttribute.cs" />
     <Compile Include="$(SharedDir)PackageUpdateHelpers.cs" Link="Utils\PackageUpdateHelpers.cs" />
-    <Compile Include="$(SharedDir)SmolSemVer.cs" Link="SmolSemVer.cs" />
     <Compile Include="$(SharedDir)InteractionHelpers.cs" Link="Utils\InteractionHelpers.cs" />
     <Compile Include="$(SharedDir)LocaleHelpers.cs" Link="Utils\LocaleHelpers.cs" />
     <Compile Include="$(SharedDir)PathLookupHelper.cs" Link="Utils\PathLookupHelper.cs" />
@@ -69,7 +68,7 @@
     <PackageReference Include="Polly.Core" />
     <PackageReference Include="JsonPatch.Net" />
     <PackageReference Include="AspNetCore.HealthChecks.Uris" />
-
+    <PackageReference Include="Semver" />
     <PackageReference Include="System.IO.Hashing" />
     <PackageReference Include="StreamJsonRpc" />
   </ItemGroup>

src/Aspire.Hosting/VersionChecking/IPackageVersionProvider.cs

@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Semver;
+
 namespace Aspire.Hosting.VersionChecking;
 
 internal interface IPackageVersionProvider

src/Aspire.Hosting/VersionChecking/PackageVersionProvider.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Aspire.Shared;
+using Semver;
 
 namespace Aspire.Hosting.VersionChecking;