Merge pull request #1204 from MicrosoftDocs/master

Taojunshen · web-flow · commit 03a74d29a1e0 · 2018-01-02T10:47:30.000-08:00
1/2 AM Publish
diff --git a/docs/code-quality/codesnippet/CSharp/ca2233-operations-should-not-overflow_2.cs b/docs/code-quality/codesnippet/CSharp/ca2233-operations-should-not-overflow_2.cs
@@ -7,10 +7,10 @@ public static class Calculator
         public static int Decrement(int input)        
         {            
             if (input == int.MinValue)                
-                throw new ArgumentOutOfRangeException("input", "input must be greater than Int32.MinValue");
+                throw new ArgumentOutOfRangeException(nameof(input), "input must be greater than Int32.MinValue");
                              
             input--;             
             return input;        
         }    
     }
-}
+}
diff --git a/docs/debugger/how-to-use-the-threads-window.md b/docs/debugger/how-to-use-the-threads-window.md
@@ -55,7 +55,7 @@ To begin this tutorial, you need a multithreaded application project. Follow the
   
     ```VB  
     Thread.Sleep(3000)   
-    Console.WriteLine(  
+    Console.WriteLine()
     ```  
   
     ```CSharp  
@@ -259,4 +259,4 @@ You can freeze and thaw (suspend and resume) threads to control the order in whi
   
 ## See Also  
  [Debug Multithreaded Applications](../debugger/debug-multithreaded-applications-in-visual-studio.md)   
- [How to: Switch to Another Thread While Debugging](../debugger/how-to-switch-to-another-thread-while-debugging.md)
+ [How to: Switch to Another Thread While Debugging](../debugger/how-to-switch-to-another-thread-while-debugging.md)
diff --git a/docs/debugger/walkthrough-writing-a-visualizer-in-csharp.md b/docs/debugger/walkthrough-writing-a-visualizer-in-csharp.md
@@ -10,9 +10,6 @@ ms.tgt_pltfrm: ""
 ms.topic: "article"
 dev_langs: 
   - "CSharp"
-  - "VB"
-  - "FSharp"
-  - "C++"
 helpviewer_keywords: 
   - "visualizers, writing"
   - "walkthroughs [Visual Studio], visualizers"
@@ -67,7 +64,7 @@ Follow the tasks below to create a visualizer.
   
 6.  In DebuggerSide.cs, add the following statement to the `using` statements:  
   
-    ```  
+    ```csharp  
     using Microsoft.VisualStudio.DebuggerVisualizers;  
     ```  
   
@@ -77,13 +74,13 @@ Follow the tasks below to create a visualizer.
   
 1.  In DebuggerSide.cs, go to the following line of code:  
   
-    ```  
+    ```csharp  
     public class DebuggerSide  
     ```  
   
 2.  Change the code to:  
   
-    ```  
+    ```csharp  
     public class DebuggerSide : DialogDebuggerVisualizer  
     ```  
   
@@ -93,8 +90,8 @@ Follow the tasks below to create a visualizer.
   
 -   In `public class DebuggerSide`, add the following **method:**  
   
-    ```  
-    override protected void Show(IDialogVisualizerService windowService, IVisualizerObjectProvider objectProvider)  
+    ```csharp  
+    protected override void Show(IDialogVisualizerService windowService, IVisualizerObjectProvider objectProvider)  
     {  
     }  
     ```  
@@ -111,7 +108,7 @@ Follow the tasks below to create a visualizer.
   
 4.  In DebuggerSide.cs, add the following statement to the `using` statements:  
   
-    ```  
+    ```csharp  
     using System.Windows.Forms;  
     ```  
   
@@ -121,7 +118,7 @@ Follow the tasks below to create a visualizer.
   
 1.  In the `Show` method, add the following line of code:  
   
