Skip to content

Update to Aspire 9.4 #770

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
aaronpowell merged 11 commits into from
Jul 30, 2025
Merged

Update to Aspire 9.4 #770

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4ed5755
Update packages for Aspire 9.4
aaronpowell Jul 30, 2025
91cddc3
Fixing the usage of the GetValueAsync on ParameterResource
aaronpowell Jul 30, 2025
3ebd577
Using the new event callback model
aaronpowell Jul 30, 2025
e3b376e
More incorrect parameter usage
aaronpowell Jul 30, 2025
0c55b35
Fixing dapr tests
aaronpowell Jul 30, 2025
87180ae
Using an available cancellation token
aaronpowell Jul 30, 2025
47b3f6b
Fixing handling of async values in adminer serialization
aaronpowell Jul 30, 2025
d13c66c
Fixing dapr tests with Bicep changes from new packages
aaronpowell Jul 30, 2025
b66596c
Some how MinIO was dropped from the slnx
aaronpowell Jul 30, 2025
8e62285
Missed a test project for MinIO
aaronpowell Jul 30, 2025
8f30c88
Fixing dbgate test
aaronpowell Jul 30, 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
Prev Previous commit
Next Next commit
Some how MinIO was dropped from the slnx
  • Loading branch information
@aaronpowell
aaronpowell committed Jul 30, 2025
commit b66596cecef1e96563b181f27515f3bd0e663818
8 changes: 8 additions & 0 deletions CommunityToolkit.Aspire.slnx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,11 @@
<Project Path="examples/meilisearch/CommunityToolkit.Aspire.Hosting.Meilisearch.AppHost/CommunityToolkit.Aspire.Hosting.Meilisearch.AppHost.csproj" />
<Project Path="examples/meilisearch/CommunityToolkit.Aspire.Hosting.Meilisearch.ServiceDefaults/CommunityToolkit.Aspire.Hosting.Meilisearch.ServiceDefaults.csproj" />
</Folder>
<Folder Name="/examples/minio/">
<Project Path="examples/minio/CommunityToolkit.Aspire.Hosting.Minio.ApiService/CommunityToolkit.Aspire.Hosting.Minio.ApiService.csproj" />
<Project Path="examples/minio/CommunityToolkit.Aspire.Hosting.Minio.AppHost/CommunityToolkit.Aspire.Hosting.Minio.AppHost.csproj" />
<Project Path="examples/minio/CommunityToolkit.Aspire.Hosting.Minio.ServiceDefaults/CommunityToolkit.Aspire.Hosting.Minio.ServiceDefaults.csproj" />
</Folder>
<Folder Name="/examples/mongodb-ext/">
<Project Path="examples/mongodb-ext/CommunityToolkit.Aspire.Hosting.MongoDB.Extensions.AppHost/CommunityToolkit.Aspire.Hosting.MongoDB.Extensions.AppHost.csproj" />
</Folder>
Expand Down Expand Up @@ -161,6 +166,7 @@
<Project Path="src/CommunityToolkit.Aspire.Hosting.MailPit/CommunityToolkit.Aspire.Hosting.MailPit.csproj" />
<Project Path="src/CommunityToolkit.Aspire.Hosting.McpInspector/CommunityToolkit.Aspire.Hosting.McpInspector.csproj" />
<Project Path="src/CommunityToolkit.Aspire.Hosting.Meilisearch/CommunityToolkit.Aspire.Hosting.Meilisearch.csproj" />
<Project Path="src/CommunityToolkit.Aspire.Hosting.Minio/CommunityToolkit.Aspire.Hosting.Minio.csproj" />
<Project Path="src/CommunityToolkit.Aspire.Hosting.MongoDB.Extensions/CommunityToolkit.Aspire.Hosting.MongoDB.Extensions.csproj" />
<Project Path="src/CommunityToolkit.Aspire.Hosting.MySql.Extensions/CommunityToolkit.Aspire.Hosting.MySql.Extensions.csproj" />
<Project Path="src/CommunityToolkit.Aspire.Hosting.Ngrok/CommunityToolkit.Aspire.Hosting.Ngrok.csproj" />
Expand All @@ -181,6 +187,7 @@
<Project Path="src/CommunityToolkit.Aspire.Meilisearch/CommunityToolkit.Aspire.Meilisearch.csproj" />
<Project Path="src/CommunityToolkit.Aspire.Microsoft.Data.Sqlite/CommunityToolkit.Aspire.Microsoft.Data.Sqlite.csproj" />
<Project Path="src/CommunityToolkit.Aspire.Microsoft.EntityFrameworkCore.Sqlite/CommunityToolkit.Aspire.Microsoft.EntityFrameworkCore.Sqlite.csproj" />
<Project Path="src/CommunityToolkit.Aspire.Minio.Client/CommunityToolkit.Aspire.Minio.Client.csproj" />
<Project Path="src/CommunityToolkit.Aspire.OllamaSharp/CommunityToolkit.Aspire.OllamaSharp.csproj" />
<Project Path="src/CommunityToolkit.Aspire.RavenDB.Client/CommunityToolkit.Aspire.RavenDB.Client.csproj" />
<Project Path="src/CommunityToolkit.Aspire.SurrealDb/CommunityToolkit.Aspire.SurrealDb.csproj" />
Expand Down Expand Up @@ -208,6 +215,7 @@
<Project Path="tests/CommunityToolkit.Aspire.Hosting.MailPit.Tests/CommunityToolkit.Aspire.Hosting.MailPit.Tests.csproj" />
<Project Path="tests/CommunityToolkit.Aspire.Hosting.McpInspector.Tests/CommunityToolkit.Aspire.Hosting.McpInspector.Tests.csproj" />
<Project Path="tests/CommunityToolkit.Aspire.Hosting.Meilisearch.Tests/CommunityToolkit.Aspire.Hosting.Meilisearch.Tests.csproj" />
<Project Path="tests/CommunityToolkit.Aspire.Hosting.Minio.Tests/CommunityToolkit.Aspire.Hosting.Minio.Tests.csproj" />
<Project Path="tests/CommunityToolkit.Aspire.Hosting.MongoDB.Extensions.Tests/CommunityToolkit.Aspire.Hosting.MongoDB.Extensions.Tests.csproj" />
<Project Path="tests/CommunityToolkit.Aspire.Hosting.MySql.Extensions.Tests/CommunityToolkit.Aspire.Hosting.MySql.Extensions.Tests.csproj" />
<Project Path="tests/CommunityToolkit.Aspire.Hosting.Ngrok.Tests/CommunityToolkit.Aspire.Hosting.Ngrok.Tests.csproj" />
Expand Down
18 changes: 9 additions & 9 deletions tests/CommunityToolkit.Aspire.Hosting.Minio.Tests/MinioFunctionalTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public async Task StorageGetsCreatedAndUsable()

