Commit graph

7640 commits

Author SHA1 Message Date
Peter Huene
ce512c767f
Merge branch 'release/2.1.2xx' into release/2.1.2xx-MSRC
* release/2.1.2xx:
  Update Installer build to create both old and new package identities
  Bring back old package IDs
  Update VS Insertion NuGet package IDs in Installer.MSI.targets
  Update VS insertion package name for x86 package
  Update VS insertion package name for x64 package
2018-06-25 22:42:03 -07:00
John Luo
816173b6ae Merged PR 129095: Update to aspnet 2.0.9-rtm-10030 2018-06-20 23:50:59 +00:00
John Luo
dc2fefdc99 Update to aspnet 2.0.9-rtm-10030 2018-06-20 16:47:45 -07:00
Will Godbe
07241a3fe0 Merged PR 129043: Bump runtime versions to 2.0.9 stable 2018-06-20 21:45:26 +00:00
wtgodbe
e46c410acc Bump runtime versions to 2.0.9 stable 2018-06-20 14:36:27 -07:00
Daniel Plaisted
90fc9fb59f
Merge pull request #9473 from dsplaisted/update-vs-insertion-package-name
Update VS insertion package name
2018-06-15 13:15:29 -07:00
Nate McMaster
3601d6eb5e Merged PR 127892: [2.1.2xx-MSRC]: Update to aspnet 2.0.9-rtm-10029
Expect at least one more update as this is not the final build (it depends on .NET Core 2.0.9-servicing-26612-03)

FYI - @<John Luo> @<mgirgin>
2018-06-15 18:05:22 +00:00
Livar Cunha
04f285629d Updated the expected implicit NETStandard.Library to 2.0.3 2018-06-14 18:32:26 +00:00
Daniel Plaisted
bcbfbffced Update Installer build to create both old and new package identities 2018-06-13 18:25:59 -07:00
Daniel Plaisted
80f143dd08 Bring back old package IDs 2018-06-13 17:59:54 -07:00
Nate McMaster
5f3ad071ec
Update to aspnet 2.0.9-rtm-10029 2018-06-13 14:49:35 -07:00
Peter Huene
d89b4b74d5 Merged PR 127666: Update runtime to 2.0.9. 2018-06-13 00:20:23 +00:00
Daniel Plaisted
ac9b4579ce Update VS Insertion NuGet package IDs in Installer.MSI.targets 2018-06-12 16:05:04 -07:00
Daniel Plaisted
4ef09279d2 Update VS insertion package name for x86 package 2018-06-12 15:55:49 -07:00
Daniel Plaisted
1d12ea7f1e Update VS insertion package name for x64 package 2018-06-12 15:55:16 -07:00
Peter Huene
0bd478b31e
Update the runtime branding to 2.0.9.
This commit updates the runtime branding to 2.0.9.
2018-06-12 15:33:25 -07:00
wtgodbe
725814c601
Update runtime versions in 2.0.0 2018-06-12 15:31:30 -07:00
Peter Huene
d2c91c3539 Merged PR 127596: Update CLI branding to 2.1.202.
Update CLI branding to 2.1.202.

This commit updates the CLI branding to 2.1.202.
2018-06-12 22:26:19 +00:00
Peter Huene
922ba14142
Update CLI branding to 2.1.202.
This commit updates the CLI branding to 2.1.202.
2018-06-12 12:07:09 -07:00
Peter Huene
0461d619af Merged PR 126571: Merge from public upstream release/2.1.2xx
Merge from public upstream release/2.1.2xx
2018-06-06 17:32:48 +00:00
Peter Huene
e7b77268f5
Merge branch 'release/2.1.2xx' into release/2.1.2xx-MSRC
* release/2.1.2xx:
  Updating netci.groovy to archive test results on failure.
  Fix version number
  Consume 15.7.2 compiler
  Updating the CLI branding to 201.
  MSBuild 15.7.179
