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

24194 Commits

Author SHA1 Message Date
Chris Ross (ASP.NET) ca0bd0deae Merge branch 'release/2.2' 2018-10-03 12:27:11 -07:00
Mike Harder e2a0746663 Merge branch 'merge/release/2.2-to-master' 2018-10-03 12:05:53 -07:00
ASP.NET CI e73d933539 Updating submodule(s) 
HttpAbstractions => 677bb42245

[auto-updated: submodules]
 2018-10-03 18:21:36 +00:00
Mike Harder 79ccb2b90d Merge branch 'merge/release/2.1-to-release/2.2' into release/2.2 2018-10-03 11:15:18 -07:00
Chris Ross (ASP.NET) 677bb42245 Merge branch 'release/2.2' 2018-10-03 11:12:03 -07:00
Mike Harder 9c37082a74
Add Linux, Node8, and Node10 to test matrix (#1445) 
- Test both Node8 and Node10 on Windows and Linux
- Only test Node8 on MacOS, since the ASP.NET Core 2.1.X templates are incompatible with Node10 on macOS
  - https://github.com/aspnet/Templating/issues/608
- Move Windows build to "Hosted VS2017" pool which has more agents
  - We would rather use the "Hosted" pool, but "npm restore" currently fails on agents in this pool
- Remove "Preview" from Mac pool name
 2018-10-03 11:02:59 -07:00
ASP.NET CI aab61544de Updating submodule(s) 
Configuration => 7a8ed11f9197778854fc7281c066075dcf336f5c

[auto-updated: submodules]
 2018-10-03 17:03:58 +00:00
ASP.NET CI bed95cfbde Updating BuildTools from 3.0.0-alpha1-20181001.3 to 3.0.0-alpha1-20181002.1 
[auto-updated: buildtools]
 2018-10-03 09:57:42 -07:00
ASP.NET CI 960169f120 Updating submodule(s) 
Configuration => c9977e6d93e5ca5ac843e5369feaf5e0f16dec60
DotNetTools => 1e41958884
EntityFrameworkCore => e7ada62ae5bc89eb460a09b110daeaf5f0c336ea
HttpAbstractions => 5f75c07bbf
IISIntegration => 78b1f77d04
KestrelHttpServer => 17ec9290aa
Logging => 0118c6a2a71e46f8f79c4df28e32955a7eee2104
Mvc => 60325c8010
Razor => fb9a02ef5a
Scaffolding => cd079b7a4724aea7c8424bff1f6d11c66d1004f1
SignalR => c2c157a5d4

[auto-updated: submodules]
 2018-10-03 09:57:32 -07:00
ASP.NET CI b67c9fb236 Updating submodule(s) 
SignalR => 6f45d308ce

[auto-updated: submodules]
 2018-10-03 16:17:50 +00:00
ASP.NET CI 44a8e0812b Updating BuildTools from 2.1.3-rtm-15817 to 2.1.3-rtm-15818 
[auto-updated: buildtools]
 2018-10-03 15:58:07 +00:00
Nate McMaster c63e8cdedb
Merge branch 'release/2.2' 2018-10-03 08:40:24 -07:00
ASP.NET CI 9049250589 Updating submodule(s) 
EntityFrameworkCore => a3f0a78c41fe209924f8fb39fc77c421236f1bbe

[auto-updated: submodules]
 2018-10-02 18:05:28 -07:00
ASP.NET CI 7740cd2166 Updating submodule(s) 
EntityFrameworkCore => de17e6c3d7d5e21d22d756b7b46ef035099d6288

[auto-updated: submodules]
 2018-10-02 17:33:32 -07:00
ASP.NET CI b85c4e07a1 Updating submodule(s) 
DependencyInjection => 600c3afaad1b304218b9803f91c74f5c75617f36
EntityFrameworkCore => c4b8eafe321509db4df315f786c3b5761c6bf292
SignalR => 3ae2814c27

[auto-updated: submodules]
 2018-10-02 15:20:00 -07:00
Eilon Lipton 62101b66b2
Merge pull request #1443 from aspnet/eilon/https 
HTTP --> HTTPS
 2018-10-02 14:47:45 -07:00
Nate McMaster ef18c467aa
Merge branch 'release/2.2' 2018-10-02 14:45:17 -07:00
Eilon Lipton 64b10d5582
HTTP --> HTTPS 2018-10-02 14:39:30 -07:00
Nate McMaster f2691ee4b6
Add a copy of scripts from dotnet-deb-tool 2.0.0 to this repo (#1442) 
We currently build .deb files using dotnet-deb-tool, which comes from a package feed. We're not completely sure where the source code is for this tool, so this moves the scripts from the dotnet-deb-tool 2.0.0 package into this repo for safe keeping.
 2018-10-02 14:32:12 -07:00
ASP.NET CI a280cb367e Updating BuildTools from 2.2.0-preview1-20181001.4 to 2.2.0-preview2-20181001.5 
[auto-updated: buildtools]
 2018-10-02 13:53:45 -07:00
ASP.NET CI 54752c7919 Updating submodule(s) 
DotNetTools => 4c49d5ce80
EntityFrameworkCore => ba627d6bbfde7c780bbb893ed835cd1c0a06d363
IISIntegration => 4cbc969cd0
Mvc => 70ddf15cbc
SignalR => 17e029f15d

[auto-updated: submodules]
 2018-10-02 13:53:30 -07:00
ASP.NET CI 5c984ab9ae Updating submodule(s) 
WebSockets => 67f2c3149e

[auto-updated: submodules]
 2018-10-02 11:14:01 -07:00
Nate McMaster 1e41958884
Merge branch 'release/2.2' 2018-10-02 09:23:42 -07:00
Nate McMaster 4c49d5ce80
Resolve flaky tests (#497) 
1. Prevent an ObjectDisposedException in dotnet-watch on slower machines
2. Fix flakiness caused by PID reuse
3. Fix flakiness in tests that await the restart of dotnet-watch. The `.TimeoutAfter` method doesn't cancel the long-running task. This left 2 readers running on dotnet-watch output which caused indeterminate test outcome.
 2018-10-02 09:17:04 -07:00
Chris Ross (ASP.NET) 17ec9290aa Merge branch 'release/2.2' 2018-10-02 09:00:56 -07:00
Justin Kotalik 78b1f77d04
Merge pull request #1460 from dotnet-maestro-bot/merge/release/2.2-to-master 
[automated] Merge branch 'release/2.2' => 'master'
 2018-10-02 08:50:28 -07:00
Justin Kotalik 4cbc969cd0 Revert "Update dependencies.props" 
This reverts commit 2fea246b71.
 2018-10-01 22:15:14 -07:00
James Newton-King 5f75c07bbf
Add RoutesValues to HttpRequest (#1042) 2018-10-02 16:03:58 +13:00
ASP.NET CI 912b82ef59 Updating BuildTools from 2.2.0-preview1-20181001.2 to 2.2.0-preview1-20181001.4 
[auto-updated: buildtools]
 2018-10-01 16:38:02 -07:00
ASP.NET CI 1e1497a2a1 Updating submodule(s) 
EntityFrameworkCore => 345af5bbcf05dc942472d7e860c4d7a123d481c4

[auto-updated: submodules]
 2018-10-01 16:37:51 -07:00
Nate McMaster 18e245ecf0
Merge branch 'release/2.2' 2018-10-01 16:00:30 -07:00
Nate McMaster 7d3628b8ac
Merge branch 'release/2.1' into release/2.2 2018-10-01 15:58:37 -07:00
ASP.NET CI 9d0cac5acb Updating submodule(s) 
SignalR => 78a0a68cd1

[auto-updated: submodules]
 2018-10-01 14:45:28 -07:00
Ryan Nowak f0623fff60 Merge branch 'release/2.2' 2018-10-01 13:38:48 -07:00
ASP.NET CI f469fd2a11 Updating submodule(s) 
Diagnostics => 014e7eb963
EntityFrameworkCore => 44184d2419dd12a0af9c9d6a9e6c0d2821aeaaac

[auto-updated: submodules]
 2018-10-01 13:38:37 -07:00
Ryan Nowak 014e7eb963 Add EFCore DbContext check 2018-10-01 13:33:00 -07:00
Ryan Nowak efe83ad531 Add Diagnostics.EFCore package 2018-10-01 13:32:42 -07:00
dotnet-maestro-bot aad0f719d5 Upgrade to .NET Core 2.2.0-preview3-27001-02 (#1441) 2018-10-01 13:31:46 -07:00
ASP.NET CI ac89398014 Updating submodule(s) 
Razor => 5aad6c7b42

[auto-updated: submodules]
 2018-10-01 13:06:10 -07:00
ASP.NET CI 0ed22b04ec Updating BuildTools from 2.2.0-preview1-20180928.5 to 2.2.0-preview1-20181001.2 
[auto-updated: buildtools]
 2018-10-01 19:04:30 +00:00
ASP.NET CI 0df788b17e Updating BuildTools from 3.0.0-alpha1-20180919.1 to 3.0.0-alpha1-20181001.3 
[auto-updated: buildtools]
 2018-10-01 12:03:50 -07:00
ASP.NET CI 7165afdf78 Updating submodule(s) 
AADIntegration => 1ebe668a96
Antiforgery => 926b3dfe97
AuthSamples => 8e945c9016
AzureIntegration => 1443d4fd05
BasicMiddleware => 2a8963943e
BrowserLink => 45f5c105ac991e147f47906372e97fb8df685bfd
Caching => b5905f343c5d919bb8ea7069aa85d6bd712ed697
Common => 50d7fea80f363d362a106fbbc7c210749880ef23
Configuration => 92a9433386da203c3ef801f67a03ce4c7f51f1f9
CORS => b0c2a4631f
DataProtection => 8e3b940e91
DependencyInjection => 7a7a4feb43a922b067b76713f9de55e2d4aadb5b
Diagnostics => f1058f0d5d
DotNetTools => 978d76d761
EntityFrameworkCore => b60a74223e440b7ab2c574a106c683d3c66d3ce4
EventNotification => 08c615f0939fe0a7d7399eaa02be708dc92d9a10
FileSystem => 955cafca9555f9edb77a409f5c30e65a61ab9123
Hosting => 2850e9987b
HtmlAbstractions => 45b7e2ddb7
HttpAbstractions => e8d5a85c99
HttpClientFactory => 2aed4a9022eed2cc1d62211970f40742af7f6282
HttpSysServer => 21fe13b446
Identity => c54525f459
IISIntegration => 47f8e6dd52
JavaScriptServices => 25e9c50585
JsonPatch => e842973c71
KestrelHttpServer => ecd481fbb6
Localization => 9ecc9abd23
Logging => 44f7da00e0e1f493caa55659fabb95074b139ff2
MetaPackages => 4d3c1addd3
Microsoft.Data.Sqlite => 3496e3216322efdf0edf68b25bb664f9857e7760
MusicStore => 5fe4ff7c27
Mvc => e9c7b08d10
Options => a1635e0444ff9b2ec2f83c0433dcbc60afd69ba0
Proxy => 037be64dbcd512dff0ee705f343f66246d81ecdc
Razor => 7d09cd2972
ResponseCaching => b385d9672e
Routing => 3863601f1d
Scaffolding => 8388df27adea1476abdb1d7d76d925cb2dd3a2a1
Security => 564d53641d
ServerTests => 27b2ed836f
Session => 2c13f33a4b
SignalR => 71ba4b75e0
StaticFiles => ee7dfe9a86
Templating => 6abfd75b0f
WebHooks => d41315d2fbf18e5f467edab621e616c1c6079937
WebSockets => 24ac5589c0

[auto-updated: submodules]
 2018-10-01 12:03:39 -07:00
Nate McMaster 25e9c50585
Add missing version variable that was not merged correctly during automated merge 2018-10-01 11:25:14 -07:00
ASP.NET CI 69878cc669 Updating submodule(s) 
EntityFrameworkCore => 918bc0c312b26cf19a304170857b6614d58e7565

[auto-updated: submodules]
 2018-10-01 09:30:22 -07:00
ASP.NET CI ed4f1eacd4 Updating submodule(s) 
IISIntegration => 3ddc86a428

[auto-updated: submodules]
 2018-10-01 08:05:20 -07:00
Justin Kotalik 3ddc86a428
Fix mof file (#1457) 2018-10-01 08:00:44 -07:00
Ryan Nowak 3863601f1d
Merge pull request #832 from dotnet-maestro-bot/merge/release/2.2-to-master 
[automated] Merge branch 'release/2.2' => 'master'
 2018-09-30 16:50:15 -07:00
ASP.NET CI 20f53b1735 Updating submodule(s) 
Routing => 3227de8c0b

[auto-updated: submodules]
 2018-09-30 16:05:12 -07:00
Ryan Nowak 3227de8c0b Fix #629 - Add logging to DfaMatcther 
Adds logging for the most common things that can prevent an endpoint
from matching.

Note that we already have good logging in other parts of the system, the
stuff here completes the story by providing details at the debug level.
 2018-09-30 15:59:25 -07:00
Ryan Nowak e833352572
Merge pull request #830 from aspnet/feature/endpoint-selector-master 
Feature/endpoint selector master
 2018-09-30 14:55:25 -07:00