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

Merge pull request #138 from agocke/UpdateCoreClrVersion

Browse source 
Enable Roslyn crossgen on osx/linux
This commit is contained in:
Andy Gocke 2015-11-02 22:22:14 -08:00
commit 101b84a0a8
11 changed files with 193 additions and 127 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Microsoft.DotNet.Cli.sln
View file

@ -46,6 +46,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "corehost", "src\corehost\cm
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZERO_CHECK", "src\corehost\cmake\ZERO_CHECK.vcxproj", "{5D67FC6A-6392-4807-97BC-D13CA0FF5E6D}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZERO_CHECK", "src\corehost\cmake\ZERO_CHECK.vcxproj", "{5D67FC6A-6392-4807-97BC-D13CA0FF5E6D}"
EndProject EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Tools.Run", "src\Microsoft.DotNet.Tools.Run\Microsoft.DotNet.Tools.Run.xproj", "{1C16108C-C786-482D-BB0A-36BDAFE109ED}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@ -206,6 +208,22 @@ Global
{5D67FC6A-6392-4807-97BC-D13CA0FF5E6D}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|x64 {5D67FC6A-6392-4807-97BC-D13CA0FF5E6D}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|x64
{5D67FC6A-6392-4807-97BC-D13CA0FF5E6D}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64 {5D67FC6A-6392-4807-97BC-D13CA0FF5E6D}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
{5D67FC6A-6392-4807-97BC-D13CA0FF5E6D}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64 {5D67FC6A-6392-4807-97BC-D13CA0FF5E6D}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
{1C16108C-C786-482D-BB0A-36BDAFE109ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1C16108C-C786-482D-BB0A-36BDAFE109ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1C16108C-C786-482D-BB0A-36BDAFE109ED}.Debug|x64.ActiveCfg = Debug|Any CPU
{1C16108C-C786-482D-BB0A-36BDAFE109ED}.Debug|x64.Build.0 = Debug|Any CPU
{1C16108C-C786-482D-BB0A-36BDAFE109ED}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
{1C16108C-C786-482D-BB0A-36BDAFE109ED}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
{1C16108C-C786-482D-BB0A-36BDAFE109ED}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
{1C16108C-C786-482D-BB0A-36BDAFE109ED}.MinSizeRel|x64.Build.0 = Debug|Any CPU
{1C16108C-C786-482D-BB0A-36BDAFE109ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1C16108C-C786-482D-BB0A-36BDAFE109ED}.Release|Any CPU.Build.0 = Release|Any CPU
{1C16108C-C786-482D-BB0A-36BDAFE109ED}.Release|x64.ActiveCfg = Release|Any CPU
{1C16108C-C786-482D-BB0A-36BDAFE109ED}.Release|x64.Build.0 = Release|Any CPU
{1C16108C-C786-482D-BB0A-36BDAFE109ED}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
{1C16108C-C786-482D-BB0A-36BDAFE109ED}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
{1C16108C-C786-482D-BB0A-36BDAFE109ED}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
{1C16108C-C786-482D-BB0A-36BDAFE109ED}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
@ -223,5 +241,6 @@ Global
{8DF8403E-0DDC-4E6C-9930-4C1006E96B2F} = {C0CA389D-A35E-4082-BC05-598C9D6301BC} {8DF8403E-0DDC-4E6C-9930-4C1006E96B2F} = {C0CA389D-A35E-4082-BC05-598C9D6301BC}
{3673DD4B-F7D3-40A1-A756-F8354A5B74CD} = {C0CA389D-A35E-4082-BC05-598C9D6301BC} {3673DD4B-F7D3-40A1-A756-F8354A5B74CD} = {C0CA389D-A35E-4082-BC05-598C9D6301BC}
{5D67FC6A-6392-4807-97BC-D13CA0FF5E6D} = {C0CA389D-A35E-4082-BC05-598C9D6301BC} {5D67FC6A-6392-4807-97BC-D13CA0FF5E6D} = {C0CA389D-A35E-4082-BC05-598C9D6301BC}
{1C16108C-C786-482D-BB0A-36BDAFE109ED} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
EndGlobalSection EndGlobalSection
EndGlobal EndGlobal

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.Resgen"
dotnet publish --framework "$TFM" --runtime $RID --output "$STAGE2_DIR" --configuration "$CONFIGURATION" "$REPOROOT/src/Microsoft.DotNet.Tools.Run" 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 # Deploy CLR host to the output
cp "$HOST_DIR/corehost" "$STAGE2_DIR" 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

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

