Livar Cunha e1916cc4dc Merge remote-tracking branch 'dotnet/release/15.5' into merges/release/15.5-to-master-20171016-070031 ... * dotnet/release/15.5: (21 commits) Manually merging some changes that git merged wrong and deleted from the 15.5 branch. Separating the 'legacy' URL construction from the 'current' URL construction methods and logic. Use temporary path for fake deps.json in test Use same build number for roslyn and F# satellites Updating Roslyn satellites and SDK versions Insert NuGet Build 4.5.0-preview2-4529 into cli Update NuGet to 4529 (signed) MSBuild 15.5.154 MSBuild 15.5.153 removed commented out config I'd meant to remove added a way to specify the asp.net template versions Porting 'dotnet-install.sh' from CLI:master to CLI:release/2.0.0 'NuGet.master.config' does not appear to be used. Fixed tests Update branch info to release/15.5 Updating the websdk version to 2.0.0-rel-20171010-665 Insert NuGet Build 4.5.0-preview1-4526 into cli Update DependencyVersions.props Updated version of TestPlatform to 15.5.0-preview-20170923-02 MSBuild 15.4.8 ...		2017-10-16 15:42:40 -07:00
..
dotnet-vstest.Tests.csproj	Merge upstream changes	2017-08-28 11:09:19 -07:00
VSTestTests.cs	Merge remote-tracking branch 'dotnet/release/15.5' into merges/release/15.5-to-master-20171016-070031	2017-10-16 15:42:40 -07:00