Skip to content

Commit e26f3be

Browse files
authored
Merge pull request #5645 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 8a96a65 + c484e17 commit e26f3be

File tree

37 files changed

+105
-95
lines changed

37 files changed

+105
-95
lines changed

docs/debugger/walkthrough-writing-a-visualizer-in-csharp.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Follow the tasks below to create a visualizer.
5959

6060
5. Click **OK**.
6161

62-
6. In DebuggerSide.cs, add the following statement to the `using` statements:
62+
6. In DebuggerSide.cs, add the following to the `using` directives:
6363

6464
```csharp
6565
using Microsoft.VisualStudio.DebuggerVisualizers;
@@ -93,7 +93,7 @@ Follow the tasks below to create a visualizer.
9393
}
9494
```
9595

96-
The `Show` method contains the code that actually creates the visualizer dialog box or other user interface and displays the information that has been passed to the visualizer from the debugger. You must add the code that creates the dialog box and displays the information. In this walkthrough, you will do this using a Windows forms message box. First, you must add a reference and `using` statement for System.Windows.Forms.
96+
The `Show` method contains the code that actually creates the visualizer dialog box or other user interface and displays the information that has been passed to the visualizer from the debugger. You must add the code that creates the dialog box and displays the information. In this walkthrough, you will do this using a Windows forms message box. First, you must add a reference and `using` directive for System.Windows.Forms.
9797

9898
### To add System.Windows.Forms
9999

@@ -105,7 +105,7 @@ Follow the tasks below to create a visualizer.
105105

106106
3. Click **OK**.
107107

108-
4. In DebuggerSide.cs, add the following statement to the `using` statements:
108+
4. In DebuggerSide.cs, add the following to the `using` directives:
109109

