Merge pull request #9704 from dotnet/merges/release/2.1.4xx-to-release/2.1.401
Merge release/2.1.4xx to release/2.1.401
This commit is contained in:
commit
9d07296cd3
3 changed files with 4 additions and 4 deletions
|
@ -17,8 +17,8 @@
|
|||
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
|
||||
<MicrosoftBuildLocalizationPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildLocalizationPackageVersion>
|
||||
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
|
||||
<MicrosoftFSharpCompilerPackageVersion>10.2.0-rtm-180620-0</MicrosoftFSharpCompilerPackageVersion>
|
||||
<MicrosoftCodeAnalysisCSharpPackageVersion>2.8.1-beta6-62915-07</MicrosoftCodeAnalysisCSharpPackageVersion>
|
||||
<MicrosoftFSharpCompilerPackageVersion>10.2.1-rtm-180716-0</MicrosoftFSharpCompilerPackageVersion>
|
||||
<MicrosoftCodeAnalysisCSharpPackageVersion>2.9.0-beta8-63115-02</MicrosoftCodeAnalysisCSharpPackageVersion>
|
||||
<MicrosoftCodeAnalysisBuildTasksPackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftCodeAnalysisBuildTasksPackageVersion>
|
||||
<MicrosoftNETCoreCompilersPackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftNETCoreCompilersPackageVersion>
|
||||
<MicrosoftCodeAnalysisBuildTasksPackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftCodeAnalysisBuildTasksPackageVersion>
|
||||
|
|
|
@ -38,7 +38,7 @@ $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
|
|||
|
||||
# Install a stage 0
|
||||
Write-Output "Installing .NET Core CLI Stage 0"
|
||||
& "$RepoRoot\scripts\obtain\dotnet-install.ps1" -Channel "master" -Architecture $Architecture
|
||||
& "$RepoRoot\scripts\obtain\dotnet-install.ps1" -Version 2.1.302 -Architecture $Architecture
|
||||
if($LASTEXITCODE -ne 0) { throw "Failed to install stage0" }
|
||||
|
||||
# Put the stage0 on the path
|
||||
|
|
|
@ -34,7 +34,7 @@ export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
|
|||
|
||||
# Install a stage 0
|
||||
echo "Installing .NET Core CLI Stage 0"
|
||||
$REPO_ROOT/scripts/obtain/dotnet-install.sh -Channel master -Architecture x64
|
||||
$REPO_ROOT/scripts/obtain/dotnet-install.sh -Version 2.1.302 -Architecture x64
|
||||
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "Failed to install stage 0"
|
||||
|
|
Loading…
Reference in a new issue