huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
37,794 Commits 1 Branch 0 Tags 251 MiB
Commit Graph

44 Commits

Author SHA1 Message Date
Doug Bunting 1d1d664ea1
Merge branch 'release/2.2' into master 
- no-ops except for
  - Update PatchConfig.props (2835f85b6c)
  - Add some additional logging to ErrorPageMiddlewareWebSite (#8049) (aka 1ca6202e7e)
  - Put MVC's functional tests in a separate test group (#8118) (aka db3795b368)
- ignore the build queue (4f2a0edc97) change because we're not hitting Linux resource issues in `master` branch
- ignore baseline test changes (5661c41909 and d2a4435ac8) because they're not applicable in `master`
 2019-03-18 12:36:01 -07:00
BrennanConroy 2835f85b6c Update PatchConfig.props 2019-03-15 10:59:18 -07:00
Ryan Brandenburg aa57df121b Updated PR with my changes 2019-03-08 09:48:08 -08:00
Doug Bunting 4cbc33da74 Update branding to 2.2.4 2019-03-07 11:53:17 -08:00
Doug Bunting e089cfc11c
Merge branch 'release/2.2' 2019-02-14 06:29:38 -08:00
Doug Bunting d102d10a81 Update branding to 2.2.3 
- new version
- update baselines
- grab latest released Microsoft.NetCore.App and Microsoft.NETCore.DotNetAppHost

nit:
- updated ZipManifestGenerator's README.md to use 2.2 examples
 2019-02-13 23:15:58 -08:00
Nate McMaster 5a0e227fad
Merge branch 'release/2.2' 2019-01-24 16:14:55 -08:00
Stephen Halter 5d554aeecd Revert "Wait to dispose RequestAborted CTS (#4447)" 
This reverts commit 0622513058.
 2019-01-24 11:23:58 -08:00
Stephen Halter 7d4ae6049f
Revert "Revert "Wait to dispose RequestAborted CTS (#4447)"" (#6812) 
This reverts commit 29b7c5c030.
 2019-01-17 16:22:03 -08:00
Justin Kotalik 29b7c5c030 Revert "Wait to dispose RequestAborted CTS (#4447)" 
This reverts commit 0622513058.
 2019-01-17 09:38:04 -08:00
Justin Kotalik e6d547a923 Merge branch 'jkotalik/22temp' into jkotalik/masterMerge 2019-01-16 14:39:10 -08:00
Pavel Krymets 6eca6d201b Merge commit '874a67a' into pakrym/merge22 2019-01-16 11:57:04 -08:00
Pavel Krymets f08f2af8bc Merge commit '852d890' into pakrym/merge22 2019-01-16 11:56:50 -08:00
Pavel Krymets adf7c6628e Merge commit '437baf6' into pakrym/merge22 2019-01-16 11:56:16 -08:00
Pavel Krymets f44c175ec6
Enable logging branch SiteExtension (#6715) 2019-01-16 08:56:12 -08:00
John Luo 17b6ce8bd6 Merge branch 'release/2.2' 2019-01-15 18:49:54 -08:00
James Newton-King 92680b355f
Change consumes behavior to ignore requests with no content type (#6645) 2019-01-16 11:55:54 +13:00
Stephen Halter 0622513058
Wait to dispose RequestAborted CTS (#4447) 2019-01-15 14:54:10 -08:00
James Newton-King 180f735ac8
Fix non-parameter route constraints not called with endpoint routing for 2.2 (#6587) 2019-01-16 11:16:35 +13:00
Pavel Krymets 874a67a242 Add @aspnet/signalr to PackagesInPatch (#6716) 2019-01-15 11:17:02 -08:00
Mikael Mengistu 852d890cd6
Check HubConnection state before running invoke logic (#4400) 2019-01-15 11:15:21 -08:00
Pavel Krymets 437baf6f5e
Port Handle EOF HResult from async callback to 2.2 (#6483) 2019-01-15 10:33:26 -08:00
John Luo 38c0d5a50c
Use object indirection in HttpContextAccessor (#1066) (#6036) 2019-01-14 20:31:36 -08:00
Doug Bunting 63ee551b6b
Merge `release/2.2` to `master` 2019-01-14 20:23:51 -08:00
John Luo 8f1eedf5a9 Merge branch 'release/2.1' into release/2.2 2019-01-14 19:04:39 -08:00
BrennanConroy a9b737b793
Fix broken definitions file (#6343) 2019-01-14 18:46:07 -08:00
Chris Ross 87af0c3f1f
Update Google Auth UserInfo endpoint (#6338) 
* Update Google Auth UserInfo endpoint #6069

* Add Google to PatchConfig
 2019-01-14 12:28:25 -08:00
Doug Bunting 970bced25c
Update branding to 2.2.2 (#6608) 
- pin System.Net.WebSockets.WebSocketProtocol to version 4.5.3
- update Directory.Build.targets files to correct build issues
- fix duplicate metadata during static analysis
 2019-01-14 11:40:01 -08:00
Mikael Mengistu a06b0e3968
Prep for 2.1.8 Patch (#6632) 2019-01-11 16:57:45 -08:00
Nate McMaster 0f65d44482
Merge branch 'release/2.2' 2019-01-09 18:09:25 -08:00
dotnet-bot 8b682dfe85 Merge in 'release/2.2' changes 2018-12-14 19:01:05 +00:00
Nate McMaster feb641ddda
Merge branch 'release/2.1' into release/2.2 2018-12-14 09:44:15 -08:00
dotnet-bot 3b0d1253e1 Merge in 'release/2.2' changes 2018-12-14 08:57:43 +00:00
Nate McMaster f0990ec531
Fix build issues with IIS integration projects 
Changes:
* Ensure IIS managed and pkg projects build after the native projects
* Update projects to build test
* Update CI checks to build on macOS and Linux
* Use package baselines to manage ANCM packages
 2018-12-13 22:53:31 -08:00
dotnet-bot e1d8a986c1 Merge in 'release/2.1' changes 2018-12-13 22:36:04 +00:00
Nate McMaster 96ea326664
Document custom reference resolution (#4806) 2018-12-13 14:35:02 -08:00
Nate McMaster 495e4fe4f7
Merge branch 'release/2.2' 2018-12-04 16:03:47 -08:00
Javier Calvarro Nelson f6b4d65218
[Diagnostics] Fix Diagnostics middleware errors (#4271) 
Removes setting two forbidden headers.
 2018-12-04 01:18:31 +01:00
Chris R cdb9d0bc68 Prepare to patch WebSockets 2018-11-29 10:55:57 -08:00
Chris R 2720c28047 Prepare to patch WebSockets 2018-11-29 10:39:29 -08:00
Nate McMaster b38f936f31
Ensure Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets is included in 2.2.1 (#4308) 2018-11-28 16:04:59 -08:00
Chris Ross (ASP.NET) a36db52f9e Add Kestrel.Core to patchconfig 2018-11-27 10:17:37 -08:00
Nate McMaster c1c7d711b6
Merge branch 'release/2.1' into release/2.2 2018-11-14 09:27:23 -08:00
Nate McMaster 59ed8df382
Add targets and tools for ensuring consistent package versions between servicing builds 2018-11-09 13:05:31 -08:00