Skip to content

Update Aspire version to 9.2.0 #627

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 10 commits into from
Apr 20, 2025
Merged

Update Aspire version to 9.2.0 #627

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0a3cf7b
Update Aspire version
MackinnonBuck Apr 10, 2025
80a8d54
Updating the version of the CT
aaronpowell Apr 11, 2025
3fcdafe
Fixing ollama tests
aaronpowell Apr 11, 2025
de5fa77
Fixing test to match the updated Bicep output
aaronpowell Apr 11, 2025
78c8999
Update ResourceCreationTests.cs
FullStackChef Apr 18, 2025
e639bc0
Merge branch 'main' into mbuck/update-aspire-version
Alirexaa Apr 19, 2025
0c6da73
Populate redis password in dbgate
Alirexaa Apr 19, 2025
f37550b
Fix redis-password tests
Alirexaa Apr 19, 2025
827e14d
Fix test
Alirexaa Apr 19, 2025
ed37a9d
Merge branch 'main' into mbuck/update-aspire-version
Alirexaa Apr 19, 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 Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<Nullable>enable</Nullable>

<AspireMajorVersion>9</AspireMajorVersion>
<AspireVersion>$(AspireMajorVersion).1.0</AspireVersion>
<AspireVersion>$(AspireMajorVersion).2.0</AspireVersion>
<AspireAppHostSdkVersion>$(AspireVersion)</AspireAppHostSdkVersion>
<AspNetCoreVersion>9.0.0</AspNetCoreVersion>
<DotNetExtensionsVersion>9.0.3</DotNetExtensionsVersion>
Expand Down
20 changes: 11 additions & 9 deletions src/CommunityToolkit.Aspire.Hosting.Java/JavaAppHostingExtension.Executable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,16 +107,18 @@ public static IResourceBuilder<JavaAppExecutableResource> WithMavenBuild(
await BuildWithMaven(builder.Resource, context.ServiceProvider, context.CancellationToken, false).ConfigureAwait(false) ?
new ExecuteCommandResult { Success = true } :
new ExecuteCommandResult { Success = false, ErrorMessage = "Failed to build with Maven" },
(context) => context.ResourceSnapshot.State switch
new CommandOptions()
{
{ Text: "Stopped" } or
{ Text: "Exited" } or
{ Text: "Finished" } or
{ Text: "FailedToStart" } => ResourceCommandState.Enabled,
_ => ResourceCommandState.Disabled
},
iconName: "build"
);
IconName = "build",
UpdateState = (context) => context.ResourceSnapshot.State switch
{
{ Text: "Stopped" } or
{ Text: "Exited" } or
{ Text: "Finished" } or
{ Text: "FailedToStart" } => ResourceCommandState.Enabled,
_ => ResourceCommandState.Disabled
},
});

return builder;

Expand Down
20 changes: 9 additions & 11 deletions src/CommunityToolkit.Aspire.Hosting.Ollama/OllamaResourceBuilderExtensions.Model.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,10 +145,6 @@ private static IResourceBuilder<OllamaModelResource> AddModelResourceCommand(
builder.WithCommand(
name: name,
displayName: displayName,
updateState: context =>
context.ResourceSnapshot.State?.Text == KnownResourceStates.Running ?
ResourceCommandState.Enabled :
ResourceCommandState.Disabled,
executeCommand: async context =>
{
var modelResource = builder.Resource;
Expand All @@ -165,13 +161,15 @@ private static IResourceBuilder<OllamaModelResource> AddModelResourceCommand(

return await executeCommand(modelResource, ollamaClient, logger, notificationService, context.CancellationToken);
},
displayDescription: displayDescription,
parameter: parameter,
confirmationMessage: confirmationMessage,
iconName: iconName,
iconVariant: iconVariant,
isHighlighted: isHighlighted
);
commandOptions: new()
{
Description = displayDescription,
Parameter = parameter,
ConfirmationMessage = confirmationMessage,
IconName = iconName,
IconVariant = iconVariant,
IsHighlighted = isHighlighted
});

private static IResourceBuilder<OllamaModelResource> WithModelDownload(this IResourceBuilder<OllamaModelResource> builder)
{
Expand Down
13 changes: 8 additions & 5 deletions src/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects/SqlProjectBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,11 +215,14 @@ internal static IResourceBuilder<TResource> InternalWithReference<TResource>(thi
var service = context.ServiceProvider.GetRequiredService<SqlProjectPublishService>();
await service.PublishSqlProject(builder.Resource, target.Resource, targetDatabaseName, context.CancellationToken);
return new ExecuteCommandResult { Success = true };
}, updateState: (context) => context.ResourceSnapshot?.State?.Text == KnownResourceStates.Finished ? ResourceCommandState.Enabled : ResourceCommandState.Disabled,
displayDescription: "Redeploys the SQL Server Database Project to the target database.",
iconName: "ArrowReset",
iconVariant: IconVariant.Filled,
isHighlighted: true);
}, new CommandOptions()
{
Description = "Redeploys the SQL Server Database Project to the target database.",
IconName = "ArrowReset",
IconVariant = IconVariant.Filled,
IsHighlighted = true,
UpdateState = (context) => context.ResourceSnapshot?.State?.Text == KnownResourceStates.Finished ? ResourceCommandState.Enabled : ResourceCommandState.Disabled,
});

return builder;
}
Expand Down
3 changes: 2 additions & 1 deletion tests/CommunityToolkit.Aspire.Hosting.Bun.Tests/AddBunAppTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,9 @@ public void AddBunNullNameThrows()
public void AddBunEmptyNameThrows()
{
var builder = DistributedApplication.CreateBuilder();
var name = "";

Assert.Throws<ArgumentException>(() => builder.AddBunApp(""));
Assert.Throws<ArgumentException>(() => builder.AddBunApp(name));
}

[Fact]
Expand Down
9 changes: 6 additions & 3 deletions tests/CommunityToolkit.Aspire.Hosting.Ngrok.Tests/AddNgrokTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ public void AddNgrokEmptyNameThrows()
{
var builder = DistributedApplication.CreateBuilder();

Assert.Throws<ArgumentException>(() => builder.AddNgrok(""));
var name = "";
Assert.Throws<ArgumentException>(() => builder.AddNgrok(name));
}

[Fact]
Expand All @@ -64,16 +65,18 @@ public void AddNgrokWhitespaceConfigurationFolderThrows()
public void AddNgrokEmptyEndpointNameFolderThrows()
{
var builder = DistributedApplication.CreateBuilder();
var endpointName = "";

Assert.Throws<ArgumentException>(() => builder.AddNgrok("ngrok", endpointName: ""));
Assert.Throws<ArgumentException>(() => builder.AddNgrok("ngrok", endpointName));
}

[Fact]
public void AddNgrokWhitespaceEndpointNameFolderThrows()
{
var builder = DistributedApplication.CreateBuilder();
var endpointName = " ";

Assert.Throws<ArgumentException>(() => builder.AddNgrok("ngrok", endpointName: " "));
Assert.Throws<ArgumentException>(() => builder.AddNgrok("ngrok", endpointName));
}

[Fact]
Expand Down
Loading