Skip to content

Remove implicit WaitFor in WithDbGate #630

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 3 commits into from
Apr 15, 2025
Merged

Remove implicit WaitFor in WithDbGate #630

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fcd6d6e
Remove implicit WaitFor in WithDbGate
Alirexaa Apr 13, 2025
f40f0fd
nit
Alirexaa Apr 13, 2025
102f012
nit
Alirexaa Apr 13, 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
1 change: 1 addition & 0 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,5 +101,6 @@

<ItemGroup Label=".NET 9 Overrides" Condition="'$(TargetFramework)' == 'net9.0'">
<PackageVersion Update="Microsoft.Extensions.Logging.Abstractions" Version="9.0.3" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.0" />
</ItemGroup>
</Project>
3 changes: 1 addition & 2 deletions src/CommunityToolkit.Aspire.Hosting.MongoDB.Extensions/MongoDBBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ public static IResourceBuilder<MongoDBServerResource> WithDbGate(this IResourceB
var dbGateBuilder = DbGateBuilderExtensions.AddDbGate(builder.ApplicationBuilder, containerName);

dbGateBuilder
.WithEnvironment(context => ConfigureDbGateContainer(context, builder.ApplicationBuilder))
.WaitFor(builder);
.WithEnvironment(context => ConfigureDbGateContainer(context, builder.ApplicationBuilder));

configureContainer?.Invoke(dbGateBuilder);

Expand Down
3 changes: 1 addition & 2 deletions src/CommunityToolkit.Aspire.Hosting.PostgreSQL.Extensions/PostgresBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ public static IResourceBuilder<PostgresServerResource> WithDbGate(this IResource
var dbGateBuilder = DbGateBuilderExtensions.AddDbGate(builder.ApplicationBuilder, containerName);

dbGateBuilder
.WithEnvironment(context => ConfigureDbGateContainer(context, builder.ApplicationBuilder))
.WaitFor(builder);
.WithEnvironment(context => ConfigureDbGateContainer(context, builder.ApplicationBuilder));

configureContainer?.Invoke(dbGateBuilder);

Expand Down
3 changes: 1 addition & 2 deletions src/CommunityToolkit.Aspire.Hosting.Redis.Extensions/RedisBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@ public static IResourceBuilder<RedisResource> WithDbGate(this IResourceBuilder<R
var dbGateBuilder = DbGateBuilderExtensions.AddDbGate(builder.ApplicationBuilder, containerName);

dbGateBuilder
.WithEnvironment(context => ConfigureDbGateContainer(context, builder.ApplicationBuilder))
.WaitFor(builder);
.WithEnvironment(context => ConfigureDbGateContainer(context, builder.ApplicationBuilder));

configureContainer?.Invoke(dbGateBuilder);

Expand Down
1 change: 1 addition & 0 deletions ....Hosting.SqlServer.Extensions/CommunityToolkit.Aspire.Hosting.SqlServer.Extensions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<!-- Workaround for https://github.com/dotnet/aspire/issues/7779 -->
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
<PackageReference Include="Microsoft.Extensions.Options"></PackageReference>
Copy link
Member Author

@Alirexaa Alirexaa Apr 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The build fails locally without this change.
build error

I wonder why CI does not fail.

CC @aaronpowell

Copy link
Member

@aaronpowell aaronpowell Apr 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a weird one. Would have to run the nuget why command to trace the package refs probably and find the conflict.

Or maybe it's a VS quirk. I only dev on the repo in VS Code, which should behave the same as VS, but I know there are quirks between them.

</ItemGroup>

</Project>
3 changes: 1 addition & 2 deletions src/CommunityToolkit.Aspire.Hosting.SqlServer.Extensions/SqlServerBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ public static IResourceBuilder<SqlServerServerResource> WithDbGate(this IResourc
var dbGateBuilder = DbGateBuilderExtensions.AddDbGate(builder.ApplicationBuilder, containerName);

dbGateBuilder
.WithEnvironment(context => ConfigureDbGateContainer(context, builder.ApplicationBuilder))
.WaitFor(builder);
.WithEnvironment(context => ConfigureDbGateContainer(context, builder.ApplicationBuilder));

configureContainer?.Invoke(dbGateBuilder);

Expand Down
Loading