@ -4,13 +4,13 @@
"shared": "**/*.cs", "shared": "**/*.cs",
"dependencies": { "dependencies": {
"System.Console": "4.0.0-beta-23428", "System.Console": "4.0.0-beta-23502",
"System.IO.FileSystem": "4.0.1-beta-23428", "System.IO.FileSystem": "4.0.1-beta-23502",
"System.Diagnostics.Process": "4.1.0-beta-23428", "System.Diagnostics.Process": "4.1.0-beta-23502",
"System.Runtime.InteropServices.RuntimeInformation": "4.0.0-beta-23428", "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-beta-23502",
"Microsoft.NETCore.ConsoleHost": "1.0.0-beta-23428", "Microsoft.NETCore.ConsoleHost": "1.0.0-beta-23502",
"Microsoft.NETCore.TestHost": "1.0.0-beta-23428" "Microsoft.NETCore.TestHost": "1.0.0-beta-23502"
}, },
"frameworks": { "frameworks": {
"dnxcore50": { } "dnxcore50": { }

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

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

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

@ -2,14 +2,14 @@
"version": "1.0.0-*", "version": "1.0.0-*",
"description": "Types to model a .NET Project", "description": "Types to model a .NET Project",
"dependencies": { "dependencies": {
"Microsoft.CSharp": "4.0.1-beta-23428", "Microsoft.CSharp": "4.0.1-beta-23502",
"System.Collections": "4.0.11-beta-23428", "System.Collections": "4.0.11-beta-23502",
"System.Linq": "4.0.1-beta-23428", "System.Linq": "4.0.1-beta-23502",
"System.Threading.Thread": "4.0.0-beta-23428", "System.Threading.Thread": "4.0.0-beta-23502",
"System.Runtime.Loader": "4.0.0-beta-23428", "System.Runtime.Loader": "4.0.0-beta-23502",
"System.Dynamic.Runtime": "4.0.11-beta-23428", "System.Dynamic.Runtime": "4.0.11-beta-23502",
"System.Runtime.InteropServices.RuntimeInformation": "4.0.0-beta-23428", "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-beta-23502",
"System.Security.Cryptography.Algorithms": "4.0.0-beta-23428", "System.Security.Cryptography.Algorithms": "4.0.0-beta-23502",
"NuGet.Packaging": "3.2.0", "NuGet.Packaging": "3.2.0",

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

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

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

@ -5,13 +5,13 @@
"emitEntryPoint": true "emitEntryPoint": true
}, },
"dependencies": { "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.Console": "4.0.0-beta-23502",
"System.Collections": "4.0.11-beta-23428", "System.Collections": "4.0.11-beta-23502",
"System.Linq": "4.0.1-beta-23428", "System.Linq": "4.0.1-beta-23502",
"System.Diagnostics.Process": "4.1.0-beta-23428", "System.Diagnostics.Process": "4.1.0-beta-23502",
"System.IO.FileSystem": "4.0.1-beta-23428", "System.IO.FileSystem": "4.0.1-beta-23502",
"Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": { "Microsoft.DotNet.Cli.Utils": {

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

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

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

@ -5,13 +5,13 @@
"emitEntryPoint": true "emitEntryPoint": true
}, },
"dependencies": { "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.Console": "4.0.0-beta-23502",
"System.Collections": "4.0.11-beta-23428", "System.Collections": "4.0.11-beta-23502",
"System.Linq": "4.0.1-beta-23428", "System.Linq": "4.0.1-beta-23502",
"System.Diagnostics.Process": "4.1.0-beta-23428", "System.Diagnostics.Process": "4.1.0-beta-23502",
"System.IO.FileSystem": "4.0.1-beta-23428", "System.IO.FileSystem": "4.0.1-beta-23502",
"Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": { "Microsoft.DotNet.Cli.Utils": {