resolve merge conflict

Author: gewarren

.github/copilot-instructions.md

@@ -0,0 +1,17 @@
+Code comments should end with a period.
+
+When you add a code snippet to the XML remarks of an API, add the code as a separate code file (.cs file) and not as an inline (```) code block. Also add a .csproj file to compile the code if one doesn't already exist in the snippet folder.
+
+Don't use the word "may". Use "might" to indicate possibility or "can" to indicate permission.
+
+There should always be a comma before a clause that begins with "which".
+
+Use a conversational tone with contractions.
+
+Be concise.
+
+Break up long sentences.
+
+Use the present tense for instructions and descriptions. For example, "The method returns a value" instead of "The method will return a value."
+
+Use the Oxford comma in lists of three or more items.

snippets/csharp/System.Globalization/CultureInfo/DisplayName/getcultures.cs

@@ -32,7 +32,6 @@ CULTURE ISO ISO WIN DISPLAYNAME                              ENGLISHNAME
 ar      ar  ara ARA Arabic                                   Arabic
 bg      bg  bul BGR Bulgarian                                Bulgarian
 ca      ca  cat CAT Catalan                                  Catalan
-zh-Hans zh  zho CHS Chinese (Simplified)                     Chinese (Simplified)
 cs      cs  ces CSY Czech                                    Czech
 da      da  dan DAN Danish                                   Danish
 de      de  deu DEU German                                   German
@@ -41,9 +40,10 @@ en      en  eng ENU English                                  English
 es      es  spa ESP Spanish                                  Spanish
 fi      fi  fin FIN Finnish                                  Finnish
 zh      zh  zho CHS Chinese                                  Chinese
-zh-Hant zh  zho CHT Chinese (Traditional)                    Chinese (Traditional)
-zh-CHS  zh  zho CHS Chinese (Simplified) Legacy              Chinese (Simplified) Legacy
-zh-CHT  zh  zho CHT Chinese (Traditional) Legacy             Chinese (Traditional) Legacy
+zh-Hans zh  zho CHS Chinese (Simplified)                     Chinese (Simplified)
+zh-Hant zh  zho ZHH Chinese (Traditional)                    Chinese (Traditional)
+
+Note: zh-Hant returns ZHH when using ICU (default). When NLS mode is enabled, it returns CHT.
 
 */
 // </snippet1>

snippets/csharp/System.Net.Http/WinHttpHandler/Project.csproj

@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net9.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="9.0.6" />
+  </ItemGroup>
+
+</Project>

snippets/csharp/System.Net.Http/WinHttpHandler/program.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Net;
+using System.Net.Http;
+using System.Net.Security;
+
+class WinHttpHandler_SecureExample
+{
+    static void Main()
+    {
+        if (!OperatingSystem.IsWindows())
+        {
+            Console.WriteLine("This example requires Windows.");
+            return;
+        }
+        // <Snippet1>
+        var handler = new WinHttpHandler();
+        handler.ServerCertificateValidationCallback = (httpRequestMessage, certificate, chain, sslPolicyErrors) =>
+        {
+            if (sslPolicyErrors == SslPolicyErrors.None)
+            {
+                // TODO: Implement additional custom certificate validation logic here.
+                return true;
+            }
+            // Do not allow this client to communicate with unauthenticated servers.
+            return false;
+        };
+        // </Snippet1>
+    }
+}

snippets/csharp/System.Security.Cryptography.X509Certificates/X509Chain/Overview/chainelements-ordering.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Security.Cryptography.X509Certificates;
+
+public class ChainElementsOrdering
+{
+    public static void DemonstrateChainElementsOrdering(X509Certificate2 certificate)
+    {
+//<SNIPPET6>
+        using var chain = new X509Chain();
+        chain.Build(certificate);
+
+        // chain.ChainElements[0] is the leaf (end-entity) certificate
+        // chain.ChainElements[^1] is the root (trust anchor) certificate
+
+        Console.WriteLine("Certificate chain from leaf to root:");
+        for (int i = 0; i < chain.ChainElements.Count; i++)
+        {
+            var cert = chain.ChainElements[i].Certificate;
+            var role = i == 0 ? "Leaf" : 
+                       i == chain.ChainElements.Count - 1 ? "Root" : "Intermediate";
+            Console.WriteLine($"[{i}] {role}: {cert.Subject}");
+        }
+//</SNIPPET6>
+    }
+}