Resolve syncing conflicts from live-sync-work to live

.acrolinx-config.edn

@@ -0,0 +1,2 @@
+{:allowed-branchname-matches ["main" "master" "release-.*"]
+ :allowed-filename-matches ["articles"]}

.gitignore

@@ -14,3 +14,5 @@ articles/directories.txt
 _themes*/
 
 .openpublishing.buildcore.ps1
+/.vs
+.vscode/settings.json

.openpublishing.publish.config.json

@@ -1,154 +1,186 @@
 {
-   "docsets_to_publish":[
-      {
-         "docset_name":"bot-framework",
-         "build_source_folder":"articles",
-         "build_output_subfolder":"bot-framework",
-         "locale":"en-us",
-         "monikers":[],
-         "moniker_ranges":[
-            ">= azure-bot-service-3.0",
-            ">= botbuilder-3.12.2.4",
-            ">= skypebotsmedia-1.5.0.1177-alpha",
-            ">= botconnector-3.11.1"
-         ],
-         "open_to_public_contributors":true,
-         "type_mapping":{
-            "Conceptual":"Content",
-            "ManagedReference":"Content",
-            "RestApi":"Content"
-         },
-         "build_entry_point":"docs",
-         "template_folder":"_themes"
-      },
-      {
-         "docset_name":"bot-framework-rest-api",
-         "build_source_folder":"rest",
-         "build_output_subfolder":"bot-framework-rest-api",
-         "locale":"en-us",
-         "monikers":[],
-         "open_to_public_contributors":false,
-         "type_mapping":{
-            "Conceptual":"Content",
-            "ContextObject":"Toc",
-            "ManagedReference":"Content",
-            "RestApi":"Content"
-         },
-         "build_entry_point":"docs",
-         "template_folder":"_themes",
-         "version":0
-      },
-      {
-         "docset_name":"bot-framework-dotnet-api",
-         "build_source_folder":"dotnet",
-         "build_output_subfolder":"bot-framework-dotnet-api",
-         "locale":"en-us",
-         "open_to_public_contributors":true,
-         "type_mapping":{
-            "Conceptual":"Content",
-            "ManagedReference":"Content",
-            "RestApi":"Content",
-            "NetEnum":"Content",
-            "NetDelegate":"Content",
-            "NetNamespace":"Content",
-            "NetMember":"Content",
-            "NetType":"Content"
-         },
-         "build_entry_point":"docs",
-         "template_folder":"_themes",
-         "customized_tasks":{
-            "docset_postbuild":[
-               "_dependentPackages/ECMA2Yaml/tools/PostBuild.ps1"
-            ],
-            "docset_prebuild":[
-               "_dependentPackages/ECMA2Yaml/tools/Run.ps1",
-               "_dependentPackages/CommonPlugins/tools/SplitTOC.ps1",
-               "_dependentPackages/CommonPlugins/tools/DiffFolder.ps1"
-            ]
-         }
-      }
-   ],
-   "notification_subscribers":[
-      "[email protected]",
-      "[email protected]"
-   ],
-   "sync_notification_subscribers":[],
-   "branches_to_filter":[],
-   "git_repository_url_open_to_public_contributors":"https://github.com/MicrosoftDocs/bot-docs",
-   "git_repository_branch_open_to_public_contributors":"live",
-   "skip_source_output_uploading":false,
-   "need_preview_pull_request":true,
-   "contribution_branch_mappings":{},
-   "dependent_repositories":[
-      {
-         "path_to_root":"_themes",
-         "url":"https://github.com/Microsoft/templates.docs.msft",
-         "branch":"master",
-         "branch_mapping":{}
+  "docsets_to_publish": [
+    {
+      "docset_name": "bot-framework",
+      "build_source_folder": "articles",
+      "build_output_subfolder": "bot-framework",
+      "locale": "en-us",
+      "monikers": [],
+      "moniker_ranges": [
+        ">= azure-bot-service-3.0",
+        ">= botbuilder-3.12.2.4",
+        ">= skypebotsmedia-1.5.0.1177-alpha",
+        ">= botconnector-3.11.1"
+      ],
+      "type_mapping": {
+        "Conceptual": "Content",
+        "ManagedReference": "Content",
+        "NetEnum": "Content",
+        "NetDelegate": "Content",
+        "NetNamespace": "Content",
+        "NetMember": "Content",
+        "NetType": "Content",
+        "RestApi": "Content"
       },
-      {
-         "path_to_root":"_themes.pdf",
-         "url":"https://github.com/Microsoft/templates.docs.msft.pdf",
-         "branch":"master",
-         "branch_mapping":{}
+      "build_entry_point": "docs",
+      "template_folder": "_themes",
+      "customized_tasks": {
+        "docset_prebuild": [
+          "_dependentPackages/ECMA2Yaml/tools/Run.ps1",
+          "_dependentPackages/CommonPlugins/tools/SplitTOC.ps1",
+          "_dependentPackages/CommonPlugins/tools/DiffFolder.ps1"
+        ],
+        "docset_postbuild": [
+          "_dependentPackages/ECMA2Yaml/tools/PostBuild.ps1"
+        ]
       },
-      {
-         "path_to_root":"botbuilder-samples",
-         "url":"https://github.com/Microsoft/BotBuilder-Samples",
-         "branch":"master",
-         "branch_mapping":{}
+      "ECMA2Yaml": {
+        "SourceXmlFolder": "dotnet/xml",
+        "OutputYamlFolder": "dotnet/api",
+        "Flatten": true,
+        "id": "dotnet-template",
+        "SDPMode": true
       },
-       {
-         "path_to_root":"botbuilder-python",
-         "url":"https://github.com/microsoft/BotBuilder-Samples",
-         "branch":"master",
-         "branch_mapping":{}
-      }
-   ],
-   "branch_target_mapping":{
-      "live":[
-         "Publish",
-         "Pdf"
+      "SplitTOC": [
+        "dotnet/api/dotnet-template/toc.yml"
       ],
-      "master":[
-         "Publish",
-         "Pdf"
+      "DiffFolder": [
+        "dotnet/api"
       ]
-   },
-   "need_generate_pdf_url_template":true,
-   "Targets":{
-      "Pdf":{
-         "template_folder":"_themes.pdf"
-      }
-   },
-   "need_generate_intellisense":false,
-   "template_folder":"_themes",
-   "dependent_packages":[
-      {
-         "path_to_root":"_dependentPackages/CommonPlugins",
-         "target_framework":"net45",
-         "version":"latest",
-         "id":"Microsoft.OpenPublishing.CommonPlugins",
-         "nuget_feed":"https://www.myget.org/F/op/api/v2"
+    },
+    {
+      "docset_name": "bot-framework-rest-api",
+      "build_source_folder": "rest",
+      "build_output_subfolder": "bot-framework-rest-api",
+      "locale": "en-us",
+      "monikers": [],
+      "open_to_public_contributors": false,
+      "type_mapping": {
+        "Conceptual": "Content",
+        "ManagedReference": "Content",
+        "NetEnum": "Content",
+        "NetDelegate": "Content",
+        "NetNamespace": "Content",
+        "NetMember": "Content",
+        "NetType": "Content",
+        "ContextObject": "Toc",
+        "RestApi": "Content"
+      },
+      "build_entry_point": "docs",
+      "template_folder": "_themes",
+      "customized_tasks": {
+        "docset_prebuild": [
+          "_dependentPackages/ECMA2Yaml/tools/Run.ps1",
+          "_dependentPackages/CommonPlugins/tools/SplitTOC.ps1",
+          "_dependentPackages/CommonPlugins/tools/DiffFolder.ps1"
+        ],
+        "docset_postbuild": [
+          "_dependentPackages/ECMA2Yaml/tools/PostBuild.ps1"
+        ]
       },
-      {
-         "id":"Microsoft.DocAsCode.ECMA2Yaml",
-         "nuget_feed":"https://www.myget.org/F/op/api/v2",
-         "path_to_root":"_dependentPackages/ECMA2Yaml",
-         "target_framework":"net45",
-         "version":"latest"
-      }
-   ],
-   "ECMA2Yaml":{
-      "SourceXmlFolder":"dotnet/xml",
-      "OutputYamlFolder":"dotnet/api",
-      "Flatten":true,
-      "SDPMode":true
-   },
-   "DiffFolder":[
-      "dotnet/api"
-   ],
-   "SplitTOC":[
-      "dotnet/api/toc.yml"
-   ]
+      "ECMA2Yaml": {
+        "SourceXmlFolder": "dotnet/xml",
+        "OutputYamlFolder": "dotnet/api",
+        "Flatten": true,
+        "id": "dotnet-template",
+        "SDPMode": true
+      },
+      "SplitTOC": [
+        "dotnet/api/dotnet-template/toc.yml"
+      ],
+      "DiffFolder": [
+        "dotnet/api"
+      ],
+      "version": 0
+    }
+  ],
+  "notification_subscribers": [
+    "[email protected]",
+    "[email protected]"
+  ],
+  "sync_notification_subscribers": [],
+  "branches_to_filter": [],
+  "skip_source_output_uploading": false,
+  "need_preview_pull_request": true,
+  "contribution_branch_mappings": {},
+  "dependent_repositories": [
+    {
+      "path_to_root": "_themes",
+      "url": "https://github.com/Microsoft/templates.docs.msft",
+      "branch": "main",
+      "branch_mapping": {}
+    },
+    {
+      "path_to_root": "_themes.pdf",
+      "url": "https://github.com/Microsoft/templates.docs.msft.pdf",
+      "branch": "main",
+      "branch_mapping": {}
+    },
+    {
+      "path_to_root": "botbuilder-samples",
+      "url": "https://github.com/Microsoft/BotBuilder-Samples",
+      "branch": "main",
+      "branch_mapping": {}
+    },
+    {
+      "path_to_root": "botframework-sdk",
+      "url": "https://github.com/microsoft/botframework-sdk",
+      "branch": "main",
+      "branch_mapping": {}
+    },
+    {
+      "path_to_root": "articles/reusable-content",
+      "url": "https://github.com/MicrosoftDocs/reusable-content",
+      "branch": "main",
+      "branch_mapping": {}
+    },
+    {
+      "path_to_root": "azure-reference-other-repo",
+      "url": "https://github.com/MicrosoftDocs/azure-reference-other-pr",
+      "branch": "main",
+      "branch_mapping": {}
+    }
+  ],
+  "branch_target_mapping": {
+    "live": [
+      "Publish",
+      "Pdf"
+    ],
+    "main": [
+      "Publish",
+      "Pdf"
+    ]
+  },
+  "need_generate_pdf_url_template": true,
+  "targets": {
+    "pdf": {
+      "template_folder": "_themes.pdf"
+    }
+  },
+  "docs_build_engine": {
+    "name": "docfx_v3"
+  },
+  "need_generate_pdf": false,
+  "need_generate_intellisense": false,
+  "dependent_packages": [
+    {
+      "path_to_root": "_dependentPackages/CommonPlugins",
+      "target_framework": "net45",
+      "version": "latest",
+      "id": "Microsoft.OpenPublishing.CommonPlugins",
+      "nuget_feed": "https://www.myget.org/F/op/api/v2"
+    },
+    {
+      "id": "Microsoft.DocAsCode.ECMA2Yaml",
+      "nuget_feed": "https://www.myget.org/F/op/api/v2",
+      "path_to_root": "_dependentPackages/ECMA2Yaml",
+      "target_framework": "net45",
+      "version": "latest"
+    }
+  ],
+  "xref_query_tags": [
+    "/dotnet",
+    "/uwp/api"
+  ],
+  "template_folder": "_themes"
 }