110110
```csharp
111111
using System.Windows.Forms;
@@ -129,7 +129,7 @@ Follow the tasks below to create a visualizer.
129129

130130
### To add the debuggee-side code
131131

132-
1. Add the following attribute code to DebuggerSide.cs, after the `using` statements but before `namespace MyFirstVisualizer`:
132+
1. Add the following attribute code to DebuggerSide.cs, after the `using` directives but before `namespace MyFirstVisualizer`:
133133

134134
```csharp
135135
[assembly:System.Diagnostics.DebuggerVisualizer(
@@ -199,7 +199,7 @@ Follow the tasks below to create a visualizer.
199199
> [!NOTE]
200200
> [!INCLUDE[vsprvs](../code-quality/includes/vsprvs_md.md)] automatically changes the class declaration in TestConsole.cs to match the new file name.
201201
202-
3. In TestConsole.cs, add the following code to the `using` statements:
202+
3. In TestConsole.cs, add the following code to the `using` directives:
203203

204204
```csharp
205205
using MyFirstVisualizer;
@@ -264,4 +264,4 @@ First, you have to create a new class library project.
264264

265265
- [Visualizer Architecture](../debugger/visualizer-architecture.md)
266266
- [How to: Install a Visualizer](../debugger/how-to-install-a-visualizer.md)
267-
- [Create Custom Visualizers](../debugger/create-custom-visualizers-of-data.md)
267+
- [Create Custom Visualizers](../debugger/create-custom-visualizers-of-data.md)

docs/deployment/how-to-retrieve-query-string-information-in-an-online-clickonce-application.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ The *query string* is the portion of a URL beginning with a question mark (?) th
4040
4141
### To obtain query string information from a ClickOnce application
4242

43-
1. Place the following code in your project. In order for this code to function, you will have to have a reference to System.Web and add `using` or `Imports` statements for System.Web, System.Collections.Specialized, and System.Deployment.Application.
43+
1. Place the following code in your project. In order for this code to function, you will have to have a reference to System.Web and add `using` or `Imports` directives for System.Web, System.Collections.Specialized, and System.Deployment.Application.
4444

4545
[!code-csharp[ClickOnceQueryString#1](../deployment/codesnippet/CSharp/how-to-retrieve-query-string-information-in-an-online-clickonce-application_1.cs)]
4646
[!code-vb[ClickOnceQueryString#1](../deployment/codesnippet/VisualBasic/how-to-retrieve-query-string-information-in-an-online-clickonce-application_1.vb)]
@@ -73,4 +73,4 @@ The *query string* is the portion of a URL beginning with a question mark (?) th
7373
Allow passing URL parameters to your [!INCLUDE[ndptecclick](../deployment/includes/ndptecclick_md.md)] application only if you plan to cleanse the input of any malicious characters before using it. A string embedded with quotes, slashes, or semicolons, for example, might perform arbitrary data operations if used unfiltered in a SQL query against a database. For more information on query string security, see [Script exploits overview](https://msdn.microsoft.com/Library/772c7312-211a-4eb3-8d6e-eec0aa1dcc07).
7474

7575
## See also
76-
- [Secure ClickOnce applications](../deployment/securing-clickonce-applications.md)
76+
- [Secure ClickOnce applications](../deployment/securing-clickonce-applications.md)

docs/deployment/walkthrough-creating-a-custom-installer-for-a-clickonce-application.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Any ClickOnce application based on an *.exe* file can be silently installed and
3030

3131
2. Add a new class to your application and specify any name. This walkthrough uses the name `MyInstaller`.
3232

33-
3. Add the following `Imports` or `using` statements to the top of your new class.
33+
3. Add the following `Imports` or `using` directives to the top of your new class.
3434

3535
```vb
3636
Imports System.Deployment.Application
@@ -71,4 +71,4 @@ Any ClickOnce application based on an *.exe* file can be silently installed and
7171

7272
## See also
7373
- [ClickOnce application manifest](../deployment/clickonce-application-manifest.md)
74-
- [\<entryPoint> element](../deployment/entrypoint-element-clickonce-application.md)
74+
- [\<entryPoint> element](../deployment/entrypoint-element-clickonce-application.md)

docs/extensibility/adding-a-shortcut-menu-in-a-tool-window.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ A shortcut menu such as the one shown in this walkthrough lets the user select f
123123

124124
1. In *ShortcutMenu.cs*, the tool window can get the menu command service, but the control it contains cannot. The following steps show how to make the menu command service available to the user control.
125125

126-
2. In *ShortcutMenu.cs*, add the following using statements:
126+
2. In *ShortcutMenu.cs*, add the following using directives:
127127

128128
```csharp
129129
using Microsoft.VisualStudio.Shell;
@@ -208,7 +208,7 @@ A shortcut menu such as the one shown in this walkthrough lets the user select f
208208
}
209209
```
210210

211-
8. Add the following using statements to the same file:
211+
8. Add the following using directives to the same file:
212212

213213
```csharp
214214
using Microsoft.VisualStudio.Shell;

docs/extensibility/adding-a-tool-window.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ ms.workload:
1313
- "vssdk"
1414
---
1515
# Add a tool window
16+
1617
In this walkthrough you learn how to create a tool window and integrate it into Visual Studio in the following ways:
1718

1819
- Add a control to the tool window.
@@ -26,7 +27,8 @@ In this walkthrough you learn how to create a tool window and integrate it into
2627
- Set the default position for the tool window.
2728

2829
## Prerequisites
29-
Starting in Visual Studio 2015, you do not install the Visual Studio SDK from the download center. It is included as an optional feature in Visual Studio setup. You can also install the VS SDK later on. For more information, see [Install the Visual Studio SDK](../extensibility/installing-the-visual-studio-sdk.md).
30+
31+
The Visual Studio SDK is included as an optional feature in Visual Studio setup. For more information, see [Install the Visual Studio SDK](../extensibility/installing-the-visual-studio-sdk.md).
3032

3133
## Create a tool window
3234

@@ -84,7 +86,8 @@ By adding a toolbar in the following manner, you guarantee that its gradients an
8486
By setting the parent GUID and ID to the GUID and ID of the toolbar, you add the group to the toolbar.
8587

8688
## Add a command to the toolbar
87-
Add a command to the toolbar, which is displayed as a button.
89+
90+
Add a command to the toolbar, which is displayed as a button.
8891

8992
1. In the `<Symbols>` section, declare the following IDSymbol elements just after the toolbar and toolbar group declarations.
9093

@@ -132,7 +135,7 @@ public System.Windows.Controls.MediaElement MediaPlayer
132135
## Instantiate the tool window and toolbar
133136
Add a toolbar and a menu command that invokes the **Open File** dialog and plays the selected media file.
134137

135-
1. Open *FirstToolWindow.cs* and add the following `using` statements.
138+
1. Open *FirstToolWindow.cs* and add the following `using` directives:
136139

137140
```csharp
138141
using System.ComponentModel.Design;
@@ -161,7 +164,7 @@ Add a toolbar and a menu command that invokes the **Open File** dialog and plays
161164
this.ToolBarLocation = (int)VSTWT_LOCATION.VSTWT_TOP;
162165
```
163166

164-
5. At this point the FirstToolWindow constructor should look like this:
167+
5. At this point, the FirstToolWindow constructor should look like this:
165168

166169
```csharp
167170
public FirstToolWindow() : base(null)
@@ -177,7 +180,7 @@ Add a toolbar and a menu command that invokes the **Open File** dialog and plays
177180
}
178181
```
179182

180-
6. Add the menu command to the toolbar. In the FirstToolWindowCommand.cs class, add the following using statement
183+
6. Add the menu command to the toolbar. In the FirstToolWindowCommand.cs class, add the following using directive:
181184

182185
```csharp
183186
using System.Windows.Forms;
@@ -243,7 +246,8 @@ Add a toolbar and a menu command that invokes the **Open File** dialog and plays
243246
```
244247

245248
## Set the default position for the tool window
246-
Next, specify a default location in the IDE for the tool window. Configuration information for the tool window is in the *FirstToolWindowPackage.cs* file.
249+
250+
Next, specify a default location in the IDE for the tool window. Configuration information for the tool window is in the *FirstToolWindowPackage.cs* file.
247251

248252
1. In *FirstToolWindowPackage.cs*, find the <xref:Microsoft.VisualStudio.Shell.ProvideToolWindowAttribute> attribute on the `FirstToolWindowPackage` class, which passes the FirstToolWindow type to the constructor. To specify a default position, you must add more parameters to the constructor following example.
249253

docs/extensibility/adding-search-to-a-tool-window.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ By following this walkthrough, you'll learn how to perform the following tasks:
5959
</StackPanel>
6060
```
6161

62-
3. In the *TestSearchControl.xaml.cs* file, add the following using statement:
62+
3. In the *TestSearchControl.xaml.cs* file, add the following using directive:
6363

6464
```csharp
6565
using System.Text;
@@ -102,7 +102,7 @@ By following this walkthrough, you'll learn how to perform the following tasks:
102102
## To add the search implementation
103103
When you enable search on a <xref:Microsoft.VisualStudio.Shell.ToolWindowPane>, as in the previous procedure, the tool window creates a search host. This host sets up and manages search processes, which always occur on a background thread. Because the <xref:Microsoft.VisualStudio.Shell.ToolWindowPane> class manages the creation of the search host and the setting up of the search, you need only create a search task and provide the search method. The search process occurs on a background thread, and calls to the tool window control occur on the UI thread. Therefore, you must use the [ThreadHelper.Invoke*](https://msdn.microsoft.com/data/ee197798(v=vs.85)) method to manage any calls that you make in dealing with the control.
104104

105-
1. In the *TestSearch.cs* file, add the following `using` statements:
105+
1. In the *TestSearch.cs* file, add the following `using` directives:
106106

107107
```csharp
108108
using System;
@@ -485,4 +485,4 @@ By following this walkthrough, you'll learn how to perform the following tasks:
485485

486486
8. Choose the X on the right side of the search box.
487487

488-
The search is cleared, and the original contents appear. However, the **Match case** check box is still selected.
488+
The search is cleared, and the original contents appear. However, the **Match case** check box is still selected.

docs/extensibility/creating-a-basic-project-system-part-1.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ Templates
184184

185185
2. Add a class to the top *SimpleProject* folder named *SimpleProjectFactory.cs*.
186186

187-
3. Add the following using statements:
187+
3. Add the following using directives:
188188

189189
```csharp
190190
using System.Runtime.InteropServices;
@@ -263,7 +263,7 @@ Templates
263263

264264
### To initialize the project factory
265265

266-
1. In the *SimpleProjectPackage.cs* file, add the following `using` statement.
266+
1. In the *SimpleProjectPackage.cs* file, add the following `using` directive.
267267

268268
```csharp
269269
using Microsoft.VisualStudio.Project;
@@ -291,7 +291,7 @@ Templates
291291
}
292292
```
293293

294-
5. In *SimpleProjectFactory.cs*, add the following `using` statement after the existing `using` statements.
294+
5. In *SimpleProjectFactory.cs*, add the following `using` directive after the existing `using` directives.
295295

296296
```csharp
297297
using Microsoft.VisualStudio.Project;
@@ -410,7 +410,7 @@ Templates
410410

