Skip to content

Commit 790c961

Browse files
authored
Merge pull request #4799 from MicrosoftDocs/master637173218110955844
For protected CLA branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents 40a4025 + fd3249a commit 790c961

16 files changed

+269
-181
lines changed

docs/debugger/debugging-absolute-beginners.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "Debugging code for absolute beginners"
33
description: "If you are debugging for the first time, learn a few principles to help you run your app in debugging mode with Visual Studio"
4-
ms.date: 07/06/2018
4+
ms.date: 02/14/2020
55
ms.topic: tutorial
66
helpviewer_keywords:
77
- "debugger"
@@ -79,13 +79,13 @@ Next, we will create an application that has a few bugs.
7979
1. Open Visual Studio.
8080

8181
::: moniker range=">=vs-2019"
82-
On the start window, choose **Create a new project**. Type **console** in the search box and then choose **Console App (.NET Framework)** or **Console App (.NET Core)**. Choose **Next**. Type a project name like **ConsoleApp-FirstApp** and click **Create**.
82+
On the start window, choose **Create a new project**. Type **console** in the search box and then choose either **Console App (.NET Core)** or **Console App (.NET Framework)**. Choose **Next**. Type a project name like **ConsoleApp-FirstApp** and click **Create**.
8383
::: moniker-end
8484
::: moniker range="vs-2017"
8585
From the top menu bar, choose **File** > **New** > **Project**. In the left pane of the **New project** dialog box, under **Visual C#**, choose **Console App**, and then in the middle pane choose either **Console App (.NET Framework)** or **Console App (.NET Core)**. Type a name like **ConsoleApp-FirstApp** and click **OK**.
8686
::: moniker-end
8787

88-
If you don't see the **Console App (.NET Framework)** or **Console App (.NET Core)** project template, go to **Tools** > **Get Tools and Features**, which opens the Visual Studio Installer. Choose the **.NET desktop development** workload or the **.NET Core cross platform development** workload, then choose **Modify**.
88+
If you don't see the **Console App (.NET Framework)** or **Console App (.NET Core)** project template, go to **Tools** > **Get Tools and Features**, which opens the Visual Studio Installer. Choose either the **.NET Core cross platform development** or the **.NET desktop development** workload, then choose **Modify**.
8989

9090
Visual Studio creates the console project, which appears in Solution Explorer in the right pane.
9191

docs/debugger/get-started-debugging-multithreaded-apps.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: "Learn to debug multithreaded applications"
33
description: Debug using the Parallel Stacks and Parallel Watch windows in Visual Studio
44
ms.custom: ""
5-
ms.date: "11/16/2018"
5+
ms.date: "02/14/2020"
66
ms.topic: "conceptual"
77
dev_langs:
88
- "CSharp"

docs/debugger/how-to-debug-managed-and-native-code.md

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ If you have Visual Studio installed, but don't have the workloads you need, sele
4949
1. Open Visual Studio and create a project.
5050

5151
::: moniker range=">=vs-2019"
52-
Press **Esc** to close the start window. Type **Ctrl + Q** to open the search box, type **Empty Project**, choose **Templates**, then choose **Create new Empty Project project** for C++. In the dialog box that appears, choose **Create**. Then, type a name like **Mixed_Mode_Debugging** and click **Create**.
52+
Press **Esc** to close the start window. Type **Ctrl + Q** to open the search box, type **Empty Project**, choose **Templates**, then choose **Empty Project** for C++. In the dialog box that appears, choose **Create**. Then, type a name like **Mixed_Mode_Debugging** and click **Create**.
5353
::: moniker-end
5454
::: moniker range="vs-2017"
5555
From the top menu bar, choose **File** > **New** > **Project**. In the left pane of the **New project** dialog box, under **Visual C++**, choose **Other**, and then in the middle pane choose **Empty Project**. Then, type a name like **Mixed_Mode_Debugging** and click **OK**.
@@ -59,12 +59,6 @@ If you have Visual Studio installed, but don't have the workloads you need, sele
5959

6060
Visual Studio creates the project.
6161

62-
1. In the **New Project** dialog box, under **Visual C++**, select **Other**, and then select **Empty Project** in the middle pane.
63-
64-
1. In the **Name** field, type **Mixed_Mode_Debugging**, and then select **OK**.
65-
66-
Visual Studio creates the empty project and displays it in **Solution Explorer**.
67-
6862
1. In **Solution Explorer**, select **Source Files**, and then select **Project** > **Add New Item**. Or, right-click **Source Files** and select **Add** > **New Item**.
6963

