Merge pull request #44752 from dotnet/main

Merge main into live

Author: dotnet-policy-service[bot]

docs/ai/conceptual/understanding-tokens.md

@@ -80,7 +80,7 @@ The semantic relationships between the tokens can be analyzed by using these tok
 
 After it's trained, a model can calculate an embedding for text that contains multiple tokens. The model tokenizes the text, then calculates an overall embeddings value based on the learned embeddings of the individual tokens. This technique can be used for semantic document searches or adding [vector stores](/semantic-kernel/concepts/vector-store-connectors/) to an AI.
 
-During output generation, the model predicts a vector value for the next token in the sequence. The model then selects the next token from it's vocabulary based on this vector value. In practice, the model calculates multiple vectors by using various elements of the previous tokens' embeddings. The model then evaluates all potential tokens from these vectors and selects the most probable one to continue the sequence.
+During output generation, the model predicts a vector value for the next token in the sequence. The model then selects the next token from its vocabulary based on this vector value. In practice, the model calculates multiple vectors by using various elements of the previous tokens' embeddings. The model then evaluates all potential tokens from these vectors and selects the most probable one to continue the sequence.
 
 Output generation is an iterative operation. The model appends the predicted token to the sequence so far and uses that as the input for the next iteration, building the final output one token at a time.
 

docs/azure/includes/dotnet-all.md

