Merge branch 'master' into portals-1842600

Author: tapanm-MSFT

.acrolinx-config.edn

@@ -1,5 +1,6 @@
 {:allowed-branchname-matches ["^master$"]
  :allowed-filename-matches ["powerapps-docs"]
+ :guidance-profile "dc59e3ef-24fd-46d7-9156-0491aaae6bef" ;; Profile ID for "BAG-specific" 
  :acrolinx-check-settings
  {
   "languageId" "en"

.gitignore

@@ -13,3 +13,7 @@ settings.json
 /.vs/slnx.sqlite
 /.vs/powerapps-docs-pr/v16/.suo
 /.vs/VSWorkspaceState.json
+powerapps-docs/.vs/powerapps-docs/v15/.suo
+powerapps-docs/.vs/ProjectSettings.json
+powerapps-docs/.vs/slnx.sqlite
+powerapps-docs/.vs/VSWorkspaceState.json

.openpublishing.publish.config.json

@@ -38,10 +38,6 @@
           "ConceptualTOC": "powerapps-docs/developer/common-data-service/org-service/toc.yml",
           "ReferenceTOCUrl": "/dotnet/api/ce-9-general/toc.json"
         },
-        {
-          "ConceptualTOC": "powerapps-docs/developer/common-data-service/package-deployer/toc.yml",
-          "ReferenceTOCUrl": "/dotnet/api/ce-9-packagedeployer/toc.json"
-        },
         {
           "ConceptualTOC": "powerapps-docs/developer/common-data-service/workflow/toc.yml",
           "ReferenceTOCUrl": "/dotnet/api/ce-9-workflow/toc.json"
@@ -109,16 +105,19 @@
       "Publish",
       "PDF"
     ],
-   "alm-guide": [
+    "alm-guide": [
       "Publish",
       "PDF"
-    ] 
+    ]
   },
   "need_generate_pdf_url_template": true,
   "Targets": {
     "Pdf": {
       "template_folder": "_themes.pdf"
     }
   },
-  "need_generate_intellisense": false
+  "need_generate_intellisense": false,
+  "docs_build_engine": {
+    "name": "docfx_v3"
+  }
 }