Skip to content

Commit 55f14e3

Browse files
Merge pull request #10420 from MicrosoftDocs/main638629958327207506sync_temp
For protected branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents 15fafc5 + e8c4b94 commit 55f14e3

23 files changed

+84
-42
lines changed

docs/containers/docker-compose-properties.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ The following table shows the MSBuild properties available for Docker Compose pr
3434
|DockerComposeBaseFilePath|dcproj|Specifies the first part of the filenames of the Docker Compose files, without the `.yml` extension. For example: <br>1. DockerComposeBaseFilePath = null/undefined: use the base file path `docker-compose`, and files will be named *docker-compose.yml* and *docker-compose.override.yml*.<br>2. DockerComposeBaseFilePath = *mydockercompose*: files will be named *mydockercompose.yml* and *mydockercompose.override.yml*.<br> 3. DockerComposeBaseFilePath = *..\mydockercompose*: files will be up one level. |`docker-compose`|
3535
|DockerComposeBuildArguments|dcproj|Specifies the extra parameters to pass to the `docker-compose build` command. For example, `--parallel --pull`. |
3636
|DockerComposeDownArguments|dcproj|Specifies the extra parameters to pass to the `docker-compose down` command. For example, `--timeout 500`.|-|
37-
| DockerComposeEnvFilePath | dcproj | The relative path to an .env file that's passed to `docker compose` commands via `--env-file`. See [Substitute with a .env file](https://docs.docker.com/compose/environment-variables/set-environment-variables/#substitute-with-an-env-file). | Empty |
37+
| DockerComposeEnvFilePath | dcproj | The relative path to an .env file that's passed to `docker compose` commands via `--env-file`. See [Use the env_file attribute](https://docs.docker.com/compose/how-tos/environment-variables/set-environment-variables/#use-the-env_file-attribute). | Empty |
3838
|DockerComposeProjectName| dcproj | If specified, overrides the project name for a Docker Compose project. | "dockercompose" + auto-generated hash |
3939
|DockerComposeProjectPath|csproj or vbproj|The relative path to the Docker Compose project (dcproj) file. Set this property when publishing the service project to find the associated image build settings stored in the docker-compose.yml file.|-|
4040
|DockerComposeProjectsToIgnore|dcproj| Specifies projects to be ignored by Docker Compose tools during debug. This property can be used for any project. File paths can be specified one of two ways: <br> 1. Relative to dcproj. For example, `<DockerComposeProjectsToIgnore>path\to\AngularProject1.csproj</DockerComposeProjectsToIgnore>`. <br> 2. Absolute paths.<br> **Note**: The paths should be separated by the delimiter character `;`.|-|

docs/ide/reference/documents-environment-options-dialog-box.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Documents, Environment, Options Dialog Box
33
description: Learn how to use the Environments page in the Documents section to control the display of documents in the IDE and manage external changes to documents and files.
4-
ms.date: 10/23/2023
4+
ms.date: 9/26/2024
55
ms.topic: reference
66
f1_keywords:
77
- VS.Environment.Documents
@@ -33,7 +33,11 @@ ms.subservice: general-ide
3333
---
3434
# Options dialog box: Environment \> Documents
3535

36-
Use this page of the **Options** dialog box to control the display of documents in the integrated development environment (IDE) and manage external changes to documents and files. You can access this dialog box by clicking **Options** on the **Tools** menu and then selecting **Environment** > **Documents**.
36+
Use this page of the **Options** dialog box to control the display of documents in the integrated development environment (IDE) and manage external changes to documents and files.
37+
38+
To access this dialog box, go to **Tools** > **Options** > **Environment** > **Documents**.
39+
40+
:::image type="content" source="media/documents-options.png" alt-text="Screenshot of the Documents section in the Options dialog box":::
3741

3842
**Detect when file is changed outside the environment**
3943

215 KB
Loading

docs/ide/reference/options-text-editor-all-languages-scroll-bars.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Options, Text Editor, All Languages, Scroll Bars
33
description: Learn how to use the Scroll Bars page in the All Languages section to change the default behavior of the code editor scroll bars within Visual Studio.
4-
ms.date: 10/25/2018
4+
ms.date: 9/26/2024
55
ms.topic: reference
66
f1_keywords:
77
- VS.ToolsOptionsPages.Text_Editor.All_Languages.ScrollBars
@@ -76,11 +76,13 @@ The scroll bar has two modes: bar mode and map mode.
7676

