jorinmejia
diff --git a/‎.azure-pipelines/BranchProtectionForPrivateRepo.yml
Lines changed: 1 addition & 3 deletions b/‎.azure-pipelines/BranchProtectionForPrivateRepo.yml
Lines changed: 1 addition & 3 deletions
diff --git a/‎.azure-pipelines/PrettierCheck.yml
Lines changed: 0 additions & 14 deletions b/‎.azure-pipelines/PrettierCheck.yml
Lines changed: 0 additions & 14 deletions
diff --git a/‎.azure-pipelines/SDKAutomation.yml
Lines changed: 0 additions & 94 deletions b/‎.azure-pipelines/SDKAutomation.yml
Lines changed: 0 additions & 94 deletions
diff --git a/‎.azure-pipelines/ShouldSendPRToMain.yml
Lines changed: 6 additions & 0 deletions b/‎.azure-pipelines/ShouldSendPRToMain.yml
Lines changed: 6 additions & 0 deletions
diff --git a/‎.azure-pipelines/Spellcheck.yml
Lines changed: 0 additions & 14 deletions b/‎.azure-pipelines/Spellcheck.yml
Lines changed: 0 additions & 14 deletions
diff --git a/‎.azure-pipelines/Syntax.yml
Lines changed: 0 additions & 20 deletions b/‎.azure-pipelines/Syntax.yml
Lines changed: 0 additions & 20 deletions
diff --git a/‎.azure-pipelines/azure-pipelines-data-container.yml
Lines changed: 2 additions & 2 deletions b/‎.azure-pipelines/azure-pipelines-data-container.yml
Lines changed: 2 additions & 2 deletions
diff --git a/‎.github/PULL_REQUEST_TEMPLATE.md
Lines changed: 29 additions & 21 deletions b/‎.github/PULL_REQUEST_TEMPLATE.md
Lines changed: 29 additions & 21 deletions
diff --git a/‎.github/comment.yml
Lines changed: 6 additions & 6 deletions b/‎.github/comment.yml
Lines changed: 6 additions & 6 deletions
diff --git a/‎.github/issue_assignment.yml
Lines changed: 3 additions & 9 deletions b/‎.github/issue_assignment.yml
Lines changed: 3 additions & 9 deletions
@@ -1,8 +1,6 @@
 jobs:
   - job: "BranchProtectionForPrivateRepo"
-    pool:
-      vmImage: 'Ubuntu 16.04'
-    condition: and(variables['PRIVATE'], eq(variables['System.PullRequest.TargetBranch'], 'master'))
+    condition: and(variables['PRIVATE'], eq(variables['System.PullRequest.TargetBranch'], 'main'))
     steps:
     - script: '>&2 echo "the branch is protected"'
       failOnStderr: true
@@ -0,0 +1,6 @@
+jobs:
+  - job: "ShouldSendPRToMain"
+    condition: eq(variables['System.PullRequest.TargetBranch'], 'master')
+    steps:
+    - script: '>&2 echo "##vso[task.logissue type=error]Please edit the pull request to targeting new default branch main"'
+      failOnStderr: true
@@ -3,11 +3,11 @@ schedules:
   displayName: Daily build
   branches:
     include:
-    - master
+    - main
   always: true
 
 pool:
-  vmImage: 'Ubuntu-16.04'
+  vmImage: 'Ubuntu-20.04'
 
 variables:
   IMAGE_TAG_PREFIX: $[format('1.0.{0:HHm}', pipeline.startTime)]
 
@@ -2,16 +2,16 @@
 </i>
 
 ### Changelog
-Please ensure to add changelog with this PR by answering the following questions.
-  1. What's the purpose of the update?    
-      - [ ] new service onboarding 
-      - [ ] new API version 
-      - [ ] update existing version for new feature 
+Add a changelog entry for this PR by answering the following questions:
+  1. What's the purpose of the update?
+      - [ ] new service onboarding
+      - [ ] new API version
+      - [ ] update existing version for new feature
       - [ ] update existing version to fix swagger quality issue in s360
-      - [ ] Other, please clarify 
-  2. When you are targeting to deploy new service/feature to public regions? Please provide date, or month to public if date is not available yet.
-  3. When you expect to publish swagger? Please provide date, or month to public if date is not available yet.
-  4. If it's an update to existing version,  please select SDKs of specific language and CLIs that require refresh after swagger is published.
+      - [ ] Other, please clarify
+  2. When are you targeting to deploy the new service/feature to public regions? Please provide the date or, if the date is not yet available, the month.
+  3. When do you expect to publish the swagger? Please provide date or, the the date is not yet available, the month.
+  4. If updating an existing version, please select the specific langauge SDKs and CLIs that must be refreshed after the swagger is published.
       - [ ] SDK of .NET (need service team to ensure code readiness)
       - [ ] SDK of Python
       - [ ] SDK of Java
@@ -20,7 +20,7 @@ Please ensure to add changelog with this PR by answering the following questions
       - [ ] PowerShell
       - [ ] CLI
       - [ ] Terraform
