Skip to content

Commit aa72d87

Browse files
gewarrengewarren
authored
Merge pull request #51220 from dotnet/main
Merge main into live
2 parents fae7c3d + 6880d3f commit aa72d87

317 files changed

Lines changed: 9709 additions & 2261 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.markdownlint-cli2.jsonc‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@
4848
"code_blocks": false,
4949
"names": [
5050
"ASP.NET",
51-
"PowerShell",
52-
"Orleans"
51+
"PowerShell"
5352
]
5453
},
5554
"MD046": {

‎.openpublishing.redirection.core.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -757,6 +757,10 @@
757757
"source_path_from_root": "/docs/core/dotnet-five.md",
758758
"redirect_url": "/dotnet/core/whats-new/dotnet-5"
759759
},
760+
{
761+
"source_path_from_root": "/docs/core/enrichment/application-metadata.md",
762+
"redirect_url": "/dotnet/core/diagnostics/ambient-metadata/application-metadata"
763+
},
760764
{
761765
"source_path_from_root": "/docs/core/extensions/artificial-intelligence.md",
762766
"redirect_url": "/dotnet/ai/microsoft-extensions-ai"

‎docs/ai/evaluation/snippets/evaluate-ai-responses/TestAI.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
<ItemGroup>
1212
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
1313
<PackageReference Include="Azure.Identity" Version="1.17.1" />
14-
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="10.1.1" />
15-
<PackageReference Include="Microsoft.Extensions.AI.Evaluation" Version="10.1.0" />
16-
<PackageReference Include="Microsoft.Extensions.AI.Evaluation.Quality" Version="10.1.0" />
14+
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="10.2.0" />
15+
<PackageReference Include="Microsoft.Extensions.AI.Evaluation" Version="10.2.0" />
16+
<PackageReference Include="Microsoft.Extensions.AI.Evaluation.Quality" Version="10.2.0" />
1717
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.4.0-preview.1.25207.5" />
18-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.1" />
19-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.1" />
18+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.2" />
19+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.2" />
2020
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
2121
<PackageReference Include="MSTest" Version="4.0.2" />
2222
</ItemGroup>

‎docs/ai/quickstarts/snippets/structured-output/SOChat.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
<ItemGroup>
1212
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
1313
<PackageReference Include="Azure.Identity" Version="1.17.1" />
14-
<PackageReference Include="Microsoft.Extensions.AI" Version="10.1.1" />
14+
<PackageReference Include="Microsoft.Extensions.AI" Version="10.2.0" />
1515
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.4.0-preview.1.25207.5" />
16-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.1" />
17-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.1" />
16+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.2" />
17+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.2" />
1818
</ItemGroup>
1919

2020
</Project>

‎docs/ai/snippets/microsoft-extensions-ai/ConsoleAI.CustomClientMiddle/ConsoleAI.CustomClientMiddle.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<ItemGroup>
1111
<PackageReference Include="OllamaSharp" Version="5.4.12" />
12-
<PackageReference Include="System.Threading.RateLimiting" Version="10.0.1" />
12+
<PackageReference Include="System.Threading.RateLimiting" Version="10.0.2" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

‎docs/ai/snippets/microsoft-extensions-ai/ConsoleAI.FunctionalityPipelines/ConsoleAI.FunctionalityPipelines.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.1" />
11+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.2" />
1212
<PackageReference Include="OllamaSharp" Version="5.4.12" />
13-
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.14.0" />
13+
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.15.0" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

‎docs/ai/snippets/microsoft-extensions-ai/ConsoleAI.GetStreamingResponseAsync/ConsoleAI.GetStreamingResponseAsync.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="OllamaSharp" Version="5.4.11" />
11+
<PackageReference Include="OllamaSharp" Version="5.4.12" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎docs/azure/azure-tools.md‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ title: Additional Azure Tools
33
description: This article describes additional tools and utilities for working with Azure and how you can install them.
44
ms.topic: concept-article
55
ms.custom: devx-track-dotnet, engagement-fy23, devx-track-azurepowershell
6-
ms.date: 8/15/2024
6+
ai-usage: ai-assisted
7+
ms.date: 01/16/2026
78
---
89

910
# Additional Tools for Azure Developers
@@ -33,12 +34,12 @@ Azure Storage Explorer is a free, GUI tool for managing storage resources and da
3334
> [!div class="nextstepaction"]
3435
> [Download Azure Storage Explorer](https://azure.microsoft.com/features/storage-explorer/)
3536
36-
## Azure Data Studio
37+
## GitHub Copilot for Azure
3738

38-
Azure Data Studio is a cross-platform database tool for accessing both on-premises and cloud databases. It allows you to edit and execute SQL queries in addition to charting and visualizing result sets. It supports all versions of SQL Server from SQL Server 2014 and later and Azure SQL. Azure Data Studio extensions also provide support for other database options such as MySQL, PostgreSQL, and Azure Cosmos DB. If you plan to work with Azure SQL, download and install Azure Data Studio.
39+
GitHub Copilot for Azure is an AI companion that helps you design, build, and operate cloud-native applications. It integrates with your editor to answer questions about Azure services, generate configuration, and troubleshoot issues. If you want to accelerate your Azure development with AI assistance, install GitHub Copilot for Azure.
3940

4041
> [!div class="nextstepaction"]
41-
> [Download Azure Data Studio](/sql/azure-data-studio/download-azure-data-studio)
42+
> [Get started with GitHub Copilot for Azure](/azure/developer/github-copilot-azure/get-started)
4243
4344
## Next steps
4445

‎docs/azure/configure-vs-code.md‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
title: Configure Visual Studio Code for Azure development with .NET
33
description: This article helps you configure Visual Studio Code for Azure development including getting the right plugins installed and configured in VS Code
44
ms.topic: concept-article
5-
ms.date: 8/15/2024
5+
ms.date: 01/16/2026
6+
ai-usage: ai-assisted
67
ms.custom:
78
- devx-track-dotnet
89
- vscode-azure-extension-update-completed
@@ -35,6 +36,18 @@ To install the extension from Visual Studio Code:
3536

3637
To learn more about installing extensions in Visual Studio Code, refer to the [Extension Marketplace](https://code.visualstudio.com/docs/editor/extension-gallery) document on the Visual Studio Code website.
3738

39+
### Install GitHub Copilot for Azure
40+
41+
[GitHub Copilot for Azure](https://marketplace.visualstudio.com/items?itemName=GitHub.copilot-chat-azure) connects GitHub Copilot Chat to your Azure subscription, enabling you to manage resources, troubleshoot issues, and deploy applications using natural language.
42+
43+
To install the extension from Visual Studio Code:
44+
45+
1. Open the **Extensions** view.
46+
1. Search for *GitHub Copilot for Azure*.
47+
1. Select the **Install** button.
48+
49+
This extension requires the GitHub Copilot and GitHub Copilot Chat extensions.
50+
3851
### Sign in to your Azure account with Azure Tools
3952

4053
On the left hand panel, you'll see an Azure icon. Select this icon, and a control panel for Azure services will appear. Choose **Sign in to Azure...** to complete the authentication process for the Azure tools in Visual Studio Code.

‎docs/azure/create-azure-account.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Create an Azure account
33
description: To use Azure, you need an Azure account. This article covers the three most common ways to sign up for an Azure account.
44
ms.topic: concept-article
55
ms.custom: devx-track-dotnet, engagement-fy23
6-
ms.date: 8/15/2024
6+
ms.date: 01/16/2026
77
---
88

99
# Create an Azure account

0 commit comments

Comments
 (0)