Resolving FirestoreDb Instance for CloudFirestoreOptions in Program.cs

[SteGaff7]

My knowledge of dependency injection and the service provider during configuring services is quite limited so I might be missing something obvious, but I am struggling to work around the ASP0000 error when trying to pass my FirestoreDb singleton to the CloudFirestoreOptions while adding the Firestore Health Check.

What would you like to be added:
An overload which gives access to the service provider when adding the CloudFirestoreOptions (if this resolves the issue)
Automatically resolve FirestoreDb dependency using the registered instance during service registration

Why is this needed:
It would address the ASP0000 warning
It would prevent me from creating an instance of the database in the program.cs file and passing it to both service registration and health check method

Thanks
Stephen