Merge pull request dotnet/core-setup#3364 from weshaggard/FixMergeIssues
authorWes Haggard <weshaggard@users.noreply.github.com>
Mon, 30 Oct 2017 20:09:17 +0000 (13:09 -0700)
committerGitHub <noreply@github.com>
Mon, 30 Oct 2017 20:09:17 +0000 (13:09 -0700)
Use AssetOutputPath for anything that isn't a nupkg

Commit migrated from https://github.com/dotnet/core-setup/commit/41949b226c09874a6a15baecda6bea3184dc00f9


Trivial merge