Merge pull request #769 from MicrosoftDocs/master

merge to live

Author: TerryGLee

docs/code-quality/TOC.md

@@ -634,6 +634,7 @@
 ### [CA0503](ca0503.md)
 ### [CA0504](ca0504.md)
 ### [CA0505](ca0505.md)
+### [FxCopCmd Errors](fxcopcmd-errors.md)
 ## [Enhancing Code Quality with Team Project Check-in Policies](enhancing-code-quality-with-team-project-check-in-policies.md)
 ### [Creating and Using Code Analysis Check-In Policies](creating-and-using-code-analysis-check-in-policies.md)
 #### [How to: Create or Update Standard Code Analysis Check-in Policies](how-to-create-or-update-standard-code-analysis-check-in-policies.md)

docs/code-quality/ca0001.md

@@ -47,17 +47,13 @@ An exception was raised within managed code analysis tool that does not indicate
 
      For more diagnostic information, view the CodeAnalysisReport.xml in the \obj folder. The report lists the exception type, stack, type, message, and stack of all inner exceptions. A sample CodeAnalysisReport.xml report for the previous exception looks similar to the following:  
 
-     `<Exception Keyword="CA0001" Kind="Rule" TypeName="DoNotCallOverridableMethodsInConstructors" Category="Microsoft.Usage" CheckId="CA2214" Target="B..ctor()">`  
-  
-     `<Type>System.NullReferenceException</Type>`  
-  
-     `<ExceptionMessage>Object reference not set to an instance of an object.</ExceptionMessage>`  
-  
-     `<StackTrace>   at Microsoft.FxCop.Rules.Usage.DoNotCallOverridableMethodsInConstructors.CheckCallees(Method method, Boolean isCallVirt) in d:\rules\DoNotCallOverridableMethodsInConstructors.cs:line 107 at Microsoft.FxCop.Rules.Usage.DoNotCallOverridableMethodsInConstructors.CheckCallees(Method method, Boolean isCallVirt) in d:\rules\DoNotCallOverridableMethodsInConstructors.cs:line 128 at Microsoft.FxCop.Rules.Usage.DoNotCallOverridableMethodsInConstructors.Check(Member member) in d:\rules\DoNotCallOverridableMethodsInConstructors.cs:line 58 at Microsoft.FxCop.Engines.Introspection.AnalysisVisitor.CheckMember(Member member, NodeBase target) in d:\Engines\Introspection\AnalysisVisitor.cs:line 743</StackTrace>`  
-  
-     `</Exception>`  
-  
-     `</Exceptions>`  
+     ```
+     <Exception Keyword="CA0001" Kind="Rule" TypeName="DoNotCallOverridableMethodsInConstructors" Category="Microsoft.Usage" CheckId="CA2214" Target="B..ctor()">  
+       <Type>System.NullReferenceException</Type>  
+       <ExceptionMessage>Object reference not set to an instance of an object.</ExceptionMessage>  
+       <StackTrace>   at Microsoft.FxCop.Rules.Usage.DoNotCallOverridableMethodsInConstructors.CheckCallees(Method method, Boolean isCallVirt) in d:\rules\DoNotCallOverridableMethodsInConstructors.cs:line 107 at Microsoft.FxCop.Rules.Usage.DoNotCallOverridableMethodsInConstructors.CheckCallees(Method method, Boolean isCallVirt) in d:\rules\DoNotCallOverridableMethodsInConstructors.cs:line 128 at Microsoft.FxCop.Rules.Usage.DoNotCallOverridableMethodsInConstructors.Check(Member member) in d:\rules\DoNotCallOverridableMethodsInConstructors.cs:line 58 at Microsoft.FxCop.Engines.Introspection.AnalysisVisitor.CheckMember(Member member, NodeBase target) in d:\Engines\Introspection\AnalysisVisitor.cs:line 743</StackTrace>  
+     </Exception>  
+     ```  
   
      In the previous report, an exception occurred at line 107 of DoNotCallOverridableMethodsInConstructors.cs file. All other stack traces show the execution path that lead to the exception.  
   

docs/code-quality/ca0054.md

@@ -38,29 +38,20 @@ Custom rule assembly has invalid XML resources
 
  This occurs if a custom rule assembly has invalid XML resources describing its rules. The correct format is as follows:  
 
