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

43652 Commits

Author SHA1 Message Date
William Godbe f2f9baf383
Merge pull request #22827 from dotnet-maestro-bot/merge/release/3.1-to-master 
[automated] Merge branch 'release/3.1' => 'master'
 2020-06-11 10:05:29 -07:00
William Godbe 0ae7f1a701
Merge pull request #22801 from dotnet-maestro-bot/merge/release/2.1-to-release/3.1 
[automated] Merge branch 'release/2.1' => 'release/3.1'
 2020-06-11 09:59:17 -07:00
Will Godbe 40e1351ce8 Merge 2020-06-11 09:58:44 -07:00
William Godbe 70c5dda477
Merge pull request #22826 from dotnet-maestro-bot/merge/release/3.1-to-master 
[automated] Merge branch 'release/3.1' => 'master'
 2020-06-11 09:49:16 -07:00
William Godbe 84831fba9b
Merge branch 'master' into merge/release/3.1-to-master 2020-06-11 09:48:50 -07:00
David Fowler 9e55787b84
Add support for listening to tcp handles to in the Sockets transport (#22618) 
* Add support for listening to tcp handles to in the Sockets transport
- Make ListenHandleTests shared across both transports

Fixes #20842
 2020-06-11 09:36:27 -07:00
Sébastien Ros 5f26302eaa
Quarantining CanDispatchAsyncWorkToSyncContext (#22803) 
* Quarantining CanDispatchAsyncWorkToSyncContext

* Missing using

* Make method virtual
 2020-06-11 09:30:26 -07:00
Ryan Brandenburg b61e9b0125
Remove PubTernal APIs (#22290) 
Remove PubTernal APIs
 2020-06-11 09:21:39 -07:00
msftbot[bot] b5105e7f96
Merge pull request #22796 from dotnet-maestro-bot/merge/release/5.0-preview6-to-master 
[automated] Merge branch 'release/5.0-preview6' => 'master'
 2020-06-11 01:41:38 +00:00
Sébastien Ros fe24d85356
Merge pull request #22790 from dotnet-maestro-bot/merge/release/3.1-to-master 
[automated] Merge branch 'release/3.1' => 'master'
 2020-06-10 18:19:19 -07:00
Stephen Halter 6c31da5b1f
Enable Kestrel config reload in ConfigureWebHostDefaults (#22528) 2020-06-10 17:47:17 -07:00
Sébastien Ros 34e006fdcd
Merge branch 'master' into merge/release/5.0-preview6-to-master 2020-06-10 16:35:07 -07:00
Doug Bunting 1a560b6b8f
Update branding to 2.1.20 (#22757) 2020-06-10 13:59:45 -07:00
Will Godbe 948c62ee64 Fixup baseline 2020-06-10 13:42:24 -07:00
Will Godbe 97f3ea1453 Fixup .sln 2020-06-10 13:40:08 -07:00
Will Godbe 3d79c2b319 Fixup 2020-06-10 13:08:11 -07:00
Pranav K 153eda4e88
Ship the JSInterop package (#22794) 2020-06-10 12:39:52 -07:00
Tanya e929dab496
Replace favicon.ico with smaller size (#22533) 
Co-authored-by: Tanya Do <tad@microsoft.com>
 2020-06-10 12:17:25 -07:00
Pranav K 07b1bf4f71
Fixup error 2020-06-10 12:07:17 -07:00
Pranav K 71853a4640
Merge branch '3.1merge' 2020-06-10 11:30:40 -07:00
William Godbe 949b5e0fcb
Merge pull request #22758 from dotnet-maestro-bot/merge/release/2.1-to-release/3.1 
[automated] Merge branch 'release/2.1' => 'release/3.1'
 2020-06-10 10:54:33 -07:00
William Godbe 237dff294f
Merge pull request #22743 from dotnet-maestro-bot/merge/release/3.1-to-master 
[automated] Merge branch 'release/3.1' => 'master'
 2020-06-10 10:54:21 -07:00
Safia Abdalla a529b4c70c
Add nan as dev dependency to React templates (#22089) (#22205) 2020-06-10 09:59:39 -07:00
Safia Abdalla 55822ca516
Upgrade jQuery in samples to version 3.5.1 (#21577) (#21792) 
Fixes #21572

Co-authored-by: Christian Wenz <info@christianwenz.de>
 2020-06-10 09:59:29 -07:00
William Godbe 432dc979b3
Merge pull request #21921 from dotnet/prkrishn/merge-blazor-wasm 
Merge blazor-wasm -> 3.1
 2020-06-10 09:32:29 -07:00
William Godbe 0686c133e4
Merge pull request #22730 from dotnet-maestro-bot/merge/release/5.0-preview6-to-master 
[automated] Merge branch 'release/5.0-preview6' => 'master'
 2020-06-10 09:30:53 -07:00
dotnet-maestro[bot] cdd4b1fba9
Update dependencies from https://github.com/dotnet/runtime build 20200609.9 (#22768) 
System.ComponentModel.Annotations , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Logging , Microsoft.Extensions.Primitives , Microsoft.Extensions.Internal.Transport , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Http , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Hosting , Microsoft.Extensions.Configuration.Json , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.Platforms , Microsoft.Win32.Registry , Microsoft.Win32.SystemEvents , Microsoft.NETCore.App.Internal , Microsoft.NETCore.App.Ref , System.Drawing.Common , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.Channels , System.Windows.Extensions , System.Security.Principal.Windows , System.Security.Permissions , System.Security.Cryptography.Xml , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Net.WebSockets.WebSocketProtocol , System.Runtime.CompilerServices.Unsafe , System.Security.Cryptography.Cng , System.Security.Cryptography.Pkcs , System.Reflection.Metadata
 From Version 5.0.0-preview.7.20308.8 -> To Version 5.0.0-preview.7.20309.9

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
 2020-06-10 13:22:10 +00:00
Jonathan edf73e084b
Update TotpSecurityStampBasedTokenProvider.cs 2020-06-10 13:36:49 +02:00
Jonathan 6b761eaeab
Update PhoneNumberTokenProvider.cs 2020-06-10 13:36:32 +02:00
Jonathan 9db52fac7a
Update EmailTokenProvider.cs 2020-06-10 13:36:16 +02:00
Jonathan 103a305c25
Update TotpSecurityStampBasedTokenProvider.cs 
Add line breaks before return statement.
Use string interpolation instead of string concatenation.
Hyphenate the documentation.
 2020-06-10 12:12:09 +02:00
Jonathan 9b8cd29087
Hyphenate documentation 
Hyphenate "two-factor authentication" in documentation.
Add line break before return statements.
 2020-06-10 12:07:30 +02:00
Jonathan d1793dda5f
Hyphenate documentation 
Hyphenate two-factor authentication in the documentation.
 2020-06-10 12:05:45 +02:00
Jonathan 5972fa0004
Update EmailTokenProvider.cs 2020-06-10 12:02:18 +02:00
Jonathan be334b0d00
Update PhoneNumberTokenProvider.cs 
Add license header.
Hyphenate two-factor authentication in documentation.
Add line breaks before return statements.
Use string interpolation instead of string concatenation.
 2020-06-10 11:57:29 +02:00
Pranav K c58ab9247c
Add nullable to JSInterop (#22326) 2020-06-10 05:39:01 +00:00
Justin Kotalik e1fab3098b
No build native in site extension (#22738) 2020-06-09 21:05:32 -07:00
Pranav K b3ad812c14
Mark Wasm benchmark app as a test asset 2020-06-09 19:24:03 -07:00
Pranav K ae8f67f201
Use randomized ports in dotnet-serve 2020-06-09 19:20:12 -07:00
Doug Bunting 51584c21dd
Revert "Update branding to 2.1.20" 
This reverts commit d831217cf5.
 2020-06-09 18:27:36 -07:00
Doug Bunting d831217cf5
Update branding to 2.1.20 2020-06-09 18:26:18 -07:00
Justin Kotalik c1a3a2f10c
Change debug information format (#22734) 2020-06-09 18:03:19 -07:00
Safia Abdalla fbb70b12de
Fix startvs.cmd for Components solution (#22739) 2020-06-10 00:32:42 +00:00
Pranav K dd62a699f7
Merge remote-tracking branch 'origin/release/3.1' into prkrishn/merge-blazor-wasm 2020-06-09 16:54:36 -07:00
William Godbe 99e90f5782
Produce non-stable version of targeting pack (#22372) 
* Produce non-stable version of targeting pack

* Fix tag

* Fix indentation

* Fixup proj file

* Move Internal proj to separate folder

* Remove redundant proj

* Start moving files

* finish moving files

* Set IsReferenceAssemblyProject=true in targeting pack proj
 2020-06-09 16:40:00 -07:00
William Godbe d23d69570d
Fix path for PoliCheckExclusions.xml (#22088) 2020-06-09 16:39:42 -07:00
William Godbe aa806b9320
Merge pull request #22427 from dotnet-maestro-bot/merge/release/2.1-to-release/3.1 
[automated] Merge branch 'release/2.1' => 'release/3.1'
 2020-06-09 16:39:23 -07:00
Will Godbe 10d1f88b29 Remove unneeded stuff 2020-06-09 16:39:06 -07:00
Will Godbe fa8e387025 Fix stuff 2020-06-09 16:37:13 -07:00
William Godbe 97b336c715
Merge branch 'master' into merge/release/3.1-to-master 2020-06-09 16:34:13 -07:00