Commit graph

4864 commits

Author SHA1 Message Date
Piotr Puszkiewicz
188c5d1022 Merge branch 'rel/1.0.0' into piotrpMSFT/infra/outception 2017-01-27 11:20:02 -08:00
Livar
7bdfb21c0d Merge pull request #5446 from eerhardt/PortChange
Port stage0 change
2017-01-27 10:37:57 -08:00
Piotr Puszkiewicz
d4aec7c197 Update run-build.sh 2017-01-27 02:14:05 -08:00
Piotr Puszkiewicz
c83d8797bc Update run-build.ps1 2017-01-27 02:12:44 -08:00
Piotr Puszkiewicz
bbf14163a4 Merge branch 'rel/1.0.0' into PortChange 2017-01-27 02:08:49 -08:00
Piotr Puszkiewicz
bbac129c04 Account for Windows slashes 2017-01-27 01:45:31 -08:00
Piotr Puszkiewicz
0ab87924b2 Add DOTNET_RUNTIME_ID to kept environment variables 2017-01-27 01:18:50 -08:00
Piotr Puszkiewicz
401a2dd2ce pr feedback 2017-01-27 00:56:51 -08:00
Piotr Puszkiewicz
c4e928a18d Cleanup 2017-01-27 00:46:09 -08:00
Piotr Puszkiewicz
d70aeb950b Success! 2017-01-27 00:46:09 -08:00
PiotrP
a473c2bad7 WiP 2017-01-27 00:46:09 -08:00
Piotr Puszkiewicz
94e74d846a WiP 2017-01-27 00:46:09 -08:00
Piotr Puszkiewicz
c25abfb7c7 WiP 2017-01-27 00:46:09 -08:00
Piotr Puszkiewicz
19ed5a558b WiP 2017-01-27 00:46:09 -08:00
Livar
10b642bc12 Merge pull request #5479 from livarcocc/fix_deb
Updating the template engine version to a version that depends on 1.6.0
2017-01-26 23:39:36 -08:00
Livar
422b03cee4 Update the template engine version again. 2017-01-26 22:55:16 -08:00
Livar
45727ab4e3 Merge pull request #5474 from naamunds/FixCentosDocker
Fix yum package conflict in Docker image
2017-01-26 22:01:54 -08:00
Livar
7937e9fcd9 Merge branch 'rel/1.0.0' into FixCentosDocker 2017-01-26 21:22:13 -08:00
Livar
477d4fdf29 Merge pull request #5472 from dotnet/dev/jgoshi/handleDeprecatedPJ
Migration: support many deprecated features rather than failing migration
2017-01-26 21:21:37 -08:00
Livar
ef95add8f6 Update the template engine to the correct build. 2017-01-26 20:55:41 -08:00
Livar
60f2b2e4ab Merge branch 'rel/1.0.0' into dev/jgoshi/handleDeprecatedPJ 2017-01-26 20:46:56 -08:00
Livar
c3d8d77d71 Merge pull request #5468 from livarcocc/migrate_sln_file
Migrate sln files when running dotnet migrate in a folder
2017-01-26 20:46:13 -08:00
Parallels
c849e8ba4c Updating the template engine version to a version that depends on 1.6.0 and updating our build scripts to allow for a commit count override. 2017-01-26 20:44:31 -08:00
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
Justin Goshi
835bc5bae1 Shorten test name 2017-01-26 15:26:55 -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