From d9c166b7930bb9593d99e6c205bcacd7aaa2e9c9 Mon Sep 17 00:00:00 2001
From: "Dariy.Nurgaleev" <d.nurgaleev@trueengineering.ru>
Date: Tue, 24 Mar 2020 17:57:29 +0700
Subject: [PATCH] applied proper changes for Windows2019

---
 images/win/Windows2019-Azure.json | 57 ++++++++++++++++---------------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/images/win/Windows2019-Azure.json b/images/win/Windows2019-Azure.json
index 2b081be7..e965b9a0 100644
--- a/images/win/Windows2019-Azure.json
+++ b/images/win/Windows2019-Azure.json
@@ -30,7 +30,8 @@
         "image_os": "win19",
         "github_feed_token": "{{env `GITHUB_FEED_TOKEN`}}",
         "go_versions": "1.9, 1.10, 1.11, 1.12, 1.13, 1.14",
-        "go_default": "1.14"
+        "go_default": "1.14",
+        "boost_default": "1.72.0"
     },
     "sensitive-variables": ["install_password", "ssh_password", "client_secret", "github_feed_token"],
     "builders": [
@@ -102,6 +103,12 @@
                 "{{ template_dir }}/scripts/Installers/Windows2019/Initialize-VM.ps1"
             ]
         },
+        {
+            "type": "powershell",
+            "scripts":[
+                "{{ template_dir }}/scripts/Installers/Update-DotnetTLS.ps1"
+            ]
+        },
         {
             "type": "windows-restart",
             "restart_timeout": "10m"
@@ -188,7 +195,7 @@
         {
             "type": "powershell",
             "scripts":[
-                "{{ template_dir }}/scripts/Installers/Windows2019/Install-AnalysisExtenstion.ps1"
+                "{{ template_dir }}/scripts/Installers/Windows2019/Install-SSDTExtensions.ps1"
             ]
         },
         {
@@ -204,7 +211,7 @@
         {
             "type": "powershell",
             "scripts": [
-                "{{ template_dir }}/scripts/Installers/Windows2019/Install-WDK.ps1"
+                "{{ template_dir }}/scripts/Installers/Install-WDK.ps1"
             ]
         },
         {
@@ -220,13 +227,13 @@
         {
             "type": "powershell",
             "scripts":[
-                "{{ template_dir }}/scripts/Installers/Windows2019/Validate-Wix.ps1"
+                "{{ template_dir }}/scripts/Installers/Validate-Wix.ps1"
             ]
         },
         {
             "type": "powershell",
             "scripts":[
-                "{{ template_dir }}/scripts/Installers/Windows2019/Validate-AnalysisExtenstion.ps1"
+                "{{ template_dir }}/scripts/Installers/Windows2019/Validate-SSDTExtensions.ps1"
             ]
         },
         {
@@ -238,7 +245,7 @@
         {
             "type": "powershell",
             "scripts":[
-                "{{ template_dir }}/scripts/Installers/Windows2019/Validate-WDK.ps1"
+                "{{ template_dir }}/scripts/Installers/Validate-WDK.ps1"
             ]
         },
         {
@@ -247,12 +254,6 @@
                 "{{ template_dir }}/scripts/Installers/Validate-ServiceFabricSDK.ps1"
             ]
         },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Update-DotnetTLS.ps1"
-            ]
-        },
         {
             "type": "powershell",
             "scripts":[
@@ -298,6 +299,12 @@
                 "{{ template_dir }}/scripts/Installers/Download-ToolCache.ps1"
             ]
         },
+        {
+            "type": "powershell",
+            "scripts":[
+                "{{ template_dir }}/scripts/Installers/Install-OpenSSL.ps1"
+            ]
+        },
         {
             "type": "powershell",
             "scripts":[
@@ -499,8 +506,8 @@
         {
             "type": "powershell",
             "environment_vars": [
-                "BOOST_VERSIONS=1.69.0,1.72.0",
-                "BOOST_DEFAULT=1.72.0"
+                "ROOT_FOLDER={{user `root_folder`}}",
+                "BOOST_DEFAULT={{user `boost_default`}}"
             ],
             "scripts":[
                 "{{ template_dir }}/scripts/Installers/Install-Boost.ps1"
@@ -536,12 +543,6 @@
                 "{{ template_dir }}/scripts/Installers/Install-GitVersion.ps1"
             ]
         },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Install-OpenSSL.ps1"
-            ]
-        },
         {
             "type": "powershell",
             "scripts":[
@@ -615,6 +616,12 @@
                 "{{ template_dir }}/scripts/Installers/Validate-ToolCache.ps1"
             ]
         },
+        {
+            "type": "powershell",
+            "scripts":[
+                "{{ template_dir }}/scripts/Installers/Validate-OpenSSL.ps1"
+            ]
+        },
         {
             "type": "powershell",
             "scripts":[
@@ -640,8 +647,8 @@
         {
             "type": "powershell",
             "environment_vars": [
-                "BOOST_VERSIONS=1.69.0,1.72.0",
-                "BOOST_DEFAULT=1.72.0"
+                "ROOT_FOLDER={{user `root_folder`}}",
+                "BOOST_DEFAULT={{user `boost_default`}}"
             ],
             "scripts":[
                 "{{ template_dir }}/scripts/Installers/Validate-Boost.ps1"
@@ -815,12 +822,6 @@
                 "{{ template_dir }}/scripts/Installers/Validate-GitVersion.ps1"
             ]
         },
-        {
-            "type": "powershell",
-            "scripts":[
-                "{{ template_dir }}/scripts/Installers/Validate-OpenSSL.ps1"
-            ]
-        },
         {
             "type": "powershell",
             "scripts":[