Commit Graph

36506 Commits

Author SHA1 Message Date
Doug Bunting 579341c8d6
Merge branch 'master' into merge/release/2.2-to-master 2018-10-30 21:08:15 -07:00
Doug Bunting c74a945dda
Convert `RouteValueDictionary` values to `string` using `CultureInfo.InvariantCulture` (#8674)
* Convert `RouteValueDictionary` values to `string` using `CultureInfo.InvariantCulture`
- #8578
- user may override this choice in one case:
  - register a custom `IValueProviderFactory` to pass another `CultureInfo` into the `RouteValueProvider`
- values are used as programmatic tokens outside `RouteValueProvider`

nits:
- take VS suggestions in changed classes
- take VS suggestions in files I had open :)
2018-10-30 20:09:17 -07:00
Ryan Nowak c6a910419d
Merge pull request #2694 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-10-30 18:32:41 -07:00
Ryan Nowak 41fa3ff3eb Add Razor.Workspaces to non-shipping in NPV
Putting this package where it belongs in the NPV list. This package only
ships with our other tooling-only packages.

(cherry picked from commit 9d314071dc)
2018-10-30 18:04:11 -07:00
Nate McMaster c629400a73
Fix syntax error caused by bad merge on build/dependencies.props 2018-10-30 17:28:41 -07:00
Nate McMaster 908a8b3013
Merge branch 'release/2.2' 2018-10-30 17:18:22 -07:00
Nate McMaster eb79d8f75e
Remove the EventNotification submodule 2018-10-30 17:10:11 -07:00
Nate McMaster 973edeb29f
List linux-arm64 as a supported RID (#3769) 2018-10-30 17:08:33 -07:00
Hao Kung da9318f431
Block enabled 2fa in the UI without cookie consent (#2035)
* Block enabled 2fa in the UI without cookie consent

* Guard against feature not being there

* Set up tweak

* Fix
2018-10-30 16:23:55 -07:00
BrennanConroy 36ca210a65 [Java] Add null ref test for websocket 2018-10-30 15:43:43 -07:00
Nate McMaster 9b98b5679a
Merge branch 'release/2.2' 2018-10-30 15:43:15 -07:00
BrennanConroy 46a3d7e342 Merge branch 'release/2.2' of https://github.com/DHosseiny/SignalR into DHosseiny-release/2.2 2018-10-30 15:43:10 -07:00
Justin Kotalik 370490d2a3
Fix master package verison (#1565) 2018-10-30 15:31:03 -07:00
Nate McMaster 4c9c4a5cc8
Merge branch 'release/2.2' 2018-10-30 15:22:50 -07:00
Chris Ross (ASP.NET) 3e08bf8833 Move tests to net472 2018-10-30 15:18:52 -07:00
Pavel Krymets 6603f41677 Fix tests that were mocking ILogger (#3066) 2018-10-30 15:15:55 -07:00
Ajay Bhargav Baaskaran 970dbfd9d5 Resolve bad merge 2018-10-30 15:14:07 -07:00
Nate McMaster a705aae147
Merge branch 'release/2.1' into release/2.2 2018-10-30 15:07:46 -07:00
Chris Ross (ASP.NET) 2451b68ca0 Rewrite Listener.ResponseSendFileTests 2018-10-30 14:58:23 -07:00
Ajay Bhargav Baaskaran a80f145c6b Merge branch 'release/2.2' 2018-10-30 14:56:09 -07:00
Nate McMaster 9405d058fa
Merge branch 'release/2.1' into release/2.2 2018-10-30 14:54:51 -07:00
Pranav K 734b919b02 Respect SuppressInferBindingSourcesForParameters
Fixes https://github.com/aspnet/Mvc/issues/8657
2018-10-30 14:37:21 -07:00
Pranav K 3dcf5a04b8 Remove Microsoft.AspNetCore.Razor.Design 2018-10-30 14:30:23 -07:00
Pranav K 0bd6d135c1 Move targets, rzc and extension assembly in to the Sdk 2018-10-30 14:30:20 -07:00
ASP.NET CI a0fdca9a78 Updating BuildTools from 2.1.3-rtm-15833 to 2.1.3-rtm-15834
[auto-updated: buildtools]
2018-10-30 14:14:50 -07:00
BrennanConroy c9600ac2d4
[Java] Log invocation binding failures (#3160) 2018-10-30 13:49:43 -07:00
Pranav K 16b15fcb2a
Merge pull request #8672 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-10-30 13:33:07 -07:00
Piotr Wosiek af6527dcef Fix XML doc on HttpMethodAttribute and derived ones 2018-10-30 13:21:15 -07:00
Ajay Bhargav Baaskaran 8e62dbcae9 Change testing strategy for build server shutdown test 2018-10-30 13:20:33 -07:00
Pranav K be53aa9cac Remove skipped test
Fixes https://github.com/aspnet/AspNetCore/issues/3597
2018-10-30 13:15:06 -07:00
Hao Kung 93799664bb
Merge pull request #2031 from dotnet-maestro-bot/merge/release/2.2-to-master 2018-10-30 12:57:29 -07:00
John Luo d05ef9be3a Merge branch 'release/2.2' 2018-10-30 12:50:46 -07:00
Chris Ross (ASP.NET) 7974467dc9 Cleanup server limits tests #472 #476 #469 2018-10-30 12:35:26 -07:00
Filip W 187e89f6f0 Do not throw a null reference from request.GetDisplayUrl() (#1057) 2018-10-30 12:32:26 -07:00
Ajay Bhargav Baaskaran 0948660e8c Merge branch 'release/2.2' 2018-10-30 12:07:04 -07:00
ASP.NET CI 6b894d9c28 Updating submodule(s)
EntityFrameworkCore => 69e54addd48783e2219a239b2c03933b48e83071

[auto-updated: submodules]
2018-10-30 12:04:26 -07:00
ASP.NET CI dec1ef91b4 Updating submodule(s)
Diagnostics => 3e6b3a0067
EntityFrameworkCore => 19f7304271b8586629afba2edde16c25eaef4589
Hosting => d7b9fd4807
Logging => b1e18f01e94a06414c610312b01d5a5f8f5d6220
Mvc => 4015c9863e
Razor => 6c1bee1940
ServerTests => 3fb2949b51
SignalR => e0f547e211

[auto-updated: submodules]
2018-10-30 12:04:14 -07:00
Nate McMaster d7b9fd4807
Update TFM to include netcoreapp3.0 2018-10-30 11:26:46 -07:00
Nate McMaster 969fb9bf48
Update projects in src/Framework/ to netcoreapp3.0 2018-10-30 10:41:24 -07:00
Arthur Vickers 21135444c5
Mark cosmos as ship again for 3.0 (#3749) 2018-10-30 09:49:27 -07:00
ASP.NET CI 50cc4fa178 Updating submodule(s)
Diagnostics => 4c94bc272b
EntityFrameworkCore => cdc92acdc172a4fb4a822e924b475dd4e54f621f
SignalR => 73f2f19984

[auto-updated: submodules]
2018-10-30 00:05:02 -07:00
BrennanConroy e0f547e211
Merge pull request #3226 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-10-29 19:41:42 -07:00
Ryan Nowak 3e6b3a0067
Merge pull request #521 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-10-29 17:03:14 -07:00
John Luo e958d82584 Add more chrome test logging
- fix an issue with tests running as root on VSTS
2018-10-29 16:56:10 -07:00
BrennanConroy 73f2f19984
[Java] API level support down to 23 2018-10-29 16:53:47 -07:00
Nate McMaster 1756f17337
Merge branch 'release/2.2' 2018-10-29 16:49:45 -07:00
Nate McMaster 97dc5852a2
Suppress warning NU5125 about upcoming deprecation of PackageLicenseUrl (#3758) 2018-10-29 16:45:04 -07:00
Ryan Nowak 4c94bc272b Rename anti-caching option
- Renamed the property for configuration response caching headers
- Renamed the options class to avoid conflicts with other type names

Fixes https://github.com/aspnet/Diagnostics/issues/509
2018-10-29 16:44:45 -07:00
Nate McMaster 5e4166f940
Merge branch 'release/2.2' 2018-10-29 16:05:19 -07:00
Nate McMaster 89700b9644
docs: Minor tweaks to documentation on the shared framework 2018-10-29 15:45:48 -07:00