Commit graph

7578 commits

Author SHA1 Message Date
Livar
90d667e9b0
Merge pull request #8056 from mlorbetske/dev/mlorbe/UpdateTemplateEngineVersion
Update template engine version for 15.6+
2017-11-18 13:55:27 -08:00
Livar
f83d230508
Merge pull request #8052 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-25917-06 (master)
2017-11-17 18:51:48 -08:00
Mike Lorbetske
746b669a4c Update template engine version for 15.6+ 2017-11-17 18:37:56 -08:00
dotnet-bot
90a0249e00 Update CoreSetup to preview1-25917-06 2017-11-17 22:39:35 +00:00
Livar
2ee6aeb675
Merge pull request #7997 from dotnet/update-tab-completion-doc
Update tab-completion.md
2017-11-16 18:27:47 -08:00
Livar
d0c5510ee2
Merge pull request #7992 from seancpeters/templating_2.1.0-preview1_insertion_2017_11_09
Inserting dotnet/templating rel/2.1.0-preview1 into cli master
2017-11-16 18:27:28 -08:00
Livar
98d650cc42
Merge pull request #8038 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-25916-02 (master)
2017-11-16 17:01:33 -08:00
dotnet-bot
4498142bb5 Update CoreSetup to preview1-25916-02 2017-11-16 22:48:36 +00:00
Livar
b674f5d64c
Merge pull request #8037 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-25916-01 (master)
2017-11-16 13:26:54 -08:00
dotnet-bot
91bdd7e3a4 Update CoreSetup to preview1-25916-01 2017-11-16 18:45:07 +00:00
Livar
833635ae0f
Merge pull request #8029 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-25915-02 (master)
2017-11-15 17:19:40 -08:00
dotnet-bot
23575687f6 Update CoreSetup to preview1-25915-02 2017-11-15 23:44:19 +00:00
Livar
1b8c5b498b
Merge pull request #8025 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-25915-01 (master)
2017-11-15 12:50:32 -08:00
dotnet-bot
1a16f3a7c5 Update CoreSetup to preview1-25915-01 2017-11-15 19:13:43 +00:00
Livar
c698ac8377
Merge pull request #8020 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-25914-05 (master)
2017-11-14 18:54:40 -08:00
dotnet-bot
04c477fc21 Update CoreSetup to preview1-25914-05 2017-11-14 23:04:34 +00:00
Sean Peters
be0bebdf30 updated TemplateEnd template versions. Removed old entries from BundledTemplates.props 2017-11-14 14:13:31 -08:00
seancpeters
b5b7b9b16c
Merge branch 'master' into templating_2.1.0-preview1_insertion_2017_11_09 2017-11-14 14:06:05 -08:00
seancpeters
29a3673535
Merge branch 'master' into templating_2.1.0-preview1_insertion_2017_11_09 2017-11-14 14:04:55 -08:00
Livar
3b4becd7c8
Merge pull request #8011 from dotnet/merges/release/15.5-to-master-20171114-080040
Merge release/15.5 to master
2017-11-14 12:58:56 -08:00
Livar
5955194c11
Merge pull request #8002 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-25912-02 (master)
2017-11-13 12:14:46 -08:00
Livar
e5d2a67cfe
Merge pull request #7974 from singhsarab/patch-1
Updating the version for TestPlatform
2017-11-13 12:14:25 -08:00
dotnet-bot
36d201b4f0 Update CoreSetup to preview1-25912-02 2017-11-12 22:48:10 +00:00
Nick Guerrera
20d4d77586
Merge pull request #7998 from dotnet/release/15.5
Merge release/15.5 to master
2017-11-11 10:15:25 -08:00
Nick Guerrera
f64717fc31
Merge pull request #7994 from dotnet/nguerrera/update-sdk
Update SDK
2017-11-10 21:42:30 -08:00
seancpeters
02e82d5610
Merge branch 'master' into templating_2.1.0-preview1_insertion_2017_11_09 2017-11-10 17:28:33 -08:00
Sean Peters
b1c7c072b6 updated the websdk version 2017-11-10 17:21:37 -08:00
Sean Peters
a49a9680ff bumped the templating build number 2017-11-10 16:26:36 -08:00
Jon Sequeira
7327bae574
Update tab-completion.md 2017-11-10 15:27:27 -08:00
Nick Guerrera
5d2c5f9943
Update SDK 2017-11-10 10:56:54 -08:00
Nick Guerrera
f15495cee3
Merge pull request #7987 from dotnet/merges/release/15.5-to-master-20171109-080038
Merge release/15.5 to master
2017-11-10 10:20:37 -08:00
Nick Guerrera
71cb608e48
Merge branch 'master' into merges/release/15.5-to-master-20171109-080038 2017-11-09 18:43:28 -08:00
Livar
10238b401f
Merge pull request #7991 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-25909-03 (master)
2017-11-09 17:10:45 -08:00
Sean Peters
82718a146c Inserting dotnet/templating rel/2.1.0-preview1 into cli master 2017-11-09 15:46:14 -08:00
dotnet-bot
dfc674fb09 Update CoreSetup to preview1-25909-03 2017-11-09 22:44:46 +00:00
Livar
8b3c80958b
Merge pull request #7971 from dotnet/merges/release/2.0.0-to-release/15.5-20171107-080033
Merge release/2.0.0 to release/15.5
2017-11-09 00:04:47 -08:00
John Beisner
5bc9335ff8
Merge pull request #7981 from johnbeisner/FixingPublishConditionals
Correcting 'PUBLISH_TO_AZURE_BLOB' and 'PUBLISH_NUPKG_TO_AZURE_BLOB'
2017-11-08 18:16:27 -08:00
Livar
f33659b500
Merge pull request #7983 from joperezr/UpdateSDK
Updating the SDK and Support package on the CLI
2017-11-08 17:37:12 -08:00
Jose Perez Rodriguez
079edcd894 Updating the SDK and Support package on the CLI 2017-11-08 15:31:51 -08:00
John Beisner
e3b32e41ec
Merge pull request #7978 from johnbeisner/NugetConfigModification
Removing Tier 1 repos from Nuget.config
2017-11-08 14:24:20 -08:00
John Beisner
6302b34d56 per code review:
Putting back: https://dotnet.myget.org/F/dotnet-core/api/v3/index.json
2017-11-08 10:33:40 -08:00
John Beisner
e1d3320376 Correcting 'PUBLISH_TO_AZURE_BLOB' and 'PUBLISH_NUPKG_TO_AZURE_BLOB' Booleans - 'false' should not be conveyed by the empty string. 2017-11-08 09:26:32 -08:00
Livar
b80bfc6dfb
Merge pull request #7977 from dotnet/update_sdk
Update SDK to 15.5.0-preview-20171107-4
2017-11-07 21:32:00 -08:00
John Beisner
ef42a98a1c Removing Tier 1 repos from Nuget.config; those repos are now coming from the internal 'dotnet-core' feed. 2017-11-07 16:38:39 -08:00
Livar
b6bfc84f51
Update SDK to 15.5.0-preview-20171107-4 2017-11-07 15:54:43 -08:00
Eric Erhardt
d58fc6120d
Merge pull request #7968 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-25907-02 (master)
2017-11-07 14:35:44 -06:00
Nick Guerrera
1fef760409 Merge remote-tracking branch 'upstream/release/2.0.0' into merges/release/2.0.0-to-release/15.5-20171107-080033 2017-11-07 11:34:13 -08:00
Livar
fc19d9304e
Merge pull request #7970 from AndyGerlicher/MSBuild.15.5.178
MSBuild 15.5.178
2017-11-07 09:50:29 -08:00
dotnet-bot
fd738184c1 Update CoreSetup to preview1-25907-02 2017-11-07 17:49:55 +00:00
Nick Guerrera
4db91a217f
Merge pull request #7973 from dotnet/merges/release/15.5-to-master-20171107-080036
Merge release/15.5 to master
2017-11-07 06:31:45 -08:00