Skip to content

Commit 73a244a

Browse files
Merge pull request #43052 from dotnet/main
Merge main into live
2 parents 8f6530c + bfc9d90 commit 73a244a

File tree

3 files changed

+30
-8
lines changed

3 files changed

+30
-8
lines changed

docs/core/deploying/native-aot/index.md

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,40 @@ The Native AOT deployment model uses an ahead-of-time compiler to compile IL to
2020

2121
[Visual Studio 2022](https://visualstudio.microsoft.com/vs/), including the **Desktop development with C++** workload with all default components.
2222

23-
# [Ubuntu](#tab/linux-ubuntu)
23+
# [Alpine](#tab/linux-alpine)
2424

2525
- The compiler toolchain and developer packages for libraries that the .NET runtime depends on.
26-
- Ubuntu (18.04+)
26+
- Alpine (3.15+)
2727

2828
```sh
29-
sudo apt-get install clang zlib1g-dev
29+
sudo apk add clang build-base zlib-dev
3030
```
3131

32-
# [Alpine](#tab/linux-alpine)
32+
# [Fedora](#tab/linux-fedora)
3333

3434
- The compiler toolchain and developer packages for libraries that the .NET runtime depends on.
35-
- Alpine (3.15+)
35+
- Fedora (39+)
3636

3737
```sh
38-
sudo apk add clang build-base zlib-dev
38+
sudo dnf install clang zlib-devel
39+
```
40+
41+
# [RHEL](#tab/linux-rhel)
42+
43+
- The compiler toolchain and developer packages for libraries that the .NET runtime depends on.
44+
- RHEL (8+)
45+
46+
```sh
47+
sudo dnf install clang zlib-devel
48+
```
49+
50+
# [Ubuntu](#tab/linux-ubuntu)
51+
52+
- The compiler toolchain and developer packages for libraries that the .NET runtime depends on.
53+
- Ubuntu (18.04+)
54+
55+
```sh
56+
sudo apt-get install clang zlib1g-dev
3957
```
4058

4159
# [macOS](#tab/macOS)

docs/core/extensions/logging.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -563,6 +563,7 @@ The following providers support scopes:
563563

564564
- `Console`
565565
- [AzureAppServicesFile and AzureAppServicesBlob](xref:Microsoft.Extensions.Logging.AzureAppServices.BatchingLoggerOptions.IncludeScopes)
566+
- [ApplicationInsightsLoggerProvider](/azure/azure-monitor/app/ilogger?tabs=dotnet6#logging-scopes)
566567

567568
Use a scope by wrapping logger calls in a `using` block:
568569

docs/core/install/linux-ubuntu.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,11 @@ rm packages-microsoft-prod.deb
208208
sudo apt update
209209
```
210210

211-
> [!TIP]
212-
> The previous script was written for Ubuntu and it might not work if you're using a derived distribution, such as Linux Mint. It's likely that the `$repo_version` variable won't be assigned the correct value, making the URI for the `wget` command invalid. This variable maps to the specific Ubuntu version you want to get packages for, such as 22.04 or 23.10.
211+
> [!TIP]
212+
> The previous script was written for Ubuntu and might not work if you're using a derived distribution, such as Linux Mint. It's likely that the `$ID` and `$VERSION_ID` variables won't be assigned the correct values, making the URI for the `wget` command invalid. The `$ID` corresponds to the distribution (e.g., `ubuntu`), while `$VERSION_ID` maps to the specific version of Ubuntu you want to get packages for, such as 22.04 or 23.10.
213+
>
214+
> For example, on Ubuntu 22.04 `$ID` would be `ubuntu` and `$VERSION_ID` would be `22.04`. The URL would look like:
215+
> `https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb`.
213216
>
214217
> You can use a web browser and navigate to <https://packages.microsoft.com/config/ubuntu/> to see which versions of Ubuntu are available to use as the `$repo_version` value.
215218

0 commit comments

Comments
 (0)