Skip to content

Commit 8ff974a

Browse files
Merge pull request #49539 from dotnet/main
Merge main into live
2 parents 213f71c + c2aad4a commit 8ff974a

File tree

46 files changed

+91
-111
lines changed

Some content is hidden

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

46 files changed

+91
-111
lines changed

docs/ai/advanced/snippets/sample-implementations/Implementations.csproj

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

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.10.0" />
10+
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.10.1" />
1111
</ItemGroup>
1212

1313
</Project>

docs/ai/how-to/snippets/content-filtering/AIContentFiltering.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<ItemGroup>
1111
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
1212
<PackageReference Include="Azure.Identity" Version="1.17.0" />
13-
<PackageReference Include="Microsoft.Extensions.AI" Version="9.10.0" />
13+
<PackageReference Include="Microsoft.Extensions.AI" Version="9.10.1" />
1414
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.4.0-preview.1.25207.5" />
1515
</ItemGroup>
1616

docs/ai/quickstarts/snippets/mcp-client/MinimalMCPClient.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<ItemGroup>
1111
<PackageReference Include="Azure.AI.OpenAI" Version="2.2.0-beta.5" />
1212
<PackageReference Include="Azure.Identity" Version="1.17.0" />
13-
<PackageReference Include="Microsoft.Extensions.AI" Version="9.10.0" />
13+
<PackageReference Include="Microsoft.Extensions.AI" Version="9.10.1" />
1414
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.4.3-preview.1.25230.7" />
1515
<PackageReference Include="ModelContextProtocol" Version="0.1.0-preview.14" />
1616
</ItemGroup>

docs/ai/quickstarts/snippets/mcp-server/.mcp/server.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://static.modelcontextprotocol.io/schemas/2025-09-29/server.schema.json",
2+
"$schema": "https://static.modelcontextprotocol.io/schemas/2025-10-17/server.schema.json",
33
"description": "<your description here>",
44
"name": "io.github.<your GitHub username here>/<your repo name>",
55
"version": "<your package version here>",

docs/ai/snippets/microsoft-extensions-ai/ConsoleAI.CreateEmbeddings/ConsoleAI.CreateEmbeddings.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.4" />
11+
<PackageReference Include="OllamaSharp" Version="5.4.8" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

docs/ai/snippets/microsoft-extensions-ai/ConsoleAI/ConsoleAI.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="Microsoft.Extensions.AI" Version="9.10.0" />
11+
<PackageReference Include="Microsoft.Extensions.AI" Version="9.10.1" />
1212
<PackageReference Include="OllamaSharp" Version="5.4.8" />
1313
</ItemGroup>
1414

docs/core/compatibility/containers/10.0/default-images-use-ubuntu.md

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,17 @@
22
title: "Default .NET container tags now use Ubuntu"
33
description: Learn about the breaking change where the default .NET container tags, like `10.0`, use Ubuntu.
44
ms.date: 2/26/2025
5+
ai-usage: ai-assisted
56
---
67

78
# Default .NET images use Ubuntu
89

910
The default Linux distro for .NET tags has been changed from Debian to Ubuntu. This applies to all .NET tags that do not explicitly specify an OS.
1011

11-
Debian images are still produced and supported. They can be referenced using the `-trixie-slim` suffix.
12+
- `docker pull mcr.microsoft.com/dotnet/sdk:10.0` - Refers to Ubuntu 24.04 "Noble Numbat"
13+
- `docker pull mcr.microsoft.com/dotnet/sdk:10.0-noble` - Refers to Ubuntu 24.04 "Noble Numbat"
1214

13-
- `docker pull mcr.microsoft.com/dotnet/sdk:10.0-preview` - Refers to Ubuntu 24.04 "Noble Numbat"
14-
- `docker pull mcr.microsoft.com/dotnet/sdk:10.0-preview-noble` - Refers to Ubuntu 24.04 "Noble Numbat"
15-
- `docker pull mcr.microsoft.com/dotnet/sdk:10.0-preview-trixie-slim` - Refers to Debian 13 "Trixie"
16-
17-
The same change will apply to `10.0` tags once the `-preview` suffix is removed. This change was proposed in [dotnet-docker #5709](https://github.com/dotnet/dotnet-docker/discussions/5709).
15+
For more information about the container image platforms available at .NET 10's launch, see [dotnet-docker #6539](https://github.com/dotnet/dotnet-docker/discussions/6539). This change was proposed in [dotnet-docker #6526](https://github.com/dotnet/dotnet-docker/issues/6526).
1816

1917
## Version introduced
2018

@@ -40,8 +38,6 @@ Debian and .NET release cycles (for mainline support) are the same length, while
4038

4139
Test your application. This change is unlikely to affect users.
4240

43-
If you prefer Debian or have a dependency on it, use a Debian specific tag, such as `10.0-preview-trixie-slim`.
44-
4541
## Affected APIs
4642

4743
N/A

docs/core/tools/dotnet-build-server.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
22
title: dotnet build-server command
33
description: The dotnet build-server command interacts with servers started by a build.
4-
ms.date: 02/14/2020
4+
ms.date: 10/28/2025
55
---
66
# dotnet build-server
77

8-
**This article applies to:** ✔️ .NET Core 3.1 SDK and later versions
8+
**This article applies to:** ✔️ .NET 6 SDK and later versions
99

1010
## Name
1111

docs/core/tools/dotnet-environment-variables.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.date: 11/08/2023
66

77
# .NET environment variables
88

9-
**This article applies to:** ✔️ .NET Core 3.1 SDK and later versions
9+
**This article applies to:** ✔️ .NET 6 SDK and later versions
1010

1111
In this article, you'll learn about the environment variables used by .NET. Some environment variables are used by the .NET runtime, while others are only used by the .NET SDK and .NET CLI. Some environment variables are used by all three components.
1212

@@ -304,10 +304,6 @@ If set to `1` (enabled), enables rolling forward to a pre-release version from a
304304

305305
For more information, see [the `--roll-forward` option for the `dotnet` command](dotnet.md#rollforward).
306306

307-
### `DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX`
308-
309-
Disables minor version roll forward, if set to `0`. This setting is superseded in .NET Core 3.0 by `DOTNET_ROLL_FORWARD`. The new settings should be used instead.
310-
311307
### `DOTNET_CLI_FORCE_UTF8_ENCODING`
312308

313309
Forces the use of UTF-8 encoding in the console, even for older versions of Windows 10 that don't fully support UTF-8. For more information, see [SDK no longer changes console encoding when finished](../compatibility/sdk/8.0/console-encoding-fix.md).

docs/core/tools/dotnet-help.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
22
title: dotnet help command
33
description: The dotnet help command shows more detailed documentation online for the specified command.
4-
ms.date: 02/14/2020
4+
ms.date: 10/28/2025
55
---
66
# dotnet help reference
77

8-
**This article applies to:** ✔️ .NET Core 3.1 SDK and later versions
8+
**This article applies to:** ✔️ .NET 6 SDK and later versions
99

1010
## Name
1111

0 commit comments

Comments
 (0)