From d67a0cd9bbcf9d338176d84834fc486522b270ed Mon Sep 17 00:00:00 2001
From: Andrew Stanton-Nurse <andrew@andrewnurse.net>
Date: Thu, 11 Feb 2016 13:53:57 -0800
Subject: [PATCH] remove all the hacks to work around broken crossgen/coreclr

---
 scripts/build/build.ps1              |  3 ---
 scripts/build/build.sh               |  3 ---
 scripts/ci_build.cmd                 |  1 +
 scripts/crossgen/crossgen_roslyn.cmd |  3 +++
 scripts/obtain/install-tools.sh      | 10 ----------
 5 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/scripts/build/build.ps1 b/scripts/build/build.ps1
index c302e0378..a3a26c8a7 100644
--- a/scripts/build/build.ps1
+++ b/scripts/build/build.ps1
@@ -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"
diff --git a/scripts/build/build.sh b/scripts/build/build.sh
index 362f7c531..897c80ee3 100755
--- a/scripts/build/build.sh
+++ b/scripts/build/build.sh
@@ -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"
diff --git a/scripts/ci_build.cmd b/scripts/ci_build.cmd
index 54f5f51e3..91255b452 100644
--- a/scripts/ci_build.cmd
+++ b/scripts/ci_build.cmd
@@ -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 %*
 
diff --git a/scripts/crossgen/crossgen_roslyn.cmd b/scripts/crossgen/crossgen_roslyn.cmd
index f27515cbd..650c92d2b 100644
--- a/scripts/crossgen/crossgen_roslyn.cmd
+++ b/scripts/crossgen/crossgen_roslyn.cmd
@@ -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
 
diff --git a/scripts/obtain/install-tools.sh b/scripts/obtain/install-tools.sh
index f4a99f26c..b3be18f94 100755
--- a/scripts/obtain/install-tools.sh
+++ b/scripts/obtain/install-tools.sh
@@ -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
-)