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

32982 Commits

Author SHA1 Message Date
William Godbe 2ff5abb68b
Merge branch 'release/2.2' into merge/release/2.1-to-release/2.2 2019-09-24 10:06:03 -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 82c42d58ae Update branding to 2.1.14 
- aspnet/AspNetCore-Internal#3153
 2019-09-23 22:45:27 -07:00
Doug Bunting bfb25515ae
Merge branch 'release/2.1' => 'release/2.2' (#13873) 2019-09-10 22:21:27 -07:00
Doug Bunting 82cb080502
Merge branch 'release/2.2' into merge/release/2.1-to-release/2.2 2019-09-10 19:39:46 -07:00
Chris R 1fe84a6ded Replace obsolete feeds 2019-09-10 18:42:11 -07:00
Doug Bunting de52994381
Merge remote-tracking branch 'internal/internal/release/2.2' into release/2.2 2019-09-10 14:53:55 -07:00
Andrew Stanton-Nurse 2a6c96a684 Merged PR 2630: Fix patch config for SpaServices MSRC 
I'll merge this ASAP once I'm confident it will fix the issue.
 2019-08-13 22:13:40 +00: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
Justin Kotalik 2217be2826 Skip/disable tests in 2.2 for IIS (#12985) 
* Skip/disable tests in 2.2 for IIS

* Update ServicesTests.cs
 2019-08-13 14:00:33 -07: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 735807d6ff Skip flaky HTTPS devcert test on 2.2 (#12980) 2019-08-09 09:53:31 -07:00
Steve Sanderson fc65b4fd86 Merged PR 2264: Fix encoding used in JS generated by prerenderer 
Fix encoding used in JS generated by prerenderer
 2019-08-09 01:37:35 +00:00
Steve Sanderson d49d7d7e0a Merged PR 2262: Fix encoding used in JS generated by prerenderer 
Fix encoding used in JS generated by prerenderer
 2019-08-08 22:24:48 +00: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
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
dotnet-bot b75fa18cf5 Merge in 'release/2.1' changes 2019-07-25 03:38:08 +00: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
Mikael Mengistu fd023a6698 Merged PR 2157: Bump version of Microsoft.Data.OData to 5.8.4 
Bump version of Microsoft.Data.OData to 5.8.4

Work item: https://dev.azure.com/dnceng/internal/_workitems/edit/222/
 2019-07-19 15:38:28 +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