merge from master

Author: eddynaka

.openpublishing.redirection.json

@@ -7752,12 +7752,12 @@
     },
     {
       "source_path": "scripting-docs/winscript/index.md",
-      "redirect_url": "/script/winscript/active-script-debugging-overview",
+      "redirect_url": "/scripting/winscript/active-script-debugging-overview",
       "redirect_document_id": false
     },
     {
       "source_path": "scripting-docs/winscript/reference/index.md",
-      "redirect_url": "/script/winscript/windows-script-interfaces-reference",
+      "redirect_url": "/scripting/winscript/reference/windows-script-interfaces-reference",
       "redirect_document_id": false
     },
     {
@@ -8589,6 +8589,11 @@
       "source_path": "docs/code-quality/ca2243-attribute-string-literals-should-parse-correctly.md",
       "redirect_url": "/visualstudio/code-quality/ca2243",
       "redirect_document_id": true
+    },
+    {
+      "source_path": "subscriptions/vs-office-dev.md",
+      "redirect_url": "/visualstudio/subscriptions/vs-m365",
+      "redirect_document_id": false
     }
   ]
 }

docs/code-quality/how-to-customize-the-code-analysis-dictionary.md

@@ -144,7 +144,7 @@ To include a term in the list of terms that code analysis identifies as deprecat
 
 To include a suggested alternate term in the warning, specify the alternate in the PreferredAlternate attribute of the Term element. You can leave the attribute value empty if you do not want to suggest an alternate.
 
-- The deprecated term in Dictionary/Words/ Deprecated/Term element is not case-sensitive.
+- The deprecated term in Dictionary/Words/Deprecated/Term element is not case-sensitive.
 
 - The PreferredAlternate attribute value is case-sensitive. Use Pascal case for compound alternates.
 
@@ -179,9 +179,9 @@ Terms in the Dictionary/Words/Deprecated node are applied to the following code
 
 The built-in dictionary identifies some terms as single, discrete terms rather than a compound term. To include a term in the list of terms that code analysis identifies as a compound word and to specify the correct casing of the term, add the term as the inner text of a Dictionary/Words/Compound/Term element. In the CompoundAlternate attribute of the Term element, specify the individual words that make up the compound term by capitalizing the first letter of the individual words (Pascal case). Note that the term specified in the inner text is automatically added to the Dictionary/Words/DiscreteExceptions list.
 
-- The deprecated term in Dictionary/Words/ Deprecated/Term element is not case-sensitive.
+- The compound term in Dictionary/Words/Compound/Term element is not case-sensitive.
 
-- The PreferredAlternate attribute value is case-sensitive. Use Pascal case for compound alternates.
+- The CompoundAlternate attribute value is case-sensitive. Use Pascal case for compound alternates.
 
 **Example**
 
@@ -268,4 +268,4 @@ Terms in the Dictionary/Acronyms/CasingExceptions node are applied to the follow
 
 5. From the **Build Action** list, select **CodeAnalysisDictionary**.
 
-6. From the **Copy to Output Directory** list, select **Do not copy**.
+6. From the **Copy to Output Directory** list, select **Do not copy**.

docs/debugger/xaml-hot-reload.md

@@ -48,6 +48,7 @@ The following are known limitations of XAML Hot Reload. To work around any limit
 |Adding new controls, classes, windows, or other files to your project while the app is running|Not Supported|Not Supported|None|
 |Managing NuGet packages (adding/removing/updating packages)|Not Supported|Not Supported|None|
 |Changing data binding that uses the {x:Bind} markup extension|N/A|Supported starting in Visual Studio 2019|This requires Windows 10 version 1809 (build 10.0.17763). Not supported in Visual Studio 2017 or previous versions.|
+|Changing x:Uid directives is not supported|N/A|Not Supported|None|
 
 ## Error messages
 

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

@@ -59,7 +59,7 @@ If you can't use NuGet packages, you can reference MSBuild assemblies that are d
 
 #### Binding redirects
 
-Reference the Microsoft.Build.Locator package to ensure that your application automatically uses the required binding redirects of all versions of MSBuild assemblies to version `15.1.0.0`.
+Reference the Microsoft.Build.Locator package to ensure that your application automatically uses the required binding redirects to version 15.1.0.0. Binding redirects to this version support both MSBuild 15 and MSBuild 16.
 
 ### Ensure output is clean