mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update toolset and align stage0 version

Browse source
This commit is contained in:
Nick Guerrera 2018-07-27 14:55:05 -07:00
parent bbb8d01ef8
commit 2c46d9d042
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build/DependencyVersions.props
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<ToolsetVersion>3.0.100-alpha1-009033</ToolsetVersion> <ToolsetVersion>3.0.100-alpha1-009347</ToolsetVersion>
<MicrosoftAspNetCoreAllPackageVersion>3.0.0-alpha1-10062</MicrosoftAspNetCoreAllPackageVersion> <MicrosoftAspNetCoreAllPackageVersion>3.0.0-alpha1-10062</MicrosoftAspNetCoreAllPackageVersion>
<MicrosoftAspNetCoreAppPackageVersion>$(MicrosoftAspNetCoreAllPackageVersion)</MicrosoftAspNetCoreAppPackageVersion> <MicrosoftAspNetCoreAppPackageVersion>$(MicrosoftAspNetCoreAllPackageVersion)</MicrosoftAspNetCoreAppPackageVersion>
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>$(MicrosoftAspNetCoreAllPackageVersion)</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion> <MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>$(MicrosoftAspNetCoreAllPackageVersion)</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>

4
run-build.ps1
View file

@ -90,8 +90,8 @@ if($Architecture.StartsWith("arm", [StringComparison]::OrdinalIgnoreCase))
$InstallArchitecture = "x64" $InstallArchitecture = "x64"
} }
Write-Output "$dotnetInstallPath -version ""2.1.300"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$InstallArchitecture""" Write-Output "$dotnetInstallPath -version ""3.0.100-preview1-009020"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$InstallArchitecture"""
Invoke-Expression "$dotnetInstallPath -version ""2.1.300"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$InstallArchitecture""" Invoke-Expression "$dotnetInstallPath -version ""3.0.100-preview1-009020"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$InstallArchitecture"""
if ($LastExitCode -ne 0) if ($LastExitCode -ne 0)
{ {

2
run-build.sh
View file

@ -164,7 +164,7 @@ if [[ $archlower == 'arm'* ]]; then
fi fi
if [ "$STAGE0_SOURCE_DIR" == "" ]; then if [ "$STAGE0_SOURCE_DIR" == "" ]; then
(set -x ; curl -sSL "https://dot.net/v1/dotnet-install.sh" | bash /dev/stdin --version "2.2.0-preview1-007799" --install-dir "$DOTNET_INSTALL_DIR" --architecture "$INSTALL_ARCHITECTURE" $LINUX_PORTABLE_INSTALL_ARGS) (set -x ; curl -sSL "https://dot.net/v1/dotnet-install.sh" | bash /dev/stdin --version "3.0.100-preview1-009020" --install-dir "$DOTNET_INSTALL_DIR" --architecture "$INSTALL_ARCHITECTURE" $LINUX_PORTABLE_INSTALL_ARGS)
else else
echo "Copying bootstrap cli from $STAGE0_SOURCE_DIR" echo "Copying bootstrap cli from $STAGE0_SOURCE_DIR"
cp -r $STAGE0_SOURCE_DIR/* "$DOTNET_INSTALL_DIR" cp -r $STAGE0_SOURCE_DIR/* "$DOTNET_INSTALL_DIR"