Skip to content

Commit e986c94

Browse files
authored
Merge pull request #2877 from MicrosoftDocs/master636882700517930545
For protected CLA branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents 9b84e0c + 7313516 commit e986c94

File tree

52 files changed

+841
-167
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+841
-167
lines changed

docs/cross-platform/build-an-opengl-es-application-on-android-and-ios.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,9 @@ Before you can create an OpenGL ES app for iOS and Android, you must make sure y
2525

2626
In this tutorial, you first create a new OpenGL ES Application project and then build and run the default app in the Visual Studio Emulator for Android. Next you build the app for iOS and run the app in the iOS Simulator.
2727

28-
### To create a new project
28+
1. In Visual Studio, choose **File** > **New** > **Project**.
2929

30-
1. Open Visual Studio. On the menu bar, choose **File**, **New**, **Project**.
31-
32-
2. In the **New Project** dialog box, under **Templates**, choose **Visual C++**, **Cross Platform**, and then choose the **OpenGLES Application (Android, iOS)** template.
30+
2. In the **New Project** dialog box, under **Templates**, choose **Visual C++** > **Cross Platform**, and then choose the **OpenGLES Application (Android, iOS)** template.
3331

3432
3. Give the app a name like `MyOpenGLESApp`, and then choose **OK**.
3533

docs/cross-platform/create-an-android-native-activity-app.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ Before you can create an Android Native Activity app, you must make sure you've
2525

2626
In this tutorial, you'll first create a new Android Native Activity project and then build and run the default app in the Visual Studio Emulator for Android.
2727

28-
### To create a new project
29-
30-
1. Open Visual Studio. On the menu bar, choose **File** > **New** > **Project**.
28+
1. In Visual Studio, choose **File** > **New** > **Project**.
3129

3230
2. In the **New Project** dialog box, under **Templates**, choose **Visual C++** > **Cross Platform**, and then choose the **Native-Activity Application (Android)** template.
3331

docs/cross-platform/cross-platform-mobile-development-in-visual-studio.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ With Visual Studio Tools for Xamarin, you can target Android, iOS, and Windows i
9090

9191
![Multi-device hybrid apps with Javascript](../cross-platform/media/multidevicehybridapps.png "Multi-device hybrid apps with Javascript")
9292

93-
To get started, install Visual Studio 2017 and choose the **Mobile Development with Javascript** feature during setup. The Cordova tools automatically install all third-party software that's required to build your multi-platform app.
93+
To get started, install Visual Studio and choose the **Mobile Development with Javascript** feature during setup. The Cordova tools automatically install all third-party software that's required to build your multi-platform app.
9494

9595
After you've installed the extension, open Visual Studio and create a **Blank App (Apache Cordova)** project. Then, you can develop your app by using JavaScript or Typescript. You can also add plug-ins to extend the functionality of your app, and APIs from plug-ins appear in IntelliSense as you write code.
9696

docs/cross-platform/install-visual-cpp-for-cross-platform-mobile-development.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ The Visual Studio Installer for Visual Studio 2017 includes a **Mobile developme
6565
> [!IMPORTANT]
6666
> You must restart to make sure everything is installed correctly.
6767
68-
1. Open Visual Studio. If this is the first time that you have run Visual Studio, it may take some time to configure and sign in. When Visual Studio is ready, check for any updates and install them.
68+
1. Open Visual Studio.
6969

7070
> [!NOTE]
7171
> If you're using Visual Studio 2015, see [Install Visual C++ for Cross-Platform Mobile Development (Visual Studio 2015)](/cross-platform/install-visual-cpp-for-cross-platform-mobile-development?view=vs-2015)

docs/data-tools/bind-wpf-controls-to-a-dataset.md

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,30 @@ Prior knowledge of the following concepts is also helpful, but not required to c
5050

5151
Create a new WPF project to display product records.
5252

53-
1. Start Visual Studio.
53+
::: moniker range="vs-2017"
54+
55+
1. Open Visual Studio.
5456

5557
2. On the **File** menu, select **New** > **Project**.
5658

5759
3. Expand **Visual Basic** or **Visual C#**, and then select **Windows**.
5860

59-
4. Select the **WPF Application** project template.
61+
4. Select the **WPF App** project template.
6062

