Commit graph

8935 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
John Luo
f388933ebb Set Default aspnetcore metapackage versions 2018-05-30 17:45:17 -07:00
Livar
d250d075be
Merge pull request #9348 from livarcocc/update_dependencies
Update dependencies and branding
2018-05-25 14:51:18 -07:00
Livar Cunha
99462b9e7a Updating branding to 2.1.301. 2018-05-25 12:12:22 -07:00