Install shared farmework compatible with particular version of CLI (#857

)
microsoft · Jun 13, 2017 · 322bf71 · 322bf71
1 parent d66ac59
commit 322bf71
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/scripts/build.ps1 b/scripts/build.ps1
@@ -61,7 +61,8 @@ $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = 1
 # Dotnet build doesn't support --packages yet. See https://github.com/dotnet/cli/issues/2712
 $env:NUGET_PACKAGES = $env:TP_PACKAGES_DIR
 $env:NUGET_EXE_Version = "3.4.3"
-$env:DOTNET_CLI_VERSION = "latest"
+$env:DOTNET_CLI_VERSION = "2.1.0-preview1-006329"
+$env:DOTNET_RUNTIME_VERSION = "2.0.0-preview2-25331-01"
 $env:LOCATE_VS_API_VERSION = "0.2.4-beta"
 $env:MSBUILD_VERSION = "15.0"
 
@@ -138,6 +139,9 @@ function Install-DotNetCli
 
     # Get netcoreapp1.1 shared components.
     & $dotnetInstallScript -InstallDir $dotnetInstallPath -SharedRuntime -Version '1.1.2' -Channel 'release/1.1.0'
+
+    # Get shared components which is compatible with dotnet cli version $env:DOTNET_CLI_VERSION
+    & $dotnetInstallScript -InstallDir $dotnetInstallPath -SharedRuntime -Version $env:DOTNET_RUNTIME_VERSION -Channel 'master'
 
     Write-Log "Install-DotNetCli: Complete. {$(Get-ElapsedTime($timer))}"
 }

diff --git a/scripts/build.sh b/scripts/build.sh
@@ -80,7 +80,8 @@ TP_SRC_DIR="$TP_ROOT_DIR/src"
 export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
 # Dotnet build doesnt support --packages yet. See https://github.com/dotnet/cli/issues/2712
 export NUGET_PACKAGES=$TP_PACKAGES_DIR
-DOTNET_CLI_VERSION="latest"
+DOTNET_CLI_VERSION="2.1.0-preview1-006329"
+DOTNET_RUNTIME_VERSION="2.0.0-preview2-25331-01"
 
 #
 # Build configuration
@@ -159,6 +160,8 @@ function install_cli()
     $install_script --install-dir "$TP_TOOLS_DIR/dotnet" --no-path --channel "preview" --version "1.0.5" --shared-runtime
     log "install_cli: Get the shared netcoreapp1.1 runtime..."
     $install_script --install-dir "$TP_TOOLS_DIR/dotnet" --no-path --channel "release/1.1.0" --version "1.1.2" --shared-runtime
+    log "install_cli: Get shared components which is compatible with dotnet cli version $DOTNET_CLI_VERSION..."
+    $install_script --install-dir "$TP_TOOLS_DIR/dotnet" --no-path --channel "master" --version $DOTNET_RUNTIME_VERSION --shared-runtime
 
     log "install_cli: Complete. Elapsed $(( SECONDS - start ))s."
     return 0