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

Enable Roslyn crossgen on osx/linux

Browse source 
Also updates the runtime to 23502, which contains the crossgen
utility in the xplat runtime packages.
This commit is contained in:
Andy Gocke 2015-11-02 10:53:16 -08:00
parent ee84f498fa
commit 7dd429f047
10 changed files with 154 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scripts/bootstrap.sh
View file

@ -85,6 +85,9 @@ dotnet publish --framework "$TFM" --runtime $RID --output "$STAGE2_DIR" --config
dotnet publish --framework "$TFM" --runtime $RID --output "$STAGE2_DIR" --configuration "$CONFIGURATION" "$REPOROOT/src/Microsoft.DotNet.Tools.Resgen"
dotnet publish --framework "$TFM" --runtime $RID --output "$STAGE2_DIR" --configuration "$CONFIGURATION" "$REPOROOT/src/Microsoft.DotNet.Tools.Run"
echo "Crossgenning Roslyn compiler ..."
$REPOROOT/scripts/crossgen/crossgen_roslyn.sh "$STAGE2_DIR"
# Deploy CLR host to the output
cp "$HOST_DIR/corehost" "$STAGE2_DIR"

44
scripts/crossgen/crossgen_roslyn.sh Executable file
View file

@ -0,0 +1,44 @@
#!/usr/bin/env bash
set -e
BIN_DIR="$( cd $1 && pwd )"
UNAME=`uname`
if [ -z "$RID" ]; then
if [ "$UNAME" == "Darwin" ]; then
RID=osx.10.10-x64
elif [ "$UNAME" == "Linux" ]; then
RID=ubuntu.14.04-x64
else
echo "Unknown OS: $UNAME" 1>&2
exit 1
fi
fi
# Replace with a robust method for finding the right crossgen.exe
CROSSGEN_UTIL=~/.dnx/packages/runtime.$RID.Microsoft.NETCore.Runtime.CoreCLR/1.0.1-beta-23502/tools/crossgen
pushd $BIN_DIR
# Crossgen currently requires itself to be next to mscorlib
cp $CROSSGEN_UTIL $BIN_DIR
chmod +x crossgen
./crossgen -nologo -platform_assemblies_paths $BIN_DIR mscorlib.dll
./crossgen -nologo -platform_assemblies_paths $BIN_DIR System.Collections.Immutable.dll
./crossgen -nologo -platform_assemblies_paths $BIN_DIR System.Reflection.Metadata.dll
./crossgen -nologo -platform_assemblies_paths $BIN_DIR Microsoft.CodeAnalysis.dll
./crossgen -nologo -platform_assemblies_paths $BIN_DIR Microsoft.CodeAnalysis.CSharp.dll
./crossgen -nologo -platform_assemblies_paths $BIN_DIR Microsoft.CodeAnalysis.VisualBasic.dll
./crossgen -nologo -platform_assemblies_paths $BIN_DIR csc.exe
./crossgen -nologo -platform_assemblies_paths $BIN_DIR vbc.exe

4
src/Microsoft.DotNet.Cli.Utils/project.json
View file