411411
### To connect the project factory class and the node class
412412

413-
1. In the *SimpleProjectFactory.cs* file, add the following `using` statement:
413+
1. In the *SimpleProjectFactory.cs* file, add the following `using` directive:
414414

415415
```csharp
416416
using IOleServiceProvider = Microsoft.VisualStudio.OLE.Interop.IServiceProvider;
@@ -454,7 +454,7 @@ Templates
454454

455455
3. In the **Properties** window, change the **Build action** of the bitmap to **Embedded Resource**.
456456

457-
4. In *SimpleProjectNode.cs*, add the following `using` statements:
457+
4. In *SimpleProjectNode.cs*, add the following `using` directives:
458458

459459
```csharp
460460
using System.Drawing;
@@ -556,7 +556,7 @@ Templates
556556

557557
### To substitute template parameters
558558

559-
1. In the *SimpleProjectNode.cs* file, add the following `using` statement.
559+
1. In the *SimpleProjectNode.cs* file, add the following `using` directive.
560560

561561
```csharp
562562
using System.IO;
@@ -630,4 +630,4 @@ Templates
630630

631631
![Simple Project Command](../extensibility/media/simpleprojcommand.png "SimpleProjCommand")
632632

633-
Congratulations! You have implemented a basic managed project system.
633+
Congratulations! You have implemented a basic managed project system.

docs/extensibility/dynamically-adding-menu-items.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ You can add menu items at run time by specifying the `DynamicItemStart` command
146146

147147
```
148148

