Azure · xaliciayang · Nov 9, 2020 · Nov 9, 2020 · Nov 10, 2020 · Nov 10, 2020
@@ -39,4 +39,3 @@ steps:
     repository: $(CONTAINER_REGISTRY_REPOSITORY_NAME)
     tags: |
       latest
-      $(IMAGE_TAG_PREFIX)$(Build.BuildNumber)
@@ -35,3 +35,18 @@
     type: label
     label: NewApiVersionRequired
     onLabeledComments: "<b>NewApiVersionRequired reason:</b></br> </br><b>A service’s API is a contract with customers and is represented by using the api-version query parameter. Changes such as adding an optional property to a request/response or introducing a new operation is a change to the service’s contract and therefore requires a new api-version value. This is critically important for documentation, client libraries, and customer support. </b> </br></br> EXAMPLE: if a customer calls a service in the public cloud using <b>api-version=2020-07-27</b>, the new property or operation may exist but if they call the service in a government cloud, air-gapped cloud, or Azure Stack Hub cloud using the same api-version, the property or operation may not exist. Because there is no clear relationship between the service api-version and the new property/operation, customers can’t trust the documentation and Azure customer have difficulty helping customers diagnose issues. In addition, each client library version documents the service version it supports. When an optional property or new operation is added to a service and its Swagger, new client libraries must be produced to expose this functionality to customers. Without updating the api-version, it is unclear to customers which version of a client library supports these new features.  "
+
+- rule:
+    type: label
+    label: CI-FixRequiredOnFailure
+    onLabeledComments: "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</th></tr><tr><td>Avocado</td><td>[Fix-Avocado](https://github.com/Azure/avocado)</td><td>High</td><td>ruowan@microsoft.com</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>Jianye.Xi@microsoft.com, ruoxuan@microsoft.com</td></tr><tr><td>Semantic validation</td><td>[Fix-SenmanticValidation-Error](https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/ci-fix.md#semantic-validation)</td><td>High</td><td>raychen@microsoft.com, Jianye.xi@microsoft.com</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@microsoft.com,Jianye.xi@microsoft.com</td></tr></table> If you need further help, please feedback via [swagger feedback](https://aka.ms/swaggerfeedback)." 
+
+- rule:
+    type: PROpen
+    variables:
+      openapiHub: https://openapihub.test.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 cross api-version diff. See [OpenAPI Hub Diff](${openapiHub}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. vsswagger@microsoft.com"
+
+
@@ -20,7 +20,6 @@
     reviewers:
       - anuchandy
       - jhendrixMSFT
-      - lmazuel
       - tjprescott
 
 
@@ -99,7 +98,6 @@
     paths:
       - "specification/storage/**"
     reviewers:
-      - qianwens
       - Juliehzl
 
 
@@ -140,6 +138,12 @@
       - "specification/web/**"
     reviewers:
       - weidongxu-microsoft
+
+- rule:
+    paths:
+      - "specification/testbase/**"
+    reviewers:
+      - PhoenixHe-msft
 
 - rule:
     paths:

diff --git a/custom-words.txt b/custom-words.txt
@@ -1,4 +1,4 @@
-A128CBCPAD
+A128CBCPAD
 A192CBCPAD
 A256CBCPAD
 AADDS
@@ -142,6 +142,7 @@ authorizationrules
 authpriv
 authprovider
 authproviders
+Auths
 authsettings
 authsid
 autobackup
@@ -309,6 +310,7 @@ CIDRs
 CIFS
 ciphertext
 CISCOASA
+Citus
 claimCondition
 claimType
 clfs
@@ -333,6 +335,7 @@ cloudsimple
 clustermonitoring
 clustername
 CMAF
+CMEK
 Cmdkey
 cmdlet
 CMMI
@@ -1016,6 +1019,7 @@ MCAS
 MDATP
 mebibytes
 mediaservices
+Meru
 Mesos
 messagingplan
 Metada
@@ -2044,3 +2048,7 @@ ziplist
 Zoho
 zoneinfo
 zset
