From 193e63325939e8190db7af7695337acbb5483857 Mon Sep 17 00:00:00 2001 From: likamrat Date: Fri, 23 Jul 2021 14:00:57 -0700 Subject: [PATCH 1/2] az cli 2.26 --- .../aks/arm_template/artifacts/Bootstrap.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/azure_arc_app_services_jumpstart/aks/arm_template/artifacts/Bootstrap.ps1 b/azure_arc_app_services_jumpstart/aks/arm_template/artifacts/Bootstrap.ps1 index 3ecf8a24f5..757a173580 100644 --- a/azure_arc_app_services_jumpstart/aks/arm_template/artifacts/Bootstrap.ps1 +++ b/azure_arc_app_services_jumpstart/aks/arm_template/artifacts/Bootstrap.ps1 @@ -65,12 +65,12 @@ Invoke-WebRequest ($templateBaseUrl + "artifacts/deployFunction.ps1") -OutFile " # Installing tools -Invoke-WebRequest -Uri https://github.com/Azure/azure-cli/releases/download/azure-cli-2.25.0/azure-cli-2.25.0.msi -OutFile .\AzureCLI.msi; Start-Process msiexec.exe -Wait -ArgumentList '/I AzureCLI.msi /quiet'; rm .\AzureCLI.msi +# Invoke-WebRequest -Uri https://github.com/Azure/azure-cli/releases/download/azure-cli-2.25.0/azure-cli-2.25.0.msi -OutFile .\AzureCLI.msi; Start-Process msiexec.exe -Wait -ArgumentList '/I AzureCLI.msi /quiet'; rm .\AzureCLI.msi # Pindown az cli version to avoid current Azure Arc-enabled app services version compatibility issues workflow ClientTools_01 { - $chocolateyAppList = 'az.powershell,kubernetes-cli,vcredist140,microsoft-edge,azcopy10,vscode,putty.install,kubernetes-helm,azure-functions-core-tools-3,azurefunctions-vscode,dotnetcore-sdk,vscode-csharp,microsoftazurestorageexplorer' + $chocolateyAppList = 'azure-cli,az.powershell,kubernetes-cli,vcredist140,microsoft-edge,azcopy10,vscode,putty.install,kubernetes-helm,azure-functions-core-tools-3,azurefunctions-vscode,dotnetcore-sdk,vscode-csharp,microsoftazurestorageexplorer' #Run commands in parallel. Parallel { @@ -97,7 +97,7 @@ workflow ClientTools_01 Write-Host "Installing $app" & choco install $app /y -Force| Write-Output } - } + } } Invoke-WebRequest "https://raw.githubusercontent.com/microsoft/azure_arc/main/img/jumpstart_wallpaper.png" -OutFile "C:\Temp\wallpaper.png" } From 115a2b8ee22f79905edf343cebe132ec1e6f2b76 Mon Sep 17 00:00:00 2001 From: likamrat Date: Fri, 23 Jul 2021 15:05:40 -0700 Subject: [PATCH 2/2] az cli 2.26 --- .../aks/arm_template/artifacts/Bootstrap.ps1 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/azure_arc_app_services_jumpstart/aks/arm_template/artifacts/Bootstrap.ps1 b/azure_arc_app_services_jumpstart/aks/arm_template/artifacts/Bootstrap.ps1 index 757a173580..6d1c352f17 100644 --- a/azure_arc_app_services_jumpstart/aks/arm_template/artifacts/Bootstrap.ps1 +++ b/azure_arc_app_services_jumpstart/aks/arm_template/artifacts/Bootstrap.ps1 @@ -64,10 +64,6 @@ Invoke-WebRequest ($templateBaseUrl + "artifacts/deployAppService.ps1") -OutFile Invoke-WebRequest ($templateBaseUrl + "artifacts/deployFunction.ps1") -OutFile "C:\Temp\deployFunction.ps1" # Installing tools - -# Invoke-WebRequest -Uri https://github.com/Azure/azure-cli/releases/download/azure-cli-2.25.0/azure-cli-2.25.0.msi -OutFile .\AzureCLI.msi; Start-Process msiexec.exe -Wait -ArgumentList '/I AzureCLI.msi /quiet'; rm .\AzureCLI.msi -# Pindown az cli version to avoid current Azure Arc-enabled app services version compatibility issues - workflow ClientTools_01 { $chocolateyAppList = 'azure-cli,az.powershell,kubernetes-cli,vcredist140,microsoft-edge,azcopy10,vscode,putty.install,kubernetes-helm,azure-functions-core-tools-3,azurefunctions-vscode,dotnetcore-sdk,vscode-csharp,microsoftazurestorageexplorer'