Skip to content

Commit 62285ec

Browse files
authored
Merge pull request #17932 from dotnet/publish-5724
Merge master into live
2 parents d9470d8 + fe0a599 commit 62285ec

File tree

1,147 files changed

+10227
-10180
lines changed

Some content is hidden

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

1,147 files changed

+10227
-10180
lines changed

docs/core/diagnostics/debug-memory-leak.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ dotnet-dump analyze core_20190430_185145
140140
Where `core_20190430_185145` is the name of the core dump you want to analyze.
141141

142142
> [!NOTE]
143-
> If you see an error complaining that *libdl.so* cannot be found, you may have to install the *libc6-dev* package. For more information, see [Prerequisites for .NET Core on Linux](../linux-prerequisites.md).
143+
> If you see an error complaining that *libdl.so* cannot be found, you may have to install the *libc6-dev* package. For more information, see [Prerequisites for .NET Core on Linux](../install/dependencies.md?pivots=os-linux).
144144
145145
You'll be presented with a prompt where you can enter SOS commands. Commonly, the first thing you want to look at is the overall state of the managed heap:
146146

docs/core/install/how-to-detect-installed-versions.md

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,51 @@ Microsoft.NETCore.App 3.1.0 [/usr/local/share/dotnet/shared/Microsoft.NETCore.Ap
161161

162162
::: zone-end
163163

164+
## Check for install folders
165+
166+
It's possible that .NET Core is installed but not added to the `PATH` variable for your operating system or user profile. Running the commands from the previous sections may not work. As an alternative, you can check that the .NET Core install folders exist.
167+
168+
When you install .NET Core from an installer or script, it's installed to a standard folder. Much of the time the installer or script you're using to install .NET Core gives you an option to install to a different folder. If you choose to install to a different folder, adjust the start of the folder path.
169+
170+
::: zone pivot="os-windows"
171+
172+
- **dotnet executable**\
173+
_C:\\program files\\dotnet\\dotnet.exe_
174+
175+
- **.NET SDK**\
176+
_C:\\program files\\dotnet\\sdk\\{version}\\_
177+
178+
- **.NET Runtime**\
179+
_C:\\program files\\dotnet\\shared\\{runtime-type}\\{version}\\_
180+
181+
::: zone-end
182+
183+
::: zone pivot="os-linux"
184+
185+
- **dotnet executable**\
186+
_/home/user/share/dotnet/dotnet_
187+
188+
- **.NET SDK**\
189+
_/home/user/share/dotnet/sdk/{version}/_
190+
191+
- **.NET Runtime**\
192+
_/home/user/share/dotnet/shared/{runtime-type}/{version}/_
193+
194+
::: zone-end
195+
196+
::: zone pivot="os-macos"
197+
198+
- **dotnet executable**\
199+
_/usr/local/share/dotnet/dotnet_
200+
201+
- **.NET SDK**\
202+
_/usr/local/share/dotnet/sdk/{version}/_
203+
204+
- **.NET Runtime**\
205+
_/usr/local/share/dotnet/shared/{runtime-type}/{version}/_
206+
207+
::: zone-end
208+
164209
## More information
165210

166211
You can see both the SDK versions and runtime versions with the command `dotnet --info`. You'll also get other environmental related information, such as the operating system version and runtime identifier (RID).

docs/core/install/linux-package-manager-centos7.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ This article describes how to use a package manager to install .NET Core on Cent
1414

1515
[!INCLUDE [package-manager-intro-sdk-vs-runtime](includes/package-manager-intro-sdk-vs-runtime.md)]
1616

17-
## Register Microsoft key and feed
17+
## Add Microsoft repository key and feed
1818

1919
Before installing .NET, you'll need to:
2020

21-
- Register the Microsoft key.
22-
- Register the product repository.
21+
- Add the Microsoft package signing key to the list of trusted keys.
22+
- Add the repository to the package manager.
2323
- Install required dependencies.
2424

2525
This only needs to be done once per machine.

docs/core/install/linux-package-manager-debian10.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ This article describes how to use a package manager to install .NET Core on Debi
1414

1515
[!INCLUDE [package-manager-intro-sdk-vs-runtime](includes/package-manager-intro-sdk-vs-runtime.md)]
1616

17-
## Register Microsoft key and feed
17+
## Add Microsoft repository key and feed
1818

1919
Before installing .NET, you'll need to:
2020

21-
- Register the Microsoft key.
22-
- Register the product repository.
21+
- Add the Microsoft package signing key to the list of trusted keys.
22+
- Add the repository to the package manager.
2323
- Install required dependencies.
2424

2525
This only needs to be done once per machine.

docs/core/install/linux-package-manager-debian9.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ This article describes how to use a package manager to install .NET Core on Debi
1414

1515
[!INCLUDE [package-manager-intro-sdk-vs-runtime](includes/package-manager-intro-sdk-vs-runtime.md)]
1616

17-
## Register Microsoft key and feed
17+
## Add Microsoft repository key and feed
1818

1919
Before installing .NET, you'll need to:
2020

21-
- Register the Microsoft key.
22-
- Register the product repository.
21+
- Add the Microsoft package signing key to the list of trusted keys.
22+
- Add the repository to the package manager.
2323
- Install required dependencies.
2424

2525
This only needs to be done once per machine.

docs/core/install/linux-package-manager-fedora29.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ This article describes how to use a package manager to install .NET Core on Fedo
1414

1515
[!INCLUDE [package-manager-intro-sdk-vs-runtime](includes/package-manager-intro-sdk-vs-runtime.md)]
1616

17-
## Register Microsoft key and feed
17+
## Add Microsoft repository key and feed
1818

1919
Before installing .NET, you'll need to:
2020

21-
- Register the Microsoft key.
22-
- Register the product repository.
21+
- Add the Microsoft package signing key to the list of trusted keys.
22+
- Add the repository to the package manager.
2323
- Install required dependencies.
2424

2525
This only needs to be done once per machine.

docs/core/install/linux-package-manager-fedora30.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ This article describes how to use a package manager to install .NET Core on Fedo
1414

1515
[!INCLUDE [package-manager-intro-sdk-vs-runtime](includes/package-manager-intro-sdk-vs-runtime.md)]
1616

17-
## Register Microsoft key and feed
17+
## Add Microsoft repository key and feed
1818

1919
Before installing .NET, you'll need to:
2020

21-
- Register the Microsoft key.
22-
- Register the product repository.
21+
- Add the Microsoft package signing key to the list of trusted keys.
22+
- Add the repository to the package manager.
2323
- Install required dependencies.
2424

2525
This only needs to be done once per machine.

docs/core/install/linux-package-manager-fedora31.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ This article describes how to use a package manager to install .NET Core on Fedo
1414

1515
[!INCLUDE [package-manager-intro-sdk-vs-runtime](includes/package-manager-intro-sdk-vs-runtime.md)]
1616

17-
## Register Microsoft key and feed
17+
## Add Microsoft repository key and feed
1818

1919
Before installing .NET, you'll need to:
2020

21-
- Register the Microsoft key.
22-
- Register the product repository.
21+
- Add the Microsoft package signing key to the list of trusted keys.
22+
- Add the repository to the package manager.
2323
- Install required dependencies.
2424

2525
This only needs to be done once per machine.

docs/core/install/linux-package-manager-opensuse15.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ This article describes how to use a package manager to install .NET Core on open
1414

1515
[!INCLUDE [package-manager-intro-sdk-vs-runtime](includes/package-manager-intro-sdk-vs-runtime.md)]
1616

17-
## Register Microsoft key and feed
17+
## Add Microsoft repository key and feed
1818

1919
Before installing .NET, you'll need to:
2020

21-
- Register the Microsoft key.
22-
- Register the product repository.
21+
- Add the Microsoft package signing key to the list of trusted keys.
22+
- Add the repository to the package manager.
2323
- Install required dependencies.
2424

2525
This only needs to be done once per machine.

docs/core/install/linux-package-manager-sles12.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ This article describes how to use a package manager to install .NET Core on SLES
1414

1515
[!INCLUDE [package-manager-intro-sdk-vs-runtime](includes/package-manager-intro-sdk-vs-runtime.md)]
1616

17-
## Register Microsoft key and feed
17+
## Add Microsoft repository key and feed
1818

1919
Before installing .NET, you'll need to:
2020

21-
- Register the Microsoft key.
22-
- Register the product repository.
21+
- Add the Microsoft package signing key to the list of trusted keys.
22+
- Add the repository to the package manager.
2323
- Install required dependencies.
2424

2525
This only needs to be done once per machine.

0 commit comments

Comments
 (0)