Merge branch 'main' into visual-studio-code-updates

Author: alexwolfmsft

.github/CODEOWNERS

@@ -65,7 +65,7 @@
 
 ############### AI ################
 
-/docs/ai/ @gewarren @alexwolfmsft @dotnet/docs
+/docs/ai/ @gewarren @dotnet/docs
 
 ############### Azure ################
 
@@ -100,7 +100,7 @@
 
 ############### .NET Core ########################
 # Breaking changes
-/docs/core/compatibility/ @dotnet/docs
+/docs/core/compatibility/ @gewarren @dotnet/docs
 # Containers
 /docs/core/containers/ @dotnet/docs
 # Deployment
@@ -120,9 +120,9 @@
 # Testing
 /docs/core/testing/ @IEvangelist @dotnet/docs
 # Tools
-/docs/core/tools/ @tdykstra @dotnet/docs
+/docs/core/tools/ @adegeo @dotnet/docs
 # Tutorials
-/docs/core/tutorials/ @tdykstra @dotnet/docs
+/docs/core/tutorials/ @BillWagner @dotnet/docs
 # What's new
 /docs/core/whats-new/ @dotnet/docs
 
@@ -179,7 +179,7 @@
 # Collections
 /docs/standard/collections/ @IEvangelist @dotnet/docs
 # System.CommandLine
-/docs/standard/commandline/ @tdykstra @dotnet/docs
+/docs/standard/commandline/ @gewarren @dotnet/docs
 # Data
 /docs/standard/data/ @gewarren @dotnet/docs
 # Data - SQLite

.github/workflows/dependency-review.yml

@@ -24,4 +24,4 @@ jobs:
       - name: 'Checkout Repository'
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@bc41886e18ea39df68b1b1245f4184881938e050 # v4.7.2
+        uses: actions/dependency-review-action@595b5aeba73380359d98a5e087f648dbb0edce1b # v4.7.3

.github/workflows/scorecards.yml

@@ -71,6 +71,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@96f518a34f7a870018057716cc4d7a5c014bd61c # v3.29.5
+        uses: github/codeql-action/upload-sarif@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.5
         with:
           sarif_file: results.sarif

.openpublishing.redirection.core.json

@@ -386,6 +386,14 @@
             "source_path_from_root": "/docs/core/deploying/applications.md",
             "redirect_url": "/dotnet/core/deploying/index"
         },
