resolved conflicts

.azure-pipelines-preproduction/package.json

@@ -10,8 +10,8 @@
   "description": "Tests for Azure REST API Specifications",
   "license": "MIT",
   "devDependencies": {
-    "@azure/avocado": "^0.6.3",
-    "@azure/rest-api-specs-scripts": "^0.7.2",
+    "@azure/avocado": "^0.6.4",
+    "@azure/rest-api-specs-scripts": "^0.9.1",
     "@ts-common/commonmark-to-markdown": "^1.2.0",
     "@ts-common/fs": "0.2.0",
     "@ts-common/iterator": "^0.3.6",

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,17 +1,20 @@
-### Latest improvements:
 <i>MSFT employees can try out our new experience at <b>[OpenAPI Hub](https://aka.ms/openapiportal) </b> - one location for using our validation tools and finding your workflow. 
-</i><br>
+</i>
+
 ### Contribution checklist:
-- [ ] I have reviewed the [documentation](https://github.com/Azure/adx-documentation-pr/wiki/Overall-basic-flow) for the workflow.
-- [ ] [Validation tools](https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/swagger-checklist.md#validation-tools-for-swagger-checklist) were run on swagger spec(s) and have all been fixed in this PR.
-- [ ] The [OpenAPI Hub](https://aka.ms/openapiportal) was used for checking validation status and next steps.
+- [ ] I have reviewed the [documentation](https://dev.azure.com/azure-sdk/internal/_wiki/wikis/internal.wiki/202/Overall-Process-of-AME-Onboarding) for the workflow.
+- [ ] [Validation tools](https://dev.azure.com/azure-sdk/internal/_wiki/wikis/internal.wiki/84/Swagger-Validation-tools) were run on swagger spec(s) and have all been fixed in this PR. [How to fix?](https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/ci-fix.md)
+
+If any further question about AME onboarding or validation tools, please view the [FAQ](https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/FAQ.md).
+
 ### ARM API Review Checklist
-- [ ] Service team MUST add the "WaitForARMFeedback" label if the management plane API changes fall into one of the below categories. 
-- adding/removing APIs.
-- adding/removing properties.
-- adding/removing API-version. 
-- adding a new service in Azure.
+- [ ] Service team MUST add the "**WaitForARMFeedback**" label if the management plane API changes fall into one of the below categories. 
+  - adding/removing APIs.
+  - adding/removing properties.
+  - adding/removing API-version. 
+  - adding a new service in Azure.
+
+<i>Failure to comply may result in delays for manifest application. Note this does not apply to data plane APIs.</i>
 
-Failure to comply may result in delays for manifest application. Note this does not apply to data plane APIs.
 - [ ] If you are blocked on ARM review and want to get the PR merged urgently, please get the ARM oncall for reviews (RP Manifest Approvers team under Azure Resource Manager service) from IcM and reach out to them. 
-Please follow the link to find more details on [API review process](https://armwiki.azurewebsites.net/rp_onboarding/ResourceProviderOnboardingAPIRevieworkflow.html).
+Please follow the link to find more details on [API review process]( https://dev.azure.com/azure-sdk/internal/_wiki/wikis/internal.wiki/212/Swagger-PR-Review).

.github/assignment.yml

@@ -30,7 +30,7 @@
       - yungezz
 
 - rule:
-    path: "specification/resources/**"
+    paths: "specification/resources/**"
     reviewers:
       - raych1
 
@@ -151,5 +151,4 @@
       - markcowl
       - leni-msft
       - qianwens
-      - allenjzhang
       - ruowan

.github/issue_assignment.yml

@@ -0,0 +1,22 @@
+---
+- rule:
+    booleanFilterExpression: "needs-triage"
+    assignees:
+      - yungezz
+      - zikalino
+      - erich-wang
+      - NullMDR
+      - raych1
+      - lirenhe
+      - weidongxu-microsoft
+      - ArcturusZhang
+      - xccc-msft
+      - ChenTanyi
+      - fengzhou-msft
+      - njuCZ
+      - akning-ms
+      - markcowl
+      - leni-msft
+      - qianwens
+      - ruowan
+      - MyronFanQiu