Commit Graph

9182 Commits

Author SHA1 Message Date
Ryan Brandenburg 9f6531b547 Fix script target 2018-04-17 12:26:08 -07:00
Ryan Brandenburg a32e7dc18b Adapt dev to release/2.1 2018-04-17 12:24:03 -07:00
Ryan Brandenburg b4946fc638 Bring modules back to release/2.1 versions 2018-04-17 12:16:10 -07:00
Ryan Brandenburg 14fa14b5d3 2.2.0 2018-04-17 09:48:24 -07:00
Nate McMaster d44982b166
Update GenerateTags.ps1 script 2018-04-17 09:08:47 -07:00
Pavel Krymets 7a3c260394 Merge branch 'pakrym/correct-merge' into dev 2018-04-16 21:22:20 -07:00
Pavel Krymets a83869dbb3 Merge remote-tracking branch 'origin/release/2.1' into HEAD 2018-04-16 21:20:13 -07:00
Ryan Brandenburg 07dddce092 Branching for 2.1.0-rc1 2018-04-16 17:04:05 -07:00
Ryan Brandenburg 718989b820 Branching for 2.1.0-rc1 2018-04-16 17:03:27 -07:00
Ryan Brandenburg 23d7955517 Branching for 2.1.0-rc1 2018-04-16 17:00:04 -07:00
Ryan Brandenburg 9662e2bd01 Branching for 2.1.0-rc1 2018-04-16 16:58:58 -07:00
Ryan Brandenburg 40d5c7f839 Branching for 2.1.0-rc1 2018-04-16 16:58:44 -07:00
Ryan Brandenburg 6c2432e544 Branching for 2.1.0-rc1 2018-04-16 16:57:26 -07:00
Ryan Brandenburg 3385cfea1b Branching for 2.1.0-rc1 2018-04-16 16:56:17 -07:00
Ryan Brandenburg ba3cf559bd Branching for 2.1.0-rc1 2018-04-16 16:55:36 -07:00
ASP.NET CI 279d7cb2a0 Updating submodule(s)
AADIntegration => 353f8554a9

[auto-updated: submodules]
2018-04-16 16:46:08 -07:00
Ryan Brandenburg 41ad654a26
Fix bad update 2018-04-16 16:23:34 -07:00
ASP.NET CI b0e8081a87 Updating submodule(s)
Localization => 7cec5ccd48
MetaPackages => 5d612380e6
MusicStore => 43cb563f7b
Options => bba46a679f203728db7e32b2b1bb5f6ef1859ef4
Proxy => 13caad9f7a8f06b68be06bc6bc62efcfa86fa226
ResponseCaching => afc2c83e6c
Routing => c8d842c160
Security => 0778f5467a
ServerTests => a43546674c
Session => 1cc3bb8a85
StaticFiles => 52c45f2204
Testing => e7abaf7ad48592b48aa0afb844c8903492948cfc

[auto-updated: submodules]
2018-04-16 15:24:11 -07:00
Ryan Brandenburg 43cb563f7b Merge remote-tracking branch 'origin/release/2.1' into rybrande/MergeRelease21IntoDev 2018-04-16 14:53:07 -07:00
ASP.NET CI 62e37aadfe Updating submodule(s)
Configuration => ec35b4b7ef3929685ef4860c8e36a4e677e878ae
CORS => af6f10030c
DataProtection => 3c40b9efd2
Diagnostics => 3acf82e5f8
EventNotification => 1327a2773a61e92ebdcf9e1b7f55c6e56b238f5a
FileSystem => 50d78868bf89a9c74176ee8271e0755937a0dd68
HtmlAbstractions => f9a0a9e646
HttpAbstractions => 5d1ee9da82
JavaScriptServices => 2c81117b4b
JsonPatch => 75839f4951

