Commit graph

7538 commits

Author SHA1 Message Date
Nick Guerrera
5a92c1ace2 Merge pull request #7512 from wli3/dummycommit
Dummy commit to trigger CI due to 20170824.1 publish nuget time out 2…
2017-08-24 13:33:28 -07:00
William Li
f9b798b119 Dummy commit to trigger CI due to 20170824.1 publish nuget time out 20170824.1 2017-08-24 12:20:28 -07:00
Daniel Plaisted
4662629964 Merge pull request #7478 from dsplaisted/update-runtime-to-2.1
Update .NET Core runtime to 2.1
2017-08-24 12:16:43 -07:00
NuGet Team Bot
069d94cbe4 Insert NuGet Build 4.4.0-preview1-4434 into cli 2017-08-24 11:22:51 -07:00
Daniel Plaisted
b461e75524 Disable tests on non-Windows due to bugs related to .NET Core 2.1
https://github.com/dotnet/corefx/issues/23496
https://github.com/dotnet/cli/issues/7501
2017-08-23 10:41:37 -07:00
Daniel Plaisted
a463a34ac5 Update CliTargetFramework to netcoreapp2.1, and switch from hardcoding to using the variable in places 2017-08-23 10:40:26 -07:00
Nick Guerrera
f62ca5e235 Merge pull request #7488 from wli3/merges/release/2.0.0-to-master-20170821-070027-resolve-conflict
Merges/release/2.0.0 to master 20170821 070027 resolve conflict
2017-08-21 14:24:31 -07:00
William Li
4ae52088bf Merge branch 'master' into merges/release/2.0.0-to-master-20170821-070027 2017-08-21 12:54:31 -07:00
José Pedro
b855c1ec0e Renamed 'Runtime Package Store' to 'Runtime Store'. 2017-08-21 12:36:55 -07:00
Mikkel Nylander Bundgaard
ed2a8f4432 Add store and help to SDK commands
I've added the store command as a localizable string (the
help command was already one), but I've not supplied any
translations.

