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

dotnet · Oct 27, 2023 · abf00b5 · abf00b5
1 parent 56fad8f
commit abf00b5
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/...s.ServiceDiscovery.Abstractions/Microsoft.Extensions.ServiceDiscovery.Abstractions.csproj b/...s.ServiceDiscovery.Abstractions/Microsoft.Extensions.ServiceDiscovery.Abstractions.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>$(NetCurrent)</TargetFramework>
     <IsPackable>true</IsPackable>
+    <IsAotCompatible>true</IsAotCompatible>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...icrosoft.Extensions.ServiceDiscovery.Dns/Microsoft.Extensions.ServiceDiscovery.Dns.csproj b/...icrosoft.Extensions.ServiceDiscovery.Dns/Microsoft.Extensions.ServiceDiscovery.Dns.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>$(NetCurrent)</TargetFramework>
     <IsPackable>true</IsPackable>
+    <IsAotCompatible>true</IsAotCompatible>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...rosoft.Extensions.ServiceDiscovery.Yarp/Microsoft.Extensions.ServiceDiscovery.Yarp.csproj b/...rosoft.Extensions.ServiceDiscovery.Yarp/Microsoft.Extensions.ServiceDiscovery.Yarp.csproj
@@ -5,6 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsPackable>true</IsPackable>
+    <IsAotCompatible>true</IsAotCompatible>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...crosoft.Extensions.ServiceDiscovery/Configuration/ConfigurationServiceEndPointResolver.cs b/...crosoft.Extensions.ServiceDiscovery/Configuration/ConfigurationServiceEndPointResolver.cs
@@ -76,9 +76,10 @@ private ResolutionStatus ResolveInternal(ServiceEndPointCollectionSource endPoin
 
         // Read the endpoint from the configuration.
         // First check if there is a collection of sections
-        if (section.GetChildren().Any())
+        var children = section.GetChildren();
+        if (children.Any())
         {
-            var values = section.Get<List<string>>();
+            var values = children.Select(c => c.Value!).Where(s => !string.IsNullOrEmpty(s)).ToList();
             if (values is { Count: > 0 })
             {
                 // Use schemes if any of the URIs have a scheme set.

diff --git a/src/Microsoft.Extensions.ServiceDiscovery/Microsoft.Extensions.ServiceDiscovery.csproj b/src/Microsoft.Extensions.ServiceDiscovery/Microsoft.Extensions.ServiceDiscovery.csproj
@@ -1,8 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>$(NetCurrent)</TargetFramework>
     <IsPackable>true</IsPackable>
+    <IsAotCompatible>true</IsAotCompatible>
   </PropertyGroup>
 
   <ItemGroup>