From abaa909b9533b3f4ec3eed06311904cd25178151 Mon Sep 17 00:00:00 2001 From: Konstantin S Date: Sat, 14 Oct 2023 12:57:24 +1000 Subject: [PATCH] fix: Use dotnet workload install --sdk-version instead global.json in scripts. --- workload/scripts/workload-install.sh | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/workload/scripts/workload-install.sh b/workload/scripts/workload-install.sh index bb27d834..a35043d6 100755 --- a/workload/scripts/workload-install.sh +++ b/workload/scripts/workload-install.sh @@ -207,21 +207,10 @@ function install_tizenworkload() { fi # Install workload packs. - if [ -f global.json ]; then - CACHE_GLOBAL_JSON="true" - mv global.json global.json.bak - else - CACHE_GLOBAL_JSON="false" - fi - dotnet new globaljson --sdk-version $DOTNET_VERSION - $DOTNET_INSTALL_DIR/dotnet workload install tizen --skip-manifest-update + $DOTNET_INSTALL_DIR/dotnet workload install tizen --sdk-version $DOTNET_VERSION --skip-manifest-update # Clean-up rm -fr $TMPDIR - rm global.json - if [[ "$CACHE_GLOBAL_JSON" == "true" ]]; then - mv global.json.bak global.json - fi echo "Done installing Tizen workload $MANIFEST_VERSION" echo ""