Commit graph

3005 commits

Author SHA1 Message Date
Eric Erhardt
0eb24de0a8 CLI dotnet/versions build info files should be separated between the branches.
Adding a "BranchName" branchinfo.txt variable like we have in core-setup. This allows to update the correct path under dotnet/versions/build-info.

Also, moving UpdateVersionsRepo into FinalizeBuild.
2016-06-08 18:02:59 -05:00
Ajay Bhargav Baaskaran
3c9f8dd99b Merge pull request #3426 from dotnet/ajbaaska/dotnet-new-web2
Added a web template to dotnet new
2016-06-08 12:45:49 -07:00
Eric Erhardt
03999deea1 Merge pull request #3437 from eerhardt/DiaSymNativeUpdate
Update Microsoft.DiaSymReader.Native to 1.4.0-rc2
2016-06-08 13:52:55 -05:00
Ajay Bhargav Baaskaran
4a88cff185 [Fixes #3255] Added a web template to dotnet new 2016-06-08 11:31:08 -07:00
Eric Erhardt
71d39a4a19 Update Microsoft.DiaSymReader.Native to 1.4.0-rc2 2016-06-08 12:01:35 -05:00
Eric Erhardt
c33117e259 Merge pull request #3425 from eerhardt/UpdateDependencies
Updating CoreFx, CoreClr, CoreSetup to rc3-24207-03, rc3-24207-03, rc3-004415 respectively
2016-06-07 20:35:57 -05:00
Eric Erhardt
d2f1fa0300 Updating CoreFx, CoreClr, CoreSetup to rc3-24207-03, rc3-24207-03, rc3-004415 respectively. 2016-06-07 18:24:30 -05:00
Eric Erhardt
82ef0304bb Crossgen now requires a Jit package to be specified.
Port Crossgen fix from core-setup.

See a2857af7e3
2016-06-07 18:22:52 -05:00
Eric Erhardt
748516bb0d Add CoreClr dependency to CLI's update-dependencies. 2016-06-07 18:22:52 -05:00
Jonathan Miller
cff4f37456 Merge pull request #3411 from sokket/json
Bumping JSON.NET to 9.0.1
2016-06-07 16:17:00 -07:00
Jonathan Miller
30ba1a1a61 Merge pull request #3413 from sokket/cycle
Adding check for self-referencing projects
2016-06-07 16:16:54 -07:00
Jonathan Miller
cdf4407419 Bumping JSON.NET to 9.0.1 2016-06-07 15:04:17 -07:00
Eric Erhardt
2e7c467aad Merge pull request #3407 from dotnet/dev-ragrawal-updatenuget
update nuget to 3.5.0-beta2-1392
2016-06-07 15:50:13 -05:00
Jonathan Miller
dc5fbc1a91 Adding basic cycle detection in the dependency walker 2016-06-07 13:21:13 -07:00
Eric Erhardt
54cd31b0b7 Merge pull request #3414 from eerhardt/UpdateRoslyn
Updating CoreSetup, Roslyn, DiaSymReader to rc3-004408, beta1-20160606-02, 1.0.8-rc2-60606-01 respectively.
2016-06-06 21:37:02 -05:00
Eric Erhardt
334b079995 Updating CoreSetup, Roslyn, DiaSymReader to rc3-004408, beta1-20160606-02, 1.0.8-rc2-60606-01 respectively. 2016-06-06 18:56:24 -05:00
Andrew Stanton-Nurse
dd51836aac fix #2289 by integrating EF's version of project load context (#3402) 2016-06-06 15:08:46 -07:00
Rohit Agrawal
5378f5a697 update nuget to 3.5.0-beta2-1392 2016-06-06 14:14:20 -07:00
Rob Relyea
b84832bd8d Merge pull request #3403 from dotnet/toddmosc/preview2Port
Porting "dotnet pack -serviceable" change from rel/1.0.0 to 1.0.0-preview2
2016-06-06 12:06:36 -07:00
Todd Moscinski
d3b935489f Fixing schema version number, tweaking a string, and making test call pass a bool instead of a string to enable serviceable. 2016-06-06 11:00:47 -07:00
Todd Moscinski
391675c5b9 Changing schema version to 8 to match NuGet internal value and adding a pack test for the --serviceable option. 2016-06-06 11:00:33 -07:00
Todd Moscinski
8099e6b9f7 Adding support for --serviceable option to pack command which puts <serviceable>true</serviceable> into the output nuspec 2016-06-06 11:00:05 -07:00
Eric Erhardt
90fbc3bb53 Merge pull request #3399 from eerhardt/UpdateSharedFX
Updating CoreSetup to rc3-004406
2016-06-06 12:13:53 -05:00
Eric Erhardt
ea1b688527 Merge pull request #3394 from eerhardt/Fix1650
Change 'got' to 'received' for dep conflicts
2016-06-06 11:59:30 -05:00
Eric Erhardt
8a97cd74b3 Merge pull request #3397 from eerhardt/FixExecSilentEnvVar
Pass env into ExecCore
2016-06-06 11:58:32 -05:00
Eric Erhardt
42938f180f Updating CoreSetup to rc3-004406 2016-06-06 11:15:07 -05:00
Eric Erhardt
f34788898d Pass env into ExecCore 2016-06-06 10:31:44 -05:00
Josh Free
b422e7fde3 Merge pull request #3393 from eerhardt/UpdateDependencies20160606022451
Updating CoreFx, CoreSetup to rc3-24206-00, rc3-004404 respectively
2016-06-06 08:26:49 -07:00
Eric Erhardt
cd94ef9c07 Merge pull request #3389 from dotnet/troy-3347
Expand timeout setting for project model server
2016-06-06 09:49:01 -05:00
Luke Latham
d76807d22a Change 'got' to 'received' for dep conflicts 2016-06-06 09:35:24 -05:00
eerhardt
354b1d38d5 Updating CoreFx, CoreSetup to rc3-24206-00, rc3-004404 respectively 2016-06-06 14:24:51 +00:00
Troy Dai
7adf70d297 Expand timeout setting for project model server 2016-06-05 20:30:21 -07:00
Eric Erhardt
512287ec03 Merge pull request #3384 from eerhardt/UpdateDependencies20160604063234
Updating CoreFx, CoreSetup to rc3-24204-00, rc3-004400 respectively
2016-06-04 23:02:44 -05:00
Eric Erhardt
3e77d1a2d8 Moving TestAsset project from netstandard1.5 to 1.6. 2016-06-04 19:56:42 -05:00
eerhardt
ea8ae8d1c7 Updating CoreFx, CoreSetup to rc3-24204-00, rc3-004400 respectively 2016-06-04 18:32:34 +00:00
Eric Erhardt
06da2ee9b2 Merge pull request #3380 from eerhardt/NewSharedFX
Update CoreSetup to rc3-004397
2016-06-04 09:47:06 -05:00
Eric Erhardt
4f95bc0010 Update CoreSetup to rc3-004397 2016-06-04 00:00:28 -05:00
Eric Erhardt
9aee42aab6 Merge pull request #3373 from eerhardt/RuntimeCoreCLR
Move dependency from Microsoft.NETCore.Runtime to Microsoft.NETCore.Runtime.CoreCLR.
2016-06-03 23:42:33 -05:00
Eric Erhardt
b512ddb8b8 Merge pull request #3369 from eerhardt/FixDocker
Port @ellismg's debian docker file fix to CLI.
2016-06-03 16:51:51 -05:00
Eric Erhardt
9ffe91f367 Move dependency from Microsoft.NETCore.Runtime to Microsoft.NETCore.Runtime.CoreCLR. 2016-06-03 16:35:00 -05:00
Bryan Thornbury
4f14a3c33e Merge pull request #3353 from brthor/brthor/3079
update help message
2016-06-03 13:16:27 -07:00
Eric Erhardt
d4d9653e05 Port @ellismg's debian docker file fix to CLI. 2016-06-03 13:58:33 -05:00
Eric Erhardt
7804f59519 Merge pull request #3364 from eerhardt/UpdateDependencies
Updating CoreFx, CoreSetup, Roslyn to rc3-24201-00, rc3-004391, beta1-20160602-01
2016-06-03 13:27:52 -05:00
Eric Erhardt
8162f89996 Fixing PortableAppWithRuntimeTargetsIsPublishedCorrectly now that libuv is contained in the Shared Framework. 2016-06-03 11:16:52 -05:00
Eric Erhardt
f16f2e64eb Updating CoreFx, CoreSetup, Roslyn to rc3-24201-00, rc3-004391, beta1-20160602-01 2016-06-03 07:27:42 -05:00
Eric Erhardt
0366576dba Merge pull request #3361 from eerhardt/AddRoslynDependency
Add Roslyn as a dependency in update-dependencies.
2016-06-03 07:21:27 -05:00
Eric Erhardt
5e6ae9cd48 Add Roslyn as a dependency in update-dependencies. 2016-06-03 01:03:48 -05:00
MichaelSimons
c622debad0 Removed publish logic that triggered dotnet-preview Docker builds. This logic has been moved to Maestro. 2016-06-02 19:07:16 -07:00
Livar
3af43c8669 Merge pull request #3355 from livarcocc/fix_fedora_23_dockerfile
Fix fedora 23 and ubuntu 16 dockerfile
2016-06-02 18:12:19 -07:00
Bryan Thornbury
4557f2a42f update help message 2016-06-02 15:21:29 -07:00