Merge from master

.azure-pipelines/SDKAutomation.yml

@@ -42,6 +42,8 @@ jobs:
         SDK_REPO_NAME: azure-sdk-for-go
       Trenton:
         SDK_REPO_NAME: azure-sdk-for-trenton
+      Schema:
+        SDK_REPO_NAME: azure-resource-manager-schemas
   steps:
   - checkout: none
   - script: |

.github/issue_assignment.yml

@@ -19,3 +19,4 @@
       - qianwens
       - ruowan
       - MyronFanQiu
+      - jianyexi

.github/pull_request_assignment.yml

@@ -152,3 +152,4 @@
       - leni-msft
       - qianwens
       - ruowan
+      - jianyexi

CODEOWNERS

@@ -10,7 +10,7 @@
 /specification/billing/ @wilcobmsft
 /specification/cdn/ @csmengwan @injyzarif @prakharsharma10
 /specification/cognitiveservices/ @felixwa @yangyuan
-/specification/compute/ @hyonholee @mabhard @danielli90 @smotwani @ppatwa @vikramd-ms @savyasachisamal @yunusm @ZhidongPeng @nkuchta @maheshnemichand @najams @changov
+/specification/compute/ @bilaakpan-ms @sandido @dkulkarni-ms @haagha @madewithsmiles @MS-syh2qs @grizzlytheodore @hyonholee @mabhard @danielli90 @smotwani @ppatwa @vikramd-ms @savyasachisamal @yunusm @ZhidongPeng @nkuchta @maheshnemichand @najams @changov
 /specification/consumption/ @kjeur @panda-wang
 /specification/containerinstance/ @novinc
 /specification/containerregistry/ @djyou
@@ -43,7 +43,7 @@
 /specification/mobileengagement/ @pshrosbree
 /specification/monitor/ @gucalder
 /specification/mysql/ @qingqingyuan
-/specification/network/ @MikhailTryakhov @number213 @solhaile @v-shhatt
+/specification/network/ @MikhailTryakhov
 /specification/notificationhubs/ @amolr @smithab
 /specification/operationalinsights/ @sw47
 /specification/operationsmanagement/ @dashimi16
@@ -65,7 +65,7 @@
 /specification/service-map/ @daveirwin1
 /specification/servicebus/ @sazeesha @v-ajnava
 /specification/servicefabric/ @juhacket @samedder
-/specification/sql/ @dnayantara @jaredmoo @nathannfan
+/specification/sql/ @jaredmoo @jamestao
 /specification/storage/ @blueww @jasonyang-msft @xiaonlimsft @kasobol-msft
 /specification/storageimportexport/ @leoz-ms
 /specification/storagesync/ @ankushbindlish2

azure-pipelines.yml

@@ -23,7 +23,6 @@ jobs:
 - template: .azure-pipelines/Semantic.yml
 - template: .azure-pipelines/Avocado.yml
 - template: .azure-pipelines/ModelValidation.yml
-- template: .azure-pipelines/BreakingChange.yml
 - template: .azure-pipelines/LintDiff.yml
 - template: .azure-pipelines/NetworkValidation.yml
 - template: .azure-pipelines/Spellcheck.yml

cSpell.json

@@ -89,6 +89,78 @@
                 "Ochestrator"
             ]
         },
+        {
+            "filename": "**/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-02-01/managedClusters.json",
+            "words": [
+                "azpodpolicy"
+            ]
+        },
+        {
+            "filename": "**/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-04-01/managedClusters.json",
+            "words": [
+                "azpodpolicy"
+            ]
+        },
+        {
+            "filename": "**/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-06-01/managedClusters.json",
+            "words": [
+                "azpodpolicy"
+            ]
+        },
+        {
+            "filename": "**/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-08-01/managedClusters.json",
+            "words": [
+                "azpodpolicy"
+            ]
+        },
+        {
+            "filename": "**/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-10-01/managedClusters.json",
+            "words": [
+                "azpodpolicy"
+            ]
+        },
+        {
+            "filename": "**/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-11-01/managedClusters.json",
+            "words": [
+                "azpodpolicy"
+            ]
+        },
+        {
+            "filename": "**/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-01-01/managedClusters.json",
+            "words": [
+                "azpodpolicy"
+            ]
+        },
+        {
+            "filename": "**/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-02-01/managedClusters.json",
+            "words": [
+                "azpodpolicy"
+            ]
+        },
+        {
+            "filename": "**/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-03-01/managedClusters.json",
+            "words": [
+                "azpodpolicy"
+            ]
+        },
+        {
+            "filename": "**/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-04-01/managedClusters.json",
+            "words": [
+                "azpodpolicy"
+            ]
+        },
+        {
+            "filename": "**/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-06-01/managedClusters.json",
+            "words": [
+                "azpodpolicy"
+            ]
+        },
+        {
+            "filename": "**/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-07-01/managedClusters.json",
+            "words": [
+                "azpodpolicy"
+            ]
+        },
         {
             "filename": "**/specification/containerregistry/data-plane/Microsoft.ContainerRegistry/preview/2018-08-10/containerregistry.json",
             "words": [
@@ -637,4 +709,4 @@
             ]
         }
     ]
-}
+}

custom-words.txt

@@ -36,6 +36,7 @@ adminmanagement
 ADTO
 adultscore
 affinitized
+AFRINIC
 agentpool
 aggregatedcost
 AHUB
@@ -94,6 +95,7 @@ apimtenant
 apimusers
 apimversionsets
 apitoken
+APNIC
 APNS
 appconfig
 appid
@@ -102,6 +104,7 @@ applynetworkconfigurationupdates
 appservice
 appsettings
 appteststorage
