Merge branch 'master' of https://github.com/dotnet/core-setup into engine
authorChristopher Costa <chcosta@microsoft.com>
Tue, 2 May 2017 20:44:08 +0000 (13:44 -0700)
committerChristopher Costa <chcosta@microsoft.com>
Tue, 2 May 2017 20:44:08 +0000 (13:44 -0700)
commitdbac59406c514ed62f3e527f51b3407a8b520a34
tree31817902d157dcb25cad4288a92df4e2b5ff20fa
parent6fa4999d3b3199d82e4b595387a48bf9ed6b75eb
parent7987d3a69c5f8b45e06e924fcc9cd78fae1b6155
Merge branch 'master' of https://github.com/dotnet/core-setup into engine

Commit migrated from https://github.com/dotnet/core-setup/commit/578257677a4ed90d79ec144521d4703dbe5245b5
src/installer/buildpipeline/Core-Setup-Signing-Windows-BT.json
src/installer/pkg/packaging/dir.props
src/installer/pkg/packaging/windows/package.props