7064
1. In the **New Item** dialog, select **C++ file (.cpp)**. Type **Mixed_Mode.cpp** in the **Name** field, and then select **Add**.
@@ -126,7 +120,7 @@ If you have Visual Studio installed, but don't have the workloads you need, sele
126120
1. Open Visual Studio and create a new project.
127121

128122
::: moniker range=">=vs-2019"
129-
Press **Esc** to close the start window. Type **Ctrl + Q** to open the search box, type **console**, choose **Templates**, and then choose **Create new Console App (.NET Framework) project** for C#. In the dialog box that appears, choose **Create**.
123+
Press **Esc** to close the start window. Type **Ctrl + Q** to open the search box, type **console**, choose **Templates**, and then choose **Console App (.NET Core)** or **Console App (.NET Framework)** for C#. In the dialog box that appears, choose **Create**.
130124

131125
Then, type a name like **Mixed_Mode_Calling_App** and click **Create**.
132126
::: moniker-end

docs/debugger/how-to-use-the-threads-window.md

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "Debug a multithreaded app"
33
description: Debug using the Threads window and the Debug Location toolbar in Visual Studio
4-
ms.date: "11/21/2018"
4+
ms.date: "02/14/2020"
55
ms.topic: "conceptual"
66
dev_langs:
77
- "CSharp"
@@ -30,25 +30,36 @@ Create the following multithreaded app project to use in this tutorial:
3030

3131
1. Open Visual Studio and create a new project.
3232

33-
::: moniker range=">=vs-2019"
34-
Press **Esc** to close the start window. Type **Ctrl + Q** to open the search box, type **console** (or **c++**), choose **Templates**, and then:
33+
::: moniker range=">=vs-2019"
3534

36-
- For C#, choose **Create new Console App (.NET Framework) project** for C#. In the dialog box that appears, choose **Create**.
37-
- For C++, choose **Create new Console App project**. In the dialog box that appears, choose **Create**.
35+
If the start window is not open, choose **File** > **Start Window**.
3836

39-
Then, type a name like **MyThreadWalkthroughApp** and click **Create**.
40-
::: moniker-end
41-
::: moniker range="vs-2017"
42-
From the top menu bar, choose **File** > **New** > **Project**. In the left pane of the **New project** dialog box, choose the following:
43-
- For a C# app, under **Visual C#**, choose **Windows Desktop**, and then in the middle pane choose **Console App (.NET Framework)**.
44-
- For a C++ app, under **Visual C++**, choose **Windows Desktop**,, and then choose **Windows Console Application**.
37+
On the start window, choose **Create a new project**.
4538

46-
Then, type a name like **MyThreadWalkthroughApp** and click **OK**.
47-
::: moniker-end
39+
On the **Create a new project** window, enter or type *console* in the search box. Next, choose **C#** or **C++** from the Language list, and then choose **Windows** from the Platform list.
4840

49-
If you don't see the **Console App** project template, go to **Tools** > **Get Tools and Features...**, which opens the Visual Studio Installer. Choose the **.NET desktop development** or **Desktop development with C++** workload, then choose **Modify**.
41+
After you apply the language and platform filters, choose the **Console App (.NET Core)** or, for C++, **Console App** template, and then choose **Next**.
5042

51-
The new project appears in **Solution Explorer**, and a source file called *Program.cs* or *MyThreadWalkthroughApp.cpp* opens in the source code window.
43+
> [!NOTE]
44+
> If you don't see the correct template, go to **Tools** > **Get Tools and Features...**, which opens the Visual Studio Installer. Choose the **.NET desktop development** or **Desktop development with C++** workload, then choose **Modify**.
45+
46+
In the **Configure your new project** window, type or enter *MyThreadWalkthroughApp* in the **Project name** box. Then, choose **Create**.
47+
48+
::: moniker-end
49+
::: moniker range="vs-2017"
50+
From the top menu bar, choose **File** > **New** > **Project**. In the left pane of the **New project** dialog box, choose the following:
51+
52+
- For a C# app, under **Visual C#**, choose **Windows Desktop**, and then in the middle pane choose **Console App (.NET Framework)**.
53+
- For a C++ app, under **Visual C++**, choose **Windows Desktop**,, and then choose **Windows Console Application**.
54+
55+
If you don't see the **Console App (.NET Core)** or, for C++, the **Console App** project template, go to **Tools** > **Get Tools and Features...**, which opens the Visual Studio Installer. Choose the **.NET desktop development** or **Desktop development with C++** workload, then choose **Modify**.
56+
57+
Then, type a name like *MyThreadWalkthroughApp* and click **OK**.
58+
59+
Select **OK**.
60+
::: moniker-end
61+
62+
A new console project appears. After the project has been created, a source file appears. Depending on the language you have chosen, the source file might be called *Program.cs*, *MyThreadWalkthroughApp.cpp*, or *Module1.vb*.
5263

