hosunmsft · hosunmsft · Sep 18, 2018 · Sep 13, 2018 · Sep 13, 2018 · Sep 14, 2018
diff --git a/profile/2018-03-01-hybrid.json b/profile/2018-03-01-hybrid.json
@@ -1,7 +1,7 @@
 {
     "info":{
-        "name":"2018-03-01-profile",
-        "description":"Profile definition targeted for hybrid applications that could run on azure stack 1807 version and azure cloud"
+        "name":"2018-03-01-hybrid",
+        "description":"Profile definition targeted for hybrid applications that could run on azure stack 1808 version and azure cloud"
     },
     "resource-manager": {
         "microsoft.authorization": {

diff --git a/...source-manager/Microsoft.Automation/stable/2018-06-30/examples/createOrUpdateRunbook.json b/...source-manager/Microsoft.Automation/stable/2018-06-30/examples/createOrUpdateRunbook.json
@@ -4,7 +4,7 @@
         "resourceGroupName": "rg",
         "automationAccountName": "ContoseAutomationAccount",
         "runbookName": "Get-AzureVMTutorial",
-        "api-version": "2015-10-31",
+        "api-version": "2018-06-30",
         "parameters": {
             "properties": {
                 "logVerbose": false,
@@ -86,10 +86,6 @@
                     "lastModifiedTime": "2017-03-28T21:04:46.6+00:00"
                 }
             }
-        },
-        "400": {
-            "code": "BadRequest",
-            "message": "{\"Message\":\"Cannot specify the content link for a published runbook and draft at the same time.\"}"
         }
     }
 }
diff --git a/...esource-manager/Microsoft.Automation/stable/2018-06-30/examples/createRunbookAsDraft.json b/...esource-manager/Microsoft.Automation/stable/2018-06-30/examples/createRunbookAsDraft.json
@@ -4,7 +4,7 @@
         "resourceGroupName": "rg",
         "automationAccountName": "ContoseAutomationAccount",
         "runbookName": "Get-AzureVMTutorial",
-        "api-version": "2015-10-31",
+        "api-version": "2018-06-30",
         "parameters": {
             "properties": {
                 "logVerbose": false,
@@ -76,10 +76,6 @@
                     "lastModifiedTime": "2018-02-09T03:25:59.097+00:00"
                 }
             }
-        },
-        "400": {
-            "code": "BadRequest",
-            "message": "{\"Message\":\"Cannot specify the content link for a published runbook and draft at the same time.\"}"
         }
     }
 }
diff --git a/...ation/resource-manager/Microsoft.Automation/stable/2018-06-30/examples/createTestJob.json b/...ation/resource-manager/Microsoft.Automation/stable/2018-06-30/examples/createTestJob.json
@@ -4,7 +4,7 @@
         "resourceGroupName": "mygroup",
         "automationAccountName": "ContoseAutomationAccount",
         "runbookName": "Get-AzureVMTutorial",