-      - [ ] No, no need to refresh for updates in this PR
+      - [ ] No refresh required for updates in this PR
 
 ### Contribution checklist:
 - [ ] I commit to follow the [Breaking Change Policy](http://aka.ms/bcforapi) of "no breaking changes"
@@ -29,24 +29,32 @@ Please ensure to add changelog with this PR by answering the following questions
 
 If any further question about AME onboarding or validation tools, please view the [FAQ](https://aka.ms/faqinprreview).
 
-### ARM API Review Checklist
-- [ ] Ensure to check this box if one of the following scenarios meet updates in the PR, so that label “WaitForARMFeedback” will be added automatically to involve ARM API Review. Failure to comply may result in delays for manifest application. Note this does not apply to data plane APIs, all “removals” and “adding a new property” no more require ARM API review.
+### ARM API Review Checklist 
+
+> **Applicability**: :warning: 
+>
+> If your changes encompass only the following scenarios, you should SKIP this section, as these scenarios do not require ARM review.
+> - Change to data plane APIs 
+> - Adding new properties 
+> - All removals
+
+Otherwise your PR may be subject to ARM review requirements. Complete the following:
+- [ ] Check this box if any of the following apply to the PR so that label "WaitForARMFeedback" will be added automatically to begin ARM API Review. Failure to comply may result in delays to the manifest.
+  - Adding a new service
   - Adding new API(s)
   - Adding a new API version
-  -  [ ] Ensure to copy the existing version into new directory structure for first commit (including refactoring) and then push new changes including version updates in separate commits. This is required to review the changes efficiently.
-  - Adding a new service
+    -[ ] To review changes efficiently, ensure you copy the existing version into the new directory structure for first commit and then push new changes, including version updates, in separate commits.
 
-- [ ] Please ensure you've reviewed following [guidelines](https://aka.ms/rpguidelines) including [ARM resource provider contract](https://github.com/Azure/azure-resource-manager-rpc) and [REST guidelines](https://github.com/microsoft/api-guidelines/blob/vNext/azure/Guidelines.md). Estimated time (4 hours). This is required before you can request review from ARM API Review board.
+- [ ] Ensure you've reviewed following [guidelines](https://aka.ms/rpguidelines) including [ARM resource provider contract](https://github.com/Azure/azure-resource-manager-rpc) and [REST guidelines](https://github.com/microsoft/api-guidelines/blob/vNext/azure/Guidelines.md). Estimated time (4 hours). This is required before you can request review from ARM API Review board.
 
 - [ ] If you are blocked on ARM review and want to get the PR merged with urgency, please get the ARM oncall for reviews (*RP Manifest Approvers* team under <ins>Azure Resource Manager service</ins>) from IcM and reach out to them. 
 
 ### Breaking Change Review Checklist 
-If there are following updates in the PR, ensure to request an approval from Breaking Change Review Board as defined in the [Breaking Change Policy](http://aka.ms/bcforapi). 
-
-- [ ] Removing API(s) in stable version
-- [ ] Removing properties in stable version
-- [ ] Removing API version(s) in stable version
-- [ ] Updating API in stable or public preview version with Breaking Change Validation errors
+If any of the following scenarios apply to the PR, request approval from the Breaking Change Review Board as defined in the [Breaking Change Policy](http://aka.ms/bcforapi). 
+- [ ] Removing API(s) in a stable version
+- [ ] Removing properties in a stable version
+- [ ] Removing API version(s) in a stable version
+- [ ] Updating API in a stable or public preview version with Breaking Change Validation errors
 - [ ] Updating API(s) in public preview over 1 year (refer to [Retirement of Previews](https://dev.azure.com/msazure/AzureWiki/_wiki/wikis/AzureWiki.wiki/37683/Retirement-of-Previews))
 
 **Action**: to initiate an evaluation of the breaking change, create a new intake using the [template for breaking changes](https://aka.ms/Breakingchangetemplate). Addition details on the process and office hours are on the [Breaking change Wiki](https://dev.azure.com/msazure/AzureWiki/_wiki/wikis/AzureWiki.wiki/37684/Breaking-Changes).
 
@@ -6,7 +6,7 @@
     booleanFilterExpression: "!(ARMSignedOff||ARMChangesRequested||Approved-OkToMerge||WaitForARMRevisit)"
     onCheckedLabels:
       - WaitForARMFeedback
-    onCheckedComments: "Hi, @${PRAuthor} your PR are labelled with <b> WaitForARMFeedback</b>. A notification email will be sent out shortly afterwards to notify ARM review board([email protected]). cc @${PRAssignee} "
+    onCheckedComments: "Hi, @${PRAuthor} your PR are labelled with <b> WaitForARMFeedback</b>. A notification email will be sent out shortly afterwards to notify ARM review board([email protected])."
 
 - rule:
     type: label
@@ -21,7 +21,7 @@
       - Azure/azure-rest-api-specs-pr
     variables:
       openapiHub: https://portal.azure-devex-tools.com
-      to: Azure/azure-rest-api-specs/master
+      to: Azure/azure-rest-api-specs/main
     label: Approved-OkToMerge
     onLabeledComments: "Hi @${PRAuthor},Your PR is approved. Congratulations. </br>  <li> Since your PR is in private repo (azure-rest-api-specs-pr),  there won’t be PR merge. If you want to publish the PR to public repo (Azure/azure-rest-api-specs) and get it merged, pls use [OpenAPIHub Publish PR](${openapiHub}/tools/publishpullrequest?pr=${owner}/${repo}/${PRNumber}&to=${to}).</li> <li> For further guidance on how to proceed.  Please refer to this [wiki](https://dev.azure.com/azure-sdk/internal/_wiki/wikis/internal.wiki/205/RP-Scenarios-to-Contribute-to-Swagger?anchor=**public-repository-vs.-private-repository**)</li>"
 
@@ -37,9 +37,9 @@
       Hi @${PRAuthor}, Your PR has some issues. Please fix the CI sequentially by following the order of `Avocado, semantic validation, model validation, breaking change, lintDiff`. 
       <table><tr><th>Task</th><th>How to fix</th><th>Priority</th><th>Support (Microsoft alias)</th></tr>
       <tr><td>Avocado</td><td>[Fix-Avocado](https://github.com/Azure/avocado)</td><td>High</td><td>ruowan</td></tr>
-      <tr><td>Semantic validation</td><td>[Fix-SemanticValidation-Error](https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/ci-fix.md#semantic-validation)</td><td>High</td><td>raychen, jianyxi</td></tr>
-      <tr><td>Model validation</td><td>[Fix-ModelValidation-Error](https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/ci-fix.md#model-validation)</td><td>High</td><td>raychen,jianyxi</td></tr>
-      <tr><td>LintDiff</td><td>[Fix-LintDiff](https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/ci-fix.md#linter-validation)</td><td>high</td><td>jianyxi, ruoxuan</td></tr></table> 
+      <tr><td>Semantic validation</td><td>[Fix-SemanticValidation-Error](https://github.com/Azure/azure-rest-api-specs/blob/main/documentation/ci-fix.md#semantic-validation)</td><td>High</td><td>raychen, jianyxi</td></tr>
+      <tr><td>Model validation</td><td>[Fix-ModelValidation-Error](https://github.com/Azure/azure-rest-api-specs/blob/main/documentation/ci-fix.md#model-validation)</td><td>High</td><td>raychen,jianyxi</td></tr>
+      <tr><td>LintDiff</td><td>[Fix-LintDiff](https://github.com/Azure/azure-rest-api-specs/blob/main/documentation/ci-fix.md#linter-validation)</td><td>high</td><td>jianyxi, ruoxuan</td></tr></table> 
       If you need further help, please feedback via [swagger feedback](https://aka.ms/swaggerfeedback)." 
 
 - rule:
@@ -48,7 +48,7 @@
       openapiHub: https://portal.azure-devex-tools.com
     keywords:
       - "I have reviewed the [documentation](https://aka.ms/ameonboard) for the workflow."
-    onOpenedComments: "Hi, @${PRAuthor} Thanks for your PR. I am workflow bot for review process. Here are some small tips. </br> <li> Please ensure to do self-check against checklists in first PR comment.</li> <li> PR assignee is the person auto-assigned and responsible for your current PR reviewing and merging. </li>   <li> For specs comparison cross API versions,  Use [API Specs Comparison Report Generator](${openapiHub}/tools/diff?pr=${owner}/${repo}/${PRNumber})</li>  <li> If there is CI failure(s), to fix CI error(s) is mandatory for PR merging; or you need to provide justification in PR comment for explanation. [How to fix?](https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/ci-fix.md)</li></br> Any feedback about review process or workflow bot, pls contact swagger and tools team. [email protected]"
+    onOpenedComments: "Hi, @${PRAuthor} Thanks for your PR. I am workflow bot for review process. Here are some small tips. </br> <li> Please ensure to do self-check against checklists in first PR comment.</li> <li> PR assignee is the person auto-assigned and responsible for your current PR reviewing and merging. </li>   <li> For specs comparison cross API versions,  Use [API Specs Comparison Report Generator](${openapiHub}/tools/diff?pr=${owner}/${repo}/${PRNumber})</li>  <li> If there is CI failure(s), to fix CI error(s) is mandatory for PR merging; or you need to provide justification in PR comment for explanation. [How to fix?](https://github.com/Azure/azure-rest-api-specs/blob/main/documentation/ci-fix.md)</li></br> Any feedback about review process or workflow bot, pls contact swagger and tools team. [email protected]"
 
 - rule:
     type: PROpen
 
@@ -1,12 +1,6 @@
 ---
-- rule:
-    booleanFilterExpression: "needs-triage"
+- rule: 
+    booleanFilterExpression: "APIStewardshipBoard-ReviewRequested"
     assignees:
-      - PhoenixHe-msft
-      - raych1
-      - akning-ms
-      - leni-msft
-      - ruowan
-      - jianyexi
-      - zhenglaizhang
+      - mikekistler