5364
1. Replace the code in the source file with the C# or C++ example code from [Get started debugging multithreaded apps](../debugger/get-started-debugging-multithreaded-apps.md).
5465

docs/debugger/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
href: quickstart-debug-with-managed.md
1717
- name: Debug a C++ app
1818
href: quickstart-debug-with-cplusplus.md
19-
- name: Debug an ASP.NET app
19+
- name: Debug an ASP.NET Core app
2020
href: quickstart-debug-aspnet.md
2121
- name: Tutorials
2222
items:

docs/debugger/walkthrough-debugging-a-parallel-application.md

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "Debug a parallel application | Microsoft Docs"
33
description: Debug using the Parallel Tasks and Parallel Stacks windows in Visual Studio
4-
ms.date: "03/22/2018"
4+
ms.date: "02/14/2020"
55
ms.topic: "conceptual"
66
dev_langs:
77
- "CSharp"
@@ -58,25 +58,37 @@ This walkthrough shows how to use the **Parallel Tasks** and **Parallel Stacks**
5858

5959
1. Open Visual Studio and create a new project.
6060

61-
::: moniker range=">=vs-2019"
62-
Press **Esc** to close the start window. Type **Ctrl + Q** to open the search box, type **console** (or **c++**), choose **Templates**, and then:
61+
::: moniker range=">=vs-2019"
6362

64-
- For C# or Visual Basic, choose **Create new Console App (.NET Framework) project** for either C# or Visual Basic. In the dialog box that appears, choose **Create**.
65-
- For C++, choose **Create new Console App project** for C++. In the dialog box that appears, choose **Create**.
63+
If the start window is not open, choose **File** > **Start Window**.
6664

67-
Then, type a name or use the default name and click **Create**.
68-
::: moniker-end
69-
::: moniker range="vs-2017"
70-
From the top menu bar, choose **File** > **New** > **Project**. In the left pane of the **New project** dialog box, choose the following:
65+
On the start window, choose **Create a new project**.
7166

72-
- For a C# app, under **Visual C#**, choose **Windows Desktop**, and then in the middle pane choose **Console App (.NET Framework)**.
73-
- For a Visual Basic app, under **Visual Basic**, choose **Windows Desktop**, and then in the middle pane choose **Console App (.NET Framework)**.
74-
- For a C++ app, under **Visual C++**, choose **Windows Desktop**,, and then choose **Windows Console Application**.
67+
On the **Create a new project** window, enter or type *console* in the search box. Next, choose **C#**, **C++**, or **Visual Basic** from the Language list, and then choose **Windows** from the Platform list.
7568

76-
Then, type a name or use the default name and click **OK**.
77-
::: moniker-end
69+
After you apply the language and platform filters, choose the **Console App (.NET Core)** or, for C++, **Console App** template, and then choose **Next**.
7870

79-
If you don't see the **Console App** project template, go to **Tools** > **Get Tools and Features...**, which opens the Visual Studio Installer. Choose the **.NET desktop development** or **Desktop development with C++** workload, then choose **Modify**.
71+
> [!NOTE]
72+
> If you don't see the correct template, go to **Tools** > **Get Tools and Features...**, which opens the Visual Studio Installer. Choose the **.NET desktop development** or **Desktop development with C++** workload, then choose **Modify**.
73+
74+
In the **Configure your new project** window, type a name or use the default name in the **Project name** box. Then, choose **Create**.
75+
76+
::: moniker-end
77+
::: moniker range="vs-2017"
78+
From the top menu bar, choose **File** > **New** > **Project**. In the left pane of the **New project** dialog box, choose the following:
79+
80+
- For a C# app, under **Visual C#**, choose **Windows Desktop**, and then in the middle pane choose **Console App (.NET Framework)**.
81+
- For a Visual Basic app, under **Visual Basic**, choose **Windows Desktop**, and then in the middle pane choose **Console App (.NET Framework)**.
82+
- For a C++ app, under **Visual C++**, choose **Windows Desktop**,, and then choose **Windows Console Application**.
83+
84+
If you don't see the **Console App (.NET Core)** or, for C++, the **Console App** project template, go to **Tools** > **Get Tools and Features...**, which opens the Visual Studio Installer. Choose the **.NET desktop development** or **Desktop development with C++** workload, then choose **Modify**.
85+
86+
Then, type a name or use the default name and click **OK**.
87+
88+
Select **OK**.
89+
::: moniker-end
90+
91+
A new console project appears. After the project has been created, a source file appears.
8092

