From 241ef778ea6f596587996cad7c408ee398cac84b Mon Sep 17 00:00:00 2001 From: Eric Mellino Date: Fri, 18 Mar 2016 15:18:18 -0700 Subject: [PATCH] Crossgen by default, add additional dependency to shared framework * We need a newer version of Microsoft.CodeAnalysis.CSharp than the one that NETCore.App depends on. When a newer version of NETCore.App is published with a higher dependency, we can remove this explicit reference. --- scripts/dotnet-cli-build/CompileTargets.cs | 4 ++-- src/sharedframework/framework/project.json | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/dotnet-cli-build/CompileTargets.cs b/scripts/dotnet-cli-build/CompileTargets.cs index 13f0a53c0..266c3871d 100644 --- a/scripts/dotnet-cli-build/CompileTargets.cs +++ b/scripts/dotnet-cli-build/CompileTargets.cs @@ -477,9 +477,9 @@ namespace Microsoft.DotNet.Cli.Build public static BuildTargetResult CrossgenSharedFx(BuildTargetContext c, string pathToAssemblies) { // 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(); } diff --git a/src/sharedframework/framework/project.json b/src/sharedframework/framework/project.json index b10880254..b65eb3277 100644 --- a/src/sharedframework/framework/project.json +++ b/src/sharedframework/framework/project.json @@ -5,7 +5,8 @@ }, "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": {