Sridhar Periyasamy 3edcab8eab 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
..
BuildArchitecture.cs	Add Conditional Target capabilities to the build scripts	2016-02-24 16:55:11 -08:00
BuildPlatform.cs	Merge branch 'rel/1.0.0' of https://github.com/dotnet/cli into build-refactor1	2016-03-08 23:42:15 +00:00