Commit graph

8967 commits

Author SHA1 Message Date
Peter Huene
751976cbbe
Merge pull request #9633 from peterhuene/merge-2.1.3xx-msrc
Merge release/2.1.3xx-MSRC to release/2.1.3xx
2018-07-10 18:25:05 -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
Peter Huene
6c411e824b
Merge branch 'release/2.1.3xx-MSRC' into release/2.1.3xx
* release/2.1.3xx-MSRC:
  Updates asp.net versions to match prodcon
  Change the implicit asp.net core version for FDD apps to be pinned as 2.1.1.
  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
  Fixup myget feed for aspnetcore
  Upgrade to aspnetcore 2.1.1-rtm-30818 and react to file name change
  Updated Version.props
2018-07-10 10:43:47 -07:00
John Beisner
460788c91a
Removing 'Locked-file' test; CLI:release/2.1.3xx (#9604)
* Removing 'Locked-file' test: ItFailsInLessThanOneSecondWhenTheProjectAssetsJsonDoesNotExist
2018-07-03 16:23:35 +00:00
Matt Mitchell
9048955601 Merged PR 130771: Updates asp.net versions to match prodcon
- If this PR should not run tests please add text "skip[REMOVE_THIS]ci[REMOVE_THIS]please" (remove the marked text, no quotes).
- Please add description for changes you are making.
- If there is an issue related to this PR, please add the reference.
2018-07-02 16:18:23 +00:00
Livar
dd83b0c2b3 Updates asp.net versions to match prodcon
Fixes https://github.com/dotnet/cli/issues/9550
2018-07-02 09:16:55 -07:00
John Beisner
dbca58f8b7
Merge pull request #9588 from johnbeisner/UpdateMicrosoftDotNetArchiveVersion
Update the 'Microsoft.DotNet.Archive' version.
2018-06-29 18:43:07 +00:00
jbeisner
1bcb4f8865 Update the 'Microsoft.DotNet.Archive' version. 2018-06-29 17:11:07 +00:00
Livar
2a1f1c6d30
Merge pull request #9551 from dotnet/update_asp_net_versions
Updates asp.net versions to match prodcon
2018-06-25 15:55:06 -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
William Li
5218c4bcf5
Pass BaseIntermediateOutputPath via xml (#9509)
Instead of command line to avoid escaping problem.

It can support most of the character including surrogate char. It cannot
support semicolon. However, semicolon is not allow to be part of the
user name.

Port 2.1.4xx fix 0251f677ede571b61a47ca24f38df8e09038277d while keep
BaseIntermediateOutputPath instead of MsBuildProjectExtensionsPath to
minimize the change.
2018-06-24 11:32:44 -07:00
John Beisner
dc2443ca74
Fix the CI legs; CLI:release/2.1.3xx (#9535)
* Linux-musl command should be derived from "baseShellBuildCommand" not "buildCommand"; setting 'DropSuffix' in the environment.
2018-06-22 13:45:53 -07:00
John Beisner
f882376933
Adding 'NoSuffix' legs to the CI (#9502)
* Adding 'NoSuffix' legs to the CI

* Fixing typo...

* Updates per code review...

* "openSUSE 43.2" should be "openSUSE 42.3"; fixing 'netci.groovy' command formation logic.
2018-06-21 12:00:28 -07:00
Daniel Plaisted
189e90e18d
Merge pull request #9505 from dotnet/merges/release/2.1.2xx-to-release/2.1.3xx
Merge release/2.1.2xx to release/2.1.3xx
2018-06-20 16:42:04 -07:00
jbeisner
4402dfb684 Revert "Merge remote-tracking branch 'origin/release/2.1.2xx' into merges/release/2.1.2xx-to-release/2.1.3xx"
This reverts commit 40be59f753, reversing
changes made to 734a41730a.
2018-06-20 22:11:00 +00:00
jbeisner
40be59f753 Merge remote-tracking branch 'origin/release/2.1.2xx' into merges/release/2.1.2xx-to-release/2.1.3xx 2018-06-20 22:01:12 +00:00
Daniel Plaisted
90fc9fb59f
Merge pull request #9473 from dsplaisted/update-vs-insertion-package-name
Update VS insertion package name
2018-06-15 13:15:29 -07:00
Livar Cunha
cfc9d947b4 Merged PR 128266: Change the implicit asp.net core version for FDD apps to be pinned as 2.1.1.
Change the implicit asp.net core version for FDD apps to be pinned as 2.1.1.
2018-06-15 17:46:15 +00:00
Livar Cunha
bdcc3b4c87 Change the implicit asp.net core version for FDD apps to be pinned as 2.1.1. 2018-06-15 10:33:54 -07:00
John Beisner
f97e9e82e9 Merged PR 128197: Recent fixes; merge release/2.1.3xx into release/2.1.3xx-MSRC
Including in this merge:

https://github.com/dotnet/cli/pull/9495
The "pack" command under 'buildCrossTargeting' for 'Microsoft.DotNet.MSBuildSdkResolver' now throws a "NU5104" warning/error because the SDK stage0 was changed to "2.1.300" [change was intended].
Impact: package failure for Linux-x64, Linux-arm, and Linux-arm64

https://github.com/dotnet/cli/pull/9491
The version of 'Microsoft.AspNetCore.Mvc' should be independent of 'Microsoft.AspNetCore.All'
Impact: RazorApp test failure in all legs except for Linux-arm and Linux-arm64
2018-06-15 00:47:08 +00: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
Matt Mitchell
612c9c87bb
Merge pull request #9495 from johnbeisner/AddBackNoWarn
Add global NoWarn for: 'NU5104'
2018-06-14 15:11:33 -07:00
jbeisner
c0c445be04 Updating the 'NoWarn' comments. 2018-06-14 21:12:46 +00:00
jbeisner
4050c6374f The "pack" command under 'buildCrossTargeting' for 'Microsoft.DotNet.MSBuildSdkResolver' now throws a "NU5104" warning/error because the SDK stage0 was changed to "2.1.300" [change was intended]. 2018-06-14 20:31:09 +00:00
Daniel Plaisted
bcbfbffced Update Installer build to create both old and new package identities 2018-06-13 18:25:59 -07:00
Daniel Plaisted
80f143dd08 Bring back old package IDs 2018-06-13 17:59:54 -07:00
Livar Cunha
d4a70a4854 Merged PR 127887: Merge release/2.1.3xx into release/2.1.3xx-MSRC 2018-06-13 21:34:20 +00: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
John Beisner
24f83b0417
Merge pull request #9470 from johnbeisner/UpdateBranchInfo
Correcting the 'Channel' and 'BranchName' to "release/2.1.3xx"
2018-06-13 09:54:20 -07:00
Matt Mitchell
7f0765eb33
Revert undesired changes 2018-06-12 20:34:32 -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
Daniel Plaisted
ac9b4579ce Update VS Insertion NuGet package IDs in Installer.MSI.targets 2018-06-12 16:05:04 -07:00
Daniel Plaisted
4ef09279d2 Update VS insertion package name for x86 package 2018-06-12 15:55:49 -07:00
Daniel Plaisted
1d12ea7f1e Update VS insertion package name for x64 package 2018-06-12 15:55:16 -07:00
jbeisner
af6b9ab12e Correct the 'Channel' and 'BranchName' to "release/2.1.3xx" 2018-06-12 22:15:53 +00:00
Peter Huene
b7eb74ff6b Merged PR 126597: Merge from upstream release/2.1.3xx
Merge from upstream release/2.1.3xx

Note: this conflicted with several cherry-picked commits that were already present in release/2.1.3xx-MSRC.
2018-06-12 17:36:06 +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
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
Livar
f13c4a2c5c
Merge pull request #9444 from johnbeisner/UnblockUbuntuCI
Unblock Ubuntu x64 Jenkins CI Leg
2018-06-09 10:23:25 -07: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
Livar
a8396b53e1
Merge pull request #9430 from johnbeisner/DropTheLzma
Drop the LZMA archive for every build
2018-06-07 10:21:28 -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
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
Matt Mitchell
27ae13af80 Merged PR 126473: Port Pass "PB_AssetRootUrl" explictly on the MSBuild call and fix two tests #9421
Porting Pass "PB_AssetRootUrl" explictly on the MSBuild call and fix two tests #9421 from GitHub
2018-06-06 00:35:05 +00:00
Matt Mitchell
41d2418bfb Update expected versions to 2.1.2 2018-06-05 17:32:01 -07:00
jbeisner
2e7e6950e2 Disable NewProjectRestoresCorrectPackageVersion "console" test for now. 2018-06-05 17:30:44 -07:00