Merge branch 'main' into Grace-chrisda

Author: chrisda

.openpublishing.publish.config.json

@@ -50,9 +50,9 @@
       ]
     },
     {
-      "docset_name": "sharepoint-ps",
-      "build_source_folder": "sharepoint",
-      "build_output_subfolder": "sharepoint-ps",
+      "docset_name": "skype-ps",
+      "build_source_folder": "skype",
+      "build_output_subfolder": "skype-ps",
       "locale": "en-us",
       "monikers": [],
       "moniker_ranges": [],
@@ -66,12 +66,20 @@
       },
       "build_entry_point": "docs",
       "template_folder": "_themes",
-      "version": 0
+      "version": 0,
+      "customized_tasks": {
+        "docset_prebuild": [
+          "_dependentPackages/MAML2Yaml/tools/Run.ps1"
+        ]
+      },
+      "monikerPath": [
+        "mapping/monikerMapping.json"
+      ]
     },
     {
-      "docset_name": "skype-ps",
-      "build_source_folder": "skype",
-      "build_output_subfolder": "skype-ps",
+      "docset_name": "spmt-ps",
+      "build_source_folder": "spmt",
+      "build_output_subfolder": "spmt-ps",
       "locale": "en-us",
       "monikers": [],
       "moniker_ranges": [],
@@ -86,11 +94,6 @@
       "build_entry_point": "docs",
       "template_folder": "_themes",
       "version": 0,
-      "customized_tasks": {
-        "docset_prebuild": [
-          "_dependentPackages/MAML2Yaml/tools/Run.ps1"
-        ]
-      },
       "monikerPath": [
         "mapping/monikerMapping.json"
       ]
@@ -141,28 +144,6 @@
         "mapping/monikerMapping.json"
       ]
     },
-    {
-      "docset_name": "spmt-ps",
-      "build_source_folder": "spmt",
-      "build_output_subfolder": "spmt-ps",
-      "locale": "en-us",
-      "monikers": [],
-      "moniker_ranges": [],
-      "open_to_public_contributors": true,
-      "type_mapping": {
-        "Conceptual": "Content",
-        "ManagedReference": "Content",
-        "RestApi": "Content",
-        "PowershellModule": "Content",
-        "PowershellCmdlet": "Content"
-      },
-      "build_entry_point": "docs",
-      "template_folder": "_themes",
-      "version": 0,
-      "monikerPath": [
-        "mapping/monikerMapping.json"
-      ]
-    },
     {
       "docset_name": "whiteboard-ps",
       "build_source_folder": "whiteboard",
@@ -195,10 +176,7 @@
   "sync_notification_subscribers": [],
   "branches_to_filter": [],
   "git_repository_branch_open_to_public_contributors": "main",
-  "skip_source_output_uploading": false,
   "need_preview_pull_request": true,
-  "enable_incremental_build": false,
-  "contribution_branch_mappings": {},
   "dependent_repositories": [
     {
       "path_to_root": "_themes",
@@ -212,12 +190,16 @@
       "Publish"
     ]
   },
-  "need_generate_pdf_url_template": false,
   "targets": {
     "Pdf": {
       "template_folder": "_themes.pdf"
     }
   },
+  "docs_build_engine": {},
+  "skip_source_output_uploading": false,
+  "enable_incremental_build": false,
+  "contribution_branch_mappings": {},
+  "need_generate_pdf_url_template": false,
   "need_generate_intellisense": false,
   "dependent_packages": [
     {
@@ -227,8 +209,5 @@
       "target_framework": "net45",
       "version": "latest"
     }
-  ],
-  "docs_build_engine": {
-    "name": "docfx_v3"
-  }
-}
+  ]
+}