Merge branch 'rel/1.0.0' of https://github.com/dotnet/cli into rhel
Conflicts: TestAssets/TestProjects/OutputStandardOutputAndError/project.json
This commit is contained in:
commit
c4cb1f2d53
233 changed files with 3061 additions and 937 deletions
|
@ -12,7 +12,7 @@ namespace Microsoft.DotNet.Cli.Build
|
|||
{
|
||||
public class CompileTargets
|
||||
{
|
||||
public static readonly string CoreCLRVersion = "1.0.1-rc2-23811";
|
||||
public static readonly string CoreCLRVersion = "1.0.2-rc2-23901";
|
||||
public static readonly string AppDepSdkVersion = "1.0.6-prerelease-00003";
|
||||
public static readonly bool IsWinx86 = CurrentPlatform.IsWindows && CurrentArchitecture.Isx86;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue