Skip to content

Commit 6d0cd8f

Browse files
authored
Merge pull request #3374 from MicrosoftDocs/master636952680214210566
For protected CLA branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents 2160590 + aeb1a11 commit 6d0cd8f

16 files changed

+92
-57
lines changed

docs/data-tools/create-a-sql-database-by-using-a-designer.md

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,19 @@ You can use Visual Studio to create and update a local database file in SQL Serv
2020

2121
## Prerequisites
2222

23-
To complete this walkthrough, you must have the optional **Data storage and processing** workload installed in Visual Studio. To install it, open **Visual Studio Installer** and choose **More** > **Modify** next to the version of Visual Studio you want to modify (if you have more than one version installed). On the **Workloads** tab, under **Web & Cloud**, choose **Data storage and processing**, and then click **Modify** to add the workload to Visual Studio.
23+
To complete this walkthrough, you must have the optional **Data storage and processing** workload installed in Visual Studio. To install it, open **Visual Studio Installer** and choose **Modify** or **More** > **Modify** next to the version of Visual Studio you want to modify.
24+
25+
::: moniker range=">=vs-2019"
26+
27+
On the **Workloads** tab, under **Other Toolsets**, choose **Data storage and processing**, and then click **Modify** to add the workload to Visual Studio.
28+
29+
::: moniker-end
30+
31+
::: moniker range="=vs-2017"
32+
33+
On the **Workloads** tab, under **Web & Cloud**, choose **Data storage and processing**, and then click **Modify** to add the workload to Visual Studio.
34+
35+
::: moniker-end
2436

2537
## Create a project and a local database file
2638

@@ -169,4 +181,4 @@ In this section, you'll create two tables, a primary key in each table, and a fe
169181

170182
## See also
171183

172-
- [Accessing data in Visual Studio](accessing-data-in-visual-studio.md)
184+
- [Accessing data in Visual Studio](accessing-data-in-visual-studio.md)

docs/ide/reference/rename.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,13 @@ This refactoring applies to:
6262
6363
4. When you're happy with the change, choose the **Apply** button or press **Enter** and the changes will be committed.
6464

65-
> [!NOTE]
66-
> If you use a name that already exists which would cause a conflict, the **Rename** box will warn you.
67-
>
68-
> ![Rename Conflict](media/rename-conflict-cs.png)
65+
## Remarks
66+
67+
- If you use a name that already exists which would cause a conflict, the **Rename** box will warn you.
68+
69+
![Rename Conflict](media/rename-conflict-cs.png)
70+
71+
- Another way to rename a symbol is to change its name in the editor. Then, with the cursor in the symbol name, press **Ctrl**+**.** or just expand the light bulb icon menu that appears and choose **Rename \<old name> to \<new name>**.
6972

7073
## See also
7174

docs/ide/step-1-create-a-project-and-add-a-table-to-your-form.md

Lines changed: 35 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "Step 1: Create a project and add a table to your form"
3-
ms.date: 11/04/2016
3+
ms.date: 05/31/2019
44
ms.topic: conceptual
55
ms.prod: visual-studio-windows
66
ms.technology: vs-ide-general
@@ -21,33 +21,55 @@ The first step in creating a matching game is to create the project and add a ta
2121

2222
1. On the menu bar, choose **File** > **New** > **Project**.
2323

24+
1. Choose either **Visual C#** or **Visual Basic** on the left side of the **New Project** dialog box, and then choose **Windows Desktop**.
25+
26+
1. In the list of templates, choose the **Windows Forms App (.NET Framework)** template, name it *MatchingGame*, and then choose the **OK** button.
27+
28+
A form that's named *Form1.cs* or *Form1.vb* appears, depending on the programming language that you chose.
29+
30+
> [!NOTE]
31+
> If you don't see the **Windows Forms App (.NET Framework)** template, use the Visual Studio Installer to install the **.NET desktop development** workload.<br/><br/>![.NET desktop development workload in the Visual Studio Installer](../ide/media/dot-net-desktop-dev-workload.png)<br/><br/> For more information, see the [Install Visual Studio](../install/install-visual-studio.md) page.
32+
2433
::: moniker-end
2534

