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

72 Commits

Author SHA1 Message Date
Nate McMaster 002b305c9f
Merge branch 'release/2.2' 2019-06-05 10:33:30 -07:00
Nate McMaster f9ef0abcf8
Merge branch 'release/2.1' into release/2.2 2019-06-04 17:06:19 -07:00
Nate McMaster 6ab3df58af
Update branding to 2.1.12 (#10865) 2019-06-04 16:58:12 -07:00
Doug Bunting 82c1b2b3eb
Merge branch 'release/2.2' => 'master' (#10589) 
- [automated]
 2019-06-04 15:03:03 -07:00
Pranav K 99a12a6882 Add Mvc.Api.Analyzers to 2.2.6 patch (#10621) 2019-06-04 12:42:05 -07:00
Doug Bunting 35a5718960
Merge branch 'release/2.2' -> 'master' 2019-05-15 09:07:11 -07:00
Doug Bunting dfae19ee7c
Merge branch 'release/2.2' -> 'master' 2019-04-19 18:53:15 -07:00
Nate McMaster 2a99b8608d
Merge changes from 'release/2.2' 2019-04-16 11:57:15 -07:00
dotnet-bot 476be1182f Merge in 'release/2.1' changes 2019-04-16 16:14:24 +00:00
Javier Calvarro Nelson 1bc775f636 [2.2] Include Identity UI in the 2.2.5 patch 2019-04-16 09:13:40 -07:00
Javier Calvarro Nelson 2657cb87b6 [2.1] Include Identity UI in the 2.1.11 patch 2019-04-16 09:13:00 -07:00
BrennanConroy d93b207485 Add Site Extension to patch (#9336) 
- make build.cmd work
- update build/repo.props

Co-Authored-By: BrennanConroy <brecon@microsoft.com>
 2019-04-15 22:21:27 -07:00
Nate McMaster fafae36461
Merge changes from 'release/2.1' 2019-04-15 17:02:10 -07:00
Nate McMaster d004cf0f14
Merge branch 'release/2.1' into release/2.2 2019-04-15 16:42:07 -07:00
Pranav K 836964a653 Don't log action and page handler arguments above Trace level (#9227) 2019-04-15 13:29:07 -07:00
Brennan Conroy 4332a25c43 Update Redis dependency 2019-04-15 15:49:37 +00:00
Brennan Conroy 6ecdff7c68 Merged PR 898: Update MessagePack dependency 
Update MessagePack dependency
 2019-04-12 22:25:38 +00:00
Brennan Conroy 182c48f0b0 Merged PR 891: Update MessagePack dependency 
Update MessagePack dependency

Related work items: #142
 2019-04-12 17:40:48 +00:00
Justin Kotalik 3b180691e1 Merge branch 'release/2.2' into merge/release/2.2-to-master 2019-04-12 08:42:55 -07:00
Andrew Stanton-Nurse ec00758af9 Update PatchConfig.props 2019-04-11 22:16:39 -07:00
Justin Kotalik 7e1d545e29 Remove dependency on jscript in IISExpress installers (#8707) 
* Add a .gitignore
 2019-04-11 21:25:54 -07:00
Doug Bunting 66e32ff1c8
Merge branch 'release/2.2' => 'master' 2019-04-11 15:26:10 -07:00
Doug Bunting 05ad003b2e
Merge branch 'release/2.2' into merge/release/2.1-to-release/2.2 2019-04-10 09:31:41 -07:00
Doug Bunting c53bd798c4 Update branding to 2.1.11 
- no ArchiveBaseline.*.txt additions necessary
 2019-04-10 08:59:44 -07:00
Doug Bunting 46fac99de5 Update branding to 2.2.5 
- no ArchiveBaseline.*.txt additions necessary
 2019-04-10 08:59:29 -07:00
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
Justin Kotalik 430002570f Update patch config for ANCMV2 patch 2019-03-15 23:32:58 +00: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 e497f4101f
Update branding to 2.1.10 (#8265) 2019-03-06 19:45:46 -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
Doug Bunting 5bb5bafbed Update branding to 2.1.9 2019-02-12 19:12:20 -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