@ -9,8 +9,8 @@
"System.Diagnostics.Process": "4.1.0-beta-23428",
"System.Runtime.InteropServices.RuntimeInformation": "4.0.0-beta-23428",
"Microsoft.NETCore.ConsoleHost": "1.0.0-beta-23428",
"Microsoft.NETCore.TestHost": "1.0.0-beta-23428"
"Microsoft.NETCore.ConsoleHost": "1.0.0-beta-23502",
"Microsoft.NETCore.TestHost": "1.0.0-beta-23502"
},
"frameworks": {
"dnxcore50": { }

44
src/Microsoft.DotNet.Cli/project.json
View file

@ -1,26 +1,26 @@
{
"name": "dotnet",
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.Runtime": "1.0.1-beta-23428",
"System.Console": "4.0.0-beta-23428",
"System.Collections": "4.0.11-beta-23428",
"System.Linq": "4.0.1-beta-23428",
"System.Diagnostics.Process": "4.1.0-beta-23428",
"Microsoft.DotNet.Cli.Utils": {
"type": "build",
"version": "1.0.0-*"
"name": "dotnet",
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"Microsoft.Extensions.CommandLineUtils.Sources": {
"type": "build",
"version": "1.0.0-*"
"dependencies": {
"Microsoft.NETCore.Runtime": "1.0.1-beta-23502",
"System.Console": "4.0.0-beta-23428",
"System.Collections": "4.0.11-beta-23428",
"System.Linq": "4.0.1-beta-23428",
"System.Diagnostics.Process": "4.1.0-beta-23428",
"Microsoft.DotNet.Cli.Utils": {
"type": "build",
"version": "1.0.0-*"
},
"Microsoft.Extensions.CommandLineUtils.Sources": {
"type": "build",
"version": "1.0.0-*"
}
},
"frameworks": {
"dnxcore50": { }
}
},
"frameworks": {
"dnxcore50": { }
}
}

4
src/Microsoft.DotNet.ProjectModel/project.json
View file

@ -6,8 +6,8 @@
"System.Collections": "4.0.11-beta-23428",
"System.Linq": "4.0.1-beta-23428",
"System.Threading.Thread": "4.0.0-beta-23428",
"System.Runtime.Loader": "4.0.0-beta-23428",
"System.Dynamic.Runtime": "4.0.11-beta-23428",
"System.Runtime.Loader": "4.0.0-beta-23502",
"System.Dynamic.Runtime": "4.0.11-beta-23502",
"System.Runtime.InteropServices.RuntimeInformation": "4.0.0-beta-23428",
"System.Security.Cryptography.Algorithms": "4.0.0-beta-23428",

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

@ -1,29 +1,29 @@
{
"name": "dotnet-compile-csc",
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.Runtime": "1.0.1-beta-23428",
"System.Console": "4.0.0-beta-23428",
"System.Collections": "4.0.11-beta-23428",
"System.Linq": "4.0.1-beta-23428",
"System.Diagnostics.Process": "4.1.0-beta-23428",
"System.IO.FileSystem": "4.0.1-beta-23428",
"Microsoft.DotNet.Cli.Utils": {
"type": "build",
"version": "1.0.0-*"
{
"name": "dotnet-compile-csc",
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"Microsoft.Extensions.CommandLineUtils.Sources": {
"type": "build",
"version": "1.0.0-*"
"dependencies": {
"Microsoft.NETCore.Runtime": "1.0.1-beta-23502",
"System.Console": "4.0.0-beta-23428",
"System.Collections": "4.0.11-beta-23428",
"System.Linq": "4.0.1-beta-23428",
"System.Diagnostics.Process": "4.1.0-beta-23428",
"System.IO.FileSystem": "4.0.1-beta-23428",
"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.1.0-*"
},
"Microsoft.Net.Compilers.netcore": "1.1.0-*"
},
"frameworks": {
"dnxcore50": { }
}
"frameworks": {
"dnxcore50": { }
}
}

2
src/Microsoft.DotNet.Tools.Compiler/project.json
View file

@ -5,7 +5,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.Runtime": "1.0.1-beta-23428",
"Microsoft.NETCore.Runtime": "1.0.1-beta-23502",
"System.Console": "4.0.0-beta-23428",
"System.Collections": "4.0.11-beta-23428",

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

@ -1,30 +1,30 @@
{
"name": "dotnet-publish",
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.Runtime": "1.0.1-beta-23428",
"System.Console": "4.0.0-beta-23428",
"System.Collections": "4.0.11-beta-23428",
"System.Linq": "4.0.1-beta-23428",
"System.Diagnostics.Process": "4.1.0-beta-23428",
"System.IO.FileSystem": "4.0.1-beta-23428",
"System.AppContext": "4.0.1-beta-23428",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": {
"type": "build",
"version": "1.0.0-*"
{
"name": "dotnet-publish",
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"Microsoft.Extensions.CommandLineUtils.Sources": {
"type": "build",
"version": "1.0.0-*"
"dependencies": {
"Microsoft.NETCore.Runtime": "1.0.1-beta-23502",
"System.Console": "4.0.0-beta-23428",
"System.Collections": "4.0.11-beta-23428",
"System.Linq": "4.0.1-beta-23428",
"System.Diagnostics.Process": "4.1.0-beta-23428",
"System.IO.FileSystem": "4.0.1-beta-23428",
"System.AppContext": "4.0.1-beta-23428",
"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-*"
}
},
"frameworks": {
"dnxcore50": { }
}
},
"frameworks": {
"dnxcore50": { }
}
}

52
src/Microsoft.DotNet.Tools.Resgen/project.json
View file

@ -1,29 +1,29 @@
{
"name": "resgen",
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.Runtime": "1.0.1-beta-23428",
"System.Console": "4.0.0-beta-23428",
"System.Collections": "4.0.11-beta-23428",
"System.Linq": "4.0.1-beta-23428",
"System.Diagnostics.Process": "4.1.0-beta-23428",
"System.IO.FileSystem": "4.0.1-beta-23428",
"System.Xml.XDocument": "4.0.11-beta-23428",
"System.Resources.ReaderWriter": "4.0.0-beta-23428",
"Microsoft.DotNet.Cli.Utils": {
"type": "build",
"version": "1.0.0-*"
{
"name": "resgen",
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"Microsoft.Extensions.CommandLineUtils.Sources": {
"type": "build",
"version": "1.0.0-*"
"dependencies": {
"Microsoft.NETCore.Runtime": "1.0.1-beta-23502",
"System.Console": "4.0.0-beta-23428",
"System.Collections": "4.0.11-beta-23428",
"System.Linq": "4.0.1-beta-23428",
"System.Diagnostics.Process": "4.1.0-beta-23428",
"System.IO.FileSystem": "4.0.1-beta-23428",
"System.Xml.XDocument": "4.0.11-beta-23428",
"System.Resources.ReaderWriter": "4.0.0-beta-23428",
"Microsoft.DotNet.Cli.Utils": {
"type": "build",
"version": "1.0.0-*"
},
"Microsoft.Extensions.CommandLineUtils.Sources": {
"type": "build",
"version": "1.0.0-*"
}
},
"frameworks": {
"dnxcore50": { }
}
},
"frameworks": {
"dnxcore50": { }
}
}

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

@ -5,7 +5,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.Runtime": "1.0.1-beta-23428",
"Microsoft.NETCore.Runtime": "1.0.1-beta-23502",
"System.Console": "4.0.0-beta-23428",
"System.Collections": "4.0.11-beta-23428",