var passwordParameter = ParameterResourceBuilderExtensions.CreateDefaultPasswordParameter(distributedApplicationBuilder,
$"rootPassword");
distributedApplicationBuilder.Configuration["Parameters:rootPassword"] = passwordParameter.Value;
distributedApplicationBuilder.Configuration["Parameters:rootPassword"] = await passwordParameter.GetValueAsync(default);
var rootPasswordParameter = distributedApplicationBuilder.AddParameter(passwordParameter.Name);

var minio = distributedApplicationBuilder
Expand All @@ -39,9 +39,9 @@ public async Task StorageGetsCreatedAndUsable()

var webApplicationBuilder = Host.CreateApplicationBuilder();

webApplicationBuilder.Services.AddMinio(configureClient => configureClient
webApplicationBuilder.Services.AddMinio(async configureClient => configureClient
.WithEndpoint("localhost", minioEndpoint.Port)
.WithCredentials(rootUser, passwordParameter.Value)
.WithCredentials(rootUser, await passwordParameter.GetValueAsync(default))
.WithSSL(false)
.Build());

Expand Down Expand Up @@ -70,7 +70,7 @@ public async Task WithDataShouldPersistStateBetweenUsages(bool useVolume)

var passwordParameter = ParameterResourceBuilderExtensions.CreateDefaultPasswordParameter(builder1,
$"rootPassword");
builder1.Configuration["Parameters:rootPassword"] = passwordParameter.Value;
builder1.Configuration["Parameters:rootPassword"] = await passwordParameter.GetValueAsync(default);
var rootPasswordParameter = builder1.AddParameter(passwordParameter.Name);

var minio1 = builder1.AddMinioContainer("minio",
Expand Down Expand Up @@ -106,9 +106,9 @@ public async Task WithDataShouldPersistStateBetweenUsages(bool useVolume)
{
var webApplicationBuilder = Host.CreateApplicationBuilder();

webApplicationBuilder.Services.AddMinio(configureClient => configureClient
webApplicationBuilder.Services.AddMinio(async configureClient => configureClient
.WithEndpoint("localhost", minio1Endpoint.Port)
.WithCredentials(rootUser, passwordParameter.Value)
.WithCredentials(rootUser, await passwordParameter.GetValueAsync(default))
.WithSSL(false)
.Build());

Expand All @@ -127,7 +127,7 @@ public async Task WithDataShouldPersistStateBetweenUsages(bool useVolume)
}

using var builder2 = TestDistributedApplicationBuilder.Create(testOutputHelper);
builder2.Configuration["Parameters:rootPassword"] = passwordParameter.Value;
builder2.Configuration["Parameters:rootPassword"] = await passwordParameter.GetValueAsync(default);
var rootPasswordParameter2 = builder2.AddParameter(passwordParameter.Name);


Expand Down Expand Up @@ -159,9 +159,9 @@ public async Task WithDataShouldPersistStateBetweenUsages(bool useVolume)
{
var webApplicationBuilder = Host.CreateApplicationBuilder();

webApplicationBuilder.Services.AddMinio(configureClient => configureClient
webApplicationBuilder.Services.AddMinio(async configureClient => configureClient
.WithEndpoint("localhost", minio2Endpoint.Port)
.WithCredentials(rootUser, passwordParameter.Value)
.WithCredentials(rootUser, await passwordParameter.GetValueAsync(default))
.WithSSL(false)
.Build());

Expand Down
2 changes: 1 addition & 1 deletion tests/CommunityToolkit.Aspire.Hosting.Minio.Tests/MinioPublicApiTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,6 @@ public async Task VerifyMinioContainerResourceWithUserName()
.WithEndpoint("http", e => e.AllocatedEndpoint = new AllocatedEndpoint(e, "localhost", 2000));

var connectionString = await postgres.Resource.GetConnectionStringAsync();
Assert.Equal($"Endpoint=http://localhost:2000;AccessKey=user1;SecretKey={postgres.Resource.PasswordParameter.Value}", connectionString);
Assert.Equal($"Endpoint=http://localhost:2000;AccessKey=user1;SecretKey={await postgres.Resource.PasswordParameter.GetValueAsync(default)}", connectionString);
}
}
Loading