- `<Rules FriendlyName="Customer Rules">`  
-  
- `<Rule TypeName="[The unqualified type name of the rule]" Category="[A category name such as Customer.Usage]" CheckId="[An identifier for the rule that is at least unique within the same category]">`  
-  
- `<Name>[Localized version of the type name, this is the rule name that appears in the UI]</Name>`  
-  
- `<Description>[A sentence describing the rule in more detail than the name].</Description>`  
-  
- `<Url>[A URL pointing to a documentation or info about the rule]</Url>`  
-  
- `<Resolution>[Format string for rule messages].</Resolution>`  
-  
- `<Email>[Email Address]</Email>`  
-  
- `<MessageLevel Certainty="[A number from 0 to 100]">[Error or Warning]</MessageLevel>`  
-  
- `<FixCategories>[NonBreaking or Breaking]</FixCategories>`  
-  
- `<Owner>[Rule owner name or group]</Owner>`  
-  
- `</Rule>`  
-  
- `</Rules>`  
+ ```xml
+ <Rules FriendlyName="Customer Rules">  
+   <Rule TypeName="[The unqualified type name of the rule]" Category="[A category name such as Customer.Usage]" CheckId="[An identifier for the rule that is at least unique within the same category]">  
+     <Name>[Localized version of the type name, this is the rule name that appears in the UI]</Name>  
+     <Description>[A sentence describing the rule in more detail than the name].</Description>  
+     <Url>[A URL pointing to a documentation or info about the rule]</Url>  
+     <Resolution>[Format string for rule messages].</Resolution>  
+     <Email>[Email Address]</Email>  
+     <MessageLevel Certainty="[A number from 0 to 100]">[Error or Warning]</MessageLevel>  
+     <FixCategories>[NonBreaking or Breaking]</FixCategories>  
+     <Owner>[Rule owner name or group]</Owner>  
+   </Rule>  
+ </Rules>  
+ ```
 
 ## See Also  
  [Code Analysis Application Errors](../code-quality/code-analysis-application-errors.md)   

docs/code-quality/ca1009-declare-event-handlers-correctly.md

@@ -69,4 +69,4 @@ translation.priority.ht:
 ## See Also  
  <xref:System.EventArgs?displayProperty=fullName>   
  <xref:System.Object?displayProperty=fullName>   