7777
### Use map mode for vertical scroll bar
7878

79-
In *map mode*, when you click a location on the scroll bar, the cursor jumps to that location in the file instead of just scrolling up or down a page. Lines of code are shown, in miniature, on the scroll bar. You can choose how wide the map column is by selecting a value in **Source overview**. To enable a larger preview of the code when you rest the pointer on the map, select the **Show Preview Tooltip** option. Collapsed regions are shaded differently and expand when you double-click them.
79+
In *map mode*, when you click a location on the scroll bar, the cursor jumps to that location in the file instead of just scrolling up or down a page. Lines of code are shown, in miniature, on the scroll bar. You can adjust the width of the scroll bar, that is, the map column, by selecting a value in **Source overview**. To enable a larger preview of the code when you rest the pointer on the map, select the **Show Preview Tooltip** option. Collapsed regions are shaded differently and expand when you double-click them.
8080

8181
> [!TIP]
8282
> You can turn the miniature code view off in map mode by setting **Source overview** to **Off**. If **Show Preview Tooltip** is selected, you still see a preview of the code at that location when you hover your pointer on the scroll bar, and the cursor still jumps to that location in the file when you click.
8383
8484
## See also
8585

86-
- [How to: Customize the scroll bar](../how-to-track-your-code-by-customizing-the-scrollbar.md)
86+
- [How to: Customize the scroll bar](../how-to-track-your-code-by-customizing-the-scrollbar.md)
87+
- [Suggest a feature](https://aka.ms/feedback/suggest)
88+
- [Report a problem](../how-to-report-a-problem-with-visual-studio.md)

docs/ide/reference/options-text-editor-csharp-intellisense.md

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Options, Text Editor, C#, IntelliSense
33
description: Learn how to use the IntelliSense page in the C# section to modify settings that affect the behavior of IntelliSense for C#.
4-
ms.date: 11/04/2016
4+
ms.date: 09/26/2024
55
ms.topic: reference
66
f1_keywords:
77
- VS.ToolsOptionsPages.Text_Editor.CSharp.Intellisense
@@ -18,7 +18,9 @@ ms.subservice: general-ide
1818
---
1919
# Options, Text Editor, C#, IntelliSense
2020

21-
Use the **IntelliSense** options page to modify settings that affect the behavior of IntelliSense for C#. To access this options page, choose **Tools** > **Options**, and then choose **Text Editor** > **C#** > **IntelliSense**.
21+
Use the **IntelliSense** options page to modify settings that affect the behavior of IntelliSense for C#.
22+
23+
To access this options page, choose **Tools** > **Options** > **Text Editor** > **C#** > **IntelliSense**.
2224

2325
The **IntelliSense** options page contains the following options:
2426

@@ -30,10 +32,14 @@ The **IntelliSense** options page contains the following options:
3032

3133
- Show completion list after a character is deleted
3234

35+
- Automatically show completion list in argument lists
36+
3337
- Highlight matching portions of completion list items
3438

3539
- Show completion item filters
3640

41+
- Automatically complete statement on semicolon
42+
3743
## Snippets behavior
3844

3945
- Never include snippets
@@ -76,6 +82,14 @@ The **IntelliSense** options page contains the following options:
7682

7783
Performs automatic object name completion for the members that you have recently selected.
7884

85+
## Show items from unimported namespaces
86+
87+
Performs completion for types and extension methods that you haven't imported yet with a `using` directive.
88+
89+
## Tab twice to insert arguments
90+
91+
Automatically inserts arguments when writing a method call. To use this feature, start writing a method call and press tab twice.
92+
7993
## See also
8094

8195
- [General, Environment, Options Dialog Box](../../ide/reference/general-environment-options-dialog-box.md)

docs/ide/reference/options-text-editor-usql-formatting.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ author: anandmeg
1313
ms.author: meghaanand
1414
manager: mijacobs
1515
ms.subservice: general-ide
16+
monikerRange: vs-2019
1617
---
1718
# Options, Text Editor, U-SQL, Formatting
1819

docs/ide/reference/options-text-editor-usql-intellisense.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ author: anandmeg
1010
ms.author: meghaanand
1111
manager: mijacobs
1212
ms.subservice: general-ide
13+
monikerRange: vs-2019
1314
---
1415
# Options, Text Editor, U-SQL, IntelliSense
1516

docs/ide/signing-in-to-visual-studio.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.subservice: general-ide
1111
---
1212
# Sign in or switch Visual Studio user accounts
1313

14-
In this article, you learn how to sign in to Visual Studio, add and switch user accounts, update your profile, sign out of your account, and the benefits to signing in. If you are looking to learn how to use multiple accounts for sign-ins, check out our article, [Access multiple accounts associated with the Visual Studio sign-in account](sign-in-access-multiple-accounts.md).
14+
In this article, you learn how to sign in to Visual Studio, add and switch user accounts, update your profile, sign out of your account, and the benefits to signing in. To learn how to access multiple user accounts in Visual Studio, see [Access multiple accounts associated with the Visual Studio sign-in account](sign-in-access-multiple-accounts.md). For guidance on how to add your public GitHub or GitHub Enterprise account to your Visual Studio keychain, see [Work with GitHub accounts in Visual Studio](work-with-github-accounts.md).
1515

1616
You can get subscription support and search the frequently asked questions about subscriptions, accounts, and billing [on our Subscription support page](https://visualstudio.microsoft.com/subscriptions/support/).
1717

@@ -166,4 +166,11 @@ To sign out of all accounts:
166166

167167
You can also use the **Account Settings** dialog to sign out of all accounts.
168168

169-
::: moniker-end
169+
::: moniker-end
170+
171+
## Related content
172+
173+
- [Access multiple accounts associated with the Visual Studio sign-in account](sign-in-access-multiple-accounts.md)
174+
- [Work with GitHub accounts in Visual Studio](work-with-github-accounts.md)
175+
- [Extend a trial version or update a license](how-to-unlock-visual-studio.md)
176+
- [Sign in to Visual Studio with accounts that require multifactor authentication (MFA)](work-with-multi-factor-authentication.md)

docs/ide/using-regular-expressions-in-visual-studio.md

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ms.subservice: general-ide
2121

2222
Visual Studio uses [.NET regular expressions](/dotnet/standard/base-types/regular-expressions) to find and replace text.
2323

24-
## Regular expression examples
24+
## Regular expression syntax
2525

2626
The following table contains some regular expression characters, operators, constructs, and pattern examples. For a more complete reference, see [Regular expression language](/dotnet/standard/base-types/regular-expression-language-quick-reference).
2727

@@ -47,15 +47,15 @@ The following table contains some regular expression characters, operators, cons
4747
|Specify the number of occurrences of the preceding character or group. For more information, see [Match exactly n times](/dotnet/standard/base-types/quantifiers-in-regular-expressions#match-exactly-n-times-n).|{n}, where 'n' is the number of occurrences|`x(ab){2}x` matches "xababx"<br/>`x(ab){2,3}x` matches "xababx" and "xabababx" but not "xababababx"|
4848
|[Match text in a Unicode category](/dotnet/standard/base-types/character-classes-in-regular-expressions#unicode-category-or-unicode-block-p). For more information about Unicode character classes, see [Unicode Standard 15.0 Character Properties](https://www.unicode.org/versions/Unicode15.0.0/ch04.pdf#G39).|\p{X}, where "X" is the Unicode number.|`\p{Lu}` matches "T" and "D" in "Thomas Doe"|
4949
|[Match a word boundary](/dotnet/standard/base-types/anchors-in-regular-expressions#word-boundary-b)|\b (Outside a character class `\b` specifies a word boundary, and inside a character class `\b` specifies a backspace.)|`\bin` matches "in" in "inside" but finds no matches in "pinto"|
50-
|Match a line break (that is, a carriage return followed by a new line)|\r?\n|`End\r?\nBegin` matches "End" and "Begin" only when "End" is the last string in a line and "Begin" is the first string in the next line|
50+
|Match a line break (that is, a carriage return followed by a new line, or a new line only)|\r?\n|`End\r?\nBegin` matches "End" and "Begin" only when "End" is the last string in a line and "Begin" is the first string in the next line|
5151
|Match any [word character](/dotnet/standard/base-types/character-classes-in-regular-expressions#word-character-w)|\w|`a\wd` matches "add" and "a1d" but not "a d"|
5252
|Match any [whitespace character](/dotnet/standard/base-types/character-classes-in-regular-expressions#whitespace-character-s)|\s|`Public\sInterface` matches the phrase "Public Interface"|
5353
|Match any [decimal digit character](/dotnet/standard/base-types/character-classes-in-regular-expressions#decimal-digit-character-d)|\d|`\d` matches "4" and "0" in "wd40"|
5454

5555
An example regular expression that combines some of the operators and constructs to match a hexadecimal number is `\b0[xX]([0-9a-fA-F]+)\b`. This expression matches "0xc67f" but not "0xc67g".
5656

5757
> [!TIP]
58-
> In Windows operating systems, most lines end in "\r\n" (a carriage return followed by a new line). These characters aren't visible but are present in the editor and passed to the .NET regular expression service.
58+
> In Windows operating systems, most lines end in "\r\n" (a carriage return followed by a new line). These characters aren't visible but are present in the editor and passed to the .NET regular expression service. When you deal with files from the web or from a non-Windows operating system, be sure to account for the possibility that they use new line only for a line break.
5959
6060
## Capture groups and replacement patterns
6161

@@ -93,6 +93,16 @@ The following image shows a regular expression `(?<repeated>\w+)\s\k<repeated>`
9393
9494
For more information about named capture groups, see [Named matched subexpressions](/dotnet/standard/base-types/grouping-constructs-in-regular-expressions#named-matched-subexpressions). For more information about regular expressions that are used in replacement patterns, see [Substitutions in regular expressions](/dotnet/standard/base-types/substitutions-in-regular-expressions).
9595

96+
## Examples
97+
98+
| Pattern | Description |
99+
| - | - |
100+
| `int ([_A-Za-z][_A-Za-z0-9]*)` | Match single integer definitions. Identifiers begin with one uppercase or lowercase letter, followed by zero or more (indicated by `*`) letters or numbers. The identifier is captured as `$1` by the outer parentheses. |
101+
| `(private|internal|public)*\s*([\w]+\s+)int\s+([_A-Za-z][_A-Za-z0-9]*)\s+=\s+[+-]+(\d)+` | Match C# integer declarations that are initialized to integer literals, capturing the various parts, including the access level, modifiers like `const` or `static`, the identifier, and the defined value. Note the use of `\s+` for at least one whitespace character, or `\s*` if whitespace might or might not occur. |
102+
| `foreach\s*\(([\w\d]*)\s+([\w\d]*)\s+in\s+(.*)\)` | Match the opening line of a `foreach` loop. The literal parentheses are escaped with backslash (`\`). The various groups are captured as `$1`, `$2`, and `$3` by the unescaped parentheses. |
103+
| `#define\s+([_A-Za-z][_A-Za-z0-9]*)` | Matches `#define` definitions (without the value, if any). The defined token is stored in `$1`. |
104+
| `#include\s+["<](.*)[">]` | Match includes in a C++ source file. |
105+
96106
## Related content
97107

98108
- [Quick reference: Regular expression language](/dotnet/standard/base-types/regular-expression-language-quick-reference)

docs/ide/work-with-github-accounts.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ In this article, you learn how to add your public GitHub or GitHub Enterprise ac
1515

1616
## Adding public GitHub accounts
1717

18-
You can add your public GitHub account at any point, even if you haven't [signed into Visual Studio with a Microsoft account, work account, or school account](signing-in-to-visual-studio.md#sign-in-to-your-account).
18+
You can add your public GitHub account at any point, after you've [signed into Visual Studio with a Microsoft account, work account, or school account](signing-in-to-visual-studio.md#sign-in-to-your-account).
19+
20+
If you have [GitHub Copilot installed](visual-studio-github-copilot-install-and-states.md), you can add a GitHub account by selecting **Add GitHub account to Visual Studio** from the [GitHub Copilot status icon](visual-studio-github-copilot-install-and-states.md#copilot-is-inactive), even if you haven't [signed into Visual Studio with a Microsoft account, work account, or school account](signing-in-to-visual-studio.md#sign-in-to-your-account).
1921

2022
**Add a GitHub account from the **Account settings** dialog:**
2123

0 commit comments

Comments
 (0)