Merged
Conversation
ghost
added
the
area-integrations
eerhardt
reviewed
Feb 14, 2024
Comment on lines
+111
to
+142
| // Resolving DbContext<TContextService> will resolve DbContextOptions<TContextImplementation>. | ||
| // We need to replace the DbContextOptions service descriptor to inject more logic. This won't be necessary once | ||
| // Aspire targets .NET 9 as EF will respect the calls to services.ConfigureDbContext<TContext>(). c.f. https://github.com/dotnet/efcore/pull/32518 | ||
|
|
||
| var oldDbContextOptionsDescriptor = builder.Services.FirstOrDefault(sd => sd.ServiceType == typeof(DbContextOptions<TContext>)); | ||
|
|
||
| if (oldDbContextOptionsDescriptor is null) | ||
| { | ||
| throw new InvalidOperationException($"DbContext<{typeof(TContext).Name}> was not registered"); | ||
| } | ||
|
|
||
| builder.Services.Remove(oldDbContextOptionsDescriptor); | ||
|
|
||
| var dbContextOptionsDescriptor = new ServiceDescriptor( | ||
| oldDbContextOptionsDescriptor.ServiceType, | ||
| oldDbContextOptionsDescriptor.ServiceKey, | ||
| factory: (sp, key) => | ||
| { | ||
| var dbContextOptions = oldDbContextOptionsDescriptor.ImplementationFactory?.Invoke(sp) as DbContextOptions<TContext>; | ||
|
|
||
| var optionsBuilder = dbContextOptions != null | ||
| ? new DbContextOptionsBuilder<TContext>(dbContextOptions) | ||
| : new DbContextOptionsBuilder<TContext>(); | ||
|
|
||
| optionsBuilder.UseSqlServer(options => options.EnableRetryOnFailure()); | ||
|
|
||
| return optionsBuilder.Options; | ||
| }, | ||
| oldDbContextOptionsDescriptor.Lifetime | ||
| ); | ||
|
|
||
| builder.Services.Add(dbContextOptionsDescriptor); |
Member
There was a problem hiding this comment.
Let's extract this into a common method so we don't have to duplicate this logic across all 5 EF components.
eerhardt
approved these changes
Feb 14, 2024
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Microsoft Reviewers: Open in CodeFlow