From c2fa68df30c018c461e9321a364c3b2323ca1d3f Mon Sep 17 00:00:00 2001 From: Andy Gocke Date: Wed, 28 Oct 2015 22:42:14 -0700 Subject: [PATCH] Rebase onto 23428 update --- scripts/bootstrap.cmd | 1 + scripts/crossgen/crossgen_roslyn.cmd | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/scripts/bootstrap.cmd b/scripts/bootstrap.cmd index d13db9418..8f6eff5cc 100644 --- a/scripts/bootstrap.cmd +++ b/scripts/bootstrap.cmd @@ -103,6 +103,7 @@ if errorlevel 1 goto fail echo Crossgening Roslyn compiler ... call %~dp0crossgen/crossgen_roslyn.cmd %STAGE2_DIR% +if errorlevel 1 goto fail REM Copy DNX in to stage2 xcopy /s /q %DNX_ROOT% %STAGE2_DIR%\dnx\ diff --git a/scripts/crossgen/crossgen_roslyn.cmd b/scripts/crossgen/crossgen_roslyn.cmd index 9c64d9fff..d18d8acba 100644 --- a/scripts/crossgen/crossgen_roslyn.cmd +++ b/scripts/crossgen/crossgen_roslyn.cmd @@ -6,30 +6,30 @@ set BIN_DIR=%CD% popd REM Replace with a robust method for finding the right crossgen.exe -set CROSSGEN_UTIL=%UserProfile%\.dnx\packages\runtime.win7-x64.Microsoft.NETCore.Runtime.CoreCLR\1.0.1-beta-23419\tools\crossgen.exe +set CROSSGEN_UTIL=%UserProfile%\.dnx\packages\runtime.win7-x64.Microsoft.NETCore.Runtime.CoreCLR\1.0.1-beta-23428\tools\crossgen.exe pushd %BIN_DIR% %CROSSGEN_UTIL% /nologo /readytorun /Platform_Assemblies_Paths %BIN_DIR% System.Collections.Immutable.dll -if errorlevel 1 goto fail +if not %errorlevel% EQU 0 goto fail %CROSSGEN_UTIL% /nologo /readytorun /Platform_Assemblies_Paths %BIN_DIR% System.Reflection.Metadata.dll -if errorlevel 1 goto fail +if not %errorlevel% EQU 0 goto fail %CROSSGEN_UTIL% /nologo /readytorun /Platform_Assemblies_Paths %BIN_DIR% Microsoft.CodeAnalysis.dll -if errorlevel 1 goto fail +if not %errorlevel% EQU 0 goto fail %CROSSGEN_UTIL% /nologo /readytorun /Platform_Assemblies_Paths %BIN_DIR% Microsoft.CodeAnalysis.CSharp.dll -if errorlevel 1 goto fail +if not %errorlevel% EQU 0 goto fail %CROSSGEN_UTIL% /nologo /readytorun /Platform_Assemblies_Paths %BIN_DIR% Microsoft.CodeAnalysis.VisualBasic.dll -if errorlevel 1 goto fail +if not %errorlevel% EQU 0 goto fail %CROSSGEN_UTIL% /nologo /readytorun /Platform_Assemblies_Paths %BIN_DIR% csc.exe -if errorlevel 1 goto fail +if not %errorlevel% EQU 0 goto fail %CROSSGEN_UTIL% /nologo /readytorun /Platform_Assemblies_Paths %BIN_DIR% vbc.exe -if errorlevel 1 goto fail +if not %errorlevel% EQU 0 goto fail popd goto end