@@ -400,7 +400,7 @@
 | Common | NuGet [2.2.1](https://www.nuget.org/packages/Microsoft.Azure.Common/2.2.1) |  |  |
 | Common - Dependencies | NuGet [1.0.0](https://www.nuget.org/packages/Microsoft.Azure.Common.Dependencies/1.0.0) |  |  |
 | Computer Vision | NuGet [7.0.1](https://www.nuget.org/packages/Microsoft.Azure.CognitiveServices.Vision.ComputerVision/7.0.1) |  | GitHub [7.0.1](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Azure.CognitiveServices.Vision.ComputerVision_6.0.0-preview.1/sdk/cognitiveservices/Vision.ComputerVision) |
-| Cosmos DB | NuGet [3.42.0](https://www.nuget.org/packages/Microsoft.Azure.Cosmos/3.42.0)<br>NuGet [3.47.0-preview.1](https://www.nuget.org/packages/Microsoft.Azure.Cosmos/3.47.0-preview.1) | [docs](https://learn.microsoft.com/dotnet/api/overview/azure/cosmosdb) | GitHub [3.42.0](https://github.com/Azure/azure-cosmos-dotnet-v3/tree/3.12.0/Microsoft.Azure.Cosmos) |
+| Cosmos DB | NuGet [3.42.0](https://www.nuget.org/packages/Microsoft.Azure.Cosmos/3.42.0)<br>NuGet [3.48.0-preview.0](https://www.nuget.org/packages/Microsoft.Azure.Cosmos/3.48.0-preview.0) | [docs](https://learn.microsoft.com/dotnet/api/overview/azure/cosmosdb) | GitHub [3.42.0](https://github.com/Azure/azure-cosmos-dotnet-v3/tree/3.12.0/Microsoft.Azure.Cosmos) |
 | Custom Image Search | NuGet [2.1.0-preview.1](https://www.nuget.org/packages/Microsoft.Azure.CognitiveServices.Search.BingCustomImageSearch/2.1.0-preview.1) |  | GitHub [2.1.0-preview.1](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Azure.CognitiveServices.Search.BingCustomImageSearch_2.1.0-preview.1/sdk/cognitiveservices/Search.BingCustomImageSearch) |
 | Custom Image Search | NuGet [2.0.0](https://www.nuget.org/packages/Microsoft.Azure.CognitiveServices.Search.CustomImageSearch/2.0.0) |  |  |
 | Custom Search | NuGet [2.1.0-preview.1](https://www.nuget.org/packages/Microsoft.Azure.CognitiveServices.Search.BingCustomSearch/2.1.0-preview.1) |  | GitHub [2.1.0-preview.1](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Azure.CognitiveServices.Search.BingCustomSearch_2.1.0-preview.1/sdk/cognitiveservices/Search.BingCustomSearch) |
@@ -478,7 +478,7 @@
 | App Service - API Apps Service | NuGet [0.9.64](https://www.nuget.org/packages/Microsoft.Azure.AppService.ApiApps.Service/0.9.64) |  |  |
 | Code Analyzers for Durable Functions | NuGet [0.5.0](https://www.nuget.org/packages/Microsoft.Azure.WebJobs.Extensions.DurableTask.Analyzers/0.5.0) |  | GitHub [0.5.0](https://github.com/Azure/azure-functions-durable-extension/tree/Analyzer-v0.3.0/src/WebJobs.Extensions.DurableTask.Analyzers) |
 | Cosmos DB - BulkExecutor | NuGet [2.5.1-preview](https://www.nuget.org/packages/Microsoft.Azure.CosmosDB.BulkExecutor/2.5.1-preview) |  | GitHub [2.5.1-preview](https://github.com/Azure/azure-cosmosdb-bulkexecutor-dotnet-getting-started) |
-| Cosmos DB - Direct | NuGet [3.37.9](https://www.nuget.org/packages/Microsoft.Azure.Cosmos.Direct/3.37.9) |  | GitHub [3.37.9](https://github.com/Azure/azure-cosmos-dotnet-v3) |
+| Cosmos DB - Direct | NuGet [3.37.10](https://www.nuget.org/packages/Microsoft.Azure.Cosmos.Direct/3.37.10) |  | GitHub [3.37.10](https://github.com/Azure/azure-cosmos-dotnet-v3) |
 | Cosmos DB - Encryption | NuGet [2.0.3](https://www.nuget.org/packages/Microsoft.Azure.Cosmos.Encryption/2.0.3)<br>NuGet [2.1.0-preview4](https://www.nuget.org/packages/Microsoft.Azure.Cosmos.Encryption/2.1.0-preview4) |  | GitHub [2.0.3](https://github.com/Azure/azure-cosmos-dotnet-v3/tree/releases/encryption/1.0.0-preview4/Microsoft.Azure.Cosmos.Encryption) |
 | Cosmos DB - Encryption | NuGet [1.0.0-preview07](https://www.nuget.org/packages/Microsoft.Azure.Cosmos.Encryption.Custom/1.0.0-preview07) |  |  |
 | Extensions - Caching Cosmos | NuGet [1.7.0](https://www.nuget.org/packages/Microsoft.Extensions.Caching.Cosmos/1.7.0) |  | GitHub [1.7.0](https://github.com/Azure/Microsoft.Extensions.Caching.Cosmos/tree/v1.0.0-preview4) |

docs/csharp/methods.md

@@ -163,14 +163,16 @@ You can also choose to define your methods with a statement body and a `return`
 
 :::code language="csharp" source="snippets/methods/return44.cs" id="snippet43":::
 
-To use a value returned from a method, the calling method can use the method call itself anywhere a value of the same type would be sufficient. You can also assign the return value to a variable. For example, the following three code examples accomplish the same goal:
+To use a value returned from a method, you can assign the return value to a variable:
+
+:::code language="csharp" source="snippets/methods/return44.cs" id="snippet47":::
+
+The calling method can also use the method call itself anywhere a value of the same type would be sufficient. For example, the following two code examples accomplish the same goal:
 
 :::code language="csharp" source="snippets/methods/return44.cs" id="snippet45":::
 
 :::code language="csharp" source="snippets/methods/return44.cs" id="snippet46":::
 
-:::code language="csharp" source="snippets/methods/return44.cs" id="snippet47":::
-
 Sometimes, you want your method to return more than a single value. You use *tuple types* and *tuple literals* to return multiple values. The tuple type defines the data types of the tuple's elements. Tuple literals provide the actual values of the returned tuple. In the following example, `(string, string, string, int)` defines the tuple type returned by the `GetPersonalInfo` method. The expression `(per.FirstName, per.MiddleName, per.LastName, per.Age)` is the tuple literal; the method returns the first, middle, and family name, along with the age, of a `PersonInfo` object.
 
 ```csharp

docs/csharp/snippets/methods/named1.cs

@@ -13,7 +13,7 @@ static void Main()
         var moto = new TestMotorcycle();
         moto.StartEngine();
         moto.AddGas(15);
-        int travelTime = moto.Drive(miles: 170, speed: 60);
+        int travelTime = moto.Drive(speed: 60, miles: 170);
         Console.WriteLine("Travel time: approx. {0} hours", travelTime);
     }
 }

docs/csharp/snippets/methods/return44.cs

@@ -1,5 +1,5 @@
 //<Snippet43>
-class SimpleMathExtnsion
+class SimpleMathExtension
 {
     public int DivideTwoNumbers(int number1, int number2)
     {
@@ -19,12 +19,25 @@ public int SquareANumber(int number) =>
 }
 //</Snippet44>
 
+static class TestSimpleMathExtension
+{
+    static void Main()
+    {
+        var obj = new SimpleMathExtension();
+        
+        //<Snippet47>
+        int result = obj.DivideTwoNumbers(6,2);
+        // The result is 3.
+        Console.WriteLine(result);
+        //</Snippet47>
+    }
+}
+
 static class TestSimpleMath
 {
     static void Main()
     {
         var obj = new SimpleMath();
-        var obj2 = new SimpleMathExtnsion();
 
         //<Snippet45>
         int result = obj.AddTwoNumbers(1, 2);
@@ -38,11 +51,5 @@ static void Main()
         // The result is 9.
         Console.WriteLine(result);
         //</Snippet46>
-
-        //<Snippet47>
-        result = obj2.DivideTwoNumbers(6,2);
-        // The result is 3.
-        Console.WriteLine(result);
-        //</Snippet47>
     }
 }

docs/framework/release-notes/2025/01-14-january-cumulative-update.md

@@ -22,7 +22,7 @@ This security update addresses a remote code execution vulnerability detailed in
 
 #### CLR
 
-Address crashes that can occur due to certain interactions between multi-module assembly native image usage and OS code integrity enforcement policy updates. (*Applies to: .NET Framework 4.8, 4.8.1.*)
+Address crashes that can occur due to certain interactions between multi-module assembly native image usage and OS code integrity enforcement policy updates. (*Applies to: .NET Framework 4.8, 4.8.1*)
 
 ## Known issues in this release
 

docs/framework/release-notes/2025/01-28-january-cumulative-update-preview.md

@@ -0,0 +1,49 @@
+---
+title: January 2025 cumulative update preview
+description: Learn about the improvements in the .NET Framework January 2025 cumulative update preview.
+ms.date: 01/28/2025
+---
+# January 2025 cumulative update preview
+
+_Released January 28, 2025_
+
+## Summary of what's new in this release
+
+- [Security improvements](#security-improvements)
+- [Quality and reliability improvements](#quality-and-reliability-improvements)
+
+### Security improvements
+
+There are no new security improvements in this release. This update is cumulative and contains all previously released security improvements.
+
+### Quality and reliability improvements
+
+#### CLR
+
+Addresses an issue with printing large number of pages due to an OutOfMemory exception. To apply this improvement, you must set the following AppContextSwitch. (*Applies to: .NET Framework 4.8, 4.8.1*)
+
+```
+<runtime>
+  <AppContextSwitchOverrides value="Switch.System.Windows.Controls.ReleaseDiscardableFontReasources=true"/>
+</runtime>
+```
+
+## Known issues in this release
+
+This release contains no known issues.
+
+## Summary tables
+
+The following table outlines the updates in this release.
+
+| Product version | Cumulative update preview |
+| --- | --- |
+| **Windows 11, version 24H2** | |
+| .NET Framework 3.5, 4.8.1 | [5050577](https://support.microsoft.com/kb/5050577) |
+| **Windows 11, version 22H2 and Windows 11, version 23H2** | |
+| .NET Framework 3.5, 4.8.1 | [5050578](https://support.microsoft.com/kb/5050578) |
+| **Windows 10, version 22H2** | **[5050593](https://support.microsoft.com/kb/5050593)** |
+| .NET Framework 3.5, 4.8 | [5050579](https://support.microsoft.com/kb/5050579) |
+| .NET Framework 3.5, 4.8.1 | [5050576](https://support.microsoft.com/kb/5050576) |
+
+The operating system row lists a KB that's used for update offering purposes. When the operating system KB is offered, the applicability logic determines the specific .NET Framework update(s) installed. Updates for individual .NET Framework versions are installed based on the version of .NET Framework that is already present on the device. Because of this, the operating system KB is not expected to be listed as installed updates on the device. The expected updates installed are the .NET Framework-specific version updates listed in the previous table.

docs/framework/release-notes/release-notes.md

@@ -1,7 +1,7 @@
 ---
 title: .NET Framework release information
 description: Improvements in the .NET Framework servicing cumulative updates.
-ms.date: 01/14/2025
+ms.date: 01/28/2025
 ---
 # .NET Framework release notes
 
@@ -11,7 +11,8 @@ The .NET Framework updates include cumulative security and reliability improveme
 
 .NET Framework cumulative update releases are discussed in detail in the following individual release notes:
 
-* January 14, 2025 - [cumulative update](./2025/01-14-january-cumulative-update.md) **New Release**
+* January 28, 2025 - [cumulative update preview](./2025/01-28-january-cumulative-update-preview.md) **New Release**
+* January 14, 2025 - [cumulative update](./2025/01-14-january-cumulative-update.md)
 * November 21, 2024 - [cumulative update preview](./2024/11-21-november-preview-cumulative-update.md)
 * November 12, 2024 - [security and quality rollup](./2024/11-12-november-security-and-quality-rollup.md)
 * Octber 22, 2024 - [cumulative update preview](./2024/10-22-october-preview-cumulative-update.md)

docs/framework/toc.yml

@@ -707,6 +707,8 @@ items:
       href: release-notes/2024/11-21-november-preview-cumulative-update.md
     - name: January 2025 cumulative update
       href: release-notes/2025/01-14-january-cumulative-update.md
+    - name: January 2025 cumulative update preview
+      href: release-notes/2025/01-28-january-cumulative-update-preview.md
   - name: What's new
     href: whats-new/index.md
   - name: What's new in accessibility

docs/standard/serialization/system-text-json/deserialization.md

@@ -1,7 +1,7 @@
 ---
 title: "How to deserialize JSON in C#"
 description: "Learn how to use the System.Text.Json namespace to deserialize from JSON in .NET. Includes sample code."
-ms.date: 10/19/2023
+ms.date: 02/11/2025
 no-loc: [System.Text.Json, Newtonsoft.Json]
 dev_langs:
   - "csharp"