dotnet · mairaw · May 25, 2018 · May 24, 2018 · May 24, 2018 · May 24, 2018
diff --git a/.gitignore b/.gitignore
@@ -26,4 +26,12 @@ _dependentPackages/
 !/xml/System.Net.Cache/
 
 # Visual Studio Code
-.vscode
+.vscode
+
+# Windows thumbnail cache files
+Thumbs.db
+ehthumbs.db
+ehthumbs_vista.db
+
+# Windows shortcuts
+*.lnk
diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json
@@ -1236,67 +1236,67 @@
         },
         {
             "source_path": "docs/standard/modernize-with-azure-and-containers/lift-and-shift-existing-apps-devops/index.md",
-            "redirect_url": "/docs/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/index"
+            "redirect_url": "/dotnet/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/index"
         },
         {
             "source_path": "docs/standard/modernize-with-azure-and-containers/lift-and-shift-existing-apps-devops/reasons-to-lift-and-shift-existing-net-apps-to-cloud-devops-ready-applications.md",
-            "redirect_url": "/docs/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/reasons-to-modernize-existing-net-apps-to-cloud-optimized-applications"
+            "redirect_url": "/dotnet/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/reasons-to-modernize-existing-net-apps-to-cloud-optimized-applications"
         },
         {
             "source_path": "docs/standard/modernize-with-azure-and-containerslift-and-shift-existing-apps-devops/microsoft-technologies-in-cloud-devops-ready-applications.md",
-            "redirect_url": "/docs/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/microsoft-technologies-in-cloud-optimized-applications"
+            "redirect_url": "/dotnet/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/microsoft-technologies-in-cloud-optimized-applications"
         },
         {
             "source_path": "docs/standard/modernize-with-azure-and-containers/lift-and-shift-existing-apps-devops/what-about-cloud-optimized-applications.md",
-            "redirect_url": "/docs/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/what-about-cloud-native-applications"
+            "redirect_url": "/dotnet/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/what-about-cloud-native-applications"
         },
         {
             "source_path": "docs/standard/modernize-with-azure-and-containers/lift-and-shift-existing-apps-devops/deploy-existing-net-apps-as-windows-containers.md",
-            "redirect_url": "/docs/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/deploy-existing-net-apps-as-windows-containers"
+            "redirect_url": "/dotnet/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/deploy-existing-net-apps-as-windows-containers"
         },
         {   
             "source_path": "docs/standard/modernize-with-azure-and-containers/lift-and-shift-existing-apps-devops/when-not-to-deploy-to-windows-containers.md",
-            "redirect_url": "/docs/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/when-not-to-deploy-to-windows-containers"
+            "redirect_url": "/dotnet/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/when-not-to-deploy-to-windows-containers"
         },
         {
             "source_path": "docs/standard/modernize-with-azure-and-containers/lift-and-shift-existing-apps-devops/when-to-deploy-windows-containers-in-your-on-premises-iaas-vm-infrastructure.md",
-            "redirect_url": "/docs/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/when-to-deploy-windows-containers-in-your-on-premises-iaas-vm-infrastructure"
+            "redirect_url": "/dotnet/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/when-to-deploy-windows-containers-in-your-on-premises-iaas-vm-infrastructure"
         },
         {
             "source_path": "docs/standard/modernize-with-azure-and-containers/lift-and-shift-existing-apps-devops/when-to-deploy-windows-containers-to-azure-vms-iaas-cloud.md",
-            "redirect_url": "/docs/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/when-to-deploy-windows-containers-to-azure-vms-iaas-cloud"
+            "redirect_url": "/dotnet/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/when-to-deploy-windows-containers-to-azure-vms-iaas-cloud"
         },
         {
             "source_path": "docs/standard/modernize-with-azure-and-containers/lift-and-shift-existing-apps-devops/how-to-deploy-existing-net-apps-to-azure-app-service.md",
-            "redirect_url": "/docs/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/when-to-deploy-windows-containers-to-azure-container-instances-ACI"
+            "redirect_url": "/dotnet/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/when-to-deploy-windows-containers-to-azure-container-instances-ACI"
         },
         {
             "source_path": "docs/standard/modernize-with-azure-and-containers/lift-and-shift-existing-apps-devops/when-to-deploy-windows-containers-to-service-fabric.md",
-            "redirect_url": "/docs/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/when-to-deploy-windows-containers-to-service-fabric"
+            "redirect_url": "/dotnet/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/when-to-deploy-windows-containers-to-service-fabric"
         },
         {
             "source_path": "docs/standard/modernize-with-azure-and-containers/lift-and-shift-existing-apps-devops/when-to-deploy-windows-containers-to-azure-container-service-kubernetes.md",
-            "redirect_url": "/docs/standard/modernize-with-azure-and-containers//modernize-existing-apps-to-cloud-optimized/when-to-deploy-windows-containers-to-azure-container-service-kubernetes"
+            "redirect_url": "/dotnet/standard/modernize-with-azure-and-containers//modernize-existing-apps-to-cloud-optimized/when-to-deploy-windows-containers-to-azure-container-service-kubernetes"
         },
         {
             "source_path": "docs/standard/modernize-with-azure-and-containers/lift-and-shift-existing-apps-devops/build-resilient-services-ready-for-the-cloud-embrace-transient-failures-in-the-cloud.md",
-            "redirect_url": "/docs/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/build-resilient-services-ready-for-the-cloud-embrace-transient-failures-in-the-cloud"
+            "redirect_url": "/dotnet/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/build-resilient-services-ready-for-the-cloud-embrace-transient-failures-in-the-cloud"
         },
         {
             "source_path": "docs/standard/modernize-with-azure-and-containers/lift-and-shift-existing-apps-devops/modernize-your-apps-with-monitoring-and-telemetry.md",
-            "redirect_url": "/docs/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/modernize-your-apps-with-monitoring-and-telemetry"
+            "redirect_url": "/dotnet/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/modernize-your-apps-with-monitoring-and-telemetry"
         },
         {
             "source_path": "docs/standard/modernize-with-azure-and-containers/lift-and-shift-existing-apps-devops/modernize-your-apps-lifecycle-with-ci-cd-pipelines-and-devops-tools-in-the-cloud.md",
-            "redirect_url": "/docs/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/modernize-your-apps-lifecycle-with-ci-cd-pipelines-and-devops-tools-in-the-cloud"
+            "redirect_url": "/dotnet/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/modernize-your-apps-lifecycle-with-ci-cd-pipelines-and-devops-tools-in-the-cloud"
         },
         {
             "source_path": "docs/standard/modernize-with-azure-and-containers/lift-and-shift-existing-apps-devops/migrate-to-hybrid-cloud-scenarios.md",
-            "redirect_url": "/docs/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/migrate-to-hybrid-cloud-scenarios"
+            "redirect_url": "/dotnet/standard/modernize-with-azure-and-containers/modernize-existing-apps-to-cloud-optimized/migrate-to-hybrid-cloud-scenarios"
         },
         {
             "source_path":"docs/csharp/language-reference/operators/null-conditional-operator.md",
-            "redirect_url":"/docs/csharp/language-reference/operators/null-coalescing-operator"
+            "redirect_url":"/dotnet/csharp/language-reference/operators/null-coalescing-operator"
         }
     ]
 }
