Merge pull request #5061 from dotnet/master

Update live with current master

Author: mairaw

.gitignore

@@ -23,4 +23,7 @@ samples/framework/docker/MVCRandomAnswerGenerator/containerImage
 .DS_Store
 _dependentPackages/
 !/xml/System.IO.Log/
-!/xml/System.Net.Cache/
+!/xml/System.Net.Cache/
+
+# Visual Studio Code
+.vscode

.openpublishing.redirection.json

@@ -1153,6 +1153,10 @@
         {
             "source_path": "docs/fsharp/tutorials/type-providers/generating-fsharp-types-from-edmx.md",
             "redirect_url": "/dotnet/fsharp/tutorials/type-providers/index"
+        },
+        {
+            "source_path": "docs/csharp/programming-guide/generics/generics-in-the-net-framework-class-library.md",
+            "redirect_url": "/dotnet/standard/generics/index"
         }
     ]
 }

docfx.json

@@ -92,9 +92,15 @@
       "searchScope": [".NET"],
       "uhfHeaderId": "MSDocsHeader-DotNet",
       "apiPlatform": "dotnet",
-      "ms.topic": "article"
+      "ms.topic": "conceptual",
+      "feedback_system": "GitHub",
+      "feedback_github_repo": "dotnet/docs",
+      "feedback_product_url": "https://developercommunity.visualstudio.com/spaces/61/index.html" 
     },
     "fileMetadata": {
+      "feedback_product_url": {
+        "docs/fsharp/**/**.md": "https://github.com/Microsoft/visualfsharp"
+      },
       "ms.prod": {
         "_csharplang/spec/*.md": ".net",
         "_vblang/spec/*.md": ".net"

docs/core/additional-tools/index.md

@@ -5,9 +5,11 @@ author: mlacouture
 manager: wpickett
 ms.author: johalex
 ms.date: 01/19/2018
-ms.topic: article
-ms.prod: .net-core
+ms.topic: conceptual
+ms.prod: dotnet-core
 ms.custom: mvc
+ms.workload: 
+  - dotnetcore
 ---
 # .NET Core additional tools
 

docs/core/additional-tools/wcf-web-service-reference-guide.md

@@ -5,9 +5,11 @@ author: mlacouture
 manager: wpickett
 ms.author: johalex
 ms.date: 04/19/2018
-ms.topic: article
-ms.prod: .net-core
+ms.topic: conceptual
+ms.prod: dotnet-core
 ms.custom: mvc
+ms.workload: 
+  - dotnetcore
 ---
 # Microsoft WCF Web Service Reference Provider Tool
 

docs/core/additional-tools/xml-serializer-generator.md

@@ -6,8 +6,10 @@ manager: wpickett
 ms.author: johalex
 ms.date: 01/19/2017
 ms.topic: tutorial
-ms.prod: .net-core
+ms.prod: dotnet-core
 ms.custom: mvc
+ms.workload: 
+  - dotnetcore
 ---
 # Using Microsoft XML Serializer Generator on .NET Core
 

docs/core/build/distribution-packaging.md

@@ -1,14 +1,12 @@
 ---
 title: .NET Core distribution packaging
 description: Learn how to package, name, and version .NET Core for distribution.
-keywords: .NET, .NET Core, source, build
 author: bleroy
 ms.author: mairaw
 ms.date: 06/28/2017
-ms.topic: article
-ms.prod: .net-core
+ms.topic: conceptual
+ms.prod: dotnet-core
 ms.devlang: dotnet
-ms.assetid: 71b9d722-c5a8-4271-9ce1-d87e7ae2494d
 ms.workload: 
   - dotnetcore
 ---

docs/core/build/index.md

@@ -1,14 +1,12 @@
 ---
 title: Build .NET Core from source
 description: Learn how to build .NET Core and the .NET Core CLI from the source code.
-keywords: .NET, .NET Core, source, build
 author: bleroy
 ms.author: mairaw
 ms.date: 06/28/2017
-ms.topic: article
-ms.prod: .net-core
+ms.topic: conceptual
+ms.prod: dotnet-core
 ms.devlang: dotnet
-ms.assetid: 8b49079c-6ede-429a-92d7-ecd2fda1ab0e
 ms.workload: 
   - dotnetcore
 ---

docs/core/deploying/creating-nuget-packages.md

@@ -1,15 +1,13 @@
 ---
 title: Creating a NuGet Package with Cross Platform Tools
 description: Learn how to create a NuGet package with the 'dotnet pack' command.
-keywords: .NET, .NET Core, NuGet
 author: cartermp
 ms.author: mairaw
 ms.date: 06/20/2016
-ms.topic: article
-ms.prod: .net-core
+ms.topic: conceptual
+ms.prod: dotnet-core
 ms.technology: dotnet-cli
 ms.devlang: dotnet
-ms.assetid: 2f0415c1-110b-433d-87c1-ae3d543a8844
 ms.workload: 
   - dotnetcore
 ---

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

@@ -1,14 +1,12 @@
 ---
 title: .NET Core app deployment with CLI tools
 description: Learn .NET Core app deployment with command-line interface (CLI) tools
-keywords: .NET, .NET Core, .NET Core deployment
 author: rpetrusha
 ms.author: ronpet
 ms.date: 04/18/2017
-ms.topic: article
-ms.prod: .net-core
+ms.topic: conceptual
+ms.prod: dotnet-core
 ms.devlang: dotnet
-ms.assetid: 82ebe16d-5e1c-46cc-91e8-71974296429c
 ms.workload: 
   - dotnetcore
 ---