-        "api-version": "2015-10-31",
+        "api-version": "2018-06-30",
         "parameters": {
             "parameters": {
                 "key01": "value01",

diff --git a/...ation/resource-manager/Microsoft.Automation/stable/2018-06-30/examples/deleteRunbook.json b/...ation/resource-manager/Microsoft.Automation/stable/2018-06-30/examples/deleteRunbook.json
@@ -4,7 +4,7 @@
         "resourceGroupName": "rg",
         "automationAccountName": "ContoseAutomationAccount",
         "runbookName": "Get-AzureVMTutorial",
-        "api-version": "2015-10-31"
+        "api-version": "2018-06-30"
     },
     "responses": {
         "200": {},

diff --git a/...tomation/resource-manager/Microsoft.Automation/stable/2018-06-30/examples/getRunbook.json b/...tomation/resource-manager/Microsoft.Automation/stable/2018-06-30/examples/getRunbook.json
@@ -4,7 +4,7 @@
         "resourceGroupName": "rg",
         "automationAccountName": "ContoseAutomationAccount",
         "runbookName": "Get-AzureVMTutorial",
-        "api-version": "2015-10-31"
+        "api-version": "2018-06-30"
     },
     "responses": {
         "200": {

diff --git a/...n/resource-manager/Microsoft.Automation/stable/2018-06-30/examples/getRunbookContent.json b/...n/resource-manager/Microsoft.Automation/stable/2018-06-30/examples/getRunbookContent.json
@@ -4,7 +4,7 @@
         "resourceGroupName": "rg",
         "automationAccountName": "ContoseAutomationAccount",
         "runbookName": "Get-AzureVMTutorial",
-        "api-version": "2015-10-31"
+        "api-version": "2018-06-30"
     },
     "responses": {
         "200": {

diff --git a/...ion/resource-manager/Microsoft.Automation/stable/2018-06-30/examples/getRunbookDraft.json b/...ion/resource-manager/Microsoft.Automation/stable/2018-06-30/examples/getRunbookDraft.json
@@ -4,7 +4,7 @@
         "resourceGroupName": "rg",
         "automationAccountName": "ContoseAutomationAccount",
         "runbookName": "Get-AzureVMTutorial",
-        "api-version": "2015-10-31"
+        "api-version": "2018-06-30"
     },
     "responses": {
         "200": {

diff --git a/...ource-manager/Microsoft.Automation/stable/2018-06-30/examples/getRunbookDraftContent.json b/...ource-manager/Microsoft.Automation/stable/2018-06-30/examples/getRunbookDraftContent.json
@@ -4,7 +4,7 @@
         "resourceGroupName": "rg",
         "automationAccountName": "ContoseAutomationAccount",
         "runbookName": "Get-AzureVMTutorial",
-        "api-version": "2015-10-31"
+        "api-version": "2018-06-30"
     },
     "responses": {
         "200": {

diff --git a/...tomation/resource-manager/Microsoft.Automation/stable/2018-06-30/examples/getTestJob.json b/...tomation/resource-manager/Microsoft.Automation/stable/2018-06-30/examples/getTestJob.json
@@ -4,7 +4,7 @@
         "resourceGroupName": "mygroup",
         "automationAccountName": "ContoseAutomationAccount",
         "runbookName": "Get-AzureVMTutorial",
-        "api-version": "2015-10-31"        
+        "api-version": "2018-06-30"
     },
     "responses": {
         "200": {

diff --git a/...on/resource-manager/Microsoft.Automation/stable/2018-06-30/examples/getTestJobStream.json b/...on/resource-manager/Microsoft.Automation/stable/2018-06-30/examples/getTestJobStream.json
@@ -5,7 +5,7 @@
         "automationAccountName": "ContoseAutomationAccount",
         "runbookName": "Get-AzureVMTutorial",
         "jobStreamId": "851b2101-686f-40e2-8a4b-5b8df08afbd1_00636535684910693884_00000000000000000001",
-        "api-version": "2015-10-31"
+        "api-version": "2018-06-30"
     },
     "responses": {
         "200": {

diff --git a/...ager/Microsoft.Automation/stable/2018-06-30/examples/listRunbooksByAutomationAccount.json b/...ager/Microsoft.Automation/stable/2018-06-30/examples/listRunbooksByAutomationAccount.json
@@ -3,7 +3,7 @@
         "subscriptionId": "subid",
         "resourceGroupName": "rg",
         "automationAccountName": "ContoseAutomationAccount",
-        "api-version": "2015-10-31"
+        "api-version": "2018-06-30"
     },
     "responses": {
         "200": {

diff --git a/...urce-manager/Microsoft.Automation/stable/2018-06-30/examples/listTestJobStreamsByJob.json b/...urce-manager/Microsoft.Automation/stable/2018-06-30/examples/listTestJobStreamsByJob.json
@@ -4,7 +4,7 @@
         "resourceGroupName": "mygroup",
         "automationAccountName": "ContoseAutomationAccount",
         "runbookName": "Get-AzureVMTutorial",
-        "api-version": "2015-10-31"
+        "api-version": "2018-06-30"
     },
     "responses": {
         "200": {

diff --git a/...e-manager/Microsoft.Automation/stable/2018-06-30/examples/replaceRunbookDraftContent.json b/...e-manager/Microsoft.Automation/stable/2018-06-30/examples/replaceRunbookDraftContent.json
@@ -4,13 +4,15 @@
         "resourceGroupName": "rg",
         "automationAccountName": "ContoseAutomationAccount",
         "runbookName": "Get-AzureVMTutorial",
-        "api-version": "2015-10-31",
+        "api-version": "2018-06-30",
         "runbookContent": "<#\r\n        .DESCRIPTION\r\n            An example runbook which prints out the first10 Azure VMs in your subscription (ordered alphabetically).\r\n            For more information about how this runbook authenticates to your Azure subscription, see our documentation here: http: \/\/aka.ms\/fxu3mn\r\n\r\n        .NOTES\r\n            AUTHOR: Azure Automation Team\r\n            LASTEDIT: Mar27,\r\n            2015\r\n    #>\r\n    workflow Get-AzureVMTutorial{\r\n        #The name of the Automation Credential Asset this runbook will use to authenticate to Azure.\r\n        $CredentialAssetName = 'DefaultAzureCredential'\r\n\r\n        #Get the credential with the above name from the Automation Asset store\r\n        $Cred = Get-AutomationPSCredential -Name $CredentialAssetName\r\n        if(!$Cred){\r\n            Throw\"Could not find an Automation Credential Asset named '${CredentialAssetName}'. Make sure you have created one in this Automation Account.\"\r\n                }\r\n\r\n        #Connect to your Azure Account\r\n        $Account = Add-AzureAccount -Credential $Cred\r\n        if(!$Account){\r\n            Throw\"Could not authenticate to Azure using the credential asset '${CredentialAssetName}'. Make sure the user name and password are correct.\"\r\n                }\r\n\r\n        #TODO (optional): pick the right subscription to use. Without this line, the default subscription for your Azure Account will be used.\r\n        #Select-AzureSubscription -SubscriptionName\"TODO: your Azure subscription name here\"\r\n        \r\n        #Get all the VMs you have in your Azure subscription\r\n        $VMs = Get-AzureVM\r\n\r\n        #Print out up to10 of those VMs\r\n        if(!$VMs){\r\n            Write-Output\"No VMs were found in your subscription.\"\r\n                } else{\r\n            Write-Output $VMs[0..9\r\n                    ]\r\n                }\r\n            }"
     },
     "responses": {
         "202": {
             "headers": {
                 "Location": "https://management.azure.com/subscriptions/subid/resourcegroups/rg/providers/Microsoft.Automation/automationAccounts/ContoseAutomationAccount/runbooks/Get-AzureVMTutorial/draft/content/operationResults/9bd70be2-cf73-49b4-9467-5261d48c2b3d?api-version=2015-10-31"
+            },
+            "body": {
             }
         },
         "200":{}

diff --git a/...ation/resource-manager/Microsoft.Automation/stable/2018-06-30/examples/resumeTestJob.json b/...ation/resource-manager/Microsoft.Automation/stable/2018-06-30/examples/resumeTestJob.json
@@ -4,7 +4,7 @@
         "resourceGroupName": "mygroup",
         "automationAccountName": "ContoseAutomationAccount",
         "runbookName": "Get-AzureVMTutorial",
-        "api-version": "2015-10-31"
+        "api-version": "2018-06-30"
     },
     "responses": {
         "200": {}

diff --git a/...omation/resource-manager/Microsoft.Automation/stable/2018-06-30/examples/stopTestJob.json b/...omation/resource-manager/Microsoft.Automation/stable/2018-06-30/examples/stopTestJob.json
@@ -4,7 +4,7 @@
         "resourceGroupName": "mygroup",
         "automationAccountName": "ContoseAutomationAccount",
         "runbookName": "Get-AzureVMTutorial",
-        "api-version": "2015-10-31"
+        "api-version": "2018-06-30"
     },
     "responses": {
         "200": {}

diff --git a/...tion/resource-manager/Microsoft.Automation/stable/2018-06-30/examples/suspendTestJob.json b/...tion/resource-manager/Microsoft.Automation/stable/2018-06-30/examples/suspendTestJob.json
@@ -4,7 +4,7 @@
         "resourceGroupName": "mygroup",
         "automationAccountName": "ContoseAutomationAccount",
         "runbookName": "Get-AzureVMTutorial",
-        "api-version": "2015-10-31"
+        "api-version": "2018-06-30"
     },
     "responses": {
         "200": {}

diff --git a/...crosoft.Automation/stable/2018-06-30/examples/undoDraftEditToLastKnownPublishedState.json b/...crosoft.Automation/stable/2018-06-30/examples/undoDraftEditToLastKnownPublishedState.json
@@ -4,7 +4,7 @@
         "resourceGroupName": "rg",
         "automationAccountName": "ContoseAutomationAccount",
         "runbookName": "Get-AzureVMTutorial",
-        "api-version": "2015-10-31"
+        "api-version": "2018-06-30"
     },
     "responses": {
         "200": {}   

diff --git a/...ation/resource-manager/Microsoft.Automation/stable/2018-06-30/examples/updateRunbook.json b/...ation/resource-manager/Microsoft.Automation/stable/2018-06-30/examples/updateRunbook.json
@@ -4,7 +4,7 @@
         "resourceGroupName": "rg",
         "automationAccountName": "ContoseAutomationAccount",
         "runbookName": "Get-AzureVMTutorial",
-        "api-version": "2015-10-31",
+        "api-version": "2018-06-30",
         "parameters": {
             "properties": {
                 "description": "Updated Description of the Runbook",

diff --git a/...ification/automation/resource-manager/Microsoft.Automation/stable/2018-06-30/runbook.json b/...ification/automation/resource-manager/Microsoft.Automation/stable/2018-06-30/runbook.json
@@ -2,7 +2,7 @@
   "swagger": "2.0",
   "info": {
     "title": "AutomationManagement",
-    "version": "2015-10-31",
+    "version": "2018-06-30",
     "x-ms-code-generation-settings": {
       "useDateTimeOffset": true
     }
@@ -1095,6 +1095,7 @@
           "description": "Gets or sets the values of the job stream."
         }
       },
+      "x-ms-client-flatten": true,
       "description": "Definition of the job stream."
     },
     "JobStreamListResult": {

diff --git a/specification/automation/resource-manager/readme.md b/specification/automation/resource-manager/readme.md
@@ -25,7 +25,7 @@ These are the global settings for the Automation API.
 title: AutomationClient
 description: Automation Client
 openapi-type: arm
-tag: package-2018-01-preview
+tag: package-2018-06-preview
 ```
 
 ### Tag: package-2015-10
@@ -121,6 +121,40 @@ input-file:
 - Microsoft.Automation/stable/2018-01-15/dscNodeCounts.json
 ```
 
+### Tag: package-2018-06-preview
+
+These settings apply only when `--tag=package-2018-06-preview` is specified on the command line.
+
+``` yaml $(tag) == 'package-2018-06-preview'
+input-file:
+- Microsoft.Automation/stable/2015-10-31/account.json
+- Microsoft.Automation/stable/2015-10-31/certificate.json
+- Microsoft.Automation/stable/2015-10-31/connection.json
+- Microsoft.Automation/stable/2015-10-31/connectionType.json
+- Microsoft.Automation/stable/2015-10-31/credential.json
+- Microsoft.Automation/stable/2015-10-31/dscConfiguration.json
+- Microsoft.Automation/stable/2015-10-31/hybridRunbookWorkerGroup.json
+- Microsoft.Automation/stable/2015-10-31/jobSchedule.json
+- Microsoft.Automation/stable/2015-10-31/linkedWorkspace.json
+- Microsoft.Automation/stable/2015-10-31/module.json
+- Microsoft.Automation/stable/2015-10-31/schedule.json
+- Microsoft.Automation/stable/2015-10-31/variable.json
+- Microsoft.Automation/stable/2015-10-31/webhook.json
+- Microsoft.Automation/stable/2015-10-31/watcher.json
+- Microsoft.Automation/preview/2017-05-15-preview/softwareUpdateConfiguration.json
+- Microsoft.Automation/preview/2017-05-15-preview/softwareUpdateConfigurationRun.json
+- Microsoft.Automation/preview/2017-05-15-preview/softwareUpdateConfigurationMachineRun.json
+- Microsoft.Automation/preview/2017-05-15-preview/sourceControl.json
+- Microsoft.Automation/preview/2017-05-15-preview/sourceControlSyncJob.json
+- Microsoft.Automation/preview/2017-05-15-preview/sourceControlSyncJobStreams.json
+- Microsoft.Automation/preview/2017-05-15-preview/job.json
+- Microsoft.Automation/stable/2018-01-15/dscNode.json
+- Microsoft.Automation/stable/2018-01-15/dscCompilationJob.json
+- Microsoft.Automation/stable/2018-01-15/dscNodeConfiguration.json
+- Microsoft.Automation/stable/2018-01-15/dscNodeCounts.json
+- Microsoft.Automation/stable/2018-06-30/runbook.json
+```
+
 ---
 ## Suppression
 ``` yaml
@@ -143,6 +177,9 @@ directive:
   - suppress: LongRunningResponseStatusCode
     from: runbook.json
     where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}/draft/publish"].post["x-ms-long-running-operation"]
+  - suppress: LongRunningResponseStatusCode
+    from: runbook.json
+    where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}/publish"].post["x-ms-long-running-operation"]
 ```
 
 ---
@@ -192,7 +229,7 @@ python:
   payload-flattening-threshold: 2
   namespace: azure.mgmt.automation
   package-name: azure-mgmt-automation
-  package-version: 0.2.0
+  package-version: 0.3.0
   clear-output-folder: true
 ```
 ``` yaml $(python) && $(python-mode) == 'update'
@@ -224,6 +261,7 @@ batch:
   - tag: package-2015-10
   - tag: package-2017-05-preview
   - tag: package-2018-01-preview
+  - tag: package-2018-06-preview
 ```
 
 ### Tag: package-2015-10 and go
@@ -253,6 +291,15 @@ Please also specify `--go-sdk-folder=<path to the root directory of your azure-s
 output-folder: $(go-sdk-folder)/services/preview/automation/mgmt/2018-01-preview/automation
 ```
 
+### Tag: package-2018-06-preview and go
+
+These settings apply only when `--tag=package-2018-06-preview --go` is specified on the command line.
+Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
+
+``` yaml $(tag) == 'package-2018-06-preview' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/automation/mgmt/2018-06-preview/automation
+```
+
 ## Java
 
 These settings apply only when `--java` is specified on the command line.