2635
::: moniker range="vs-2019"
2736

2837
1. On the start window, choose **Create a new project**.
2938

30-
1. In the search box, type "WPF", choose **WPF App (.NET Framework)**, and then choose **Next**.
39+
![View the 'Create a new project' window](../get-started/media/vs-2019/create-new-project-dark-theme.png)
3140

32-
(If you don't see the **WPF App (.NET Framework)** template, use the Visual Studio Installer to install the **.NET desktop development** workload.)
41+
1. On the **Create a new project** window, enter or type *Windows Forms* in the search box.
3342

34-
1. Give the project a name, **MatchingGame**, and choose **Create**
43+
1. Choose the **Windows Forms App (.NET Framework)** template, and then choose **Next**.
3544

36-
::: moniker-end
45+
![Choose the Visual Basic template for the Windows Forms App (.NET Framework)](../get-started/visual-basic/media/vs-2019/vb-create-new-project-search-winforms-filtered.png)
46+
47+
> [!NOTE]
48+
> If you do not see the **Windows Forms App (.NET Framework)** template, you can install it from the **Create a new project** window. In the **Not finding what you're looking for?** message, choose the **Install more tools and features** link.
49+
>
50+
> ![The 'Install more tools and features' link from the 'Not finding what you're looking for' message in the 'Create new project' window](../get-started/media/vs-2019/not-finding-what-looking-for.png)
51+
>
52+
> Next, in the Visual Studio Installer, choose the Choose the **.NET desktop development** workload.
53+
>
54+
> ![.NET Core workload in the Visual Studio Installer](../ide/media/install-dot-net-desktop-env.png)
55+
>
56+
> After that, choose the **Modify** button in the Visual Studio Installer. You might be prompted to save your work; if so, do so. Next, choose **Continue** to install the workload.
57+
58+
1. In the **Configure your new project** window, type or enter *MatchingGame* in the **Project name** box. Then, choose **Create**.
3759

38-
2. If you're not using Visual Studio Express, you need to select a programming language first. From the **Installed Templates** list, choose either **Visual C#** or **Visual Basic**.
60+
::: moniker-end
3961

40-
3. In the list of project templates, choose **Windows Forms Application**, name the project **MatchingGame**, and then choose the **OK** button.
62+
## To set properties for a form
4163

42-
4. In the **Properties** window, set the following form properties.
64+
1. In the **Properties** window, set the following form properties.
4365

4466
1. Change the form's **Text** property from **Form1** to **Matching Game**. This text appears at the top of the game window.
4567

4668
2. Set the size of the form to 550 pixels wide by 550 tall. You can do this either by setting the **Size** property to **550, 550**, or by dragging the corner of the form until you see the correct size in the lower-right corner of the integrated development environment (IDE).
4769

48-
5. Display the toolbox by choosing the **Toolbox** tab on the left side of the IDE.
70+
2. Display the toolbox by choosing the **Toolbox** tab on the left side of the IDE.
4971

50-
6. Drag a <xref:System.Windows.Forms.TableLayoutPanel> control from the **Containers** category in the toolbox, and then set the following properties for it.
72+
3. Drag a <xref:System.Windows.Forms.TableLayoutPanel> control from the **Containers** category in the toolbox, and then set the following properties for it.
5173

5274
1. Set the **BackColor** property to **CornflowerBlue**. To do this, open the **BackColor** dialog box by choosing the drop-down arrow next to the **BackColor** property in the **Properties** window. Then, choose the **Web** tab in the **BackColor** dialog box to view a list of available color names.
5375

@@ -66,7 +88,7 @@ The first step in creating a matching game is to create the project and add a ta
6688

6789
Your TableLayoutPanel should now be a 4x4 grid, with sixteen equally sized square cells. These rows and columns are where the icon images will appear later.
6890

69-
7. Be certain that the TableLayoutPanel is selected in the form editor. To verify this, you should see **tableLayoutPanel1** at the top of the **Properties** window. If it is not selected, choose the TableLayoutPanel on the form, or choose it in the dropdown control at the top of the **Properties** window.
91+
4. Be certain that the TableLayoutPanel is selected in the form editor. To verify this, you should see **tableLayoutPanel1** at the top of the **Properties** window. If it is not selected, choose the TableLayoutPanel on the form, or choose it in the dropdown control at the top of the **Properties** window.
7092

7193
While the TableLayoutPanel is selected, open the toolbox and add a <xref:System.Windows.Forms.Label> control (located in the **Common Controls** category) to the upper-left cell of the TableLayoutPanel. The label control should now be selected in the IDE. Set the following properties for it.
7294

@@ -89,15 +111,14 @@ The first step in creating a matching game is to create the project and add a ta
89111
> [!NOTE]
90112
> The Webdings font is a font of icons that ships with the Windows operating system. In your matching game, the player needs to match pairs of icons, so you use this font to display the icons to match. Instead of putting **c** in the **Text** property, try entering different letters to see what icons are displayed. An exclamation point is a spider, an uppercase N is an eye, and a comma is a chili pepper.
91113
92-
8. Choose your Label control and copy it to the next cell in the TableLayoutPanel. (Choose the **Ctrl**+**C** keys, or on the menu bar, choose **Edit** > **Copy**.) Then paste it. (Choose the **Ctrl**+**V** keys, or on the menu bar, choose **Edit** > **Paste**.) A copy of the first Label appears in the second cell of the TableLayoutPanel. Paste it again, and another Label appears in the third cell. Keep pasting Label controls until all of the cells are filled.
114+
5. Choose your Label control and copy it to the next cell in the TableLayoutPanel. (Choose the **Ctrl**+**C** keys, or on the menu bar, choose **Edit** > **Copy**.) Then paste it. (Choose the **Ctrl**+**V** keys, or on the menu bar, choose **Edit** > **Paste**.) A copy of the first Label appears in the second cell of the TableLayoutPanel. Paste it again, and another Label appears in the third cell. Keep pasting Label controls until all of the cells are filled.
93115

94116
> [!NOTE]
95117
> If you paste too many times, the IDE adds a new row to the TableLayoutPanel so that it has a place to add your new Label control. You can undo it. To remove the new cell, choose the **Ctrl**+**Z** keys, or on the menu bar, choose **Edit** > **Undo**.
96118
97119
Now your form is laid out. It should look like the following picture.
98120

99-
![Initial matching game form](../ide/media/express_tut4step1.png)
100-
Initial matching game form
121+
![Initial matching game form](../ide/media/express_tut4step1.png)<br/> Initial matching game form
101122

102123
## To continue or review
103124

docs/ide/step-1-create-a-project-and-add-labels-to-your-form.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,14 @@ As the first steps in developing this quiz, you create the project, and you add
2424

2525
1. On the menu bar, choose **File** > **New** > **Project**.
2626

27-
1. In the **Installed Templates** list, choose either **C#** or **Visual Basic**.
27+
1. Choose either **Visual C#** or **Visual Basic** on the left side of the **New Project** dialog box, and then choose **Windows Desktop**.
2828

29-
1. In the list of templates, choose the **Windows Forms Application** template, name it **MathQuiz**, and then choose the **OK** button.
29+
1. In the list of templates, choose the **Windows Forms App (.NET Framework)** template, name it *MathQuiz*, and then choose the **OK** button.
3030

31-
A form that's named *Form1.cs* or *Form1.vb* appears, depending on the programming language that you chose.
31+
A form that's named *Form1.cs* or *Form1.vb* appears, depending on the programming language that you chose.
32+
33+
> [!NOTE]
34+
> If you don't see the **Windows Forms App (.NET Framework)** template, use the Visual Studio Installer to install the **.NET desktop development** workload.<br/><br/>![.NET desktop development workload in the Visual Studio Installer](../ide/media/dot-net-desktop-dev-workload.png)<br/><br/> For more information, see the [Install Visual Studio](../install/install-visual-studio.md) page.
3235
3336
::: moniker-end
3437

@@ -59,7 +62,7 @@ As the first steps in developing this quiz, you create the project, and you add
5962

6063
::: moniker-end
6164

62-
## To create set properties for a form
65+
## To set properties for a form
6366

6467
1. In Visual Studio, choose the form (either *Form1.cs* or *Form1.vb*, depending on the programming language), and then change its **Text** property to **Math Quiz**.
6568

docs/ide/step-1-create-a-windows-forms-application-project.md

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "Step 1: Create a Windows Forms Application project"
3-
ms.date: 03/23/2019
3+
ms.date: 06/01/2019
44
ms.prod: visual-studio-windows
55
ms.technology: vs-ide-general
66
ms.topic: conceptual
@@ -22,14 +22,13 @@ When you create a picture viewer, the first step is to create a Windows Forms Ap
2222

2323
## Open Visual Studio 2017
2424

25-
1. On the menu bar, choose **File** > **New** > **Project**. The dialog box should look like this.
25+
1. On the menu bar, choose **File** > **New** > **Project**. The dialog box should look similar to the following screenshot.
2626

27-
![New project dialog](../ide/media/newprojectdialogcallouts.png)<br/>
28-
***New project** dialog box*
27+
![New project dialog](../ide/media/newprojectdialogcallouts.png)<br/>***New project*** *dialog box*
2928

30-
2. Choose either **Visual C#** or **Visual Basic** on the left side of the **New Project** dialog box.
29+
2. Choose either **Visual C#** or **Visual Basic** on the left side of the **New Project** dialog box, and then choose **Windows Desktop**.
3130

32-
3. In the templates list, choose **Windows Forms App (.NET Framework)**. Name the new form **PictureViewer**, and then choose the **OK** button.
31+
3. In the templates list, choose **Windows Forms App (.NET Framework)**. Name the new form *PictureViewer*, and then choose the **OK** button.
3332

3433
>[!NOTE]
3534
>If you don't see the **Windows Forms App (.NET Framework)** template, use the Visual Studio Installer to install the **.NET desktop development** workload.<br/><br/>![.NET desktop development workload in the Visual Studio Installer](../ide/media/dot-net-desktop-dev-workload.png)<br/><br/> For more information, see the [Install Visual Studio](../install/install-visual-studio.md) page.
@@ -44,7 +43,7 @@ When you create a picture viewer, the first step is to create a Windows Forms Ap
4443

4544
![View the 'Create a new project' window](../get-started/media/vs-2019/create-new-project-dark-theme.png)
4645

47-
1. On the **Create a new project** window, enter or type *Windows Forms* in the search box. Next, choose **Visual Basic** from the Language list, and then choose **Windows** from the Platform list.
46+
1. On the **Create a new project** window, enter or type *Windows Forms* in the search box. Next, choose **Visual Basic** from the Language list, and then choose **Windows** from the Platform list.
4847

4948
After you apply the language and platform filters, choose the **Windows Forms App (.NET Framework)** template, and then choose **Next**.
5049

@@ -53,13 +52,13 @@ When you create a picture viewer, the first step is to create a Windows Forms Ap
5352
> [!NOTE]
5453
> If you do not see the **Windows Forms App (.NET Framework)** template, you can install it from the **Create a new project** window. In the **Not finding what you're looking for?** message, choose the **Install more tools and features** link.
5554
>
56-
> ![The 'Install more tools and features' link from the 'Not finding what you're looking for' message in the 'Create new project' window](../get-started/media/vs-2019/not-finding-what-looking-for.png)
57-
>
55+
> ![The 'Install more tools and features' link from the 'Not finding what you're looking for' message in the 'Create new project' window](../get-started/media/vs-2019/not-finding-what-looking-for.png)
56+
>
5857
> Next, in the Visual Studio Installer, choose the Choose the **.NET desktop development** workload.
59-
>
58+
>
6059
> ![.NET Core workload in the Visual Studio Installer](../ide/media/install-dot-net-desktop-env.png)
6160
>
62-
> After that, choose the **Modify** button in the Visual Studio Installer. You might be prompted to save your work; if so, do so. Next, choose **Continue** to install the workload.
61+
> After that, choose the **Modify** button in the Visual Studio Installer. You might be prompted to save your work; if so, do so. Next, choose **Continue** to install the workload.
6362
6463
1. In the **Configure your new project** window, type or enter *PictureViewer* in the **Project name** box. Then, choose **Create**.
6564

@@ -109,4 +108,4 @@ Visual Studio creates a solution for your program. A solution acts as a containe
109108

110109
## See also
111110

112-
- [Creating a new Windows Form](/dotnet/framework/winforms/creating-a-new-windows-form/)
111+
- [Creating a new Windows Form](/dotnet/framework/winforms/creating-a-new-windows-form/)

docs/ide/step-5-add-controls-to-your-form.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ In this step, you add controls, such as a <xref:System.Windows.Forms.PictureBox>
2424

2525
4. Choose the new **PictureBox** control to select it, and then choose the black triangle on the new PictureBox control to display its task list, as shown in the following picture.
2626

27-
![PictureBox tasks](../ide/media/express_pictureboxtasks.png)
28-
**PictureBox** tasks
27+
![PictureBox tasks](../ide/media/express_pictureboxtasks.png)<br/>***PictureBox*** *tasks*
2928

3029
> [!NOTE]
3130
> If you accidentally add the wrong type of control to your TableLayoutPanel, you can delete it. Right-click the control, and then choose **Delete** on its context menu. You can also remove controls from the form by using the menu bar. On the menu bar, choose **Edit** > **Undo**, or **Edit** > **Delete**.
@@ -39,8 +38,7 @@ In this step, you add controls, such as a <xref:System.Windows.Forms.PictureBox>
3938
4039
7. Choose the **TableLayoutPanel** on the form and then add a CheckBox control to the form. Double-click the **CheckBox** item in the **Toolbox** to add a new CheckBox control to the next free cell in your table. Because a PictureBox takes up the first two cells in the TableLayoutPanel, the CheckBox control is added to the lower-left cell. Choose the **Text** property and type in the word **Stretch**, as shown in the following picture.
4140

42-
![TextBox control with Stretch property](../ide/media/express_pictureviewercheckbox.png)
43-
**TextBox** control with **Stretch** property
41+
![TextBox control with Stretch property](../ide/media/express_pictureviewercheckbox.png)<br/>***TextBox*** *control with* ***Stretch*** *property*
4442

4543
8. Choose the **TableLayoutPanel** on the form, and then go to the **Containers** group in the **Toolbox** (where you got your TableLayoutPanel control) and double-click the **FlowLayoutPanel** item to add a new control to the last cell in the PictureBox (bottom right). Then dock the FlowLayoutPanel in the TableLayoutPanel (either by choosing **Dock in parent container** on the FlowLayoutPanel's black triangle task list, or by setting the FlowLayoutPanel's **Dock** property to **Fill**).
4644

@@ -65,8 +63,7 @@ In this step, you add controls, such as a <xref:System.Windows.Forms.PictureBox>
6563
6664
5. Choose the **Close** button to select it. Hold down the **Ctrl** key and choose the other three buttons, so that they are all selected. While all the buttons are selected, go to the **Properties** window and scroll up to the **AutoSize** property. This property tells the button to automatically resize itself to fit all of its text. Set it to **true**. Your buttons should now be sized properly and be in the right order. (As long as all four buttons are selected, you can change all four **AutoSize** properties at the same time.) The following picture shows the four buttons.
6765

68-
![Picture Viewer with four buttons](../ide/media/express_autosize.png)
69-
**Picture Viewer** with four buttons
66+
![Picture Viewer with four buttons](../ide/media/express_autosize.png)<br/>***Picture Viewer*** *with four buttons*
7067

7168
6. Now run your program again to see your newly laid out form. Choosing the buttons and the check box doesn't do anything yet, but it will work soon.
7269

0 commit comments

Comments
 (0)