+        {
+            "source_path_from_root": "/docs/core/deploying/deploy-with-cli.md",
+            "redirect_url": "/dotnet/core/deploying/index"
+        },
+        {
+            "source_path_from_root": "/docs/core/deploying/deploy-with-vs.md",
+            "redirect_url": "/dotnet/core/deploying/index"
+        },
         {
             "source_path_from_root": "/docs/core/deploying/fixing-warnings.md",
             "redirect_url": "/dotnet/core/deploying/trimming/fixing-warnings",

docfx.json

@@ -918,6 +918,16 @@
                 "docs/csharp/misc/**/**.{md,yml}": "3650-days",
                 "docs/csharp/roslyn-sdk/**/**.{md,yml}": "1825-days",
                 "docs/csharp/specification/**/**.{md,yml}": "1825-days",
+                "docs/fsharp/**/**.{md,yml}": "1095-days",
+                "docs/fsharp/whats-new/**/**.{md,yml}": "365-days",
+                "docs/fsharp/tools/fsharp-interactive/**/**.{md,yml}": "1095-days",
+                "docs/fsharp/scenarios/**/**.{md,yml}": "1095-days",
+                "docs/fsharp/tutorials/**/**.{md,yml}": "1095-days",
+                "docs/fsharp/tutorials/type-providers/**/**.{md,yml}": "1825-days",
+                "docs/fsharp/language-reference/**/**.{md,yml}": "1825-days",
+                "docs/fsharp/language-reference/compiler-messages/**/**.{md,yml}": "3650-days",
+                "docs/fsharp/style-guide/**/**.{md,yml}": "1095-days",
+                "docs/fsharp/get-started/**/**.{md,yml}": "1095-days",
                 "docs/framework/**/*.md": "3650-days",
                 "docs/iot/**/**.{md,yml}": "1825-days",
                 "docs/visual-basic/**/**.{md,yml}": "3650-days",

docs/ai/includes/vector-databases.md

@@ -24,6 +24,6 @@ Semantic Kernel provides connectors for the following vector databases and servi
 | Postgres                      | [Microsoft.SemanticKernel.Connectors.Postgres](https://www.nuget.org/packages/Microsoft.SemanticKernel.Connectors.Postgres)            | [Npgsql](https://www.nuget.org/packages/Npgsql/)        |
 | Qdrant                        | [Microsoft.SemanticKernel.Connectors.Qdrant](https://www.nuget.org/packages/Microsoft.SemanticKernel.Connectors.Qdrant)               | [Qdrant.Client](https://www.nuget.org/packages/Qdrant.Client)         |
 | Redis                         | [Microsoft.SemanticKernel.Connectors.Redis](https://www.nuget.org/packages/Microsoft.SemanticKernel.Connectors.Redis)                    |  [StackExchange.Redis](https://www.nuget.org/packages/StackExchange.Redis)       |
-| Weaviate                      | [Microsoft.SemanticKernel.Connectors.Weaviate](https://www.nuget.org/packages/Microsoft.SemanticKernel.Connectors.Weaviate)            | [REST API](https://weaviate.io/developers/weaviate/api/rest)       |
+| Weaviate                      | [Microsoft.SemanticKernel.Connectors.Weaviate](https://www.nuget.org/packages/Microsoft.SemanticKernel.Connectors.Weaviate)            | [REST API](https://docs.weaviate.io/weaviate/api/rest)       |
 
 To discover .NET SDK and API support, visit the documentation for each respective service.

docs/ai/index.yml

@@ -8,7 +8,7 @@ metadata:
   description: Samples, tutorials, and education for building AI apps with .NET
   ms.topic: landing-page
   ms.service: dotnet
-  ms.date: 12/19/2024
+  ms.date: 8/26/2025
   author: alexwolfmsft
   ms.author: alexwolf
 

docs/ai/quickstarts/build-vector-search-app.md

@@ -80,7 +80,7 @@ Complete the following steps to create a .NET console app that can:
 
     - [`Azure.Identity`](https://www.nuget.org/packages/Azure.Identity) provides [`Microsoft Entra ID`](/entra/fundamentals/whatis) token authentication support across the Azure SDK using classes such as `DefaultAzureCredential`.
     - [`Azure.AI.OpenAI`](https://www.nuget.org/packages/Azure.AI.OpenAI) is the official package for using OpenAI's .NET library with the Azure OpenAI Service.
-    - [`Microsoft.Extensions.VectorData.Abstractions`](https://www.nuget.org/packages/Microsoft.Extensions.AI) enables Create-Read-Update-Delete (CRUD) and search operations on vector stores.
+    - [`Microsoft.Extensions.VectorData.Abstractions`](https://www.nuget.org/packages/Microsoft.Extensions.VectorData.Abstractions) enables Create-Read-Update-Delete (CRUD) and search operations on vector stores.
     - [`Microsoft.SemanticKernel.Connectors.InMemory`](https://www.nuget.org/packages/Microsoft.SemanticKernel.Connectors.InMemory) provides an in-memory vector store class to hold queryable vector data records.
     - [Microsoft.Extensions.Configuration](https://www.nuget.org/packages/Microsoft.Extensions.Configuration) provides an implementation of key-value pair—based configuration.
     - [`Microsoft.Extensions.Configuration.UserSecrets`](https://www.nuget.org/packages/Microsoft.Extensions.Configuration.UserSecrets) is a user secrets configuration provider implementation for `Microsoft.Extensions.Configuration`.
@@ -101,7 +101,7 @@ Complete the following steps to create a .NET console app that can:
     The following list describes each package in the `VectorDataAI` app:
 
     - [`Microsoft.Extensions.AI.OpenAI`](https://www.nuget.org/packages/Microsoft.Extensions.AI.OpenAI) provides AI abstractions for OpenAI-compatible models or endpoints. This library also includes the official [`OpenAI`](https://www.nuget.org/packages/OpenAI) library for the OpenAI service API as a dependency.
-    - [`Microsoft.Extensions.VectorData.Abstractions`](https://www.nuget.org/packages/Microsoft.Extensions.AI) enables Create-Read-Update-Delete (CRUD) and search operations on vector stores.
+    - [`Microsoft.Extensions.VectorData.Abstractions`](https://www.nuget.org/packages/Microsoft.Extensions.VectorData.Abstractions) enables Create-Read-Update-Delete (CRUD) and search operations on vector stores.
     - [`Microsoft.SemanticKernel.Connectors.InMemory`](https://www.nuget.org/packages/Microsoft.SemanticKernel.Connectors.InMemory) provides an in-memory vector store class to hold queryable vector data records.
     - [Microsoft.Extensions.Configuration](https://www.nuget.org/packages/Microsoft.Extensions.Configuration) provides an implementation of key-value pair—based configuration.
     - [`Microsoft.Extensions.Configuration.UserSecrets`](https://www.nuget.org/packages/Microsoft.Extensions.Configuration.UserSecrets) is a user secrets configuration provider implementation for `Microsoft.Extensions.Configuration`.

docs/ai/quickstarts/includes/ai-templates-github-models.md

@@ -89,25 +89,60 @@ To authenticate to GitHub models from your code, you'll need to [create a GitHub
 
 ## Configure the app
 
-The **AI Chat Web App** app is almost ready to go as soon as it's created. However, you need to configure the app to use the personal access token you set up for GitHub Models. By default, the app template searches for this value in the project's local .NET user secrets. You can manage user secrets using either the Visual Studio UI or the .NET CLI.
+The **AI Chat Web App** is almost ready to go as soon as it's created. However, you need to configure the app to use the personal access token you set up for GitHub Models. By default, the app template searches for this value in the project's local .NET user secrets. You can manage user secrets using either the Visual Studio UI or the .NET CLI.
 
-# [Visual Studio](#tab/configure-visual-studio)
+> [!NOTE]
+> If you enabled .NET Aspire for your app, skip to the [.NET Aspire configuration](#net-aspire-configuration) section.
+
+## [Visual Studio](#tab/configure-visual-studio)
 
-1. In Visual Studio, right-click on your project in the Solution Explorer and select **Manage User Secrets**. This opens a `secrets.json` file where you can store your API keys without them being tracked in source control.
+1. Right-click on your project in the Solution Explorer and select **Manage User Secrets**. This opens a `secrets.json` file where you can store your API keys without them being tracked in source control.
 
 2. Add the following key and value:
 
     ```json
     {
-        "GitHubModels:Token": "<your-personal-access-token>"
+        "GitHubModels:Token": "<your-gh-models-access-token>"
     }
     ```
 
-# [.NET CLI](#tab/configure-dotnet-cli)
+## [.NET CLI](#tab/configure-dotnet-cli)
 
-```dotnetcli
-dotnet user-secrets set GitHubModels:Token <your-personal-access-token>
-```
+1. Open a terminal window set to the root of your project.
+
+1. Run the `dotnet user-secrets set` command to set the user secret:
+
+    ```dotnetcli
+    dotnet user-secrets set GitHubModels:Token <your-gh-models-access-token>
+    ```
+
+---
+
+### .NET Aspire configuration
+
+To use the **AI Chat Web App** template with .NET Aspire orchestration, add the following configurations:
+
+#### [Visual Studio](#tab/configure-visual-studio-aspire)
+
+1. Right-click on your `*.AppHost` project in the Solution Explorer and select **Manage User Secrets**. This opens a `secrets.json` file where you can store your API keys without them being tracked in source control.
+
+2. Add the following key and value:
+
+    ```json
+    {
+        "ConnectionStrings:openai": "Endpoint=https://models.inference.ai.azure.com;Key=<your-gh-models-access-token>"
+    }
+    ```
+
+#### [.NET CLI](#tab/configure-dotnet-cli-aspire)
+
+1. Open a terminal window set to the root of your `*.AppHost` project.
+
+1. Run the `dotnet user-secrets set` command to set the user secret:
+
+    ```dotnetcli
+    dotnet user-secrets set ConnectionStrings:openai "Endpoint=https://models.inference.ai.azure.com;Key=<your-gh-models-access-token>"
+    ```
 
 ---
 

docs/ai/quickstarts/snippets/evaluate-ai-responses/TestAI.csproj

@@ -10,15 +10,15 @@
 
   <ItemGroup>
     <PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
-    <PackageReference Include="Azure.Identity" Version="1.14.2" />
-    <PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.7.1" />
-    <PackageReference Include="Microsoft.Extensions.AI.Evaluation" Version="9.7.0" />
-    <PackageReference Include="Microsoft.Extensions.AI.Evaluation.Quality" Version="9.7.0" />
+    <PackageReference Include="Azure.Identity" Version="1.15.0" />
+    <PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.8.0" />
+    <PackageReference Include="Microsoft.Extensions.AI.Evaluation" Version="9.8.0" />
+    <PackageReference Include="Microsoft.Extensions.AI.Evaluation.Quality" Version="9.8.0" />
     <PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.4.0-preview.1.25207.5" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.8" />
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.8" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
-    <PackageReference Include="MSTest" Version="3.10.1" />
+    <PackageReference Include="MSTest" Version="3.10.3" />
   </ItemGroup>
 
   <ItemGroup>