Move Microsoft.Extensions.ServiceDiscovery to dotnet/extensions #6868

eerhardt · 2025-09-30T17:32:14Z

I preserved git history using git filter-repo.

Then on top of that history, there is 1 commit for changing the libraries and tests to build cleanly. For now I disable any analyzer warnings that come up. #6871 tracks enabling the analyzers in these libraries in the future.

Contributes to dotnet/aspire#170.

NOTE: This PR shouldn't be "squashed" when merged. Instead it should be a merge commit.

Microsoft Reviewers: Open in CodeFlow

…343) * Service Discovery: Allow DNS and DNS SRV to be added independently

)

* Service Discovery: make host name propagation opt-in * Review feedback

* Last round of triple slash, I believe. * Revert Aspire.sln change * Update src/Aspire.Hosting.Azure.Provisioning/UserSecretsPathHelper.cs * Update src/Aspire.Hosting.Azure.Provisioning/UserSecretsPathHelper.cs --------- Co-authored-by: David Fowler <davidfowl@gmail.com>

* Last round of triple slash, I believe. * Revert Aspire.sln change * Update src/Aspire.Hosting.Azure.Provisioning/UserSecretsPathHelper.cs * Update src/Aspire.Hosting.Azure.Provisioning/UserSecretsPathHelper.cs --------- Co-authored-by: David Pine <david.pine@microsoft.com>

…elease/8.0-preview1' Related work items: #592, #602, #607, #617, #622, #624, #626, #627, #632, #638, #639, #640, #644, #647, #649, #650, #651, #652, #653, #656, #663

* Add additional debug logs to Service Discovery * Log message tweak * Use display name instead of GetType().Name for resolver names. Remove nameof

…elease/8.0-preview1' Related work items: #657, #670, #672, #681

* Add package descriptions and icons.

* Add package descriptions and icons. (#701) * Add package descriptions and icons. * Update src/Microsoft.Extensions.ServiceDiscovery/Microsoft.Extensions.ServiceDiscovery.csproj Co-authored-by: Eric Erhardt <eric.erhardt@microsoft.com> * Update src/Microsoft.Extensions.ServiceDiscovery.Dns/Microsoft.Extensions.ServiceDiscovery.Dns.csproj Co-authored-by: Reuben Bond <203839+ReubenBond@users.noreply.github.com> * Update src/Microsoft.Extensions.ServiceDiscovery/Microsoft.Extensions.ServiceDiscovery.csproj Co-authored-by: Reuben Bond <203839+ReubenBond@users.noreply.github.com> * Fix package icons. Use base arcade icon for ServiceDiscovery packages. Use the default Aspire icon for Aspire Hosting packages. --------- Co-authored-by: David Fowler <davidfowl@gmail.com> Co-authored-by: Eric Erhardt <eric.erhardt@microsoft.com> Co-authored-by: Reuben Bond <203839+ReubenBond@users.noreply.github.com>

…elease/8.0-preview1' Related work items: #682, #683

* Forward port package changes from release branch. * Remove unused dotnet-icon. --------- Co-authored-by: Eric Erhardt <eric.erhardt@microsoft.com>

When PublishTrimmed=true in an app that uses ServiceDiscovery, we get a warning that says: _ILLink : warning IL2105: Microsoft.Extensions.ServiceDiscovery.Abstractions.ServiceEndPointCollection: Type 'ServiceEndPointCollectionDebuggerView' was not found in the caller assembly nor in the base library. Type name strings used for dynamically accessing a type should be assembly qualified._ Fix this warning by using `typeof` instead of `nameof`.

* READMEs for Service Discovery * Update src/Microsoft.Extensions.ServiceDiscovery.Abstractions/README.md Co-authored-by: David Pine <david.pine@microsoft.com> * Update src/Microsoft.Extensions.ServiceDiscovery.Dns/README.md Co-authored-by: David Pine <david.pine@microsoft.com> * Update src/Microsoft.Extensions.ServiceDiscovery.Dns/README.md Co-authored-by: David Pine <david.pine@microsoft.com> * Update src/Microsoft.Extensions.ServiceDiscovery/README.md Co-authored-by: David Pine <david.pine@microsoft.com> * Update src/Microsoft.Extensions.ServiceDiscovery.Dns/README.md Co-authored-by: David Pine <david.pine@microsoft.com> * Update src/Microsoft.Extensions.ServiceDiscovery.Dns/README.md Co-authored-by: David Pine <david.pine@microsoft.com> * Update src/Microsoft.Extensions.ServiceDiscovery/README.md Co-authored-by: David Pine <david.pine@microsoft.com> * Update src/Microsoft.Extensions.ServiceDiscovery/README.md Co-authored-by: David Pine <david.pine@microsoft.com> * Update src/Microsoft.Extensions.ServiceDiscovery/README.md Co-authored-by: David Pine <david.pine@microsoft.com> * Update src/Microsoft.Extensions.ServiceDiscovery/README.md Co-authored-by: David Pine <david.pine@microsoft.com> * Update src/Microsoft.Extensions.ServiceDiscovery/README.md Co-authored-by: David Pine <david.pine@microsoft.com> * Update src/Microsoft.Extensions.ServiceDiscovery/README.md Co-authored-by: David Pine <david.pine@microsoft.com> * Update src/Microsoft.Extensions.ServiceDiscovery/README.md Co-authored-by: David Pine <david.pine@microsoft.com> * Update src/Microsoft.Extensions.ServiceDiscovery/README.md Co-authored-by: David Pine <david.pine@microsoft.com> --------- Co-authored-by: David Pine <david.pine@microsoft.com>

…esFromInternal

Merging internal commits from release/8.0-preview1

…view1-to-main [automated] Merge branch 'release/8.0-preview1' => 'main'

…880) * Service Discovery: fix shutdown blocking indefinitely in some cases * Update src/Microsoft.Extensions.ServiceDiscovery/Http/HttpServiceEndPointResolver.cs Co-authored-by: Eric Erhardt <eric.erhardt@microsoft.com> * Review feedback --------- Co-authored-by: Eric Erhardt <eric.erhardt@microsoft.com>

