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

89 Commits

Author SHA1 Message Date
Chris Ross c0a7f04370 [3.0 patch] Re-implement SameSite for 2019 (#13870) 2019-10-09 14:19:33 -07:00
Brennan ac261d8789 Don't call close if connect does not succeed (#14114) 
- small comment
- patch config
- fix assert
 2019-10-03 08:27:41 -07:00
Doug Bunting 8a54461c63
Merge branch 'release/3.0' into merge/release/2.2-to-release/3.0 2019-10-02 10:11:37 -07:00
Justin Kotalik 59bdc3449f [release/2.2] Backport memory leak fix from 3.0 (#13840) 2019-10-01 16:06:56 -07:00
Doug Bunting c97484217f
Update branding to 3.0.1 
- aspnet/AspNetCore-Internal#3153
 2019-09-25 15:47:23 -07:00
wtgodbe 481df9d64c Merge branches 2019-09-24 14:36:18 -07:00
Doug Bunting 731293d6da Update branding to 2.2.8 
- aspnet/AspNetCore-Internal#3153
 2019-09-23 22:46:06 -07:00
Doug Bunting de8dce4c6c
Merge branch 'release/2.2' into 'release/3.0' 2019-09-11 09:07:54 -07:00
Andrew Stanton-Nurse be0a4a7f4c Merged PR 2631: Fix patch config in 2.2 
I'll merge this ASAP once I'm confident it will resolve the issue
 2019-08-13 22:10:56 +00:00
Mikael Mengistu e1426f6bdf Merged PR 2582: Fixing merge conflict between release/2.2 and internal/release/2.2 
Changes were made to the `PatchConfig.props` files in the internal and public branches. The change to the internal branch was made before the change in the public branch which caused the conflict and broke mirroring.
 2019-08-12 16:40:16 +00:00
Justin Kotalik e32844033a Merge branch 'release/2.2' into release/3.0 2019-08-08 10:45:31 -07:00
Justin Kotalik 76c62a5768 Update patch config for 2.2 (#12955) 2019-08-08 09:00:12 -07:00
Mikael Mengistu 124b96b09d Merged PR 2564: Update PatchConfig.props for 2.2.7 
Update PatchConfig.props for 2.2.7

Note: It's very easy to forget this. I think we should implement an automated check.
 2019-08-08 15:29:45 +00:00
Doug Bunting e9acab1d36
Merge branch 'release/2.2' into 'master' 2019-07-16 12:18:36 -07:00
Doug Bunting 4fd1d01467
Update branding to 2.2.7 (#12100) 
* Add Microsoft.AspNetCore.Mvc.Api.Analyzers to baselines
* also improve PreparingPatchUpdates.md
  - document changes to dependencies.props
  - reflect changes in how Templating is handled
    - e.g. use EF Core examples
  - nit: adjust indentation to avoid markdown warnings
 2019-07-12 06:56:50 -07:00
Doug Bunting 85cd3877a6
Merge branch 'release/2.2' -> 'master' 
- remove .NET Framework TFM from src\Shared\test\Shared.Tests\Microsoft.AspNetCore.Shared.Tests.csproj
 2019-07-10 10:43:59 -07:00
Chris Ross (ASP.NET) b9c8f34919 Merged PR 1508: [2.2] HttpSys & IIS path normalization 
This takes PathNormalizer from Kestrel to normalize the request path and prevent traversals. (e.g. "/./" and "/../").

In 2.1 only HttpSys was affected (https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore/pullrequest/1480). In 2.2 HttpSys and IIS-in-proc share this code (with additional tests). In 3.0 we'll refactor it to use more shared source across all three servers.
 2019-06-08 06:37:36 +00:00
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