2018-06-06 10:26:51 -07:00
Livar
5bf135011f
Merge pull request #9307 from tannergooding/release/2.1
Updating netci.groovy to archive test results on failure.
2018-05-19 09:14:55 -07:00
Tanner Gooding
46403a5966 Updating netci.groovy to archive test results on failure. 2018-05-17 13:52:51 -07:00
Livar
7932dc6179
Merge pull request #9283 from dotnet/jaredpar-patch-1
Consume 15.7.2 compiler
2018-05-16 11:58:14 -07:00
Jared Parsons
4d3b649efc
Fix version number 2018-05-16 11:04:16 -07:00
Jared Parsons
4e6171401c
Consume 15.7.2 compiler 2018-05-15 12:51:40 -07:00
Livar
e03cda9838
Merge pull request #9264 from livarcocc/update_branding_201
Updating the CLI branding to 201.
2018-05-11 14:50:28 -07:00
Livar Cunha
fb41e73046 Updating the CLI branding to 201. 2018-05-11 12:33:12 -07:00
Livar
a62a902e01
Merge pull request #9261 from rainersigwald/msbuild-15.7.179-2xx
MSBuild 15.7.179 (2xx)
2018-05-11 12:30:11 -07:00
Rainer Sigwald
98fa02ade4 MSBuild 15.7.179 2018-05-11 13:15:30 -05:00
John Beisner
327b692b77
Merge pull request #9242 from dotnet/merges/release/2.1.2xx-MSRC-to-2.1.2xx
CLI:release/2.1.2xx-MSRC to CLI:release/2.1.2xx
2018-05-09 14:55:57 -07:00
John Beisner
2edba8d7f1 Merged PR 119486: Refresh release/2.1.2xx-MSRC with 'dotnet' release/2.1.2xx
Merge update to release/2.1.2xx-MSRC from 'dotnet' release/2.1.2xx

New SDK version.
2018-04-27 22:08:51 +00:00
jbeisner
6fcea14b78 Merge remote-tracking branch 'upstream/release/2.1.2xx' into release/2.1.2xx-MSRC 2018-04-27 22:05:24 +00:00
Livar
b390c9805e
Merge pull request #9166 from dotnet/update_sdk_2xx
Update SDK to 2.1.200-preview-62827-05
2018-04-27 15:02:00 -07:00
Livar
70994ee6dd
Update SDK to 2.1.200-preview-62827-05 2018-04-27 14:06:19 -07:00
John Beisner
bb56baa8c1 Merged PR 119247: Refresh release/2.1.2xx-MSRC with 'dotnet' release/2.1.2xx
Merge update to release/2.1.2xx-MSRC from 'dotnet' release/2.1.2xx
2018-04-26 22:55:26 +00:00
jbeisner
55535c0f41 Merge remote-tracking branch 'upstream/release/2.1.2xx' into release/2.1.2xx-MSRC 2018-04-26 22:51:04 +00:00
Livar
b794743c76
Merge pull request #9155 from dotnet/update_sdk_2xx
Update SDK to 2.1.200-preview-62826-08
2018-04-26 15:38:55 -07:00
Livar
fc577e6b05
Update SDK to 2.1.200-preview-62826-08 2018-04-26 14:12:42 -07:00
Livar
20574d2e7b
Merge pull request #9147 from AndyGerlicher/MSBuild-15.7.177-2xx
MSBuild 15.7.177 (2xx)
2018-04-26 13:21:31 -07:00
Livar
af62bffb45
Merge pull request #9133 from dotnet/nuget.client.release-5148-1-1
Insert NuGet Build 4.7.0-rtm.5148 into cli
2018-04-26 13:21:04 -07:00
Andy Gerlicher
a4cc9fa5e0 MSBuild 15.7.177 2018-04-25 20:39:14 -07:00
John Beisner
14bdc6a1ba Merged PR 118861: Refresh release/2.1.2xx-MSRC with 'dotnet' release/2.1.2xx
Merge update to release/2.1.2xx-MSRC from 'dotnet' release/2.1.2xx
2018-04-25 18:40:33 +00:00
jbeisner
8ff0797b10 Merge remote-tracking branch 'upstream/release/2.1.2xx' into release/2.1.2xx-MSRC 2018-04-25 18:34:16 +00:00
Livar
e17cc69763
Merge pull request #9134 from dotnet/update_roslyn_2xx
Update Roslyn to 2.8.0-beta4-62824-10
2018-04-24 16:57:11 -07:00
Livar
a711c264f1
Update Roslyn to 2.8.0-beta4-62824-10 2018-04-24 16:00:33 -07:00
NuGet Team Bot
458ad92d49 Insert NuGet Build 4.7.0-rtm.5148 into cli 2018-04-24 14:50:13 -07:00
John Beisner
c115d048f7 Merged PR 118577: Refresh release/2.1.2xx-MSRC with 'dotnet' release/2.1.2xx
Pulling in: https://github.com/dotnet/cli/pull/9096 and other updates to release/2.1.2xx

Please review DependencyVersions.props
2018-04-24 18:12:28 +00:00
jbeisner
36d7cdf8c1 Merge remote-tracking branch 'upstream/release/2.1.2xx' into release/2.1.2xx-MSRC 2018-04-24 17:51:56 +00:00
Nate McMaster
2d59528389 Merged PR 118480: Update to ASP.NET Core 2.0.8 build 10026
Update to ASP.NET Core 2.0.8 build 10026.

FYI @<Stephen Halter> - includes your latest Kestrel changes.
2018-04-24 14:54:42 +00:00