Merge branch 'rel/1.0.0' of https://github.com/dotnet/cli into build-refactor1

Conflicts: scripts/Microsoft.DotNet.Cli.Build.Framework/CurrentPlatform.cs scripts/Microsoft.DotNet.Cli.Build.Framework/Enumerations/BuildPlatform.cs
2016-03-08 23:42:15 +00:00 · 2016-03-08 23:42:15 +00:00 · 3edcab8eab
commit 3edcab8eab
parent 015bda2137 12dd8d6112
112 changed files with 3673 additions and 723 deletions
--- a/scripts/Microsoft.DotNet.Cli.Build.Framework/Enumerations/BuildPlatform.cs
+++ b/scripts/Microsoft.DotNet.Cli.Build.Framework/Enumerations/BuildPlatform.cs
@ -7,6 +7,7 @@ namespace Microsoft.DotNet.Cli.Build.Framework
        Linux = 3,
        OSX = 4,
        Ubuntu = 5,
-        CentOS = 6
+        CentOS = 6,
+        RHEL = 7
    }
 }