Commit graph

4663 commits

Author SHA1 Message Date
Livar
99ed699311 Merge branch 'rel/1.0.0' into migrate_sln_file 2017-01-26 19:51:03 -08:00
Livar
62aa2783a3 Merge pull request #5460 from livarcocc/bump_sdk
Bumping the SDK version to 1.0.0-alpha-20170123-1.
2017-01-26 19:50:39 -08:00
Livar
29ad4a25ec Merge branch 'rel/1.0.0' into bump_sdk 2017-01-26 19:12:20 -08:00
Livar
68bbcc71e2 Merge pull request #5476 from piotrpMSFT/piotrpMSFT/bump/MSBuild15.1.0-preview-000539-01
Bump MSBuild to 15.1.0-preview-000539-01
2017-01-26 19:10:52 -08:00
Livar
e37172c43f Merge branch 'rel/1.0.0' into piotrpMSFT/bump/MSBuild15.1.0-preview-000539-01 2017-01-26 17:46:36 -08:00
Livar
225b700173 Merge branch 'rel/1.0.0' into bump_sdk 2017-01-26 17:41:35 -08:00
Livar
f693bd64f5 Merge pull request #5456 from AbhitejJohn/mstestrc2update
MSTest nuget update
2017-01-26 17:40:11 -08:00
Piotr Puszkiewicz
b4b4fa64fe Bump MSBuild to 15.1.0-preview-000539-01 2017-01-26 17:04:50 -08:00
Livar
06cd5e8645 Merge branch 'rel/1.0.0' into mstestrc2update 2017-01-26 16:34:27 -08:00
Piotr Puszkiewicz
c6d07fcc90 Merge pull request #5415 from jonsequitur/make-cli-run-on-netcoreapp1.1
Make cli run on netcoreapp1.1
2017-01-26 16:33:19 -08:00
jonsequitur
8a79abe4c9 fix conditional 2017-01-26 14:48:42 -08:00
jonsequitur
090c8e2e09 hoist CoreCLRRid definition to Prepare.targets 2017-01-26 14:48:42 -08:00
jonsequitur
d25f2a11d6 remove rid for Microsoft.DotNet.Cli.Utils test package build 2017-01-26 14:48:42 -08:00
jonsequitur
a14195f76d hoist task batching to target batching 2017-01-26 14:48:42 -08:00
jonsequitur
d63e0dd74a reduce abstraction in building test packages 2017-01-26 14:48:41 -08:00
jonsequitur
473e28c26b remove tool_csc cleanup 2017-01-26 14:48:41 -08:00
Piotr Puszkiewicz
add5f72573 Simplify desktop test packaging 2017-01-26 14:48:41 -08:00
Piotr Puszkiewicz
e0f46f9de4 add missing suffix component 2017-01-26 14:48:41 -08:00
Piotr Puszkiewicz
e089f8753e Account for NuGet/Home#4404 2017-01-26 14:48:41 -08:00
jonsequitur
4985804ba2 update Roslyn to 2.0.0-rc4-61325-08 2017-01-26 14:48:41 -08:00
jonsequitur
89ff57f51b only build desktop-and-portable TestPackage on Windows 2017-01-26 14:48:41 -08:00
jonsequitur
f66dbdb4b4 dotnet-desktop-and-portable.csproj to netcoreapp1.1 2017-01-26 14:48:41 -08:00
jonsequitur
25e3395684 dotnet-desktop-and-portable.csproj to netcoreapp1.0 2017-01-26 14:48:40 -08:00
Piotr Puszkiewicz
cc30bdde8a Make Deb tests test Deb 2017-01-26 14:48:40 -08:00
jonsequitur
bed3d974d6 add netcoreapp1.1 to Ubuntu installer 2017-01-26 14:48:40 -08:00
jonsequitur
573c4efea5 test fixes 2017-01-26 14:48:40 -08:00
jonsequitur
3cba07288d remove redundant ToolPath setting 2017-01-26 14:48:40 -08:00
jonsequitur
0c80992384 move additional tests to netcoreapp1.1 2017-01-26 14:48:40 -08:00
jonsequitur
9824fa945b FluentAssertions 4.18.0 2017-01-26 14:48:40 -08:00
jonsequitur
927f0b6dc5 rebase fix 2017-01-26 14:48:39 -08:00
jonsequitur
d55be626a9 netcoreapp1.1 fixes 2017-01-26 14:48:39 -08:00
Eric Erhardt
cfb4cc3cb9 Update tests to netcoreapp1.1. 2017-01-26 14:48:39 -08:00
Eric Erhardt
0073fc8534 Update CLI to run on netcoreapp1.1. 2017-01-26 14:48:39 -08:00
Livar
4e5c5c1864 Merge branch 'rel/1.0.0' into mstestrc2update 2017-01-26 14:21:56 -08:00
Livar
1fe1c3af01 Merge pull request #5429 from krwq/i5316
Fix: Migration: explicit compile include *.cs results in a build break
2017-01-26 14:20:45 -08:00
Livar
29afc0622e Merge branch 'rel/1.0.0' into i5316 2017-01-26 13:17:44 -08:00
Livar Cunha
40c0c41cde Handling a potential race condition when writing global.json during migration. 2017-01-26 12:40:56 -08:00
Livar Cunha
537d78d2a6 Fixing test failures. One of them, is a known issue that still reproes intermittently. The other was some left over code that was causing problems. 2017-01-26 12:40:56 -08:00
Livar Cunha
85ec8a6f2c Fixing our solution tests so that they go back to building the solution. Seems to work now, at least on OSX. Also, made a change to update solution to update any solutions in the folder where dotnet migrate is executed. 2017-01-26 12:40:55 -08:00
Livar
cb34818237 Merge pull request #5469 from jchannon/patch-2
Add instruction to add global.json to preview2
2017-01-26 12:33:17 -08:00
Krzysztof Wicher
7a65922895 apply review feedback 2017-01-26 09:02:28 -08:00
Krzysztof Wicher
3fa73a90d4 fix EOL in test asset 2017-01-26 09:02:28 -08:00
Krzysztof Wicher
ecd034b95c fix build errors after rebase 2017-01-26 09:02:28 -08:00
Krzysztof Wicher
000734d1ef Ignore explicit glob **/*.cs 2017-01-26 09:02:28 -08:00
Jonathan Channon
efa8dcdfd8 Add instruction to add global.json to preview2 2017-01-26 13:09:07 +00:00
Livar Cunha
6af1648543 Bumping the SDK version to 1.0.0-alpha-20170123-1. 2017-01-25 10:33:38 -08:00
Abhitej Anoop John Bandi
93651da836 Updating the MSTest nugets with the ones shipping in VS for desktop and UWP scenarios. 2017-01-25 19:44:50 +05:30
Piotr Puszkiewicz
56d8071361 Merge pull request #5423 from dasMulli/patch-1
Fix in German translation for dotnet-add-reference
2017-01-24 18:55:15 -08:00
Piotr Puszkiewicz
38fa2548f6 Merge branch 'rel/1.0.0' into patch-1 2017-01-24 16:49:25 -08:00
Piotr Puszkiewicz
41123fadaa Merge pull request #5432 from dotnet/dev/jgoshi/issue5355
Migrate sln should remove global.json from the sln file
2017-01-24 16:48:57 -08:00