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

32941 Commits

Author SHA1 Message Date
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
Nate McMaster 6ab3df58af
Update branding to 2.1.12 (#10865) 2019-06-04 16:58:12 -07:00
Pranav K 99a12a6882 Add Mvc.Api.Analyzers to 2.2.6 patch (#10621) 2019-06-04 12:42:05 -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
Doug Bunting 659474a7ab
Merge branch 'release/2.1' => 'release/2.2' (#10221) 2019-05-14 11:11:41 -07:00
Nate McMaster d558350d50
Move updateMigrations.cmd back into its correct subfolder 2019-05-14 10:49:47 -07:00
Doug Bunting 9b3bf98389
Merge branch 'release/2.2' into merge/release/2.1-to-release/2.2 2019-05-13 22:43:17 -07:00
dotnet-bot 0890d19e27 Merge in 'release/2.1' changes 2019-05-14 05:35:58 +00:00
Doug Bunting 064dce2bef Get e2e tests running 
- correct `--filter` syntax; perform `contains` match on `Name` and not `FullyQualifiedName`
  - `FullyQualifiedName` doesn't seem to include NUnit test case data
- move to latest test package versions
- support recent SDK versions

Background: successful but no-op builds have been common lately
- blocking real work on aspnet/AspNetCore-Internal#1843
 2019-05-13 22:34:58 -07:00
Matt Mitchell 11ab4bd196 Fix aspnet e2e tests 
- add `-CliManifestName` option to run-tests.ps1 command
- pass `-CliManifestName` and more from YAML to run-tests.ps1
  - pass access token suffix
 2019-05-13 22:34:58 -07:00
dotnet-bot 782a3f8f5e Merge in 'release/2.2' changes 2019-05-08 05:05:13 +00:00
Doug Bunting 858f5195d9
Merge 'release/2.1' -> 'release/2.2' (#10064) 2019-05-07 22:04:11 -07:00
Doug Bunting bdd2134928
Merge branch 'release/2.1' into release/2.2 2019-05-07 17:38:00 -07:00
dotnet-bot 03f29fb422 Merge in 'release/2.2' changes 2019-05-08 00:30:53 +00:00
Doug Bunting 0c0596b910
Merge branch 'release/2.1' => 'release/2.2' (#10017) 2019-05-07 17:29:50 -07:00
dotnet-bot 1435be9c02 Merge in 'release/2.2' changes 2019-05-07 08:18:32 +00:00
John Luo 6e691e9f20
Use nuget release of netfx ref package (#10024) 2019-05-07 01:17:14 -07:00
dotnet-bot ff87665cc5 Merge in 'release/2.1' changes 2019-05-07 04:51:54 +00:00
Doug Bunting c7287509a0 Update EF Core submodule for 2.1 
- aspnet/AspNetCore-Internal#2474
 2019-05-06 21:50:39 -07:00
dotnet-bot 3432b599a5 Merge in 'release/2.2' changes 2019-05-07 01:50:45 +00:00
Doug Bunting fcd96b2fe5 Update EF Core submodule for 2.2 
- aspnet/AspNetCore-Internal#2474
 2019-05-06 18:49:46 -07:00
Doug Bunting 493e216ca6
Correct `$(StartArguments)` 2019-05-06 18:46:52 -07:00
Doug Bunting 2b186421d8
Merge branch 'release/2.2' into merge/release/2.1-to-release/2.2 2019-05-06 15:18:44 -07:00
dotnet-bot cab367eb5a Merge in 'release/2.1' changes 2019-05-06 22:05:20 +00:00