Commit graph

8938 commits

Author SHA1 Message Date
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
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
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
Livar
59524873d6
Merge pull request #9421 from johnbeisner/FixProdConIssues
Pass "PB_AssetRootUrl" explictly on the MSBuild call and fix two tests
2018-06-05 14:26:41 -07:00
jbeisner
79b4809559 Disable NewProjectRestoresCorrectPackageVersion "console" test for now. 2018-06-05 18:25:07 +00: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
Matt Mitchell
6a39ef5c7b Merged PR 126122: Fix alpine file ownership issues with newer docker
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).
2018-06-04 18:41:13 +00:00
Matt Mitchell
05348ce78f
Merge pull request #9416 from mmitche/fix-alpine-legs
Fix alpine file ownership issues with newer docker
2018-06-04 11:36:36 -07:00
Matt Mitchell
9ff4188d48 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).
2018-06-04 10:36:54 -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
William Li
42cd5fd055
Merge pull request #9402 from wli3/port-2.1.3-Add-retry-when-Directory.Move
Port 2.1.3xx add retry when directory.move
2018-06-01 12:44:01 -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
William Li
ea539c7f63 Add retry when Directory.Move (#9313) 2018-06-01 11:22:03 -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
Nate McMaster
4eaf45ba85 Fix mismatch of dotnet-watch with package variable name 2018-05-31 19:31:34 -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
9e9fe6d5ee
Merge pull request #9380 from natemcmaster/cleanup
Upgrade to aspnetcore 2.1.1-rtm-30818 and react to file name change
2018-05-31 19:21:29 -07:00
Nate McMaster
1386aa28e1
Fix mismatch of dotnet-watch with package variable name 2018-05-31 14:44:29 -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
Nate McMaster
a997650cb4
Split the version of Microsoft.AspNetCore.DeveloperCertificates.XPlat into a separate variable 2018-05-31 11:54:12 -07:00
Livar Cunha
348a6a7428 Merged PR 125617: Updated the CLI branding to 2.1.302
Updated the CLI branding to 2.1.302
2018-05-31 18:27:22 +00:00
Livar Cunha
8a315605e1 Updated Version.props 2018-05-31 18:18:43 +00:00
Nate McMaster
0fa8657fb1
Fixup myget feed for aspnetcore 2018-05-31 11:07:55 -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