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

Upgrade compiler version and fix crossgen

Browse source 
The latest compiler nugets have missing dependencies, so
this temporarily turns on -MissingDependenciesOK for crossgen
This commit is contained in:
Andy Gocke 2015-11-11 16:33:06 -08:00
parent d9dd05f4a0
commit 5bfb626799
4 changed files with 56 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/crossgen/crossgen_roslyn.cmd
View file

@ -33,10 +33,10 @@ if not %errorlevel% EQU 0 goto fail
crossgen /nologo /ReadyToRun /Platform_Assemblies_Paths %BIN_DIR% Microsoft.CodeAnalysis.VisualBasic.dll >nul 2>nul crossgen /nologo /ReadyToRun /Platform_Assemblies_Paths %BIN_DIR% Microsoft.CodeAnalysis.VisualBasic.dll >nul 2>nul
if not %errorlevel% EQU 0 goto fail if not %errorlevel% EQU 0 goto fail
crossgen /nologo /ReadyToRun /Platform_Assemblies_Paths %BIN_DIR% csc.exe >nul 2>nul crossgen /MissingDependenciesOK /nologo /ReadyToRun /Platform_Assemblies_Paths %BIN_DIR% csc.exe >nul 2>nul
if not %errorlevel% EQU 0 goto fail if not %errorlevel% EQU 0 goto fail
crossgen /nologo /ReadyToRun /Platform_Assemblies_Paths %BIN_DIR% vbc.exe >nul 2>nul crossgen /MissingDependenciesOK /nologo /ReadyToRun /Platform_Assemblies_Paths %BIN_DIR% vbc.exe >nul 2>nul
if not %errorlevel% EQU 0 goto fail if not %errorlevel% EQU 0 goto fail
popd popd

4
scripts/crossgen/crossgen_roslyn.sh
View file

@ -38,7 +38,7 @@ chmod +x crossgen
./crossgen -nologo -platform_assemblies_paths $BIN_DIR Microsoft.CodeAnalysis.VisualBasic.dll ./crossgen -nologo -platform_assemblies_paths $BIN_DIR Microsoft.CodeAnalysis.VisualBasic.dll
./crossgen -nologo -platform_assemblies_paths $BIN_DIR csc.exe ./crossgen -MissingDependenciesOK -nologo -platform_assemblies_paths $BIN_DIR csc.exe
./crossgen -nologo -platform_assemblies_paths $BIN_DIR vbc.exe ./crossgen -MissingDependenciesOK -nologo -platform_assemblies_paths $BIN_DIR vbc.exe

50
src/Microsoft.DotNet.Tools.Compiler.Csc/project.json
View file

@ -1,30 +1,30 @@
{ {
"name": "dotnet-compile-csc", "name": "dotnet-compile-csc",
"version": "1.0.0-*", "version": "1.0.0-*",
"compilationOptions": { "compilationOptions": {
"emitEntryPoint": true "emitEntryPoint": true
}, },
"dependencies": { "dependencies": {
"Microsoft.NETCore.Runtime": "1.0.1-beta-23504", "Microsoft.NETCore.Runtime": "1.0.1-beta-23504",
"System.Console": "4.0.0-beta-23504", "System.Console": "4.0.0-beta-23504",
"System.Collections": "4.0.11-beta-23504", "System.Collections": "4.0.11-beta-23504",
"System.Linq": "4.0.1-beta-23504", "System.Linq": "4.0.1-beta-23504",
"System.Diagnostics.Process": "4.1.0-beta-23504", "System.Diagnostics.Process": "4.1.0-beta-23504",
"System.IO.FileSystem": "4.0.1-beta-23504", "System.IO.FileSystem": "4.0.1-beta-23504",
"Microsoft.DotNet.Cli.Utils": { "Microsoft.DotNet.Cli.Utils": {
"type": "build", "type": "build",
"version": "1.0.0-*" "version": "1.0.0-*"
},
"Microsoft.Extensions.CommandLineUtils.Sources": {
"type": "build",
"version": "1.0.0-*"
},
"Microsoft.DotNet.Compiler.Common": "1.0.0-*",
"Microsoft.Net.Compilers.netcore": "1.2.0-beta-20151106-02"
}, },
"frameworks": { "Microsoft.Extensions.CommandLineUtils.Sources": {
"dnxcore50": { } "type": "build",
} "version": "1.0.0-*"
},
"Microsoft.DotNet.Compiler.Common": "1.0.0-*",
"Microsoft.Net.Compilers.netcore": "1.2.0-beta-20151111-02"
},
"frameworks": {
"dnxcore50": { }
}
} }

54
src/Microsoft.DotNet.Tools.Run/project.json
View file

@ -1,30 +1,30 @@
{ {
"name": "dotnet-run", "name": "dotnet-run",
"version": "1.0.0-*", "version": "1.0.0-*",
"compilationOptions": { "compilationOptions": {
"emitEntryPoint": true "emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.Runtime": "1.0.1-beta-23504",
"System.Console": "4.0.0-beta-23504",
"System.Collections": "4.0.11-beta-23504",
"System.Linq": "4.0.1-beta-23504",
"System.Diagnostics.Process": "4.1.0-beta-23504",
"System.IO.FileSystem": "4.0.1-beta-23504",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": {
"type": "build",
"version": "1.0.0-*"
}, },
"Microsoft.Extensions.CommandLineUtils.Sources": { "dependencies": {
"type": "build", "Microsoft.NETCore.Runtime": "1.0.1-beta-23504",
"version": "1.0.0-*"
"System.Console": "4.0.0-beta-23504",
"System.Collections": "4.0.11-beta-23504",
"System.Linq": "4.0.1-beta-23504",
"System.Diagnostics.Process": "4.1.0-beta-23504",
"System.IO.FileSystem": "4.0.1-beta-23504",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": {
"type": "build",
"version": "1.0.0-*"
},
"Microsoft.Extensions.CommandLineUtils.Sources": {
"type": "build",
"version": "1.0.0-*"
},
"Microsoft.Net.Compilers.netcore": "1.2.0-beta-20151111-02"
}, },
"Microsoft.Net.Compilers.netcore": "1.2.0-beta-20151106-02" "frameworks": {
}, "dnxcore50": { }
"frameworks": { }
"dnxcore50": { }
}
} }