From 85ca7c183db1c43a2bf57c777c4b121b4c415245 Mon Sep 17 00:00:00 2001 From: Sridhar Periyasamy Date: Fri, 26 Feb 2016 16:00:54 -0800 Subject: [PATCH] Upgrade the roslyn packages to 1.3.0-beta1-20160225-02. This version has the fix for https://github.com/dotnet/roslyn/issues/8951 --- scripts/dotnet-cli-build/CompileTargets.cs | 25 +++------------------- src/dotnet/project.json | 6 +++--- 2 files changed, 6 insertions(+), 25 deletions(-) diff --git a/scripts/dotnet-cli-build/CompileTargets.cs b/scripts/dotnet-cli-build/CompileTargets.cs index dae340152..e62fba929 100644 --- a/scripts/dotnet-cli-build/CompileTargets.cs +++ b/scripts/dotnet-cli-build/CompileTargets.cs @@ -14,8 +14,7 @@ namespace Microsoft.DotNet.Cli.Build { public static readonly string CoreCLRVersion = "1.0.1-rc2-23811"; public static readonly string AppDepSdkVersion = "1.0.6-prerelease-00003"; - public static readonly bool IsWinx86 = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && - RuntimeInformation.ProcessArchitecture == Architecture.X86; + public static readonly bool IsWinx86 = CurrentPlatform.IsWindows && CurrentArchitecture.Isx86; public static readonly List AssembliesToCrossGen = GetAssembliesToCrossGen(); @@ -62,7 +61,6 @@ namespace Microsoft.DotNet.Cli.Build Mkdirp(cmakeOut); var configuration = c.BuildContext.Get("Configuration"); - var architecture = PlatformServices.Default.Runtime.RuntimeArchitecture; // Run the build if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) @@ -70,8 +68,10 @@ namespace Microsoft.DotNet.Cli.Build // Why does Windows directly call cmake but Linux/Mac calls "build.sh" in the corehost dir? // See the comment in "src/corehost/build.sh" for details. It doesn't work for some reason. var visualStudio = IsWinx86 ? "Visual Studio 14 2015" : "Visual Studio 14 2015 Win64"; + var archMacro = IsWinx86 ? "-DCLI_CMAKE_PLATFORM_ARCH_I386=1" : "-DCLI_CMAKE_PLATFORM_ARCH_AMD64=1"; ExecIn(cmakeOut, "cmake", Path.Combine(c.BuildContext.BuildDirectory, "src", "corehost"), + archMacro, "-G", visualStudio); @@ -207,25 +207,6 @@ namespace Microsoft.DotNet.Cli.Build File.Delete(Path.Combine(binDir, $"dotnet{Constants.ExeSuffix}")); File.Copy(Path.Combine(binDir, $"corehost{Constants.ExeSuffix}"), Path.Combine(binDir, $"dotnet{Constants.ExeSuffix}")); - // HACK - // bootstrapping for Windows x86. Copy csc/vbc from stage0. - // This is a temporary hack for https://github.com/dotnet/roslyn/issues/8951 - if (IsWinx86) - { - List x86compilerBins = new List { - "csc.dll", - "Microsoft.CodeAnalysis.CSharp.dll", - "Microsoft.CodeAnalysis.dll", - "Microsoft.CodeAnalysis.VisualBasic.dll", - "vbc.dll" - }; - - foreach (var binary in x86compilerBins) - { - File.Copy(Path.Combine(DotNetCli.Stage0.BinPath, binary), Path.Combine(binDir, binary), true); - } - } - // Crossgen Roslyn var result = Crossgen(c, binDir); if (!result.Success) diff --git a/src/dotnet/project.json b/src/dotnet/project.json index 9d364d513..852e8adaa 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -18,10 +18,10 @@ "dependencies": { "Newtonsoft.Json": "7.0.1", - "Microsoft.Net.Compilers.netcore": "1.2.0-beta1-20160202-02", + "Microsoft.Net.Compilers.netcore": "1.3.0-beta1-20160225-02", "Microsoft.FSharp.Compiler.netcore": "1.0.0-alpha-151218", - "Microsoft.Net.CSharp.Interactive.netcore": "1.2.0-beta1-20160202-02", - "Microsoft.CodeAnalysis.CSharp": "1.2.0-beta1-20160202-02", + "Microsoft.Net.CSharp.Interactive.netcore": "1.3.0-beta1-20160225-02", + "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160225-02", "Microsoft.DiaSymReader.Native": "1.3.3", "NuGet.CommandLine.XPlat": "3.4.0-beta-632",