Merge pull request #5118 from dotnet/master

Update live with current master

Author: mairaw

docfx.json

@@ -83,9 +83,9 @@
     "externalReference": [],
     "globalMetadata": {
       "breadcrumb_path": "/dotnet/breadcrumb/toc.json",
-      "_displayLangs": [
-        "csharp"
-      ],
+      "_displayLangs": ["csharp"],
+      "dev_langs": ["csharp"],
+      "ms.devlang": "dotnet",
       "author": "dotnet-bot",
       "ms.author": "dotnetcontent",
       "manager": "wpickett",
@@ -102,33 +102,81 @@
         "docs/fsharp/**/**.md": "https://github.com/Microsoft/visualfsharp"
       },
       "ms.prod": {
-        "_csharplang/spec/*.md": ".net",
-        "_vblang/spec/*.md": ".net"
+        "_csharplang/spec/*.md": "dotnet-csharp",
+        "_vblang/spec/*.md": "dotnet-visualbasic",
+        "docs/core/**/**.md": "dotnet-core",
+        "docs/csharp/**/**.md": "dotnet-csharp",
+        "docs/framework/**/**.md": "dotnet-framework",
+        "docs/fsharp/**/**.md": "dotnet-fsharp",
+        "docs/standard/**/**.md": "dotnet",
+        "docs/visual-basic/**/**.md": "dotnet-visualbasic"
       },
       "ms.topic": {
         "_csharplang/spec/*.md": "language-reference",
-        "_vblang/spec/*.md": "language-reference"
-     },
+        "_vblang/spec/*.md": "language-reference",
+        "docs/framework/additional-apis/**/**.md": "managed-reference",
+        "docs/framework/unmanaged-api/**/**.md": "reference"
+      },
       "dev_langs": {
-        "docs/core/**/**.md": ["csharp"],
-        "docs/csharp/**/**.md": ["csharp"],
-        "docs/framework/**/**.md": ["csharp"],
         "docs/fsharp/**/**.md": ["fsharp"],
-        "docs/standard/**/**.md": ["csharp"],
         "docs/visual-basic/**/**.md": ["vb"]
       },
+      "ms.devlang": {
+        "docs/csharp/**/**.md": "csharp",
+        "docs/fsharp/**/**.md": "fsharp",
+        "docs/visual-basic/**/**.md": "vb"
+      },
+      "author": {
+        "docs/core/**/**.md": "mairaw",
+        "docs/csharp/**/**.md": "billwagner",        
+        "docs/framework/data/adonet/**/**.md": "douglaslMS",
+        "docs/fsharp/**/**.md": "cartermp"
+      },
       "ms.author": {
         "_csharplang/spec/*.md": "wiwagn",
-        "_vblang/spec/*.md": "wiwagn"
+        "_vblang/spec/*.md": "wiwagn",
+        "docs/core/**/**.md": "mairaw",
+        "docs/csharp/**/**.md": "wiwagn",
+        "docs/framework/data/adonet/**/**.md": "douglasl",
+        "docs/fsharp/**/**.md": "phcart"        
       },
-      "ms.technology": {
-        "_csharplang/spec/*.md": "devlang-csharp",
-        "csharp/quick-starts/**": "csharp-interactive",
-        "_vblang/spec/*.md": "devlang-visual-basic"
+      "manager": {
+        "docs/framework/data/adonet/**/**.md": "craigg"
       },
       "ms.date": {
         "_csharplang/spec/*.md": "07/01/2017",
         "_vblang/spec/*.md": "07/21/2017"
+      },
+      "ms.workload": {
+        "docs/core/**/**.md": ["dotnetcore"],
+        "docs/framework/**/**.md": ["dotnet"],
+        "docs/standard/**/**.md": ["dotnet", "dotnetcore"]
+      },
+      "ms.technology": {
+        "_csharplang/spec/*.md": "csharp-spec",
+        "_vblang/spec/*.md": "vb-spec",
+        "docs/csharp/roslyn-sdk/**/**.md": "csharp-roslyn",
+        "docs/csharp/language-reference/compiler-messages/**/**.md": "csharp-diagnostics",
+        "docs/csharp/misc/**/**.md": "csharp-diagnostics",
+        "docs/core/tools/**/**.md": "dotnet-cli",
+        "docs/core/docker/**/**.md": "dotnet-docker",
+        "docs/framework/data/adonet/**/**.md": "dotnet-data",
+        "docs/framework/data/wcf/**/**.md": "dotnet-wcf",
+        "docs/framework/docker/**/**.md": "dotnet-docker",
+        "docs/framework/install/**/**.md": "dotnet-install",
+        "docs/framework/migration-guide/**/**.md": "dotnet-appcompat",
+        "docs/framework/network-programming/**/**.md": "dotnet-networking",
+        "docs/framework/wcf/**/**.md": "dotnet-wcf",
+        "docs/framework/windows-workflow-foundation/**/**.md": "dotnet-wf",
+        "docs/framework/winforms/**/**.md": "dotnet-winforms",
+        "docs/framework/wpf/**/**.md": "dotnet-wpf",
+        "docs/framework/xaml-services/**/**.md": "dotnet-wpf",
+        "docs/standard/containerized-lifecycle-architecture/**/**.md": "dotnet-ebooks",
+        "docs/standard/microservices-architecture/**/**.md": "dotnet-ebooks",
+        "docs/standard/modern-web-apps-azure-architecture/**/**.md": "dotnet-ebooks",
+        "docs/standard/modernize-with-azure-and-containers/**/**.md": "dotnet-ebooks",
+        "docs/standard/security/**/**.md": "dotnet-security",
+        "docs/visual-basic/language-reference/error-messages/**/**.md": "vb-diagnostics"
       }
     },
     "dest": "_site",

