Skip to content

Commit 23279f0

Browse files
Merge pull request #43989 from dotnet/main
Merge main into live
2 parents fa1af2a + 89bf131 commit 23279f0

File tree

12 files changed

+154
-105
lines changed

12 files changed

+154
-105
lines changed

docs/azure/includes/dotnet-all.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
| Name | Package | Docs | Source |
22
| ---- | ------- | ---- | ------ |
3-
| AI Foundry | NuGet [1.0.0-beta.1](https://www.nuget.org/packages/Azure.AI.Projects/1.0.0-beta.1) | [docs](/dotnet/api/overview/azure/AI.Projects-readme?view=azure-dotnet-preview&preserve-view=true) | GitHub [1.0.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.AI.Projects_1.0.0-beta.1/sdk/ai/Azure.AI.Projects/) |
3+
| AI Foundry | NuGet [1.0.0-beta.2](https://www.nuget.org/packages/Azure.AI.Projects/1.0.0-beta.2) | [docs](/dotnet/api/overview/azure/AI.Projects-readme?view=azure-dotnet-preview&preserve-view=true) | GitHub [1.0.0-beta.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.AI.Projects_1.0.0-beta.2/sdk/ai/Azure.AI.Projects/) |
44
| AI Model Inference | NuGet [1.0.0-beta.2](https://www.nuget.org/packages/Azure.AI.Inference/1.0.0-beta.2) | [docs](/dotnet/api/overview/azure/AI.Inference-readme?view=azure-dotnet-preview&preserve-view=true) | GitHub [1.0.0-beta.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.AI.Inference_1.0.0-beta.2/sdk/ai/Azure.AI.Inference/) |
55
| Anomaly Detector | NuGet [3.0.0-preview.7](https://www.nuget.org/packages/Azure.AI.AnomalyDetector/3.0.0-preview.7) | [docs](/dotnet/api/overview/azure/AI.AnomalyDetector-readme?view=azure-dotnet-preview&preserve-view=true) | GitHub [3.0.0-preview.7](https://github.com/Azure/azure-sdk-for-net/tree/Azure.AI.AnomalyDetector_3.0.0-preview.7/sdk/anomalydetector/Azure.AI.AnomalyDetector/) |
66
| App Configuration | NuGet [1.5.0](https://www.nuget.org/packages/Azure.Data.AppConfiguration/1.5.0) | [docs](/dotnet/api/overview/azure/Data.AppConfiguration-readme) | GitHub [1.5.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Data.AppConfiguration_1.5.0/sdk/appconfiguration/Azure.Data.AppConfiguration/) |

docs/azure/includes/dotnet-new.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
| Name | Package | Docs | Source |
22
| ---- | ------- | ---- | ------ |
3-
| AI Foundry | NuGet [1.0.0-beta.1](https://www.nuget.org/packages/Azure.AI.Projects/1.0.0-beta.1) | [docs](/dotnet/api/overview/azure/AI.Projects-readme?view=azure-dotnet-preview&preserve-view=true) | GitHub [1.0.0-beta.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.AI.Projects_1.0.0-beta.1/sdk/ai/Azure.AI.Projects/) |
3+
| AI Foundry | NuGet [1.0.0-beta.2](https://www.nuget.org/packages/Azure.AI.Projects/1.0.0-beta.2) | [docs](/dotnet/api/overview/azure/AI.Projects-readme?view=azure-dotnet-preview&preserve-view=true) | GitHub [1.0.0-beta.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.AI.Projects_1.0.0-beta.2/sdk/ai/Azure.AI.Projects/) |
44
| AI Model Inference | NuGet [1.0.0-beta.2](https://www.nuget.org/packages/Azure.AI.Inference/1.0.0-beta.2) | [docs](/dotnet/api/overview/azure/AI.Inference-readme?view=azure-dotnet-preview&preserve-view=true) | GitHub [1.0.0-beta.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.AI.Inference_1.0.0-beta.2/sdk/ai/Azure.AI.Inference/) |
55
| Anomaly Detector | NuGet [3.0.0-preview.7](https://www.nuget.org/packages/Azure.AI.AnomalyDetector/3.0.0-preview.7) | [docs](/dotnet/api/overview/azure/AI.AnomalyDetector-readme?view=azure-dotnet-preview&preserve-view=true) | GitHub [3.0.0-preview.7](https://github.com/Azure/azure-sdk-for-net/tree/Azure.AI.AnomalyDetector_3.0.0-preview.7/sdk/anomalydetector/Azure.AI.AnomalyDetector/) |
66
| App Configuration | NuGet [1.5.0](https://www.nuget.org/packages/Azure.Data.AppConfiguration/1.5.0) | [docs](/dotnet/api/overview/azure/Data.AppConfiguration-readme) | GitHub [1.5.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Data.AppConfiguration_1.5.0/sdk/appconfiguration/Azure.Data.AppConfiguration/) |

docs/core/extensions/configuration-providers.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Configuration providers
33
description: Discover how to configure .NET apps using the configuration provider API and the available configuration providers.
44
author: IEvangelist
55
ms.author: dapine
6-
ms.date: 09/10/2024
6+
ms.date: 12/16/2024
77
---
88

99
# Configuration providers in .NET
@@ -236,7 +236,7 @@ Environment variables set in *launchSettings.json* override those set in the sys
236236

237237
### Azure App Service settings
238238

239-
On [Azure App Service](https://azure.microsoft.com/services/app-service), select **New application setting** on the **Settings** > **Configuration** page. Azure App Service application settings are:
239+
On [Azure App Service](https://azure.microsoft.com/services/app-service), select **Add** on the **Settings** > **Environment variables** page. Azure App Service application settings are:
240240

241241
- Encrypted at rest and transmitted over an encrypted channel.
242242
- Exposed as environment variables.
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
---
2+
author: adegeo
3+
ms.author: adegeo
4+
ms.date: 11/14/2023
5+
ms.topic: include
6+
ms.custom: linux-related-content
7+
---
8+
9+
### Install the SDK
10+
11+
The .NET SDK allows you to develop apps with .NET. If you install the .NET SDK, you don't need to install the corresponding runtime. To install the .NET SDK, run the following command:
12+
13+
```bash
14+
sudo apk add dotnet8-sdk
15+
```
16+
17+
To learn how to use the .NET CLI, see [.NET CLI overview](../../tools/index.md).
18+
19+
### Install the runtime
20+
21+
The ASP.NET Core Runtime allows you to run apps that were made with .NET that didn't provide the runtime. The following command installs the ASP.NET Core Runtime, which is the most compatible runtime for .NET. In your terminal, run the following command:
22+
23+
```bash
24+
sudo apk add aspnetcore8-runtime
25+
```
26+
27+
As an alternative to the ASP.NET Core Runtime, you can install the .NET Runtime, which doesn't include ASP.NET Core support: replace `aspnetcore8-runtime` in the previous command with `dotnet8-runtime`:
28+
29+
```bash
30+
sudo apk add dotnet8-runtime
31+
```
32+
33+
To learn how to use the .NET CLI, see [.NET CLI overview](../../tools/index.md).

docs/core/install/linux-alpine.md

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@ title: Install .NET on Alpine
33
description: Learn about which versions of .NET SDK and .NET Runtime are supported, and how to install .NET on Alpine.
44
author: adegeo
55
ms.author: adegeo
6-
ms.date: 11/01/2024
6+
ms.date: 12/13/2024
77
ms.custom: linux-related-content
88
---
99

1010
# Install the .NET SDK or the .NET Runtime on Alpine
1111

12-
[!INCLUDE [linux-release-wait](includes/linux-release-wait.md)]
13-
1412
.NET is supported on Alpine and this article describes how to install .NET on Alpine. When an Alpine version falls out of support, .NET is no longer supported with that version.
1513

1614
If you're using Docker, consider using [official .NET Docker images](../docker/introduction.md#net-images) instead of installing .NET yourself.
@@ -23,6 +21,7 @@ The following table is a list of currently supported .NET releases and the versi
2321

2422
| Alpine | Supported Version | Available in Package Manager |
2523
|--------|-------------------|------------------------------|
24+
| 3.21 | 9.0, 8.0 | 9.0, 8.0 |
2625
| 3.20 | 9.0, 8.0 | 8.0, 6.0 |
2726
| 3.19 | 9.0, 8.0 | 7.0, 6.0 |
2827
| 3.18 | 8.0 | 7.0, 6.0 |
@@ -33,30 +32,28 @@ The following table is a list of currently supported .NET releases and the versi
3332

3433
# [.NET 9](#tab/dotnet9)
3534

36-
Not supported on Alpine 3.18.
37-
38-
[!INCLUDE [linux-release-wait](includes/linux-release-wait.md)]
35+
**Not supported on Alpine 3.18.**
3936

4037
[!INCLUDE [linux-apk-install-90](includes/linux-install-90-apk.md)]
4138

4239
# [.NET 8](#tab/dotnet8)
4340

44-
[!INCLUDE [linux-apk-install-90](includes/linux-install-90-apk.md)]
41+
[!INCLUDE [linux-apk-install-80](includes/linux-install-80-apk.md)]
4542

4643
---
4744

4845
## Supported architectures
4946

50-
The following table is a list of currently supported .NET releases and the architecture of Alpine they're supported on. These versions remain supported until either the version of [.NET reaches end-of-support](https://dotnet.microsoft.com/platform/support/policy/dotnet-core) or the architecture of [Alpine is supported#](https://alpinelinux.org/releases/). Note that only `x86_64`, `armv7`, `aarch64` is officially supported by Microsoft. Other architectures are supported by the distribution maintainers, and can be installed using the `apk` package manager.
47+
The following table is a list of currently supported .NET releases and the architecture of Alpine they're supported on. These versions remain supported until either the version of [.NET reaches end-of-support](https://dotnet.microsoft.com/platform/support/policy/dotnet-core) or the architecture of [Alpine is supported#](https://alpinelinux.org/releases/). Note that only `x86_64`, `armv7`, `aarch64` is officially supported by Microsoft. Other architectures are supported by the distribution maintainers, and can be installed using the `apk` package manager, if a package is available for that architecture.
5148

5249
| Architecture | .NET 9 | .NET 8 |
5350
|--------------|------------------------|------------------------|
54-
| x86_64 | 3.17, 3.18, 3.19, 3.20 | 3.17, 3.18, 3.19, 3.20 |
51+
| x86_64 | 3.19, 3.20, 3.21 | 3.18, 3.19, 3.20, 3.21 |
5552
| x86 | None | None |
56-
| aarch64 | 3.17, 3.18, 3.19, 3.20 | 3.17, 3.18, 3.19, 3.20 |
57-
| armv7 | 3.17, 3.18, 3.19, 3.20 | 3.17, 3.18, 3.19, 3.20 |
53+
| aarch64 | 3.19, 3.20, 3.21 | 3.18, 3.19, 3.20, 3.21 |
54+
| armv7 | 3.19, 3.20, 3.21 | 3.18, 3.19, 3.20, 3.21 |
5855
| armhf | None | None |
59-
| s390x | 3.17 | 3.17 |
56+
| s390x | None | None |
6057
| ppc64le | None | None |
6158
| riscv64 | None | None |
6259

docs/core/install/linux-rhel.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@ title: Install .NET on RHEL and CentOS Stream
33
description: Learn about which versions of .NET are supported, and how to install .NET on Red Hat Enterprise Linux and CentOS Stream.
44
author: adegeo
55
ms.author: adegeo
6-
ms.date: 11/11/2024
6+
ms.date: 12/13/2024
77
ms.custom: linux-related-content
88
---
99

1010
# Install the .NET SDK or the .NET Runtime on RHEL and CentOS Stream
1111

12-
[!INCLUDE [linux-release-wait](includes/linux-release-wait.md)]
13-
1412
.NET is supported on Red Hat Enterprise Linux (RHEL). This article describes how to install .NET on RHEL and CentOS Stream.
1513

1614
[!INCLUDE [linux-intro-sdk-vs-runtime](includes/linux-intro-sdk-vs-runtime.md)]

docs/core/install/linux-snap-runtime.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Install .NET Runtime on Linux with Snap
33
description: Learn about how to install the .NET Runtime snap package. Canonical maintains and supports .NET-related snap packages.
44
author: adegeo
55
ms.author: adegeo
6-
ms.date: 11/11/2024
6+
ms.date: 12/13/2024
77
ms.topic: install-set-up-deploy
88
ms.custom: linux-related-content
99
#customer intent: As a Linux user, I want to install .NET Runtime through Snap.
@@ -31,8 +31,6 @@ Your Linux distribution might already include snap. Try running `snap` from a te
3131

3232
## 1. Install the runtime
3333

34-
[!INCLUDE [linux-release-wait](includes/linux-release-wait.md)]
35-
3634
The following steps install the .NET 9 runtime snap package:
3735

3836
01. Open a terminal.
@@ -46,7 +44,7 @@ Each .NET Runtime is published as an individual snap package. The following tabl
4644

4745
| .NET version | Snap package | .NET version supported by Microsoft |
4846
|---------------------------------------------------|---------------------|-----|
49-
| 9 (STS) | Not yet available | Yes |
47+
| [9 (STS)](https://snapcraft.io/dotnet-runtime-90) | `dotnet-runtime-90` | Yes |
5048
| [8 (LTS)](https://snapcraft.io/dotnet-runtime-80) | `dotnet-runtime-80` | Yes |
5149
| [7 (STS)](https://snapcraft.io/dotnet-runtime-70) | `dotnet-runtime-70` | No |
5250
| [6 (LTS)](https://snapcraft.io/dotnet-runtime-60) | `dotnet-runtime-60` | No |

docs/core/install/linux-ubuntu-install.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Install .NET on Ubuntu
33
description: Demonstrates the various ways to install .NET SDK and .NET Runtime on Ubuntu. .NET is usually installed through APT.
44
author: adegeo
55
ms.author: adegeo
6-
ms.date: 11/01/2024
6+
ms.date: 12/13/2024
77
ms.custom: linux-related-content
88
zone_pivot_groups: ubuntu-install-set-one
99
---
@@ -35,8 +35,6 @@ When an [Ubuntu version](https://wiki.ubuntu.com/Releases) falls out of support,
3535

3636
# [.NET 9](#tab/dotnet9)
3737

38-
[!INCLUDE [linux-release-wait](includes/linux-release-wait.md)]
39-
4038
[!INCLUDE [linux-apt-install-90](includes/linux-install-90-apt.md)]
4139

4240
# [.NET 8](#tab/dotnet8)

docs/core/install/linux-ubuntu.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: .NET and Ubuntu overview
33
description: Learn about the ways you can install .NET on Ubuntu, either from the built-in package feed, the .NET backports repository, or the Microsoft repository.
44
author: adegeo
55
ms.author: adegeo
6-
ms.date: 11/11/2024
6+
ms.date: 12/13/2024
77
ms.custom: updateeachrelease, linux-related-content
88
---
99

@@ -223,8 +223,6 @@ sudo apt update
223223
224224
## Install .NET
225225

226-
[!INCLUDE [linux-release-wait](includes/linux-release-wait.md)]
227-
228226
Install .NET through the package manager with the `sudo apt install <package-name>` command. Replace `<package-name>` with the name of the .NET package you want to install. For example, to install .NET SDK 9.0, use the command `sudo apt install dotnet-sdk-9.0`. The following table lists the currently supported .NET packages (which [might vary by your Ubuntu version](#supported-distributions)):
229227

230228
|| Product | Type | Package |

docs/fsharp/language-reference/xml-documentation.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ The compiler-generated XML file can be distributed alongside your .NET assembly
1414
show quick information about types or members. Additionally, the XML file can be run through tools
1515
like [fsdocs](http://fsprojects.github.io/FSharp.Formatting/) to generate API reference websites.
1616

17-
XML documentation comments, like all other comments, are ignored by the compiler, unless the options described below are enabled to check the validity and
18-
completeness of comments at compile time.
17+
By default, XML documentation comments are ignored by the compiler. To change this, set `--warnon:3390`. The compiler will then verify the syntax of the XML and the parameters referred to in `<param>` and `<paramref>` tags.
1918

2019
You can generate the XML file at compile time by doing one of the following:
2120

0 commit comments

Comments
 (0)