Skip to content

Commit 7ed15be

Browse files
committed
Merged main into live
2 parents 7645131 + 101dc24 commit 7ed15be

35 files changed

+193
-360
lines changed

.docutune/config/docutune-visualstudio-docs-pr.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@
5252
"*-caution-*",
5353
"abbreviation-linq-language-integrated-query",
5454
"casing-prefixes",
55-
"product-microsoft-visual-studio"
55+
"product-microsoft-visual-studio",
56+
"formatting-minimum-0002",
57+
"invalid-compound-word-verb-0002-005"
5658
]
5759
}

.github/policies/scheduled-pr.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@ configuration:
88
scheduledSearches:
99
- description: Push to live branch (scheduled publish)
1010
frequencies:
11-
- daily:
12-
time: 00:0
11+
- hourly:
12+
hour: 8
1313
filters: []
1414
actions:
1515
- createPullRequest:
1616
head: main
1717
base: live
1818
title: Merge main into live
1919
body: Please don't squash-merge this PR.
20+

.openpublishing.redirection.json

Lines changed: 143 additions & 143 deletions
Large diffs are not rendered by default.

.openpublishing.redirection.vs2017.json

Lines changed: 0 additions & 170 deletions
Original file line numberDiff line numberDiff line change
@@ -42682,181 +42682,11 @@
4268242682
"vs-2017"
4268342683
]
4268442684
},
42685-
{
42686-
"source_path": "docs/vsto/accessibility-in-office-projects.md",
42687-
"redirect_url": "/previous-versions/visualstudio/visual-studio-2017/vsto/accessibility-in-office-projects?view=vs-2017&preserve-view=true",
42688-
"redirect_document_id": false
42689-
},
42690-
{
42691-
"source_path": "docs/vsto/changes-to-the-design-of-office-projects-that-target-the-dotnet-framework-4-or-the-dotnet-framework-4-5.md",
42692-
"redirect_url": "/previous-versions/visualstudio/visual-studio-2017/vsto/changes-to-the-design-of-office-projects-that-target-the-dotnet-framework-4-or-the-dotnet-framework-4-5?view=vs-2017&preserve-view=true",
42693-
"redirect_document_id": false
42694-
},
42695-
{
42696-
"source_path": "docs/vsto/collaborative-development-of-office-solutions.md",
42697-
"redirect_url": "/previous-versions/visualstudio/visual-studio-2017/vsto/collaborative-development-of-office-solutions?view=vs-2017&preserve-view=true",
42698-
"redirect_document_id": false
42699-
},
42700-
{
42701-
"source_path": "docs/vsto/data-in-office-solutions-walkthroughs.md",
42702-
"redirect_url": "/previous-versions/visualstudio/visual-studio-2017/vsto/data-in-office-solutions-walkthroughs?view=vs-2017&preserve-view=true",
42703-
"redirect_document_id": false
42704-
},
42705-
{
42706-
"source_path": "docs/vsto/how-to-add-a-form-region-to-an-outlook-add-in-project.md",
42707-
"redirect_url": "/previous-versions/visualstudio/visual-studio-2017/vsto/how-to-add-a-form-region-to-an-outlook-add-in-project?view=vs-2017&preserve-view=true",
42708-
"redirect_document_id": false
42709-
},
42710-
{
42711-
"source_path": "docs/vsto/how-to-add-controls-to-the-backstage-view.md",
42712-
"redirect_url": "/previous-versions/visualstudio/visual-studio-2017/vsto/how-to-add-controls-to-the-backstage-view?view=vs-2017&preserve-view=true",
42713-
"redirect_document_id": false
42714-
},
42715-
{
42716-
"source_path": "docs/vsto/how-to-add-xmlmappedrange-controls-to-worksheets.md",
42717-
"redirect_url": "/previous-versions/visualstudio/visual-studio-2017/vsto/how-to-add-xmlmappedrange-controls-to-worksheets?view=vs-2017&preserve-view=true",
42718-
"redirect_document_id": false
42719-
},
42720-
{
42721-
"source_path": "docs/vsto/how-to-add-xmlnode-controls-to-word-documents.md",
42722-
"redirect_url": "/previous-versions/visualstudio/visual-studio-2017/vsto/how-to-add-xmlnode-controls-to-word-documents?view=vs-2017&preserve-view=true",
42723-
"redirect_document_id": false
42724-
},
42725-
{
42726-
"source_path": "docs/vsto/how-to-add-xmlnodes-controls-to-word-documents.md",
42727-
"redirect_url": "/previous-versions/visualstudio/visual-studio-2017/vsto/how-to-add-xmlnodes-controls-to-word-documents?view=vs-2017&preserve-view=true",
42728-
"redirect_document_id": false
42729-
},
42730-
{
42731-
"source_path": "docs/vsto/how-to-attach-managed-code-extensions-to-documents.md",
42732-
"redirect_url": "/previous-versions/visualstudio/visual-studio-2017/vsto/how-to-attach-managed-code-extensions-to-documents?view=vs-2017&preserve-view=true",
42733-
"redirect_document_id": false
42734-
},
42735-
{
42736-
"source_path": "docs/vsto/how-to-cache-data-in-a-password-protected-document.md",
42737-
"redirect_url": "/previous-versions/visualstudio/visual-studio-2017/vsto/how-to-cache-data-in-a-password-protected-document?view=vs-2017&preserve-view=true",
42738-
"redirect_document_id": false
42739-
},
42740-
{
42741-
"source_path": "docs/vsto/how-to-expose-code-to-vba-in-a-visual-basic-project.md",
42742-
"redirect_url": "/previous-versions/visualstudio/visual-studio-2017/vsto/how-to-expose-code-to-vba-in-a-visual-basic-project?view=vs-2017&preserve-view=true",
42743-
"redirect_document_id": false
42744-
},
42745-
{
42746-
"source_path": "docs/vsto/how-to-open-office-solutions-without-running-code.md",
42747-
"redirect_url": "/previous-versions/visualstudio/visual-studio-2017/vsto/how-to-open-office-solutions-without-running-code?view=vs-2017&preserve-view=true",
42748-
"redirect_document_id": false
42749-
},
42750-
{
42751-
"source_path": "docs/vsto/how-to-programmatically-add-an-entry-to-outlook-contacts.md",
42752-
"redirect_url": "/previous-versions/visualstudio/visual-studio-2017/vsto/how-to-programmatically-add-an-entry-to-outlook-contacts?view=vs-2017&preserve-view=true",
42753-
"redirect_document_id": false
42754-
},
42755-
{
42756-
"source_path": "docs/vsto/how-to-programmatically-cache-a-data-source-in-an-office-document.md",
42757-
"redirect_url": "/previous-versions/visualstudio/visual-studio-2017/vsto/how-to-programmatically-cache-a-data-source-in-an-office-document?view=vs-2017&preserve-view=true",
42758-
"redirect_document_id": false
42759-
},
42760-
{
42761-
"source_path": "docs/vsto/how-to-programmatically-check-spelling-in-worksheets.md",
42762-
"redirect_url": "/previous-versions/visualstudio/visual-studio-2017/vsto/how-to-programmatically-check-spelling-in-worksheets?view=vs-2017&preserve-view=true",
42763-
"redirect_document_id": false
42764-
},
42765-
{
42766-
"source_path": "docs/vsto/how-to-programmatically-delete-appointments.md",
42767-
"redirect_url": "/previous-versions/visualstudio/visual-studio-2017/vsto/how-to-programmatically-delete-appointments?view=vs-2017&preserve-view=true",
42768-
"redirect_document_id": false
42769-
},
42770-
{
42771-
"source_path": "docs/vsto/how-to-programmatically-display-worksheet-comments.md",
42772-
"redirect_url": "/previous-versions/visualstudio/visual-studio-2017/vsto/how-to-programmatically-display-worksheet-comments?view=vs-2017&preserve-view=true",
42773-
"redirect_document_id": false
42774-
},
42775-
{
42776-
"source_path": "docs/vsto/how-to-programmatically-restore-selections-after-searches.md",
42777-
"redirect_url": "/previous-versions/visualstudio/visual-studio-2017/vsto/how-to-programmatically-restore-selections-after-searches?view=vs-2017&preserve-view=true",
42778-
"redirect_document_id": false
42779-
},
42780-
{
42781-
"source_path": "docs/vsto/how-to-scroll-through-database-records-in-a-worksheet.md",
42782-
"redirect_url": "/previous-versions/visualstudio/visual-studio-2017/vsto/how-to-scroll-through-database-records-in-a-worksheet?view=vs-2017&preserve-view=true",
42783-
"redirect_document_id": false
42784-
},
4278542685
{
4278642686
"source_path": "docs/vsto/one-or-more-properties-in-the-dot-ofs-file-are-not-valid-for-the-message-class-selected .md",
4278742687
"redirect_url": "/previous-versions/visualstudio/visual-studio-2017/vsto/one-or-more-properties-in-the-dot-ofs-file-are-not-valid-for-the-message-class-selected?view=vs-2017&preserve-view=true",
4278842688
"redirect_document_id": false
4278942689
},
42790-
{
42791-
"source_path": "docs/vsto/password-protection-on-office-documents.md",
42792-
"redirect_url": "/previous-versions/visualstudio/visual-studio-2017/vsto/password-protection-on-office-documents?view=vs-2017&preserve-view=true",
42793-
"redirect_document_id": false
42794-
},
42795-
{
42796-
"source_path": "docs/vsto/persisting-dynamic-controls-in-office-documents.md",
42797-
"redirect_url": "/previous-versions/visualstudio/visual-studio-2017/vsto/persisting-dynamic-controls-in-office-documents?view=vs-2017&preserve-view=true",
42798-
"redirect_document_id": false
42799-
},
42800-
{
42801-
"source_path": "docs/vsto/project-upgrade-options-dialog-box.md",
42802-
"redirect_url": "/previous-versions/visualstudio/visual-studio-2017/vsto/project-upgrade-options-dialog-box?view=vs-2017&preserve-view=true",
42803-
"redirect_document_id": false
42804-
},
42805-
{
42806-
"source_path": "docs/vsto/publish-page-project-designer-office-development-in-visual-studio.md",
42807-
"redirect_url": "/previous-versions/visualstudio/visual-studio-2017/vsto/publish-page-project-designer-office-development-in-visual-studio?view=vs-2017&preserve-view=true",
42808-
"redirect_document_id": false
42809-
},
42810-
{
42811-
"source_path": "docs/vsto/required-changes-to-run-office-projects-that-you-migrate-to-the-dotnet-framework-4-or-the-dotnet-framework-4-5.md",
42812-
"redirect_url": "/previous-versions/visualstudio/visual-studio-2017/vsto/required-changes-to-run-office-projects-that-you-migrate-to-the-dotnet-framework-4-or-the-dotnet-framework-4-5?view=vs-2017&preserve-view=true",
42813-
"redirect_document_id": false
42814-
},
42815-
{
42816-
"source_path": "docs/vsto/secure-deployment.md",
42817-
"redirect_url": "/previous-versions/visualstudio/visual-studio-2017/vsto/secure-deployment?view=vs-2017&preserve-view=true",
42818-
"redirect_document_id": false
42819-
},
42820-
{
42821-
"source_path": "docs/vsto/security-and-deployment-walkthroughs.md",
42822-
"redirect_url": "/previous-versions/visualstudio/visual-studio-2017/vsto/security-and-deployment-walkthroughs?view=vs-2017&preserve-view=true",
42823-
"redirect_document_id": false
42824-
},
42825-
{
42826-
"source_path": "docs/vsto/updating-form-regions-in-outlook-projects-that-you-migrate-to-the-dotnet-framework-4-or-the-dotnet-framework-4-5.md",
42827-
"redirect_url": "/previous-versions/visualstudio/visual-studio-2017/vsto/updating-form-regions-in-outlook-projects-that-you-migrate-to-the-dotnet-framework-4-or-the-dotnet-framework-4-5?view=vs-2017&preserve-view=true",
42828-
"redirect_document_id": false
42829-
},
42830-
{
42831-
"source_path": "docs/vsto/upgrading-and-migrating-office-solutions.md",
42832-
"redirect_url": "/previous-versions/visualstudio/visual-studio-2017/vsto/upgrading-and-migrating-office-solutions?view=vs-2017&preserve-view=true",
42833-
"redirect_document_id": false
42834-
},
42835-
{
42836-
"source_path": "docs/vsto/user-interface-reference-office-development-in-visual-studio.md",
42837-
"redirect_url": "/previous-versions/visualstudio/visual-studio-2017/vsto/user-interface-reference-office-development-in-visual-studio?view=vs-2017&preserve-view=true",
42838-
"redirect_document_id": false
42839-
},
42840-
{
42841-
"source_path": "docs/vsto/walkthrough-creating-a-master-detail-relation-using-a-cached-dataset.md",
42842-
"redirect_url": "/previous-versions/visualstudio/visual-studio-2017/vsto/walkthrough-creating-a-master-detail-relation-using-a-cached-dataset?view=vs-2017&preserve-view=true",
42843-
"redirect_document_id": false
42844-
},
42845-
{
42846-
"source_path": "docs/vsto/working-with-mail-items.md",
42847-
"redirect_url": "/previous-versions/visualstudio/visual-studio-2017/vsto/working-with-mail-items?view=vs-2017&preserve-view=true",
42848-
"redirect_document_id": false
42849-
},
42850-
{
42851-
"source_path": "docs/vsto/xmlmappedrange-control.md",
42852-
"redirect_url": "/previous-versions/visualstudio/visual-studio-2017/vsto/xmlmappedrange-control?view=vs-2017&preserve-view=true",
42853-
"redirect_document_id": false
42854-
},
42855-
{
42856-
"source_path": "docs/vsto/xmlnode-control.md",
42857-
"redirect_url": "/previous-versions/visualstudio/visual-studio-2017/vsto/xmlnode-control?view=vs-2017&preserve-view=true",
42858-
"redirect_document_id": false
42859-
},
4286042690

