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

32964 Commits

Author SHA1 Message Date
dotnet-bot c950fdbd62 Merge in 'release/2.2' changes 2019-07-30 19:56:32 +00:00
Justin Kotalik c809b669b9 Catch all exceptions from Exit shutdown (#12518) 2019-07-30 12:55:13 -07:00
dotnet-bot 9fa709a2ab Merge in 'release/2.2' changes 2019-07-25 17:46:51 +00:00
John Luo 9feeb664da Merge branch 'release/2.1' into release/2.2 2019-07-24 20:44:18 -07:00
John Luo f7a7c98e53
Ship templates in 2.1 (#12540) 
Addresses https://github.com/aspnet/AspNetCore/issues/12208
 2019-07-24 20:36:52 -07:00
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 a4649e66ba
Merge branch 'release/2.1' => 'release/2.2' (#12104) 2019-07-16 11:58:54 -07:00
Justin Kotalik 010fdeac8e Generate VS nuget package for 2.1 (#11616) 2019-07-16 08:26:29 -07:00
Doug Bunting 2d335f3647
List all SPA project template names 2019-07-15 18:22:29 -07:00
Doug Bunting 3481238a72
Merge branch 'release/2.1' into 'release/2.2' 2019-07-14 12:13:04 -07:00
Doug Bunting 5712263dda
Re-pin EF dependencies (#12132) 
- not shipping this time around
- bump a few versions to match newer 'release/2.1' dependencies
  - System.Diagnostics.DiagnosticSource
  - System.Security.Principal.Windows
  - System.Threading.Tasks.Extensions (will bump this again in 'release/2.1')
 2019-07-13 11:05:28 -07:00
Doug Bunting 6ed7bf85b1 Re-pin System.Threading.Tasks.Extensions 
- not shipping this time around
 2019-07-12 12:47:47 -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
Ryan Brandenburg c8fc054096 Version the SPA template package [release/2.1] (#11774) 
* Version the SPA template package

* Update src/Templating/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj

* Fix templates
 2019-07-12 11:45:46 -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 59d43346e6
Update branding to 2.1.12 (#12096) 
* 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-11 15:35:47 -07:00
Doug Bunting 716bc8dce9
Merge branch 'release/2.1' => 'release/2.2' (#12009) 2019-07-09 19:09:40 -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 e7f262e331 Merge in 'release/2.2' changes 2019-06-17 13:57:18 +00:00
Doug Bunting 2c9e5c9356
Merge branch 'release/2.1' => 'release/2.2' #11236 2019-06-17 06:56:05 -07:00
Justin Kotalik d2327a506e Merge branch 'release/2.1' into release/2.2 2019-06-14 15:25:31 -07:00
dotnet-bot 19dc9d1172 Merge in 'release/2.2' changes 2019-06-14 20:50:56 +00:00
Nate McMaster d8581565da Fix order in which EF properties are set 2019-06-14 13:49:52 -07:00
Arthur Vickers 21f6b5f664 Update submodules.props for EF 2.2.6 2019-06-14 13:49:52 -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
dotnet-bot 9cd8884425 Merge in 'release/2.2' changes 2019-06-11 16:49:33 +00:00
Nate McMaster c5b2bc0df2
Merge branch 'release/2.1' into release/2.2 2019-06-11 09:48:08 -07:00
dotnet-bot 07b26f32f3 Merge in 'release/2.1' changes 2019-06-11 16:08:48 +00:00
Matt Mitchell dab998e7d2 Unpin 2.1.12 package versions (#11091) 2019-06-11 09:07:33 -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
John Luo 5a698ae534 Merge branch 'release/2.1' into release/2.2 2019-06-07 14:21:57 -07: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
John Luo a8388b4fa4
Add TeamName to MicroBuildCleanup@1 (#10959) 2019-06-07 12:58:07 -07: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