Commit graph

8901 commits

Author SHA1 Message Date
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
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
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 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
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
Livar Cunha
aeae506fa8 Updating dependency versions to match prodcon. 2018-05-25 12:11:39 -07:00
Livar
adab45bf0c
Merge pull request #9329 from livarcocc/fix_branding_drop_suffix
Don't add the ReleaseSuffix to the branding on the CLI
2018-05-22 13:15:31 -07:00
Livar Cunha
6dfa6af7d6 Don't add the ReleaseSuffix to the branding on the CLI when DropSuffix is set to true. 2018-05-22 10:45:11 -07:00
John Beisner
fc33e5ddc6
Merge pull request #9318 from dotnet/merges/release/2.1.2xx-to-release/2.1.3xx
Merge release/2.1.2xx to release/2.1.3xx
2018-05-21 09:24:15 -07:00
Livar
5bf135011f
Merge pull request #9307 from tannergooding/release/2.1
Updating netci.groovy to archive test results on failure.
2018-05-19 09:14:55 -07:00
Tanner Gooding
46403a5966 Updating netci.groovy to archive test results on failure. 2018-05-17 13:52:51 -07:00
Livar
8a9b0a7df4
Merge pull request #9287 from dotnet-maestro-bot/release/2.1.3xx-UpdateDependencies
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 (release/2.1.3xx)
2018-05-17 13:41:54 -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
Livar
484a1f6743
Merge pull request #9298 from dotnet/merges/release/2.1.2xx-to-release/2.1.3xx
Merge release/2.1.2xx to release/2.1.3xx
2018-05-17 10:34:38 -07:00
Livar
35c71afb8e
Merge pull request #9300 from livarcocc/no_suffix_tests_full_framework
Add the NoWarn option when producing Cli.Utils for full framework as well
2018-05-16 21:35:16 -07:00
Livar Cunha
491ec16307 Add the NoWarn option when producing Cli.Utils for full framework as well. 2018-05-16 15:33:19 -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
Matt Mitchell
32f29b6eb9
Merge pull request #9297 from livarcocc/fix_no_suffix_tests
Add NoWarn=NU5104 when packaging Cli.Utils for tests.
2018-05-16 14:07:53 -07:00
Livar Cunha
2531e3a136 Add NoWarn for the stable package depending on non-stable package when packaging Cli.Utils for tests. 2018-05-16 12:44:23 -07:00
Livar
7932dc6179
Merge pull request #9283 from dotnet/jaredpar-patch-1
Consume 15.7.2 compiler
2018-05-16 11:58:14 -07:00
Jared Parsons
4d3b649efc
Fix version number 2018-05-16 11:04:16 -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
55698edb41
Merge pull request #9280 from dotnet/merges/release/2.1.2xx-to-release/2.1.3xx
Merge release/2.1.2xx to release/2.1.3xx
2018-05-15 10:20:43 -07:00
John Beisner
1dac17868f
Merge branch 'release/2.1.3xx' into merges/release/2.1.2xx-to-release/2.1.3xx 2018-05-15 08:37:21 -07:00
Livar
2c9eaca455
Merge pull request #9251 from dotnet/merges/release/2.1.2xx-to-release/2.1.3xx
Merge release/2.1.2xx to release/2.1.3xx
2018-05-14 21:26:03 -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
Matt Mitchell
f9712c4ca0
Merge pull request #9278 from mmitche/drop-suffix-boolean
Accept DropSuffix as a boolean
2018-05-14 15:47:28 -07:00
Matt Mitchell
1aae04f316 Accept DropSuffix as a boolean 2018-05-14 13:43:09 -07:00
Livar
ada66f2896
Reverting the asp.net store changes as they are not needed for 3xx 2018-05-14 10:44:26 -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
Peter Huene
59a27df531
Merge pull request #9267 from peterhuene/fix-test-verbosity
Fix incorrect default VSTest verbosity level.
2018-05-11 23:17:05 -07:00
Peter Huene
1feaa0385a
Fix incorrect default VSTest verbosity level.
Commit 10289504a8 changed the default verbosity
option used for MSBuild from `-v:quiet` to `-verbosity:quiet`.  This triggered a
match that was being done against arguments starting with `-verbosity` to
forward the value to VSTest via the `VSTestVerbosity` property.  The result is
that VSTest is using a default verbosity of `quiet`, suppressing error output
that users expect to see.

The fix is to change the check to only match against user-supplied options.
The default level the command uses for MSBuild is not forwarded to VSTest.

Fixes #9229.
2018-05-11 20:03:24 -07:00
Livar
e03cda9838
Merge pull request #9264 from livarcocc/update_branding_201
Updating the CLI branding to 201.
2018-05-11 14:50:28 -07:00
Livar
fb18c670fc
Merge pull request #9232 from dotnet-maestro-bot/release/2.1.3xx-UpdateDependencies
Update clicommandlineparser, climigrate, coresetup, coresetup, coresetup, fsharp, sdk, templating, templating, templating, websdk to rtm-62908-03, alpha-62908-03, rtm-26508-02, rtm-26508-02, rtm-26508-02, rtm-180508-0, rtm-62908-02, beta3-20180508-1667431, beta3-20180508-1667431, beta3-20180508-1667431, rtm-20180508-1667423, respectively (release/2.1.3xx)
2018-05-11 14:34:16 -07:00
Livar Cunha
fb41e73046 Updating the CLI branding to 201. 2018-05-11 12:33:12 -07:00
Livar
a62a902e01
Merge pull request #9261 from rainersigwald/msbuild-15.7.179-2xx
MSBuild 15.7.179 (2xx)
2018-05-11 12:30:11 -07:00