Skip to content

Commit 04db10c

Browse files
authored
Merge pull request #3145 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/visualstudio-docs (branch master)
2 parents 1000427 + 5e5582a commit 04db10c

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ Here are some examples:
5252
|Match either the expression before or the one after the symbol.|||`(sponge\|mud) bath` matches "sponge bath" and "mud bath."|
5353
|Escape the character following the backslash| \\ |`\^` matches the character ^.|
5454
|Specify the number of occurrences of the preceding character or group|{x}, where x is the number of occurrences|`x(ab){2}x` matches "xababx", and `x(ab){2,3}x` matches "xababx" and "xabababx" but not "xababababx".|
55-
|Match text in a Unicode character class, where "X" is the Unicode number. For more information about Unicode character classes, see<br /><br /> [Unicode Standard 5.2 Character Properties](http://www.unicode.org/versions/Unicode5.2.0/ch04.pdf).|\p{X}|`\p{Lu}` matches "T" and "D" in "Thomas Doe".|
56-
|Match a word boundary|`\b` (Outside a character class \b specifies a word boundary, and inside a character class specifies a backspace).|`\bin` matches "in" in "inside" but not "pinto".|
55+
|Match text in a Unicode character class. For more information about Unicode character classes, see<br /><br /> [Unicode Standard 5.2 Character Properties](http://www.unicode.org/versions/Unicode5.2.0/ch04.pdf).|\p{X}, where "X" is the Unicode number.|`\p{Lu}` matches "T" and "D" in "Thomas Doe".|
56+
|Match a word boundary|\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 not "pinto".|
5757
|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.|
5858
|Match any alphanumeric character|\w|`a\wd` matches "add" and "a1d" but not "a d".|
5959
|Match any whitespace character.|(?([^\r\n])\s)|`Public\sInterface` matches the phrase "Public Interface".|
@@ -69,4 +69,4 @@ Here are some examples:
6969
7070
## See also
7171

72-
- [Find and replace text](../ide/finding-and-replacing-text.md)
72+
- [Find and replace text](../ide/finding-and-replacing-text.md)

docs/msbuild/project-element-msbuild.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Required root element of an [!INCLUDE[vstecmsbuild](../extensibility/internals/i
5353
| Attribute | Description |
5454
|------------------------| - |
5555
| `DefaultTargets` | Optional attribute.<br /><br /> The default target or targets to be the entry point of the build if no target has been specified. Multiple targets are semi-colon (;) delimited.<br /><br /> If no default target is specified in either the `DefaultTargets` attribute or the [!INCLUDE[vstecmsbuild](../extensibility/internals/includes/vstecmsbuild_md.md)] command line, the engine executes the first target in the project file after the [Import](../msbuild/import-element-msbuild.md) elements have been evaluated. |
56-
| `InitialTargets` | Optional attribute.<br /><br /> The initial target or targets to be run before the targets specified in the `DefaultTargets` attribute or on the command line. Multiple targets are semi-colon (;) delimited. |
56+
| `InitialTargets` | Optional attribute.<br /><br /> The initial target or targets to be run before the targets specified in the `DefaultTargets` attribute or on the command line. Multiple targets are semi-colon (`;`) delimited. If multiple imported files define `InitialTargets`, all targets mentioned will be run, in the order the imports are encountered. |
5757
| `Sdk` | Optional attribute. <br /><br /> The SDK name and optional version to use to create implicit Import statements that are added to the .proj file. If no version is specified, MSBuild will attempt to resolve a default version. For example, `<Project Sdk="Microsoft.NET.Sdk" />` or `<Project Sdk="My.Custom.Sdk/1.0.0" />`. |
5858
| `ToolsVersion` | Optional attribute.<br /><br /> The version of the Toolset MSBuild uses to determine the values for $(MSBuildBinPath) and $(MSBuildToolsPath). |
5959
| `TreatAsLocalProperty` | Optional attribute.<br /><br /> Property names that won't be considered to be global. This attribute prevents specific command-line properties from overriding property values that are set in a project or targets file and all subsequent imports. Multiple properties are semi-colon (;) delimited.<br /><br /> Normally, global properties override property values that are set in the project or targets file. If the property is listed in the `TreatAsLocalProperty` value, the global property value doesn't override property values that are set in that file and any subsequent imports. For more information, see [How to: Build the same source files with different options](../msbuild/how-to-build-the-same-source-files-with-different-options.md). **Note:** You set global properties at a command prompt by using the **-property** (or **-p**) switch. You can also set or modify global properties for child projects in a multi-project build by using the `Properties` attribute of the MSBuild task. For more information, see [MSBuild task](../msbuild/msbuild-task.md). |

docs/vs-2015/snippets/visualbasic/VS_Snippets_Misc/ls_queries/vb/data/applicationdefinition.lsml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4369,7 +4369,7 @@
43694369
</BinaryExpression.Left>
43704370
<BinaryExpression.Right>
43714371
<ConstantExpression ResultType=":String?"
4372-
Value="Fuck You" />
4372+
Value="1 Microsoft Way" />
43734373
</BinaryExpression.Right>
43744374
</BinaryExpression>
43754375
</QueryFilterExpressionTree>

0 commit comments

Comments
 (0)