diff --git a/docs/core/linux-prerequisites.md b/docs/core/linux-prerequisites.md
@@ -60,30 +60,37 @@ The following are intended to be examples. The exact versions and names may vary
 
 Ubuntu distributions require the following libraries installed:
 
-* libunwind8
 * liblttng-ust0
 * libcurl3
 * libssl1.0.0
-* libuuid1
 * libkrb5-3
 * zlib1g
 * libicu52 (for 14.x)
 * libicu55 (for 16.x)
 * libicu57 (for 17.x)
+* libicu60 (for 18.x)
+
+For versions earlier than .NET Core 2.1, following dependencies are also required:
+
+* libunwind8
+* libuuid1
 
 ### CentOS
 
 CentOS distributions require the following libraries installed:
 
-* libunwind
 * lttng-ust
 * libcurl
 * openssl-libs
-* libuuid
 * krb5-libs
 * libicu
 * zlib
 
+For versions earlier than .NET Core 2.1, following dependencies are also required:
+
+* libunwind
+* libuuid
+
 For more information about the dependencies, see [Self-contained Linux applications](https://github.com/dotnet/core/blob/master/Documentation/self-contained-linux-apps.md).
 
 ## Installing .NET Core dependencies with the native installers
@@ -428,4 +435,4 @@ To install .NET Core 2.x for supported SUSE Linux Enterprise Server and OpenSUSE
 > * [.NET Core 2.1 known issues](https://github.com/dotnet/core/tree/master/release-notes/2.1)
 > * [.NET Core 2.0 known issues](https://github.com/dotnet/core/tree/master/release-notes/2.0)
 > * [.NET Core 1.1 known issues](https://github.com/dotnet/core/blob/master/release-notes/1.1)
-> * [.NET Core 1.0 known issues](https://github.com/dotnet/core/blob/master/release-notes/1.0)
+> * [.NET Core 1.0 known issues](https://github.com/dotnet/core/blob/master/release-notes/1.0)
diff --git a/docs/core/tutorials/media/consuming-library-with-visual-studio/addnewproject.png b/docs/core/tutorials/media/consuming-library-with-visual-studio/addnewproject.png
diff --git a/.../core/tutorials/media/consuming-library-with-visual-studio/vb-addnewproject.png b/.../core/tutorials/media/consuming-library-with-visual-studio/vb-addnewproject.png
diff --git a/docs/core/tutorials/media/library-with-visual-studio/libproject.png b/docs/core/tutorials/media/library-with-visual-studio/libproject.png
diff --git a/docs/core/tutorials/media/library-with-visual-studio/newproject.png b/docs/core/tutorials/media/library-with-visual-studio/newproject.png
diff --git a/docs/core/tutorials/media/testing-library-with-visual-studio/testproject.png b/docs/core/tutorials/media/testing-library-with-visual-studio/testproject.png
diff --git a/docs/core/tutorials/media/testing-library-with-visual-studio/vb-testproject.png b/docs/core/tutorials/media/testing-library-with-visual-studio/vb-testproject.png
diff --git a/docs/core/tutorials/media/vb-library-with-visual-studio/Thumbs.db b/docs/core/tutorials/media/vb-library-with-visual-studio/Thumbs.db
diff --git a/docs/core/tutorials/media/vb-library-with-visual-studio/libproject.png b/docs/core/tutorials/media/vb-library-with-visual-studio/libproject.png
diff --git a/docs/core/tutorials/media/vb-with-visual-studio/new-project.png b/docs/core/tutorials/media/vb-with-visual-studio/new-project.png
diff --git a/docs/core/tutorials/media/with-visual-studio/newproject.png b/docs/core/tutorials/media/with-visual-studio/newproject.png
diff --git a/docs/core/tutorials/testing-library-with-visual-studio.md b/docs/core/tutorials/testing-library-with-visual-studio.md
@@ -19,12 +19,12 @@ To create the unit test project, do the following:
 # [C#](#tab/csharp)
 1. In **Solution Explorer**, open the context menu for the **ClassLibraryProjects** solution node and select **Add** > **New Project**.
 
-1. In the **Add New Project** dialog, select the **Visual C#** node. Then select the **.NET Core** node followed by the **Unit Test Project (.NET Core)** project template. In the **Name** text box, enter "StringLibraryTest" as the name of the project. Select **OK** to create the unit test project.
+1. In the **Add New Project** dialog, select the **Visual C#** node. Then select the **.NET Core** node followed by the **MSTest Test Project (.NET Core)** project template. In the **Name** text box, enter "StringLibraryTest" as the name of the project. Select **OK** to create the unit test project.
 
    ![Add New Project dialog](./media/testing-library-with-visual-studio/testproject.png)
 
    > [!NOTE]  
-   > In addition to a Unit Test project, you can also use Visual Studio to create an xUnit test project for .NET Core.
+   > In addition to an MSTest Test project, you can also use Visual Studio to create an xUnit test project for .NET Core.
 
 1. Visual Studio creates the project and opens the *UnitTest1.cs* file in the code window.
 
@@ -48,12 +48,12 @@ To create the unit test project, do the following:
 # [Visual Basic](#tab/visual-basic) 
 1. In **Solution Explorer**, open the context menu for the **ClassLibraryProjects** solution node and select **Add** > **New Project**.
 
-1. In the **Add New Project** dialog, select the **Visual Basic** node. Then select the **.NET Core** node followed by the **Unit Test Project (.NET Core)** project template. In the **Name** text box, enter "StringLibraryTest" as the name of the project. Select **OK** to create the unit test project.
+1. In the **Add New Project** dialog, select the **Visual Basic** node. Then select the **.NET Core** node followed by the **MSTest Test Project (.NET Core)** project template. In the **Name** text box, enter "StringLibraryTest" as the name of the project. Select **OK** to create the unit test project.
 
    ![Add New Project dialog](./media/testing-library-with-visual-studio/vb-testproject.png)
 
    > [!NOTE]  
-   > In addition to a Unit Test project, you can also use Visual Studio to create an xUnit test project for .NET Core.
+   > In addition to an MSTest Test project, you can also use Visual Studio to create an xUnit test project for .NET Core.
 
 1. Visual Studio creates the project and opens the *UnitTest1.vb* file in the code window.
 

diff --git a/docs/csharp/tutorials/media/book-class.jpg b/docs/csharp/tutorials/media/book-class.jpg
diff --git a/docs/csharp/whats-new/csharp-6.md b/docs/csharp/whats-new/csharp-6.md
@@ -508,12 +508,12 @@ if any, is lost.
 ## Index Initializers
 
 *Index Initializers* is one of two features that make collection
-initializers more consistent. In earlier releases of C#, you could use
-*collection initializers* only with sequence style collections:
+initializers more consistent with index usage. In earlier releases of C#, you could use
+*collection initializers* only with sequence style collections, including <xref:System.Collections.Generic.Dictionary%602> by adding braces around key and value pairs:
 
 [!code-csharp[ListInitializer](../../../samples/snippets/csharp/new-in-6/initializers.cs#ListInitializer)]
 
-Now, you can also use them with <xref:System.Collections.Generic.Dictionary%602> collections and similar types:
+Now, you can use them with <xref:System.Collections.Generic.Dictionary%602> collections and similar types. The new syntax supports assignment using an index into the collection:
 
 [!code-csharp[DictionaryInitializer](../../../samples/snippets/csharp/new-in-6/initializers.cs#DictionaryInitializer)]
 

diff --git a/docs/framework/wcf/extending/client-channel-factories-and-channels.md b/docs/framework/wcf/extending/client-channel-factories-and-channels.md
@@ -18,11 +18,11 @@ A channel factory creates channels.
 
 -   The <xref:System.ServiceModel.Channels.CommunicationObject> class implements <xref:System.ServiceModel.ICommunicationObject> and enforces the state machine described in step 2 of [Developing Channels](../../../../docs/framework/wcf/extending/developing-channels.md).  
 
--   The``<xref:System.ServiceModel.Channels.ChannelManagerBase> class implements <xref:System.ServiceModel.Channels.CommunicationObject> and provides a unified base class for <xref:System.ServiceModel.Channels.ChannelFactoryBase?displayProperty=nameWithType> and <xref:System.ServiceModel.Channels.ChannelListenerBase?displayProperty=nameWithType>. The <xref:System.ServiceModel.Channels.ChannelManagerBase> class works in conjunction with <xref:System.ServiceModel.Channels.ChannelBase>, which is a base class that implements <xref:System.ServiceModel.Channels.IChannel>.  
+-   The <xref:System.ServiceModel.Channels.ChannelManagerBase> class implements <xref:System.ServiceModel.Channels.CommunicationObject> and provides a unified base class for <xref:System.ServiceModel.Channels.ChannelFactoryBase?displayProperty=nameWithType> and <xref:System.ServiceModel.Channels.ChannelListenerBase?displayProperty=nameWithType>. The <xref:System.ServiceModel.Channels.ChannelManagerBase> class works in conjunction with <xref:System.ServiceModel.Channels.ChannelBase>, which is a base class that implements <xref:System.ServiceModel.Channels.IChannel>.
 
--   The``<xref:System.ServiceModel.Channels.ChannelFactoryBase> class implements <xref:System.ServiceModel.Channels.ChannelManagerBase> and <xref:System.ServiceModel.Channels.IChannelFactory> and consolidates the `CreateChannel` overloads into one `OnCreateChannel` abstract method.  
+-   The <xref:System.ServiceModel.Channels.ChannelFactoryBase> class implements <xref:System.ServiceModel.Channels.ChannelManagerBase> and <xref:System.ServiceModel.Channels.IChannelFactory> and consolidates the `CreateChannel` overloads into one `OnCreateChannel` abstract method.
 
--   The``<xref:System.ServiceModel.Channels.ChannelListenerBase> class implements <xref:System.ServiceModel.Channels.IChannelListener>. It takes care of basic state management.  
+-   The <xref:System.ServiceModel.Channels.ChannelListenerBase> class implements <xref:System.ServiceModel.Channels.IChannelListener>. It takes care of basic state management. 
 
  The following discussion is based upon the [Transport: UDP](../../../../docs/framework/wcf/samples/transport-udp.md) sample.  
 

diff --git a/docs/framework/winforms/high-dpi-support-in-windows-forms.md b/docs/framework/winforms/high-dpi-support-in-windows-forms.md
@@ -33,7 +33,7 @@ In addition, to configure high DPI support in your Windows Forms application, yo
   To do this, add the following to your manifest file:
 
   ```xml
-  <compatibility xmlns="urn:schemas-microsoft.comn:compatibility.v1">
+  <compatibility xmlns="urn:schemas-microsoft.com:compatibility.v1">
     <application>
       <!-- Windows 10 compatibility -->
       <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />

diff --git a/docs/fsharp/language-reference/modules.md b/docs/fsharp/language-reference/modules.md
@@ -124,8 +124,8 @@ Note that the exception `DontSqueezeTheBananaException` and the class `Banana` b
 
 This capability is also possible in [Namespaces](namespaces.md) with F# 4.1.
 
-## See Also
+## See also
 
-[F# Language Reference](index.md)
-[Namespaces](namespaces.md)
-[F# RFC FS-1009 - Allow mutually referential types and modules over larger scopes within files](https://github.com/fsharp/fslang-design/blob/master/FSharp-4.1/FS-1009-mutually-referential-types-and-modules-single-scope.md)
+[F# Language Reference](index.md)  
+[Namespaces](namespaces.md)  
+[F# RFC FS-1009 - Allow mutually referential types and modules over larger scopes within files](https://github.com/fsharp/fslang-design/blob/master/FSharp-4.1/FS-1009-mutually-referential-types-and-modules-single-scope.md)  
diff --git a/includes/migration-guide/retargeting/versionselector.md b/includes/migration-guide/retargeting/versionselector.md
@@ -43,4 +43,4 @@
 > - [(4.6.2 | 4.7.2)](~/docs/framework/migration-guide/retargeting/4.6.2-4.7.2.md)
 > - [(4.7 | 4.7.1)](~/docs/framework/migration-guide/retargeting/4.7-4.7.1.md)
 > - [(4.7 | 4.7.2)](~/docs/framework/migration-guide/retargeting/4.7-4.7.2.md)
-> - [(4.7.1 | 4.7.2)](~/docs/framework/migration-guide/retargeting/4.6.1-4.7.2.md)
+> - [(4.7.1 | 4.7.2)](~/docs/framework/migration-guide/retargeting/4.7.1-4.7.2.md)
diff --git a/includes/migration-guide/runtime/versionselector.md b/includes/migration-guide/runtime/versionselector.md
@@ -43,4 +43,4 @@
 > - [(4.6.2 | 4.7.2)](~/docs/framework/migration-guide/runtime/4.6.2-4.7.2.md)
 > - [(4.7 | 4.7.1)](~/docs/framework/migration-guide/runtime/4.7-4.7.1.md)
 > - [(4.7 | 4.7.2)](~/docs/framework/migration-guide/runtime/4.7-4.7.2.md)
-> - [(4.7.1 | 4.7.2)](~/docs/framework/migration-guide/runtime/4.6.1-4.7.2.md)
+> - [(4.7.1 | 4.7.2)](~/docs/framework/migration-guide/runtime/4.7.1-4.7.2.md)