docs/core/deploying/deploy-with-cli.md

@@ -57,13 +57,17 @@ Deploying a framework-dependent deployment with no third-party dependencies simp
       ```console
       dotnet publish -f netcoreapp1.1 -c Release
       ```
-   This creates a Release (rather than a Debug) version of your app. The resulting files are placed in a directory named *publish* that's in a subdirectory of your project's *bin* directory.
+   This creates a Release (rather than a Debug) version of your app. The resulting files are placed in a directory named *publish*      that's in a subdirectory of your project's *bin* directory.
 
-Along with your application's files, the publishing process emits a program database (.pdb) file that contains debugging information about your app. The file is useful primarily for debugging exceptions. You can choose not to distribute it with your application's files. You should, however, save it in the event that you want to debug the Release build of your app.
+   Along with your application's files, the publishing process emits a program database (.pdb) file that contains debugging information about your app. The file is useful primarily for debugging exceptions. You can choose not to distribute it with your application's files. You should, however, save it in the event that you want to debug the Release build of your app.
 
-You can deploy the complete set of application files in any way you like. For example, you can package them in a Zip file, use a simple `copy` command, or deploy them with any installation package of your choice. Once installed, users can execute your application by using the `dotnet` command and providing the application filename, such as `dotnet fdd.dll`.
+   You can deploy the complete set of application files in any way you like. For example, you can package them in a Zip file, use a simple `copy` command, or deploy them with any installation package of your choice.
 
-In addition to the application binaries, your installer should also either bundle the shared framework installer or check for it as a prerequisite as part of the application installation.  Installation of the shared framework requires Administrator/root access.
+1. Run your app
+
+   Once installed, users can execute your application by using the `dotnet` command and providing the application filename, such as `dotnet fdd.dll`.
+
+   In addition to the application binaries, your installer should also either bundle the shared framework installer or check for it as a prerequisite as part of the application installation.  Installation of the shared framework requires Administrator/root access.
 
 ## Framework-dependent deployment with third-party dependencies
 

docs/csharp/programming-guide/concepts/async/index.md

@@ -148,7 +148,7 @@ Async methods are intended to be non-blocking operations. An `await` expression
 
 The `async` and `await` keywords don't cause additional threads to be created. Async methods don't require multithreading because an async method doesn't run on its own thread. The method runs on the current synchronization context and uses time on the thread only when the method is active. You can use <xref:System.Threading.Tasks.Task.Run%2A?displayProperty=nameWithType> to move CPU-bound work to a background thread, but a background thread doesn't help with a process that's just waiting for results to become available.  
 
-The async-based approach to asynchronous programming is preferable to existing approaches in almost every case. In particular, this approach is better than the <xref:System.ComponentModel.BackgroundWorker> class for IO-bound operations because the code is simpler and you don't have to guard against race conditions. In combination with the <xref:System.Threading.Tasks.Task.Run%2A?displayProperty=nameWithType> method, async programming is better than <xref:System.ComponentModel.BackgroundWorker> for CPU-bound operations because async programming separates the coordination details of running your code from the work that `Task.Run` transfers to the threadpool.  
+The async-based approach to asynchronous programming is preferable to existing approaches in almost every case. In particular, this approach is better than the <xref:System.ComponentModel.BackgroundWorker> class for I/O-bound operations because the code is simpler and you don't have to guard against race conditions. In combination with the <xref:System.Threading.Tasks.Task.Run%2A?displayProperty=nameWithType> method, async programming is better than <xref:System.ComponentModel.BackgroundWorker> for CPU-bound operations because async programming separates the coordination details of running your code from the work that `Task.Run` transfers to the threadpool.  
 
 ##  <a name="BKMK_AsyncandAwait"></a> async and await  
  If you specify that a method is an async method by using the [async](../../../../csharp/language-reference/keywords/async.md) modifier, you enable the following two capabilities.  

