Port changes in dev15.1 back to dev

natidea commented 7 years ago

This brings the changes in dev15.1 back to dev and resolves the conflicts.

NOTES

Most changes in dev were already in dev15.1. The only missing changes were from PR #30, as evidenced by this diff: https://github.com/NuGet/NuGet.BuildTasks/compare/dev15.1...natidea-merge-dev15.1
Most changes in dev15.1 have already been inserted into VS. The only change not in VS was the recent PR #35.
So #30 and #35 are the only changes not in VS. Fix: PR 83574
There are some changes in VS not here. Those are brought back in PR https://github.com/NuGet/NuGet.BuildTasks/pull/38

radical commented 7 years ago

Does "VS" here mean VS 15.4? If it is then I need to take the changes for mono too.

natidea commented 7 years ago

Yes "VS" is 15.4, and once #38 is merged, 'dev' branch will fully reflect what will ship in that release.

dotnet / NuGet.BuildTasks