Merge branch 'master' of https://github.com/Azure/azure-powershell into wyunchi/automation

Author: wyunchi-ms

.ci-config.json

@@ -18,7 +18,7 @@
     },
     {
       "patterns": [
-        "src/*.props"
+        "src/*.props$"
       ],
       "phases": [
         "build:all",
@@ -65,7 +65,7 @@
     },
     {
       "patterns": [
-        "src/{ModuleName}/**/*.md"
+        "src/{ModuleName}/**/*.md$"
       ],
       "phases": [
         "build:module",
@@ -74,7 +74,7 @@
     },
     {
       "patterns": [
-        "src/{ModuleName}/**/*.csproj"
+        "src/{ModuleName}/**/*.csproj$"
       ],
       "phases": [
         "build:related-module",

build.proj

@@ -140,12 +140,6 @@
             TaskParameter="Value"
             PropertyName="SubTasks" />
     </CreateProperty>
-    <CreateProperty
-        Value="$(TestCsprojList.Split(';').Length)">
-        <Output
-            TaskParameter="Value"
-            PropertyName="TestCsprojListCount" />
-    </CreateProperty>
   </Target>
 
   <!-- Build all flavors of the Cmdlets -->
@@ -314,10 +308,9 @@
   <Target Name="Test" DependsOnTargets="FilterBuild">
     <Message Importance="high" Text="Running check in tests..." />
     <MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
-
     <!-- https://github.com/Microsoft/msbuild/issues/3157#issuecomment-378002971 -->
     <!-- https://github.com/xunit/xunit/issues/1154#issuecomment-405366373 -->
-    <Exec Command="dotnet test $(RepoArtifacts)Azure.PowerShell.sln --filter &quot;AcceptanceType=CheckIn%26RunType!=DesktopOnly&quot; --configuration $(Configuration) --framework $(TestFramework) --logger trx --results-directory &quot;$(TestOutputDirectory)&quot;" Condition="$(TestCsprojListCount) != 0" />
+    <Exec Command="dotnet test $(RepoArtifacts)Azure.PowerShell.sln --filter &quot;AcceptanceType=CheckIn%26RunType!=DesktopOnly&quot; --configuration $(Configuration) --framework $(TestFramework) --logger trx --results-directory &quot;$(TestOutputDirectory)&quot;" Condition="'$(TestCsprojList)' != ''" />
     <Message Importance="high" Text="Finish running tests..." />
     <OnError ExecuteTargets="TestFailureErrorMessage" />
   </Target>

src/Aks/Aks/help/Get-AzAksNodePool.md

@@ -8,7 +8,7 @@ schema: 2.0.0
 # Get-AzAksNodePool
 
 ## SYNOPSIS
-Create note pool in specified cluster.
+List node pools in specified cluster.
 
 ## SYNTAX
 
@@ -30,7 +30,7 @@ Get-AzAksNodePool -ClusterObject <PSKubernetesCluster> [-Name <String>]
 ```
 
 ## DESCRIPTION
-Create note pool in specified cluster.
+List node pools in specified cluster.
 
 ## EXAMPLES
 

src/Automation/Automation/ChangeLog.md

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Fixed the issue for starting Python3 runbooks with parameters
 
 ## Version 1.5.1
 * Fixed te issue that complex object cannot be serialized correctly. [#14431]

src/Automation/Automation/Common/AutomationPSClient.cs

@@ -1700,7 +1700,7 @@ private IDictionary<string, string> ProcessRunbookParameters(string resourceGrou
                     Resources.RunbookHasNoPublishedVersion, runbookName));
             }
 
-            if (runbook != null && runbook.RunbookType == "Python2") {
+            if (runbook != null && (runbook.RunbookType == "Python2" || runbook.RunbookType == "Python3")) {
                 int i = 1;
 
                 foreach (var key in parameters.Keys) {

src/BotService/Az.BotService.psd1

@@ -3,7 +3,7 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 2/26/2021
+# Generated on: 2021-03-11
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = './Az.BotService.psm1'
 
 # Version number of this module.
-ModuleVersion = '0.2.0'
+ModuleVersion = '0.3.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core', 'Desktop'
@@ -45,7 +45,7 @@ PowerShellVersion = '5.1'
 DotNetFrameworkVersion = '4.7.2'
 
 # Minimum version of the common language runtime (CLR) required by this module. This prerequisite is valid for the PowerShell Desktop edition only.
-# CLRVersion = ''
+# ClrVersion = ''
 
 # Processor architecture (None, X86, Amd64) required by this module
 # ProcessorArchitecture = ''
@@ -110,7 +110,7 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '* Fixed the issue that didn''t pack template files into nupkg.'
+        ReleaseNotes = '* Updated the online links.'
 
         # Prerelease string of this module
         # Prerelease = ''

src/BotService/Changelog.md

@@ -19,6 +19,9 @@
 -->
 ## Upcoming Release
 
+## Version 0.3.0
+* Updated the online links.
+
 ## Version 0.2.0
 * Fixed the issue that didn't pack template files into nupkg.
 

src/BotService/custom/Export-AzBotServiceApp.ps1

@@ -19,7 +19,7 @@ Returns a BotService specified by the parameters.
 .Description
 Returns a BotService specified by the parameters.
 .Link
-https://docs.microsoft.com/en-us/powershell/module/az.botservice/export-azbotserviceapp
+https://docs.microsoft.com/powershell/module/az.botservice/export-azbotserviceapp
 #>
 function Export-AzBotServiceApp {
     [OutputType([Microsoft.Azure.PowerShell.Cmdlets.BotService.Models.Api20180712.IBot])]

src/BotService/custom/Initialize-AzBotServicePrepareDeploy.ps1

@@ -19,7 +19,7 @@ Returns a BotService specified by the parameters.
 .Description
 Returns a BotService specified by the parameters.
 .Link
-https://docs.microsoft.com/en-us/powershell/module/az.botservice/initialize-azbotservicepreparedeploy
+https://docs.microsoft.com/powershell/module/az.botservice/initialize-azbotservicepreparedeploy
 #>
 function Initialize-AzBotServicePrepareDeploy {
     [OutputType([Microsoft.Azure.PowerShell.Cmdlets.BotService.Models.Api20180712.IBot])]
@@ -119,10 +119,10 @@ function Initialize-AzBotServicePrepareDeploy {
                     Write-Warning "WARNING: This command should normally be run in the same folder as the package.json for Node.js bots. Package.json and web.config are usually in the same folder and at the root level of the .zip file."
                 }
                 if ("JavaScript" -eq $Language) {
-                    $SourceWebConfig = [System.IO.Path]::Combine($PSScriptRoot, '..', 'resources', 'web.config')
+                    $SourceWebConfig = [System.IO.Path]::Combine($PSScriptRoot, 'web.config')
                 }
                 else {
-                    $SourceWebConfig = [System.IO.Path]::Combine($PSScriptRoot, '..', 'resources', 'typescript.web.config')
+                    $SourceWebConfig = [System.IO.Path]::Combine($PSScriptRoot, 'typescript.web.config')
                 }
                 Copy-Item -Path $SourceWebConfig -Destination $DestWebConfig
             }

src/BotService/custom/New-AzBotService.ps1

@@ -19,7 +19,7 @@ Returns a BotService specified by the parameters.
 .Description
 Returns a BotService specified by the parameters.
 .Link
-https://docs.microsoft.com/en-us/powershell/module/az.botservice/new-azbotservice
+https://docs.microsoft.com/powershell/module/az.botservice/new-azbotservice
 #>
 function New-AzBotService {
     [OutputType([Microsoft.Azure.PowerShell.Cmdlets.BotService.Models.Api20180712.IBot])]
@@ -222,7 +222,7 @@ function New-AzBotService {
                     $ServerFarmId = "/subscriptions/$SubscriptionId/resourceGroups/$ResourceGroupName/providers/Microsoft.Web/serverfarms/$Name"
                     $CreateServerFarm = $true
                 }
-                $TemplateFile = [System.IO.Path]::Combine($PSScriptRoot, '..', 'resources', 'webappv4.template.json')
+                $TemplateFile = [System.IO.Path]::Combine($PSScriptRoot, 'webappv4.template.json')
                 $AppSecret = ConvertFrom-SecureString $ApplicationSecret -AsPlainText
                 $Parameter = @{
                     'location' = $Location;

src/BotService/custom/Publish-AzBotServiceApp.ps1

@@ -19,7 +19,7 @@ Returns a BotService specified by the parameters.
 .Description
 Returns a BotService specified by the parameters.
 .Link
-https://docs.microsoft.com/en-us/powershell/module/az.botservice/publish-azbotserviceapp
+https://docs.microsoft.com/powershell/module/az.botservice/publish-azbotserviceapp
 #>
 function Publish-AzBotServiceApp {
     [CmdletBinding(PositionalBinding=$false, SupportsShouldProcess)]

src/BotService/resources/typescript.web.config renamed to src/BotService/custom/typescript.web.config

@@ -32,7 +32,7 @@ d----          2020/12/15    13:45                youriechobottest
 .Outputs
 Microsoft.Azure.PowerShell.Cmdlets.BotService.Models.Api20180712.IBot
 .Link
-https://docs.microsoft.com/en-us/powershell/module/az.botservice/export-azbotserviceapp
+https://docs.microsoft.com/powershell/module/az.botservice/export-azbotserviceapp
 #>
 function Export-AzBotServiceApp {
 [OutputType([Microsoft.Azure.PowerShell.Cmdlets.BotService.Models.Api20180712.IBot])]

src/BotService/resources/web.config renamed to src/BotService/custom/web.config

@@ -67,7 +67,7 @@ INPUTOBJECT <IBotServiceIdentity>: Identity Parameter
   [ResourceName <String>]: The name of the Bot resource.
   [SubscriptionId <String>]: Azure Subscription ID.
 .Link
-https://docs.microsoft.com/en-us/powershell/module/az.botservice/get-azbotservice
+https://docs.microsoft.com/powershell/module/az.botservice/get-azbotservice
 #>
 function Get-AzBotService {
 [OutputType([Microsoft.Azure.PowerShell.Cmdlets.BotService.Models.Api20180712.IBot])]

src/BotService/resources/webappv4.template.json renamed to src/BotService/custom/webappv4.template.json

@@ -25,7 +25,7 @@ PS C:\> Initialize-AzBotServicePrepareDeploy -CodeDir D:\zips\MyEchoBot -ProjFil
 .Outputs
 Microsoft.Azure.PowerShell.Cmdlets.BotService.Models.Api20180712.IBot
 .Link
-https://docs.microsoft.com/en-us/powershell/module/az.botservice/initialize-azbotservicepreparedeploy
+https://docs.microsoft.com/powershell/module/az.botservice/initialize-azbotservicepreparedeploy
 #>
 function Initialize-AzBotServicePrepareDeploy {
 [OutputType([Microsoft.Azure.PowerShell.Cmdlets.BotService.Models.Api20180712.IBot])]

src/BotService/exports/Export-AzBotServiceApp.ps1

@@ -34,7 +34,7 @@ Etag                                   Kind Location Name            SkuName Sku
 .Outputs
 Microsoft.Azure.PowerShell.Cmdlets.BotService.Models.Api20180712.IBot
 .Link
-https://docs.microsoft.com/en-us/powershell/module/az.botservice/new-azbotservice
+https://docs.microsoft.com/powershell/module/az.botservice/new-azbotservice
 #>
 function New-AzBotService {
 [OutputType([Microsoft.Azure.PowerShell.Cmdlets.BotService.Models.Api20180712.IBot])]

src/BotService/exports/Get-AzBotService.ps1

@@ -67,7 +67,7 @@ INPUTOBJECT <IBotServiceIdentity>: Identity Parameter
   [ResourceName <String>]: The name of the Bot resource.
   [SubscriptionId <String>]: Azure Subscription ID.
 .Link
-https://docs.microsoft.com/en-us/powershell/module/az.botservice/get-azbotservice
+https://docs.microsoft.com/powershell/module/az.botservice/get-azbotservice
 #>
 function Get-AzBotService {
 [OutputType([Microsoft.Azure.PowerShell.Cmdlets.BotService.Models.Api20180712.IBot])]
@@ -237,7 +237,7 @@ INPUTOBJECT <IBotServiceIdentity>: Identity Parameter
   [ResourceName <String>]: The name of the Bot resource.
   [SubscriptionId <String>]: Azure Subscription ID.
 .Link
-https://docs.microsoft.com/en-us/powershell/module/az.botservice/remove-azbotservice
+https://docs.microsoft.com/powershell/module/az.botservice/remove-azbotservice
 #>
 function Remove-AzBotService {
 [OutputType([System.Boolean])]
@@ -414,7 +414,7 @@ INPUTOBJECT <IBotServiceIdentity>: Identity Parameter
   [ResourceName <String>]: The name of the Bot resource.
   [SubscriptionId <String>]: Azure Subscription ID.
 .Link
-https://docs.microsoft.com/en-us/powershell/module/az.botservice/update-azbotservice
+https://docs.microsoft.com/powershell/module/az.botservice/update-azbotservice
 #>
 function Update-AzBotService {
 [OutputType([Microsoft.Azure.PowerShell.Cmdlets.BotService.Models.Api20180712.IBot])]
@@ -662,7 +662,7 @@ d----          2020/12/15    13:45                youriechobottest
 .Outputs
 Microsoft.Azure.PowerShell.Cmdlets.BotService.Models.Api20180712.IBot
 .Link
-https://docs.microsoft.com/en-us/powershell/module/az.botservice/export-azbotserviceapp
+https://docs.microsoft.com/powershell/module/az.botservice/export-azbotserviceapp
 #>
 function Export-AzBotServiceApp {
 [OutputType([Microsoft.Azure.PowerShell.Cmdlets.BotService.Models.Api20180712.IBot])]
@@ -806,7 +806,7 @@ PS C:\> Initialize-AzBotServicePrepareDeploy -CodeDir D:\zips\MyEchoBot -ProjFil
 .Outputs
 Microsoft.Azure.PowerShell.Cmdlets.BotService.Models.Api20180712.IBot
 .Link
-https://docs.microsoft.com/en-us/powershell/module/az.botservice/initialize-azbotservicepreparedeploy
+https://docs.microsoft.com/powershell/module/az.botservice/initialize-azbotservicepreparedeploy
 #>
 function Initialize-AzBotServicePrepareDeploy {
 [OutputType([Microsoft.Azure.PowerShell.Cmdlets.BotService.Models.Api20180712.IBot])]
@@ -957,7 +957,7 @@ Etag                                   Kind Location Name            SkuName Sku
 .Outputs
 Microsoft.Azure.PowerShell.Cmdlets.BotService.Models.Api20180712.IBot
 .Link
-https://docs.microsoft.com/en-us/powershell/module/az.botservice/new-azbotservice
+https://docs.microsoft.com/powershell/module/az.botservice/new-azbotservice
 #>
 function New-AzBotService {
 [OutputType([Microsoft.Azure.PowerShell.Cmdlets.BotService.Models.Api20180712.IBot])]
@@ -1156,7 +1156,7 @@ PS C:\> Publish-AzBotServiceApp -ResourceGroupName youriBotTest -CodeDir D:\zips
 
 
 .Link
-https://docs.microsoft.com/en-us/powershell/module/az.botservice/publish-azbotserviceapp
+https://docs.microsoft.com/powershell/module/az.botservice/publish-azbotserviceapp
 #>
 function Publish-AzBotServiceApp {
 [CmdletBinding(PositionalBinding=$false, SupportsShouldProcess, ConfirmImpact='Medium')]

src/BotService/exports/Initialize-AzBotServicePrepareDeploy.ps1

@@ -23,7 +23,7 @@ PS C:\> Publish-AzBotServiceApp -ResourceGroupName youriBotTest -CodeDir D:\zips
 
 
 .Link
-https://docs.microsoft.com/en-us/powershell/module/az.botservice/publish-azbotserviceapp
+https://docs.microsoft.com/powershell/module/az.botservice/publish-azbotserviceapp
 #>
 function Publish-AzBotServiceApp {
 [CmdletBinding(PositionalBinding=$false, SupportsShouldProcess, ConfirmImpact='Medium')]

src/BotService/exports/New-AzBotService.ps1

@@ -43,7 +43,7 @@ INPUTOBJECT <IBotServiceIdentity>: Identity Parameter
   [ResourceName <String>]: The name of the Bot resource.
   [SubscriptionId <String>]: Azure Subscription ID.
 .Link
-https://docs.microsoft.com/en-us/powershell/module/az.botservice/remove-azbotservice
+https://docs.microsoft.com/powershell/module/az.botservice/remove-azbotservice
 #>
 function Remove-AzBotService {
 [OutputType([System.Boolean])]

src/BotService/exports/ProxyCmdletDefinitions.ps1

@@ -49,7 +49,7 @@ INPUTOBJECT <IBotServiceIdentity>: Identity Parameter
   [ResourceName <String>]: The name of the Bot resource.
   [SubscriptionId <String>]: Azure Subscription ID.
 .Link
-https://docs.microsoft.com/en-us/powershell/module/az.botservice/update-azbotservice
+https://docs.microsoft.com/powershell/module/az.botservice/update-azbotservice
 #>
 function Update-AzBotService {
 [OutputType([Microsoft.Azure.PowerShell.Cmdlets.BotService.Models.Api20180712.IBot])]

src/BotService/exports/Publish-AzBotServiceApp.ps1

@@ -1,15 +1,8 @@
 {
-  "microsoft.azure_classic-openapi-validator": "1.0.14",
-  "microsoft.azure_openapi-validator": "1.0.4",
-  "swagger_commit": "88b316702d8dd0b3cdf4a446376fbcd24f41cc3b",
-  "microsoft.azure_autorest-core": "2.0.4417",
-  "autorest_modelerfour": "4.12.276",
-  "autorest": "3.0.6187",
-  "autorest_csharp-v3": "3.0.0-dev.20200325.2",
-  "microsoft.azure_autorest.modeler": "2.3.55",
-  "microsoft.azure_autorest.csharp": "2.3.84",
-  "node": "v10.16.0",
-  "autorest_powershell": "3.0.410",
-  "autorest_remodeler": "2.1.27",
-  "autorest_core": "3.0.6257"
+  "autorest_core": "3.0.6375",
+  "autorest_modelerfour": "4.15.414",
+  "autorest_powershell": "3.0.423",
+  "swagger_commit": "abfe5f82e8ac29a05070957bc828874a625079f1",
+  "node": "v10.16.3",
+  "autorest": "3.0.6149"
 }