Commit graph

9663 commits

Author SHA1 Message Date
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
John Beisner
ae08a294c9
Merge pull request #31 from johnbeisner/FixSDKVersions
Updating the SDK version directory: Core-SDK
2018-07-17 13:28:03 -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
Nick Guerrera
bae3a775c3
Remove LKG download left over from cross-repo merges (#25)
core-sdk does not need to download an LKG to run tests as it is the
top repo that builds the entire SDK. This file was left over from
cli and causing problems for source build.
2018-07-17 10:47:32 -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
d88a7ce337 The SDK-version directory under the SDK directory should match the advertised SDK version. 2018-07-17 16:40:52 +00: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
Daniel Plaisted
46524ae70a
Merge pull request #9630 from dotnet/nuget.client.release-4.8.0.5328-1-1
Insert NuGet Build 4.8.0-preview5.5328 into cli
2018-07-13 13:33:42 -07:00
John Beisner
56d34499f4
Update ASP.NET version; Core-SDK (#30)
* Add an 'AllLinux' build and package CI leg.
* Update ASP.NET version.
* Remove the 'patch' number for the parameter: "sudo dpkg --ignore-depends=dotnet-runtime-X.X"
* Update variable name.
* Update coresetup, coresetup, coresetup, roslyn versions.
* Use "CONFIGURATION" not "BuildConfiguration"; "CONFIGURATION" has a "debug" default.
* 'AllLinux' CI legs and build only; no tests.
2018-07-12 16:20:39 -07:00
John Beisner
58d141a378
Merge pull request #9634 from dotnet/merges/release/2.1.2xx-to-release/2.1.3xx
Merge release/2.1.2xx to release/2.1.3xx
2018-07-12 16:00:43 -07:00
Peter Huene
b483d9b4f3
Fix test failure due to smart quotes.
Replacing the smart quotes in the translation with `"` to fix a test failure.

This is the only translation for the `DotnetCliHomeUsed` key containing the
smart quotes.
2018-07-12 14:23:18 -07:00
Peter Huene
3bdb615439
Fix translations for latest changes in release/2.1.4xx.
Unfortunately, a change went in after the loc deadline that reverted a previous
change to `src/dotnet/commands/dotnet-publish/LocalizableStrings.resx`.  The
change was to put back the `SelfContainedOptionDescription` key.

Because translation occurred without this key in the resx file, so simply running
the `UpdateXlf` target would cause `SelfContainedOptionDescription` to show up
as "new" without any translations.

I've manually fixed the translations for this key to restore the previous
translation state, which was "needs review" because of small changes that were
made to the string much earlier in 2.1.4xx development.  This way at least the
old translations which are only slightly out of date are restored, rather than
having no translations at all.
2018-07-12 13:11:42 -07:00
Daniel Plaisted
75a5ed3ab2
Merge pull request #9622 from dotnet/merges/release/2.1.4xx-to-release/2.1.401
Merge release/2.1.4xx to release/2.1.401
2018-07-12 11:44:19 -07:00
Peter Huene
789423b469
Merge branch 'release/2.1.4xx' into release/2.1.401
* release/2.1.4xx:
  Add XSLT Transform for apphost (#9609)
  Update date test according to MicrosoftNETSdkPackageVersion update
  Update MicrosoftNETCoreAppPackageVersion
  Update SDK to 2.1.400-preview-63110-09
  Revert implementation of the --mode option for the publish command.
  Updating the WebSdk from aspnet/websdk/2.1.4xx
  Removing 'Locked-file' test; CLI:release/2.1.3xx (#9604)
  Log a verbose message when DOTNET_CLI_HOME is being used.
2018-07-12 10:32:16 -07:00
Zbyněk Sailer
dba04728cb LOC CHECKIN | dotnet/cli release/2.1.4xx | 20180712 2018-07-12 16:38:31 +02:00
Daniel Plaisted
9dad822199
Merge pull request #28 from dsplaisted/update-version-to-3.0
Update version numbers to 3.0, fix branch info
2018-07-11 18:49:50 -07:00
Daniel Plaisted
7f841e0bc6 Update version numbers to 3.0, fix branch info 2018-07-11 18:28:19 -07:00
Daniel Plaisted
7fb0ccccc8
Merge pull request #26 from johnbeisner/Updates
Update 'CLI' and 'Toolset' versions; update 'Toolset' blob location
2018-07-11 18:16:42 -07:00
Daniel Plaisted
53c37522fc
Merge branch 'master' into Updates 2018-07-11 17:53:57 -07:00
Daniel Plaisted
fdc5366c80
Merge pull request #22 from dsplaisted/insert-netcoreapp3.0
Insert .NET Core 3.0 Runtime
2018-07-11 17:51:28 -07:00
Daniel Plaisted
cf4a81a583 Temporarily disable creating Debian packages
https://github.com/dotnet/core-sdk/issues/27
2018-07-11 17:27:46 -07:00
Peter Huene
dcb83030e9
Merge branch 'release/2.1.2xx' into release/2.1.3xx
* release/2.1.2xx:
  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-11 16:52:47 -07:00
Daniel Plaisted
73ec338775 Remove -upgrade suffix from deb and rpm installer filenames 2018-07-11 14:37:39 -07:00