8193
1. Open the .cpp, .cs, or .vb code file in the project. Delete its contents to create an empty code file.
8294

docs/debugger/write-better-code-with-visual-studio.md

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Debugging techniques and tools
33
description: "Write better code with less bugs by using Visual Studio to fix exceptions, fix errors, and improve your code"
44
ms.custom: ['debug-experiment', 'seodec18']
5-
ms.date: "01/24/2019"
5+
ms.date: "02/14/2020"
66
ms.topic: "conceptual"
77
helpviewer_keywords:
88
- "debugger"
@@ -34,14 +34,26 @@ The following code has some bugs that you can fix using the Visual Studio IDE. T
3434

3535
To create the app:
3636

37-
1. Open Visual Studio and choose **File** > **New** > **Project**. Under **Visual C#**, choose **Windows Desktop** or **.NET Core**, and then in the middle pane choose a **Console App**.
37+
1. You must have Visual Studio installed and either the **.NET Core cross platform development** or the **.NET desktop development** workload installed, depending on which app type you want to create.
3838

39-
> [!NOTE]
40-
> If you don't see the **Console Application** project template, click the **Open Visual Studio Installer** link in the left pane of the **New Project** dialog box. The Visual Studio Installer launches. Choose the **.NET desktop development** or **.NET Core cross-platform development** workload, then choose **Modify**.
39+
If you haven't already installed Visual Studio, go to the [Visual Studio downloads](https://visualstudio.microsoft.com/downloads/) page to install it for free.
4140

42-
2. In the **Name** field, type **Console_Parse_JSON** and click **OK**. Visual Studio creates the project.
41+
If you need to install the workload but already have Visual Studio, click **Tools** > **Get Tools and Features**. The Visual Studio Installer launches. Choose the **.NET Core cross platform development** or **.NET desktop development** workload, then choose **Modify**.
4342

44-
3. Replace the default code in the project's *Program.cs* file with the sample code below.
43+
1. Open Visual Studio.
44+
45+
::: moniker range=">=vs-2019"
46+
On the start window, choose **Create a new project**. Type **console** in the search box and then choose either **Console App (.NET Core)** or **Console App (.NET Framework)**. Choose **Next**. Type a project name like **Console_Parse_JSON** and click **Create**.
47+
::: moniker-end
48+
::: moniker range="vs-2017"
49+
From the top menu bar, choose **File** > **New** > **Project**. In the left pane of the **New project** dialog box, under **Visual C#**, choose **Console App**, and then in the middle pane choose either **Console App (.NET Core)** or **Console App (.NET Framework)**. Type a name like **Console_Parse_JSON** and click **OK**.
50+
::: moniker-end
51+
52+
If you don't see the **Console App (.NET Core)** or **Console App (.NET Framework)** project template, go to **Tools** > **Get Tools and Features**, which opens the Visual Studio Installer. Choose either the **.NET Core cross platform development** or the **.NET desktop development** workload, then choose **Modify**.
53+
54+
Visual Studio creates the console project, which appears in Solution Explorer in the right pane.
55+
56+
1. Replace the default code in the project's *Program.cs* file with the sample code below.
4557

4658
```csharp
4759
using System;

docs/ide/report-a-problem-minidumps.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ In some cases, Microsoft might ask for a minidump of a running Visual Studio pro
3434
## Get the call stacks from the minidump
3535

3636
1. Open the dump file in Visual Studio.
37-
1. Got to **Tools** > **Options** > **Debugging** > **Symbols** and make sure that **Microsoft Symbol Servers** is checked in the **Symbol file (.pdb) locations**.
37+
1. Go to **Tools** > **Options** > **Debugging** > **Symbols** and make sure that **Microsoft Symbol Servers** is checked in the **Symbol file (.pdb) locations**.
3838
1. Open the **Command** window (**View** > **Other Windows** > **Command Window**)
3939
1. Type ‘~*k’. The window displays all threads' call stacks.
4040
1. Copy all text from Command Window and save to a text file.

0 commit comments

Comments
 (0)