149-
2. Add the following using statements:
149+
2. Add the following using directives:
150150

151151
```csharp
152152
using Microsoft.VisualStudio.Shell;
@@ -206,7 +206,7 @@ You can add menu items at run time by specifying the `DynamicItemStart` command
206206
public const uint cmdidMyCommand = 0x104;
207207
```
208208

209-
2. In the *DynamicMenu.cs* file, add the following using statements:
209+
2. In the *DynamicMenu.cs* file, add the following using directives:
210210

211211
```csharp
212212
using EnvDTE;
@@ -352,4 +352,4 @@ public sealed class DynamicMenuItemsPackage : Package
352352

353353
## See also
354354
- [Commands, menus, and toolbars](../extensibility/internals/commands-menus-and-toolbars.md)
355-
- [How VSPackages add user interface elements](../extensibility/internals/how-vspackages-add-user-interface-elements.md)
355+
- [How VSPackages add user interface elements](../extensibility/internals/how-vspackages-add-user-interface-elements.md)

docs/extensibility/extending-the-properties-task-list-output-and-options-windows.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ You can access any tool window in Visual Studio. This walkthrough shows how to i
5555

5656
### Customize the constructor
5757

58-
1. In the *TodoWindowControl.xaml.cs* file, add the following using statement:
58+
1. In the *TodoWindowControl.xaml.cs* file, add the following using directive:
5959

6060
```csharp
6161
using System;
@@ -97,7 +97,7 @@ You can access any tool window in Visual Studio. This walkthrough shows how to i
9797
}
9898
```
9999

100-
2. Add the following using statement:
100+
2. Add the following using directive:
101101

102102
```csharp
103103
using Microsoft.VisualStudio.Shell;
@@ -144,7 +144,7 @@ You can access any tool window in Visual Studio. This walkthrough shows how to i
144144

