From 68bfa6105259a6102f83d506ee71fec4091fd789 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Tue, 11 Dec 2018 15:33:47 -0800 Subject: [PATCH 1/2] ENV to keep existing global.json --- files/KoreBuild/scripts/KoreBuild.psm1 | 2 +- files/KoreBuild/scripts/invoke-repository-build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/files/KoreBuild/scripts/KoreBuild.psm1 b/files/KoreBuild/scripts/KoreBuild.psm1 index a15faffc3..f10b52db5 100644 --- a/files/KoreBuild/scripts/KoreBuild.psm1 +++ b/files/KoreBuild/scripts/KoreBuild.psm1 @@ -390,7 +390,7 @@ function Invoke-KoreBuildCommand( $sdkVersion = __get_dotnet_sdk_version $korebuildVersion = Get-KoreBuildVersion - if ($sdkVersion -ne 'latest') { + if ($sdkVersion -ne 'latest' -and $env:KOREBUILD_KEEPGLOBALJSON -ne '1') { @" { `"sdk`": { diff --git a/files/KoreBuild/scripts/invoke-repository-build.sh b/files/KoreBuild/scripts/invoke-repository-build.sh index d1bac5560..9f26b528c 100755 --- a/files/KoreBuild/scripts/invoke-repository-build.sh +++ b/files/KoreBuild/scripts/invoke-repository-build.sh @@ -60,7 +60,7 @@ __verbose "Building $repo_path" sdk_version="$(__get_dotnet_sdk_version)" korebuild_version="$(__get_korebuild_version)" -if [ "$sdk_version" != 'latest' ]; then +if [ "$sdk_version" != 'latest' ] && [ ! -z "${KOREBUILD_KEEPGLOBALJSON:-}" != '1' ]; then echo "{ \"sdk\": { \"version\": \"${sdk_version}\" From 5acda6e99e7e913166fe0f5f1189a821057f409e Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Tue, 11 Dec 2018 15:47:33 -0800 Subject: [PATCH 2/2] Fixup --- files/KoreBuild/scripts/invoke-repository-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/KoreBuild/scripts/invoke-repository-build.sh b/files/KoreBuild/scripts/invoke-repository-build.sh index 9f26b528c..75c15f4d4 100755 --- a/files/KoreBuild/scripts/invoke-repository-build.sh +++ b/files/KoreBuild/scripts/invoke-repository-build.sh @@ -60,7 +60,7 @@ __verbose "Building $repo_path" sdk_version="$(__get_dotnet_sdk_version)" korebuild_version="$(__get_korebuild_version)" -if [ "$sdk_version" != 'latest' ] && [ ! -z "${KOREBUILD_KEEPGLOBALJSON:-}" != '1' ]; then +if [ "$sdk_version" != 'latest' ] && [ "${KOREBUILD_KEEPGLOBALJSON:-}" != '1' ]; then echo "{ \"sdk\": { \"version\": \"${sdk_version}\"