Merge pull request #1353 from MicrosoftDocs/master

1/30 AM Publish

Author: Taojunshen

docs/code-quality/ca1036-override-methods-on-comparable-types.md

@@ -50,7 +50,7 @@ ms.workload:
  In C#, the tokens that are used to represent these operators are as follows: ==, !=, \<, and >.  
 
 ## When to Suppress Warnings  
- It is safe to suppress a warning from this rule when the violation is caused by missing operators and your programming language does not support operator overloading, as is the case with Visual Basic .NET. It is also safe to suppress a warning for from this rule when it fires on equality operators other than op_Equality if you determine that implementing the operators does not make sense in your application context. However, you should always over op_Equality and the == operator if you override Object.Equals.  
+ It is safe to suppress a warning from this rule when the violation is caused by missing operators and your programming language does not support operator overloading, as is the case with Visual Basic. It is also safe to suppress a warning for from this rule when it fires on equality operators other than op_Equality if you determine that implementing the operators does not make sense in your application context. However, you should always over op_Equality and the == operator if you override Object.Equals.  
 
 ## Example  
  The following example contains a type that correctly implements <xref:System.IComparable>. Code comments identify the methods that satisfy various rules that are related to <xref:System.Object.Equals%2A> and the <xref:System.IComparable> interface.  

docs/code-quality/ca1048-do-not-declare-virtual-members-in-sealed-types.md

@@ -36,7 +36,7 @@ ms.workload:
 ## Rule Description  
  Types declare methods as virtual so that inheriting types can override the implementation of the virtual method. By definition, you cannot inherit from a sealed type, making a virtual method on a sealed type meaningless.  
 
- The Visual Basic .NET and C# compilers do not allow types to violate this rule.  
+ The Visual Basic and C# compilers do not allow types to violate this rule.  
 
 ## How to Fix Violations  
  To fix a violation of this rule, make the method non-virtual or make the type inheritable.  

docs/code-quality/ca2121-static-constructors-should-be-private.md

@@ -36,7 +36,7 @@ ms.workload:
 ## Rule Description  
  A static constructor, also known as a class constructor, is used to initialize a type. The system calls the static constructor before the first instance of the type is created or any static members are referenced. The user has no control over when the static constructor is called. If a static constructor is not private, it can be called by code other than the system. Depending on the operations that are performed in the constructor, this can cause unexpected behavior.  
 
- This rule is enforced by the C# and Visual Basic .NET compilers.  
+ This rule is enforced by the C# and Visual Basic compilers.  
 
 ## How to Fix Violations  
  Violations are typically caused by one of the following actions:  

docs/code-quality/ca2223-members-should-differ-by-more-than-return-type.md

@@ -43,7 +43,7 @@ ms.workload:
  Do not suppress a warning from this rule.  
 
 ## Example  