docs/csharp/programming-guide/strings/index.md

@@ -120,12 +120,14 @@ string s = String.Empty;
 |-----------|-----------------|  
 |[How to: Modify String Contents](../../how-to/modify-string-contents.md)|Illustrates techniques to transform strings and modify the contents of strings.|  
 |[How to: Compare Strings](../../how-to/compare-strings.md)|Shows how to perform ordinal and culture specific comparisons of strings.|  
-|[How to: Parse Strings Using String.Split ](../../how-to/parse-strings-using-split.md)|Contains a code example that illustrates how to use the `String.Split` method to parse strings.|  
+|[How to: Concatenate Multiple Strings](../../how-to/concatenate-multiple-strings.md)|Demonstrates various ways to join multiple strings into one.|
+|[How to: Parse Strings Using String.Split ](../../how-to/parse-strings-using-split.md)|Contains code examples that illustrate how to use the `String.Split` method to parse strings.|  
 |[How to: Search Strings](../../how-to/search-strings.md)|Explains how to use search for specific text or patterns in strings.|  
 |[How to: Determine Whether a String Represents a Numeric Value](../../../csharp/programming-guide/strings/how-to-determine-whether-a-string-represents-a-numeric-value.md)|Shows how to safely parse a string to see whether it has a valid numeric value.|  
-|[How to: Convert a String to a DateTime](../../../csharp/programming-guide/strings/how-to-convert-a-string-to-a-datetime.md)|Shows how to convert a string such as "01/24/2008" to a <xref:System.DateTime?displayProperty=nameWithType> object.|  
+|[String interpolation](../../language-reference/tokens/interpolated.md)|Describes the string interpolation feature that provides a convenient syntax to format strings.|
 |[Basic String Operations](../../../../docs/standard/base-types/basic-string-operations.md)|Provides links to topics that use <xref:System.String?displayProperty=nameWithType> and <xref:System.Text.StringBuilder?displayProperty=nameWithType> methods to perform basic string operations.|  
-|[Parsing Strings](../../../../docs/standard/base-types/parsing-strings.md)|Describes how to insert characters or empty spaces into a string.|  
+|[Parsing Strings](../../../standard/base-types/parsing-strings.md)|Describes how to convert string representations of .NET base types to instances of the corresponding types.|  
+|[Parsing Date and Time Strings in .NET](../../../standard/base-types/parsing-datetime.md)|Shows how to convert a string such as "01/24/2008" to a <xref:System.DateTime?displayProperty=nameWithType> object.|  
 |[Comparing Strings](../../../../docs/standard/base-types/comparing.md)|Includes information about how to compare strings and provides examples in C# and Visual Basic.|  
 |[Using the StringBuilder Class](../../../standard/base-types/stringbuilder.md)|Describes how to create and modify dynamic string objects by using the <xref:System.Text.StringBuilder> class.|  
 |[LINQ and Strings](../../../csharp/programming-guide/concepts/linq/linq-and-strings.md)|Provides information about how to perform various string operations by using LINQ queries.|  

docs/framework/64-bit-apps.md

@@ -1,25 +1,13 @@
 ---
 title: "64-bit Applications"
-ms.custom: ""
 ms.date: "03/30/2017"
-ms.prod: ".net-framework"
-ms.reviewer: ""
-ms.suite: ""
-ms.technology: 
-  - "dotnet-bcl"
-ms.tgt_pltfrm: ""
-ms.topic: "article"
 helpviewer_keywords: 
   - "applications [C++], 64-bit"
   - "64-bit applications [C++]"
   - "64-bit programming [C++]"
 ms.assetid: fd4026bc-2c3d-4b27-86dc-ec5e96018181
-caps.latest.revision: 53
 author: "rpetrusha"
 ms.author: "ronpet"
-manager: "wpickett"
-ms.workload: 
-  - "dotnet"
 ---
 # 64-bit Applications
 When you compile an application, you can specify that it should run on a Windows 64-bit operating system either as a native application or under WOW64 (Windows 32-bit on Windows 64-bit). WOW64 is a compatibility environment that enables a 32-bit application to run on a 64-bit system. WOW64 is included in all 64-bit versions of the Windows operating system.  

docs/framework/add-ins/index.md

@@ -1,14 +1,6 @@
 ---
 title: "Add-ins and Extensibility"
-ms.custom: ""
 ms.date: "03/30/2017"
-ms.prod: ".net-framework"
-ms.reviewer: ""
-ms.suite: ""
-ms.technology: 
-  - "dotnet-clr"
-ms.tgt_pltfrm: ""
-ms.topic: "article"
 helpviewer_keywords: 
   - "extensibility [.NET Framework], add-ins"
   - "add-ins [.NET Framework]"
