diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json index e770f2f08..8a4255ec7 100644 --- a/images/linux/ubuntu1604.json +++ b/images/linux/ubuntu1604.json @@ -24,7 +24,10 @@ "run_validation_diskspace": "false", "announcements": "{{env `ANNOUNCEMENTS`}}" }, - "sensitive-variables": ["client_secret", "github_feed_token"], + "sensitive-variables": [ + "client_secret", + "github_feed_token" + ], "builders": [ { "type": "azure-arm", @@ -32,7 +35,6 @@ "client_secret": "{{user `client_secret`}}", "subscription_id": "{{user `subscription_id`}}", "tenant_id": "{{user `tenant_id`}}", - "location": "{{user `location`}}", "vm_size": "{{user `vm_size`}}", "resource_group_name": "{{user `resource_group`}}", @@ -62,7 +64,7 @@ }, { "type": "shell", - "scripts":[ + "scripts": [ "{{template_dir}}/scripts/base/repos.sh" ], "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" @@ -104,7 +106,7 @@ }, { "type": "shell", - "scripts":[ + "scripts": [ "{{template_dir}}/scripts/installers/preimagedata.sh" ], "environment_vars": [ @@ -218,7 +220,7 @@ }, { "type": "shell", - "scripts":[ + "scripts": [ "{{template_dir}}/scripts/installers/Install-Toolset.ps1", "{{template_dir}}/scripts/installers/Configure-Toolset.ps1", "{{template_dir}}/scripts/installers/Validate-Toolset.ps1" @@ -270,14 +272,14 @@ }, { "type": "shell", - "scripts":[ + "scripts": [ "{{template_dir}}/scripts/installers/cleanup.sh" ], "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" }, { "type": "shell", - "scripts":[ + "scripts": [ "{{template_dir}}/scripts/installers/Install-PowerShellModules.ps1" ], "environment_vars": [ @@ -290,7 +292,7 @@ "inline": [ "pwsh -File {{user `image_folder`}}/SoftwareReport/SoftwareReport.Generator.ps1 -OutputDirectory {{user `image_folder`}}" ], - "environment_vars":[ + "environment_vars": [ "IMAGE_VERSION={{user `image_version`}}", "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}", "ANNOUNCEMENTS={{user `announcements`}}" @@ -316,7 +318,7 @@ }, { "type": "shell", - "scripts":[ + "scripts": [ "{{template_dir}}/scripts/installers/validate-disk-space.sh" ], "environment_vars": [ diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index 7dcb51df1..12ef6d0c0 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -24,7 +24,10 @@ "run_validation_diskspace": "false", "announcements": "{{env `ANNOUNCEMENTS`}}" }, - "sensitive-variables": ["client_secret", "github_feed_token"], + "sensitive-variables": [ + "client_secret", + "github_feed_token" + ], "builders": [ { "type": "azure-arm", @@ -32,7 +35,6 @@ "client_secret": "{{user `client_secret`}}", "subscription_id": "{{user `subscription_id`}}", "tenant_id": "{{user `tenant_id`}}", - "location": "{{user `location`}}", "vm_size": "{{user `vm_size`}}", "resource_group_name": "{{user `resource_group`}}", @@ -62,7 +64,7 @@ }, { "type": "shell", - "scripts":[ + "scripts": [ "{{template_dir}}/scripts/base/repos.sh" ], "environment_vars": [ @@ -107,7 +109,7 @@ }, { "type": "shell", - "scripts":[ + "scripts": [ "{{template_dir}}/scripts/installers/preimagedata.sh" ], "environment_vars": [ @@ -222,7 +224,7 @@ }, { "type": "shell", - "scripts":[ + "scripts": [ "{{template_dir}}/scripts/installers/Install-Toolset.ps1", "{{template_dir}}/scripts/installers/Configure-Toolset.ps1", "{{template_dir}}/scripts/installers/Validate-Toolset.ps1" @@ -274,14 +276,14 @@ }, { "type": "shell", - "scripts":[ + "scripts": [ "{{template_dir}}/scripts/installers/cleanup.sh" ], "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" }, { "type": "shell", - "scripts":[ + "scripts": [ "{{template_dir}}/scripts/installers/Install-PowerShellModules.ps1" ], "environment_vars": [ @@ -294,7 +296,7 @@ "inline": [ "pwsh -File {{user `image_folder`}}/SoftwareReport/SoftwareReport.Generator.ps1 -OutputDirectory {{user `image_folder`}}" ], - "environment_vars":[ + "environment_vars": [ "IMAGE_VERSION={{user `image_version`}}", "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}", "ANNOUNCEMENTS={{user `announcements`}}" @@ -320,7 +322,7 @@ }, { "type": "shell", - "scripts":[ + "scripts": [ "{{template_dir}}/scripts/installers/validate-disk-space.sh" ], "environment_vars": [ diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json index 335144f0c..24c1f17e9 100644 --- a/images/linux/ubuntu2004.json +++ b/images/linux/ubuntu2004.json @@ -26,7 +26,10 @@ "go_versions": "1.14", "announcements": "{{env `ANNOUNCEMENTS`}}" }, - "sensitive-variables": ["client_secret", "github_feed_token"], + "sensitive-variables": [ + "client_secret", + "github_feed_token" + ], "builders": [ { "type": "azure-arm", @@ -34,7 +37,6 @@ "client_secret": "{{user `client_secret`}}", "subscription_id": "{{user `subscription_id`}}", "tenant_id": "{{user `tenant_id`}}", - "location": "{{user `location`}}", "vm_size": "{{user `vm_size`}}", "resource_group_name": "{{user `resource_group`}}", @@ -64,7 +66,7 @@ }, { "type": "shell", - "scripts":[ + "scripts": [ "{{template_dir}}/scripts/base/repos.sh" ], "environment_vars": [ @@ -109,7 +111,7 @@ }, { "type": "shell", - "scripts":[ + "scripts": [ "{{template_dir}}/scripts/installers/preimagedata.sh" ], "environment_vars": [ @@ -224,7 +226,7 @@ }, { "type": "shell", - "scripts":[ + "scripts": [ "{{template_dir}}/scripts/installers/Install-Toolset.ps1", "{{template_dir}}/scripts/installers/Configure-Toolset.ps1", "{{template_dir}}/scripts/installers/Validate-Toolset.ps1" @@ -276,14 +278,14 @@ }, { "type": "shell", - "scripts":[ + "scripts": [ "{{template_dir}}/scripts/installers/cleanup.sh" ], "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" }, { "type": "shell", - "scripts":[ + "scripts": [ "{{template_dir}}/scripts/installers/Install-PowerShellModules.ps1" ], "environment_vars": [ @@ -296,7 +298,7 @@ "inline": [ "pwsh -File {{user `image_folder`}}/SoftwareReport/SoftwareReport.Generator.ps1 -OutputDirectory {{user `image_folder`}}" ], - "environment_vars":[ + "environment_vars": [ "IMAGE_VERSION={{user `image_version`}}", "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}", "ANNOUNCEMENTS={{user `announcements`}}" diff --git a/images/win/Windows2016-Azure.json b/images/win/Windows2016-Azure.json index 481a3ce80..77d57aef1 100644 --- a/images/win/Windows2016-Azure.json +++ b/images/win/Windows2016-Azure.json @@ -15,7 +15,6 @@ "private_virtual_network_with_public_ip": "{{env `PRIVATE_VIRTUAL_NETWORK_WITH_PUBLIC_IP`}}", "vm_size": "Standard_DS4_v2", "run_scan_antivirus": "false", - "root_folder": "C:", "toolset_json_path": "{{env `TEMP`}}\\toolset.json", "image_folder": "C:\\image", @@ -30,7 +29,11 @@ "github_feed_token": "{{env `GITHUB_FEED_TOKEN`}}", "announcements": "{{env `ANNOUNCEMENTS`}}" }, - "sensitive-variables": ["install_password", "client_secret", "github_feed_token"], + "sensitive-variables": [ + "install_password", + "client_secret", + "github_feed_token" + ], "builders": [ { "name": "vhd", @@ -65,7 +68,7 @@ "provisioners": [ { "type": "powershell", - "inline":[ + "inline": [ "New-Item -Path {{user `image_folder`}} -ItemType Directory -Force" ] }, @@ -97,7 +100,7 @@ { "type": "windows-shell", "inline": [ - "net user {{user `install_user`}} {{user `install_password`}} /add /passwordchg:no /passwordreq:yes /active:yes /Y" , + "net user {{user `install_user`}} {{user `install_password`}} /add /passwordchg:no /passwordreq:yes /active:yes /Y", "net localgroup Administrators {{user `install_user`}} /add", "winrm set winrm/config/service/auth @{Basic=\"true\"}", "winrm get winrm/config/service/auth" @@ -116,7 +119,7 @@ "TOOLSET_JSON_PATH={{user `toolset_json_path`}}", "PSMODULES_ROOT_FOLDER={{user `psmodules_root_folder`}}" ], - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Install-PowerShellModules.ps1", "{{ template_dir }}/scripts/Installers/Initialize-VM.ps1", "{{ template_dir }}/scripts/Installers/Install-WebPlatformInstaller.ps1" @@ -125,7 +128,7 @@ }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Update-DotnetTLS.ps1", "{{ template_dir }}/scripts/Installers/Install-ContainersFeature.ps1" ] @@ -137,8 +140,8 @@ { "type": "powershell", "inline": [ - "setx ImageVersion {{user `image_version` }} /m", - "setx ImageOS {{user `image_os` }} /m" + "setx ImageVersion {{user `image_version` }} /m", + "setx ImageOS {{user `image_os` }} /m" ] }, { @@ -147,7 +150,7 @@ "IMAGE_VERSION={{user `image_version`}}", "IMAGEDATA_FILE={{user `imagedata_file`}}" ], - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Update-ImageData.ps1", "{{ template_dir }}/scripts/Installers/Install-Docker.ps1", "{{ template_dir }}/scripts/Installers/Install-PowershellCore.ps1" @@ -159,7 +162,7 @@ }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Update-DockerImages.ps1" ] }, @@ -169,10 +172,10 @@ 0, 3010 ], - "environment_vars":[ + "environment_vars": [ "TOOLSET_JSON_PATH={{user `toolset_json_path`}}" ], - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Install-VS.ps1", "{{ template_dir }}/scripts/Installers/Install-NET48.ps1", "{{ template_dir }}/scripts/Installers/Windows2016/Install-SSDT.ps1" @@ -182,10 +185,10 @@ }, { "type": "powershell", - "environment_vars":[ + "environment_vars": [ "TOOLSET_JSON_PATH={{user `toolset_json_path`}}" ], - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Install-Nuget.ps1", "{{ template_dir }}/scripts/Installers/Install-Wix.ps1", "{{ template_dir }}/scripts/Installers/Install-WDK.ps1", @@ -194,7 +197,7 @@ }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Install-ServiceFabricSDK.ps1" ], "execution_policy": "remotesigned" @@ -205,7 +208,7 @@ }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Install-AzureCli.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureDevOpsCli.ps1", "{{ template_dir }}/scripts/Installers/Install-AzCopy.ps1", @@ -222,12 +225,12 @@ }, { "type": "powershell", - "environment_vars":[ + "environment_vars": [ "GITHUB_FEED_TOKEN={{ user `github_feed_token` }}", "TOOLSET_JSON_PATH={{user `toolset_json_path`}}", "ROOT_FOLDER={{user `root_folder`}}" ], - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Download-ToolCache.ps1", "{{ template_dir }}/scripts/Installers/Install-PyPy.ps1", "{{ template_dir }}/scripts/Installers/Install-Toolset.ps1", @@ -238,7 +241,7 @@ }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Install-Sbt.ps1", "{{ template_dir }}/scripts/Installers/Install-OpenSSL.ps1", "{{ template_dir }}/scripts/Installers/Install-Perl.ps1", @@ -257,7 +260,7 @@ }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Enable-DeveloperMode.ps1" ], "elevated_user": "{{user `install_user`}}", @@ -265,21 +268,23 @@ }, { "type": "windows-shell", - "inline": ["wmic product where \"name like '%%microsoft azure powershell%%'\" call uninstall /nointeractive"] + "inline": [ + "wmic product where \"name like '%%microsoft azure powershell%%'\" call uninstall /nointeractive" + ] }, { "type": "powershell", - "environment_vars":[ + "environment_vars": [ "TOOLSET_JSON_PATH={{user `toolset_json_path`}}", "PSMODULES_ROOT_FOLDER={{user `psmodules_root_folder`}}" ], - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Install-AzureModules.ps1" ] }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Install-VSWhere.ps1", "{{ template_dir }}/scripts/Installers/Install-WinAppDriver.ps1", "{{ template_dir }}/scripts/Installers/Install-Cmake.ps1", @@ -291,18 +296,17 @@ "{{ template_dir }}/scripts/Installers/Install-DotnetSDK.ps1" ] }, - { "type": "powershell", "elevated_user": "SYSTEM", "elevated_password": "", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Install-Msys2.ps1" ] }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Install-Mingw64.ps1", "{{ template_dir }}/scripts/Installers/Install-TypeScript.ps1", "{{ template_dir }}/scripts/Installers/Install-Haskell.ps1", @@ -326,7 +330,7 @@ }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Install-WindowsUpdates.ps1", "{{ template_dir }}/scripts/Installers/Configure-DynamicPort.ps1" ], @@ -339,10 +343,10 @@ }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Tests/RunAll-Tests.ps1" ], - "environment_vars":[ + "environment_vars": [ "TOOLSET_JSON_PATH={{user `toolset_json_path`}}", "PSMODULES_ROOT_FOLDER={{user `psmodules_root_folder`}}", "ROOT_FOLDER={{user `root_folder`}}" @@ -353,7 +357,7 @@ "inline": [ "pwsh -File '{{user `image_folder`}}\\SoftwareReport\\SoftwareReport.Generator.ps1'" ], - "environment_vars":[ + "environment_vars": [ "TOOLSET_JSON_PATH={{user `toolset_json_path`}}", "ANNOUNCEMENTS={{user `announcements`}}" ] @@ -366,7 +370,7 @@ }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Finalize-VM.ps1" ] }, @@ -376,16 +380,16 @@ }, { "type": "powershell", - "environment_vars":[ + "environment_vars": [ "RUN_SCAN_ANTIVIRUS={{user `run_scan_antivirus`}}" ], - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Run-Antivirus.ps1" ] }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Configure-Antivirus.ps1", "{{ template_dir }}/scripts/Installers/Disable-JITDebugger.ps1" ] diff --git a/images/win/Windows2019-Azure.json b/images/win/Windows2019-Azure.json index 10c5cdd57..473051dba 100644 --- a/images/win/Windows2019-Azure.json +++ b/images/win/Windows2019-Azure.json @@ -15,7 +15,6 @@ "private_virtual_network_with_public_ip": "{{env `PRIVATE_VIRTUAL_NETWORK_WITH_PUBLIC_IP`}}", "vm_size": "Standard_D4_v2", "run_scan_antivirus": "false", - "root_folder": "C:", "toolset_json_path": "{{env `TEMP`}}\\toolset.json", "image_folder": "C:\\image", @@ -30,7 +29,11 @@ "github_feed_token": "{{env `GITHUB_FEED_TOKEN`}}", "announcements": "{{env `ANNOUNCEMENTS`}}" }, - "sensitive-variables": ["install_password", "client_secret", "github_feed_token"], + "sensitive-variables": [ + "install_password", + "client_secret", + "github_feed_token" + ], "builders": [ { "name": "vhd", @@ -65,7 +68,7 @@ "provisioners": [ { "type": "powershell", - "inline":[ + "inline": [ "New-Item -Path {{user `image_folder`}} -ItemType Directory -Force" ] }, @@ -97,7 +100,7 @@ { "type": "windows-shell", "inline": [ - "net user {{user `install_user`}} {{user `install_password`}} /add /passwordchg:no /passwordreq:yes /active:yes /Y" , + "net user {{user `install_user`}} {{user `install_password`}} /add /passwordchg:no /passwordreq:yes /active:yes /Y", "net localgroup Administrators {{user `install_user`}} /add", "winrm set winrm/config/service/auth @{Basic=\"true\"}", "winrm get winrm/config/service/auth" @@ -116,7 +119,7 @@ "TOOLSET_JSON_PATH={{user `toolset_json_path`}}", "PSMODULES_ROOT_FOLDER={{user `psmodules_root_folder`}}" ], - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Install-PowerShellModules.ps1", "{{ template_dir }}/scripts/Installers/Initialize-VM.ps1", "{{ template_dir }}/scripts/Installers/Install-WebPlatformInstaller.ps1" @@ -127,13 +130,13 @@ "type": "powershell", "elevated_user": "SYSTEM", "elevated_password": "", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Windows2019/Install-WSL.ps1" ] }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Update-DotnetTLS.ps1", "{{ template_dir }}/scripts/Installers/Install-ContainersFeature.ps1" ] @@ -141,8 +144,8 @@ { "type": "powershell", "inline": [ - "setx ImageVersion {{user `image_version` }} /m", - "setx ImageOS {{user `image_os` }} /m" + "setx ImageVersion {{user `image_version` }} /m", + "setx ImageOS {{user `image_os` }} /m" ] }, { @@ -155,7 +158,7 @@ "IMAGE_VERSION={{user `image_version`}}", "IMAGEDATA_FILE={{user `imagedata_file`}}" ], - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Update-ImageData.ps1", "{{ template_dir }}/scripts/Installers/Install-Docker.ps1", "{{ template_dir }}/scripts/Installers/Install-PowershellCore.ps1" @@ -167,7 +170,7 @@ }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Update-DockerImages.ps1" ] }, @@ -177,10 +180,10 @@ 0, 3010 ], - "environment_vars":[ + "environment_vars": [ "TOOLSET_JSON_PATH={{user `toolset_json_path`}}" ], - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Install-VS.ps1", "{{ template_dir }}/scripts/Installers/Install-NET48.ps1" ], @@ -189,10 +192,10 @@ }, { "type": "powershell", - "environment_vars":[ + "environment_vars": [ "TOOLSET_JSON_PATH={{user `toolset_json_path`}}" ], - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Install-Nuget.ps1", "{{ template_dir }}/scripts/Installers/Install-Wix.ps1", "{{ template_dir }}/scripts/Installers/Install-WDK.ps1", @@ -210,7 +213,7 @@ }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Install-ServiceFabricSDK.ps1" ], "execution_policy": "remotesigned" @@ -221,38 +224,39 @@ }, { "type": "powershell", - "environment_vars":[ + "environment_vars": [ "GITHUB_FEED_TOKEN={{ user `github_feed_token` }}", "ROOT_FOLDER={{user `root_folder`}}" ], - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Download-ToolCache.ps1" ] }, { "type": "windows-shell", - "inline": ["wmic product where \"name like '%%microsoft azure powershell%%'\" call uninstall /nointeractive"] + "inline": [ + "wmic product where \"name like '%%microsoft azure powershell%%'\" call uninstall /nointeractive" + ] }, { "type": "powershell", - "environment_vars":[ + "environment_vars": [ "TOOLSET_JSON_PATH={{user `toolset_json_path`}}", "ROOT_FOLDER={{user `root_folder`}}", "PSMODULES_ROOT_FOLDER={{user `psmodules_root_folder`}}" ], - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Install-PyPy.ps1", "{{ template_dir }}/scripts/Installers/Install-Toolset.ps1", "{{ template_dir }}/scripts/Installers/Configure-Toolset.ps1", "{{ template_dir }}/scripts/Installers/Install-YAMLLint.ps1", "{{ template_dir }}/scripts/Installers/Update-AndroidSDK.ps1", "{{ template_dir }}/scripts/Installers/Install-AzureModules.ps1" - ] }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Install-OpenSSL.ps1", "{{ template_dir }}/scripts/Installers/Install-Perl.ps1", "{{ template_dir }}/scripts/Installers/Install-Git.ps1", @@ -271,7 +275,7 @@ }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Enable-DeveloperMode.ps1" ], "elevated_user": "{{user `install_user`}}", @@ -281,13 +285,13 @@ "type": "powershell", "elevated_user": "SYSTEM", "elevated_password": "", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Install-Msys2.ps1" ] }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Install-VSWhere.ps1", "{{ template_dir }}/scripts/Installers/Install-WinAppDriver.ps1", "{{ template_dir }}/scripts/Installers/Install-Cmake.ps1", @@ -324,7 +328,7 @@ }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Install-WindowsUpdates.ps1", "{{ template_dir }}/scripts/Installers/Configure-DynamicPort.ps1" ], @@ -337,10 +341,10 @@ }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Tests/RunAll-Tests.ps1" ], - "environment_vars":[ + "environment_vars": [ "TOOLSET_JSON_PATH={{user `toolset_json_path`}}", "PSMODULES_ROOT_FOLDER={{user `psmodules_root_folder`}}", "ROOT_FOLDER={{user `root_folder`}}" @@ -351,7 +355,7 @@ "inline": [ "pwsh -File '{{user `image_folder`}}\\SoftwareReport\\SoftwareReport.Generator.ps1'" ], - "environment_vars":[ + "environment_vars": [ "TOOLSET_JSON_PATH={{user `toolset_json_path`}}", "ANNOUNCEMENTS={{user `announcements`}}" ] @@ -364,7 +368,7 @@ }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Finalize-VM.ps1" ] }, @@ -374,28 +378,28 @@ }, { "type": "powershell", - "environment_vars":[ + "environment_vars": [ "RUN_SCAN_ANTIVIRUS={{user `run_scan_antivirus`}}" ], - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Run-Antivirus.ps1" ] }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Configure-Antivirus.ps1" ] }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Disable-JITDebugger.ps1" ] }, { "type": "powershell", - "scripts":[ + "scripts": [ "{{ template_dir }}/scripts/Installers/Run-NGen.ps1" ] },