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
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
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
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
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
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