Address Service Discovery API changes #40433
Description
Describe the issue or suggestion
Address Service Discovery API changes and fix xref issues found here: https://buildapi.docs.microsoft.com/Output/PullRequest/a3bda507-3390-de91-8f7f-26f90f4e5fc8/202404101407150662-40377/BuildReport?accessString=700698a55c10106aea6881fef9c273b8f8f302afa9f4cfc3cc4a828c5fc52e77
Related to dotnet/aspire#3114