@@ -20,12 +12,8 @@ helpviewer_keywords:
   - ".NET Framework, extensibility"
   - "versioning [.NET Framework], add-ins"
 ms.assetid: 8dd45b02-7218-40f9-857d-40d7b98b850b
-caps.latest.revision: 42
 author: "rpetrusha"
 ms.author: "ronpet"
-manager: "wpickett"
-ms.workload: 
-  - "dotnet"
 ---
 # Add-ins and Extensibility
 <a name="top"></a> Add-ins provide extended features or services for a host application. The [!INCLUDE[dnprdnshort](../../../includes/dnprdnshort-md.md)] provides a programming model that developers can use to develop add-ins and activate them in their host application. The model achieves this by constructing a communication pipeline between the host and the add-in. The model is implemented by using the types in the <xref:System.AddIn>, <xref:System.AddIn.Hosting>, <xref:System.AddIn.Pipeline>, and <xref:System.AddIn.Contract> namespaces.  

docs/framework/add-ins/pipeline-development.md

@@ -1,14 +1,6 @@
 ---
 title: "Pipeline Development"
-ms.custom: ""
 ms.date: "03/30/2017"
-ms.prod: ".net-framework"
-ms.reviewer: ""
-ms.suite: ""
-ms.technology: 
-  - "dotnet-clr"
-ms.tgt_pltfrm: ""
-ms.topic: "article"
 helpviewer_keywords: 
   - "add-in pipeline [.NET Framework], segments"
   - "activation path for add-ins [.NET Framework]"
@@ -17,12 +9,8 @@ helpviewer_keywords:
   - "add-in pipeline [.NET Framework], about"
   - "add-ins [.NET Framework], pipeline development"
 ms.assetid: 932788f2-b87d-44cf-82f9-04492a8b2722
-caps.latest.revision: 31
 author: "rpetrusha"
 ms.author: "ronpet"
-manager: "wpickett"
-ms.workload: 
-  - "dotnet"
 ---
 # Pipeline Development
 The add-in pipeline is the path of pipeline segments that the host application and its add-in must use to communicate with each other.  

docs/framework/add-ins/walkthrough-create-extensible-app.md

@@ -1,14 +1,6 @@
 ---
 title: "Walkthrough: Creating an Extensible Application"
-ms.custom: ""
 ms.date: "03/30/2017"
-ms.prod: ".net-framework"
-ms.reviewer: ""
-ms.suite: ""
-ms.technology: 
-  - "dotnet-clr"
-ms.tgt_pltfrm: ""
-ms.topic: "article"
 dev_langs: 
   - "csharp"
   - "vb"
@@ -19,12 +11,8 @@ helpviewer_keywords:
   - "add-in-side adapter [.NET Framework]"
   - "contracts for add-in pipelines [.NET Framework]"
 ms.assetid: 694a33c5-a040-450d-aed5-ac49fc88ce61
-caps.latest.revision: 32
 author: "rpetrusha"
 ms.author: "ronpet"
-manager: "wpickett"
-ms.workload: 
-  - "dotnet"
 ---
 # Walkthrough: Creating an Extensible Application
 This walkthrough describes how to create a pipeline for an add-in that performs simple calculator functions. It does not demonstrate a real-world scenario; rather, it demonstrates the basic functionality of a pipeline and how an add-in can provide services for a host.  

docs/framework/additional-apis/_autoredirects.md

@@ -1,9 +1,6 @@
 ---
 title: "HttpWebRequest._AutoRedirects Field"
 ms.date: "05/01/2017"
-ms.prod: ".net-framework"
-ms.technology: ""
-ms.topic: "reference"
 topic_type: 
   - "apiref"
 api_name: 
@@ -15,9 +12,6 @@ api_type:
 ms.assetid: bd58e91c-4e35-4866-9d55-75ff58c3ed73
 author: "guardrex"
 ms.author: "mairaw"
-manager: "wpickett"
-ms.workload: 
-  - "dotnet"
 ---
 
 # HttpWebRequest.\_AutoRedirects Field

docs/framework/additional-apis/_httpresponse.md

@@ -1,9 +1,6 @@
 ---
 title: "HttpWebRequest._HttpResponse Field"
 ms.date: "05/01/2017"
-ms.prod: ".net-framework"
-ms.technology: ""
-ms.topic: "reference"
 topic_type: 
   - "apiref"
 api_name: 
@@ -15,9 +12,6 @@ api_type:
 ms.assetid: eab9b789-beb4-4c28-b2d8-78debc7ba129
 author: "guardrex"
 ms.author: "mairaw"
-manager: "wpickett"
-ms.workload: 
-  - "dotnet"
 ---
 
 # HttpWebRequest.\_HttpResponse Field