Skip to content

Commit 2c6d8ab

Browse files
Merge pull request #45854 from dotnet/main
Merge main into live
2 parents abbc15f + 39ab0f9 commit 2c6d8ab

File tree

4 files changed

+18
-13
lines changed

4 files changed

+18
-13
lines changed

docs/core/deploying/deploy-with-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ The `<TargetFramework>` setting of the project file specifies the default target
3535

3636
If you want to target more than one framework, you can set the `<TargetFrameworks>` setting to multiple TFM values, separated by a semicolon. When you build your app, a build is produced for each target framework. However, when you publish your app, you must specify the target framework with the `dotnet publish -f <TFM>` command.
3737

38-
The default **BUILD-CONFIGURATION** mode is **Debug** unless changed with the `-c` parameter.
38+
The default **BUILD-CONFIGURATION** mode is **Release** unless changed with the `-c` parameter.
3939

4040
The default output directory of the [`dotnet publish`](../tools/dotnet-publish.md) command is `./bin/<BUILD-CONFIGURATION>/<TFM>/publish/`. For example, `dotnet publish -c Release -f net9.0` publishes to `./bin/Release/net9.0/publish/`. However, you can opt in to a simplified output path and folder structure for all build outputs. For more information, see [Artifacts output layout](../sdk/artifacts-output.md).
4141

docs/core/diagnostics/dotnet-dump.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,11 @@ dotnet-dump collect [-h|--help] [-p|--process-id] [-n|--name] [--type] [-o|--out
123123
> [!NOTE]
124124
> To collect a dump using `dotnet-dump`, it needs to be run as the same user as the user running target process or as root. Otherwise, the tool will fail to establish a connection with the target process.
125125
126+
> [!NOTE]
127+
> Collecting a full or heap dump may cause the OS to page in substantial virtual memory for the target process. If the target process is running in a container with an enforced memory limit, the increased memory usage
128+
> may cause the OS to terminate the container if the limit was exceeded. We recommend testing to ensure the memory limit is set high enough. Another option is to temporarily change or remove the limit
129+
> prior to dump collection if your environment supports doing so.
130+
126131
## dotnet-dump analyze
127132

128133
Starts an interactive shell to explore a dump. The shell accepts various [SOS commands](#analyze-sos-commands).

docs/csharp/language-reference/toc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ items:
1010
href: ./configure-language-version.md
1111
- name: Types
1212
items:
13+
- name: Built-in types
14+
href: ./builtin-types/built-in-types.md
1315
- name: Value types
1416
items:
1517
- name: Overview
@@ -68,8 +70,6 @@ items:
6870
href: ./builtin-types/arrays.md
6971
- name: void
7072
href: ./builtin-types/void.md
71-
- name: Built-in types
72-
href: ./builtin-types/built-in-types.md
7373
- name: Unmanaged types
7474
href: ./builtin-types/unmanaged-types.md
7575
- name: Default values

docs/fundamentals/code-analysis/quality-rules/ca2249.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -110,22 +110,22 @@ class MyClass
110110
found = str.Contains('x');
111111

112112
// No comparisonType in string overload, adds StringComparison.CurrentCulture to resulting fix
113-
found = !string.Contains("text", StringComparison.CurrentCulture);
114-
found = string.Contains("text", StringComparison.CurrentCulture);
113+
found = !str.Contains("text", StringComparison.CurrentCulture);
114+
found = str.Contains("text", StringComparison.CurrentCulture);
115115

116116
// comparisonType equal to StringComparison.Ordinal, removes the argument
117-
found = !string.Contains('x');
118-
found = string.Contains('x');
117+
found = !str.Contains('x');
118+
found = str.Contains('x');
119119

120-
found = !string.Contains("text");
121-
found = string.Contains("text");
120+
found = !str.Contains("text");
121+
found = str.Contains("text");
122122

123123
// comparisonType different than StringComparison.Ordinal, preserves the argument
124-
;found = !string.Contains('x', StringComparison.OrdinalIgnoreCase)
125-
found = string.Contains('x', StringComparison.CurrentCulture);
124+
found = !str.Contains('x', StringComparison.OrdinalIgnoreCase);
125+
found = str.Contains('x', StringComparison.CurrentCulture);
126126

127-
found = !string.Contains("text", StringComparison.InvariantCultureIgnoreCase);
128-
found = string.Contains("text", StringComparison.InvariantCulture);
127+
found = !str.Contains("text", StringComparison.InvariantCultureIgnoreCase);
128+
found = str.Contains("text", StringComparison.InvariantCulture);
129129

130130
// This case had to be manually fixed
131131
if (!str.Contains("text"))

0 commit comments

Comments
 (0)