Commit graph

3232 commits

Author SHA1 Message Date
Eric Erhardt
7f13f6d3b6 Merge pull request #3442 from eerhardt/FixVersionsRepo
CLI dotnet/versions build info files should be separated between the branches
2016-06-08 21:13:57 -05:00
Pranav K
acc5528502 Merge pull request #3443 from dotnet/prkrishn/platformabstractions
Remove use of Microsoft.Extensions.PlatformAbstractions
2016-06-08 17:32:21 -07:00
Pranav K
a2d4f6fed0 Remove use of Microsoft.Extensions.PlatformAbstractions 2016-06-08 16:28:52 -07:00
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
6802e23d77 Merge pull request #3433 from svick/build-console-output
Use ordinal comparison when searching for escape sequence in build framework console
2016-06-08 13:55:12 -05:00
Eric Erhardt
b3062f083b Merge pull request #3435 from svick/patch-4
Minor improvements to build documentation
2016-06-08 13:53:15 -05: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
Petr Onderka
da72031a42 Improve usage listing of build scripts
- sort options by importance
- add missing -Architecture to Usage in build.ps1
- remove redundant and confusing TARGETS line in build.sh
2016-06-08 18:39:38 +02:00
Eric Erhardt
7e00b53c48 Merge pull request #3423 from svick/patch-3
Fixed links in README.md
2016-06-08 11:13:38 -05:00
Petr Onderka
ebdd0b65af Explain how to speed up building 2016-06-08 14:51:33 +02:00
Eric Erhardt
cd0f847cd7 Merge pull request #3429 from eerhardt/FixUbuntuRel
Fix Ubuntu build break.
2016-06-08 07:18:34 -05:00
Petr Onderka
53eb94e89c Use ordinal comparison when searching for escape sequence
Fixes #3431
2016-06-08 10:54:56 +00: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
Eric Erhardt
72fa4f6cf3 Fix Ubuntu build break.
Ubuntu is currently broken because we added a new channel, and a switch statement wasn't expecting the new channel.

The fix is to eliminate the switch statement on the channel and always return "dotnet-dev-<version>" for the debian sdk package name.
2016-06-07 18:02:33 -05: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
Petr Onderka
b21dc15270 Fixed links in README.md 2016-06-07 18:42:05 +02: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
0b30b148f3 Merge pull request #3376 from eerhardt/MergePreview2
Merge rel/1.0.0-preview2 into rel/1.0.0
2016-06-06 19:03:01 -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
Eric Erhardt
c3b1bb05f6 Change CHANNEL for the rel/1.0.0 branch
So it publishes builds to separate channel than rel/1.0.0-preview2.
2016-06-06 13:44:47 -05: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
Todd Moscinski
d06e2e3f24 Merge pull request #3375 from dotnet/toddmosc/serviceable
Adding support for --serviceable option to pack command
2016-06-06 10:55:17 -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
Eric Erhardt
302ac1e858 Merge pull request #3046 from benaadams/patch-1
Add slack channel
2016-06-06 09:20:04 -05:00
Troy Dai
7adf70d297 Expand timeout setting for project model server 2016-06-05 20:30:21 -07:00
Todd Moscinski
72ad34b566 Fixing schema version number, tweaking a string, and making test call pass a bool instead of a string to enable serviceable. 2016-06-05 11:52:41 -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