145145
![Properties Window](../extensibility/media/t5properties.png "T5Properties")
146146

147-
2. Add the following using statements the *TodoItem.cs* file.
147+
2. Add the following using directives the *TodoItem.cs* file.
148148

149149
```csharp
150150
using System.ComponentModel;
@@ -277,7 +277,7 @@ You can access any tool window in Visual Studio. This walkthrough shows how to i
277277
}
278278
```
279279

280-
4. Add the following using statements to *TodoWindowControl.xaml.cs*:
280+
4. Add the following using directives to *TodoWindowControl.xaml.cs*:
281281

282282
```csharp
283283
using System.Runtime.InteropServices;

docs/extensibility/getting-project-properties.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Starting in Visual Studio 2015, you do not install the Visual Studio SDK from th
3030

3131
### To display project properties in a tool window
3232

33-
1. In the ProjectPropertiesToolWindowCommand.cs file, add the following using statements.
33+
1. In the ProjectPropertiesToolWindowCommand.cs file, add the following using directives.
3434

3535
```csharp
3636
using EnvDTE;
@@ -93,4 +93,4 @@ Starting in Visual Studio 2015, you do not install the Visual Studio SDK from th
9393

9494
6. In the **View** > **Other Windows** click **ProjectPropertiesToolWindow**.
9595

96-
You should see the tree control in the tool window together with the name of the first project and of all its project properties.
96+
You should see the tree control in the tool window together with the name of the first project and of all its project properties.

docs/extensibility/getting-service-information-from-the-settings-store.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ You can use the settings store to find all available services or to determine wh
1616

1717
1. Create a VSIX project named `FindServicesExtension` and then add a custom command named `FindServicesCommand`. For more information about how to create a custom command, see [Create an extension with a menu command](../extensibility/creating-an-extension-with-a-menu-command.md)
1818

19-
2. In *FindServicesCommand.cs*, add the following using statements:
19+
2. In *FindServicesCommand.cs*, add the following using directives:
2020

2121
```vb
2222
using System.Collections.Generic;
@@ -74,4 +74,4 @@ You can use the settings store to find all available services or to determine wh
7474

7575
3. In the experimental instance, on the **Tools** menu, click **Invoke FindServicesCommand**.
7676

77-
You should see a message with the text **Help Service Available:** followed by **True** or **False**. To verify this setting, you can use a registry editor, as shown in the earlier steps.
77+
You should see a message with the text **Help Service Available:** followed by **True** or **False**. To verify this setting, you can use a registry editor, as shown in the earlier steps.

docs/extensibility/how-to-provide-an-asynchronous-visual-studio-service.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ If you want to obtain a service without blocking the UI thread, you should creat
3636

3737
5. The following example shows a very basic implementation of the three types. The constructor of the service class must set the service provider. In this example we'll just add the service to the package code file.
3838

39-
6. Add the following using statements to the package file:
39+
6. Add the following using directives to the package file:
4040

4141
```csharp
4242
using System.Threading;
@@ -197,7 +197,7 @@ public sealed class TestAsyncPackage : AsyncPackage
197197

198198
4. In the *TestAsyncCommand.cs* file, find the `MenuItemCallback()` method. Delete the body of the method.
199199

200-
5. Add a using statement:
200+
5. Add a using directive:
201201

202202
```csharp
203203
using System.IO;

0 commit comments

Comments
 (0)