Commit graph

686 commits

Author SHA1 Message Date
Livar
2031c9cf33
Merge branch 'master' into merges/release/15.5-to-master-20171031-070033 2017-10-31 10:15:11 -07:00
Nate McMaster
255e7bc850 Update aspnetcore to 2.0.3 build 125 2017-10-31 09:10:35 -07:00
Satya Madala
e7fc8749f3 Insert Testplatform 15.5.0-preview-20171031-01 2017-10-31 20:46:45 +05:30
dotnet-bot
c59ad5a4c6 Update CoreSetup to preview1-25830-04 2017-10-30 23:00:25 +00:00
Livar
3d8ce7574b
Merge pull request #7900 from dotnet/merges/release/15.5-to-master-20171025-065942
Merge release/15.5 to master
2017-10-30 10:56:28 -07:00
Livar
d1b1454976
Merge branch 'release/15.5' into merges/release/2.0.0-to-release/15.5-20171030-065952 2017-10-30 09:40:54 -07:00
Kevin Ransom
8a60d17f0c Update F# compiler to match VS 2017-10-27 15:00:25 -07:00
William Lee
812cfbe90c
Update SDK version to 15.5.0-preview-20171027-2 (#7925) 2017-10-27 12:29:19 -07:00
Livar Cunha
dfd20eaf30 Updating the version of the command line parser. 2017-10-27 11:17:18 -07:00
Nate McMaster
878532eedf Update aspnetcore to 2.0.3 build 124 2017-10-27 07:57:14 -07:00
Livar
954b9a3ee1 Merge branch 'master' into merges/release/15.5-to-master-20171025-065942 2017-10-26 15:13:01 -07:00
Andy Gerlicher
4c804c3421 MSBuild 15.5.170 2017-10-26 12:46:37 -07:00
dotnet-bot
7d3ac35d84 Update CoreSetup to preview1-25825-07 2017-10-25 22:19:32 +00:00
Livar
103a56803f Merge branch 'master' into merges/release/15.5-to-master-20171025-065942 2017-10-25 10:46:31 -07:00
Nate McMaster
347169e68a Update aspnetcore to 2.0.3 build 123 2017-10-24 15:27:08 -07:00
Andy Gerlicher
f81c0fc1d7 MSBuild 15.5.165 2017-10-23 14:59:24 -07:00
Kevin Ransom
6ef8af7d6d update fsharp compiler for preview release 2017-10-23 14:47:31 -07:00
dotnet-bot
fa2bd27688 Update CoreSetup to preview1-25823-01 2017-10-23 17:28:38 +00:00
Nate McMaster
be1b014c7c Update aspnetcore runtime store and LZMA to 2.0.3 build 120 2017-10-20 08:59:31 -07:00
Livar
0d51d3d0f7 Merge branch 'master' into master-UpdateDependencies 2017-10-18 20:16:33 -07:00
dotnet-bot
5537be658f Update CoreSetup to preview1-25818-02 2017-10-18 21:35:19 +00:00
Livar
aad235fd1c Merge branch 'master' into merges/release/15.5-to-master-20171018-070036 2017-10-18 12:20:03 -07:00
dotnet-bot
8b69a7506a Update CoreSetup to preview1-25818-01 2017-10-18 17:45:51 +00:00
Livar
d3098e7fcd Update SDK to 15.5.0-preview-20171018-2 2017-10-18 10:40:15 -07:00
Livar Cunha
72eda50303 Merge branch 'release/2.0.0' into merge_release_200
* release/2.0.0:
  Separating the 'legacy' URL construction from the 'current' URL construction methods and logic.
  Use temporary path for fake deps.json in test
  MSBuild 15.4.8
  Insert SDK 2.0.2-vspre-20170927-1
2017-10-17 17:30:58 -07:00
Livar
9bd976f5ec Updating ASP.NET templates to 1.0.0-beta2-20170810-304 2017-10-17 16:52:20 -07:00
Livar
730affa440 Merge branch 'master' into master-UpdateDependencies 2017-10-17 16:26:04 -07:00
Livar
a34ecdeff6 Merge branch 'master' into merges/release/15.5-to-master-20171016-070031 2017-10-17 14:42:15 -07:00
dotnet-bot
3484dd26df Update CoreSetup to preview1-25817-05 2017-10-17 21:40:36 +00:00
Livar
966e133565 Merge branch 'master' into merges/release/15.5-to-master-20171016-070031 2017-10-17 11:36:43 -07:00
dotnet-bot
a6b40da4ae Update CoreSetup to preview1-25817-01 2017-10-17 17:50:35 +00:00
Livar
95dafad76b Merge branch 'release/15.5' into update_roslyn 2017-10-17 10:09:24 -07:00
Livar
c4faa28ffa Merge pull request #7847 from AndyGerlicher/MSBuild.15.5.160
MSBuild 15.5.160
2017-10-17 09:50:22 -07:00
Livar Cunha
ea158bb686 Update the roslyn version to 2.6.0-beta2-62210-01. 2017-10-17 09:48:16 -07:00
Daniel Plaisted
2a3a5be07d Insert SDK 15.5.0-preview-20171017-1 2017-10-16 17:23:12 -07:00
Livar
9de48be817 Merge pull request #7834 from harshjain2/TPv2LatestRelease
Updated version of TestPlatform to 15.5.0-preview-20171012-09
2017-10-16 15:52:49 -07:00
Livar Cunha
e1916cc4dc Merge remote-tracking branch 'dotnet/release/15.5' into merges/release/15.5-to-master-20171016-070031
* dotnet/release/15.5: (21 commits)
  Manually merging some changes that git merged wrong and deleted from the 15.5 branch.
  Separating the 'legacy' URL construction from the 'current' URL construction methods and logic.
  Use temporary path for fake deps.json in test
  Use same build number for roslyn and F# satellites
  Updating Roslyn satellites and SDK versions
  Insert NuGet Build 4.5.0-preview2-4529 into cli
  Update NuGet to 4529 (signed)
  MSBuild 15.5.154
  MSBuild 15.5.153
  removed commented out config I'd meant to remove
  added a way to specify the asp.net template versions
  Porting 'dotnet-install.sh' from CLI:master to CLI:release/2.0.0
  'NuGet.master.config' does not appear to be used.
  Fixed tests
  Update branch info to release/15.5
  Updating the websdk version to 2.0.0-rel-20171010-665
  Insert NuGet Build 4.5.0-preview1-4526 into cli
  Update DependencyVersions.props
  Updated version of TestPlatform to 15.5.0-preview-20170923-02
  MSBuild 15.4.8
  ...
2017-10-16 15:42:40 -07:00
Andy Gerlicher
88bcf0ffb3 MSBuild 15.5.160 2017-10-16 14:40:46 -07:00
dotnet-bot
1efa3f57ad Update CoreSetup to preview1-25816-02 2017-10-16 21:38:06 +00:00
Livar
80d76f93a4 Merge branch 'release/15.5' into merges/release/2.0.0-to-release/15.5-20171013-070028 2017-10-13 10:19:11 -07:00
Livar Cunha
27aa698710 Manually merging some changes that git merged wrong and deleted from the 15.5 branch. 2017-10-13 09:56:08 -07:00
Livar Cunha
1943ddc57f Merge remote-tracking branch 'dotnet/release/2.0.0' into merges/release/2.0.0-to-release/15.5-20171013-070028
* dotnet/release/2.0.0:
  Use temporary path for fake deps.json in test
  Porting 'dotnet-install.sh' from CLI:master to CLI:release/2.0.0
  'NuGet.master.config' does not appear to be used.
  Reverting previous change to: 'NuGet.master.config'
  Moving the runtime version to 2.0.0 for the SDK.
  Revert release/2.0.0 back to 1bcee43995
  Adding the unified transport NuGet feed.
  Keeping the branding for release/2.0.0 at 2.0.3.
  MSBuild 15.4.8
  Insert SDK 2.0.2-vspre-20170927-1
2017-10-13 09:04:58 -07:00
Harsh Jain
41d1f6ad6d Updated version of TPv2 2017-10-13 14:09:32 +05:30
Nick Guerrera
c0c4be7946 Merge branch 'release/2.0-vs' into merge-2.0-vs 2017-10-12 18:22:04 -07:00
Nick Guerrera
7b558111ae Use same build number for roslyn and F# satellites 2017-10-12 16:22:06 -07:00
Livar Cunha
f6a07bcb39 Merge branch 'release/2.0.0' into merge_release_200
* release/2.0.0:
  Porting 'dotnet-install.sh' from CLI:master to CLI:release/2.0.0
  'NuGet.master.config' does not appear to be used.
  Reverting previous change to: 'NuGet.master.config'
  Moving the runtime version to 2.0.0 for the SDK.
  Revert release/2.0.0 back to 1bcee43995
  Adding the unified transport NuGet feed.
  Update cli-deps-satellites
  Fix up roslyn satellite assembly handling to match new insertion mechanism
2017-10-12 14:56:23 -07:00
Livar
428b2caa6b Merge pull request #7814 from AndyGerlicher/MSBuild.15.5.154
MSBuild 15.5.154
2017-10-12 13:51:38 -07:00
Livar
278cbf6c44 Merge pull request #7819 from dotnet/livarcocc-patch-2
Updating Roslyn satellites and SDK versions
2017-10-11 23:54:09 -07:00
Livar
821a413dd6 Updating Roslyn satellites and SDK versions 2017-10-11 22:29:40 -07:00
NuGet Team Bot
15ee853d49 Insert NuGet Build 4.5.0-preview2-4529 into cli 2017-10-11 18:44:34 -07:00
Livar
95a56ffcfe Merge pull request #7811 from seancpeters/15.5_separate_aspnet_templates
Added a property to DependencyVersions.props for asp.net template version
2017-10-11 18:40:24 -07:00
Andy Gerlicher
d15d448332 Update NuGet to 4529 (signed) 2017-10-11 18:30:57 -07:00
Andy Gerlicher
97f4a01869 MSBuild 15.5.154 2017-10-11 17:27:36 -07:00
Andy Gerlicher
3b09db3f9e MSBuild 15.5.153 2017-10-11 17:26:43 -07:00
seancpeters
c6139adcc9 added a way to specify the asp.net template versions 2017-10-11 16:22:03 -07:00
faahmad
6f41ca4de7 Merge branch 'release/15.5' into updateTpv215.5.0-preview-20171009-10
# Conflicts:
#	build/DependencyVersions.props
2017-10-11 12:09:40 +05:30
Livar
7f5c9ec12a Merge pull request #7803 from dotnet/vramak/websdk_15_5
Updating the websdk version to 2.0.0-rel-20171010-665
2017-10-10 21:07:53 -07:00
Vijay Ramakrishnan
6a116d4b94 Updating the websdk version to 2.0.0-rel-20171010-665 2017-10-10 16:38:32 -07:00
dotnet-bot
ce29ec42e8 Update CoreSetup to preview1-25810-02 2017-10-10 22:28:57 +00:00
NuGet Team Bot
a084153c15 Insert NuGet Build 4.5.0-preview1-4526 into cli 2017-10-10 15:08:33 -07:00
Shyam-Gupta
b5d9f6f3e6 Update DependencyVersions.props 2017-10-10 16:50:09 +05:30
Livar Cunha
fead8521c3 Moving the runtime version to 2.0.0 for the SDK.
(cherry picked from commit e24b53dda7)
2017-10-09 13:59:09 -07:00
Nick Guerrera
ddae0875cf Revert release/2.0.0 back to 1bcee43995
There were incorrect merges from release/15.5 to release/2.0.0 since then
2017-10-09 13:55:13 -07:00
Livar Cunha
7ce43b9e3e Updating the runtime version. 2017-10-09 11:42:21 -07:00
Shyam-Gupta
9a2e87f0d9 Updated version of TestPlatform to 15.5.0-preview-20170923-02
refer commit: fa876f5b90
2017-10-09 17:46:08 +05:30
dotnet-bot
c23cd33b28 Update CoreSetup to preview1-25806-02 2017-10-06 22:06:36 +00:00
Eric Erhardt
a629d569a3 Merge pull request #7780 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-25806-01 (master)
2017-10-06 16:17:16 -05:00
Livar
5407978c13 Merge pull request #7772 from dotnet/livarcocc-patch-2
Update the SDK to 2.1.0-preview1-20171006-4
2017-10-06 11:49:05 -07:00
dotnet-bot
6066e1ce3a Update CoreSetup to preview1-25806-01 2017-10-06 17:40:13 +00:00
Livar
c950f92462 Update the SDK to 2.1.0-preview1-20171006-4 2017-10-05 16:39:32 -07:00
dotnet-bot
ad0ecd6914 Update CoreSetup to preview1-25805-02 2017-10-05 21:39:21 +00:00
Nick Guerrera
d0013186c7 Merge pull request #7751 from nguerrera/fixup-roslyn-loc
Update satellite assemblies and fix up roslyn satellite handling
2017-10-05 11:25:07 -07:00
dotnet-bot
58c76ff1ce Update CoreSetup to preview1-25804-01 2017-10-04 17:28:30 +00:00
Livar Cunha
e24b53dda7 Moving the runtime version to 2.0.0 for the SDK. 2017-10-03 16:46:15 -07:00
Nick Guerrera
cd68283018 Update cli-deps-satellites 2017-10-03 16:01:08 -07:00
Livar
2d3b8da0b0 Merge pull request #7748 from AndyGerlicher/MSBuild.15.5.113
MSBuild 15.5.113
2017-10-03 09:55:17 -07:00
Livar
72f42f9463 Merge pull request #7735 from brettfo/update-fsharp-15.5
Update FSharp compiler
2017-10-02 20:43:11 -07:00
Andy Gerlicher
cd9260f467 MSBuild 15.5.113 2017-10-02 19:03:59 -07:00
Brett V. Forsgren
6ccff28e0a Update F# compiler 2017-10-02 16:37:31 -07:00
dotnet-bot
ee76f981b4 Update CoreSetup to preview1-25802-02 2017-10-02 22:30:41 +00:00
Livar
32c0f44129 Merge branch 'release/15.5' into improve_roslyn 2017-10-02 15:13:34 -07:00
dotnet-bot
1bf3b681e2 Update CoreSetup to preview1-25802-01 2017-10-02 17:27:49 +00:00
khyperia
04c8a68539 Improve the way Roslyn is pulled in 2017-10-02 08:01:44 -07:00
dotnet-bot
49794cf29b Update CoreSetup to preview1-25801-01 2017-10-01 18:39:18 +00:00
dotnet-bot
ce08614bf7 Update CoreSetup to preview1-25729-02 2017-09-29 21:49:46 +00:00
Andy Gerlicher
fb67e25cfb MSBuild 15.5.110 2017-09-29 13:31:56 -07:00
dotnet-bot
8632acb6f7 Update CoreSetup to preview1-25728-02 2017-09-28 21:26:29 +00:00
Livar
b7f14949cd Merge pull request #7719 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-25727-05 (master)
2017-09-27 20:12:13 -07:00
Livar
5de69a9e0e Merge branch 'master' into merges/release/2.0.0-to-master-20170927-070027 2017-09-27 16:21:19 -07:00
dotnet-bot
05b0a63044 Update CoreSetup to preview1-25727-05 2017-09-27 22:49:00 +00:00
Livar Cunha
4bd9bb92cc Merge remote-tracking branch 'dotnet/release/2.0.0' into merges/release/2.0.0-to-master-20170927-070027
* dotnet/release/2.0.0: (29 commits)
  Updating the CLI branding to 2.0.3
  Fixing merges.
  Removing the trailing '\r' for bash shells; commit hash.
  Removing the trailing '\r' for bash shells. https://github.com/dotnet/cli/issues/7392
  Changing ItAddsFxVersionAsAParamWhenTheToolHasThePrefercliruntimeFile to expect 2.0.0 as the runtime version.
  Fixing 'librarypath'
  Update the installation scripts in release/2.0.0 branch.
  Insert SDK 2.0.2-vspre-20170921-5
  Insert SDK 2.0.2-vspre-20170915-1
  MSBuild 15.4.7
  Updating the websdk version to 2.0.0-rel-20170908-653
  Insert NuGet Build 4.4.0-preview3-4475 into cli
  Remove out of support ubuntu1610
  Removing extra line feeds...
  Turning on the NuPkg publishing from Win x86
  The enumeration of the nupkg packages depends on that the creation of packages has already occurred.
  Trivial change to start a VSO build
  Push the 'VS.Redist.Common.Net.Core.SDK*.nupkg' packages to blob storage.
  Remove EOL openSuSE 42.1
  Trigger build
  ...
2017-09-27 14:35:00 -07:00
Andy Gerlicher
79077b5ea2 MSBuild 15.4.8 2017-09-27 09:52:43 -07:00
Daniel Plaisted
0d233cd9d0 Insert SDK 2.0.2-vspre-20170927-1 2017-09-26 18:13:03 -07:00
Livar Cunha
2669306319 Fixing merges. 2017-09-26 15:33:17 -07:00
Harsh Jain
fa876f5b90 Updated version of TestPlatform to 15.5.0-preview-20170923-02 2017-09-26 19:19:16 +05:30
Livar Cunha
c7fa050645 Merge branch 'release/2.0-vs' into merge_release20_vs
* release/2.0-vs: (22 commits)
  Insert SDK 2.0.2-vspre-20170921-5
  Insert SDK 2.0.2-vspre-20170915-1
  MSBuild 15.4.7
  Updating the websdk version to 2.0.0-rel-20170908-653
  Insert NuGet Build 4.4.0-preview3-4475 into cli
  Remove out of support ubuntu1610
  Removing extra line feeds...
  Turning on the NuPkg publishing from Win x86
  The enumeration of the nupkg packages depends on that the creation of packages has already occurred.
  Trivial change to start a VSO build
  Push the 'VS.Redist.Common.Net.Core.SDK*.nupkg' packages to blob storage.
  Remove EOL openSuSE 42.1
  Trigger build
  Trigger build
  Sign additional files
  Update CLI_NETSDK_Version SDK to 2.0.2-vspre-20170825-1
  Dummy commit to trigger CI due to 20170824.1 publish nuget time out 20170824.1
  Insert NuGet Build 4.4.0-preview1-4434 into cli
  Update to SDK build which includes NuGet 4.4.0-preview1-4365
  Insert NuGet Build 4.4.0-preview1-4365 into cli
  ...
2017-09-22 15:36:27 -07:00
Daniel Plaisted
ce885f76c4 Insert SDK 2.0.2-vspre-20170921-5 2017-09-21 15:21:29 -07:00
Andy Gerlicher
9e06395ed7 MSBuild 15.5.90 2017-09-21 12:45:07 -07:00
dotnet-bot
7287790200 Update CoreSetup to preview1-25719-04 2017-09-20 00:14:50 +00:00
Daniel Plaisted
ba1c8eda24 Insert SDK 2.0.2-vspre-20170915-1 2017-09-15 14:14:25 -07:00
Livar
b70923512c Merge pull request #7647 from dotnet/nuget-insertbuild4475
Insert NuGet Build 4.4.0-preview3-4475 into cli
2017-09-15 13:56:21 -07:00
Livar
baa49ef4c1 Merge pull request #7653 from AndyGerlicher/MSBuild.15.4.7
MSBuild 15.4.7
2017-09-15 10:04:37 -07:00
Livar
0a482954ae Merge pull request #7645 from livarcocc/remove_archiver_code
Removing Microsoft.DotNet.Archive from the CLI
2017-09-15 09:58:03 -07:00
Andy Gerlicher
f71eecfdd3 MSBuild 15.4.7 2017-09-14 11:04:59 -07:00
Vijay Ramakrishnan
c6482b8919 Updating the websdk version to 2.0.0-rel-20170908-653 2017-09-14 10:39:42 -07:00
Harsh Jain
4eb4cddbb7 Updated version of TestPlatform to 15.5.0-preview-20170914-09 2017-09-14 20:49:31 +05:30
NuGet Team Bot
5ce59a6179 Insert NuGet Build 4.4.0-preview3-4475 into cli 2017-09-13 17:27:51 -07:00
Livar Cunha
9cdb20b7a5 Removing Microsoft.DotNet.Archive from the CLI and instead depending on a nupkg. 2017-09-13 14:04:09 -07:00
Daniel Plaisted
f9b576cf5d Insert SDK version 2.0.1-servicing-20170912-1 2017-09-11 18:37:23 -07:00
John Beisner
74ad01b576 Adding consistent "Project" headers to inported props and target files. 2017-09-05 14:44:25 -07:00
Nick Guerrera
8534452274 Bump to stable runtime/framework packages 2017-09-05 13:28:02 -07:00
Nick Guerrera
2269efbbf0 Insert 2.0.1-servicing SDK in to 2.0.1-servcing CLI 2017-09-05 13:27:37 -07:00
Nick Guerrera
3514db05da Update shared framework dependency 2017-08-31 17:09:05 -07:00
seancpeters
79e94eb908 Updating new templates to 2.1.0 versions 2017-08-29 15:21:13 -07:00
Matt Galbraith
1156e52eb8 Update dependency version 2017-08-28 13:14:23 -07:00
Nick Guerrera
6d6d1c0c2b Merge branch 'master' into dotnet-bot-master-UpdateDependencies 2017-08-25 13:49:39 -07:00
Rainer Sigwald
ee5c02de77 MSBuild 15.5.74 2017-08-25 13:25:01 -07:00
William Li
1a36940549 Update CLI_NETSDK_Version SDK to 2.0.2-vspre-20170825-1 2017-08-25 13:22:01 -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
William Li
4ae52088bf Merge branch 'master' into merges/release/2.0.0-to-master-20170821-070027 2017-08-21 12:54:31 -07:00
Daniel Plaisted
be6fc8836f Update to 2.1 runtime 2017-08-17 22:55:43 -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
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
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
acd690f7da Update to SDK build which includes NuGet 4.4.0-preview1-4365 2017-08-16 18:51:36 -07:00
Daniel Plaisted
cf657095ab Insert NuGet Build 4.4.0-preview1-4365 into cli 2017-08-16 15:35:54 -07:00
dotnet-bot
ebcd0fbf99 Update CoreSetup to preview2-25616-02 2017-08-16 21:23:21 +00: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
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
Vijay Ramakrishnan
1a9bf33c3a Updating the websdk to 2.0.0-rel-20170815-630 2017-08-14 19:09:26 -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
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
Mike Lorbetske
be31443adf Fix dotnet/templating#1206 2017-08-10 23:56:43 -07:00
faahmad
ecd6c47d2e Insert new bits of TPv2 and enable blame data collector 2017-08-10 18:55:06 +05:30
William Lee
cda49654db Merge pull request #7371 from dotnet/merges/release/2.0.0-to-master-20170804-070030
Merge release/2.0.0 to master
2017-08-04 15:14:37 -07:00
Nick Guerrera
8c654cb9e1 Bump SDK version to align nuget versions 2017-08-04 00:53:05 -07:00
NuGet Team Bot
d4dd50210d Insert NuGet Build 4.3.0-rtm-4382 into cli 2017-08-03 21:58:34 -07:00
Mike Lorbetske
94cadf390b Update templates to 1.0.0-beta2-20170803-303 2017-08-03 10:38:33 -07:00
Livar
96b122e26f Merge branch 'master' into merges/release/2.0.0-to-master-20170731-070024 2017-07-31 11:00:18 -07:00
Livar
53f6fe597f Update SDK to 2.0.0-preview3-20170728-1
Contains the new error message for .NET Framework referencing NetStandard 1.5 and 1.6 without the 2.0 SDK.
2017-07-27 18:39:08 -07:00
Livar
39abdb1ef6 Merge pull request #7302 from dotnet/livarcocc-patch-1
Update SDK to 2.0.0-preview3-20170727-2
2017-07-27 16:37:35 -07:00
Livar
d864d60090 Update SDK to 2.0.0-preview3-20170727-2 2017-07-27 15:03:18 -07:00
Mike Lorbetske
09cfa32e5b Absorb update to MSTest version 2017-07-27 12:44:00 -07:00
Livar
6a67932370 Merge pull request #7297 from wli3/update-sdk-version
Update SDK to 2.0.0-preview3-20170727-1
2017-07-27 11:27:02 -07:00
William Li
68d211795a Update SDK to 2.0.0-preview3-20170727-1 2017-07-27 10:41:36 -07:00
Steve Sanderson
5af7786c45 Update SPA templates to 1.0.417 2017-07-27 15:16:29 +01:00
Nick Guerrera
9294718d8d Update Roslyn and F# satellites 2017-07-26 18:24:30 -07:00
Livar
f80fac2c51 Merge pull request #7270 from dotnet/merges/release/2.0.0-to-master-20170726-070023
Merge release/2.0.0 to master
2017-07-26 16:20:23 -07:00
Livar
e4a52e57b9 Update SDK to 2.0.0-preview3-20170726-3 2017-07-26 09:21:15 -07:00
Mike Lorbetske
f4d774b58c Switch to picking up the no-timestamp runtime store and package cache 2017-07-25 20:54:44 -07:00
Nick Guerrera
e126145d35 Merge pull request #7262 from seancpeters/update_to_coherence_26452
updating to coherence 26452 & templating build 300
2017-07-25 17:48:07 -07:00
Nick Guerrera
44638af313 Merge pull request #7230 from dotnet/nuget-insertbuild4324
Insert NuGet Build 4.3.0-rtm-4324 into cli
2017-07-25 15:50:49 -07:00
seancpeters
70d18839af updating to coherence 26452 & templating build 300 2017-07-25 15:39:33 -07:00
Nick Guerrera
4e92948870 Merge pull request #7254 from dotnet/merges/release/2.0.0-to-master-20170725-070023
Merge release/2.0.0 to master
2017-07-25 15:17:43 -07:00
Livar
18ee24c316 Merge pull request #7232 from dotnet/merges/release/2.0.0-to-master-20170724-070022
Merge release/2.0.0 to master
2017-07-24 13:29:28 -07:00
Ashley Hauck
9ff5da4dd2 Update Roslyn to 2.3.2-beta1-61921-05 in 2.0.0 2017-07-24 10:09:31 -07:00
NuGet Team Bot
81b9379536 Insert NuGet Build 4.3.0-rtm-4324 into cli 2017-07-23 16:23:47 -07:00
Livar
e678c04f03 Merge pull request #7221 from dotnet/livarcocc-patch-2
Updating SDK to 2.0.0-preview3-20170721-7
2017-07-22 17:03:12 -07:00
Mike Lorbetske
2848037380 Update to Coherence 26424 2017-07-21 19:01:49 -07:00
Livar
dfb88456ba Updating SDK to 2.0.0-preview3-20170721-7 2017-07-21 14:42:05 -07:00
Livar
13d5e92486 Merge pull request #7215 from rainersigwald/msbuild-15.3.409-for-2.0
MSBuild 15.3.409
2017-07-21 13:36:05 -07:00
Livar
a1f43a6960 Merge pull request #7218 from wli3/sdk-update-070721
Updating SDK to 2.0.0-preview3-20170721-5
2017-07-21 13:25:02 -07:00
William Li
d07a5021ac Updating SDK to 2.0.0-preview3-20170721-5 2017-07-21 12:31:54 -07:00
Livar
6ca8afe223 Merge branch 'release/2.0.0' into msbuild-15.3.409-for-2.0 2017-07-21 12:00:23 -07:00
Livar
cc0dbd3c22 Merge branch 'release/2.0.0' into dev/mlorbe/UpdateToCoherence26412 2017-07-21 11:58:03 -07:00
Livar
429cc2b0c1 Merge pull request #7208 from dotnet-bot/release/2.0.0-UpdateDependencies
Update CoreSetup to preview3-25510-01 (release/2.0.0)
2017-07-21 11:56:27 -07:00
Livar Cunha
a557206a0f Merge remote-tracking branch 'dotnet/release/2.0.0' into merges/release/2.0.0-to-master-20170721-070025
* dotnet/release/2.0.0:
  Revert "Updating SDK to 2.0.0-preview3-20170721-1"
  Updating SDK to 2.0.0-preview3-20170721-1
  Update SdkBrandName
  Insert NuGet Build 4.3.0-rtm-4315 into cli
  Changing the 'coherent' badge value.
2017-07-21 11:29:52 -07:00
Livar Cunha
ab5130d7d9 Revert "Updating SDK to 2.0.0-preview3-20170721-1"
This reverts commit c45fca648c.
2017-07-21 10:17:32 -07:00
Rainer Sigwald
e0ff36ba8e MSBuild 15.3.409 2017-07-21 10:22:52 -05:00
Mike Lorbetske
08d6a0618e Update to coherence 26412 2017-07-20 23:28:49 -07:00
Livar
24a6742dd1 Merge pull request #7207 from dotnet/nuget-insertbuild4315
Insert NuGet Build 4.3.0-rtm-4315 into cli
2017-07-20 21:21:28 -07:00
Livar
c45fca648c Updating SDK to 2.0.0-preview3-20170721-1 2017-07-20 17:49:45 -07:00
dotnet-bot
7108da7170 Update CoreSetup to preview3-25510-01 2017-07-21 00:26:04 +00:00
NuGet Team Bot
6da75e02a4 Insert NuGet Build 4.3.0-rtm-4315 into cli 2017-07-20 12:48:04 -07:00
Livar
58c580dbcc Merge pull request #7201 from dotnet/merges/release/2.0.0-to-master-20170720-070024
Merge release/2.0.0 to master
2017-07-20 11:53:12 -07:00
Livar
f009fa1b1d Merge pull request #7191 from dotnet/merges/release/2.0.0-to-master-20170719-070023
Merge release/2.0.0 to master
2017-07-19 13:14:14 -07:00
Livar
baef48e53b Merge pull request #7193 from mlorbetske/dev/mlorbe/UpdateToCoherence26380
Update to Coherence 26380
2017-07-19 12:16:26 -07:00
Mike Lorbetske
8fe8095970 Update to Coherence 26380 2017-07-19 10:37:19 -07:00
Steve Sanderson
aed35f482d Update SPA templates to 1.0.0-preview-000409 2017-07-19 14:40:15 +01:00
Livar
1728aef325 Merge branch 'master' into merges/release/2.0.0-to-master-20170718-070024 2017-07-18 15:58:34 -07:00
dotnet-bot
33b12c9fe4 Update CoreSetup to preview3-25518-01 2017-07-18 17:36:33 +00:00
Nick Guerrera
16d7104b36 Merge pull request #7180 from dotnet/nguerrera-update-sdk
Update dotnet/sdk to latest
2017-07-17 20:18:21 -07:00
Nick Guerrera
61b2990d62 Merge pull request #7175 from rainersigwald/msbuild-15.3.407-for-2.0
MSBuild 15.3.407
2017-07-17 19:45:17 -07:00
Nick Guerrera
6de76e047b Update dotnet/sdk to latest 2017-07-17 17:03:51 -07:00
Nick Guerrera
b606267b0d Update dotnet/sdk to latest 2017-07-17 16:16:14 -07:00
Nick Guerrera
0b467f1954 Merge pull request #7167 from weshaggard/UpdateNetFxSupportPackage
Update the .NET Framework Support package
2017-07-17 15:58:24 -07:00
Wes Haggard
7eb8260a2f Update the .NET Framework Support package
Need to update in order to get the fix https://github.com/dotnet/corefx/pull/22248
2017-07-17 14:03:58 -07:00
seancpeters
3c4be26876 updating to coherence 26343 & templating build 288 2017-07-17 14:01:01 -07:00
Rainer Sigwald
dd47000924 MSBuild 15.3.407 2017-07-17 15:52:50 -05:00
Nick Guerrera
feec3b7661 Merge pull request #7177 from dotnet/ragrawal-updatenuget4294
update nuget to 4.3.0-rtm-4294
2017-07-17 13:18:59 -07:00
Rohit Agrawal (NUGET)
689148b133 update nuget to 4.3.0-rtm-4294 2017-07-17 12:28:43 -07:00
dotnet-bot
8d0b1e6106 Update CoreSetup to preview3-25516-01 2017-07-16 17:27:22 +00:00
seancpeters
762709d148 updating the template engine version also 2017-07-14 15:45:14 -07:00
seancpeters
48285bafaf Update to Coherence 26318 - templating build 287 2017-07-14 15:28:30 -07:00
dotnet-bot
57ef63f491 Update CoreSetup to preview3-25514-02 2017-07-14 18:07:31 +00:00
Nick Guerrera
db5e7576d0 Merge pull request #7159 from jainaashish/asja-UpdateNuGet-release
Updating NuGet version to 4.3.0-preview4-4273
2017-07-13 16:34:23 -07:00
seancpeters
f762870deb use dotnet/templating build 286 (#7155) 2017-07-13 16:28:37 -07:00