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

14362 Commits

Author SHA1 Message Date
dotnet-bot cb0211dac1 Merge in 'release/2.2' changes 2019-07-25 01:03:20 +00:00
Justin Kotalik 9a6d4af9d6 Merge release/2.1 into release/2.2 (#12290) 2019-07-24 18:01:57 -07:00
dotnet-bot f5a4153307 Merge in 'release/2.2' changes 2019-07-22 16:21:51 +00:00
Andrew Stanton-Nurse fd5517f301
Be more defensive in BufferingDisabled test (#12278) 
Fixes https://github.com/aspnet/AspNetCore-Internal/issues/2826

We [use `?.` in `master`](f56cb72b7f/src/Hosting/Server.IntegrationTesting/src/Deployers/ApplicationDeployer.cs (L103)) and it seems like the test can end up in this state (by the linked issue) so back-porting that defensive measure seems reasonable.
 2019-07-22 09:20:40 -07:00
Mikael Mengistu dd212d7029 Merged PR 2184: rel/2.2 Bump version of Microsoft.Data.OData to 5.8.4 
Bump version of Microsoft.Data.OData to 5.8.4 in the 2.2 branch

Work item: https://dev.azure.com/dnceng/internal/_workitems/edit/222/

Related work items: #222
 2019-07-19 15:38:34 +00:00
Doug Bunting b4a678079d
Add missing ArchiveBaseline files 
- missing from 4fd1d01467 (branding update)
 2019-07-16 20:58:00 -07:00
Doug Bunting 2d335f3647
List all SPA project template names 2019-07-15 18:22:29 -07:00
Ryan Brandenburg 797f7b1670 Version the SPA template package (#11773) 
* Version the SPA template package

* Fix templates
 2019-07-12 11:46:06 -07:00
John Luo 146a483852 Revert unnecessary change from merge 2019-07-09 15:11:04 -07:00
Doug Bunting ae5b18d459
Merge branch 'release/2.1' into release/2.2 2019-07-09 11:28:17 -07:00
dotnet-bot 7b0f67689b Merge in 'release/2.1' changes 2019-06-14 20:30:02 +00:00
Justin Kotalik f74ca433b4 Always include ANCM in build output (#11199) 2019-06-14 13:29:00 -07:00
dotnet-bot 2b771cd4f4 Merge in 'release/2.2' changes 2019-06-14 19:51:28 +00:00
Justin Kotalik 0460bc3ff8 Always include ANCM in build output (#11198) 2019-06-14 12:50:25 -07:00
dotnet-bot 39c7419b72 Merge in 'release/2.2' changes 2019-06-14 01:34:16 +00:00
dotnet-maestro-bot 9517e376a2 Make the test input a bit more reasonable (#11096) (#11113) 
Fixes https://github.com/aspnet/AspNetCore-Internal/issues/2626
 2019-06-13 18:33:04 -07:00
dotnet-bot 800f380325 Merge in 'release/2.1' changes 2019-06-11 21:36:23 +00:00
Pranav K d805ee112b Make the test input a bit more reasonable (#11096) 
Fixes https://github.com/aspnet/AspNetCore-Internal/issues/2626
 2019-06-11 14:35:19 -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
Chris Ross (ASP.NET) c2bb354675 Merged PR 1480: [2.1] HttpSys 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. In 2.2 HttpSys and IIS-in-proc will share this code (with additional tests). In 3.0 we'll refactor it to use more shared source across all three servers.
 2019-06-07 21:20:28 +00:00
dotnet-maestro-bot 14c90fb343 Skip model binding test due to environment changes (#10923) (#10931) 2019-06-05 20:35:29 -07:00
John Luo aed62cdd9f
Skip model binding test due to environment changes (#10923) 2019-06-05 15:45:12 -07:00
Nate McMaster 3501a42239
Prepare 2.2.6 2019-06-05 08:59: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
Pranav K 5814a036d9 Port do not throw when a status code with a codefix appears multiple times in the method body (#10235) 
Fixes https://github.com/aspnet/AspNetCore/issues/4480
 2019-05-28 10:45:59 -07:00
Nate McMaster d558350d50
Move updateMigrations.cmd back into its correct subfolder 2019-05-14 10:49:47 -07:00
Nate McMaster 2a99b8608d
Merge changes from 'release/2.2' 2019-04-16 11:57:15 -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
dotnet-bot f70a87ccac Merge in 'release/2.1' changes 2019-04-15 17:51:13 +00:00
Doug Bunting e0a4673e0b
Add missing package archives (#9351) 
- not mandatory (it seems) for 2.1 but useful pseudo-documentation
 2019-04-15 10:49:43 -07:00
dotnet-bot f139b0dfaa Merge in 'release/2.2' changes 2019-04-15 17:49:40 +00:00
Doug Bunting 5c96ab1709 Add missing package archives 
- aspnet/AspNetCore-Internal#2217
 2019-04-15 10:48:15 -07: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 7e1d545e29 Remove dependency on jscript in IISExpress installers (#8707) 
* Add a .gitignore
 2019-04-11 21:25:54 -07:00
Stephen Halter 22f0e9b412 Don't fail shutdown-does-not-crash test if merely ungraceful (#8896) 
Fixes https://github.com/aspnet/AspNetCore-Internal/issues/2101
 2019-04-11 20:29:38 -07:00
Pranav K 5424045dac Ensure PackageArchive contains the right build of Razor.Design package (#6992) 
* Ensure PackageArchive contains the right build of Razor.Design package

* Re-order values in build\dependencies.props to ensure Razor.Design's package version is
  overwritten.
* Convert additional package refs to project refs

Fixes https://github.com/aspnet/AspNetCore-Internal/issues/1708

* Update CodeCheck.ps1
 2019-04-11 17:14:11 -07:00
Mikael Mengistu 74951717bc backport accessTokenProvider fix (#8726) 2019-04-10 13:14:15 -07:00
dotnet-bot f352ea5da7 Merge in 'release/2.2' changes 2019-03-31 22:34:13 +00:00
Stephen Halter a170820017 Merge branch 'release/2.1' into release/2.2 2019-03-28 15:15:51 -07:00
Stephen Halter 2b80b9fa01 Attempt to make MaxRequestBufferSizeTests.LargeUpload less flaky (#8582) 
This is for the release/2.1 branch, but should probably be ported forward to master so the test can be unskipped.

Fixes https://github.com/aspnet/AspNetCore-Internal/issues/1775 (hopefully)
See https://github.com/aspnet/AspNetCore-Internal/issues/1970 for the master version.
 2019-03-28 11:42:45 -07:00
Justin Kotalik 7569f14dd9 Lock when removing disconnect handler 2019-03-14 22:32:10 +00:00
Pranav K 7557cb916b Merge remote-tracking branch 'origin/release/2.1' into prkrishn/merge/2.1 2019-03-14 10:04:38 -07:00
Doug Bunting 0c6591baea
Merge release/2.1 up to commit d2a4435ac8 => release/2.2 
- remove updates about baseline test (5661c41909 and d2a4435ac8)
  - already done (differently) in release/2.2
- add JDK installation -- missing in these images but not needed in `release/2.1`
- add packages needed to run Chrome
 2019-03-13 19:17:05 -07:00
BrennanConroy aef62d9ff8 Backport SSR fix (#8174) 2019-03-08 10:00:18 -08:00
Doug Bunting 4cbc33da74 Update branding to 2.2.4 2019-03-07 11:53:17 -08:00