Commit graph

9412 commits

Author SHA1 Message Date
Nick Guerrera
0304b4ec0d
Merge pull request #9697 from dotnet/merges/release/2.1.4xx-to-release/2.2.1xx
Merge release/2.1.4xx to release/2.2.1xx
2018-07-19 10:21:56 -07:00
Nick Guerrera
9d07296cd3
Merge pull request #9704 from dotnet/merges/release/2.1.4xx-to-release/2.1.401
Merge release/2.1.4xx to release/2.1.401
2018-07-19 10:21:12 -07:00
Nick Guerrera
c45905a1c9
Merge pull request #9695 from johnbeisner/FixRPMInstallErrors
Fix RPM install errors; CLI:release/2.2.1xx
2018-07-18 21:56:36 -07:00
Nick Guerrera
d71eb98fde
Merge branch 'release/2.2.1xx' into merges/release/2.1.4xx-to-release/2.2.1xx 2018-07-18 21:52:01 -07:00
William Li
96636458e5
Passing _NETCoreAppPackageVersion as BundledNETCoreAppPackageVersion(#9702) 2018-07-18 21:18:27 -07:00
Kevin Ransom (msft)
7df8a5654f Update FSharp Compiler (#9689) 2018-07-18 17:28:02 -07:00
jbeisner
2fc95c3efa Use "SharedFxRpmPackageFileVersion" for the SharedFxRpmPackageName 2018-07-18 22:52:57 +00:00
NuGet Team Bot
fec9b448b6 Insert NuGet Build 4.8.0-rtm.5348 into cli 2018-07-18 15:07:01 -07:00
Nick Guerrera
74cdff42c7
Merge pull request #9677 from dotnet/merges/release/2.1.4xx-to-release/2.2.1xx
Merge release/2.1.4xx to release/2.2.1xx
2018-07-18 15:04:47 -07:00
jbeisner
99f83a8053 Use the full version as the RPM package names for the runtime and ASP.NET runtime. 2018-07-18 22:02:00 +00:00
Nick Guerrera
b72fe967d2
Merge pull request #9682 from dotnet/nguerrera/insert-roslyn
Insert 15.8 Roslyn into CLI 2.1.400
2018-07-18 14:36:10 -07:00
Nick Guerrera
6cb14e1821
Merge pull request #9684 from nguerrera/fix-update-dependencies
Pin stage0 used for update-dependencies to stable 2.1 build
2018-07-18 14:07:28 -07:00
Nick Guerrera
2f40e6dc83
Merge pull request #9685 from dotnet/merges/release/2.1.4xx-to-release/2.1.401
Merge release/2.1.4xx to release/2.1.401
2018-07-18 14:06:45 -07:00
Nick Guerrera
5180269487 Insert latest 15.8 Roslyn build that is also in VS (2.9.0-beta8-63115-02) 2018-07-18 13:12:58 -07:00
Nick Guerrera
222b1675af Disable failing tests against bugs 2018-07-18 12:13:40 -07:00
Nick Guerrera
69b727745a
Pin stage0 in update-dependencies.sh 2018-07-18 10:51:40 -07:00
Nick Guerrera
f58902c0d7 Pin stage0 used for update-dependencies to stable 2.1 build 2018-07-18 10:15:37 -07:00
Nick Guerrera
3a19d2212e
Merge pull request #9673 from mlorbetske/dev/mlorbe/InsertTestPlatformFor158
Perform test platform insertion for 15.8
2018-07-18 10:03:50 -07:00
Nick Guerrera
8578825de1
Merge pull request #9683 from dotnet/nguerrera/update-sdk
Update dotnet/sdk [2.1.4xx]
2018-07-18 10:03:28 -07:00
Nick Guerrera
a9e44a399a Update dotnet/sdk 2018-07-17 20:16:17 -07:00
Nick Guerrera
d650a0278d Update XLF 2018-07-17 18:24:34 -07:00
Nick Guerrera
ceffacfef8 Merge branch 'release/2.2.1xx' into merges/release/2.1.4xx-to-release/2.2.1xx 2018-07-17 18:17:04 -07:00
Nick Guerrera
ce2c412a18
Update dotnet/sdk 2018-07-17 18:07:31 -07:00
Nick Guerrera
cdffcec1f1
Merge pull request #9681 from dotnet/merges/release/2.1.4xx-to-release/2.1.401
Merge release/2.1.4xx to release/2.1.401
2018-07-17 18:01:04 -07:00
Nick Guerrera
0544859047
Merge pull request #9675 from dotnet/merges/release/2.1.4xx-to-release/2.1.401
Merge release/2.1.4xx to release/2.1.401
2018-07-17 11:16:01 -07:00
John Beisner
adc11f6599
Merge pull request #9679 from johnbeisner/FixNewtonsoftJsonVersion
Updating the version of Newtonsoft.Json: 10.0.3
2018-07-17 10:56:12 -07:00
Satya Madala
a88a82734f Add tests for Code coverage with dotnet test (#9355)
Add tests for dotnet test --collect "Code Coverage" scenario.

Fixes Microsoft/vstest#981.
2018-07-17 09:54:10 -07:00
jbeisner
64959648b2 Updating the version of Newtonsoft.Json: 10.0.3 2018-07-17 16:02:57 +00:00
Peter Huene
96140a756d
Merge 'release/2.1.4xx' into release/2.1.401
* release/2.1.4xx: (23 commits)
  Revert version change for ASP.NET bundled templates.
  Update dependency versions to 2.1.2.
  Update to ASP.NET Core 2.0.9 build 10031
  Updates asp.net versions to match prodcon
  Update to aspnet 2.0.9-rtm-10030
  Bump runtime versions to 2.0.9 stable
  Change the implicit asp.net core version for FDD apps to be pinned as 2.1.1.
  Updated the expected implicit NETStandard.Library to 2.0.3
  Update to aspnet 2.0.9-rtm-10029
  Update the runtime branding to 2.0.9.
  Update runtime versions in 2.0.0
  Update CLI branding to 2.1.202.
  Update expected versions to 2.1.2
  Disable NewProjectRestoresCorrectPackageVersion "console" test for now.
  Update the version for 'microsoft.netcore.app' to "2.1.1*"
  Pass "PB_AssetRootUrl" explictly on the MSBuild call; we are looking for Microsoft.NETCore.App "2.1.0" or "2.1.1*"
  Merged PR 126122: Fix alpine file ownership issues with newer docker
  Fix mismatch of dotnet-watch with package variable name
  Set package versions for bundled aspnet tools separately from the metapackage version
  Split the version of Microsoft.AspNetCore.DeveloperCertificates.XPlat into a separate variable
  ...
2018-07-17 00:30:18 -07:00
Peter Huene
05d4305fbe
Merge pull request #9674 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-07-17 00:17:18 -07:00
John Beisner
ba14bf27ef
Merge pull request #9575 from dotnet/merges/release/2.1.4xx-to-release/2.2.1xx
Merge release/2.1.4xx to release/2.2.1xx
2018-07-16 18:55:16 -07:00
Peter Huene
df6f316da5
Merge branch 'release/2.1.3xx' into release/2.1.4xx
* release/2.1.3xx:
  Revert version change for ASP.NET bundled templates.
  Update to ASP.NET Core 2.0.9 build 10031
  Update to aspnet 2.0.9-rtm-10030
  Bump runtime versions to 2.0.9 stable
  Updated the expected implicit NETStandard.Library to 2.0.3
  Update to aspnet 2.0.9-rtm-10029
  Update the runtime branding to 2.0.9.
  Update runtime versions in 2.0.0
  Update CLI branding to 2.1.202.
2018-07-16 17:04:27 -07:00
jbeisner
67abf5c634 'Warn and Continue' on the DEB removal errors. 2018-07-16 23:35:41 +00:00
Mike Lorbetske
5fd34dd629 Perform test platform insertion for 15.8 2018-07-16 16:16:40 -07:00
jbeisner
d8735024f9 Use the full version as the DEB package names for the runtime and ASP.NET runtime. 2018-07-16 22:52:41 +00:00
jbeisner
782c4401d4 Back to "sudo dpkg -r" with ContinueOnError="WarnAndContinue" 2018-07-16 20:51:02 +00:00
jbeisner
f378070c25 Replace the "sudo dpkg -r” command with a more encompassing: “sudo apt-get purge -y”. 2018-07-16 19:52:12 +00:00
John Beisner
e0b2c83a80
Merge pull request #9641 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-07-16 12:24:18 -07:00
John Beisner
85d732a5a1
Merge branch 'release/2.1.4xx' into merges/release/2.1.3xx-to-release/2.1.4xx 2018-07-16 08:17:58 -07:00
John Beisner
d46cddd64d
Merge pull request #9666 from dotnet/merges/release/2.1.4xx-to-release/2.1.401
Merge release/2.1.4xx to release/2.1.401
2018-07-16 08:15:39 -07:00
Nick Guerrera
51728a9594
Merge pull request #9663 from dsplaisted/insert-sdk
Insert updated dotnet/sdk
2018-07-13 19:43:14 -07:00
Nick Guerrera
02c19ad945 Revert tests for feature that is about to be reverted by merge
The mode switch tests are failing as they hit the 2.2.1xx branch
because we don't have a dotnet/sdk with the needed support for
it. Since the feature is reverted in release/2.1.4xx anyway, revert
the tests ahead of time to match release/2.1.4xx (modulo s/2.1/2.2/)
2018-07-13 19:19:37 -07:00
dotnet-maestro-bot
ed629af9a6 Update coresetup, sdk to preview1-26216-03, servicing-63108-01, respectively (#9635) 2018-07-13 18:48:13 -07:00
Nick Guerrera
7a1d28d5ec
Merge pull request #9662 from dotnet/merges/release/2.1.4xx-to-release/2.1.401
Merge release/2.1.4xx to release/2.1.401
2018-07-13 18:46:17 -07:00
Daniel Plaisted
999e1d1382 Insert updated .NET Core SDK
Completes the round-trip of the 4.8.0-preview5.5328 NuGet insertion
2018-07-13 18:11:34 -07:00
Nick Guerrera
423b718bea Temporarily disable part of self-contained roll-forward test 2018-07-13 16:55:23 -07:00
Nick Guerrera
35496cfe41 Fix incorrect merge 2018-07-13 16:52:54 -07:00
Nick Guerrera
6a9870a1bd
Merge pull request #9625 from AndyGerlicher/MSBuild-15.8.155
MSBuild 15.8.160-preview
2018-07-13 15:01:20 -07:00
Nick Guerrera
bce49a0686
Merge pull request #9645 from abhishkk/testplatfrominsertion15.8rtm1
Test platform insertion 15.8 RTM
2018-07-13 15:00:21 -07:00
Peter Huene
38a94f824e
Merge pull request #9653 from v-zbsail/loc_20180711_release_2.1.4xx
LOC CHECKIN | dotnet/cli release/2.1.4xx | 20180712
2018-07-13 13:49:37 -07:00