- The following example, in Microsoft intermediate language (MSIL), shows a type that violates this rule. Notice that this rule cannot be violated by using C# or Visual Basic .NET.  
+ The following example, in Microsoft intermediate language (MSIL), shows a type that violates this rule. Notice that this rule cannot be violated by using C# or Visual Basic.  
 
 ```  
   

docs/code-quality/enhancing-code-quality-with-team-project-check-in-policies.md

@@ -45,7 +45,7 @@ You can specify these team project check-in policies:
 |Task|Supporting Content|
 |----------|------------------------|
 |**Use Code Analysis in development process:** Team members run code analysis on their development computers. In Visual Studio, developers configure and run code analysis runs for individual code projects, view and analyze issues found by the runs, and create work items for warnings.|[Analyzing Application Quality](../code-quality/analyzing-application-quality-by-using-code-analysis-tools.md)|
-|**Create and run unit tests:** Unit tests give developers and testers a quick way to look for logic errors in the methods of classes in C#, Visual Basic .NET, and C++ projects. A unit test can be created one time and run every time that source code is changed to make sure that no bugs are introduced.|[Unit Test Your Code](../test/unit-test-your-code.md)|
+|**Create and run unit tests:** Unit tests give developers and testers a quick way to look for logic errors in the methods of classes in C#, Visual Basic, and C++ projects. A unit test can be created one time and run every time that source code is changed to make sure that no bugs are introduced.|[Unit Test Your Code](../test/unit-test-your-code.md)|
 |**Track work items and defects:** You can use work items to track and manage both your work and information about your team project. A work item is a database record that [!INCLUDE[esprfound](../code-quality/includes/esprfound_md.md)] uses to track the assignment and progress of work. You can use different types of work items to track different types of work, such as customer requirements, product bugs, and development tasks.|[Work items (VSTS)](/vsts/work/work-items/index)|
 
 ## External resources

docs/cross-platform/visual-studio-emulator-for-android.md

@@ -24,7 +24,9 @@ The Visual Studio Emulator for Android is a desktop application that emulates an
  You can test your app on a unique device profile for each of the Android platforms, screen resolutions, and other hardware properties supported by Visual Studio Emulator for Android.
 
 > [!NOTE]
-> The Google Android emulator is recommended for use with the Visual Studio Tools for Apache Cordova. For more information, see [Run your Apache Cordova app on Android](/visualstudio/cross-platform/tools-for-cordova/run-your-app/run-app-android#a-idgoogle-android-emulatora-run-on-the-google-android-emulator).
+> The Google Android emulator is recommended for use in the following cases:
+> - When using Visual Studio Tools for Apache Cordova. For more information, see [Run your Apache Cordova app on Android](/visualstudio/cross-platform/tools-for-cordova/run-your-app/run-app-android#a-idgoogle-android-emulatora-run-on-the-google-android-emulator).
+> - When in need of emulator images containing Android 7.0 or later as there are no plans to publish Android images past version 6.0 for use in Visual Studio Emulator for Android.
   
 ##  <a name="Installing"></a> Installing and uninstalling  
  Installing  
@@ -76,7 +78,7 @@ The Visual Studio Emulator for Android is a desktop application that emulates an
  Once you've installed the set of profiles that you'd like to target, you can start these new profiles directly from the manager by pressing the green **Play** button. They will also appear in the debug target dropdown menu in any Visual Studio cross-platform mobile project type.  
 
 ##  <a name="FeaturesTest"></a> Features that you can test in the emulator  
- For detailed information on features you can test in the emulator, see this [documentation](http://blogs.msdn.com/b/visualstudioalm/archive/2014/11/12/introducing-visual-studio-s-emulator-for-android.aspx).  
+ For detailed information on features you can test in the emulator, see this [blog post](http://blogs.msdn.com/b/visualstudioalm/archive/2014/11/12/introducing-visual-studio-s-emulator-for-android.aspx).  
 
 ##  <a name="FeaturesNonTest"></a> Features that you can't test in the emulator  
  The following list describes features of the Android platform that you **cannot** test in the emulator. You have to test these features on a physical device.  
@@ -98,4 +100,4 @@ The Visual Studio Emulator for Android is a desktop application that emulates an
 
 ## See Also  
  [System Requirements for the Visual Studio Emulator for Android](../cross-platform/system-requirements-for-the-visual-studio-emulator-for-android.md)   
- [Troubleshooting the Visual Studio Emulator for Android](../cross-platform/troubleshooting-the-visual-studio-emulator-for-android.md)
+ [Troubleshooting the Visual Studio Emulator for Android](../cross-platform/troubleshooting-the-visual-studio-emulator-for-android.md)

docs/debugger/map-methods-on-the-call-stack-while-debugging-in-visual-studio.md

@@ -44,7 +44,7 @@ Create a code map to visually trace the call stack while you're debugging. You c
 
 -   [Visual Studio Enterprise](https://www.visualstudio.com/downloads/download-visual-studio-vs)  
 
--   Code that you can debug, such as Visual C# .NET, Visual Basic .NET, C++, JavaScript, or X++  
+-   Code that you can debug, such as Visual C#, Visual Basic, C++, JavaScript, or X++  
 
 Here's a quick look at a code map:
 
@@ -93,7 +93,7 @@ Here's a quick look at a code map:
  ![Update code map with next call stack](../debugger/media/debuggermap_addclearcallstack.png "DebuggerMap_AddClearCallStack")  
 
 ##  <a name="AddRelatedCode"></a> Add related code to the map  
- Now you've got a map - what next? If you're working with Visual C# .NET or Visual Basic .NET, add items, such as fields, properties, and other methods, to track what's happening in the code.  
+ Now you've got a map - what next? If you're working with Visual C# or Visual Basic, add items, such as fields, properties, and other methods, to track what's happening in the code.  
 
  Double-click a method to see its code definition, or use the shortcut menu for the method. (Keyboard: Select the method on the map and press **F12**)