From ff7bf55b29ba543f757bcd8c959af5effdca5186 Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Wed, 9 Jul 2025 11:12:29 -0700 Subject: [PATCH 1/2] Branding updates for 9.5.0 --- eng/Versions.props | 2 +- .../Commands/AddCommandTests.cs | 4 ++-- .../Commands/NewCommandTests.cs | 4 ++-- .../NuGet/NuGetPackageCacheTests.cs | 4 ++-- .../CliUpdateNotificationServiceTests.cs | 24 +++++++++---------- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index e06c4602376..f6b8d6635ae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ 9 - 4 + 5 0 $(MajorVersion).$(MinorVersion).$(PatchVersion) preview.1 diff --git a/tests/Aspire.Cli.Tests/Commands/AddCommandTests.cs b/tests/Aspire.Cli.Tests/Commands/AddCommandTests.cs index febbc60426f..27ef4635a5d 100644 --- a/tests/Aspire.Cli.Tests/Commands/AddCommandTests.cs +++ b/tests/Aspire.Cli.Tests/Commands/AddCommandTests.cs @@ -202,7 +202,7 @@ public async Task AddCommandSortsPackageVersionsWithPrerelease() { Id = "Aspire.Hosting.Redis", Source = "nuget", - Version = "9.4.0-preview1.1234" + Version = "9.5.0-preview1.1234" }; var redis93Package = new NuGetPackage() @@ -236,7 +236,7 @@ public async Task AddCommandSortsPackageVersionsWithPrerelease() Assert.Equal(0, exitCode); Assert.Collection( promptedPackages!, - p => Assert.Equal("9.4.0-preview1.1234", p.Package.Version), + p => Assert.Equal("9.5.0-preview1.1234", p.Package.Version), p => Assert.Equal("9.3.0", p.Package.Version), p => Assert.Equal("9.2.0", p.Package.Version) ); diff --git a/tests/Aspire.Cli.Tests/Commands/NewCommandTests.cs b/tests/Aspire.Cli.Tests/Commands/NewCommandTests.cs index 8ed3816d37f..2d9f2ec49e0 100644 --- a/tests/Aspire.Cli.Tests/Commands/NewCommandTests.cs +++ b/tests/Aspire.Cli.Tests/Commands/NewCommandTests.cs @@ -232,7 +232,7 @@ public async Task NewCommandOrdersTemplatePackageVersionsCorrectlyWithPrerelease { Id = "Aspire.ProjectTemplates", Source = "internalfeed", - Version = "9.4.0-preview.1234" + Version = "9.5.0-preview.1234" }; var package93 = new NuGetPackage() @@ -261,7 +261,7 @@ public async Task NewCommandOrdersTemplatePackageVersionsCorrectlyWithPrerelease Assert.NotNull(promptedPackages); Assert.Collection( promptedPackages, - package => Assert.Equal("9.4.0-preview.1234", package.Version), + package => Assert.Equal("9.5.0-preview.1234", package.Version), package => Assert.Equal("9.3.0", package.Version), package => Assert.Equal("9.2.0", package.Version) ); diff --git a/tests/Aspire.Cli.Tests/NuGet/NuGetPackageCacheTests.cs b/tests/Aspire.Cli.Tests/NuGet/NuGetPackageCacheTests.cs index 36a61c50814..641ac6d7a8d 100644 --- a/tests/Aspire.Cli.Tests/NuGet/NuGetPackageCacheTests.cs +++ b/tests/Aspire.Cli.Tests/NuGet/NuGetPackageCacheTests.cs @@ -24,8 +24,8 @@ public async Task NonAspireCliPackagesWillNotBeConsidered() { // Simulate a search that returns packages that do not match Aspire.Cli return (0, [ - new NuGetPackage { Id = "CommunityToolkit.Aspire.Hosting.Foo", Version = "9.4.0-xyz", Source = "nuget.org" }, - new NuGetPackage { Id = "Aspire.Cli", Version = "9.4.0-preview", Source = "nuget.org" } + new NuGetPackage { Id = "CommunityToolkit.Aspire.Hosting.Foo", Version = "9.5.0-xyz", Source = "nuget.org" }, + new NuGetPackage { Id = "Aspire.Cli", Version = "9.5.0-preview", Source = "nuget.org" } ]); }; diff --git a/tests/Aspire.Cli.Tests/Utils/CliUpdateNotificationServiceTests.cs b/tests/Aspire.Cli.Tests/Utils/CliUpdateNotificationServiceTests.cs index 1a223de3ae9..8c363c7c29d 100644 --- a/tests/Aspire.Cli.Tests/Utils/CliUpdateNotificationServiceTests.cs +++ b/tests/Aspire.Cli.Tests/Utils/CliUpdateNotificationServiceTests.cs @@ -30,11 +30,11 @@ public async Task PrereleaseWillRecommendUpgradeToPrereleaseOnSameVersionFamily( // Should be ignored because its lower that current prerelease version. new NuGetPackage { Id = "Aspire.Cli", Version = "9.3.1", Source = "nuget.org" }, - // Should be selected because it is higher than 9.4.0-dev (dev and preview sort using alphabetical sort). - new NuGetPackage { Id = "Aspire.Cli", Version = "9.4.0-preview", Source = "nuget.org" }, + // Should be selected because it is higher than 9.5.0-dev (dev and preview sort using alphabetical sort). + new NuGetPackage { Id = "Aspire.Cli", Version = "9.5.0-preview", Source = "nuget.org" }, - // Should be ignored because it is lower than 9.4.0-dev (dev and preview sort using alpha). - new NuGetPackage { Id = "Aspire.Cli", Version = "9.4.0-beta", Source = "nuget.org" } + // Should be ignored because it is lower than 9.5.0-dev (dev and preview sort using alpha). + new NuGetPackage { Id = "Aspire.Cli", Version = "9.5.0-beta", Source = "nuget.org" } ]); return cache; @@ -58,7 +58,7 @@ public async Task PrereleaseWillRecommendUpgradeToPrereleaseOnSameVersionFamily( var interactionService = sp.GetRequiredService(); // Use a custom notifier that overrides the current version - return new CliUpdateNotifierWithPackageVersionOverride("9.4.0-dev", logger, nuGetPackageCache, interactionService); + return new CliUpdateNotifierWithPackageVersionOverride("9.5.0-dev", logger, nuGetPackageCache, interactionService); }; }); @@ -68,7 +68,7 @@ public async Task PrereleaseWillRecommendUpgradeToPrereleaseOnSameVersionFamily( await notifier.NotifyIfUpdateAvailableAsync(workspace.WorkspaceRoot).WaitAsync(CliTestConstants.DefaultTimeout); var suggestedVersion = await suggestedVersionTcs.Task.WaitAsync(CliTestConstants.DefaultTimeout); - Assert.Equal("9.4.0-preview", suggestedVersion); + Assert.Equal("9.5.0-preview", suggestedVersion); } [Fact] @@ -85,7 +85,7 @@ public async Task PrereleaseWillRecommendUpgradeToStableInCurrentVersionFamily() var cache = new TestNuGetPackageCache(); cache.SetMockCliPackages([ // Should be selected because stable sorts higher than preview. - new NuGetPackage { Id = "Aspire.Cli", Version = "9.4.0", Source = "nuget.org" }, + new NuGetPackage { Id = "Aspire.Cli", Version = "9.5.0", Source = "nuget.org" }, // Should be ignored because its prerelease but in a higher version family. new NuGetPackage { Id = "Aspire.Cli", Version = "9.5.0-preview", Source = "nuget.org" }, @@ -112,7 +112,7 @@ public async Task PrereleaseWillRecommendUpgradeToStableInCurrentVersionFamily() var interactionService = sp.GetRequiredService(); // Use a custom notifier that overrides the current version - return new CliUpdateNotifierWithPackageVersionOverride("9.4.0-dev", logger, nuGetPackageCache, interactionService); + return new CliUpdateNotifierWithPackageVersionOverride("9.5.0-dev", logger, nuGetPackageCache, interactionService); }; }); @@ -122,7 +122,7 @@ public async Task PrereleaseWillRecommendUpgradeToStableInCurrentVersionFamily() await notifier.NotifyIfUpdateAvailableAsync(workspace.WorkspaceRoot).WaitAsync(CliTestConstants.DefaultTimeout); var suggestedVersion = await suggestedVersionTcs.Task.WaitAsync(CliTestConstants.DefaultTimeout); - Assert.Equal("9.4.0", suggestedVersion); + Assert.Equal("9.5.0", suggestedVersion); } [Fact] @@ -166,7 +166,7 @@ public async Task StableWillOnlyRecommendGoingToNewerStable() var interactionService = sp.GetRequiredService(); // Use a custom notifier that overrides the current version - return new CliUpdateNotifierWithPackageVersionOverride("9.4.0", logger, nuGetPackageCache, interactionService); + return new CliUpdateNotifierWithPackageVersionOverride("9.5.0", logger, nuGetPackageCache, interactionService); }; }); @@ -191,7 +191,7 @@ public async Task StableWillNotRecommendUpdatingToPreview() { var cache = new TestNuGetPackageCache(); cache.SetMockCliPackages([ - new NuGetPackage { Id = "Aspire.Cli", Version = "9.4.0-preview", Source = "nuget.org" }, + new NuGetPackage { Id = "Aspire.Cli", Version = "9.5.0-preview", Source = "nuget.org" }, new NuGetPackage { Id = "Aspire.Cli", Version = "9.5.0-preview", Source = "nuget.org" }, ]); @@ -216,7 +216,7 @@ public async Task StableWillNotRecommendUpdatingToPreview() var interactionService = sp.GetRequiredService(); // Use a custom notifier that overrides the current version - return new CliUpdateNotifierWithPackageVersionOverride("9.4.0", logger, nuGetPackageCache, interactionService); + return new CliUpdateNotifierWithPackageVersionOverride("9.5.0", logger, nuGetPackageCache, interactionService); }; }); From 0c8d85ba7937cc92affb7c2ec0cd73852d13655d Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Wed, 9 Jul 2025 12:26:33 -0700 Subject: [PATCH 2/2] Undo CLI test changes as those shouldn't be required --- .../Commands/AddCommandTests.cs | 4 ++-- .../Commands/NewCommandTests.cs | 4 ++-- .../NuGet/NuGetPackageCacheTests.cs | 4 ++-- .../CliUpdateNotificationServiceTests.cs | 24 +++++++++---------- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/tests/Aspire.Cli.Tests/Commands/AddCommandTests.cs b/tests/Aspire.Cli.Tests/Commands/AddCommandTests.cs index 27ef4635a5d..febbc60426f 100644 --- a/tests/Aspire.Cli.Tests/Commands/AddCommandTests.cs +++ b/tests/Aspire.Cli.Tests/Commands/AddCommandTests.cs @@ -202,7 +202,7 @@ public async Task AddCommandSortsPackageVersionsWithPrerelease() { Id = "Aspire.Hosting.Redis", Source = "nuget", - Version = "9.5.0-preview1.1234" + Version = "9.4.0-preview1.1234" }; var redis93Package = new NuGetPackage() @@ -236,7 +236,7 @@ public async Task AddCommandSortsPackageVersionsWithPrerelease() Assert.Equal(0, exitCode); Assert.Collection( promptedPackages!, - p => Assert.Equal("9.5.0-preview1.1234", p.Package.Version), + p => Assert.Equal("9.4.0-preview1.1234", p.Package.Version), p => Assert.Equal("9.3.0", p.Package.Version), p => Assert.Equal("9.2.0", p.Package.Version) ); diff --git a/tests/Aspire.Cli.Tests/Commands/NewCommandTests.cs b/tests/Aspire.Cli.Tests/Commands/NewCommandTests.cs index 2d9f2ec49e0..8ed3816d37f 100644 --- a/tests/Aspire.Cli.Tests/Commands/NewCommandTests.cs +++ b/tests/Aspire.Cli.Tests/Commands/NewCommandTests.cs @@ -232,7 +232,7 @@ public async Task NewCommandOrdersTemplatePackageVersionsCorrectlyWithPrerelease { Id = "Aspire.ProjectTemplates", Source = "internalfeed", - Version = "9.5.0-preview.1234" + Version = "9.4.0-preview.1234" }; var package93 = new NuGetPackage() @@ -261,7 +261,7 @@ public async Task NewCommandOrdersTemplatePackageVersionsCorrectlyWithPrerelease Assert.NotNull(promptedPackages); Assert.Collection( promptedPackages, - package => Assert.Equal("9.5.0-preview.1234", package.Version), + package => Assert.Equal("9.4.0-preview.1234", package.Version), package => Assert.Equal("9.3.0", package.Version), package => Assert.Equal("9.2.0", package.Version) ); diff --git a/tests/Aspire.Cli.Tests/NuGet/NuGetPackageCacheTests.cs b/tests/Aspire.Cli.Tests/NuGet/NuGetPackageCacheTests.cs index 641ac6d7a8d..36a61c50814 100644 --- a/tests/Aspire.Cli.Tests/NuGet/NuGetPackageCacheTests.cs +++ b/tests/Aspire.Cli.Tests/NuGet/NuGetPackageCacheTests.cs @@ -24,8 +24,8 @@ public async Task NonAspireCliPackagesWillNotBeConsidered() { // Simulate a search that returns packages that do not match Aspire.Cli return (0, [ - new NuGetPackage { Id = "CommunityToolkit.Aspire.Hosting.Foo", Version = "9.5.0-xyz", Source = "nuget.org" }, - new NuGetPackage { Id = "Aspire.Cli", Version = "9.5.0-preview", Source = "nuget.org" } + new NuGetPackage { Id = "CommunityToolkit.Aspire.Hosting.Foo", Version = "9.4.0-xyz", Source = "nuget.org" }, + new NuGetPackage { Id = "Aspire.Cli", Version = "9.4.0-preview", Source = "nuget.org" } ]); }; diff --git a/tests/Aspire.Cli.Tests/Utils/CliUpdateNotificationServiceTests.cs b/tests/Aspire.Cli.Tests/Utils/CliUpdateNotificationServiceTests.cs index 8c363c7c29d..1a223de3ae9 100644 --- a/tests/Aspire.Cli.Tests/Utils/CliUpdateNotificationServiceTests.cs +++ b/tests/Aspire.Cli.Tests/Utils/CliUpdateNotificationServiceTests.cs @@ -30,11 +30,11 @@ public async Task PrereleaseWillRecommendUpgradeToPrereleaseOnSameVersionFamily( // Should be ignored because its lower that current prerelease version. new NuGetPackage { Id = "Aspire.Cli", Version = "9.3.1", Source = "nuget.org" }, - // Should be selected because it is higher than 9.5.0-dev (dev and preview sort using alphabetical sort). - new NuGetPackage { Id = "Aspire.Cli", Version = "9.5.0-preview", Source = "nuget.org" }, + // Should be selected because it is higher than 9.4.0-dev (dev and preview sort using alphabetical sort). + new NuGetPackage { Id = "Aspire.Cli", Version = "9.4.0-preview", Source = "nuget.org" }, - // Should be ignored because it is lower than 9.5.0-dev (dev and preview sort using alpha). - new NuGetPackage { Id = "Aspire.Cli", Version = "9.5.0-beta", Source = "nuget.org" } + // Should be ignored because it is lower than 9.4.0-dev (dev and preview sort using alpha). + new NuGetPackage { Id = "Aspire.Cli", Version = "9.4.0-beta", Source = "nuget.org" } ]); return cache; @@ -58,7 +58,7 @@ public async Task PrereleaseWillRecommendUpgradeToPrereleaseOnSameVersionFamily( var interactionService = sp.GetRequiredService(); // Use a custom notifier that overrides the current version - return new CliUpdateNotifierWithPackageVersionOverride("9.5.0-dev", logger, nuGetPackageCache, interactionService); + return new CliUpdateNotifierWithPackageVersionOverride("9.4.0-dev", logger, nuGetPackageCache, interactionService); }; }); @@ -68,7 +68,7 @@ public async Task PrereleaseWillRecommendUpgradeToPrereleaseOnSameVersionFamily( await notifier.NotifyIfUpdateAvailableAsync(workspace.WorkspaceRoot).WaitAsync(CliTestConstants.DefaultTimeout); var suggestedVersion = await suggestedVersionTcs.Task.WaitAsync(CliTestConstants.DefaultTimeout); - Assert.Equal("9.5.0-preview", suggestedVersion); + Assert.Equal("9.4.0-preview", suggestedVersion); } [Fact] @@ -85,7 +85,7 @@ public async Task PrereleaseWillRecommendUpgradeToStableInCurrentVersionFamily() var cache = new TestNuGetPackageCache(); cache.SetMockCliPackages([ // Should be selected because stable sorts higher than preview. - new NuGetPackage { Id = "Aspire.Cli", Version = "9.5.0", Source = "nuget.org" }, + new NuGetPackage { Id = "Aspire.Cli", Version = "9.4.0", Source = "nuget.org" }, // Should be ignored because its prerelease but in a higher version family. new NuGetPackage { Id = "Aspire.Cli", Version = "9.5.0-preview", Source = "nuget.org" }, @@ -112,7 +112,7 @@ public async Task PrereleaseWillRecommendUpgradeToStableInCurrentVersionFamily() var interactionService = sp.GetRequiredService(); // Use a custom notifier that overrides the current version - return new CliUpdateNotifierWithPackageVersionOverride("9.5.0-dev", logger, nuGetPackageCache, interactionService); + return new CliUpdateNotifierWithPackageVersionOverride("9.4.0-dev", logger, nuGetPackageCache, interactionService); }; }); @@ -122,7 +122,7 @@ public async Task PrereleaseWillRecommendUpgradeToStableInCurrentVersionFamily() await notifier.NotifyIfUpdateAvailableAsync(workspace.WorkspaceRoot).WaitAsync(CliTestConstants.DefaultTimeout); var suggestedVersion = await suggestedVersionTcs.Task.WaitAsync(CliTestConstants.DefaultTimeout); - Assert.Equal("9.5.0", suggestedVersion); + Assert.Equal("9.4.0", suggestedVersion); } [Fact] @@ -166,7 +166,7 @@ public async Task StableWillOnlyRecommendGoingToNewerStable() var interactionService = sp.GetRequiredService(); // Use a custom notifier that overrides the current version - return new CliUpdateNotifierWithPackageVersionOverride("9.5.0", logger, nuGetPackageCache, interactionService); + return new CliUpdateNotifierWithPackageVersionOverride("9.4.0", logger, nuGetPackageCache, interactionService); }; }); @@ -191,7 +191,7 @@ public async Task StableWillNotRecommendUpdatingToPreview() { var cache = new TestNuGetPackageCache(); cache.SetMockCliPackages([ - new NuGetPackage { Id = "Aspire.Cli", Version = "9.5.0-preview", Source = "nuget.org" }, + new NuGetPackage { Id = "Aspire.Cli", Version = "9.4.0-preview", Source = "nuget.org" }, new NuGetPackage { Id = "Aspire.Cli", Version = "9.5.0-preview", Source = "nuget.org" }, ]); @@ -216,7 +216,7 @@ public async Task StableWillNotRecommendUpdatingToPreview() var interactionService = sp.GetRequiredService(); // Use a custom notifier that overrides the current version - return new CliUpdateNotifierWithPackageVersionOverride("9.5.0", logger, nuGetPackageCache, interactionService); + return new CliUpdateNotifierWithPackageVersionOverride("9.4.0", logger, nuGetPackageCache, interactionService); }; });