git pull upstream master

Author: gewarren

.ghal.rules.json

@@ -1,13 +1,25 @@
 {
-  "labels": {
-    "defaults": [ ":watch: Not Triaged" ],
-    "product": {
-      "(?i).*": "Source - Docs.ms"
-    },
-    "contentsource": {
-      "(?i).*dotnet-api-docs\/blob\/master\/xml\/system\\.net.*": ":card_file_box: Technology - NCL",
-      "(?i).*dotnet-api-docs\/blob\/master\/xml\/system\\.windows\\.forms.*": ":card_file_box: Technology - WinForms",
-      "(?i).*dotnet-api-docs\/blob\/master\/xml\/system\\.security.*": ":card_file_box: Technology - Security"
+  "version": 3,
+  "configRevision": 1,
+
+  "issue": {
+    "opened": {
+      "processor-default": {
+        "labels-add": [ ":watch: Not Triaged" ]
+      },
+      "processor-meta-docs": {
+        "contentsource": {
+          "(?i).*dotnet-api-docs\/blob\/master\/xml\/system\\.net.*": {
+            "labels-add": ":card_file_box: Technology - NCL"
+          },
+          "(?i).*dotnet-api-docs\/blob\/master\/xml\/system\\.windows\\.forms.*": {
+            "labels-add": ":card_file_box: Technology - WinForms"
+          },
+          "(?i).*dotnet-api-docs\/blob\/master\/xml\/system\\.security.*": {
+            "labels-add": ":card_file_box: Technology - Security"
+          }
+        }
+      }
     }
   }
 }

.openpublishing.publish.config.json

@@ -13,16 +13,17 @@
       "type_mapping": {
         "Conceptual": "Content",
         "ManagedReference": "Content",
-        "RestApi": "Content",
+        "NetEnum": "Content",
+        "NetDelegate": "Content",
+        "NetNamespace": "Content",
+        "NetMember": "Content",
+        "NetType": "Content",
         "Tutorial": "Content"
       },
       "build_entry_point": "docs",
       "template_folder": "_themes",
       "base_path": "dotnet",
       "site_name": "Docs",
-      "customized_template_paths": [
-        "_dependentPackages/memberpage.plugins/content"
-      ],
       "customized_tasks": {
         "docset_prebuild": [
           "_dependentPackages/ECMA2Yaml/tools/Run.ps1",
@@ -36,7 +37,8 @@
       "ECMA2Yaml": {
         "SourceXmlFolder": "xml",
         "OutputYamlFolder": "api",
-        "Flatten": true
+        "Flatten": true,
+        "SDPMode": true
       },
       "SplitTOC": [
         "api/toc.yml"
@@ -103,13 +105,6 @@
       "target_framework": "net45",
       "version": "latest"
     },
-    {
-      "id": "memberpage.plugins",
-      "nuget_feed": "https://www.myget.org/F/docfx/api/v2",
-      "path_to_root": "_dependentPackages/memberpage.plugins",
-      "target_framework": "net45",
-      "version": "latest"
-    },
     {
       "id": "Microsoft.OpenPublishing.CommonPlugins",
       "nuget_feed": "https://www.myget.org/F/op/api/v2",

_zip/missingapi.yml

@@ -1,6 +1,6 @@
 {
   "build": {
-    "markdownEngineName": "dfm-latest",
+    "markdownEngineName": "markdig",
     "content": [
       {
         "files": [
@@ -49,6 +49,7 @@
       "ms.topic": "managed-reference",
       "ms.prod": "dotnet-api",
       "feedback_system": "None",
+      "defaultDevLang": "csharp",
       "_op_documentIdPathDepotMapping": {
         "api/": {
           "depot_name": "VS.core-docs"
@@ -138,7 +139,6 @@
       "docs.html"
     ],
     "xref": [
-      "_zip/office15.zip",
       "_zip/missingapi.yml"
     ],
     "lruSize": 0