+tpgs
+ProviderHub
+checkin
+regionality
diff --git a/documentation/openapi-authoring-automated-guidelines.md b/documentation/openapi-authoring-automated-guidelines.md
@@ -61,6 +61,7 @@ We request OpenAPI(Swagger) spec authoring be assigned to engineers who have an
 | [R4017](#r4017) | [TopLevelResourcesListBySubscription](#r4017) | ARM OpenAPI(swagger) specs |
 | [R4018](#r4018) | [OperationsApiResponseSchema](#r4018) | ARM OpenAPI(swagger) specs |
 | [R4019](#r4019) | [GetCollectionResponseSchema](#r4019) | ARM OpenAPI(swagger) specs |
+| [R4009](#r4009) | [RequiredSystemDataInNewApiVersions](#r4009) | ARM OpenAPI(swagger) specs |
 
 #### ARM Warnings
 
@@ -71,7 +72,6 @@ We request OpenAPI(Swagger) spec authoring be assigned to engineers who have an
 | [R2057](#r2057) | [InvalidSkuModel](#r2057) | ARM OpenAPI(swagger) specs |
 | [R3010](#r3010) | [TrackedResourceListByImmediateParent](#r3010) | ARM OpenAPI(swagger) specs |
 | [R2004](#r2004) | [NonApplicationJsonType](#r2004) | ARM OpenAPI(swagger) specs |
-| [R4009](#r4009) | [RequiredSystemDataInNewApiVersions](#r4009) | ARM OpenAPI(swagger) specs |
 | [R4014](#r4014) | [AllResourcesMustHaveGetOperation](#r4014) | ARM OpenAPI(swagger) specs |
 ### SDK Violations
 
@@ -1590,7 +1590,7 @@ Links: [Index](#index) | [Error vs. Warning](#error-vs-warning) | [Automated Rul
 
 **Output Message**: A '{0}' operation '{1}' with x-ms-long-running-operation extension must have a valid terminal success status code {2}.
 
-**Description**: The allowed response status codes for a long DELETE operation are "200", "204". The allowed response status codes for a POST operation are "200", "201" & "204". The allowed response status codes for a PUT operation are  "200" & "201".
+**Description**: The allowed response status codes for a long DELETE operation are "200", "204". The allowed response status codes for a POST operation are "200", "201" ,"202", & "204". The allowed response status codes for a PUT operation are  "200" & "201".
 
 **Why the rule is important**: This will ensure that the DELETE/POST/PUT operations are designed correctly.Please refer [here](./swagger-extensions.md#x-ms-long-running-operation) for further details.
 
@@ -2269,7 +2269,7 @@ Links: [Index](#index) | [Error vs. Warning](#error-vs-warning) | [Automated Rul
 
 **Output Message** : Must not have duplicate name in x-ms-enum extension , make sure every x-ms-enum name unique.  
 
-**Description** : Must not have duplicate name in x-ms-enum extension.
+**Description** : This rule will check all the swagger files with the same api-version, and ensure there is no duplicate x-ms-enum name. 
 
 **CreatedAt**: March 18, 2020
 
@@ -2438,25 +2438,33 @@ The following would be invalid:
 ```
 Links: [Index](#index) | [Error vs. Warning](#error-vs-warning) | [Automated Rules](#automated-rules) | [ARM](#arm-violations): [Errors](#arm-errors) or [Warnings](#arm-warnings) | [SDK](#sdk-violations): [Errors](#sdk-errors) or [Warnings](#sdk-warnings)
 
-### <a name="r4009" ></a>R4009 RequiredSystemDataInNewApiVersion
+### <a name="r4009" ></a>R4009 RequiredSystemDataInNewApiVersions
 
-**Category** : ARM Warning
+**Category** : ARM Error
 
 **Applies to** : ARM OpenAPI(swagger) specs
 
-**Output Message** : The response of operation '{operation name }' is defined without 'systemData'. Consider adding the systemData to the response.
+**Output Message** : The response of operation '{operation name}' is defined without 'systemData'. Consider adding the systemData to the response.
 
-**Description** : The responses of GET, PUT and PATCH in new API versions should contain the `systemData` object.The version after 2020-05-01 consider as a new API version.
+**Description** : Per [common-api-contracts](https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/common-api-contracts.md#system-metadata-for-all-azure-resources), all Azure resources should implement the `systemData` object property in new api-version. In this lint rule, the version after 2020-05-01 considers as a new API version.
 
 **CreatedAt**: May 21, 2020
 
 **LastModifiedAt**: May 21, 2020
 
-**How to fix the violation**: For each response in the GET/PUT/PATCH operation add the systemData object:
+**How to fix the violation**: For each response in the GET/PUT/PATCH operation add the systemData object. 
+It's recommended to refer to the 'systemData' defined in [v2/types.json](https://github.com/Azure/azure-rest-api-specs/blob/7dddc4bf1e402b6e6737c132ecf05b74e2b53b08/specification/common-types/resource-management/v2/types.json#L445) which is provided for fixing the error.
 ``` json
- "systemData": {
-    "$ref": "#/definitions/SystemData"
+"MyResource": {
+  "properties": {
+    ...
+    ...
+    "systemData": {
+      "$ref": "v2/types.json#/definitions/systemData"
+    }
   }
+}
+
 ```
 
 Links: [Index](#index) | [Error vs. Warning](#error-vs-warning) | [Automated Rules](#automated-rules) | [ARM](#arm-violations): [Errors](#arm-errors) or [Warnings](#arm-warnings) | [SDK](#sdk-violations): [Errors](#sdk-errors) or [Warnings](#sdk-warnings)
@@ -3204,4 +3212,4 @@ The following would be valid:
         }
 ...
 ```
-Links: [Index](#index) | [Error vs. Warning](#error-vs-warning) | [Automated Rules](#automated-rules) | [ARM](#arm-violations): [Errors](#arm-errors) or [Warnings](#arm-warnings) | [SDK](#sdk-violations): [Errors](#sdk-errors) or [Warnings](#sdk-warnings)
+Links: [Index](#index) | [Error vs. Warning](#error-vs-warning) | [Automated Rules](#automated-rules) | [ARM](#arm-violations): [Errors](#arm-errors) or [Warnings](#arm-warnings) | [SDK](#sdk-violations): [Errors](#sdk-errors) or [Warnings](#sdk-warnings)
diff --git a/documentation/samplefiles/samplereadme.md b/documentation/samplefiles/samplereadme.md
@@ -53,8 +53,6 @@ swagger-to-sdk:
   - repo: azure-sdk-for-java
   - repo: azure-sdk-for-go
   - repo: azure-sdk-for-js
-    after_scripts:
-      - bundle install && rake arm:regen_all_profiles['azure_mgmt_[[ServiceName]]']
   - repo: azure-resource-manager-schemas
     after_scripts:
       - node sdkauto_afterscript.js [[ServiceName]]/resource-manager

@@ -9,11 +9,18 @@ go:
   clear-output-folder: true
 ```
 
+### Go multi-api
+
+``` yaml $(go) && $(multiapi)
+batch:
+  - tag: package-2020-07-01-preview
+```
+
 ### Tag: package-2020-07-01-preview and go
 
 These settings apply only when `--tag=package-2020-07-01-preview --go` is specified on the command line.
 Please also specify `--go-sdks-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
 ```yaml $(tag) == 'package-2020-07-01-preview' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/adp/mgmt/2019-07-01-preview
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2019-07-01-preview/$(namespace)
 ```
diff --git a/...cation/advisor/resource-manager/Microsoft.Advisor/preview/2020-07-01-preview/advisor.json b/...cation/advisor/resource-manager/Microsoft.Advisor/preview/2020-07-01-preview/advisor.json
@@ -230,6 +230,11 @@
         "potentialScoreIncrease": {
           "description": "The potential percentage increase in overall score at subscription level once all recommendations in this scope are implemented.",
           "type": "number"
+        },
+        "categoryCount": {
+          "description": "The count of impacted categories.",
+          "type": "number",
+          "readOnly": true
         }
       }
     },
@@ -249,7 +254,7 @@
               "month"
             ]
           },
-          "data": {
+          "scoreHistory": {
             "description": "The past score data",
             "type": "array",
             "items": {

diff --git a/...-manager/Microsoft.Advisor/preview/2020-07-01-preview/examples/GetAdvisorScoreDetail.json b/...-manager/Microsoft.Advisor/preview/2020-07-01-preview/examples/GetAdvisorScoreDetail.json
@@ -15,12 +15,13 @@
             "score": 1,
             "consumptionUnits": 12,
             "impactedResourceCount": 1,
-            "potentialScoreIncrease": 0
+            "potentialScoreIncrease": 0,
+            "categoryCount": 1
           },
           "timeSeries": [
             {
               "aggregationLevel": "day",
-              "data": [
+              "scoreHistory": [
                 {
                   "date": "2020-06-25T00:00:00Z",
                   "score": 1,
@@ -74,7 +75,7 @@
             },
             {
               "aggregationLevel": "month",
-              "data": [
+              "scoreHistory": [
                 {
                   "date": "2020-06-25T00:00:00Z",
                   "score": 1,
@@ -100,7 +101,7 @@
             },
             {
               "aggregationLevel": "week",
-              "data": [
+              "scoreHistory": [
                 {
                   "date": "2020-06-25T00:00:00Z",
                   "score": 1,
-Original file line number
+Diff line change
@@ Expand Up / @@ -39,4 +39,3 @@ steps: @@
         repository: $(CONTAINER_REGISTRY_REPOSITORY_NAME)
         tags: |
           latest
-          $(IMAGE_TAG_PREFIX)$(Build.BuildNumber)