diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 3ee454a8e..5b1915c40 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 2.0.0-preview2-25324-03 + 2.0.0-preview2-25331-01 15.3.0-preview-000246-05 2.3.0-beta2-61716-09 1.6.0-beta2-25304 @@ -16,8 +16,8 @@ 1.0.0-beta2-20170531-247 1.0.0-beta2-20170531-247 1.0.0-beta2-20170531-247 - 2.0.0-preview2-25324-03 - 2.0.0-preview2-25324-03 + 2.0.0-preview2-25331-01 + 2.0.0-preview2-25331-01 0.1.0-alpha-142 1.2.1-alpha-002130 0.2.0 @@ -32,6 +32,6 @@ 1.0.27-prerelease-01611-04 - 2.0.0-preview1-001877 + 2.0.0-preview2-25331-01 diff --git a/build/package/Installer.DEB.targets b/build/package/Installer.DEB.targets index f34d6f8a1..abfef33a5 100644 --- a/build/package/Installer.DEB.targets +++ b/build/package/Installer.DEB.targets @@ -10,7 +10,7 @@ dotnet-deb-tool-consumer.csproj $(IntermediateDirectory)/$(DotnetDebToolConsumerProjectName) - $(NuGetPackagesDir)/dotnet-deb-tool/$(DotnetDebToolVersion)/lib/netcoreapp1.0/tool/package_tool + $(NuGetPackagesDir)/dotnet-deb-tool/$(DotnetDebToolVersion)/lib/netcoreapp2.0/tool/package_tool @@ -29,10 +29,10 @@ $(SdkVersion) dotnet-dev-$(SdkDebianPackageVersion) $(SharedFrameworkVersion) - dotnet-runtime-$(SharedFxDebianPackageVersion) + dotnet-runtime-$(SharedFxDebianPackageVersion)-$(CoreSetupRid) $(SharedFxDebianPackageName.ToLower()) $(HostFxrVersion) - dotnet-hostfxr-$(HostFxrDebianPackageVersion) + dotnet-hostfxr-$(HostFxrDebianPackageVersion)-$(CoreSetupRid) $(HostFxrDebianPackageName.ToLower()) dotnet-host diff --git a/run-build.ps1 b/run-build.ps1 index 7cdfb01bd..af40c0742 100644 --- a/run-build.ps1 +++ b/run-build.ps1 @@ -80,8 +80,8 @@ $env:VSTEST_TRACE_BUILD=1 # install a stage0 $dotnetInstallPath = Join-Path $RepoRoot "scripts\obtain\dotnet-install.ps1" -Write-Output "$dotnetInstallPath -Channel ""master"" -Version ""2.0.0-preview1-005867"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture""" -Invoke-Expression "$dotnetInstallPath -Channel ""master"" ""2.0.0-preview1-005867"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture""" +Write-Output "$dotnetInstallPath -Channel ""release/2.0.0"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture""" +Invoke-Expression "$dotnetInstallPath -Channel ""release/2.0.0"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture""" if ($LastExitCode -ne 0) { Write-Output "The .NET CLI installation failed with exit code $LastExitCode" diff --git a/run-build.sh b/run-build.sh index 726e6d3bd..a7ce1daad 100755 --- a/run-build.sh +++ b/run-build.sh @@ -155,7 +155,7 @@ export VSTEST_TRACE_BUILD=1 DOTNET_MULTILEVEL_LOOKUP=0 # Install a stage 0 -(set -x ; "$REPOROOT/scripts/obtain/dotnet-install.sh" --channel "master" --version "2.0.0-preview1-005867" --install-dir "$DOTNET_INSTALL_DIR" --architecture "$ARCHITECTURE" $LINUX_PORTABLE_INSTALL_ARGS) +(set -x ; "$REPOROOT/scripts/obtain/dotnet-install.sh" --channel "release/2.0.0" --install-dir "$DOTNET_INSTALL_DIR" --architecture "$ARCHITECTURE" $LINUX_PORTABLE_INSTALL_ARGS) EXIT_CODE=$? if [ $EXIT_CODE != 0 ]; then echo "run-build: Error: installing stage0 with exit code $EXIT_CODE." >&2