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

Rebase onto 23428 update

Browse source
This commit is contained in:
Andy Gocke 2015-10-28 22:42:14 -07:00
parent c1dd917cb0
commit c2fa68df30
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
scripts/bootstrap.cmd
View file

@ -103,6 +103,7 @@ if errorlevel 1 goto fail
echo Crossgening Roslyn compiler ... echo Crossgening Roslyn compiler ...
call %~dp0crossgen/crossgen_roslyn.cmd %STAGE2_DIR% call %~dp0crossgen/crossgen_roslyn.cmd %STAGE2_DIR%
if errorlevel 1 goto fail
REM Copy DNX in to stage2 REM Copy DNX in to stage2
xcopy /s /q %DNX_ROOT% %STAGE2_DIR%\dnx\ xcopy /s /q %DNX_ROOT% %STAGE2_DIR%\dnx\

16
scripts/crossgen/crossgen_roslyn.cmd
View file

@ -6,30 +6,30 @@ set BIN_DIR=%CD%
popd popd
REM Replace with a robust method for finding the right crossgen.exe 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% pushd %BIN_DIR%
%CROSSGEN_UTIL% /nologo /readytorun /Platform_Assemblies_Paths %BIN_DIR% System.Collections.Immutable.dll %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 %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 %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 %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 %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 %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 %CROSSGEN_UTIL% /nologo /readytorun /Platform_Assemblies_Paths %BIN_DIR% vbc.exe
if errorlevel 1 goto fail if not %errorlevel% EQU 0 goto fail
popd popd
goto end goto end