6163
5. In the **Name** box, enter **AdventureWorksProductsEditor** and then select **OK**.
6264

65+
::: moniker-end
66+
67+
::: moniker range=">=vs-2019"
68+
69+
1. Open Visual Studio.
70+
71+
2. On the Start window, choose **Create a new project**.
72+
73+
3. Search for the C# **WPF App** project template and follow the steps to create the project, naming the project **AdventureWorksProductsEditor**.
74+
75+
::: moniker-end
76+
6377
Visual Studio creates the AdventureWorksProductsEditor project.
6478

6579
## Create a dataset for the application

docs/data-tools/bind-wpf-controls-to-a-wcf-data-service.md

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ You need the following components to complete this walkthrough:
4444

4545
Prior knowledge of the following concepts is also helpful, but not required to complete the walkthrough:
4646

47-
- WCF Data Services. For more information, see [Overview](/dotnet/framework/data/wcf/wcf-data-services-overview).
47+
- [WCF Data Services](/dotnet/framework/data/wcf/wcf-data-services-overview).
4848

4949
- Data models in [!INCLUDE[ssAstoria](../data-tools/includes/ssastoria_md.md)].
5050

@@ -54,21 +54,9 @@ Prior knowledge of the following concepts is also helpful, but not required to c
5454

5555
## Create the service project
5656

57-
Start this walkthrough by creating a project for a WCF Data Service:
57+
1. Start this walkthrough by creating a C# or Visual Basic **ASP.NET Web Application** project. Name the project **AdventureWorksService**.
5858

59-
1. Start Visual Studio.
60-
61-
2. On the **File** menu, point to **New**, and then click **Project**.
62-
63-
3. Expand **Visual C#** or **Visual Basic**, and then select **Web**.
64-
65-
4. Select the **ASP.NET Web Application** project template.
66-
67-
5. In the **Name** box, type **AdventureWorksService** and click **OK**.
68-
69-
Visual Studio creates the **AdventureWorksService** project.
70-
71-
6. In **Solution Explorer**, right-click **Default.aspx** and select **Delete**. This file is not necessary in this walkthrough.
59+
2. In **Solution Explorer**, right-click **Default.aspx** and select **Delete**. This file is not necessary for the walkthrough.
7260

7361
## Create an Entity Data Model for the service
7462

docs/designers/how-to-build-and-run-the-linqtoxmldatabinding-example.md

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,9 @@ This topic shows how to create and build the LinqToXmlDataBinding Visual Studio
1414

1515
For more information about Visual Studio, see [Visual Studio IDE overview](../get-started/visual-studio-ide.md).
1616

17-
## Create and populate the project
17+
## Create the project
1818

19-
### To create the starting project
20-
21-
1. Start Visual Studio and create a C# WPF application named LinqToXmlDataBinding. The project must use the .NET Framework 3.5 (or later).
19+
1. Open Visual Studio and create a C# **WPF App** named **LinqToXmlDataBinding**. The project should target the .NET Framework 3.5 (or later).
2220

2321
1. If not already present, add project references for the following .NET assemblies:
2422

