Skip to content

Branding updates for 9.5.0 #10302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 9, 2025
Merged

Branding updates for 9.5.0 #10302

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff7bf55
Branding updates for 9.5.0
joperezr Jul 9, 2025
0c8d85b
Undo CLI test changes as those shouldn't be required
joperezr Jul 9, 2025
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
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<!-- This repo version -->
<MajorVersion>9</MajorVersion>
<MinorVersion>4</MinorVersion>
<MinorVersion>5</MinorVersion>
<PatchVersion>0</PatchVersion>
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
<PreReleaseVersionLabel>preview.1</PreReleaseVersionLabel>
Expand Down
4 changes: 2 additions & 2 deletions tests/Aspire.Cli.Tests/Commands/AddCommandTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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)
);
Expand Down
4 changes: 2 additions & 2 deletions tests/Aspire.Cli.Tests/Commands/NewCommandTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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)
);
Expand Down
4 changes: 2 additions & 2 deletions tests/Aspire.Cli.Tests/NuGet/NuGetPackageCacheTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
]);
};

Expand Down
24 changes: 12 additions & 12 deletions tests/Aspire.Cli.Tests/Utils/CliUpdateNotificationServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -58,7 +58,7 @@ public async Task PrereleaseWillRecommendUpgradeToPrereleaseOnSameVersionFamily(
var interactionService = sp.GetRequiredService<IInteractionService>();

// 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);
};
});

Expand All @@ -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]
Expand All @@ -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" },
Expand All @@ -112,7 +112,7 @@ public async Task PrereleaseWillRecommendUpgradeToStableInCurrentVersionFamily()
var interactionService = sp.GetRequiredService<IInteractionService>();

// 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);
};
});

Expand All @@ -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]
Expand Down Expand Up @@ -166,7 +166,7 @@ public async Task StableWillOnlyRecommendGoingToNewerStable()
var interactionService = sp.GetRequiredService<IInteractionService>();

// 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);
};
});

Expand All @@ -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" },
]);

Expand All @@ -216,7 +216,7 @@ public async Task StableWillNotRecommendUpdatingToPreview()
var interactionService = sp.GetRequiredService<IInteractionService>();

// 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);
};
});

Expand Down
Loading