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

Upgrade the roslyn packages to 1.3.0-beta1-20160225-02.

Browse source 
This version has the fix for https://github.com/dotnet/roslyn/issues/8951
This commit is contained in:
Sridhar Periyasamy 2016-02-26 16:00:54 -08:00
parent 01d2656be1
commit 85ca7c183d
2 changed files with 6 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -14,8 +14,7 @@ namespace Microsoft.DotNet.Cli.Build
{ {
public static readonly string CoreCLRVersion = "1.0.1-rc2-23811"; public static readonly string CoreCLRVersion = "1.0.1-rc2-23811";
public static readonly string AppDepSdkVersion = "1.0.6-prerelease-00003"; public static readonly string AppDepSdkVersion = "1.0.6-prerelease-00003";
public static readonly bool IsWinx86 = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && public static readonly bool IsWinx86 = CurrentPlatform.IsWindows && CurrentArchitecture.Isx86;
RuntimeInformation.ProcessArchitecture == Architecture.X86;
public static readonly List<string> AssembliesToCrossGen = GetAssembliesToCrossGen(); public static readonly List<string> AssembliesToCrossGen = GetAssembliesToCrossGen();
@ -62,7 +61,6 @@ namespace Microsoft.DotNet.Cli.Build
Mkdirp(cmakeOut); Mkdirp(cmakeOut);
var configuration = c.BuildContext.Get<string>("Configuration"); var configuration = c.BuildContext.Get<string>("Configuration");
var architecture = PlatformServices.Default.Runtime.RuntimeArchitecture;
// Run the build // Run the build
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) 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? // 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. // 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 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", ExecIn(cmakeOut, "cmake",
Path.Combine(c.BuildContext.BuildDirectory, "src", "corehost"), Path.Combine(c.BuildContext.BuildDirectory, "src", "corehost"),
archMacro,
"-G", "-G",
visualStudio); visualStudio);
@ -207,25 +207,6 @@ namespace Microsoft.DotNet.Cli.Build
File.Delete(Path.Combine(binDir, $"dotnet{Constants.ExeSuffix}")); File.Delete(Path.Combine(binDir, $"dotnet{Constants.ExeSuffix}"));
File.Copy(Path.Combine(binDir, $"corehost{Constants.ExeSuffix}"), 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<string> x86compilerBins = new List<string> {
"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 // Crossgen Roslyn
var result = Crossgen(c, binDir); var result = Crossgen(c, binDir);
if (!result.Success) if (!result.Success)

6
src/dotnet/project.json
View file

@ -18,10 +18,10 @@
"dependencies": { "dependencies": {
"Newtonsoft.Json": "7.0.1", "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.FSharp.Compiler.netcore": "1.0.0-alpha-151218",
"Microsoft.Net.CSharp.Interactive.netcore": "1.2.0-beta1-20160202-02", "Microsoft.Net.CSharp.Interactive.netcore": "1.3.0-beta1-20160225-02",
"Microsoft.CodeAnalysis.CSharp": "1.2.0-beta1-20160202-02", "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160225-02",
"Microsoft.DiaSymReader.Native": "1.3.3", "Microsoft.DiaSymReader.Native": "1.3.3",
"NuGet.CommandLine.XPlat": "3.4.0-beta-632", "NuGet.CommandLine.XPlat": "3.4.0-beta-632",