@@ -32,9 +30,9 @@ For more information about Visual Studio, see [Visual Studio IDE overview](../ge
3230

3331
1. Build the solution by pressing **Ctrl**+**Shift**+**B**, then run it by pressing **F5**. The project should compile without errors and run as a generic WPF application.
3432

35-
### To add custom code to the project
33+
## Add code to the project
3634

37-
1. In Solution Explorer, rename the source file **Window1.xaml** to **L2XDBForm.xaml**. The dependent source file **Window1.xaml.cs** should automatically be renamed to **L2XDBForm.xaml.cs**.
35+
1. In **Solution Explorer**, rename the source file **Window1.xaml** to **L2XDBForm.xaml**. The dependent source file **Window1.xaml.cs** should automatically be renamed to **L2XDBForm.xaml.cs**.
3836

3937
1. Replace the source code found in the file **L2XDBForm.xaml** with the code section from the topic [L2DBForm.xaml source code](../designers/l2dbform-xaml-source-code.md). Use the XAML source view to work with this file.
4038

@@ -50,9 +48,7 @@ The LinqToXmlDataBinding program enables the user to view and manipulate a list
5048

5149
### To run the program and view the book list
5250

53-
- Run LinqToXmlDataBinding by pressing **F5** (**Start Debugging**) or **Ctrl**+**F5** (**Start Without Debugging**).
54-
55-
A program window with the title **WPF Data Binding using LINQ to XML** appears.
51+
Run LinqToXmlDataBinding by pressing **F5** (**Start Debugging**) or **Ctrl**+**F5** (**Start Without Debugging**). A program window with the title **WPF Data Binding using LINQ to XML** appears.
5652

5753
- Notice the top section of the UI, which displays the raw **XML** that represents the book list. It is displayed using a WPF <xref:System.Windows.Controls.TextBlock> control, which does not enable interaction through the mouse or keyboard.
5854

docs/get-started/csharp/tutorial-editor.md

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,21 @@ This article assumes you're already familiar with C#. If you aren't, we suggest
2929

3030
Start by creating a new file and adding some code to it.
3131

32-
1. Open Visual Studio, and from the **File** menu on the menu bar, choose **New** > **File**.
32+
::: moniker range="vs-2017"
3333

34-
1. In the **New File** dialog box, under the **General** category, choose **Visual C# Class**, and then choose **Open**.
34+
1. Open Visual Studio.
35+
36+
::: moniker-end
37+
38+
::: moniker range=">=vs-2019"
39+
40+
1. Open Visual Studio. Press **Esc** or click **Continue without code** on the Start window to open the development environment.
41+
42+
::: moniker-end
43+
44+
2. From the **File** menu on the menu bar, choose **New** > **File**.
45+
46+
3. In the **New File** dialog box, under the **General** category, choose **Visual C# Class**, and then choose **Open**.
3547

3648
A new file opens in the editor with the skeleton of a C# class. (Notice that we don't have to create a full Visual Studio project to gain some of the benefits that the code editor offers; all you need is a code file!)
3749

docs/get-started/csharp/tutorial-projects-solutions.md

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,11 @@ Despite its name, a solution is not an "answer". A solution is simply a containe
3232

3333
We'll start our exploration by creating an empty solution. After you get to know Visual Studio, you probably won't find yourself creating empty solutions very often. When you create a new project, Visual Studio automatically creates a solution to house the project if there's not a solution already open.
3434

35+
::: moniker range="vs-2017"
36+
3537
1. Open Visual Studio.
3638

37-
1. On the menu bar, which is the row of menus such as **File** and **Edit**, choose **File** > **New** > **Project**.
39+
1. On the top menu bar, choose **File** > **New** > **Project**.
3840

3941
The **New Project** dialog box opens.
4042

@@ -44,6 +46,22 @@ We'll start our exploration by creating an empty solution. After you get to know
4446

4547
The **Start Page** closes, and a solution appears in **Solution Explorer** on the right-hand side of the Visual Studio window. You'll probably use **Solution Explorer** often, to browse the contents of your projects.
4648

49+
::: moniker-end
50+
51+
::: moniker range=">=vs-2019"
52+
53+
1. Open Visual Studio.
54+
55+
2. On the Start window, choose **Create a new project**.
56+
57+
3. On the **Create a new project** page, enter **blank solution** into the search box, select the **Blank Solution** template, and then choose **Next**.
58+
59+
4. Name the solution **QuickSolution**, and then choose **Create**.
60+
61+
A solution appears in **Solution Explorer** on the right-hand side of the Visual Studio window. You'll probably use **Solution Explorer** often, to browse the contents of your projects.
62+
63+
::: moniker-end
64+
4765
### Add a project
4866

4967
Now let's add our first project to the solution. We'll start with an empty project and add the items we need to the project.

docs/get-started/includes/ide-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ To get started, [download Visual Studio](https://visualstudio.microsoft.com/down
150150

151151
![.NET Core cross-platform development workload in Visual Studio Installer](../media/dotnet-core-cross-platform-workload.png)
152152

153-
When you start Visual Studio for the first time, you can optionally [sign in](../../ide/signing-in-to-visual-studio.md) using your Microsoft account or your work or school account.
153+
When you open Visual Studio for the first time, you can optionally [sign in](../../ide/signing-in-to-visual-studio.md) using your Microsoft account or your work or school account.
154154

155155
## Create a program
156156

docs/get-started/tutorial-editor.md

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,21 @@ This article assumes you're already familiar with a programming language. If you
2525

2626
Start by creating a new file and adding some code to it.
2727

28-
1. Open Visual Studio, and from the **File** menu on the menu bar, choose **New** > **File**.
28+
::: moniker range="vs-2017"
2929

30-
1. In the **New File** dialog box, under the **General** category, choose **Visual C# Class**, and then choose **Open**.
30+
1. Open Visual Studio.
31+
32+
::: moniker-end
33+
34+
::: moniker range=">=vs-2019"
35+
36+
1. Open Visual Studio. Press **Esc** or click **Continue without code** on the start window to open the development environment.
37+
38+
::: moniker-end
39+
40+
2. From the **File** menu on the menu bar, choose **New** > **File**.
41+
42+
3. In the **New File** dialog box, under the **General** category, choose **Visual C# Class**, and then choose **Open**.
3143

3244
A new file opens in the editor with the skeleton of a C# class. (Notice that we don't have to create a full Visual Studio project to gain some of the benefits that the code editor offers; all you need is a code file!)
3345

docs/get-started/tutorial-open-project-from-repo.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ If you haven't already installed Visual Studio, go to the [Visual Studio downloa
4545

4646
![Choose Clone from the Local Git Repositories section](./media/open-proj-repo-local-git-repo-clone.png)
4747

48-
1. In the box that says ***Enter the URL of a Git repo to clone***, type or paste the URL for your repo, and then press **Enter**. (You might receive a prompt to sign in to your Git repo; if so, do so.)
48+
1. In the box that says ***Enter the URL of a Git repo to clone***, type or paste the URL for your repo, and then press **Enter**. (You might receive a prompt to sign in to GitHub; if so, do so.)
4949

5050
After Visual Studio clones your repo, Team Explorer closes and Solution Explorer opens. A message appears that says *Click on Solutions and Folders above to view a list of Solutions*. Choose **Solutions and Folders**.
5151

docs/get-started/tutorial-projects-solutions.md

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,11 @@ Despite its name, a solution is not an "answer". A solution is simply a containe
2929

3030
We'll start our exploration by creating an empty solution. After you get to know Visual Studio, you probably won't find yourself creating empty solutions very often. When you create a new project, Visual Studio automatically creates a solution to house the project if there's not a solution already open.
3131

32+
::: moniker range="vs-2017"
33+
3234
1. Open Visual Studio.
3335

34-
1. On the menu bar, which is the row of menus such as **File** and **Edit**, choose **File** > **New** > **Project**.
36+
1. On the menu bar, choose **File** > **New** > **Project**.
3537

3638
The **New Project** dialog box opens.
3739

@@ -41,6 +43,22 @@ We'll start our exploration by creating an empty solution. After you get to know
4143

4244
The **Start Page** closes, and a solution appears in **Solution Explorer** on the right-hand side of the Visual Studio window. You'll probably use **Solution Explorer** often, to browse the contents of your projects.
4345

46+
::: moniker-end
47+
48+
::: moniker range=">=vs-2019"
49+
50+
1. Open Visual Studio.
51+
52+
2. On the Start window, choose **Create a new project**.
53+
54+
3. On the **Create a new project** page, enter **blank solution** into the search box, select the **Blank Solution** template, and then choose **Next**.
55+
56+
4. Name the solution **QuickSolution**, and then choose **Create**.
57+
58+
A solution appears in **Solution Explorer** on the right-hand side of the Visual Studio window. You'll probably use **Solution Explorer** often, to browse the contents of your projects.
59+
60+
::: moniker-end
61+
4462
### Add a project
4563

4664
Now let's add our first project to the solution. We'll start with an empty project and add the items we need to the project.

docs/get-started/visual-basic/tutorial-editor.md

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,21 @@ This article assumes you're already familiar with Visual Basic. If you aren't, w
2929

3030
Start by creating a new file and adding some code to it.
3131

32-
1. Open Visual Studio, and from the **File** menu on the menu bar, choose **New File**.
32+
::: moniker range="vs-2017"
3333

34-
1. In the **New File** dialog box, under the **General** category, choose **Visual Basic Class**, and then choose **Open**.
34+
1. Open Visual Studio.
35+
36+
::: moniker-end
37+
38+
::: moniker range=">=vs-2019"
39+
40+
1. Open Visual Studio. Press **Esc** or click **Continue without code** on the start window to open the development environment.
41+
42+
::: moniker-end
43+
44+
2. From the **File** menu on the menu bar, choose **New File**.
45+
46+
3. In the **New File** dialog box, under the **General** category, choose **Visual Basic Class**, and then choose **Open**.
3547

3648
A new file opens in the editor with the skeleton of a Visual Basic class. (You can already notice that you don't have to create a full Visual Studio project to gain some of the benefits that the code editor offers, such as syntax highlighting. All you need is a code file!)
3749

docs/get-started/visual-basic/tutorial-projects-solutions.md

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,36 @@ Despite its name, a solution is not an "answer". A solution is simply a containe
3232

3333
We'll start our exploration by creating an empty solution. After you get to know Visual Studio, you probably won't find yourself creating empty solutions very often. When you create a new project, Visual Studio automatically creates a solution to house the project if there's not a solution already open.
3434

35+
::: moniker range="vs-2017"
36+
3537
1. Open Visual Studio.
3638

37-
1. On the menu bar, which is the row of menus such as **File** and **Edit**, choose **File** > **New** > **Project**.
39+
1. On the menu bar, choose **File** > **New** > **Project**.
3840

3941
The **New Project** dialog box opens.
4042

41-
1. In the left pane, expand **Other Project Types**, then choose **Visual Studio Solutions**. In the center pane, choose the **Blank Solution** template. Name your solution **QuickSolution**, then choose the **OK** button.
43+
1. In the left pane, expand **Other Project Types**, then choose **Visual Studio Solutions**. In the center pane, choose the **Blank Solution** template. Name your solution **QuickSolution**, and then choose **OK**.
4244

4345
![Blank solution template in Visual Studio](../media/tutorial-projects-new-solution.png)
4446

4547
The **Start Page** closes, and a solution appears in **Solution Explorer** on the right-hand side of the Visual Studio window. You'll probably use **Solution Explorer** often, to browse the contents of your projects.
4648

49+
::: moniker-end
50+
51+
::: moniker range=">=vs-2019"
52+
53+
1. Open Visual Studio.
54+
55+
2. On the Start window, choose **Create a new project**.
56+
57+
3. On the **Create a new project** page, enter **blank solution** into the search box, select the **Blank Solution** template, and then choose **Next**.
58+
59+
4. Name the solution **QuickSolution**, and then choose **Create**.
60+
61+
A solution appears in **Solution Explorer** on the right-hand side of the Visual Studio window. You'll probably use **Solution Explorer** often, to browse the contents of your projects.
62+
63+
::: moniker-end
64+
4765
### Add a project
4866

4967
Now let's add our first project to the solution. We'll start with an empty project and add the items we need to the project.

docs/get-started/visual-basic/visual-studio-ide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ To get started, [download Visual Studio](https://visualstudio.microsoft.com/down
201201

202202
![.NET Core cross-platform development workload in Visual Studio Installer](../media/dotnet-core-cross-platform-workload.png)
203203

204-
When you start Visual Studio for the first time, you can optionally [sign in](../../ide/signing-in-to-visual-studio.md) using your Microsoft account or your work or school account.
204+
When you open Visual Studio for the first time, you can optionally [sign in](../../ide/signing-in-to-visual-studio.md) using your Microsoft account or your work or school account.
205205

206206
## Customize Visual Studio
207207

docs/ide/customizing-the-start-page-for-visual-studio.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ To install a custom start page, open the *.vsix* file, or copy and paste the sta
5959
1. In the **Customize Start Page** list, choose the page that you want.
6060

6161
> [!TIP]
62-
> If an error in a custom start page causes Visual Studio to crash, you can start Visual Studio in safe mode and then set it to use the default start page. See [/SafeMode (devenv.exe)](../ide/reference/safemode-devenv-exe.md).
62+
> If an error in a custom start page causes Visual Studio to crash, you can open Visual Studio in safe mode and then set it to use the default start page. See [/SafeMode (devenv.exe)](../ide/reference/safemode-devenv-exe.md).
6363
6464
## See also
6565

0 commit comments

Comments
 (0)