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
Livar Cunha
f643067869
Merge branch 'release/2.1.3xx' into merge_release_213xx
...
* release/2.1.3xx:
Update SDK/WebSDK dependencies to 2.1.1
Revert undesired changes
Update coresetup, msbuild, nugetclient, roslyn to preview1-26216-03, 15.7.177, preview1.5116, beta6-62923-07, respectively
Correct the 'Channel' and 'BranchName' to "release/2.1.3xx"
2018-06-13 14:31:26 -07:00
Livar
769f81938e
Merge pull request #9474 from dotnet-maestro-bot/release/2.1.3xx-UpdateDependencies
...
Update coresetup, msbuild, nugetclient, roslyn to preview1-26216-03, 15.7.177, preview1.5116, beta6-62923-07, respectively (release/2.1.3xx)
2018-06-13 14:18:49 -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
jbeisner
af6b9ab12e
Correct the 'Channel' and 'BranchName' to "release/2.1.3xx"
2018-06-12 22:15:53 +00:00
Peter Huene
c0eff4fa56
Merge branch 'release/2.1.3xx' into release/2.1.3xx-MSRC
...
* release/2.1.3xx:
Updating the CLI stage0 to 2.1.300 and fixing some build failures.
Update Microsoft.NETCore.App Package Version
Formatting...
Drop the LZMA archive for every build.
2018-06-12 10:31:56 -07: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
Livar
9ab03e695e
Merge pull request #9446 from livarcocc/update_stage0
...
Updating the CLI stage0 to 2.1.300 and fixing some build failures.
2018-06-09 17:09:08 -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
Livar Cunha
15e6928b02
Updating the CLI stage0 to 2.1.300 and fixing some build failures.
2018-06-08 16:03:24 -07: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
jbeisner
7f5ab825be
Formatting...
2018-06-06 23:15:52 +00:00
jbeisner
7a0d2c8f0c
Drop the LZMA archive for every build.
2018-06-06 23:08:38 +00: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
Peter Huene
90bcdff150
Merge branch 'release/2.1.3xx' into release/2.1.3xx-MSRC
...
* release/2.1.3xx:
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*"
Fix alpine file ownership issues with newer docker Upgrades to a newer docker version (18.03.1-ce) caused files created inside to be owned by root on alpine. It appears that the logic to set up the user in the container so that this doesn't happen was missing from alpine. While it's not clear why it worked before at all, the logic has been duplicated (tweaked for the alpine base image).
Remove -upgrade suffix from installer inputs
Ensure default aspnetcore metapackage versions doesn't jump when/if we ever get to version `2.1.10`
Add retry when Directory.Move (#9313 )
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
Fixup myget feed for aspnetcore
Upgrade to aspnetcore 2.1.1-rtm-30818 and react to file name change
Set Default aspnetcore metapackage versions
2018-06-06 11:12:05 -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
Livar
670dcedba2
Merge pull request #9381 from dotnet/merges/release/2.1.4xx-to-master
...
Merge release/2.1.4xx to master
2018-06-05 22:45:53 -07:00
jbeisner
5541529bbe
Update the version for 'microsoft.netcore.app' to "2.1.1*"
2018-06-05 17:30:34 -07:00
jbeisner
fec5f38b93
Pass "PB_AssetRootUrl" explictly on the MSBuild call; we are looking for Microsoft.NETCore.App "2.1.0" or "2.1.1*"
2018-06-05 17:28:32 -07:00
jbeisner
74a7d63e43
Update the version for 'microsoft.netcore.app' to "2.1.1*"
2018-06-05 17:51:19 +00:00
jbeisner
0015821db6
Pass "PB_AssetRootUrl" explictly on the MSBuild call; we are looking for Microsoft.NETCore.App "2.1.0" or "2.1.1*"
2018-06-05 16:51:32 +00:00
Livar Cunha
625b9d4963
Updating signing project to use new intermediate directory (int).
2018-06-04 13:06:02 -07: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
Matt Mitchell
9db1b6d3b9
Merge pull request #9406 from mmitche/upgradeable-installers
...
Remove -upgrade suffix from installer inputs
2018-06-03 20:25:44 -07:00
Livar
7f6c09bad1
Merge pull request #9374 from dotnet/johluo/default-aspnetcore-versions
...
Set Default aspnetcore metapackage versions
2018-06-03 14:37:19 -07:00
Matt Mitchell
c078dda8c7
Remove -upgrade suffix from installer inputs
2018-06-03 08:45:34 -07:00
Livar Cunha
78c7f5af5b
Shortening the path to the intermediate folder by renaming it to int.
2018-06-01 15:46:22 -07:00
Livar Cunha
33c3a26880
Updating asp.net to 2.2.0 as well.
2018-06-01 13:31:03 -07:00
Nate McMaster
e9a1bd434a
Ensure default aspnetcore metapackage versions doesn't jump when/if we ever get to version 2.1.10
2018-06-01 12:01:42 -07:00
Livar Cunha
a75367aa4e
Merged PR 125797: Cherry picking change to not use -upgrade packages for asp.net
2018-06-01 16:48:20 +00: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
Nate McMaster
74d81ad253
Set package versions for bundled aspnet tools separately from the metapackage version
2018-05-31 19:31:28 -07:00
Nate McMaster
aad98ed7ff
Split the version of Microsoft.AspNetCore.DeveloperCertificates.XPlat into a separate variable
2018-05-31 19:31:23 -07:00
Nate McMaster
e00b935e07
Fixup myget feed for aspnetcore
2018-05-31 19:31:17 -07:00
Nate McMaster
79e5822e32
Upgrade to aspnetcore 2.1.1-rtm-30818 and react to file name change
2018-05-31 19:31:09 -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
Daniel Plaisted
da77c12682
Merge pull request #9386 from dsplaisted/clear-disabled-package-sources
...
Clear disabled package sources in generated NuGet.config
2018-05-31 16:55:52 -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
Daniel Plaisted
0bb66a5e28
Clear disabled package sources in generated NuGet.config
...
This will help prevent the repo being broken if you have the same feeds set up in your global NuGet.config but have them disabled
2018-05-31 12:04:23 -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