Commit graph

1132 commits

Author SHA1 Message Date
dotnet-maestro-bot
7d37fb3c14 Update coresetup, coresetup to preview1-26813-02, preview1-26813-02, respectively 2018-08-13 17:50:20 +00:00
jbeisner
1262aac3b5 Update Toolset version to 3.0.100-alpha1-009349 2018-08-06 22:29:19 +00:00
Daniel Plaisted
cc2a2998e3 Clean up dependency versions that aren't needed after repo refactoring 2018-07-31 18:31:02 -07:00
Nick Guerrera
2c46d9d042 Update toolset and align stage0 version 2018-07-30 17:09:14 -07:00
Nick Guerrera
46f0cbfd76 Fix merge error 2018-07-30 17:09:14 -07:00
Nick Guerrera
29d3640768 Merge remote-tracking branch 'cli/release/2.2.1xx' into merge-cli/release/2.2.1xx-to-core-sdk/master 2018-07-27 14:47:38 -07:00
Nick Guerrera
63747aaba1
Merge pull request #9720 from dotnet/merges/release/2.1.4xx-to-release/2.2.1xx
Merge release/2.1.4xx to release/2.2.1xx
2018-07-22 18:27:13 -07:00
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
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
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
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
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
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
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
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