Merge pull request #10891 from dotnet/main

Merge main into live
dotnet · Jan 30, 2025 · 9f0608b · 9f0608b
2 parents 8058d83 + e669d4a
commit 9f0608b
Show file tree

Hide file tree

Showing 22 changed files with 1,704 additions and 1,646 deletions.
diff --git a/snippets/csharp/System.Net.Http/HttpCompletionOption/HttpCompletionOptionSnippets.cs b/snippets/csharp/System.Net.Http/HttpCompletionOption/HttpCompletionOptionSnippets.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Net.Http;
+using System.Threading.Tasks;
+
+namespace HttpCompletionOptionSnippets
+{
+    class HttpCompletionOptionSnippets
+    {
+        public static async Task RunAsync()
+        {
+            //<SnippetHttpCompletionOption>
+            using var httpClient = new HttpClient();
+            httpClient.Timeout = TimeSpan.FromSeconds(30);
+            httpClient.MaxResponseContentBufferSize = 1_000; // This will be ignored
+
+            // Because we're specifying the ResponseHeadersRead option,
+            // the 30-second timeout applies only up until the headers are received.
+            // It does not affect future operations that interact with the response content.
+            using HttpResponseMessage response = await httpClient.GetAsync(
+                "http://localhost:12345/",
+                HttpCompletionOption.ResponseHeadersRead);
+
+            // Do other checks that don't rely on the content first, like status code validation.
+            response.EnsureSuccessStatusCode();
+
+            // Since the HttpClient.Timeout will not apply to reading the content,
+            // you must enforce it yourself, for example by using a CancellationTokenSource.
+            using var cancellationSource = new CancellationTokenSource(TimeSpan.FromSeconds(15));
+
+            // If you wish to enforce the MaxResponseContentBufferSize limit as well,
+            // you can do so by calling the LoadIntoBufferAsync helper first.
+            await response.Content.LoadIntoBufferAsync(1_000, cancellationSource.Token);
+
+            // Make sure to pass the CancellationToken to all methods.
+            string content = await response.Content.ReadAsStringAsync(cancellationSource.Token);
+            //</SnippetHttpCompletionOption>
+        }
+    }
+}
diff --git a/snippets/csharp/System.Net.Http/HttpCompletionOption/HttpCompletionOptionSnippets.csproj b/snippets/csharp/System.Net.Http/HttpCompletionOption/HttpCompletionOptionSnippets.csproj
@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net9.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>
diff --git a/snippets/csharp/System.Net.Http/HttpCompletionOption/Program.cs b/snippets/csharp/System.Net.Http/HttpCompletionOption/Program.cs
@@ -0,0 +1,15 @@
+using System;
+
+namespace HttpCompletionOptionSnippets
+{
+    class MetadataReaderSnippets
+    {
+        class Program
+        {
+            static async Task Main()
+            {
+                await HttpCompletionOptionSnippets.RunAsync();
+            }
+        }
+    }
+}
diff --git a/xml/Microsoft.SqlServer.Server/SqlMetaData.xml b/xml/Microsoft.SqlServer.Server/SqlMetaData.xml
@@ -176,19 +176,17 @@
 
  The following are the default values assigned to `dbType`, depending on the `SqlDbType` (the <xref:Microsoft.SqlServer.Server.SqlMetaData.XmlSchemaCollectionDatabase%2A>, <xref:Microsoft.SqlServer.Server.SqlMetaData.XmlSchemaCollectionName%2A>, <xref:Microsoft.SqlServer.Server.SqlMetaData.XmlSchemaCollectionOwningSchema%2A>, and <xref:Microsoft.SqlServer.Server.SqlMetaData.Type%2A> properties are set to `null`):
 
-|SqlDbType|Precision|Scale|Locale|Compare options|
-|---------------|---------------|-----------|------------|---------------------|
-|Binary|0|0|0|IgnoreCase, IgnoreKanaType, IgnoreWidth|
-|Char|0|0|\<thread>|IgnoreCase, IgnoreKanaType, IgnoreWidth|
-|Image|0|0|0|None|
-|NChar|0|0|\<thread>|IgnoreCase, IgnoreKanaType, IgnoreWidth|
-|NText|0|0|\<thread>|IgnoreCase, IgnoreKanaType, IgnoreWidth|
-|NVarChar|0|0|\<thread>|IgnoreCase, IgnoreKanaType, IgnoreWidth|
-|Text|0|0|\<thread>|IgnoreCase, IgnoreKanaType, IgnoreWidth|
-|VarBinary|0|0||IgnoreCase, IgnoreKanaType, IgnoreWidth|
-|VarChar|0|0|\<thread>|IgnoreCase, IgnoreKanaType, IgnoreWidth|
-
-
+| SqlDbType | Precision | Scale | Locale    | Compare options                         |
+|-----------|-----------|-------|-----------|-----------------------------------------|
+| Binary    | 0         | 0     | 0         | IgnoreCase, IgnoreKanaType, IgnoreWidth |
+| Char      | 0         | 0     | \<thread> | IgnoreCase, IgnoreKanaType, IgnoreWidth |
+| Image     | 0         | 0     | 0         | None                                    |
+| NChar     | 0         | 0     | \<thread> | IgnoreCase, IgnoreKanaType, IgnoreWidth |
+| NText     | 0         | 0     | \<thread> | IgnoreCase, IgnoreKanaType, IgnoreWidth |
+| NVarChar  | 0         | 0     | \<thread> | IgnoreCase, IgnoreKanaType, IgnoreWidth |
+| Text      | 0         | 0     | \<thread> | IgnoreCase, IgnoreKanaType, IgnoreWidth |
+| VarBinary | 0         | 0     |           | IgnoreCase, IgnoreKanaType, IgnoreWidth |
+| VarChar   | 0         | 0     | \<thread> | IgnoreCase, IgnoreKanaType, IgnoreWidth |
 
 ## Examples
  The following example creates a new <xref:Microsoft.SqlServer.Server.SqlMetaData> object by specifying the column name, a column data type of <xref:System.Data.SqlDbType>`.NVarChar`, and a maximum length of 12 characters.