Rebase onto 23428 update
This commit is contained in:
parent
c1dd917cb0
commit
c2fa68df30
2 changed files with 9 additions and 8 deletions
|
@ -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\
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue