Merge pull request #3926 from MicrosoftDocs/master637039911365909775

For protected CLA branch, push strategy should use PR and merge to target branch method to work around git push error

Author: gewarren

docs/get-started/csharp/media/csharp-aspnet-razor-solution-explorer-mycoreapp.png

@@ -82,7 +82,7 @@ Note that for most of the project templates you can also choose to enable Docker
 - Work or School Accounts. This option uses Active Directory, Azure AD, or Office 365 for authentication.
 - Windows Authentication. Suitable for intranet applications.
 
-Select the standard Web Application template with No Authentication and click **OK**.
+Select the standard Web Application template with No Authentication and click **Create**.
 
 ![Visual Studio 2019 Choose ASP.NET Core Project Options](media/vs-2019/vs2019-choose-aspnetcore-project.png)
 

docs/get-started/csharp/tutorial-aspnet-core-ef-step-01.md

@@ -1,10 +1,13 @@
 ---
 title: "Step 1: Create a project and add labels to your form"
 ms.date: 05/31/2019
-ms.topic: conceptual
+ms.topic: tutorial
 ms.prod: visual-studio-windows
 ms.technology: vs-ide-general
 ms.assetid: f44e50be-a5f5-4d77-9cff-dd52374c3f74
+ms.devlang:
+ - "csharp"
+ - "vb"
 author: TerryGLee
 ms.author: tglee
 manager: jillfra
@@ -16,7 +19,7 @@ ms.workload:
 As the first steps in developing this quiz, you create the project, and you add labels, a button, and other controls to a form. You also set properties for each control that you add. The project will contain the form, the controls, and (later in the tutorial) code. The button starts the quiz, the labels show the quiz problems, and the other controls show the quiz answers and the time that remains to finish the quiz.
 
 > [!NOTE]
