From b3251e95a88e6d6d4f4cedbd74a512e3785dc2f6 Mon Sep 17 00:00:00 2001 From: Darii Nurgaleev Date: Tue, 22 Sep 2020 15:21:08 +0700 Subject: [PATCH 1/4] vsmac added latest flag --- images/macos/provision/core/vsmac.sh | 3 +++ images/macos/toolsets/toolset-10.15.json | 2 +- images/macos/toolsets/toolset-11.0.json | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/images/macos/provision/core/vsmac.sh b/images/macos/provision/core/vsmac.sh index 9774e486f..3be149e25 100644 --- a/images/macos/provision/core/vsmac.sh +++ b/images/macos/provision/core/vsmac.sh @@ -3,6 +3,9 @@ source ~/utils/utils.sh source ~/utils/xamarin-utils.sh VSMAC_VERSION=$(get_toolset_value '.xamarin.vsmac') +if [ VSMAC_VERSION == 'latest' ] + then + VSMAC_VERSION=$(curl https://formulae.brew.sh/api/cask/visual-studio.json 2>/dev/null | jq .version) VSMAC_DOWNLOAD_URL=$(buildVSMacDownloadUrl $VSMAC_VERSION) TMPMOUNT=`/usr/bin/mktemp -d /tmp/visualstudio.XXXX` diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index e7b17989f..39ee290fc 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -6,7 +6,7 @@ ] }, "xamarin": { - "vsmac": "8.7.7.10", + "vsmac": "latest", "mono-versions": [ "6.12.0.93", "6.10.0.106", "6.8.0.123", "6.6.0.166", "6.4.0.208" ], diff --git a/images/macos/toolsets/toolset-11.0.json b/images/macos/toolsets/toolset-11.0.json index fa7a65a5a..b4ca5c82d 100644 --- a/images/macos/toolsets/toolset-11.0.json +++ b/images/macos/toolsets/toolset-11.0.json @@ -6,7 +6,7 @@ ] }, "xamarin": { - "vsmac": "8.7.7.10", + "vsmac": "latest", "mono-versions": [ "6.12.0.93" ], From 3e0cb719c7631369654ea14401edf013e8f8e6ae Mon Sep 17 00:00:00 2001 From: Darii Nurgaleev Date: Tue, 22 Sep 2020 15:31:29 +0700 Subject: [PATCH 2/4] copy issue. --- images/macos/provision/core/vsmac.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/provision/core/vsmac.sh b/images/macos/provision/core/vsmac.sh index 3be149e25..1ba0f6039 100644 --- a/images/macos/provision/core/vsmac.sh +++ b/images/macos/provision/core/vsmac.sh @@ -3,9 +3,9 @@ source ~/utils/utils.sh source ~/utils/xamarin-utils.sh VSMAC_VERSION=$(get_toolset_value '.xamarin.vsmac') -if [ VSMAC_VERSION == 'latest' ] - then +if [ VSMAC_VERSION == 'latest' ]; then VSMAC_VERSION=$(curl https://formulae.brew.sh/api/cask/visual-studio.json 2>/dev/null | jq .version) +fi VSMAC_DOWNLOAD_URL=$(buildVSMacDownloadUrl $VSMAC_VERSION) TMPMOUNT=`/usr/bin/mktemp -d /tmp/visualstudio.XXXX` From d0860e2c374e03f63ca743be2964e87c99a08cf9 Mon Sep 17 00:00:00 2001 From: Darii Nurgaleev Date: Wed, 23 Sep 2020 01:41:19 +0700 Subject: [PATCH 3/4] change quotes --- images/macos/provision/core/vsmac.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/provision/core/vsmac.sh b/images/macos/provision/core/vsmac.sh index 1ba0f6039..89fa58184 100644 --- a/images/macos/provision/core/vsmac.sh +++ b/images/macos/provision/core/vsmac.sh @@ -3,7 +3,7 @@ source ~/utils/utils.sh source ~/utils/xamarin-utils.sh VSMAC_VERSION=$(get_toolset_value '.xamarin.vsmac') -if [ VSMAC_VERSION == 'latest' ]; then +if [ VSMAC_VERSION == "latest" ]; then VSMAC_VERSION=$(curl https://formulae.brew.sh/api/cask/visual-studio.json 2>/dev/null | jq .version) fi VSMAC_DOWNLOAD_URL=$(buildVSMacDownloadUrl $VSMAC_VERSION) From 3635bca3c247aa576c34e381eb65780f8b8135ce Mon Sep 17 00:00:00 2001 From: Darii Nurgaleev Date: Thu, 24 Sep 2020 01:44:29 +0700 Subject: [PATCH 4/4] added latest version --- images/macos/provision/core/vsmac.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/provision/core/vsmac.sh b/images/macos/provision/core/vsmac.sh index 89fa58184..20a8efd46 100644 --- a/images/macos/provision/core/vsmac.sh +++ b/images/macos/provision/core/vsmac.sh @@ -3,8 +3,8 @@ source ~/utils/utils.sh source ~/utils/xamarin-utils.sh VSMAC_VERSION=$(get_toolset_value '.xamarin.vsmac') -if [ VSMAC_VERSION == "latest" ]; then - VSMAC_VERSION=$(curl https://formulae.brew.sh/api/cask/visual-studio.json 2>/dev/null | jq .version) +if [ $VSMAC_VERSION == "latest" ]; then + VSMAC_VERSION=$(curl https://formulae.brew.sh/api/cask/visual-studio.json 2>/dev/null | jq .version | tr -d \") fi VSMAC_DOWNLOAD_URL=$(buildVSMacDownloadUrl $VSMAC_VERSION)