Skip to content

Merge main into live #50760

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dotnet-policy-service wants to merge 23 commits into from
Closed

Merge main into live #50760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
a5fd0e2
Fix package reference in MCP server quickstart note (#50730)
Copilot Dec 23, 2025
37c026f
Clarify file-based apps documentation per PR feedback (#50723)
Copilot Dec 23, 2025
ee6c7e4
Remove duplicate ErrObject.Raise entry (#50748)
gewarren Dec 23, 2025
2456219
More Try.NET cleanup (#50732)
gewarren Dec 23, 2025
818de67
Change section headers in logging.md (#50743)
gewarren Dec 23, 2025
9f046a5
Use H2 headings instead of H3 (#50736)
gewarren Dec 23, 2025
ba14c80
Acrolinx pass on a few diagnostics tutorials (#50749)
gewarren Dec 24, 2025
eca55b3
Bump the dotnet group with 1 update (#50757)
dependabot[bot] Dec 24, 2025
9e641ef
Bump the dotnet group with 1 update (#50765)
dependabot[bot] Dec 24, 2025
7945fd3
Bump the dotnet group with 1 update (#50767)
dependabot[bot] Dec 24, 2025
a28b4e4
Bump the dotnet group with 2 updates (#50768)
dependabot[bot] Dec 24, 2025
9bccaa7
Bump the dotnet group with 1 update (#50770)
dependabot[bot] Dec 24, 2025
9f1e99f
Bump the dotnet group with 2 updates (#50771)
dependabot[bot] Dec 24, 2025
faf702e
Bump the dotnet group with 3 updates (#50779)
dependabot[bot] Dec 24, 2025
7c30a73
Bump the dotnet group with 2 updates (#50787)
dependabot[bot] Dec 24, 2025
e6880aa
Bump the dotnet group with 2 updates (#50788)
dependabot[bot] Dec 24, 2025
f97e99a
Bump the dotnet group with 2 updates (#50786)
dependabot[bot] Dec 24, 2025
cda814d
Bump the dotnet group with 1 update (#50789)
dependabot[bot] Dec 24, 2025
9006436
Bump the dotnet group with 1 update (#50794)
dependabot[bot] Dec 24, 2025
9352d17
Bump the dotnet group with 1 update (#50796)
dependabot[bot] Dec 24, 2025
f00deb9
Bump the dotnet group with 2 updates (#50797)
dependabot[bot] Dec 24, 2025
a9b208a
Remove trailing periods from option descriptions (#50808)
adamralph Dec 29, 2025
fde0a56
Correct Median calculation in Extensions.cs (#50813)
jszumigaj Dec 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/ai/evaluation/snippets/evaluate-safety/EvaluateResponseSafety.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<ItemGroup>
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
<PackageReference Include="Azure.Identity" Version="1.17.1" />
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="10.1.0" />
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="10.1.1" />
<PackageReference Include="Microsoft.Extensions.AI.Evaluation" Version="10.1.0" />
<PackageReference Include="Microsoft.Extensions.AI.Evaluation.Reporting" Version="10.1.0" />
<PackageReference Include="Microsoft.Extensions.AI.Evaluation.Safety" Version="9.5.0-preview.1.25265.7" />
Expand Down
2 changes: 1 addition & 1 deletion docs/ai/quickstarts/build-mcp-server.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ms.author: alexwolf
In this quickstart, you create a minimal Model Context Protocol (MCP) server using the [C# SDK for MCP](https://github.com/modelcontextprotocol/csharp-sdk), connect to it using GitHub Copilot, and publish it to NuGet. MCP servers are services that expose capabilities to clients through the Model Context Protocol (MCP).

> [!NOTE]
> The `Microsoft.Extensions.AI.Templates` experience is currently in preview. The template uses the [ModelContextProtocol](https://www.nuget.org/packages/ModelContextProtocol/) library and the [MCP registry `server.json` schema](https://github.com/modelcontextprotocol/registry/blob/main/docs/reference/server-json/generic-server-json.md), which are both in preview.
> The `Microsoft.McpServer.ProjectTemplates` template package is currently in preview.

## Prerequisites

Expand Down
6 changes: 3 additions & 3 deletions docs/ai/quickstarts/snippets/image-generation/azure-openai/ImagesAzureOpenAI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Azure.Identity" Version="1.17.0" />
<PackageReference Include="Azure.Identity" Version="1.17.1" />
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.10" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.10" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.1" />

</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion docs/ai/quickstarts/snippets/image-generation/openai/ImagesOpenAI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="OpenAI" Version="2.7.0" />
<PackageReference Include="OpenAI" Version="2.8.0" />
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.4.0-preview.1.25207.5" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.1" />
Expand Down
2 changes: 1 addition & 1 deletion docs/ai/quickstarts/snippets/mcp-server/SampleMcpServer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.1" />
<PackageReference Include="ModelContextProtocol" Version="0.4.0-preview.3" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions docs/ai/quickstarts/snippets/text-to-image/azure-openai/TextToImageAzureOpenAI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<ItemGroup>
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.10.1-preview.1.25521.4" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.1" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions ...snippets/microsoft-extensions-ai/ConsoleAI.CacheResponses/ConsoleAI.CacheResponses.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="OllamaSharp" Version="5.4.11" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0" />
<PackageReference Include="OllamaSharp" Version="5.4.12" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...s-ai/ConsoleAI.ConsumeRateLimitingEmbedding/ConsoleAI.ConsumeRateLimitingEmbedding.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="OllamaSharp" Version="5.4.8" />
<PackageReference Include="OllamaSharp" Version="5.4.12" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions ...ft-extensions-ai/ConsoleAI.FunctionalityPipelines/ConsoleAI.FunctionalityPipelines.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0" />
<PackageReference Include="OllamaSharp" Version="5.4.11" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.1" />
<PackageReference Include="OllamaSharp" Version="5.4.12" />
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.14.0" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions docs/ai/snippets/microsoft-extensions-ai/ConsoleAI/ConsoleAI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.AI" Version="10.0.0" />
<PackageReference Include="OllamaSharp" Version="5.4.11" />
<PackageReference Include="Microsoft.Extensions.AI" Version="10.1.1" />
<PackageReference Include="OllamaSharp" Version="5.4.12" />
</ItemGroup>

<ItemGroup>
Expand Down
12 changes: 6 additions & 6 deletions docs/core/diagnostics/observability-applicationinsights.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: "Example: Use OpenTelemetry with Azure Monitor and Application Insights"
description: An walkthrough of how to use OpenTelemetry in .NET to export telemetry to Application Insights
description: A walkthrough of how to use OpenTelemetry in .NET to export telemetry to Application Insights
ms.date: 8/21/2024
ms.topic: concept-article
ms.custom: sfi-ropc-nochange
Expand All @@ -14,7 +14,7 @@ There are many commercial Application Performance Management (APM) systems avail

To make the ASP.NET experience with Azure Monitor easier, a wrapper package (called a Distro in OTel parlance) is provided that does most of the heavy lifting of configuring OpenTelemetry.

This example is based off the [OTLP walkthrough](./observability-otlp-example.md). Follow the steps 1-5 to create the application code using the OTLP exporter. In this example, we will extend the code to send data to Application Insights.
This example is based off the [OTLP walkthrough](./observability-otlp-example.md). Follow the steps 1-5 to create the application code using the OTLP exporter. In this example, you extend the code to send data to Application Insights.

Take the same project from [Step 5](./observability-otlp-example.md#5-configure-opentelemetry-with-the-correct-providers) and add the following NuGet package:

Expand All @@ -27,19 +27,19 @@ Take the same project from [Step 5](./observability-otlp-example.md#5-configure-
> [!NOTE]
> Replace the version with the latest available

## 2. Setup the exporter
## 2. Set up the exporter

Add the following OTel initialization code before `builder.Build();`:

:::code language="csharp" source="snippets/OTLP-Example/csharp/Program.cs" id="Snippet_AzureMonitor":::

[`UseAzureMonitor()`](https://github.com/Azure/azure-sdk-for-net/blob/d51f02c6ef46f2c5d9b38a9d8974ed461cde9a81/sdk/monitor/Azure.Monitor.OpenTelemetry.AspNetCore/src/OpenTelemetryBuilderExtensions.cs#L80) is the magic that will add the common instrumentation libraries and exporters for Application Insights. You just need to add your custom `Meter` and `ActivitySource` names to the registration.
[`UseAzureMonitor()`](https://github.com/Azure/azure-sdk-for-net/blob/d51f02c6ef46f2c5d9b38a9d8974ed461cde9a81/sdk/monitor/Azure.Monitor.OpenTelemetry.AspNetCore/src/OpenTelemetryBuilderExtensions.cs#L80) is the magic that adds the common instrumentation libraries and exporters for Application Insights. You just need to add your custom `Meter` and `ActivitySource` names to the registration.

The same OTel initialization works for OTLP as for Application Insights, the difference is which exporters you select. You can use both in the same application, and select between them by defining the appropriate environment variables.

## 3. Specify the connection string

If you're not already an Azure customer, you can create a free account at [https://azure.microsoft.com/free/](https://azure.microsoft.com/pricing/purchase-options/azure-account?cid=msft_learn). Log in to the Azure Portal, and either select an existing Application Insights resource or create a new one with [https://ms.portal.azure.com/#create/Microsoft.AppInsights](https://ms.portal.azure.com/#create/Microsoft.AppInsights).
If you're not already an Azure customer, you can create a free account at [https://azure.microsoft.com/free/](https://azure.microsoft.com/pricing/purchase-options/azure-account?cid=msft_learn). Sign in to the Azure portal, and either select an existing Application Insights resource or create a new one with [https://ms.portal.azure.com/#create/Microsoft.AppInsights](https://ms.portal.azure.com/#create/Microsoft.AppInsights).

Application Insights identifies which instance to use to store and process data through an instrumentation key and connection string that are found at the top right side of the portal UI.

Expand All @@ -58,7 +58,7 @@ If you're using Azure App Service, this connection string is automatically passe

## 4. Examine your app in Application Insights

When you run the application, telemetry will be sent to Application Insights. You should now get logs, metrics, and distributed traces for your application. Open the Application Insights resource in the Azure Portal.
When you run the application, telemetry will be sent to Application Insights. You should now get logs, metrics, and distributed traces for your application. Open the Application Insights resource in the Azure portal.

:::row:::
:::column span="":::
Expand Down
Loading
Loading