Merge pull request #4112 from MicrosoftDocs/master637066919472908828

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

Author: gewarren

docs/ide/includes/devlang-control.md renamed to docs/ide/includes/devlang-control-csharp-vb.md

@@ -26,8 +26,8 @@ This code adds functionality to the buttons you added earlier. Without this code
 ## How to write code for additional buttons and a check box
 
 Add the following code to your **Form1** code file (*Form1.cs* or *Form1.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)
+
+  [!INCLUDE [devlang-control-csharp-vb](./includes/devlang-control-csharp-vb.md)]
 
   [!code-csharp[VbExpressTutorial1Step9_10#2](../ide/codesnippet/CSharp/step-10-write-code-for-additional-buttons-and-a-check-box_1.cs)]
 

docs/ide/step-10-write-code-for-additional-buttons-and-a-check-box.md

@@ -36,8 +36,7 @@ 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)
+     [!INCLUDE [devlang-control-csharp-vb](./includes/devlang-control-csharp-vb.md)]
 
      You've added a Random object to your form and named the object **randomizer**.
 

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

@@ -30,8 +30,7 @@ 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)
+     [!INCLUDE [devlang-control-csharp-vb](./includes/devlang-control-csharp-vb.md)]
 
      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.
 

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

@@ -35,8 +35,7 @@ In the fourth part of this tutorial, you'll write a method, `CheckTheAnswer()`,
      [!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)
+     [!INCLUDE [devlang-control-csharp-vb](./includes/devlang-control-csharp-vb.md)]
 
      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.
 

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

@@ -56,8 +56,7 @@ 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)
+     [!INCLUDE [devlang-control-csharp-vb](./includes/devlang-control-csharp-vb.md)]
 
      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.
 

docs/ide/step-5-add-enter-event-handlers-for-the-numericupdown-controls.md