-> This topic is part of a tutorial series about basic coding concepts. For an overview of the tutorial, see [Tutorial 2: Create a timed math quiz](../ide/tutorial-2-create-a-timed-math-quiz.md).
+> This topic is part of a tutorial series about basic coding concepts. <br><li>For an overview of the tutorial, see [Tutorial 2: Create a timed math quiz](../ide/tutorial-2-create-a-timed-math-quiz.md). <br><li>To download a completed version of the code, see [Complete math quiz tutorial sample](https://code.msdn.microsoft.com/Complete-Math-Quiz-8581813c).
 
 ## To create a project for a form
 
@@ -96,7 +99,7 @@ As the first steps in developing this quiz, you create the project, and you add
 
 7. Choose the plus sign (**+**) next to the **Font** property, and then change the value of the **Size** property to **15.75**.
 
-     You can change several font properties, as the following picture shows.
+     You can change several font properties, as the following screenshot shows.
 
      ![Properties window showing font size](../ide/media/express_setfontsize.png)
 
@@ -144,7 +147,7 @@ As the first steps in developing this quiz, you create the project, and you add
 
 16. Change the value of the **(Name)** property for the NumericUpDown control to **sum**.
 
-     You've created the first row, as the following picture shows.
+     You've created the first row, as shown in the following illustration.
 
      ![First row of math quiz](../ide/media/express_firstrow.png)
 
@@ -194,14 +197,14 @@ As the first steps in developing this quiz, you create the project, and you add
 
 7. Set the value of the **TabIndex** property for the NumericUpDown sum control to **2**, for the difference control to **3**, for the product control to **4**, and for the quotient control to **5**.
 
-     The form should look like the following illustration.
+     The form should look similar to the following screenshot.
 
      ![Initial math quiz form](../ide/media/express_formlaidout.png)
 
 8. To verify whether the **TabIndex** property works as you expect, save and run your program by choosing the **F5** key, or by choosing **Debug** > **Start Debugging** on the menu bar, and then choose the **Tab** key a few times.
 
 ## To continue or review
 
-- To go to the next tutorial step, see [Step 2: Create a random addition problem](../ide/step-2-create-a-random-addition-problem.md).
+- To go to the next tutorial step, see **[Step 2: Create a random addition problem](../ide/step-2-create-a-random-addition-problem.md)**.
 
 - To return to the overview topic, see [Tutorial 2: Create a timed math quiz](../ide/tutorial-2-create-a-timed-math-quiz.md).

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

@@ -1,8 +1,13 @@
 ---
 title: "Step 2: Create a random addition problem"
 ms.date: 11/04/2016
-ms.topic: conceptual
-dev_langs: 
+ms.topic: tutorial
+ms.prod: visual-studio-windows
+ms.technology: vs-ide-general
+ms.devlang:
+ - "csharp"
+ - "vb"
+dev_langs:
   - "csharp"
   - "vb"
 ms.assetid: 6461c4cf-f2aa-4bf5-91ed-06820a4f893d
@@ -16,7 +21,7 @@ ms.workload:
 In the second part of this tutorial, you make the quiz challenging by adding math problems that are based on random numbers. You also create a method that's named `StartTheQuiz()` and that fills in the problems and starts the countdown timer. Later in this tutorial, you'll add the subtraction, multiplication, and division problems.
 
 > [!NOTE]
-> This topic is part of a tutorial series about basic coding concepts. For an overview of the tutorial, see [Tutorial 2: Create a timed math quiz](../ide/tutorial-2-create-a-timed-math-quiz.md).
+> This topic is part of a tutorial series about basic coding concepts. <br><li>For an overview of the tutorial, see [Tutorial 2: Create a timed math quiz](../ide/tutorial-2-create-a-timed-math-quiz.md). <br><li>To download a completed version of the code, see [Complete math quiz tutorial sample](https://code.msdn.microsoft.com/Complete-Math-Quiz-8581813c).
 
 ## To create a random addition problem
 
@@ -31,6 +36,9 @@ In the second part of this tutorial, you make the quiz challenging by adding mat
      [!code-csharp[VbExpressTutorial3Step2#1](../ide/codesnippet/CSharp/step-2-create-a-random-addition-problem_1.cs)]
      [!code-vb[VbExpressTutorial3Step2#1](../ide/codesnippet/VisualBasic/step-2-create-a-random-addition-problem_1.vb)]
 
+   > [!IMPORTANT]
+   > Use the programming language control at the top right of this page to view either the C# code snippet or the Visual Basic code snippet.<br><br>![Programming language control for Docs.Microsoft.com](../ide/media/docs-programming-language-control.png)
+
      You've added a Random object to your form and named the object **randomizer**.
 
      `Random` is known as an object. You've probably heard that word before, and you learn more about what it means for programming in the next tutorial. For now, just remember that you can use `new` statements to create buttons, labels, panels, OpenFileDialogs, ColorDialogs, SoundPlayers, Randoms, and even forms, and those items are referred to as objects. When you run your program, the form is started, and the code behind it creates a random object and names it **randomizer**.
@@ -54,8 +62,8 @@ In the second part of this tutorial, you make the quiz challenging by adding mat
 
      Notice that when you enter the dot (.) after `randomizer` in the code, an IntelliSense window opens and shows you all of the Random object's methods that you can call. For example, IntelliSense lists the `Next()` method, as follows.
 
-     ![Next method](../ide/media/express_randomwhite.png)
-Next method
+     ![Next method](../ide/media/express_randomwhite.png)<br/>
+*Next method*
 
      When you enter a dot after an object, IntelliSense shows a list of the object's members, such as properties, methods, and events.
 
@@ -82,15 +90,15 @@ Next method
 
 8. Save your code, run it, and then choose the **Start** button.
 
-     A random addition problem appears, as the following illustration shows.
+     A random addition problem appears, as shown in the following screenshot.
 
-     ![Random addition problem](../ide/media/express_additionproblem.png)
-Random addition problem
+     ![Random addition problem](../ide/media/express_additionproblem.png)<br/>
+*Random addition problem*
 
      In the next step of the tutorial, you'll add the sum.
 
 ## To continue or review
 
-- To go to the next tutorial step, see [Step 3: Add a countdown timer](../ide/step-3-add-a-countdown-timer.md).
+- To go to the next tutorial step, see **[Step 3: Add a countdown timer](../ide/step-3-add-a-countdown-timer.md)**.
 
 - To return to the previous tutorial step, see [Step 1: Create a project and add labels to your form](../ide/step-1-create-a-project-and-add-labels-to-your-form.md).

docs/ide/step-2-create-a-random-addition-problem.md

@@ -1,8 +1,13 @@
 ---
 title: "Step 3: Add a countdown timer"
 ms.date: 11/04/2016
-ms.topic: conceptual
-dev_langs: 
+ms.topic: tutorial
+ms.prod: visual-studio-windows
+ms.technology: vs-ide-general
+ms.devlang:
+ - "csharp"
+ - "vb"
+dev_langs:
   - "csharp"
   - "vb"
 ms.assetid: 62670a2b-efdc-45c6-9646-9b17eeb33dcb
@@ -16,7 +21,7 @@ ms.workload:
 In the third part of this tutorial, you'll add a countdown timer to track the number of seconds that remain for the quiz taker to finish.
 
 > [!NOTE]
-> This topic is part of a tutorial series about basic coding concepts. For an overview of the tutorial, see [Tutorial 2: Create a timed math quiz](../ide/tutorial-2-create-a-timed-math-quiz.md).
+> This topic is part of a tutorial series about basic coding concepts. <br><li>For an overview of the tutorial, see [Tutorial 2: Create a timed math quiz](../ide/tutorial-2-create-a-timed-math-quiz.md). <br><li>To download a completed version of the code, see [Complete math quiz tutorial sample](https://code.msdn.microsoft.com/Complete-Math-Quiz-8581813c).
 
 ## To add a countdown timer
 
@@ -25,6 +30,9 @@ In the third part of this tutorial, you'll add a countdown timer to track the nu
      [!code-vb[VbExpressTutorial3Step3#5](../ide/codesnippet/VisualBasic/step-3-add-a-countdown-timer_1.vb)]
      [!code-csharp[VbExpressTutorial3Step3#5](../ide/codesnippet/CSharp/step-3-add-a-countdown-timer_1.cs)]
 
+   > [!IMPORTANT]
+   > Use the programming language control at the top right of this page to view either the C# code snippet or the Visual Basic code snippet.<br><br>![Programming language control for Docs.Microsoft.com](../ide/media/docs-programming-language-control.png)
+
      Now you need a method that actually counts the seconds, such as a timer, which raises an event after the amount of time that you specify.
 
 2. In the design window, move a <xref:System.Windows.Forms.Timer> control from the **Components** category of the **Toolbox** to your form.
@@ -51,7 +59,7 @@ In the third part of this tutorial, you'll add a countdown timer to track the nu
      You just added an `if else` statement, which is how you tell programs to make decisions. An `if else` statement looks like the following.
 
     > [!NOTE]
-    > The following example is for illustration only-don't add it to your project.
+    > The following example is for demonstration only--don't add it to your project.
 
     ```vb
     If (something that your program will check) Then
@@ -96,11 +104,11 @@ In the third part of this tutorial, you'll add a countdown timer to track the nu
 
      The timer starts to count down. When time runs out, the quiz ends, and the answer appears. The following illustration shows the quiz in progress.
 
-     ![Math quiz in progress](../ide/media/express_addcountdown.png)
-Math quiz in progress
+     ![Math quiz in progress](../ide/media/express_addcountdown.png)<br/>
+*Math quiz in progress*
 
 ## To continue or review
 
-- To go to the next tutorial step, see [Step 4: Add the CheckTheAnswer() method](../ide/step-4-add-the-checktheanswer-parens-method.md).
+- To go to the next tutorial step, see **[Step 4: Add the CheckTheAnswer() method](../ide/step-4-add-the-checktheanswer-parens-method.md)**.
 
 - To return to the previous tutorial step, see [Step 2: Create a random addition problem](../ide/step-2-create-a-random-addition-problem.md).

docs/ide/step-3-add-a-countdown-timer.md

@@ -1,8 +1,13 @@
 ---
 title: "Step 4: Add the CheckTheAnswer() method"
 ms.date: 11/04/2016
-ms.topic: conceptual
-dev_langs: 
+ms.topic: tutorial
+ms.prod: visual-studio-windows
+ms.technology: vs-ide-general
+ms.devlang:
+ - "csharp"
+ - "vb"
+dev_langs:
   - "csharp"
   - "vb"
 ms.assetid: c66f3831-b4a0-40bc-a109-8f46f4db35ed
@@ -16,17 +21,23 @@ ms.workload:
 In the fourth part of this tutorial, you'll write a method, `CheckTheAnswer()`, that determines whether the answers to the math problems are correct. This topic is part of a tutorial series about basic coding concepts. For an overview of the tutorial, see [Tutorial 2: Create a timed math quiz](../ide/tutorial-2-create-a-timed-math-quiz.md).
 
 > [!NOTE]
-> If you're following along in Visual Basic, you'll use the `Function` keyword instead of the usual `Sub` keyword because this method returns a value. It's really that simple: a sub doesn't return a value, but a function does.
+> This topic is part of a tutorial series about basic coding concepts. <br><li>For an overview of the tutorial, see [Tutorial 2: Create a timed math quiz](../ide/tutorial-2-create-a-timed-math-quiz.md). <br><li>To download a completed version of the code, see [Complete math quiz tutorial sample](https://code.msdn.microsoft.com/Complete-Math-Quiz-8581813c).
 
 ## To verify whether the answers are correct
 
+> [!NOTE]
+> If you're following along in Visual Basic, you'll use the `Function` keyword instead of the usual `Sub` keyword because this method returns a value. It's really that simple: a sub doesn't return a value, but a function does.
+
 1. Add the `CheckTheAnswer()` method.
 
      When this method is called, it adds the values of addend1 and addend2 and compares the result to the value in the sum <xref:System.Windows.Forms.NumericUpDown> control. If the values are equal, the method returns a value of `true`. Otherwise, the method returns a value of `false`. Your code should look like the following.
 
      [!code-vb[VbExpressTutorial3Step4#8](../ide/codesnippet/VisualBasic/step-4-add-the-checktheanswer-parens-method_1.vb)]
      [!code-csharp[VbExpressTutorial3Step4#8](../ide/codesnippet/CSharp/step-4-add-the-checktheanswer-parens-method_1.cs)]
 
+     > [!IMPORTANT]
+     > Use the programming language control at the top right of this page to view either the C# code snippet or the Visual Basic code snippet.<br><br>![Programming language control for Docs.Microsoft.com](../ide/media/docs-programming-language-control.png)
+
      Next, you'll check the answer by updating the code in the method for the timer's <xref:System.Windows.Forms.Timer.Tick> event handler to call the new `CheckTheAnswer()` method.
 
 2. Add the following code to the `if else` statement.
@@ -45,6 +56,6 @@ In the fourth part of this tutorial, you'll write a method, `CheckTheAnswer()`,
 
 ## To continue or review
 
-- To go to the next tutorial step, see [Step 5: Add Enter event handlers for the NumericUpDown controls](../ide/step-5-add-enter-event-handlers-for-the-numericupdown-controls.md).
+- To go to the next tutorial step, see **[Step 5: Add Enter event handlers for the NumericUpDown controls](../ide/step-5-add-enter-event-handlers-for-the-numericupdown-controls.md)**.
 
 - To return to the previous tutorial step, see [Step 3: Add a countdown timer](../ide/step-3-add-a-countdown-timer.md).

docs/ide/step-4-add-the-checktheanswer-parens-method.md

@@ -1,7 +1,15 @@
 ---
 title: "Step 5: Add Enter event handlers for NumericUpDown controls"
 ms.date: 11/04/2016
-ms.topic: conceptual
+ms.topic: tutorial
+ms.prod: visual-studio-windows
+ms.technology: vs-ide-general
+ms.devlang:
+ - "csharp"
+ - "vb"
+dev_langs:
+  - "csharp"
+  - "vb"
 ms.assetid: 45a99a5d-c881-4298-b74d-adb481dec5ee
 author: TerryGLee
 ms.author: tglee
@@ -17,7 +25,7 @@ ms.workload:
 In the fifth part of this tutorial, you'll add <xref:System.Windows.Forms.Control.Enter> event handlers to make entering answers for quiz problems a little easier. This code will select and clear the current value in each <xref:System.Windows.Forms.NumericUpDown> control as soon as the quiz taker chooses it and starts to enter a different value.
 
 > [!NOTE]
-> This topic is part of a tutorial series about basic coding concepts. For an overview of the tutorial, see [Tutorial 2: Create a timed math quiz](../ide/tutorial-2-create-a-timed-math-quiz.md).
+> This topic is part of a tutorial series about basic coding concepts. <br><li>For an overview of the tutorial, see [Tutorial 2: Create a timed math quiz](../ide/tutorial-2-create-a-timed-math-quiz.md). <br><li>To download a completed version of the code, see [Complete math quiz tutorial sample](https://code.msdn.microsoft.com/Complete-Math-Quiz-8581813c).
 
 ## To verify the default behavior
 
@@ -52,6 +60,9 @@ In the fifth part of this tutorial, you'll add <xref:System.Windows.Forms.Contro
      [!code-vb[VbExpressTutorial3Step5_6#11](../ide/codesnippet/VisualBasic/step-5-add-enter-event-handlers-for-the-numericupdown-controls_1.vb)]
      [!code-csharp[VbExpressTutorial3Step5_6#11](../ide/codesnippet/CSharp/step-5-add-enter-event-handlers-for-the-numericupdown-controls_1.cs)]
 
+     > [!IMPORTANT]
+     > Use the programming language control at the top right of this page to view either the C# code snippet or the Visual Basic code snippet.<br><br>![Programming language control for Docs.Microsoft.com](../ide/media/docs-programming-language-control.png)
+
      This code may look complex, but you can understand it if you look at it step by step. First, look at the top of the method: `object sender` in C# or `sender As System.Object` in Visual Basic. This parameter refers to the object whose event is firing, which is known as the sender. In this case, the sender object is the NumericUpDown control. So, in the first line of the method, you specify that the sender isn't just any generic object but specifically a NumericUpDown control. (Every NumericUpDown control is an object, but not every object is a NumericUpDown control.) The NumericUpDown control is named **answerBox** in this method, because it will be used for all of the NumericUpDown controls on the form, not just the sum NumericUpDown control. Because you declare the answerBox variable in this method, its scope applies only to this method. In other words, the variable can be used only within this method.
 
      The next line verifies whether answerBox was successfully converted (cast) from an object to a NumericUpDown control. If the conversion was unsuccessful, the variable would have a value of `null` (C#) or `Nothing` (Visual Basic). The third line gets the length of the answer that appears in the NumericUpDown control, and the fourth line selects the current value in the control based on this length. Now, when the quiz taker chooses the control, Visual Studio fires this event, which causes the current answer to be selected. As soon as the quiz taker starts to enter a different answer, the previous answer is cleared and replaced with the new answer.
@@ -68,6 +79,6 @@ In the fifth part of this tutorial, you'll add <xref:System.Windows.Forms.Contro
 
 ## To continue or review
 
-- To go to the next tutorial step, see [Step 6: Add a subtraction problem](../ide/step-6-add-a-subtraction-problem.md).
+- To go to the next tutorial step, see **[Step 6: Add a subtraction problem](../ide/step-6-add-a-subtraction-problem.md)**.
 
 - To return to the previous tutorial step, see [Step 4: Add the CheckTheAnswer() method](../ide/step-4-add-the-checktheanswer-parens-method.md).