Commit Graph

36925 Commits

Author SHA1 Message Date
dotnet-maestro-bot 312f653f8f Upgrade to .NET Core 3.0.0-preview1-26907-01 (#1388) 2018-09-07 09:03:30 -07:00
Doug Bunting 30274c29e5 Merge branch 'release/2.2' 2018-09-07 09:00:25 -07:00
Pavel Krymets ca1c0ea354
Merge pull request #1377 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-09-07 09:00:21 -07:00
gqqnbig fd80509fef LocalizedHtmlString.Value doesn't include arguments (#8376)
* Clarify that Value is prior to formatting with any constructor arguments
2018-09-07 08:58:52 -07:00
gqqnbig 99d277ae51 LocalizedHtmlString.Value doesn't include arguments (#8376)
* Clarify that Value is prior to formatting with any constructor arguments
2018-09-07 08:54:53 -07:00
Andrii Kurdiumov 6546c55f4c Removal of global.json from the template
I remove only global.json from the template, and leave global.json in the repository root, since it is required for the build.
See #1324
2018-09-07 12:44:52 +01:00
ASP.NET CI d65d531c93 Updating submodule(s)
Hosting => 5543d29af1

[auto-updated: submodules]
2018-09-07 01:36:05 -07:00
David Fowler 5543d29af1 Merge branch 'release/2.2' => 'master' 2018-09-07 01:29:38 -07:00
ASP.NET CI af4ea9da0a Updating submodule(s)
EntityFrameworkCore => aafa90a898815a9e0ff33babf5a00cceb1670ed9

[auto-updated: submodules]
2018-09-07 01:26:59 -07:00
Nate McMaster 6fb4de5962
Merge branch 'release/2.2' 2018-09-06 23:05:08 -07:00
Nate McMaster e3ba165baa
Update build.ps1 2018-09-06 23:04:43 -07:00
ASP.NET CI 561a551ed6 Updating submodule(s)
Routing => e6ff157b5f

[auto-updated: submodules]
2018-09-06 19:40:34 -07:00
Ryan Nowak e6ff157b5f Add a test for Routing#435
This was already fixes as part of the LinkGenerator redesign. Adding a
test so we can mark it as complete.
2018-09-06 19:29:18 -07:00
ASP.NET CI 1bd6c1562c Updating submodule(s)
Mvc => 64b0f298de
Routing => 27a0951a88

[auto-updated: submodules]
2018-09-07 01:56:10 +00:00
James Newton-King 27a0951a88
Update dependencies and re-mark obsolete constructor (#783) 2018-09-07 13:34:10 +12:00
James Newton-King 64b0f298de
React to obsolete DefaultInlineConstraintResolver ctor (#8409) 2018-09-07 13:33:46 +12:00
ASP.NET CI 02c9c047fe Updating submodule(s)
Mvc => 74ba9898f4

[auto-updated: submodules]
2018-09-06 18:31:27 -07:00
Casey O'Brien 74ba9898f4 [Fixes #8250] Improve the error message when TEntryPoint is not in an entry point assembly
Validates that the type used as a generic argument in WebApplicaitonFactory is contained within the entry point to assembly and throws InvalidOperationException otherwise
2018-09-06 18:02:21 -07:00
ASP.NET CI 4eab1f94d7 Updating submodule(s)
EntityFrameworkCore => 920fd4a8db9de51f2d9f41d9331fda80e9fbb82c
IISIntegration => 2597a2e009
Routing => 489a179c41

[auto-updated: submodules]
2018-09-07 00:58:42 +00:00
ASP.NET CI 06bb9759ca Updating submodule(s)
EntityFrameworkCore => add1786ef3542754bc288d51dd10d30f95f9574b
HttpSysServer => 08a332e1cb
JavaScriptServices => f0e66325c3
Mvc => 494e719fc6
Routing => d364a9e5af

[auto-updated: submodules]
2018-09-07 00:06:08 +00:00
Ryan Nowak 489a179c41 Add a test for Routing#435
This was already fixes as part of the LinkGenerator redesign. Adding a
test so we can mark it as complete.
2018-09-06 16:57:43 -07:00
Nate McMaster 3d244ecb04
Merge branch 'release/2.2' 2018-09-06 16:57:20 -07:00
Nate McMaster 399576b244
Merge branch 'release/2.1' into release/2.2 2018-09-06 16:54:39 -07:00
Nate McMaster 06568d990b
Set the signing cert for .msi files to the 'Microsoft' certificate 2018-09-06 16:30:03 -07:00
Ryan Nowak 494e719fc6 Merge branch 'dotnet-maestro-bot-merge/release/2.2-to-master' 2018-09-06 16:09:53 -07:00
Ryan Nowak f7d9271d71 Merge branch 'merge/release/2.2-to-master' of https://github.com/dotnet-maestro-bot/Mvc into dotnet-maestro-bot-merge/release/2.2-to-master 2018-09-06 16:09:34 -07:00
ASP.NET CI 6b7b60fef4 Updating submodule(s)
HttpSysServer => 869582e1fc
Mvc => 863b1c2c97

[auto-updated: submodules]
2018-09-06 22:43:54 +00:00
Pavel Krymets 2597a2e009
Merge QueryStatus and CreateHandler calls to make them atomic (#1359) 2018-09-06 15:42:18 -07:00
Chris Ross (ASP.NET) 08a332e1cb Merge branch 'release/2.2' 2018-09-06 15:26:23 -07:00
Chris Ross (ASP.NET) aea71d47e2 Merge branch 'release/2.2' 2018-09-06 15:25:03 -07:00
Chris Ross (ASP.NET) 869582e1fc Skip Auth test due to HttpClient regression #474 2018-09-06 15:22:02 -07:00
Ryan Brandenburg f0e66325c3 Merge branch 'merge/release/2.2-to-master' 2018-09-06 15:21:29 -07:00
dotnet-maestro-bot 02d70d8d31 Upgrade to .NET Core 3.0.0-preview1-26906-05 (#1385) 2018-09-06 15:20:09 -07:00
dotnet-maestro-bot 9c1940e94c Upgrade to .NET Core 2.1.5-servicing-26906-03 (#1384) 2018-09-06 15:19:55 -07:00
James Newton-King 863b1c2c97
Action endpoint metadata contains attributes from action and controller (#8395) 2018-09-07 10:01:40 +12:00
Ryan Nowak d364a9e5af Merge branch 'release/2.2' 2018-09-06 14:47:29 -07:00
ASP.NET CI 3f7fe7f9ac Updating submodule(s)
EntityFrameworkCore => b103984ce5bec3463bd34e0c5b7285b08ec21b30

[auto-updated: submodules]
2018-09-06 14:30:00 -07:00
ASP.NET CI b466d24455 Updating submodule(s)
EntityFrameworkCore => 1ca6f6f4b85f127e1c34968312ac1f713017a305

[auto-updated: submodules]
2018-09-06 14:16:07 -07:00
ASP.NET CI ad202eb87c Updating submodule(s)
EntityFrameworkCore => 9a0c8949ea7394ac006a845c1d524b12b8ecc310

[auto-updated: submodules]
2018-09-06 13:58:53 -07:00
ASP.NET CI cf80ac36a0 Updating submodule(s)
EntityFrameworkCore => 0b7f299a2640d94f32142bd491e4131b441e5dfd

[auto-updated: submodules]
2018-09-06 20:33:05 +00:00
ASP.NET CI b86851e6af Updating submodule(s)
EntityFrameworkCore => 084a7580f9ee8032d2ba49d33798530d637b6c9d
IISIntegration => f4f6e50b22
SignalR => 4dbc21c785

[auto-updated: submodules]
2018-09-06 12:54:33 -07:00
ASP.NET CI 851b8deefe Updating submodule(s)
EntityFrameworkCore => e9fa1a58dd1d03eb12a25d01c5d592140de92932
IISIntegration => 2cc108b2e1

[auto-updated: submodules]
2018-09-06 19:31:12 +00:00
Justin Kotalik f4f6e50b22 Merge branch 'merge/release/2.2-to-master' 2018-09-06 12:06:07 -07:00
Mikael Mengistu 4dbc21c785
Merge pull request #2920 from aspnet/release/2.2 2018-09-06 12:05:42 -07:00
ASP.NET CI 3b30760901 Updating submodule(s)
KestrelHttpServer => 5295ebba0b

[auto-updated: submodules]
2018-09-06 12:05:04 -07:00
ASP.NET CI 586bbef406 Updating submodule(s)
JavaScriptServices => c2f15f4199
KestrelHttpServer => d3d7c55198
SignalR => f18c1d7159

[auto-updated: submodules]
2018-09-06 18:57:08 +00:00
Justin Kotalik 2cc108b2e1
Write wide strings to stdout; cleanup logging providers; test utf8 (#1332) 2018-09-06 11:57:00 -07:00
Mikael Mengistu f18c1d7159
Should skip negotiate in tests that use fake urls (#2921) 2018-09-06 11:49:46 -07:00
John Luo 5295ebba0b Merge branch 'release/2.2' 2018-09-06 11:48:59 -07:00
Simon Cropp d3d7c55198 fix some spelling (#2888) 2018-09-06 11:48:25 -07:00