resolve merge conflict

Author: gewarren

.github/policies/disallow-edits.yml

@@ -16,8 +16,7 @@ configuration:
                   matchAny: true
                   excludedFiles:
                     - xml/Microsoft.Extensions.FileSystemGlobbing/*
-                    - xml/Microsoft.Extensions.FileSystemGlobbing.Abstractions/*
-                    - xml/Microsoft.Extensions.FileSystemGlobbing.Internal*/*
+                    - xml/Microsoft.Extensions.FileSystemGlobbing.*/*
               - filesMatchPattern:
                   matchAny: true
                   pattern: xml/System.Composition/*
@@ -51,9 +50,6 @@ configuration:
               - filesMatchPattern:
                   matchAny: true
                   pattern: xml/System.Runtime.Serialization/XsdDataContractExporter.xml
-              - filesMatchPattern:
-                  matchAny: true
-                  pattern: xml/System.Speech/*
         then:
             - addReply:
                 reply: >-

docfx.json

@@ -49,7 +49,7 @@
       "show_latex": true,
       "uhfHeaderId": "MSDocsHeader-DotNet",
       "apiPlatform": "dotnet",
-      "ms.topic": "managed-reference",
+      "ms.topic": "reference",
       "ms.service": "dotnet-api",
       "products": ["https://authoring-docs-microsoft.poolparty.biz/devrel/7696cda6-0510-47f6-8302-71bb5d2e28cf"],
       "feedback_system": "OpenSource",
@@ -146,6 +146,21 @@
       "langs": {
         "api/**.yml": ["csharp", "vb", "fsharp", "cpp"]
       },
+      "ms.topic": {
+        "api/Microsoft.Extensions**": "generated-reference",
+        "api/Microsoft.Extensions.FileSystemGlobbing**": "reference",
+        "api/System.Composition**": "generated-reference",
+        "api/System.Diagnostics.EventLog.Messages**": "generated-reference",
+        "api/System.Formats.Asn1**": "generated-reference",
+        "api/System.Formats.Cbor**": "generated-reference",
+        "api/System.Formats.Nrbf**": "generated-reference",
+        "api/System.Net.ServerSentEvents**": "generated-reference",
+        "api/System.Numerics.Tensors**": "generated-reference",
+        "api/System.Runtime.Serialization.Schema**": "generated-reference",
+        "api/System.Runtime.Serialization.ISerializationCodeDomSurrogateProvider.yml": "generated-reference",
+        "api/System.Runtime.Serialization.ImportOptions.yml": "generated-reference",
+        "api/System.Runtime.Serialization.XsdDataContractExporter.yml": "generated-reference"
+      },
       "open_to_public_contributors": {
         "api/Microsoft.Extensions**": false,
         "api/System.Composition**": false,
@@ -158,8 +173,7 @@
         "api/System.Runtime.Serialization.Schema**": false,
         "api/System.Runtime.Serialization.ISerializationCodeDomSurrogateProvider.yml": false,
         "api/System.Runtime.Serialization.ImportOptions.yml": false,
-        "api/System.Runtime.Serialization.XsdDataContractExporter.yml": false,
-        "api/System.Speech**": false
+        "api/System.Runtime.Serialization.XsdDataContractExporter.yml": false
       }
     },
     "dest": "_site",

snippets/csharp/Microsoft.Extensions.Configuration/ConfigurationBuilder/Overview/AppWithOptions.csproj

@@ -2,14 +2,14 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>

snippets/csharp/System.Net.Http/SocketsHttpHandler/ConnectCallback/program.cs

@@ -1,5 +1,4 @@
-using System;
-using System.IO;
+using System;
 using System.Net;
 using System.Net.Http;
 using System.Net.Sockets;
@@ -14,14 +13,17 @@ static async Task Main()
 
         handler.ConnectCallback = async (ctx, ct) =>
         {
+            DnsEndPoint dnsEndPoint = ctx.DnsEndPoint;
+            IPAddress[] addresses = await Dns.GetHostAddressesAsync(dnsEndPoint.Host, dnsEndPoint.AddressFamily, ct);
             var s = new Socket(SocketType.Stream, ProtocolType.Tcp) { NoDelay = true };
             try
             {
                 s.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.KeepAlive, true);
                 s.SetSocketOption(SocketOptionLevel.Tcp, SocketOptionName.TcpKeepAliveTime, 5);
                 s.SetSocketOption(SocketOptionLevel.Tcp, SocketOptionName.TcpKeepAliveInterval, 5);
                 s.SetSocketOption(SocketOptionLevel.Tcp, SocketOptionName.TcpKeepAliveRetryCount, 5);
-                await s.ConnectAsync(ctx.DnsEndPoint, ct);
+
+                await s.ConnectAsync(addresses, dnsEndPoint.Port, ct);
                 return new NetworkStream(s, ownsSocket: true);
             }
             catch