@@ -37,8 +37,7 @@ In the sixth part of this tutorial, you'll add a subtraction problem and learn h
      [!code-vb[VbExpressTutorial3Step5_6#12](../ide/codesnippet/VisualBasic/step-6-add-a-subtraction-problem_1.vb)]
      [!code-csharp[VbExpressTutorial3Step5_6#12](../ide/codesnippet/CSharp/step-6-add-a-subtraction-problem_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)
+     [!INCLUDE [devlang-control-csharp-vb](./includes/devlang-control-csharp-vb.md)]
 
      The names of the new integer variables—**minuend** and **subtrahend**—aren't programming terms. They're the traditional names in arithmetic for the number that's being subtracted (the subtrahend) and the number from which the subtrahend is being subtracted (the minuend). The difference is the minuend minus the subtrahend. You could use other names, because your program doesn't require specific names for variables, controls, components, or methods. You must follow rules such as not starting names with digits, but you can generally use names such as x1, x2, x3, and x4. However, generic names make code difficult to read and problems nearly impossible to track down. To keep variable names unique and helpful, you'll use the traditional names for multiplication (multiplicand × multiplier = product) and division (dividend ÷ divisor = quotient) later in this tutorial.
 

docs/ide/step-6-add-a-subtraction-problem.md

@@ -59,7 +59,7 @@ You can verify the names by choosing the control selector drop-down list in the
     End Sub
     ```
 
-   [!INCLUDE [devlang-control](./includes/devlang-control.md)]
+   [!INCLUDE [devlang-control-csharp-vb](./includes/devlang-control-csharp-vb.md)]
 
    You're looking at code called `showButton_Click()` (alternatively, `ShowButton_Click()`). The IDE added this to the form's code when you opened the code file for the **showButton** button. At design-time, when you open the code file for a control in a form, code is generated for the control if it doesn't already exist. This code, known as a *method*, runs when you run your app and choose the control - in this case, the **Show a picture** button.
 

docs/ide/step-6-name-your-button-controls.md

@@ -30,8 +30,7 @@ In the seventh part of this tutorial, you'll add multiplication and division pro
      [!code-vb[VbExpressTutorial3Step7#15](../ide/codesnippet/VisualBasic/step-7-add-multiplication-and-division-problems_1.vb)]
      [!code-csharp[VbExpressTutorial3Step7#15](../ide/codesnippet/CSharp/step-7-add-multiplication-and-division-problems_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)
+     [!INCLUDE [devlang-control-csharp-vb](./includes/devlang-control-csharp-vb.md)]
 
 2. As you did before, modify the `StartTheQuiz()` method to fill in random numbers for the multiplication and division problems.
 

docs/ide/step-7-add-multiplication-and-division-problems.md

@@ -35,8 +35,7 @@ In the last part of the tutorial, you'll explore some ways to customize the quiz
   timeLabel.BackColor = Color.Red
   ```
 
-  > [!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)
+  [!INCLUDE [devlang-control-csharp-vb](./includes/devlang-control-csharp-vb.md)]
 
   Reset the color when the quiz is over.
 

docs/ide/step-8-customize-the-quiz.md

@@ -87,8 +87,7 @@ Next, you use IntelliSense to enter more code to open an **Open File** dialog bo
 
  1. Now add one more line of code. You can type it (or copy and paste it), but consider using IntelliSense to add it. The more familiar you are with IntelliSense, the more quickly you can write your own code. Your final `showButton_Click()` method should look similar to the following code.
 
-    > [!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)
+    [!INCLUDE [devlang-control-csharp-vb](./includes/devlang-control-csharp-vb.md)]
 
     [!code-csharp[VbExpressTutorial1Step8#1](../ide/codesnippet/CSharp/step-8-write-code-for-the-show-a-picture-button-event-handler_1.cs)]
 

docs/ide/step-8-write-code-for-the-show-a-picture-button-event-handler.md

@@ -48,8 +48,7 @@ You just built something that works, and although it's not done yet, it can alre
 
 1. Add the following comment to your code.
 
-    > [!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)
+     [!INCLUDE [devlang-control-csharp-vb](./includes/devlang-control-csharp-vb.md)]
 
      [!code-csharp[VbExpressTutorial1Step9_10#1](../ide/codesnippet/CSharp/step-9-review-comment-and-test-your-code_1.cs)]
 

docs/ide/step-9-review-comment-and-test-your-code.md

@@ -47,7 +47,7 @@ The following known issues occur when you install Visual Studio Build Tools into
 The following known issues might occur when you use a Build Tools container. To see whether issues have been fixed or if there are other known issues, visit https://developercommunity.visualstudio.com.
 
 * IntelliTrace might not work in [some scenarios](https://github.com/Microsoft/vstest/issues/940) within a container.
-* On older versions of Docker for Windows, the default container image size is only 20 GB and will not fit Build Tools. Follow [instructions to change image size](https://docs.microsoft.com/virtualization/windowscontainers/manage-containers/container-storage#image-size) to 127 GB or more.
+* On older versions of Docker for Windows, the default container image size is only 20 GB and will not fit Build Tools. Follow [instructions to change image size](https://docs.microsoft.com/virtualization/windowscontainers/manage-containers/container-storage#storage-limits) to 127 GB or more.
 
 [!INCLUDE[install_get_support_md](includes/install_get_support_md.md)]
 

docs/install/build-tools-container-issues.md

@@ -41,7 +41,7 @@ If you don't see a project or file type listed here that should be, consult the
 
 | Type of Project | Support |
 | --- | --- |
-| .NET Core projects (xproj) | Projects created with Visual Studio 2015 used preview tooling that included an xproj project file.<br/><br/>Visual Studio 2017: The xproj format is not supported other than for migration to csproj format. When you open an xproj file, you're prompted to migrate the file to the SDK-style csproj format. (A backup of the xproj file is made.) SDK-style csproj projects are not supported in Visual Studio 2015 and earlier. <br/><br/>Visual Studio 2019: In version 16.3 and later, you cannot load or migrate xproj projects. For more information, see [Migrating .NET Core projects to the csproj format](/dotnet/core/migration/#visual-studio-2017).|
+| .NET Core projects (xproj) | Projects created with Visual Studio 2015 used preview tooling that included an xproj project file.<br/><br/>Visual Studio 2017: The xproj format is not supported other than for migration to csproj format. When you open an xproj file, you're prompted to migrate the file to the SDK-style csproj format. (A backup of the xproj file is made.) SDK-style csproj projects are not supported in Visual Studio 2015 and earlier. <br/><br/>Visual Studio 2019: In version 16.3 and later, you cannot load or migrate xproj projects. For more information, see [Migrating .NET Core projects to the csproj format](/dotnet/core/migration/#visual-studio).|
 | ASP.NET Web Application and ASP.NET Core Web Application with Application Insights enabled | For each Visual Studio user, resource information is stored in the registry per user instance. This information is used when a user doesn't have a project opened and wants to search Azure Application Insights data. Visual Studio 2015 uses different registry location than Visual Studio 2017 and does not conflict.<br/><br/>Once a user creates an ASP.NET Web Application or ASP.NET Core Web Application, the resource is stored in the .suo file. The user can open the project in Visual Studio 2015 or 2017 and the resource information is used for both as long as Visual Studio supports projects and solutions being used across both versions. Users need to authenticate once on each product. For example, if a project is created with Visual Studio 2015 and opened in Visual Studio 2017, the user needs to authenticate on Visual Studio 2017. |
 | C#/Visual Basic Webform or Windows Form | You can open the project in Visual Studio 2017 and Visual Studio 2015. |
 | Database Unit Test Projects (csproj, .vbproj) | Older Data Unit test projects are loaded in Visual Studio 2017 but use the GAC'd version of dependencies. To upgrade the unit test project to use the latest dependencies, right-click on the project in Solution Explorer and select **Convert to SQL Server Unit Testing Project...**. |
@@ -123,7 +123,7 @@ If you don't see a project or file type listed here that should be, consult the
 
 | Type of Project | Support |
 | --- | --- |
-| .NET Core projects (xproj) | Projects created with Visual Studio 2015 used preview tooling that included an xproj project file. When you open an xproj file with Visual Studio 2019, you are prompted to migrate the file to the csproj format (a backup of the xproj file is made). This csproj format for .NET Core projects is not supported in Visual Studio 2015 and earlier.  The xproj format is not supported in Visual Studio 2017 and later, other than for migration to csproj. For more information, see [Migrating .NET Core projects to the csproj format](/dotnet/core/migration/#visual-studio-2017).|
+| .NET Core projects (xproj) | Projects created with Visual Studio 2015 used preview tooling that included an xproj project file. When you open an xproj file with Visual Studio 2019, you are prompted to migrate the file to the csproj format (a backup of the xproj file is made). This csproj format for .NET Core projects is not supported in Visual Studio 2015 and earlier.  The xproj format is not supported in Visual Studio 2017 and later, other than for migration to csproj. For more information, see [Migrating .NET Core projects to the csproj format](/dotnet/core/migration/#visual-studio).|
 | ASP.NET Web Application and ASP.NET Core Web Application with Application Insights enabled | For each Visual Studio user, resource information is stored in the registry per user instance. This information is used when a user doesn't have a project opened and wants to search Azure Application Insights data. Visual Studio 2015 uses different registry location than Visual Studio 2017 and Visual Studio 2019 and does not conflict.<br/><br/>Once a user creates an ASP.NET Web Application or ASP.NET Core Web Application, the resource is stored in the .suo file. The user can open the project in Visual Studio 2015, Visual Studio 2017, or Visual Studio 2019,  and the resource information is used for each as long as Visual Studio supports projects and solutions being used across both versions. Users need to authenticate once on each product. For example, if a project is created with Visual Studio 2017 and opened in Visual Studio 2019, the user needs to authenticate on Visual Studio 2019. |
 | C#/Visual Basic Webform or Windows Form | You can open the project in Visual Studio 2019, Visual Studio 2017, and Visual Studio 2015. |
 | Coded UI Test | Coded UI test for automated UI-driven functional testing is deprecated in Visual Studio 2019. <br/><br/>Visual Studio 2019 will be the last release for Coded UI test. We recommend using Selenium for testing web apps and Appium with WinAppDriver for testing desktop and UWP apps. |

docs/porting/port-migrate-and-upgrade-visual-studio-projects.md

@@ -18,16 +18,15 @@ When you sign in to Azure DevOps using either the identity that you used for act
 ## Eligibility
 | Subscription Level                                                 |     Channels                                            | Benefit                                                          | Renewable?    |
 |--------------------------------------------------------------------|---------------------------------------------------------|------------------------------------------------------------------|---------------|
-| Visual Studio Enterprise (Standard, monthly cloud)   | VL, Azure, Retail,  selected NFR<sup>1</sup>, FTE  | Azure Boards & Repos (Basic), Azure Test Plans, Azure Artifacts<sup>2</sup>, Azure Pipelines (self-hosted)       |  Yes          |
-| Visual Studio Professional (Standard, monthly cloud) | VL, Azure, Retail,                                        | Azure Boards & Repos (Basic), Azure Artifacts<sup>2</sup>                                                            |  Yes          |
+| Visual Studio Enterprise (Standard, monthly cloud)   | VL, Azure, Retail,  selected NFR<sup>1</sup>  | Azure Boards & Repos (Basic), Azure Test Plans, Azure Pipelines (self-hosted)       |  Yes          |
+| Visual Studio Professional (Standard, monthly cloud) | VL, Azure, Retail,                                        | Azure Boards & Repos (Basic)                                                            |  Yes          |
 | Visual Studio Test Professional (Standard)                         | VL, Retail                                              | Azure Boards & Repos (Basic), Azure Test Plans                                              |  Yes          |
 | MSDN Platforms (Standard)                                          | VL, Retail                                              | Azure Boards & Repos (Basic), Azure Test Plans                                              |  Yes          |
 ||
 
-<sup>1</sup>  *Includes:  Not for Resale (NFR), Most Valuable Professional (MVP), Regional Director (RD), Visual Studio Industry Partner (VSIP),Microsoft Partner Network (Enterprise), BizSpark, MCT Software & Services Developer.
+<sup>1</sup>  *Includes:  Not for Resale (NFR), Most Valuable Professional (MVP), Regional Director (RD), Visual Studio Industry Partner (VSIP),Microsoft Partner Network (Enterprise), BizSpark, MCT Software & Services Developer, FTE.
   Excludes: MCT Software & Services, Imagine.*
 
-<sup>2</sup>  *Includes 2GB at no charge*
 
 > [!NOTE]
 > Microsoft no longer offers Visual Studio Professional Annual subscriptions and Visual Studio Enterprise Annual subscriptions in Cloud Subscriptions. There will be no change to existing customers experience and ability to renew, increase, decrease, or cancel their subscriptions. New customers are encouraged to go to [https://visualstudio.microsoft.com/vs/pricing/](https://visualstudio.microsoft.com/vs/pricing/) to explore different options to purchase Visual Studio.