+ARIN
 ABGRABGR
 ARGBARGB
 Arjun
@@ -813,6 +816,7 @@ l'avion
 labaccounts
 labelset
 labservices
+LACNIC
 Lajolla
 largefacelists
 largepersongroups
@@ -1170,6 +1174,7 @@ privatedns
 privatelinks
 privatepreview
 projectable
+propogation
 Protectable
 provisioner
 provisioningservices
@@ -1319,6 +1324,7 @@ RGBARGBA
 RGBRGB
 rgname
 rhel
+RIRs
 Rolledback
 Rollforward
 rollouts
@@ -1476,6 +1482,7 @@ SSTP
 ssword
 standardasciifolding
 startlocalrun
+startpacketcapture
 startrun
 startswith
 starttask
@@ -1486,6 +1493,7 @@ stateful
 staticsite
 statusdir
 stderror
+stoppacketcapture
 stdev
 stopresize
 stopword
@@ -1853,7 +1861,13 @@ sparkr
 ambari
 dotnetspark
 FDID
+Automanage
+Antimalware
+dscp
+Dscp
+qos
+FDID
 watchlists
 Watchlists
 watchlist
-Watchlist
+Watchlist

preproduction-azure-pipelines.yml

@@ -16,7 +16,6 @@ variables:
   PREPRODUCTION_PIPELINE: "true"
 
 jobs:
-  - template: .azure-pipelines/BreakingChange.yml
   - template: .azure-pipelines/ModelValidation.yml
   - template: .azure-pipelines/LintDiff.yml
   - template: .azure-pipelines/Avocado.yml

specification/EnterpriseKnowledgeGraph/resource-manager/readme.azureresourceschema.md

@@ -0,0 +1,20 @@
+## AzureResourceSchema
+
+These settings apply only when `--azureresourceschema` is specified on the command line.
+
+### AzureResourceSchema multi-api
+
+``` yaml $(azureresourceschema) && $(multiapi)
+batch:
+  - tag: package-2018-12-03
+```
+
+### Tag: package-2018-12-03 and azureresourceschema
+
+These settings apply only when `--tag=package-2018-12-03 --azureresourceschema` is specified on the command line.
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+``` yaml $(tag) == 'package-2018-12-03' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+```
+

specification/EnterpriseKnowledgeGraph/resource-manager/readme.md

@@ -75,6 +75,9 @@ swagger-to-sdk:
   - repo: azure-sdk-for-net
   - repo: azure-sdk-for-python
   - repo: azure-sdk-for-go
+  - repo: azure-resource-manager-schemas
+    after_scripts:
+      - node sdkauto_afterscript.js EnterpriseKnowledgeGraph/resource-manager
 ```
 
 ## C#
@@ -91,6 +94,10 @@ csharp:
   clear-output-folder: true
 ```
 
+## AzureResourceSchema
+
+See configuration in [readme.azureresourceschema.md](./readme.azureresourceschema.md)
+
 ## Multi-API/Profile support for AutoRest v3 generators 
 
 AutoRest V3 generators require the use of `--tag=all-api-versions` to select api files.

specification/addons/resource-manager/readme.azureresourceschema.md

@@ -0,0 +1,30 @@
+## AzureResourceSchema
+
+These settings apply only when `--azureresourceschema` is specified on the command line.
+
+### AzureResourceSchema multi-api
+
+``` yaml $(azureresourceschema) && $(multiapi)
+batch:
+  - tag: package-2018-03
+  - tag: package-2017-05
+```
+
+### Tag: package-2018-03 and azureresourceschema
+
+These settings apply only when `--tag=package-2018-03 --azureresourceschema` is specified on the command line.
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+``` yaml $(tag) == 'package-2018-03' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+```
+
+### Tag: package-2017-05 and azureresourceschema
+
+These settings apply only when `--tag=package-2017-05 --azureresourceschema` is specified on the command line.
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+``` yaml $(tag) == 'package-2017-05' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+```
+

specification/addons/resource-manager/readme.md

@@ -50,6 +50,17 @@ input-file:
 ---
 # Code Generation
 
+## Swagger to SDK
+
+This section describes what SDK should be generated by the automatic system.
+This is not used by Autorest itself.
+
+``` yaml $(swagger-to-sdk)
+swagger-to-sdk:
+  - repo: azure-resource-manager-schemas
+    after_scripts:
+      - node sdkauto_afterscript.js addons/resource-manager
+```
 
 ---
 ## C# 
@@ -182,6 +193,10 @@ generate-interface: true
 
 
 
+## AzureResourceSchema
+
+See configuration in [readme.azureresourceschema.md](./readme.azureresourceschema.md)
+
 ## Multi-API/Profile support for AutoRest v3 generators 
 
 AutoRest V3 generators require the use of `--tag=all-api-versions` to select api files.

specification/adhybridhealthservice/resource-manager/readme.azureresourceschema.md

@@ -0,0 +1,20 @@
+## AzureResourceSchema
+
+These settings apply only when `--azureresourceschema` is specified on the command line.
+
+### AzureResourceSchema multi-api
+
+``` yaml $(azureresourceschema) && $(multiapi)
+batch:
+  - tag: package-2014-01
+```
+
+### Tag: package-2014-01 and azureresourceschema
+
+These settings apply only when `--tag=package-2014-01 --azureresourceschema` is specified on the command line.
+Please also specify `--azureresourceschema-folder=<path to the root directory of your azure-resource-manager-schemas clone>`.
+
+``` yaml $(tag) == 'package-2014-01' && $(azureresourceschema)
+output-folder: $(azureresourceschema-folder)/schemas
+```
+