Commit graph

678 commits

Author SHA1 Message Date
dotnet-bot
6a03ff2255 Update CoreSetup to preview1-002101 2017-04-28 00:46:59 +00:00
Livar
2cc5612fec Merge pull request #6287 from dotnet/dev-ragrawal-updatenuget2484
update nuget version to 4.3.0-preview1-2500
2017-04-27 12:59:19 -07:00
Daniel Plaisted
0c210b6e49 Update to SDK version with support for tools deps file generation 2017-04-27 09:31:07 -07:00
dotnet-bot
42ad257436 Update CoreSetup to preview1-002091 2017-04-27 01:34:35 +00:00
Livar
b4214c8b18 Merge branch 'master' into dev-ragrawal-updatenuget2484 2017-04-26 16:35:18 -07:00
dotnet-bot
221e32d28c Update CoreSetup to preview2-002093 2017-04-26 23:24:46 +00:00
Livar Cunha
2e164f8f0a Merge branch 'release/2.0.0' into merge_release_200_again
* release/2.0.0:
  Adding a work around for a test failure.
  Generating the Microsoft.NETCoreSdk.BundledVersions.props file in the CLI folder, so that it can be picked up by the SDK.
2017-04-26 14:09:45 -07:00
Livar Cunha
e6354edb81 Merge branch 'release/2.0.0' into merge_release_200
* release/2.0.0:
  Temporarily remove tools
  Update to latest ASP.NET package versions & fix feed entry in NuGet.config
  Fixing crossgen to use the correct RID for OSX and Win now that only portable packages are being produced.
  Update core-setup channel to release/2.0.0
  Update CoreSetup to preview1-002088
  Update templates and add 'baseline' feature
  Remove accidental debug line
  Localization for CommonOptions
  Merge pull request #6380 from livarcocc/update_channel
  Merge pull request #6362 from mlorbetske/dev/mlorbe/Update20Templates