[auto-updated: submodules]
2018-04-16 14:47:31 -07:00
Ryan Brandenburg 75839f4951 Merge remote-tracking branch 'origin/release/2.1' into rybrande/MergeRelease21IntoDev 2018-04-16 14:42:12 -07:00
Ryan Brandenburg f9a0a9e646 Merge remote-tracking branch 'origin/release/2.1' into rybrande/MergeRelease21IntoDev 2018-04-16 14:31:08 -07:00
Ryan Brandenburg 3c40b9efd2 Merge remote-tracking branch 'origin/release/2.1' into rybrande/MergeRelease21IntoDev 2018-04-16 14:24:13 -07:00
ASP.NET CI 139df72bfe Updating submodule(s)
Common => 268a25ba1b85e99bbcc6bcc9133198c5c8fdfa39

[auto-updated: submodules]
2018-04-16 14:10:48 -07:00
ASP.NET CI 78e745433f Updating submodule(s)
AADIntegration => 8ce4329017
Antiforgery => 7e1c2d8cb2
AuthSamples => 07fb470c3c
AzureIntegration => e77be23e2b
BasicMiddleware => cd3e968d16
BrowserLink => 7c1721c38caa05fc574b2d2ff778508afcec819a
Caching => 3b0e3fa503fe6ec32fc433e441a890be4a4736c2

[auto-updated: submodules]
2018-04-16 13:34:16 -07:00
Ryan Brandenburg 1eec4a11a0 Branching for 2.1.0-rc1 2018-04-16 13:15:15 -07:00
Ryan Brandenburg 98326377dc
Merge pull request #36 from aspnet/rybrande/MergeRelease21IntoDev
Merge release/2.1 into dev
2018-04-16 13:14:21 -07:00
Ryan Brandenburg 6d9f374da0 Merge remote-tracking branch 'origin/release/2.1' into rybrande/MergeRelease21IntoDev 2018-04-16 13:12:32 -07:00
ASP.NET CI eb656c0e1f Updating submodule(s)
AzureIntegration => e2147cff77
KestrelHttpServer => 6fd09af374

