From 5513d6d41dd42726b97686bd5d2d4f6d080f1d0e Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Fri, 28 Dec 2018 13:22:29 -0800 Subject: [PATCH] Updating stage0 to 3.0.100-preview-009812 again. This change was lost when we moved to arcade. --- .vsts-ci.yml | 1 + eng/build.yml | 1 + eng/restore-toolset.sh | 16 ++++++---------- global.json | 2 +- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index ddc704b55..3a20d2a77 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -243,6 +243,7 @@ jobs: matrix: Build_Release: _BuildConfig: Release + _AdditionalBuildParameters: '/p:DisableSourceLink=true' - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - job: Copy_SDK_To_Latest diff --git a/eng/build.yml b/eng/build.yml index c0789417f..35af1aa69 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -110,6 +110,7 @@ phases: $(_PublishArgs) $(_SignArgs) $(_OfficialBuildIdArgs) + $(AdditionalBuildParameters) displayName: Build - task: PublishTestResults@1 diff --git a/eng/restore-toolset.sh b/eng/restore-toolset.sh index 549156253..42ee4d364 100644 --- a/eng/restore-toolset.sh +++ b/eng/restore-toolset.sh @@ -13,27 +13,23 @@ function InitializeCustomSDKToolset { #InstallDotNetSharedFramework "1.1.2" InitializeDotNetCli true - # Install 2.1 framework for dotnet-deb-tool + # Install 2.1 framework for dotnet-deb-tool. + # Failures on this call will be ignored, as this is expected to fail on some + # OSes. InstallDotNetSharedFramework "2.1.0" } # Installs additional shared frameworks for testing purposes function InstallDotNetSharedFramework { local version=$1 - local dotnet_root=$DOTNET_INSTALL_DIR + local dotnet_root=$DOTNET_INSTALL_DIR local fx_dir="$dotnet_root/shared/Microsoft.NETCore.App/$version" if [[ ! -d "$fx_dir" ]]; then GetDotNetInstallScript "$dotnet_root" local install_script=$_GetDotNetInstallScript - - bash "$install_script" --version $version --install-dir "$dotnet_root" --runtime "dotnet" - local lastexitcode=$? - - if [[ $lastexitcode != 0 ]]; then - echo "Failed to install Shared Framework $version to '$dotnet_root' (exit code '$lastexitcode')." - ExitWithExitCode $lastexitcode - fi + + bash "$install_script" --version $version --install-dir "$dotnet_root" --runtime "dotnet" || true fi } diff --git a/global.json b/global.json index 5ec05dd38..a82059ebd 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "3.0.100-alpha1-009697" + "dotnet": "3.0.100-preview-009812" }, "msbuild-sdks": { "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.18620.6"