…sistent (#1160)

…ensions. For now, disable analyzers in the projects to get them building.

Copilot

Pull Request Overview

This PR moves the Microsoft.Extensions.ServiceDiscovery libraries and tests from their current location to the dotnet/extensions repository, preserving git history using git filter-repo. The primary purpose is to consolidate service discovery components into a dedicated repository with appropriate build configurations.

Transfer of all service discovery library source files and project configurations
Migration of comprehensive test suites covering DNS resolution, YARP integration, and core functionality
Addition of analyzer warning suppressions to maintain clean builds during the migration phase

Reviewed Changes

Copilot reviewed 131 out of 137 changed files in this pull request and generated no comments.

Show a summary per file

File	Description
test/Libraries/Microsoft.Extensions.ServiceDiscovery.Yarp.Tests/*	Test files for YARP service discovery integration with public API tests and functionality validation
test/Libraries/Microsoft.Extensions.ServiceDiscovery.Tests/*	Core service discovery test suite including resolver, configuration, and API validation tests
test/Libraries/Microsoft.Extensions.ServiceDiscovery.Dns.Tests/*	Comprehensive DNS resolver test suite with fuzzing tests, resolver functionality, and protocol validation
src/Libraries/Microsoft.Extensions.ServiceDiscovery/*	Core service discovery library with HTTP integration, configuration providers, and load balancing
src/Libraries/Microsoft.Extensions.ServiceDiscovery.Yarp/*	YARP reverse proxy integration for service discovery destination resolution
src/Libraries/Microsoft.Extensions.ServiceDiscovery.Dns/*	DNS-based service discovery provider with custom DNS resolver implementation
src/Shared/FxPolyfills/*	Framework compatibility polyfills for cross-platform and multi-targeting support

src/Libraries/Microsoft.Extensions.ServiceDiscovery.Abstractions/ServiceEndpointQuery.cs

src/Libraries/Microsoft.Extensions.ServiceDiscovery.Dns/DnsServiceEndpointProviderBase.cs

src/Libraries/Microsoft.Extensions.ServiceDiscovery.Dns/DnsSrvServiceEndpointProviderFactory.cs

src/Libraries/Microsoft.Extensions.ServiceDiscovery.Dns/FallbackDnsResolver.cs

src/Libraries/Microsoft.Extensions.ServiceDiscovery.Dns/Resolver/DnsResolver.cs

src/Libraries/Microsoft.Extensions.ServiceDiscovery.Yarp/README.md

...s/Microsoft.Extensions.ServiceDiscovery.Dns/Microsoft.Extensions.ServiceDiscovery.Dns.csproj

stephentoub · 2025-09-30T19:51:09Z

cc: @karelz

eng/packages/General-LTS.props

...rosoft.Extensions.ServiceDiscovery/Configuration/ConfigurationServiceEndpointProvider.Log.cs

joperezr

What do we want to do about the versioning of these packages? Currently the version in NuGet.org is 9.5, and this will start producing 9.10. Is that fine? I'm assuming so and we want these packages to align versioning with the rest of the extensions repo but asking just in case.

evgenyfedorov2

Approving on behalf of dotnet-extensions-fundamentals

eerhardt · 2025-10-01T14:43:55Z

What do we want to do about the versioning of these packages? Currently the version in NuGet.org is 9.5, and this will start producing 9.10. Is that fine? I'm assuming so and we want these packages to align versioning with the rest of the extensions repo but asking just in case.

This is what I was planning on doing. If Aspire can jump from 9.5 to 13.0, I think it will be OK if the ServiceDiscovery libraries jump from 9.5 to 9.10, and then continue using dotnet/extensions versioning going forward.

eerhardt · 2025-10-01T15:05:51Z

@joperezr - I believe this is ready to merge. However, it shouldn't be merged with a "Squash". Instead we should "Merge commit" so the history of the libraries are maintained. Can you enable this option?

dotnet-bot and others added 30 commits September 28, 2023 15:19

Initial commit

f65b56f

False positive. **BYPASS_SECRET_SCANNING**

727e5ea

Service Discovery: fail when no resolvers have been registered (#340)

ec97849

Service Discovery: Refactor DNS & DNS SRV providers into subclasses (#…

2bb9a6e

…343) * Service Discovery: Allow DNS and DNS SRV to be added independently

Add IHostNameFeature to propagate original host name to HttpClient (#460

ea510d7

)

Fix race in ServiceEndPointResolver (#511)

81b2daa

Fix one place where service discovery isn't AOT compatible (#540)

aad81ea

Service Discovery: make host name propagation opt-in (#548)

d2b0781

* Service Discovery: make host name propagation opt-in * Review feedback

Merged PR 35034: Merge branch 'release/8.0-preview1' into 'internal/r…

2febced

…elease/8.0-preview1' Related work items: #592, #602, #607, #617, #622, #624, #626, #627, #632, #638, #639, #640, #644, #647, #649, #650, #651, #652, #653, #656, #663

Add additional debug logs to Service Discovery (#672)

7fbb032

* Add additional debug logs to Service Discovery * Log message tweak * Use display name instead of GetType().Name for resolver names. Remove nameof

Add additional debug logs to Service Discovery (#672) (#678)

2371e8b

* Add additional debug logs to Service Discovery * Log message tweak * Use display name instead of GetType().Name for resolver names. Remove nameof

Merge branch 'release/8.0-preview1' into 'internal/release/8.0-preview1'

63ba7e9

Merged PR 35041: Merge branch 'release/8.0-preview1' into 'internal/r…

01862e7

…elease/8.0-preview1' Related work items: #657, #670, #672, #681

Add package descriptions and icons. (#701)

655a8a2

* Add package descriptions and icons.

Merge branch 'release/8.0-preview1' into 'internal/release/8.0-preview1'

3c56542

Merged PR 35083: Merge branch 'release/8.0-preview1' into 'internal/r…

84b747b

…elease/8.0-preview1' Related work items: #682, #683

Forward port package changes from release branch. (#722)

fd54a80

* Forward port package changes from release branch. * Remove unused dotnet-icon. --------- Co-authored-by: Eric Erhardt <eric.erhardt@microsoft.com>

Merge branch 'internal/release/8.0-preview1' into joperezr/MergeChang…

eab38c8

…esFromInternal

Fix NuGet Package Icons (#817)

aaf3fbf

Merge pull request #818 from dotnet/joperezr/MergeChangesFromInternal

ced627d

Merging internal commits from release/8.0-preview1

Merge branch 'release/8.0-preview1'

a0c7573

Merge pull request #828 from dotnet-maestro-bot/merge/release/8.0-pre…

cea4479

…view1-to-main [automated] Merge branch 'release/8.0-preview1' => 'main'

Use ValueStopWatch (#1148)

b51c429

Make behavior of IHttpClientBuilder.UseServiceDiscovery overloads con…

7050e5a

…sistent (#1160)

eerhardt added 2 commits September 30, 2025 09:35

Migrate Microsoft.Extensions.ServiceDiscovery to dotnet/extensions

0177e8d

Get ServiceDiscovery libraries and tests building clean in dotnet/ext…

0df2dc1

…ensions. For now, disable analyzers in the projects to get them building.

eerhardt requested review from radical, ReubenBond and joperezr September 30, 2025 17:32

eerhardt requested a review from a team as a code owner September 30, 2025 17:32

Copilot AI review requested due to automatic review settings September 30, 2025 17:32

eerhardt requested a review from a team as a code owner September 30, 2025 17:32

github-actions bot added the area-infrastructure label Sep 30, 2025

Copilot AI reviewed Sep 30, 2025

View reviewed changes

dotnet-policy-service bot assigned eerhardt Sep 30, 2025

ReubenBond approved these changes Sep 30, 2025

View reviewed changes

Remove FxPolyfills from the Shared.csproj

0034bee

stephentoub reviewed Sep 30, 2025

View reviewed changes

eerhardt mentioned this pull request Sep 30, 2025

Enable static analysis for Microsoft.Extensions.ServiceDiscovery #6871

Open

PR Feedback

675c83e

eerhardt mentioned this pull request Sep 30, 2025

Add more tests to Microsoft.Extensions.ServiceDiscovery.Dns and clean up code #6872

Open

joperezr reviewed Sep 30, 2025

View reviewed changes

eng/packages/General-LTS.props Show resolved Hide resolved

joperezr reviewed Sep 30, 2025

View reviewed changes

...rosoft.Extensions.ServiceDiscovery/Configuration/ConfigurationServiceEndpointProvider.Log.cs Show resolved Hide resolved

joperezr approved these changes Sep 30, 2025

View reviewed changes

evgenyfedorov2 approved these changes Oct 1, 2025

View reviewed changes

eerhardt mentioned this pull request Oct 1, 2025

Remove ServiceDiscovery libraries from the repo dotnet/aspire#11777

Open

Copilot AI mentioned this pull request Oct 1, 2025

Remove ServiceDiscovery libraries moved to dotnet/extensions dotnet/aspire#11778

Merged

19 tasks

joperezr merged commit d5cb8af into main Oct 1, 2025
6 checks passed

joperezr deleted the eerhardt/MoveServiceDiscovery branch October 1, 2025 18:17

davidfowl mentioned this pull request Oct 2, 2025

Using containerized Consul for service discovery dotnet/aspire#11740

Open

1 task

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Move Microsoft.Extensions.ServiceDiscovery to dotnet/extensions #6868

Move Microsoft.Extensions.ServiceDiscovery to dotnet/extensions #6868

Uh oh!

eerhardt commented Sep 30, 2025 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

stephentoub commented Sep 30, 2025

Uh oh!

Uh oh!

Uh oh!

joperezr left a comment

Uh oh!

evgenyfedorov2 left a comment

Uh oh!

eerhardt commented Oct 1, 2025 •

edited

Loading

Uh oh!

eerhardt commented Oct 1, 2025

Uh oh!

Uh oh!

Uh oh!

Move Microsoft.Extensions.ServiceDiscovery to dotnet/extensions #6868

Move Microsoft.Extensions.ServiceDiscovery to dotnet/extensions #6868

Uh oh!

Conversation

eerhardt commented Sep 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Microsoft Reviewers: Open in CodeFlow

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

stephentoub commented Sep 30, 2025

Uh oh!

Uh oh!

Uh oh!

joperezr left a comment

Choose a reason for hiding this comment

Uh oh!

evgenyfedorov2 left a comment

Choose a reason for hiding this comment

Uh oh!

eerhardt commented Oct 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

eerhardt commented Oct 1, 2025

Uh oh!

Uh oh!

Uh oh!

eerhardt commented Sep 30, 2025 •

edited

Loading

eerhardt commented Oct 1, 2025 •

edited

Loading