[auto-updated: submodules]
2018-04-16 12:57:45 -07:00
Stephen Halter 6fd09af374
Improve logging of request drain timeout (#2480) 2018-04-16 11:53:10 -07:00
ASP.NET CI 16fe7eb5c1 Updating submodule(s)
KestrelHttpServer => 3a45136cc4
SignalR => c05c5a6b2a

[auto-updated: submodules]
2018-04-16 11:49:26 -07:00
Andrew Stanton-Nurse 3a45136cc4
make IConnectionInherentKeepAliveFeature a boolean feature (#2496) 2018-04-16 11:34:06 -07:00
ASP.NET CI 4b478f3fa7 Updating BuildTools from 2.1.0-preview3-17018 to 2.1.0-preview3-17032
[auto-updated: buildtools]
2018-04-16 10:41:17 -07:00
ASP.NET CI c15273a68c Updating submodule(s)
BasicMiddleware => 0a876cece7
SignalR => a5d9930802

[auto-updated: submodules]
2018-04-16 10:41:15 -07:00
ASP.NET CI dd28273f9f Updating submodule(s)
JavaScriptServices => 4d151a599e

[auto-updated: submodules]
2018-04-16 14:59:11 +00:00
ASP.NET CI 825beae4b3 Updating submodule(s)
JavaScriptServices => 78f7dccfab

[auto-updated: submodules]
2018-04-16 13:49:44 +00:00
ASP.NET CI a944ed0af1 Updating submodule(s)
SignalR => 927b08f893

[auto-updated: submodules]
2018-04-15 23:28:22 -07:00
ASP.NET CI 506c40cd81 Updating submodule(s)
SignalR => 7745fd748a

[auto-updated: submodules]
2018-04-15 22:50:01 -07:00
ASP.NET CI 35b62cfac6 Updating submodule(s)
SignalR => 0da06fb5d2

[auto-updated: submodules]
2018-04-16 05:08:00 +00:00
ASP.NET CI cd43949613 Updating submodule(s)
SignalR => b3a9011698

[auto-updated: submodules]
2018-04-15 21:00:16 -07:00
ASP.NET CI fb9b1dfb1c Updating submodule(s)
SignalR => 6eac7049ba

[auto-updated: submodules]
2018-04-15 20:24:39 -07:00
ASP.NET CI 9ddd24cefb Updating submodule(s)
Logging => 3821274d6ca48e97d447e27a5239d2357256c331

[auto-updated: submodules]
2018-04-16 01:36:23 +00:00
ASP.NET CI 8cc48e924f Updating submodule(s)
Mvc => d8fc2d4009
Templating => 2850064c36
Testing => 981cd117db06963820cfce03bc59c2a3a635772f
WebHooks => 57601858b1ab5fc0b735417b12970f55003b62e2
WebSockets => 2ef84e6b9a

[auto-updated: submodules]
2018-04-15 23:36:50 +00:00
ASP.NET CI e0132f8691 Updating submodule(s)
AADIntegration => 224c35d24d
Antiforgery => 6d7d1bd8a5
AuthSamples => ede65d1f13
AzureIntegration => fafe02faa9
BasicMiddleware => 0c31fcdf30
BrowserLink => 6d4402f883275de536cbf023abfa8f36f5eeafd3
Caching => f5deb936e387f047d0f2c6f8f360d14704d776b0
Common => da1d82b4ba982ceba4316a1c91f264f21a7777e3
Configuration => 2b31faab0a7fb3453e52f8feda3253f80c501480
CORS => a7105cabd1
DataProtection => a563e6e966
DependencyInjection => aad8d7a682d0156e93f1789213afa123d9858429
Diagnostics => 74740db8c2
DotNetTools => 5f9e708089
EntityFrameworkCore => bb01aeab99cc8f03feae90b6431fc5a7b50bb149
EventNotification => 89ab1b78a82a0e82b9580d5483f47ceb3c5a0b7d
FileSystem => 60093163807115fc5a2c371fce9daf61ec7b208e
Hosting => a997ceba98
HtmlAbstractions => 411d583631
HttpAbstractions => a5743b2fd4
HttpClientFactory => 703ab198180e9ab35e466cbe1f2a4d56b1d3be4a
HttpSysServer => 8b5053957e
Identity => 985c8a8b07
IISIntegration => 8e15e40d2b
JavaScriptServices => 7f550fb469
JsonPatch => 4ca59af546
KestrelHttpServer => a9e46b0d59
Localization => 9f0d28f587
Logging => 602e10ec1fdb2fdc72aa56a7c5991a33e2477b52
MetaPackages => f5dcb7578a
Microsoft.Data.Sqlite => e9358df6978aaea4f3ef01be0d94c7e877787960
MusicStore => 8ee11748ef
Mvc => 128c7e0a17
MvcPrecompilation => 92886f592a
Options => 898680b792d2ddc37522e496fead9bc92ef5773d
Proxy => 08b340d2cced4579462b288ad0051df0770c7604
Razor => d16c9a5ba4
ResponseCaching => 3d0c2af20f
Routing => 83ee793c21
Scaffolding => d9767b5682fdfc1a1cf439811f6062db9629bad0
Security => ec5d71d2dc
ServerTests => 46e3c69458
Session => 094d96c4fc
SignalR => b7cea8690a
StaticFiles => c871c52e84

[auto-updated: submodules]
2018-04-15 14:35:28 -07:00
ASP.NET CI 2ef84e6b9a Update dependencies.props
[auto-updated: dependencies]
2018-04-15 14:30:55 -07:00
ASP.NET CI 2850064c36 Update dependencies.props
[auto-updated: dependencies]
2018-04-15 14:29:09 -07:00
ASP.NET CI 8ee11748ef Update dependencies.props
[auto-updated: dependencies]
2018-04-15 14:19:13 -07:00
ASP.NET CI a9e46b0d59 Update dependencies.props
[auto-updated: dependencies]
2018-04-15 14:16:38 -07:00
ASP.NET CI 4ca59af546 Update dependencies.props
[auto-updated: dependencies]
2018-04-15 14:16:23 -07:00
ASP.NET CI 8e15e40d2b Update dependencies.props
[auto-updated: dependencies]
2018-04-15 14:12:41 -07:00