Commit graph

1283 commits

Author SHA1 Message Date
Nick Guerrera
fb7a22a989
Merge branch 'release/2.2.1xx' into merges/release/2.1.4xx-to-release/2.2.1xx 2018-07-22 08:02:02 -07:00
Nick Guerrera
d4d996d771
Merge pull request #9714 from dotnet/merges/release/2.1.4xx-to-release/2.1.401
Merge release/2.1.4xx to release/2.1.401
2018-07-22 08:01:09 -07:00
Andy Gerlicher
b47915414b MSBuild 15.8.166 2018-07-21 22:10:36 -07:00
Brett V. Forsgren
cc7e978bd6 update F# to 10.2.2-rtm-180720-0 2018-07-20 13:52:35 -07:00
Nick Guerrera
e424b949e0
Merge pull request #9703 from dotnet-maestro-bot/release/2.1.4xx-UpdateDependencies
Update roslyn to beta8-63119-10 (release/2.1.4xx)
2018-07-20 12:54:02 -07:00
Nick Guerrera
4a5ca22662
Merge pull request #9707 from dotnet/merges/release/2.1.4xx-to-release/2.2.1xx
Merge release/2.1.4xx to release/2.2.1xx
2018-07-20 11:33:28 -07:00
Nick Guerrera
c6931b75f7
Insert roslyn 2.9.0-beta8-63119-10 2018-07-20 10:21:38 -07:00
Nick Guerrera
13d264a275
Merge pull request #9708 from dotnet/merges/release/2.1.4xx-to-release/2.1.401
Merge release/2.1.4xx to release/2.1.401
2018-07-20 09:58:35 -07:00
Peter Huene
656147725f
Update the .NET SDK version.
Bump the .NET SDK version following the NuGet insertion.
2018-07-19 18:34:25 -07:00
Nick Guerrera
b305c20871
Merge pull request #9694 from dotnet/nuget.client.release-4.8.0.5348-2-1
Insert NuGet Build 4.8.0-rtm.5348 into cli
2018-07-19 16:03:21 -07:00
dotnet-maestro-bot
3e86b9fb76 Update roslyn to beta8-63119-12 2018-07-19 20:54:13 +00: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
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
Kevin Ransom (msft)
7df8a5654f Update FSharp Compiler (#9689) 2018-07-18 17:28:02 -07: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
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
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
a9e44a399a Update dotnet/sdk 2018-07-17 20:16:17 -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
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
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
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
Mike Lorbetske
5fd34dd629 Perform test platform insertion for 15.8 2018-07-16 16:16:40 -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
dotnet-maestro-bot
ed629af9a6 Update coresetup, sdk to preview1-26216-03, servicing-63108-01, respectively (#9635) 2018-07-13 18:48:13 -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
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
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
Daniel Plaisted
53c37522fc
Merge branch 'master' into Updates 2018-07-11 17:53:57 -07:00
jbeisner
f2039c9139 Update 'CLI' and 'Toolset' versions; update 'Toolset' blob location; update build tools package references. 2018-07-11 18:46:24 +00:00
Peter Huene
bf3e772075
Revert version change for ASP.NET bundled templates.
The bundled ASP.NET templates should match the ASP.NET version.

Confusion over versions and missing packages caused a previous commit
to keep the bundled template versions the same while reving the ASP.NET version
from the private branch.

This commit reverts those changes.
2018-07-11 11:17:02 -07:00
abhishkk
8f624131f4 test platform insertion 15.8 rtm 2018-07-11 17:08:03 +05:30
Daniel Plaisted
b44a2bb723 Insert ASP.NET Core 3.0 2018-07-11 02:13:06 -07:00
Peter Huene
0134d4b661
Update dependency versions to 2.1.2.
This also refactors the ASP.NET SDKs to have independent versions from the
ASP.NET version.
2018-07-10 16:42:01 -07:00
William Li
461fd82844 Update MicrosoftNETCoreAppPackageVersion 2018-07-10 14:13:29 -07:00
Andy Gerlicher
50365dec4f MSBuild 15.8.160-preview 2018-07-10 13:37:59 -07:00
William Li
eadd6ead8c Update SDK to 2.1.400-preview-63110-09 2018-07-10 12:53:09 -07:00
NuGet Team Bot
db54427525 Insert NuGet Build 4.8.0-preview5.5328 into cli 2018-07-10 09:36:38 -07:00
Peter Huene
74c4e279e9
Merge pull request #9608 from peterhuene/fx-dep-apphost
Revert implementation of the --mode option for the publish command.
2018-07-09 16:29:37 -07:00
Daniel Plaisted
3e2a16d5db Insert .NET Core 3.0 runtime builds 2018-07-09 13:46:03 -07:00
Peter Huene
d9e8947ff4
Revert implementation of the --mode option for the publish command.
This commit reverts the implementation of the `--mode` option for the `dotnet
publish` command.  A bug in the apphost prevents this feature from working
properly in some cases and there currently is not a mechanism to service it
with this feature.

The team has decided to move this feature to 2.2.1xx for the .NET Core SDK.

Fixes dotnet/sdk#2380.
2018-07-09 12:46:13 -07:00
vramak
85e29304a6 Updating the WebSdk from aspnet/websdk/2.1.4xx 2018-07-05 18:22:54 -07:00
Nick Guerrera
1326c79a5d Merge branch 'release/2.2.1xx' into merges/release/2.1.4xx-to-release/2.2.1xx 2018-06-29 15:25:24 -07:00
Nick Guerrera
21014a5060
Merge branch 'release/2.1.4xx' into merges/release/2.1.3xx-to-release/2.1.4xx 2018-06-29 17:41:11 -04:00
jbeisner
1bcb4f8865 Update the 'Microsoft.DotNet.Archive' version. 2018-06-29 17:11:07 +00:00
Livar
57597e8511
Update SDK to 2.1.400-preview-63027-01 2018-06-26 17:50:41 -07:00
Livar
b5de134c49
Merge pull request #9552 from AndyGerlicher/MSBuild-15.8.136
MSBuild 15.8.138
2018-06-26 14:24:13 -07:00
Andy Gerlicher
58a4fd0285 MSBuild 15.8.138-preview 2018-06-26 12:24:42 -07:00
akharlov
dc3835df84 add nunit project and item templates to bundle 2018-06-26 12:34:13 +05:00
Livar Cunha
e2b679c4bb Merge branch 'master' of /Users/livarcocc/Documents/git/cli into merge_master_cli
* 'master' of /Users/livarcocc/Documents/git/cli: (1063 commits)
  Updating signing project to use new intermediate directory (int).
  Update runtimeconfig.json doc for 2.1 (#9382)
  Shortening the path to the intermediate folder by renaming it to int.
  fix typo (#9364)
  Updating asp.net to 2.2.0 as well.
  Updating the build and tests to work with the 2.2.0 runtime.
  Simplified combining dictionaries in Telemetry
  Fixing 'Channel' and 'BranchName': "release/2.1.4xx" to "master" (#9362)
  Fix extraction of folders (#9335)
  Update Sha256Hasher.cs
  Fix relative path tool path (#9330)
  Insert updated SDK from 2.1.4xx branch
  MSBuild 15.8.60
  Fix crash when user home directory cannot be determined.
  Make `CliFolderPathCalculator` a static class.
  Don't add the ReleaseSuffix to the branding on the CLI when DropSuffix is set to true.
  Add retry when Directory.Move (#9313)
  Override new SdkResult public properties
  Add reference to Microsoft.Build.NuGetSdkResolver
  Disable crossgen for MSBuild inline-task refs
  ...
2018-06-25 22:38:01 -07:00
Livar
ec8fcf3707
Merge pull request #9554 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-06-25 22:14:28 -07:00
Livar
2fed1c07ba Updates asp.net versions to match prodcon
Fixes https://github.com/dotnet/cli/issues/9550
2018-06-25 13:34:59 -07:00
Andy Gerlicher
50c5a5e110 MSBuild 15.8.125-preview 2018-06-22 10:45:22 -07:00
Livar
4757e52adb
Merge pull request #9524 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-06-21 10:53:38 -07:00
Livar
2bc587a615
Merge pull request #9496 from mlorbetske/dev/mlorbe/UpdateTestTemplatesToSdk15.8.0-preview-20180610-02
Update templates to carry test SDK 15.8.0-preview-20180610-02
2018-06-21 10:49:32 -07:00
Kevin Ransom
f0e0e9d51e Align F# with VS2017.8 2018-06-21 00:10:41 -07:00
Livar
5a3e9963f7
Merge pull request #9484 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-06-20 15:15:30 -07:00
Livar
12a1388160
Merge pull request #9494 from dotnet/nuget.client.release-4.8.0.5278-1-1
Insert NuGet Build 4.8.0-preview3.5278 into cli
2018-06-20 15:14:16 -07:00
John Beisner
6afa092018
Merge branch 'release/2.1.4xx' into merges/release/2.1.3xx-to-release/2.1.4xx 2018-06-20 08:43:05 -07:00
Mike Lorbetske
ad47c91c75
Merge branch 'release/2.1.4xx' into dev/mlorbe/UpdateTestTemplatesToSdk15.8.0-preview-20180610-02 2018-06-19 13:13:41 -07:00
Daniel Plaisted
d3787295e2
Merge pull request #9492 from dotnet/vramak/UpdateWebSdkVersion
Updating the WebSdk version for release/2.1.4xx
2018-06-18 11:37:33 -07:00
Mike Lorbetske
cec0b5998e Switch back to the older version of the template package and add the templating MyGet feed 2018-06-15 15:18:30 -07:00
Mike Lorbetske
470370ab76 Bump to a newer package version built by prodcon 2018-06-15 14:44:22 -07:00
William Li
f3f43a7db4
Update SDK to 2.1.400-preview-63014-01 (#9498) 2018-06-15 10:36:47 -07:00
William Li
f66dc4e08b
Merge pull request #9460 from peterhuene/fx-dep-apphost
Implement `mode` option for `dotnet publish`.
2018-06-15 09:40:19 -07:00
Livar
3818426392
Merge pull request #9475 from AndyGerlicher/MSBuild-15.8.101
MSBuild 15.8.101
2018-06-15 09:24:55 -07:00
John Beisner
734a41730a
Fix the 'Microsoft.AspNet.Core.Mvc' versioning (#9491)
* The version of 'Microsoft.AspNetCore.Mvc' should be independent of 'Microsoft.AspNetCore.All'

* Changing "MicrosoftAspNetCoreMvcVersion" to "MicrosoftAspNetCoreMvcPackageVersion" in order to be compatable with ProdCon.
2018-06-14 17:32:24 -07:00
Mike Lorbetske
d396c8bf4e Update templates to carry test SDK 15.8.0-preview-20180610-02 2018-06-14 13:41:15 -07:00
NuGet Team Bot
bf473ad46c Insert NuGet Build 4.8.0-preview3.5278 into cli 2018-06-14 12:57:21 -07:00
vramak
b9a8667dbf Updating the WebSdk version for release/2.1.4xx 2018-06-14 10:43:41 -07:00
John Beisner
89c1500501
Merge branch 'release/2.1.4xx' into merges/release/2.1.3xx-to-release/2.1.4xx 2018-06-13 17:15:24 -07:00
Matt Mitchell
7f29a90635
Update SDK/WebSDK dependencies to 2.1.1 2018-06-13 13:24:47 -07:00
jbeisner
fddf38656a Resolve conflicts: merge 'release/2.1.3xx' to 'release/2.1.4xx' 2018-06-13 17:30:42 +00:00
Matt Mitchell
7f0765eb33
Revert undesired changes 2018-06-12 20:34:32 -07:00
Andy Gerlicher
0a5861d8b2 MSBuild 15.8.101-preview 2018-06-12 19:52:57 -07:00
dotnet-maestro-bot
e45766ca1e Update coresetup, msbuild, nugetclient, roslyn to preview1-26216-03, 15.7.177, preview1.5116, beta6-62923-07, respectively 2018-06-13 02:47:33 +00:00
Peter Huene
bc96902c61
Implement mode option for dotnet publish.
This commit implements a `mode` option that can control how an application is
published with the `dotnet publish` command.

There are three supported modes:

* self-contained: publishes a self-contained application (same as
--self-contained).
* fx-dependent: publishes a framework-dependent application (with an
application host when a runtime is specified).
* fx-dependent-no-exe: publishes a framework-dependent application without an
application host.

The default when publishing without a runtime specified is
`fx-dependent-no-exe`.

The default when publishing with a runtime specified is `self-contained`.

`fx-dependent` requires netcoreapp2.1 or later when a runtime is specified.

The `--self-contained` option is still supported, but is now hidden so that
users will be encouraged to move to the `--mode` option.

Fixes #6237.
2018-06-11 15:43:55 -07:00
dotnet-maestro-bot
9a313bcb64 Update coresetup, coresetup, coresetup to preview1-26609-02, preview1-26609-02, preview1-26609-02, respectively 2018-06-09 17:42:16 +00:00
dotnet-maestro-bot
22f885492b Update coresetup, coresetup, coresetup, roslyn to preview1-26609-01, preview1-26609-01, preview1-26609-01, beta6-62923-07, respectively 2018-06-09 05:44:50 +00:00
jbeisner
6e550e5c25 Update Microsoft.NETCore.App Package Version 2018-06-08 19:12:51 +00:00
Andy Gerlicher
767f569ac3 MSBuild 15.8.86 2018-06-07 10:22:03 -07:00
John Beisner
548ba179f4
Merge pull request #9393 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-06-06 11:52:14 -07:00
Livar
62d968050a
Merge branch 'master' into merges/release/2.1.4xx-to-master 2018-06-06 09:19:05 -07:00
Sarabjot Singh
d99a367db0 Inserting Testplatform 15.8.0-preview-20180605-02 package in dotnet cli 2018-06-06 15:56:55 +05:30
jbeisner
74a7d63e43 Update the version for 'microsoft.netcore.app' to "2.1.1*" 2018-06-05 17:51:19 +00:00
Livar
447bd91100
Merge branch 'master' into merges/release/2.1.4xx-to-master 2018-06-04 11:38:31 -07:00
Livar
77a0f99c94
Merge pull request #9392 from livarcocc/enable_2_2_runtime
Updating the build and tests to work with the 2.2.0 runtime.
2018-06-04 11:05:52 -07:00
NuGet Team Bot
534ae754dd Insert NuGet Build 4.8.0-preview3.5244 into cli 2018-06-04 09:47:36 -07:00
Livar Cunha
33c3a26880 Updating asp.net to 2.2.0 as well. 2018-06-01 13:31:03 -07:00
Daniel Plaisted
c9d457a6b9
Merge pull request #9350 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-05-31 20:09:06 -07:00
Livar Cunha
2f0f270a73 Updating the build and tests to work with the 2.2.0 runtime. 2018-05-31 19:14:24 -07:00
Nate McMaster
276045d957
Set package versions for bundled aspnet tools separately from the metapackage version 2018-05-31 12:39:56 -07:00
Nick Guerrera
81c7f9a3e9
Merge branch 'release/2.1.4xx' into merges/release/2.1.3xx-to-release/2.1.4xx 2018-05-31 11:59:29 -07:00
Nate McMaster
a997650cb4
Split the version of Microsoft.AspNetCore.DeveloperCertificates.XPlat into a separate variable 2018-05-31 11:54:12 -07:00
Nate McMaster
538aa557b0
Upgrade to aspnetcore 2.1.1-rtm-30818 and react to file name change 2018-05-31 10:34:02 -07:00
Andy Gerlicher
29def94d78 MSBuild 15.8.78 2018-05-30 19:59:32 -07:00
Livar Cunha
aeae506fa8 Updating dependency versions to match prodcon. 2018-05-25 12:11:39 -07:00
Daniel Plaisted
d17b088022 Insert updated SDK from 2.1.4xx branch 2018-05-24 16:29:10 -07:00
Rainer Sigwald
48eab9c572 MSBuild 15.8.60 2018-05-24 12:05:52 -05:00
Andy Gerlicher
5e794a064c Add reference to Microsoft.Build.NuGetSdkResolver 2018-05-21 15:29:37 -07:00
Andy Gerlicher
6bed6e1943 MSBuild 15.8.61 2018-05-21 15:29:37 -07:00
Livar
7adbeb3928
Merge pull request #9259 from dotnet/nuget.client.release-4.8.0.5196-1-1
Insert NuGet Build 4.8.0-preview1.5196 into cli
2018-05-19 08:59:59 -07:00
Livar
a45bba7eb9
Merge pull request #9308 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-05-17 15:17:08 -07:00
Livar
d57435bfcd
Merge pull request #9305 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-05-17 11:53:21 -07:00
Livar
8829b9690e
Maintain MSBuild version at 15.7.179 2018-05-17 11:51:36 -07:00
Livar
ded465c666
Merge branch 'release/2.1.3xx' into release/2.1.3xx-UpdateDependencies 2018-05-17 10:37:00 -07:00
John Beisner
d7892663ea
Merge branch 'release/2.1.3xx' into merges/release/2.1.2xx-to-release/2.1.3xx 2018-05-16 14:50:13 -07:00
Jared Parsons
4d3b649efc
Fix version number 2018-05-16 11:04:16 -07:00
John Beisner
b78d591c97
Merge pull request #9284 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-05-16 09:04:53 -07:00
dotnet-maestro-bot
be606951b1 Update clicommandlineparser, climigrate, coresetup, coresetup, coresetup, fsharp, msbuild, roslyn, sdk, templating, templating, templating, websdk to rtm-62915-03, rtm-62915-03, rtm-26515-03, rtm-26515-03, rtm-26515-03, rtm-180515-0, 15.7.177, beta6-62915-07, rtm-62915-10, beta3-20180515-1688254, beta3-20180515-1688254, beta3-20180515-1688254, rtm-20180515-1688249, respectively 2018-05-15 23:49:42 +00:00
Jared Parsons
4e6171401c
Consume 15.7.2 compiler 2018-05-15 12:51:40 -07:00
John Beisner
08b20ef268
Merge pull request #9275 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-05-15 09:17:36 -07:00
Livar
f55724c348
Merge pull request #9276 from dotnet-maestro-bot/release/2.1.3xx-UpdateDependencies
Update clicommandlineparser, climigrate, coresetup, coresetup, coresetup, fsharp, roslyn, sdk, templating, templating, templating, websdk to rtm-62914-01, rtm-62914-02, rtm-26514-02, rtm-26514-02, rtm-26514-02, rtm-180513-0, beta6-62911-06, rtm-62914-01, beta3-20180513-1683966, beta3-20180513-1683966, beta3-20180513-1683966, rtm-20180513-1683962, respectively (release/2.1.3xx)
2018-05-14 21:25:46 -07:00
Livar
8096889442
Merge pull request #9262 from rainersigwald/msbuild-15.7.179-3xx
MSBuild 15.7.179
2018-05-14 09:47:06 -07:00
dotnet-maestro-bot
1fd2a6aa90 Update clicommandlineparser, climigrate, coresetup, coresetup, coresetup, fsharp, roslyn, sdk, templating, templating, templating, websdk to rtm-62914-01, rtm-62914-02, rtm-26514-02, rtm-26514-02, rtm-26514-02, rtm-180513-0, beta6-62911-06, rtm-62914-01, beta3-20180513-1683966, beta3-20180513-1683966, beta3-20180513-1683966, rtm-20180513-1683962, respectively 2018-05-14 15:46:02 +00:00
Rainer Sigwald
85aba00741 MSBuild 15.7.179 2018-05-11 13:30:58 -05:00
Rainer Sigwald
98fa02ade4 MSBuild 15.7.179 2018-05-11 13:15:30 -05:00
NuGet Team Bot
f6be1b1669 Insert NuGet Build 4.8.0-preview1.5196 into cli 2018-05-11 10:36:28 -07:00
Livar
11f2843f7b
Merge pull request #9252 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-05-11 10:16:04 -07:00
abhishkk
b18efcea85 15.8.0-preview-20180510-03 testplatform insertion 2018-05-11 16:11:54 +05:30
Livar
4919ee2484
Merge branch 'release/2.1.3xx' into release/2.1.3xx-UpdateDependencies 2018-05-09 15:42:26 -07:00
John Beisner
da7da0b018
Merge pull request #9227 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-05-09 14:06:02 -07:00
Parallels
3bbab5edbf Updating tests to depend on -upgrade packages and also updating the versions of the runtime and asp.net to versions that have support for upgradable linux packages. 2018-05-08 18:11:54 -07:00
dotnet-maestro-bot
1a8ba89a7f Update clicommandlineparser, climigrate, coresetup, coresetup, coresetup, fsharp, sdk, templating, templating, templating, websdk to rtm-62908-03, alpha-62908-03, rtm-26508-02, rtm-26508-02, rtm-26508-02, rtm-180508-0, rtm-62908-02, beta3-20180508-1667431, beta3-20180508-1667431, beta3-20180508-1667431, rtm-20180508-1667423, respectively 2018-05-09 00:31:48 +00:00
Tanner Gooding
6d6bf64f28 Merge remote-tracking branch 'dotnet/release/2.1.3xx' into merges/release/2.1.3xx-to-release/2.1.4xx 2018-05-07 08:20:23 -07:00
dotnet-maestro-bot
a2f3fb835d Update clicommandlineparser, climigrate, coresetup, coresetup, coresetup, fsharp, roslyn, sdk, templating, templating, templating, websdk to rtm-62905-02, alpha-62905-02, rtm-26505-04, rtm-26505-04, rtm-26505-04, rtm-180505-0, beta6-62904-04, rtm-62905-02, beta3-20180505-1661716, beta3-20180505-1661716, beta3-20180505-1661716, rtm-20180505-1661707, respectively 2018-05-05 20:42:19 +00:00
NuGet Team Bot
817870e977 Insert NuGet Build 4.8.0-preview1.5158 into cli 2018-05-04 10:58:07 -07:00
Tanner Gooding
a8856ddccc Merge remote-tracking branch 'dotnet/release/2.1.2xx' into merges/release/2.1.2xx-to-release/2.1.3xx 2018-05-03 15:24:39 -07:00
Livar
b1b35e4226
Update SDK to latest from 2.1.300
Updating to 1.0.0-rc1-62827-06. There is a bug in the SDK where we are producing packages with the wrong version.
2018-04-27 16:33:52 -07: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
70994ee6dd
Update SDK to 2.1.200-preview-62827-05 2018-04-27 14:06:19 -07:00
dotnet-maestro-bot
4009912a6e Update clicommandlineparser, climigrate, coresetup, coresetup, fsharp, roslyn, sdk, templating, templating, templating, websdk to alpha-62823-01, alpha-62823-01, rc1-26423-06, rc1-26423-06, rtm-180422-0, beta4-62827-02, rc1-62823-01, beta3-20180422-1618305, beta3-20180422-1618305, beta3-20180422-1618305, rc1-20180422-1618307, respectively 2018-04-27 15:48:19 +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
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
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
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
jbeisner
247937665f Fix a release/2.1.3xx baseline error:
error NU1605: Detected package downgrade: Microsoft.NETCore.App from 2.1.0-rc1-26423-06 to 2.1.0-rc1-26420-08
2018-04-24 20:57:42 +00:00
John Beisner
754a68524a
Merge branch 'release/2.1.3xx' into FixLinuxMusl 2018-04-24 13:31:46 -07:00
jbeisner
70e3f1d30d Updating the AspNetCore version to a drop that has a 'linux-musl' asset 2018-04-24 19:51:04 +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
0b885eee23
Update to ASP.NET Core 2.0.8 build 10026 2018-04-23 20:02:08 -07:00
John Luo
441a470f54 Add bundled aspnetcore runtime framework versions
- Add integration test for implicit Microsoft.AspNetCore.App versions
2018-04-23 00:33:33 -07:00
Nate McMaster
68add55652
Update to ASP.NET Core 2.0.8 build 10024 2018-04-20 16:52:01 -07:00
Livar
53068bb65e
Merge pull request #9115 from dotnet/nuget.client.release-5122-1-1
Insert NuGet Build 4.7.0-rtm.5122 into cli
2018-04-20 16:27:19 -07:00
Livar
6d9a4f1c65
Update SDK to 2.1.200-preview-62820-08 2018-04-20 15:21:46 -07:00
Livar
dc088918f9
Merge pull request #9106 from dotnet/merges/release/2.1.1xx-to-release/2.1.2xx
Merge release/2.1.1xx to release/2.1.2xx
2018-04-20 15:12:18 -07:00
Wes Haggard
1e30cf3b5f Add temporary feed to boot-strap linux-musl build 2018-04-20 14:11:06 -07:00
NuGet Team Bot
205f58496f Insert NuGet Build 4.7.0-rtm.5122 into cli 2018-04-20 13:09:19 -07:00
Livar
c60ca4c76a
Merge pull request #9093 from dotnet/update_roslyn
Update Roslyn to 2.8.0-dev-62817-01
2018-04-19 13:32:49 -07:00
Livar
04c02b0200
Merge pull request #9019 from mlorbetske/dev/mlorbe/UpdateTestTemplatesFor20To157RTW
Update test templates to use the 15.7.0 test SDK
2018-04-19 12:56:21 -07:00
dotnet-maestro-bot
8317c6f0da Update clicommandlineparser, climigrate, coresetup, coresetup, coresetup, fsharp, msbuild, nugetclient, roslyn, sdk, templating, templating, templating, websdk to alpha-62819-01, alpha-62819-01, rc1-26419-02, rc1-26419-02, rc1-26419-02, rtm-180418-0, preview-000169, preview1.5116, dev-62819-05, preview3-62819-01, beta3-20180418-1607235, beta3-20180418-1607235, beta3-20180418-1607235, rc1-20180418-1607241, respectively 2018-04-19 19:40:52 +00:00
Nate McMaster
f729fad293
Fix the aspnetcore dependency on .rpm and .deb installers 2018-04-18 22:49:21 -07:00
Livar
3c344c2f83
Update Roslyn to 2.8.0-dev-62817-01 2018-04-18 12:03:42 -07:00
Livar
83d150e87b
Update SDK to 2.1.200-preview-62816-05 2018-04-16 10:38:21 -07:00
NuGet Team Bot
6a3419cedd Insert NuGet Build 4.7.0-rtm.5104 into cli 2018-04-13 14:03:00 -07:00
NuGet Team Bot
0ed1ffb8dd Insert NuGet Build 4.7.0-rtm.5096 into cli 2018-04-13 10:44:27 -07:00
Livar
fef4ae58af
Update SDK to 2.1.200-preview-62812-03 2018-04-11 22:23:35 -07:00
Daniel Plaisted
c01e4f07b8
Merge pull request #9053 from dsplaisted/update-nuget
Insert NuGet Build 4.7.0-rtm.5081 into cli
2018-04-11 16:48:20 -07:00
NuGet Team Bot
a86d529687 Insert NuGet Build 4.7.0-rtm.5081 into cli 2018-04-11 13:58:39 -07:00
Livar
7cd9176ac0
Merge branch 'master' into merges/release/2.1.3xx-to-master 2018-04-11 12:05:59 -07:00
Livar
f31e8d26d6
Merge pull request #9045 from AndyGerlicher/MSBUild-15.7.163
MSBuild 15.7.163
2018-04-11 12:03:53 -07:00
dotnet-maestro-bot
98e8857f1f Update coresetup, coresetup, coresetup, roslyn to preview3-26411-06, preview3-26411-06, preview3-26411-06, beta4-62811-05, respectively 2018-04-11 17:46:24 +00:00
John Beisner
11eace08b9
Merge branch 'master' into merges/release/2.1.3xx-to-master 2018-04-11 09:30:34 -07:00
John Beisner
a543dd3084
Merge pull request #9034 from dotnet/merges/release/2.1.1xx-to-release/2.1.2xx
Merge release/2.1.1xx to release/2.1.2xx
2018-04-11 09:27:10 -07:00
Livar
1581af4503
Merge pull request #9040 from dotnet/nuget.client.release-5081-1-1
Insert NuGet Build 4.7.0-rtm.5081 into cli
2018-04-10 16:35:08 -07:00
Andy Gerlicher
51214d02b1 MSBuild 15.7.163 2018-04-10 15:59:50 -07:00
NuGet Team Bot
d43718d444 Insert NuGet Build 4.7.0-rtm.5081 into cli 2018-04-10 08:49:48 -07:00
dotnet-maestro-bot
1135ea6869 Update clicommandlineparser, climigrate, coresetup, coresetup, coresetup, fsharp, msbuild, roslyn, sdk, templating, templating, templating, websdk to alpha-62806-05, alpha-62806-04, preview2-26406-04, preview2-26406-04, preview2-26406-04, rtm-180406-0, preview-000145, beta4-62806-08, preview2-62806-04, beta3-20180406-1563557, beta3-20180406-1563557, beta3-20180406-1563557, preview2-20180406-1563552, respectively 2018-04-09 20:17:41 +00:00
Nate McMaster
1860d43323
Update to ASP.NET Core 2.0.7 build 231 2018-04-09 12:14:47 -07:00
Eric Erhardt
fbd5154ba4 Fix merge to only update core-setup and Roslyn versions. 2018-04-09 10:40:14 -05:00
Eric Erhardt
47bda58a23
Merge branch 'master' into master-UpdateDependencies 2018-04-09 10:30:10 -05:00
Mike Lorbetske
8370f24850 Update test templates to use the 15.7.0 test SDK 2018-04-08 11:57:30 -07:00
dotnet-maestro-bot
936cc73ef2 Update CoreSetup, CoreSetup, CoreSetup, Roslyn to preview3-26406-06, preview3-26406-06, preview3-26406-06, beta4-62806-08, respectively 2018-04-06 17:53:37 +00:00
Kevin Ransom
8fa1c8230b Align dotnetcli with VS2017.4 compiler 2018-04-06 10:52:34 -07:00
Livar
7cb7535bae
Merge branch 'master' into merges/release/2.1.3xx-to-master 2018-04-06 09:05:57 -07:00
Eric Erhardt
a6cf823b9c
Merge pull request #9000 from dotnet-maestro-bot/master-UpdateDependencies
Update CoreSetup, CoreSetup, CoreSetup, Roslyn to preview3-26405-02, preview3-26405-02, preview3-26405-02, beta4-62805-01, respectively (master)
2018-04-06 09:18:59 -05:00
Nick Guerrera
4956bfea8c
Merge pull request #8996 from nguerrera/publish-no-build
Implement `dotnet publish --no-build`
2018-04-05 23:43:02 -07:00
Livar
d8eed7963e
Merge branch 'master' into master-UpdateDependencies 2018-04-05 15:32:36 -07:00
Livar
6179a01514
Merge pull request #9006 from dotnet/update_sdk
Updating SDK to 2.1.200-preview-62805-05
2018-04-05 15:30:46 -07:00
Livar
c43ea1458e
Merge pull request #9005 from livarcocc/merge_1xx_into_2xx
Merge release/2.1.1xx into release/2.1.2xx
2018-04-05 13:26:10 -07:00
dotnet-maestro-bot
921c3849e2 Update CoreSetup, CoreSetup, CoreSetup, Roslyn to preview3-26405-02, preview3-26405-02, preview3-26405-02, beta4-62805-01, respectively 2018-04-05 17:40:43 +00:00
Livar
d0aca6fb7b
Updating SDK to 2.1.200-preview-62805-05 2018-04-05 09:43:20 -07:00
Livar Cunha
2e2a8d6179 Merge branch 'release/2.1.1xx' into merge_1xx_into_2xx
* release/2.1.1xx:
  Fixing another typo in that is breaking RHEL.
  Fix a typo in the rpm.targets when testing the rpm generated packages.
  Update to aspnet 2.0.7 build 230
  Producing an empty commit to trigger a rebuild of the CLI
  Fix AspNetCoreRuntimeBuildDropFeed to use CoreSetupBlobRootUrl
  Adding a work around for publishing self-contained apps to RIDs that are not available for Microsoft.NETCore.App 2.0.0.
  Reverse the order in which old runtime stores are listed
  Update to ASP.NET Core 2.0.7 build 228
  Moving the opensuse 43.2 docker file to the right folder.
  Updating the CLI branding to 2.1.105, to go over the 104 release we will have to do for NuGet. Also, fixed the branding of the runtime in our installers to 2.0.7.
  Updating the runtime to 2.0.7 and the CLI branding to 2.1.104.
  Update SDK to 2.1.100-preview-62730-07
  Add msbuild myget.org feed
  MSBuild 15.6.84

 Conflicts:
	build/Branding.props
	build/DependencyVersions.props
	build/NugetConfigFile.targets
	build/Version.props
	packaging/osx/clisdk/resources/cs.lproj/conclusion.html
	packaging/osx/clisdk/resources/de.lproj/conclusion.html
	packaging/osx/clisdk/resources/en.lproj/conclusion.html
	packaging/osx/clisdk/resources/es.lproj/conclusion.html
	packaging/osx/clisdk/resources/fr.lproj/conclusion.html
	packaging/osx/clisdk/resources/it.lproj/conclusion.html
	packaging/osx/clisdk/resources/ja.lproj/conclusion.html
	packaging/osx/clisdk/resources/ko.lproj/conclusion.html
	packaging/osx/clisdk/resources/pl.lproj/conclusion.html
	packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html
	packaging/osx/clisdk/resources/ru.lproj/conclusion.html
	packaging/osx/clisdk/resources/tr.lproj/conclusion.html
	packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html
	packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html
	packaging/windows/clisdk/bundle.wxl
2018-04-05 09:40:35 -07:00
Livar
4c948fefcc
Merge branch 'master' into merges/release/2.1.3xx-to-master 2018-04-05 09:09:45 -07:00
Livar Cunha
364ee996bf Fixing another typo in that is breaking RHEL. 2018-04-04 22:43:37 -07:00
Nick Guerrera
b6174af511 Implement dotnet publish --no-build 2018-04-04 15:03:29 -07:00
dotnet-maestro-bot
69c380765c Update clicommandlineparser, climigrate, coresetup, coresetup, coresetup, fsharp, msbuild, nugetclient, roslyn, sdk, templating, templating, templating, websdk to alpha-62803-03, alpha-62803-04, preview2-26403-06, preview2-26403-06, preview2-26403-06, rtm-180403-0, preview-000144, preview4.5065, beta4-62803-03, preview2-62803-07, beta3-20180403-1549505, beta3-20180403-1549505, beta3-20180403-1549505, preview2-20180403-1549509, respectively 2018-04-04 21:31:25 +00:00
dotnet-maestro-bot
ffc1d286a1 Update Roslyn to beta4-62804-05 2018-04-04 19:47:16 +00:00
Livar
334ac4f4f3
Merge branch 'release/2.1.3xx' into release/2.1.3xx-UpdateDependencies 2018-04-04 10:18:12 -07:00