-    ```  
+    ```csharp  
     MessageBox.Show(objectProvider.GetObject().ToString());  
     ```  
   
@@ -135,12 +132,12 @@ Follow the tasks below to create a visualizer.
   
 1.  Add the following attribute code to DebuggerSide.cs, after the `using` statements but before `namespace MyFirstVisualizer`:  
   
-    ```  
+    ```csharp  
     [assembly:System.Diagnostics.DebuggerVisualizer(  
     typeof(MyFirstVisualizer.DebuggerSide),  
     typeof(VisualizerObjectSource),  
-    Target  = typeof(System.String),  
-    Description  = "My First Visualizer")]  
+    Target = typeof(System.String),  
+    Description = "My First Visualizer")]  
     ```  
   
 2.  On the **Build** menu, choose **Build MyFirstVisualizer**. The project should build successfully. Correct any build errors before continuing.  
@@ -151,7 +148,7 @@ Follow the tasks below to create a visualizer.
   
 1.  Add the following method to class `public DebuggerSide`:  
   
-    ```  
+    ```csharp  
     public static void TestShowVisualizer(object objectToVisualize)  
     {  
        VisualizerDevelopmentHost visualizerHost = new VisualizerDevelopmentHost(objectToVisualize, typeof(DebuggerSide));  
@@ -201,13 +198,13 @@ Follow the tasks below to create a visualizer.
   
 3.  In TestConsole.cs, add the following code to the `using` statements:  
   
-    ```  
+    ```csharp  
     using MyFirstVisualizer;  
     ```  
   
 4.  In method `Main`, add the following code:  
   
-    ```  
+    ```csharp  
     String myString = "Hello, World";  
     DebuggerSide.TestShowVisualizer(myString);  
     ```  
diff --git a/docs/designers/walkthrough-my-first-wpf-desktop-application2.md b/docs/designers/walkthrough-my-first-wpf-desktop-application2.md
@@ -266,7 +266,7 @@ In this section, you'll create the application infrastructure, which includes th
   
 1.  Choose the following image and save it as `watermark.png`.  
   
-     ![Watermark image for walkthrough](../designers/media/wpf_watermark.png "WPF_watermark")  
+     ![Watermark image for walkthrough](../designers/media/wpf_watermark.png "watermark")  
   
     > [!NOTE]
     >  Alternatively you can create your own image and save it as `watermark.png`.  
@@ -885,4 +885,4 @@ In this section, you'll create the application infrastructure, which includes th
 -   [Documents in WPF](/dotnet/framework/wpf/advanced/documents-in-wpf)  
   
 ## See Also  
-[Create Modern Desktop Applications with Windows Presentation Foundation](../designers/create-modern-desktop-applications-with-windows-presentation-foundation.md)
+[Create Modern Desktop Applications with Windows Presentation Foundation](../designers/create-modern-desktop-applications-with-windows-presentation-foundation.md)
diff --git a/docs/ide/how-to-create-multi-project-templates.md b/docs/ide/how-to-create-multi-project-templates.md
@@ -22,69 +22,95 @@ ms.workload:
 ---
 # How to: Create Multi-Project Templates
 Multi-project templates act as containers for two or more projects. When a project based on a multi-project template is created from the **New Project** dialog box, every project in the template is added to the solution.  
+
+ A multi-project template is two-or more project templates along with a root template of type `ProjectGroup`.
+
+ Multi-project templates also behave differently than normal templates. Multi-project templates have the following unique characteristics:  
   
- A multi-project template must include the following items, compressed into a .zip file:  
-  
--   A root .vstemplate file for the entire multi-project template. This root .vstemplate file contains the metadata that the **New Project** dialog box displays, and specifies where to find the .vstemplate files for the projects in this template. This file must be located at the root of the .zip file.  
-  
--   One or more folders that contain the files that are required for a complete project template. This includes all code files for the project, and also a .vstemplate file for the project.  
+-   Individual projects in a multi-project template cannot be assigned names by the **New Project** dialog box. Instead, use the `ProjectName` attribute on the `ProjectTemplateLink` element to specify the name for each project. For more information, see the first example in the following section.  
   
- For example, a multi-project template .zip file that has two projects could have the following files and directories:  
+-   Multi-project templates can contain projects written in different languages, but the entire template itself can only be put in one category by using the `ProjectType` element.  
   
- MultiProjectTemplate.vstemplate  
+### To create a multi-project template  
   
- \Project1\Project1.vstemplate  
+1.  Create the projects to include in the multi-project template:
+    1.  Create a project.  
   
- \Project1\Project1.vbproj  
+    > [!NOTE]
+    >  Use only valid identifier characters when naming a project that will be the source for a template. A template exported from a project named with invalid characters can cause compilation errors in future projects based on the template. For more information on valid identifier characters, see [Declared Element Names](/dotnet/visual-basic/programming-guide/language-features/declared-elements/declared-element-names).  
   
- \Project1\Class.vb  
+    2.  Edit the project until it is ready to be exported as a template.  
   
- \Project2\Project2.vstemplate  
+    3.  As appropriate, edit the code files to indicate where parameter replacement should take place. For more information on parameter replacement, see [How to: Substitute Parameters in a Template](../ide/how-to-substitute-parameters-in-a-template.md).  
   
- \Project2\Project2.vbproj  
+    4.  On the **Project** menu, click **Export Template**. The **Export Template** wizard opens.  
   
- \Project2\Class.vb  
+    5.  Click **Project Template**.  
   
- The root .vstemplate file for a multi-project template differs from a single-project template in the following ways:  
+    6.  If you have more than one project in your current solution, select the projects you want to export to a template.  
   
--   The `Type` attribute of the `VSTemplate` element contains the value `ProjectGroup`. For example:  
+    7.  Click **Next**.  
   
-    ```  
-    <VSTemplate Version="2.0.0" Type="ProjectGroup"  
-        xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">  
-    ```  
+    8.  Select an icon and a preview image for your template. These will appear in the **New Project** dialog box.  
   
--   The `TemplateContent` element contains a `ProjectCollection` element that has one or more `ProjectTemplateLink` elements that define the paths to the .vstemplate files of the included projects. For example:  
+    9. Enter a template name and description.  
   
-    ```  
-    <TemplateContent>  
-        <ProjectCollection>  
-            <ProjectTemplateLink>  
-                Project1\Project1.vstemplate  
-            </ProjectTemplateLink>  
-            <ProjectTemplateLink>  
-                Project2\Project2.vstemplate  
-            </ProjectTemplateLink>  
-        </ProjectCollection>  
-    </TemplateContent>  
-    ```  
-  
- Multi-project templates also behave differently than normal templates. Multi-project templates have the following unique characteristics:  
-  
--   Individual projects in a multi-project template cannot be assigned names by the **New Project** dialog box. Instead, use the `ProjectName` attribute on the `ProjectTemplateLink` element to specify the name for each project. For more information, see the first example in the following section.  
-  
--   Multi-project templates can contain projects written in different languages, but the entire template itself can only be put in one category by using the `ProjectType` element.  
-  
-### To create a multi-project template  
-  
-1.  Create the projects to include in the multi-project template.  
-  
-2.  Create .vstemplate files for every project. For more information, see [How to: Create Project Templates](../ide/how-to-create-project-templates.md).  
+    10. Click **Finish**. Your project is exported into a .zip file and placed in the specified output location, and, if selected, imported into [!INCLUDE[vsprvs](../code-quality/includes/vsprvs_md.md)].  
   
+2.  Extract the .vstemplate file from the generated zip file into the same directory as the project file used to export the template.
+
 3.  Create a root .vstemplate file that to contain the metadata for the multi-project template. For more information, see the first example in the following section.  
   
 4.  Select the files and folders to include in your template, right-click the selection, click **Send To**, and then click **Compressed (zipped) Folder**. The files and folders are compressed into a .zip file.  
   
+> [NOTE!]
+> A multi-project template must include the following items, compressed into a .zip file:  
+>   
+> -   A root .vstemplate file for the entire multi-project template. This root .vstemplate file contains the metadata that the **New Project** dialog box displays, and specifies where to find the .vstemplate files for the projects in this template. This file must be located at the root of the .zip file.  
+>   
+> -   One or more folders that contain the files that are required for a complete project template. This includes all code files for the project, and also a .vstemplate file for the project.  
+>   
+> For example, a multi-project template .zip file that has two projects could have the following files and directories:  
+>   
+>  MultiProjectTemplate.vstemplate  
+>   
+>  \Project1\Project1.vstemplate  
+>   
+>  \Project1\Project1.vbproj  
+>   
+>  \Project1\Class.vb  
+>   
+>  \Project2\Project2.vstemplate  
+>   
+>  \Project2\Project2.vbproj  
+>   
+>  \Project2\Class.vb  
+>   
+>  The root .vstemplate file for a multi-project template differs from a single-project template in the following ways:  
+>   
+> -   The `Type` attribute of the `VSTemplate` element contains the value `ProjectGroup`. For example:  
+>   
+>     ```  
+>     <VSTemplate Version="2.0.0" Type="ProjectGroup"  
+>         xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">  
+>     ```  
+>   
+> -   The `TemplateContent` element contains a `ProjectCollection` element that has one or more `ProjectTemplateLink` elements that define the paths to the .vstemplate files of the included projects. For example:  
+>   
+>     ```  
+>     <TemplateContent>  
+>         <ProjectCollection>  
+>             <ProjectTemplateLink>  
+>                 Project1\Project1.vstemplate  
+>             </ProjectTemplateLink>  
+>             <ProjectTemplateLink>  
+>                 Project2\Project2.vstemplate  
+>             </ProjectTemplateLink>  
+>         </ProjectCollection>  
+>     </TemplateContent>  
+>     ```  
+>   
+  
 5.  Put the .zip template file in the [!INCLUDE[vsprvs](../code-quality/includes/vsprvs_md.md)] project template directory. By default, this directory is \My Documents\Visual Studio *Version*\Templates\ProjectTemplates\\.  
   
 ## Example  
@@ -153,4 +179,4 @@ Multi-project templates act as containers for two or more projects. When a proje
  [How to: Create Project Templates](../ide/how-to-create-project-templates.md)   
  [Visual Studio Template Schema Reference](../extensibility/visual-studio-template-schema-reference.md)   
  [SolutionFolder Element (Visual Studio Templates)](../extensibility/solutionfolder-element-visual-studio-templates.md)   
- [ProjectTemplateLink Element (Visual Studio Templates)](../extensibility/projecttemplatelink-element-visual-studio-templates.md)
+ [ProjectTemplateLink Element (Visual Studio Templates)](../extensibility/projecttemplatelink-element-visual-studio-templates.md)
diff --git a/docs/ide/synchronized-settings-in-visual-studio.md b/docs/ide/synchronized-settings-in-visual-studio.md
@@ -50,7 +50,7 @@ By default, the following settings are synchronized.
 
 ## Turn off synchronized settings on a particular computer
 
-Synchronized settings for Visual Studio are turned on by default. You can turn off synchronized settings on a computer by going to the **Tools &#124; Options &#124; Environment &#124; Synchronized Settings** page and unchecking the checkbox.  For example, if you decide not to synchronize Visual Studio's settings on Computer A, any setting changes made on Computer A do not appear on Computer B or Computer C. Computer B and C will continue to synchronize with each other, but not with Computer A.
+Synchronized settings for Visual Studio are turned on by default. You can turn off synchronized settings on a computer by going to the **Tools &#124; Options &#124; Environment &#124; Accounts** page and unchecking the checkbox.  For example, if you decide not to synchronize Visual Studio's settings on Computer A, any setting changes made on Computer A do not appear on Computer B or Computer C. Computer B and C will continue to synchronize with each other, but not with Computer A.
 
 ## Synchronize settings across Visual Studio family products and editions
 
diff --git a/docs/msbuild/msbuild-conditions.md b/docs/msbuild/msbuild-conditions.md
@@ -31,7 +31,7 @@ ms.workload:
 |---------------|-----------------|  
 |'`stringA`' == '`stringB`'|Evaluates to `true` if `stringA` equals `stringB`.<br /><br /> For example:<br /><br /> `Condition="'$(CONFIG)'=='DEBUG'"`<br /><br /> Single quotes are not required for simple alphanumeric strings or boolean values. However, single quotes are required for empty values.|  
 |'`stringA`' != '`stringB`'|Evaluates to `true` if `stringA` is not equal to `stringB`.<br /><br /> For example:<br /><br /> `Condition="'$(CONFIG)'!='DEBUG'"`<br /><br /> Single quotes are not required for simple alphanumeric strings or boolean values. However, single quotes are required for empty values.|  
-|\<, >, \<=, >=|Evaluates the numeric values of the operands. Returns `true` if the relational evaluation is true. Operands must evaluate to a decimal or hexadecimal number. Hexadecimal numbers must begin with "0x". **Note:**  In XML, the characters `<` and `>` must be escaped. The symbol `<` is represented as `<`. The symbol `>` is represented as `>`.|  
+|\<, >, \<=, >=|Evaluates the numeric values of the operands. Returns `true` if the relational evaluation is true. Operands must evaluate to a decimal or hexadecimal number. Hexadecimal numbers must begin with "0x". **Note:**  In XML, the characters `<` and `>` must be escaped. The symbol `<` is represented as `&lt;`. The symbol `>` is represented as `&gt;`.|  
 |Exists('`stringA`')|Evaluates to `true` if a file or folder with the name `stringA` exists.<br /><br /> For example:<br /><br /> `Condition="!Exists('$(builtdir)')"`<br /><br /> Single quotes are not required for simple alphanumeric strings or boolean values. However, single quotes are required for empty values.|  
 |HasTrailingSlash('`stringA`')|Evaluates to `true` if the specified string contains either a trailing backward slash (\\) or forward slash (/) character.<br /><br /> For example:<br /><br /> `Condition="!HasTrailingSlash('$(OutputPath)')"`<br /><br /> Single quotes are not required for simple alphanumeric strings or boolean values. However, single quotes are required for empty values.|  
 |!|Evaluates to `true` if the operand evaluates to `false`.|  
@@ -43,4 +43,4 @@ ms.workload:
 ## See Also  
  [MSBuild Reference](../msbuild/msbuild-reference.md)   
  [Conditional Constructs](../msbuild/msbuild-conditional-constructs.md)   
- [Walkthrough: Creating an MSBuild Project File from Scratch](../msbuild/walkthrough-creating-an-msbuild-project-file-from-scratch.md)
+ [Walkthrough: Creating an MSBuild Project File from Scratch](../msbuild/walkthrough-creating-an-msbuild-project-file-from-scratch.md)
diff --git a/docs/python/cpp-and-python.md b/docs/python/cpp-and-python.md
diff --git a/docs/test/supported-configurations-and-platforms-for-coded-ui-tests-and-action-recordings.md b/docs/test/supported-configurations-and-platforms-for-coded-ui-tests-and-action-recordings.md

Original file line number	Diff line number	Diff line change
`@@ -7,10 +7,10 @@ public static class Calculator`
`7`	`7`	`public static int Decrement(int input)`
`8`	`8`	`{`
`9`	`9`	`if (input == int.MinValue)`
`10`		`- throw new ArgumentOutOfRangeException("input", "input must be greater than Int32.MinValue");`
	`10`	`+ throw new ArgumentOutOfRangeException(nameof(input), "input must be greater than Int32.MinValue");`
`11`	`11`
`12`	`12`	`input--;`
`13`	`13`	`return input;`
`14`	`14`	`}`
`15`	`15`	`}`
`16`		`-}`
	`16`	`+}`