From caa872685a9d06e66d9368a40755faa3ce5791c1 Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov Date: Tue, 10 Nov 2020 15:50:34 +0300 Subject: [PATCH] resolve issues --- images/win/toolsets/toolset-2016.json | 3 +-- images/win/toolsets/toolset-2019.json | 3 +-- images/win/windows2016.json | 3 +++ images/win/windows2019.json | 3 +++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json index e612645b..e9ec9116 100644 --- a/images/win/toolsets/toolset-2016.json +++ b/images/win/toolsets/toolset-2016.json @@ -248,8 +248,7 @@ "versions": [ "1.1", "2.1", - "3.1", - "5.0" + "3.1" ] } } diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 94e0f93c..2b226ab7 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -290,8 +290,7 @@ "dotnet": { "versions": [ "2.1", - "3.1", - "5.0" + "3.1" ] } } diff --git a/images/win/windows2016.json b/images/win/windows2016.json index 120e7ac9..13cdc4a7 100644 --- a/images/win/windows2016.json +++ b/images/win/windows2016.json @@ -285,6 +285,9 @@ }, { "type": "powershell", + "environment_vars": [ + "TOOLSET_JSON_PATH={{user `toolset_json_path`}}" + ], "scripts": [ "{{ template_dir }}/scripts/Installers/Install-VSWhere.ps1", "{{ template_dir }}/scripts/Installers/Install-WinAppDriver.ps1", diff --git a/images/win/windows2019.json b/images/win/windows2019.json index a27bf27d..f2c230bf 100644 --- a/images/win/windows2019.json +++ b/images/win/windows2019.json @@ -292,6 +292,9 @@ }, { "type": "powershell", + "environment_vars": [ + "TOOLSET_JSON_PATH={{user `toolset_json_path`}}" + ], "scripts": [ "{{ template_dir }}/scripts/Installers/Install-VSWhere.ps1", "{{ template_dir }}/scripts/Installers/Install-WinAppDriver.ps1",