4286142691
{
4286242692
"source_path": "docs/workflow-designer/add-correlationinitializers-dialog-box.md",

docs/data-tools/customize-how-visual-studio-creates-captions-for-data-bound-controls.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ The following table lists the internal default settings for these registry value
3939

4040
|Registry item|Default value|Explanation|
4141
|-------------------|-------------------|-----------------|
42-
|**SmartCaptionExpression**|**(\\\p{Ll})(\\\p{Lu})|_+**|Matches a lowercase character followed by an uppercase character or an underscore.|
42+
|**SmartCaptionExpression**|`(\\p{Ll})(\\p{Lu})|_+`|Matches a lowercase character followed by an uppercase character or an underscore.|
4343
|**SmartCaptionReplacement**|**$1 $2**|The **$1** represents any characters matched in the first parentheses of the expression, and the **$2** represents any characters matched in the second parentheses. The replacement is the first match, a space, and then the second match.|
4444
|**SmartCaptionSuffix**|**:**|Represents a character appended to the returned string. For example, if the caption is `Company Name`, the suffix makes it `Company Name:`|
4545

docs/data-tools/query-datasets.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ The following code examples demonstrate how to navigate up and down relationship
8787

8888
- An `Orders` table.
8989

90-
- A relationship named `FK_Orders_Customers`relating the two tables.
90+
- A relationship named `FK_Orders_Customers` relating the two tables.
9191

9292
Additionally, both tables need to be filled with data for any records to be returned.
9393

docs/data-tools/update-data-by-using-a-tableadapter.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Call the `Update` method of a TableAdapter. Pass the name of the data table that
4242

4343
### To update a database by using a TableAdapter
4444

45-
- Enclose the TableAdapter's`Update` method in a `try`/`catch` block. The following example shows how to update the contents of the `Customers` table in `NorthwindDataSet` from within a `try`/`catch` block .
45+
- Enclose the TableAdapter's `Update` method in a `try`/`catch` block. The following example shows how to update the contents of the `Customers` table in `NorthwindDataSet` from within a `try`/`catch` block.
4646

4747
### [C#](#tab/csharp)
4848
:::code language="csharp" source="../snippets/csharp/VS_Snippets_VBCSharp/VbRaddataSaving/CS/Form3.cs" id="Snippet9":::

docs/debugger/debug-interface-access/lexical-hierarchy-of-symbol-types.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
description: "The following table shows the symbol types in the lexical hierarchy."
32
title: "Lexical Hierarchy of Symbol Types"
3+
description: "The following table shows the symbol types in the lexical hierarchy."
44
ms.date: "11/04/2016"
55
ms.topic: "reference"
66
dev_langs:
@@ -34,7 +34,7 @@ The following table shows the symbol types in the lexical hierarchy.
3434
|[Label (Debug Interface Access SDK)](../../debugger/debug-interface-access/label-debug-interface-access-sdk.md)|Specifies a location in program code.|
3535
|[PublicSymbol](../../debugger/debug-interface-access/publicsymbol.md)|Specifies an external symbol that appears when building the executable program.|
3636
|[Thunk](../../debugger/debug-interface-access/thunk.md)|Specifies a `thunk`.|
37-
|[UsingNameSpace](../../debugger/debug-interface-access/usingnamespace.md)|Specifies a `namespace`identifier.|
37+
|[UsingNameSpace](../../debugger/debug-interface-access/usingnamespace.md)|Specifies a `namespace` identifier.|
3838

3939
> [!NOTE]
4040
> Additional symbol properties may be available depending on the symbol type. These properties are listed in the individual symbol topics.

docs/deployment/localizing-clickonce-applications.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Localization is the process of making your application appropriate for a specifi
5656

5757
You can accomplish the same thing by using the *MageUI.exe* tool in the Microsoft Windows Software Development Kit (SDK). Use the **Populate** button on the **Files** tab of your application manifest to exclude all other satellite assemblies from the application directory, and then set the **Culture** field on the **Name** tab for your deployment manifest in *MageUI.exe*. These steps not only include the correct satellite assembly, but they also set the `language` attribute on the `assemblyIdentity` element in your deployment manifest to the corresponding culture.
5858

59-
After publishing the application, you must repeat this step for each additional culture your application supports. You must make sure that you publish to a different Web server directory or file share directory every time, because each application manifest will reference a different satellite assembly, and each deployment manifest will have a different value for the `language`attribute.
59+
After publishing the application, you must repeat this step for each additional culture your application supports. You must make sure that you publish to a different Web server directory or file share directory every time, because each application manifest will reference a different satellite assembly, and each deployment manifest will have a different value for the `language` attribute.
6060

6161
## Download satellite assemblies on demand
6262
If you decide to include all satellite assemblies in a single deployment, you can improve performance by using on-demand downloading, which enables you to mark assemblies as optional. The marked assemblies will not be downloaded when the application is installed or updated. You can install the assemblies when you need them by calling the <xref:System.Deployment.Application.ApplicationDeployment.DownloadFileGroup%2A> method on the <xref:System.Deployment.Application.ApplicationDeployment> class.

docs/deployment/trustinfo-element-clickonce-application.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Describes the minimum security permissions required for the application to run o
6767
Required. This element is a child of the `trustInfo` element. It contains the `applicationRequestMinimum` element and has no attributes.
6868

6969
## applicationRequestMinimum
70-
Required. This element is a child of the `security` element and contains the `PermissionSet`, `assemblyRequest`, and `defaultAssemblyRequest`elements. This element has no attributes.
70+
Required. This element is a child of the `security` element and contains the `PermissionSet`, `assemblyRequest`, and `defaultAssemblyRequest` elements. This element has no attributes.
7171

7272
## PermissionSet
7373
Required. This element is a child of the `applicationRequestMinimum` element and contains the `IPermission` element. This element has the following attributes.

docs/deployment/walkthrough-downloading-assemblies-on-demand-with-the-clickonce-deployment-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ By default, all of the assemblies included in a ClickOnce application are downlo
8989

9090
10. In the code, locate the call to <xref:System.Reflection.Assembly.LoadFile%2A>.
9191

92-
11. Set`PublicKeyToken` to the value that you retrieved earlier.
92+
11. Set `PublicKeyToken` to the value that you retrieved earlier.
9393

9494
12. Save the file as either *Form1.cs* or *Form1.vb*.
9595

docs/extensibility/debugger/evaluating-a-watch-window-expression.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ ms.subservice: debug-diagnostics
2727

2828
3. `IDebugExpressionContext2::ParseText` calls [Parse](../../extensibility/debugger/reference/idebugexpressionevaluator-parse.md) to do the actual work of parsing the text and produce an [IDebugParsedExpression](../../extensibility/debugger/reference/idebugparsedexpression.md) object.
2929

30-
4. `IDebugExpressionContext2::ParseText` creates an [IDebugExpression2](../../extensibility/debugger/reference/idebugexpression2.md) object and puts the `IDebugParsedExpression` object into it. This I`DebugExpression2` object is then returned to Visual Studio.
30+
4. `IDebugExpressionContext2::ParseText` creates an [IDebugExpression2](../../extensibility/debugger/reference/idebugexpression2.md) object and puts the `IDebugParsedExpression` object into it. This `IDebugExpression2` object is then returned to Visual Studio.
3131

3232
5. Visual Studio calls [EvaluateSync](../../extensibility/debugger/reference/idebugexpression2-evaluatesync.md) to evaluate the parsed expression.
3333

docs/extensibility/debugger/reference/const-guid-array.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
description: "A structure that holds a list of GUID`s."
32
title: CONST_GUID_ARRAY
3+
description: "A structure that holds a list of `GUID`s."
44
ms.date: 11/04/2016
55
ms.topic: reference
66
f1_keywords:

0 commit comments

Comments
 (0)