Merge pull request #5275 from Azure/sergey/fi

FI to network
Azure · Feb 27, 2019 · ed6d838 · ed6d838
2 parents 5e09701 + cb5dd9e
commit ed6d838
Show file tree

Hide file tree

Showing 215 changed files with 31,221 additions and 43 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -25,11 +25,13 @@ jobs:
       echo TRAVIS_PULL_REQUEST_SLUG: $(TRAVIS_PULL_REQUEST_SLUG)
       echo TRAVIS_PULL_REQUEST_SHA: $(TRAVIS_PULL_REQUEST_SHA)
       echo PR_ONLY: $(PR_ONLY)
+    displayName: "Info"
   - task: Npm@1
     displayName: 'npm install'
     inputs:
       verbose: false
   - script: 'npm test -- test/syntax.js'
+    displayName: 'Syntax validation'
 
 - job: "Semantic"
   pool:
@@ -40,6 +42,7 @@ jobs:
     inputs:
       verbose: false
   - script: 'node scripts/semanticValidation.js'
+    displayName: 'Semantic Validation'
 
 - job: "ModelValidation"
   pool:
@@ -50,17 +53,20 @@ jobs:
     inputs:
       verbose: false
   - script: 'node scripts/modelValidation.js'
+    displayName: 'Model Validation'
 
 - job: "BreakingChange"
   pool:
     vmImage: 'Ubuntu 16.04'
   steps:
   - script: 'scripts/install-dotnet.sh'
+    displayName: 'Insall .Net'
   - task: Npm@1
     displayName: 'npm install'
     inputs:
       verbose: false
   - script: 'node scripts/breaking-change.js'
+    displayName: 'Breaking Changes'
 
 - job: "LintDiff"
   variables:
@@ -73,9 +79,12 @@ jobs:
     inputs:
       verbose: false
   - script: 'scripts/install-dotnet.sh'
+    displayName: 'install .Net'
   - script: 'node scripts/momentOfTruth.js && node scripts/momentOfTruthPostProcessing.js'
+    displayName: 'LintDiff'
 
 - job: "SDK"
+  timeoutInMinutes: 120
   strategy:
     matrix:
       ruby:
@@ -100,3 +109,4 @@ jobs:
     vmImage: 'Ubuntu 16.04'
   steps:
   - script: "scripts/swagger-to-sdk.sh Azure/$(AZURE_SDK_REPO) -v $(AZURE_SDK_PARAMS)"
+    displayName: "Swagger to SDK script"
diff --git a/profile/2019-03-01-hybrid.json b/profile/2019-03-01-hybrid.json
@@ -36,7 +36,7 @@
                 "virtualMachineScaleSets/extensions",
                 "virtualmachineScaleSets/networkInterfaces",
                 "virtualMachineScaleSets/virtualMachines",
-                "virtualMachineScaleSets/virtualMachines/networkInterfaces",
+                "virtualMachineScaleSets/virtualMachines/networkInterfaces"
             ],
             "2017-03-30": [
                 "disks",
@@ -189,4 +189,4 @@
             "2017-04-17": []
         }
     }
-}
+}
diff --git a/.../resource-manager/Microsoft.Blueprint/preview/2018-11-01-preview/blueprintAssignment.json b/.../resource-manager/Microsoft.Blueprint/preview/2018-11-01-preview/blueprintAssignment.json
@@ -286,7 +286,8 @@
           "description": "Lock mode.",
           "enum": [
             "None",
-            "AllResources"
+            "AllResourcesReadOnly",
+            "AllResourcesDoNotDelete"
           ],
           "x-ms-enum": {
             "name": "AssignmentLockMode",

diff --git a/...factory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json b/...factory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json
@@ -2,7 +2,7 @@
   "swagger": "2.0",
   "info": {
     "title": "DataFactoryManagementClient",
-    "version": "2017-09-01-preview"
+    "version": "2018-06-01"
   },
   "paths": {},
   "definitions": {

diff --git a/...ource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/IntegrationRuntime.json b/...ource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/IntegrationRuntime.json
@@ -2,7 +2,7 @@
   "swagger": "2.0",
   "info": {
     "title": "DataFactoryManagementClient",
-    "version": "2017-09-01-preview"
+    "version": "2018-06-01"
   },
   "paths": {},
   "definitions": {

diff --git a/...y/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json b/...y/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json
@@ -2,7 +2,7 @@
   "swagger": "2.0",
   "info": {
     "title": "DataFactoryManagementClient",
-    "version": "2017-09-01-preview"
+    "version": "2018-06-01"
   },
   "paths": {},
   "definitions": {

diff --git a/...actory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json b/...actory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json
@@ -2,7 +2,7 @@
   "swagger": "2.0",
   "info": {
     "title": "DataFactoryManagementClient",
-    "version": "2017-09-01-preview"
+    "version": "2018-06-01"
   },
   "paths": {},
   "definitions": {

diff --git a/...factory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Trigger.json b/...factory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Trigger.json
@@ -2,7 +2,7 @@
   "swagger": "2.0",
   "info": {
     "title": "DataFactoryManagementClient",
-    "version": "2017-09-01-preview"
+    "version": "2018-06-01"
   },
   "paths": {},
   "definitions": {
@@ -275,8 +275,7 @@
         "typeProperties"
       ]
     },
-    "BlobEventsTrigger":
-    {
+    "BlobEventsTrigger": {
       "description": "Trigger that runs every time a Blob event occurs.",
       "type": "object",
       "allOf": [
@@ -285,8 +284,7 @@
         }
       ],
       "properties": {
-        "typeProperties":
-        {
+        "typeProperties": {
           "description": "Blob Events Trigger properties.",
           "x-ms-client-flatten": true,
           "properties": {