Merge branch 'master' into csharp

Author: cataggar

.azure-pipelines/NetworkValidation.yml

@@ -18,7 +18,7 @@ jobs:
     displayName: Install Node.js
   - script: npm install autorest -g
     displayName: Install autorest
-  - script: git clone --depth 1 -- https://dev.azure.com/v-anevse/BuildScripts/_git/BuildScripts ..\BuildScripts
+  - script: git clone --depth 1 -- https://dev.azure.com/nrp-swagger/swagger-stack/_git/automation-scripts ..\BuildScripts
     displayName: Clone build tools
   - powershell: |
       $swgrPath = (Get-Item ".\").FullName

.azure-pipelines/SDKAutomation.yml

@@ -34,6 +34,8 @@ jobs:
         SDK_REPO_NAME: azure-sdk-for-js
       Python:
         SDK_REPO_NAME: azure-sdk-for-python
+      PythonT2:
+        SDK_REPO_NAME: azure-sdk-for-python-track2
       Cliextension:
         SDK_REPO_NAME: azure-cli-extensions
       Go:

.github/computeReviewLabeler.yml

@@ -76,5 +76,3 @@
 /specification/trafficmanager/ @allencal @hrkulkarmsft
 /specification/web/ @lukaszstem @naveedaz @nking92
 /profile/ @shahabhijeet
-/.github/computeReviewLabeler.yml @grizzlytheodore
-/.github/workflows/computeReviewLabeler.yml @grizzlytheodore

.github/workflows/computeReviewLabeler.yml

@@ -466,6 +466,7 @@ domainservices
 DOTALL
 DRMs
 dsmax
+DTDL
 Dtus
 duration'PT
 EAPMSCHA
@@ -507,6 +508,7 @@ ErrorSchema
 Español
 estaba
 Etag
+etags
 Ethereum
 evalue
 evaluateautoscale
@@ -515,6 +517,7 @@ eventgrid
 Eventhub
 eventhubconnections
 eventhubs
+eventroutes
 eventtime
 eventtypes
 EWDG
@@ -688,6 +691,7 @@ imagesearch
 IMDS
 importdevices
 Inbuild
+incomingrelationships
 indic
 inferencing
 Informations
@@ -1781,5 +1785,11 @@ userprincipalname
 sessionstate
 sessionhosts
 hostpool
+Alexa
+regeneratekeys
+Directline
+Keyschannel
+azureADMetrics
 sparkr
 ambari
+dotnetspark

CODEOWNERS

@@ -108,7 +108,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "./definitions.json#/definitions/QuotaCounterValueContractProperties"
+              "$ref": "./definitions.json#/definitions/QuotaCounterValueUpdateContract"
             },
             "description": "The value of the quota counter to be applied to all quota counter periods."
           },
@@ -212,7 +212,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "./definitions.json#/definitions/QuotaCounterValueContractProperties"
+              "$ref": "./definitions.json#/definitions/QuotaCounterValueUpdateContract"
             },
             "description": "The value of the Quota counter to be applied on the specified period."
           },

custom-words.txt

@@ -3847,6 +3847,16 @@
       },
       "description": "Quota counter value details."
     },
+    "QuotaCounterValueUpdateContract": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/QuotaCounterValueContractProperties",
+          "description": "Quota counter value details."
+        }
+      },
+      "description": "Quota counter value details."
+    },
     "RecipientEmailCollection": {
       "properties": {
         "value": {

specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-12-01/apimquotas.json

@@ -6,8 +6,10 @@
     "subscriptionId": "subid",
     "quotaCounterKey": "ba",
     "parameters": {
-      "callsCount": 0,
-      "kbTransferred": 2.5630078125
+      "properties": {
+        "callsCount": 0,
+        "kbTransferred": 2.5630078125
+      }
     }
   },
   "responses": {

specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2019-12-01/definitions.json

@@ -7,8 +7,10 @@
     "quotaCounterKey": "ba",
     "quotaPeriodKey": "0_P3Y6M4DT12H30M5S",
     "parameters": {
-      "callsCount": 0,
-      "kbTransferred": 0
+      "properties": {
+        "callsCount": 0,
+        "kbTransferred": 0
+      }
     }
   },
   "responses": {