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

Merge pull request #1954 from mellinoe/crossgen-enabled

Browse source 
Crossgen by default, add additional dependency to shared framework
This commit is contained in:
Piotr Puszkiewicz 2016-03-21 20:48:40 -07:00
commit 55ca13eee7
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/dotnet-cli-build/CompileTargets.cs
View file

@ -477,9 +477,9 @@ namespace Microsoft.DotNet.Cli.Build
public static BuildTargetResult CrossgenSharedFx(BuildTargetContext c, string pathToAssemblies) public static BuildTargetResult CrossgenSharedFx(BuildTargetContext c, string pathToAssemblies)
{ {
// Check if we need to skip crossgen // Check if we need to skip crossgen
if (!string.Equals(Environment.GetEnvironmentVariable("CROSSGEN_SHAREDFRAMEWORK"), "1")) if (string.Equals(Environment.GetEnvironmentVariable("DONT_CROSSGEN_SHAREDFRAMEWORK"), "1"))
{ {
c.Warn("Skipping crossgen for SharedFx because CROSSGEN_SHAREDFRAMEWORK is not set to 1"); c.Warn("Skipping crossgen for SharedFx because DONT_CROSSGEN_SHAREDFRAMEWORK is set to 1");
return c.Success(); return c.Success();
} }

3
src/sharedframework/framework/project.json
View file

@ -5,7 +5,8 @@
}, },
"dependencies": { "dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc2-23911" "Microsoft.NETCore.App": "1.0.0-rc2-23911",
"Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160318-02"
}, },
"runtimes": { "runtimes": {