From 32184fd8507834f6e952274b7a4cbf063783040d Mon Sep 17 00:00:00 2001
From: Maxim Lobanov <maxim-lobanov@github.com>
Date: Tue, 3 Aug 2021 11:56:52 +0300
Subject: [PATCH] [Windows] Clean up and simplify Windows templates (#3833)

* improve InitializeVM script

* Update windows2019.json

* remove configs

* resolve comments

* resolve comments; fix order

* fix templates

* move Node.js packages to toolset

* dotnet warmup and merge docker scripts

* clean up templates

* move template

* fix dotnetTLS order
---
 .../scripts/ImageHelpers/InstallHelpers.ps1   |   3 +-
 .../Installers/Install-AzureModules.ps1       |   2 +-
 .../scripts/Tests/PowerShellModules.Tests.ps1 |   2 +-
 images/win/windows2016.json                   | 126 +++---------------
 images/win/windows2019.json                   | 110 +++------------
 5 files changed, 41 insertions(+), 202 deletions(-)

diff --git a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 b/images/win/scripts/ImageHelpers/InstallHelpers.ps1
index 4f15d41e9..25a785858 100644
--- a/images/win/scripts/ImageHelpers/InstallHelpers.ps1
+++ b/images/win/scripts/ImageHelpers/InstallHelpers.ps1
@@ -318,7 +318,8 @@ function Get-VSExtensionVersion
 
 function Get-ToolsetContent
 {
-    $toolsetJson = Get-Content -Path $env:TOOLSET_JSON_PATH -Raw
+    $toolsetPath = Join-Path "C:\\image" "toolset.json"
+    $toolsetJson = Get-Content -Path $toolsetPath -Raw
     ConvertFrom-Json -InputObject $toolsetJson
 }
 
diff --git a/images/win/scripts/Installers/Install-AzureModules.ps1 b/images/win/scripts/Installers/Install-AzureModules.ps1
index ec36fe6ff..1c98a8c3d 100644
--- a/images/win/scripts/Installers/Install-AzureModules.ps1
+++ b/images/win/scripts/Installers/Install-AzureModules.ps1
@@ -4,7 +4,7 @@
 ################################################################################
 
 # The correct Modules need to be saved in C:\Modules
-$installPSModulePath = $env:PSMODULES_ROOT_FOLDER
+$installPSModulePath = "C:\\Modules"
 if (-not (Test-Path -LiteralPath $installPSModulePath))
 {
     Write-Host "Creating ${installPSModulePath} folder to store PowerShell Azure modules..."
diff --git a/images/win/scripts/Tests/PowerShellModules.Tests.ps1 b/images/win/scripts/Tests/PowerShellModules.Tests.ps1
index c4a9be861..ebda62bb9 100644
--- a/images/win/scripts/Tests/PowerShellModules.Tests.ps1
+++ b/images/win/scripts/Tests/PowerShellModules.Tests.ps1
@@ -24,7 +24,7 @@ Describe "PowerShellModules" {
 
 Describe "AzureModules" {
     $modules = (Get-ToolsetContent).azureModules
-    $modulesRootPath = $env:PSMODULES_ROOT_FOLDER
+    $modulesRootPath = "C:\\Modules"
 
     foreach ($module in $modules) {
         $moduleName = $module.name
diff --git a/images/win/windows2016.json b/images/win/windows2016.json
index 7445431ed..3bcd272d7 100644
--- a/images/win/windows2016.json
+++ b/images/win/windows2016.json
@@ -16,8 +16,6 @@
         "private_virtual_network_with_public_ip": "{{env `PRIVATE_VIRTUAL_NETWORK_WITH_PUBLIC_IP`}}",
         "allowed_inbound_ip_addresses": "{{env `AGENT_IP`}}",
         "vm_size": "Standard_D8s_v4",
-        "root_folder": "C:",
-        "toolset_json_path": "{{env `TEMP`}}\\toolset.json",
         "image_folder": "C:\\image",
         "imagedata_file": "C:\\imagedata.json",
         "helper_script_folder": "C:\\Program Files\\WindowsPowerShell\\Modules\\",
@@ -96,7 +94,7 @@
         {
             "type": "file",
             "source": "{{template_dir}}/toolsets/toolset-2016.json",
-            "destination": "{{user `toolset_json_path`}}"
+            "destination": "{{user `image_folder`}}\\toolset.json"
         },
         {
             "type": "windows-shell",
@@ -119,43 +117,30 @@
                 "IMAGE_VERSION={{user `image_version`}}",
                 "IMAGE_OS={{user `image_os`}}",
                 "AGENT_TOOLSDIRECTORY={{user `agent_tools_directory`}}",
-                "TOOLSET_JSON_PATH={{user `toolset_json_path`}}",
-                "PSMODULES_ROOT_FOLDER={{user `psmodules_root_folder`}}"
+                "IMAGEDATA_FILE={{user `imagedata_file`}}"
             ],
             "scripts": [
                 "{{ template_dir }}/scripts/Installers/Configure-Antivirus.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-PowerShellModules.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-WindowsFeatures.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-Choco.ps1",
-                "{{ template_dir }}/scripts/Installers/Initialize-VM.ps1"
+                "{{ template_dir }}/scripts/Installers/Initialize-VM.ps1",
+                "{{ template_dir }}/scripts/Installers/Update-ImageData.ps1",
+                "{{ template_dir }}/scripts/Installers/Update-DotnetTLS.ps1"
             ],
             "execution_policy": "unrestricted"
         },
-        {
-            "type": "powershell",
-            "scripts": [
-                "{{ template_dir }}/scripts/Installers/Install-WebPlatformInstaller.ps1",
-                "{{ template_dir }}/scripts/Installers/Update-DotnetTLS.ps1"
-            ]
-        },
         {
             "type": "windows-restart",
             "restart_timeout": "30m"
         },
         {
             "type": "powershell",
-            "environment_vars": [
-                "IMAGE_VERSION={{user `image_version`}}",
-                "IMAGE_OS={{user `image_os`}}",
-                "AGENT_TOOLSDIRECTORY={{user `agent_tools_directory`}}",
-                "IMAGEDATA_FILE={{user `imagedata_file`}}",
-                "TOOLSET_JSON_PATH={{user `toolset_json_path`}}"
-            ],
             "scripts": [
                 "{{ template_dir }}/scripts/Installers/Install-VCRedist.ps1",
-                "{{ template_dir }}/scripts/Installers/Update-ImageData.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-Docker.ps1",
-                "{{ template_dir }}/scripts/Installers/Install-PowershellCore.ps1"
+                "{{ template_dir }}/scripts/Installers/Install-PowershellCore.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-WebPlatformInstaller.ps1"
             ]
         },
         {
@@ -168,29 +153,16 @@
                 0,
                 3010
             ],
-            "environment_vars": [
-                "TOOLSET_JSON_PATH={{user `toolset_json_path`}}"
-            ],
             "scripts": [
                 "{{ template_dir }}/scripts/Installers/Install-KubernetesTools.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-VS.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-NET48.ps1",
-                "{{ template_dir }}/scripts/Installers/Windows2016/Install-SSDT.ps1"
+                "{{ template_dir }}/scripts/Installers/Windows2016/Install-SSDT.ps1",
+                "{{ template_dir }}/scripts/Installers/Enable-DeveloperMode.ps1"
             ],
             "elevated_user": "{{user `install_user`}}",
             "elevated_password": "{{user `install_password`}}"
         },
-        {
-            "type": "powershell",
-            "environment_vars": [
-                "TOOLSET_JSON_PATH={{user `toolset_json_path`}}"
-            ],
-            "scripts": [
-                "{{ template_dir }}/scripts/Installers/Install-Wix.ps1",
-                "{{ template_dir }}/scripts/Installers/Install-WDK.ps1",
-                "{{ template_dir }}/scripts/Installers/Install-Vsix.ps1"
-            ]
-        },
         {
             "type": "powershell",
             "scripts": [
@@ -204,10 +176,10 @@
         },
         {
             "type": "powershell",
-            "environment_vars": [
-                "TOOLSET_JSON_PATH={{user `toolset_json_path`}}"
-            ],
             "scripts": [
+                "{{ template_dir }}/scripts/Installers/Install-Wix.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-WDK.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Vsix.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-AzureCli.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-AzureDevOpsCli.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-NodeLts.ps1",
@@ -215,28 +187,14 @@
                 "{{ template_dir }}/scripts/Installers/Install-CommonUtils.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-AliyunCli.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-PostgreSQL.ps1",
-                "{{ template_dir }}/scripts/Installers/Install-JavaTools.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "environment_vars": [
-                "TOOLSET_JSON_PATH={{user `toolset_json_path`}}",
-                "ROOT_FOLDER={{user `root_folder`}}"
-            ],
-            "scripts": [
+                "{{ template_dir }}/scripts/Installers/Install-JavaTools.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-Ruby.ps1",
                 "{{ 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-AndroidSDK.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-Pipx.ps1",
-                "{{ template_dir }}/scripts/Installers/Install-PipxPackages.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts": [
+                "{{ template_dir }}/scripts/Installers/Install-PipxPackages.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-Sbt.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-Git.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-GitHub-CLI.ps1",
@@ -251,14 +209,6 @@
                 "{{ template_dir }}/scripts/Installers/Install-Nginx.ps1"
             ]
         },
-        {
-            "type": "powershell",
-            "scripts": [
-                "{{ template_dir }}/scripts/Installers/Enable-DeveloperMode.ps1"
-            ],
-            "elevated_user": "{{user `install_user`}}",
-            "elevated_password": "{{user `install_password`}}"
-        },
         {
             "type": "windows-shell",
             "inline": [
@@ -267,41 +217,16 @@
         },
         {
             "type": "powershell",
-            "environment_vars": [
-                "TOOLSET_JSON_PATH={{user `toolset_json_path`}}",
-                "PSMODULES_ROOT_FOLDER={{user `psmodules_root_folder`}}"
-            ],
-            "scripts": [
-                "{{ template_dir }}/scripts/Installers/Install-AzureModules.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "environment_vars": [
-                "TOOLSET_JSON_PATH={{user `toolset_json_path`}}"
-            ],
             "scripts": [
+                "{{ template_dir }}/scripts/Installers/Install-AzureModules.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-WinAppDriver.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-R.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-AWS.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-DACFx.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-MysqlCli.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-SQLPowerShellTools.ps1",
-                "{{ template_dir }}/scripts/Installers/Install-DotnetSDK.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "environment_vars": [
-                "TOOLSET_JSON_PATH={{user `toolset_json_path`}}"
-            ],
-            "scripts": [
-                "{{ template_dir }}/scripts/Installers/Install-Msys2.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts": [
+                "{{ template_dir }}/scripts/Installers/Install-DotnetSDK.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Msys2.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-Mingw64.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-Haskell.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-Stack.ps1",
@@ -314,7 +239,8 @@
                 "{{ template_dir }}/scripts/Installers/Install-Vcpkg.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-MongoDB.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-GoogleCloudSDK.ps1",
-                "{{ template_dir }}/scripts/Installers/Install-CodeQLBundle.ps1"
+                "{{ template_dir }}/scripts/Installers/Install-CodeQLBundle.ps1",
+                "{{ template_dir }}/scripts/Installers/Disable-JITDebugger.ps1"
             ]
         },
         {
@@ -336,11 +262,6 @@
             "type": "powershell",
             "scripts": [
                 "{{ template_dir }}/scripts/Tests/RunAll-Tests.ps1"
-            ],
-            "environment_vars": [
-                "TOOLSET_JSON_PATH={{user `toolset_json_path`}}",
-                "PSMODULES_ROOT_FOLDER={{user `psmodules_root_folder`}}",
-                "ROOT_FOLDER={{user `root_folder`}}"
             ]
         },
         {
@@ -349,8 +270,7 @@
                 "pwsh -File '{{user `image_folder`}}\\SoftwareReport\\SoftwareReport.Generator.ps1'"
             ],
             "environment_vars": [
-                "IMAGE_VERSION={{user `image_version`}}",
-                "TOOLSET_JSON_PATH={{user `toolset_json_path`}}"
+                "IMAGE_VERSION={{user `image_version`}}"
             ]
         },
         {
@@ -369,12 +289,6 @@
             "type": "windows-restart",
             "restart_timeout": "30m"
         },
-        {
-            "type": "powershell",
-            "scripts": [
-                "{{ template_dir }}/scripts/Installers/Disable-JITDebugger.ps1"
-            ]
-        },
         {
             "type": "powershell",
             "inline": [
diff --git a/images/win/windows2019.json b/images/win/windows2019.json
index 18c63ed85..052e51c1b 100644
--- a/images/win/windows2019.json
+++ b/images/win/windows2019.json
@@ -16,12 +16,9 @@
         "private_virtual_network_with_public_ip": "{{env `PRIVATE_VIRTUAL_NETWORK_WITH_PUBLIC_IP`}}",
         "allowed_inbound_ip_addresses": "{{env `AGENT_IP`}}",
         "vm_size": "Standard_D8s_v4",
-        "root_folder": "C:",
-        "toolset_json_path": "{{env `TEMP`}}\\toolset.json",
         "image_folder": "C:\\image",
         "imagedata_file": "C:\\imagedata.json",
         "helper_script_folder": "C:\\Program Files\\WindowsPowerShell\\Modules\\",
-        "psmodules_root_folder": "C:\\Modules",
         "agent_tools_directory": "C:\\hostedtoolcache\\windows",
         "install_user": "installer",
         "install_password": null,
@@ -96,7 +93,7 @@
         {
             "type": "file",
             "source": "{{template_dir}}/toolsets/toolset-2019.json",
-            "destination": "{{user `toolset_json_path`}}"
+            "destination": "{{user `image_folder`}}\\toolset.json"
         },
         {
             "type": "windows-shell",
@@ -119,15 +116,16 @@
                 "IMAGE_VERSION={{user `image_version`}}",
                 "IMAGE_OS={{user `image_os`}}",
                 "AGENT_TOOLSDIRECTORY={{user `agent_tools_directory`}}",
-                "TOOLSET_JSON_PATH={{user `toolset_json_path`}}",
-                "PSMODULES_ROOT_FOLDER={{user `psmodules_root_folder`}}"
+                "IMAGEDATA_FILE={{user `imagedata_file`}}"
             ],
             "scripts": [
                 "{{ template_dir }}/scripts/Installers/Configure-Antivirus.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-PowerShellModules.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-WindowsFeatures.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-Choco.ps1",
-                "{{ template_dir }}/scripts/Installers/Initialize-VM.ps1"
+                "{{ template_dir }}/scripts/Installers/Initialize-VM.ps1",
+                "{{ template_dir }}/scripts/Installers/Update-ImageData.ps1",
+                "{{ template_dir }}/scripts/Installers/Update-DotnetTLS.ps1"
             ],
             "execution_policy": "unrestricted"
         },
@@ -139,31 +137,17 @@
                 "{{ template_dir }}/scripts/Installers/Windows2019/Install-WSL.ps1"
             ]
         },
-        {
-            "type": "powershell",
-            "scripts": [
-                "{{ template_dir }}/scripts/Installers/Install-WebPlatformInstaller.ps1",
-                "{{ template_dir }}/scripts/Installers/Update-DotnetTLS.ps1"
-            ]
-        },
         {
             "type": "windows-restart",
             "restart_timeout": "10m"
         },
         {
             "type": "powershell",
-            "environment_vars": [
-                "IMAGE_VERSION={{user `image_version`}}",
-                "IMAGE_OS={{user `image_os`}}",
-                "AGENT_TOOLSDIRECTORY={{user `agent_tools_directory`}}",
-                "IMAGEDATA_FILE={{user `imagedata_file`}}",
-                "TOOLSET_JSON_PATH={{user `toolset_json_path`}}"
-            ],
             "scripts": [
                 "{{ template_dir }}/scripts/Installers/Install-VCRedist.ps1",
-                "{{ template_dir }}/scripts/Installers/Update-ImageData.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-Docker.ps1",
-                "{{ template_dir }}/scripts/Installers/Install-PowershellCore.ps1"
+                "{{ template_dir }}/scripts/Installers/Install-PowershellCore.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-WebPlatformInstaller.ps1"
             ]
         },
         {
@@ -176,22 +160,17 @@
                 0,
                 3010
             ],
-            "environment_vars": [
-                "TOOLSET_JSON_PATH={{user `toolset_json_path`}}"
-            ],
             "scripts": [
                 "{{ template_dir }}/scripts/Installers/Install-KubernetesTools.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-VS.ps1",
-                "{{ template_dir }}/scripts/Installers/Install-NET48.ps1"
+                "{{ template_dir }}/scripts/Installers/Install-NET48.ps1",
+                "{{ template_dir }}/scripts/Installers/Enable-DeveloperMode.ps1"
             ],
             "elevated_user": "{{user `install_user`}}",
             "elevated_password": "{{user `install_password`}}"
         },
         {
             "type": "powershell",
-            "environment_vars": [
-                "TOOLSET_JSON_PATH={{user `toolset_json_path`}}"
-            ],
             "scripts": [
                 "{{ template_dir }}/scripts/Installers/Install-Wix.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-WDK.ps1",
@@ -222,11 +201,6 @@
         },
         {
             "type": "powershell",
-            "environment_vars": [
-                "TOOLSET_JSON_PATH={{user `toolset_json_path`}}",
-                "ROOT_FOLDER={{user `root_folder`}}",
-                "PSMODULES_ROOT_FOLDER={{user `psmodules_root_folder`}}"
-            ],
             "scripts": [
                 "{{ template_dir }}/scripts/Installers/Install-Ruby.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-PyPy.ps1",
@@ -235,12 +209,7 @@
                 "{{ template_dir }}/scripts/Installers/Install-AndroidSDK.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-AzureModules.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-Pipx.ps1",
-                "{{ template_dir }}/scripts/Installers/Install-PipxPackages.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts": [
+                "{{ template_dir }}/scripts/Installers/Install-PipxPackages.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-Git.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-GitHub-CLI.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-PHP.ps1",
@@ -252,32 +221,8 @@
                 "{{ template_dir }}/scripts/Installers/Install-Selenium.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-IEWebDriver.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-Apache.ps1",
-                "{{ template_dir }}/scripts/Installers/Install-Nginx.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts": [
-                "{{ template_dir }}/scripts/Installers/Enable-DeveloperMode.ps1"
-            ],
-            "elevated_user": "{{user `install_user`}}",
-            "elevated_password": "{{user `install_password`}}"
-        },
-        {
-            "type": "powershell",
-            "environment_vars": [
-                "TOOLSET_JSON_PATH={{user `toolset_json_path`}}"
-            ],
-            "scripts": [
-                "{{ template_dir }}/scripts/Installers/Install-Msys2.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "environment_vars": [
-                "TOOLSET_JSON_PATH={{user `toolset_json_path`}}"
-            ],
-            "scripts": [
+                "{{ template_dir }}/scripts/Installers/Install-Nginx.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-Msys2.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-WinAppDriver.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-R.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-AWS.ps1",
@@ -301,13 +246,10 @@
                 "{{ template_dir }}/scripts/Installers/Install-RootCA.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-MongoDB.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-GoogleCloudSDK.ps1",
-                "{{ template_dir }}/scripts/Installers/Install-CodeQLBundle.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts": [
-                "{{ template_dir }}/scripts/Installers/Install-BizTalkBuildComponent.ps1"
+                "{{ template_dir }}/scripts/Installers/Install-CodeQLBundle.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-BizTalkBuildComponent.ps1",
+                "{{ template_dir }}/scripts/Installers/Disable-JITDebugger.ps1",
+                "{{ template_dir }}/scripts/Installers/Run-NGen.ps1"
             ]
         },
         {
@@ -329,11 +271,6 @@
             "type": "powershell",
             "scripts": [
                 "{{ template_dir }}/scripts/Tests/RunAll-Tests.ps1"
-            ],
-            "environment_vars": [
-                "TOOLSET_JSON_PATH={{user `toolset_json_path`}}",
-                "PSMODULES_ROOT_FOLDER={{user `psmodules_root_folder`}}",
-                "ROOT_FOLDER={{user `root_folder`}}"
             ]
         },
         {
@@ -342,8 +279,7 @@
                 "pwsh -File '{{user `image_folder`}}\\SoftwareReport\\SoftwareReport.Generator.ps1'"
             ],
             "environment_vars": [
-                "IMAGE_VERSION={{user `image_version`}}",
-                "TOOLSET_JSON_PATH={{user `toolset_json_path`}}"
+                "IMAGE_VERSION={{user `image_version`}}"
             ]
         },
         {
@@ -362,18 +298,6 @@
             "type": "windows-restart",
             "restart_timeout": "10m"
         },
-        {
-            "type": "powershell",
-            "scripts": [
-                "{{ template_dir }}/scripts/Installers/Disable-JITDebugger.ps1"
-            ]
-        },
-        {
-            "type": "powershell",
-            "scripts": [
-                "{{ template_dir }}/scripts/Installers/Run-NGen.ps1"
-            ]
-        },
         {
             "type": "powershell",
             "inline": [