Fixes #7432
2017-08-20 00:57:32 +02:00
Daniel Plaisted
360e657884 Disable tests that require templates that target .NET Core 2.1 (which aren't available yet) 2017-08-18 18:07:57 -07:00
Daniel Plaisted
60e5fabde2 Update tool tests to target netcoreapp2.1 2017-08-18 18:07:14 -07:00
Daniel Plaisted
dc4046ca7e Update test code to use netcoreapp2.1 2017-08-18 15:36:01 -07:00
Daniel Plaisted
c00afe9588 Retarget tests to netcoreapp2.1 2017-08-17 23:07:28 -07:00
Daniel Plaisted
be6fc8836f Update to 2.1 runtime 2017-08-17 22:55:43 -07:00
Nick Guerrera
937578cd3e Merge pull request #7469 from dsplaisted/2.1-maximum-version
Update to SDK with a maximum version for .NET Core of 2.1
2017-08-17 20:38:02 -07:00
Daniel Plaisted
4598d7b2c2 Update to SDK with a maximum version for .NET Core of 2.1 2017-08-17 19:50:17 -07:00
Mikkel Nylander Bundgaard
44d25ae3af Add test for commands without doclink 2017-08-17 15:01:31 -07:00
Mikkel Nylander Bundgaard
5ae335b592 Only open help page for commands with DocLink
The help-command now handles commands without a DocLink
in the same manner as unknown commands.

Fixes #7065
2017-08-17 15:01:31 -07:00
Nick Guerrera
4434a8a832 Merge pull request #7417 from mlorbetske/dev/mlorbe/FixTemplating1206
Fix dotnet/templating#1206
2017-08-17 14:03:29 -07:00
Nick Guerrera
6e993ed1cb Merge pull request #7441 from dotnet/vramak/UpdateWebSdk_8_14
Updating the websdk to 2.0.0-rel-20170815-630
2017-08-17 14:02:30 -07:00
Rick Anderson
27a6569ae0 Update README.md (#7217) 2017-08-17 13:19:03 -07:00
Nick Guerrera
949b8f8963 Merge pull request #7465 from dotnet/merges/release/2.0.0-to-master-20170817-070024
Merge release/2.0.0 to master
2017-08-17 12:56:48 -07:00
Nick Guerrera
448fba7456 Merge pull request #7446 from vcsjones/remove-targets-from-usage
Remove --targets from usage.
2017-08-17 11:51:22 -07:00
Nick Guerrera
37714cd5f0 Merge pull request #7413 from Faizan2304/blameDataCollector
Insert new bits of TPv2 and enable blame data collector
2017-08-17 11:50:07 -07:00
Daniel Plaisted
ec73bb8044 Merge pull request #7461 from dsplaisted/update-nuget-release/2.0-vs
Update to SDK build which includes NuGet 4.4.0-preview1-4365
2017-08-16 23:04:47 -07:00
Daniel Plaisted
acd690f7da Update to SDK build which includes NuGet 4.4.0-preview1-4365 2017-08-16 18:51:36 -07:00
Nick Guerrera
a398815652 Merge pull request #7459 from dsplaisted/release/2.0-vs
Insert NuGet Build 4.4.0-preview1-4365 into cli
2017-08-16 16:53:27 -07:00
Daniel Plaisted
cf657095ab Insert NuGet Build 4.4.0-preview1-4365 into cli 2017-08-16 15:35:54 -07:00
Daniel Plaisted
5661979a79 Merge pull request #7456 from dsplaisted/release/2.0-vs
Update branch in README.md to release/2.0.2
2017-08-16 15:00:10 -07:00
Daniel Plaisted
030dfc9945 Update branch in README.md to release/2.0.2 2017-08-16 14:40:06 -07:00
dotnet-bot
ebcd0fbf99 Update CoreSetup to preview2-25616-02 2017-08-16 21:23:21 +00:00
Daniel Plaisted
dc88bac18f Update version to 2.0.2-vspre 2017-08-16 14:22:25 -07:00
Daniel Plaisted
e94a82c9a3 Update to SDK build which includes NuGet 4.4.0-preview1-4365 (#7449) 2017-08-15 21:25:36 -07:00
Daniel Plaisted
dec65ebf4d Merge pull request #7448 from dsplaisted/update-nuget
Insert NuGet Build 4.4.0-preview1-4365 into cli
2017-08-15 14:45:55 -07:00
Daniel Plaisted
a4006bdbeb Insert NuGet Build 4.4.0-preview1-4365 into cli 2017-08-15 13:50:30 -07:00
Daniel Plaisted
6ed4e12ee8 Merge pull request #7439 from dsplaisted/fix-obtain-master
Fix dotnet-install.ps1 script when latest version file for channel is returned as application/octet-stream
2017-08-15 12:16:29 -07:00
Daniel Plaisted
0fc8003702 Merge pull request #7440 from dsplaisted/fix-obtain-release/2.0.0
Fix dotnet-install script when latest version file for channel is returned as application/octet-stream
2017-08-15 11:48:45 -07:00
Brett V. Forsgren
22a87d3ca6 Merge pull request #7430 from dotnet/merges/release/2.0.0-to-master-20170814-070029
Merge release/2.0.0 to master
2017-08-15 10:15:54 -07:00
Kevin Jones
f1fbd6bdd8 Remove --targets from usage. 2017-08-15 09:50:38 -04:00
John Doe
c4301c6ebf typo 2017-08-14 21:26:49 -07:00
John Doe
8fc8a03081 typo 2017-08-14 21:26:49 -07:00
Vijay Ramakrishnan
1a9bf33c3a Updating the websdk to 2.0.0-rel-20170815-630 2017-08-14 19:09:26 -07:00
Daniel Plaisted
83f9a374d3 Fix dotnet-install script when latest version file for channel is returned as application/octet-stream 2017-08-14 18:05:30 -07:00
Daniel Plaisted
8c5e955252 Fix dotnet-install script when latest version file for channel is returned as application/octet-stream 2017-08-14 18:05:04 -07:00
William Li
1fa454bda4 Ingest new version Aspnet store
Change the url and name accordingly for the name naming convention
2017-08-14 16:05:22 -07:00
Nick Guerrera
209d0cac73 Merge pull request #7437 from dagood/optional-dotnet-versions/2.0.0
[release/2.0.0] Skip versions repo publish if auth not defined
2017-08-14 14:24:35 -07:00
Davis Goodin
ab6933708e Merge pull request #7436 from dagood/optional-dotnet-versions/master
Skip versions repo publish if auth not defined
2017-08-14 16:16:07 -05:00
Brett V. Forsgren
77e289b114 Merge remote-tracking branch 'upstream/release/2.0.0' into merges/release/2.0.0-to-master-20170814-070029 2017-08-14 13:59:06 -07:00
Davis Goodin
2c8ea8263a Skip versions repo publish if auth not defined
(cherry picked from commit b4c1a809b8)
2017-08-14 14:19:10 -05:00