- [NIB: Events and Delegates](http://msdn.microsoft.com/en-us/d98fd58b-fa4f-4598-8378-addf4355a115)
+ [Handling and raising events](/dotnet/standard/events/index)  

docs/code-quality/ca1304-specify-cultureinfo.md

@@ -89,4 +89,4 @@ translation.priority.mt:
  [CA1305: Specify IFormatProvider](../code-quality/ca1305-specify-iformatprovider.md)  
 
 ## See Also  
- [NIB: Using the CultureInfo Class](http://msdn.microsoft.com/en-us/d4329e34-64c3-4d1e-8c73-5b0ee626ba7a)
+[Using the CultureInfo Class](/dotnet/standard/globalization-localization/globalization#Cultures)  

docs/code-quality/ca1305-specify-iformatprovider.md

@@ -89,4 +89,4 @@ translation.priority.mt:
  [CA1304: Specify CultureInfo](../code-quality/ca1304-specify-cultureinfo.md)  
 
 ## See Also  
- [NIB: Using the CultureInfo Class](http://msdn.microsoft.com/en-us/d4329e34-64c3-4d1e-8c73-5b0ee626ba7a)
+[Using the CultureInfo Class](/dotnet/standard/globalization-localization/globalization#Cultures)  

docs/code-quality/ca1710-identifiers-should-have-correct-suffix.md

@@ -105,4 +105,4 @@ foreach(SomeType x in SomeDictionary.Values) { }
 
 ## See Also  
  [Attributes](/dotnet/standard/design-guidelines/attributes)   
- [NIB: Events and Delegates](http://msdn.microsoft.com/en-us/d98fd58b-fa4f-4598-8378-addf4355a115)
+ [Handling and raising events](/dotnet/standard/events/index)  

docs/code-quality/ca1711-identifiers-should-not-have-incorrect-suffix.md

@@ -86,4 +86,4 @@ translation.priority.ht:
 
 ## See Also  
  [Attributes](/dotnet/standard/design-guidelines/attributes)   
- [NIB: Events and Delegates](http://msdn.microsoft.com/en-us/d98fd58b-fa4f-4598-8378-addf4355a115)
+ [Handling and raising events](/dotnet/standard/events/index)  

docs/code-quality/code-analysis-application-errors.md

@@ -68,10 +68,11 @@ This section is a reference of the error messages that are generated by the mana
 |[CA0504](ca0504.md)|Rule directory was ignored because it does not exist|  
 |[CA0505](ca0505.md)|The property is deprecated. Use the superceding property|  
 |[FxCopCmd Errors](fxcopcmd-errors.md)|Managed code analysis errors.|  
-|[Code Analysis Policy Errors](../code-quality/code-analysis-policy-errors.md)|Code analysis check in policy errors.|  
 
 ## Related Sections  
  [Guidelines for Writing Secure Code](http://msdn.microsoft.com/en-us/9892fd19-45cd-44b6-9fa8-10f1b5cb6ea4)  
+
+ [Code Analysis Policy Errors](../code-quality/code-analysis-policy-errors.md)  
 
  [Analyzing Managed Code Quality](../code-quality/analyzing-managed-code-quality-by-using-code-analysis.md)  
 

docs/cross-platform/change-log-visual-studio-tools-for-unity.md

@@ -32,6 +32,37 @@ translation.priority.mt:
 # Change Log (Visual Studio Tools for Unity)
 Visual Studio Tools for Unity change log.  
 
+## 3.4.0.2
+ Released 2017-09-19
+
+### New Features  
+
+-   **Project Generation:**  
+
+    -   Added support for assembly.json compilation units.
+
+    -   Stopped copying Unity assemblies to the project folder.
+    
+-   **Debugger:**  
+
+    -   Added support for setting the next statement with the new Unity runtime.
+    
+    -   Added support for Decimal type with the new Unity runtime.
+    
+    -   Added support for implicit/explicit conversions.
+    
+### Bug fixes  
+  
+-   **Evaluation:**  
+
+    -   Fixed array creation with implicit size.
+    
+    -   Fixed compiler generated items with locals.
+   
+-   **Project Generation:**  
+   
+    -   Fixed reference to Microsoft.CSharp for 4.6 API level.
+
 ## 3.3.0.2
  Released 2017-08-15
 

docs/cross-platform/media/cross-plat-xamarin-setup-2a.png

@@ -8,7 +8,7 @@
 ### [How to: Save and Edit Connection Strings](how-to-save-and-edit-connection-strings.md)
 ### [Connect to data in an Access database (Windows Forms)](connect-to-data-in-an-access-database-windows-forms.md)
 ## [Add new data sources](add-new-data-sources.md)
-## [Entity Data Model Tools in Visual Studio](entity-data-model-tools-in-visual-studio.md)
+## [Entity Framework Tools in Visual Studio](entity-data-model-tools-in-visual-studio.md)
 ## [Dataset tools in Visual Studio](dataset-tools-in-visual-studio.md)
 ### [Create and configure datasets in Visual Studio](create-and-configure-datasets-in-visual-studio.md)
 #### [Typed vs. untyped datasets](typed-vs-untyped-datasets.md)

docs/data-tools/TOC.md

@@ -96,7 +96,7 @@ The **Configure Service Reference** dialog box enables you to configure the beha
  Contains a list of referenced assemblies for the project or Web site. When **Reuse types in specified referenced assemblies** is selected, individual assemblies can be selected or cleared.  
 
  **Add Web Reference**  
- Displays the [NIB: Add Web Reference Dialog Box](http://msdn.microsoft.com/en-us/bdf05776-c591-40af-bfd7-e1e2aa1e87b5).  
+ Displays the [Add Web Reference Dialog Box](https://msdn.microsoft.com/en-us/library/8dcbc50t(v=vs.100).aspx).  
 
 > [!NOTE]
 >  This option should be used only for projects that target version 2.0 of the [!INCLUDE[dnprdnshort](../code-quality/includes/dnprdnshort_md.md)].  

docs/data-tools/configure-service-reference-dialog-box.md

@@ -1,7 +1,7 @@
 ---
 title: "Connect to data in an Access database (Windows Forms) | Microsoft Docs"
 ms.custom: ""
-ms.date: "11/04/2016"
+ms.date: "09/15/2017"
 ms.reviewer: ""
 ms.suite: ""
 ms.tgt_pltfrm: ""
@@ -50,32 +50,35 @@ You can connect to an Access database (either an .mdf file or an .accdb file) by
      ![View Other Windows Data Sources](../data-tools/media/viewdatasources.png "ViewDataSources")  
 
 3.  In the **Data Sources** window, click **Add New Data Source**.  
-  
-     ![Add New Data Source](../data-tools/media/dataaddnewdatasource.png "dataAddNewDataSource")  
+
+     The **Data Source Configuration Wizard** opens.  
 
 4.  Select **Database** on the **Choose a Data Source Type** page, and then select **Next**.  
 
 5.  Select **Dataset** on the **Choose a Database Model** page, and then select **Next**.  
 
 6.  On the **Choose your Data Connection** page, select **New Connection** to configure a new data connection.  
+
+     The **Add Connection** dialog box opens.  
 
-7.  Change the **Data source** to **.NET Framework Data Provider for OLE DB**.  
-  
-     ![Change Data Provider to OLE DB](../data-tools/media/datachangedatasourceoledb.png "dataChangeDataSourceOLEDB")  
-  
-    > [!IMPORTANT]
-    >  Although a data source of **Microsoft Access Database File (OLE DB)** might seem like the right choice, you use that data-source type only for .mdb database files.  
+7.  Select the **Change** button next to the **Data source** text box.
+
+     The **Change Data Source** dialog box opens.  
 
-8.  In **OLE DB Provider**, select **Microsoft Office 12.0 Access Database Engine OLE DB Provider**.  
+8.  In the list of data sources, choose **\<other\>**. In the **Data provider** drop-down, select **.NET Framework Data Provider for OLE DB**, then choose **OK**.  
+
+9. Back in the **Add Connection** dialog box, select **Microsoft Office 12.0 Access Database Engine OLE DB Provider** from the **OLE DB Provider** drop-down.  
 
      ![OLE DB Provider Microsoft Office 12.0 Access](../data-tools/media/dataoledbprovideroffice12access.png "dataOLEDBProviderOffice12Access")  
+
+     > [!NOTE]
+     >  If you don't see **Microsoft Office 12.0 Access Database Engine OLE DB Provider** in the OLE DB provider drop-down, you may need to install the [2007 Office System Driver: Data Connectivity Components](https://www.microsoft.com/download/confirmation.aspx?id=23734).
   
-9. In **Server or file name**, specify the path and name of the .accdb file to which you want to connect, and then select **OK**.  
-  
-    > [!NOTE]
-    >  If the database file has a user name and password, specify them before you select **OK**.  
+9. In the **Server or file name** text box, specify the path and file name of the .accdb file you want to connect to, and then select **OK**. (If the database file has a user name and password, specify them before you select **OK**.)    
 
 10. Select **Next** on the **Choose your Data Connection** page.  
+
+     You may get a dialog box telling you the data file is not in your current project. Select **Yes** or **No**.
 
 11. Select **Next** on the **Save connection string to the Application Configuration file** page.  
 
@@ -97,6 +100,8 @@ You can connect to an Access database (either an .mdf file or an .accdb file) by
      ![View Other Windows Data Sources](../data-tools/media/viewdatasources.png "ViewDataSources")  
 
 3.  In the **Data Sources** window, click **Add New Data Source**.  
+
+     The **Data Source Configuration Wizard** opens.
 
 4.  Select **Database** on the **Choose a Data Source Type** page, and then select **Next**.  
 
@@ -106,7 +111,7 @@ You can connect to an Access database (either an .mdf file or an .accdb file) by
 
 7.  If the data source is not **Microsoft Access Database File (OLE DB)**, select **Change** to open the **Change Data Source** dialog box and select **Microsoft Access Database File**, and then select **OK**.  
 
-8.  In the **Database file name**, specify the path and name of the .mdb file to which you want to connect, and then select **OK**.  
+8.  In the **Database file name**, specify the path and name of the .mdb file you want to connect to, and then select **OK**.  
 
      ![Add Connection Access Database File](../data-tools/media/dataaddconnectionaccessmdb.png "dataAddConnectionAccessMDB")