2017-04-26 10:59:47 -07:00
Livar
6c8fa9dddd Merge branch 'master' into dev-ragrawal-updatenuget2484 2017-04-26 10:38:02 -07:00
Livar
8207b865f4 Merge branch 'release/2.0.0' into move_bundled_versions 2017-04-26 10:30:34 -07:00
Eric Erhardt
bb1c3df558 Merge remote-tracking branch 'upstream/release/2.0.0' into release/2.0.0-UpdateDependencies 2017-04-26 11:45:24 -05:00
Mike Lorbetske
80c23d53d3 Temporarily remove tools 2017-04-25 21:52:43 -07:00
Mike Lorbetske
dde0cee897 Update to latest ASP.NET package versions & fix feed entry in NuGet.config 2017-04-25 21:31:12 -07:00
dotnet-bot
fd112f45a0 Update CoreSetup to preview1-002088 2017-04-26 03:16:03 +00:00
Zhi Li
ab0a68d32f update nuget version to 4.3.0-preview1-2500 2017-04-25 16:48:12 -07:00
Mike Lorbetske
9014b1b163 Update templates and add 'baseline' feature 2017-04-25 16:25:27 -07:00
Livar Cunha
7ebd363ca2 Generating the Microsoft.NETCoreSdk.BundledVersions.props file in the CLI folder, so that it can be picked up by the SDK. 2017-04-25 13:10:15 -07:00
dotnet-bot
195d11ceb5 Update CoreSetup to preview2-002081 2017-04-25 19:30:57 +00:00
Eric Erhardt
65662ea385 Merge branch 'master' into master-UpdateDependencies 2017-04-24 10:19:27 -05:00
Livar
4f6fbc4a7f Merge pull request #6362 from mlorbetske/dev/mlorbe/Update20Templates
Update templates and engine, pin ASP.NET package versions, add web item templates
2017-04-22 12:00:08 -07:00
Mike Lorbetske
8227a6edac Update templates, remove browserlink from checked packages 2017-04-21 22:10:57 -07:00
Mike Lorbetske
38e467e990 Fix build warning for web projects, add gracefull fallback for framework reference add attempts 2017-04-21 20:51:52 -07:00
Mike Lorbetske
2cbbea5b48 Put 195 engine version back 2017-04-21 20:51:52 -07:00
Mike Lorbetske
90cdb07cbc Try slightly earlier engine version 2017-04-21 20:51:52 -07:00
Mike Lorbetske
9ea9cbc8a6 Update templates and engine, pin ASP.NET package versions, add web item templates 2017-04-21 20:51:52 -07:00
dotnet-bot
31dbdfa197 Update CoreSetup to preview2-002066 2017-04-22 02:06:37 +00:00
Eric Erhardt
12eff39992 Update Core-setup to 2.0.0-preview1-002061-00 2017-04-21 12:47:56 -05:00
dotnet-bot
bb60a32737 Update CoreSetup to preview1-002057 2017-04-21 00:13:14 +00:00
Livar Cunha
61a934229e Updating SDK version to 2.0.0-alpha-20170420-1 2017-04-19 17:12:07 -07:00
Livar
12dbed613a Merge pull request #6319 from smadala/tp-insert-0414
TestPlatform 15.1.0-preview-20170414-04 insertion
2017-04-19 10:08:46 -07:00
Eric Erhardt
33b83ee1c7 Merge pull request #6343 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-002028 (master)
2017-04-19 09:15:26 -05:00
Rama krishnan Raghupathy
a150055dfb Merge pull request #6342 from ramarag/updateDependency
Updating Microsoft.Extensions.DependencyModel to 002022
2017-04-18 22:16:14 -07:00
Livar
3f82e11a91 Merge branch 'master' into tp-insert-0414 2017-04-18 21:06:17 -07:00
dotnet-bot
64b976a348 Update CoreSetup to preview1-002028 2017-04-17 21:36:31 +00:00
Rama Krishnan Raghupathy
a629dfe210 Updating Microsoft.Extensions.DependencyModel to 002022 2017-04-17 13:02:56 -07:00
Vijay Ramakrishnan
e9f2b22492 Updating the websdk version to 1.0.0-rel-20170413-451 2017-04-17 10:00:42 -07:00
dotnet-bot
65ebbded91 Update CoreSetup to preview1-002021 2017-04-17 15:09:44 +00:00
Rama Krishnan Raghupathy
bb4298ddc2 Updating SDk to 20170414 2017-04-14 14:55:01 -07:00
Satya Madala
59de556b76 TestPlatform 15.1.0-preview-20170414-04 2017-04-14 20:52:52 +05:30
Daniel Plaisted
2b4992c56d Merge pull request #6304 from dotnet/update-sdk
Update SDK to 2.0.0-alpha-20170411-3
2017-04-13 17:49:34 -07:00
Daniel Plaisted
1bd0873b42 Update SDK to 2.0.0-alpha-20170413-1 2017-04-13 14:36:14 -07:00
dotnet-bot
9e1ce3a5ab Update CoreSetup to preview1-001978 2017-04-12 22:50:27 +00:00
Rama krishnan Raghupathy
8bd15c7ec0 Merge pull request #6300 from ramarag/dependencymodel
moving dependecymodel and platformabstraction to preview1-001960
2017-04-11 18:54:43 -07:00
Rama Krishnan Raghupathy
2f5673f953 moving dependecymodel and platformabstraction to preview1-001960 2017-04-11 17:00:50 -07:00
dotnet-bot
60f830aa7f Update CoreSetup to preview1-001961 2017-04-11 18:03:18 +00:00
William Li
a6d3012da1 Replace dotnet help parser with CliCommandLineParser
CliCommandLineParserVersion 138 cannot use help as command and --help as
opinion at the same timem, update to 142
2017-04-10 22:11:14 -07:00
Livar
5e9e688d9e Merge pull request #6289 from mlorbetske/dev/mlorbe/UpdateWeb20TemplatesAndEngineVersion
Update templates & engine, rename --skip-restore to --no-restore
2017-04-10 20:54:23 -07:00
Mike Lorbetske
fc77d7e152 Update templates & engine, rename --skip-restore to --no-restore 2017-04-10 20:00:17 -07:00
dotnet-bot
607a001553 Update CoreSetup to preview1-001960 2017-04-11 01:54:27 +00:00
Livar
0d57d7169f Merge pull request #6284 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-001957 (master)
2017-04-10 17:31:39 -07:00