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

remove all the hacks to work around broken crossgen/coreclr

Browse source
This commit is contained in:
Andrew Stanton-Nurse 2016-02-11 13:53:57 -08:00
parent 5a257a7107
commit d67a0cd9bb
5 changed files with 4 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
scripts/build/build.ps1
View file

@ -30,9 +30,6 @@ else {
_ "$RepoRoot\scripts\obtain\install-tools.ps1"
}
header "Cleaning out .ni's from Stage0"
rm "$RepoRoot\.dotnet_stage0\**\*.ni.*"
_ "$RepoRoot\scripts\build\restore-packages.ps1"
header "Compiling"

3
scripts/build/build.sh
View file

@ -44,9 +44,6 @@ else
$REPOROOT/scripts/obtain/install-tools.sh
fi
header "Cleaning out .ni's from Stage0"
find ".dotnet_stage0" -name '*.ni.*' -delete
$REPOROOT/scripts/build/restore-packages.sh
header "Compiling"

1
scripts/ci_build.cmd
View file

@ -4,6 +4,7 @@ REM Copyright (c) .NET Foundation and contributors. All rights reserved.
REM Licensed under the MIT license. See LICENSE file in the project root for full license information.
set CI_BUILD=1
set SKIP_CROSSGEN=0
CALL %~dp0..\build.cmd %*

3
scripts/crossgen/crossgen_roslyn.cmd
View file

@ -41,12 +41,15 @@ if not %errorlevel% EQU 0 goto fail
crossgen /nologo %READYTORUN% /Platform_Assemblies_Paths %BIN_DIR% Microsoft.CodeAnalysis.CSharp.dll >nul 2>nul
if not %errorlevel% EQU 0 goto fail
echo Crossgenning Microsoft.CodeAnalysis.VisualBasic
crossgen /nologo %READYTORUN% /Platform_Assemblies_Paths %BIN_DIR% Microsoft.CodeAnalysis.VisualBasic.dll >nul 2>nul
if not %errorlevel% EQU 0 goto fail
echo Crossgenning csc
crossgen /nologo %READYTORUN% /Platform_Assemblies_Paths %BIN_DIR% csc.dll >nul 2>nul
if not %errorlevel% EQU 0 goto fail
echo Crossgenning vbc
crossgen /nologo %READYTORUN% /Platform_Assemblies_Paths %BIN_DIR% vbc.dll >nul 2>nul
if not %errorlevel% EQU 0 goto fail

10
scripts/obtain/install-tools.sh
View file

@ -22,13 +22,3 @@ source "$DIR/../common/_common.sh"
# Ensure the latest stage0 is installed
header "Installing dotnet stage 0"
$REPOROOT/scripts/obtain/install.sh
# Now patch the runtime in stage 0
# HACK(anurse): BIG HACK. This is just to dodge the current broken Linux stage0. We'll remove it as soon as we've got a new stage 0
(
export PATH="$DOTNET_INSTALL_DIR/bin:$PATH"
cd $REPOROOT/src/Microsoft.DotNet.Runtime
dotnet restore
dotnet publish -o "$DOTNET_INSTALL_DIR/share/dotnet/cli/runtime/coreclr"
cp $DOTNET_INSTALL_DIR/share/dotnet/cli/runtime/coreclr/* $DOTNET_INSTALL_DIR/share/dotnet/cli/bin
)