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

37440 Commits

Author SHA1 Message Date
Nate McMaster 302d8d59dd
Remove the aspnet/Caching submodule 2018-11-06 21:20:06 -08:00
ASP.NET CI 5faea3ff7b Updating submodule(s) 
MvcPrecompilation => 032768b063
SignalR => 56f78b4593

[auto-updated: submodules]
 2018-11-06 18:16:25 -08:00
Nate McMaster 3cb67766a8
Merge branch 'release/2.2' 2018-11-06 18:09:01 -08:00
Nate McMaster d81128de11
Fix CodeSign.props to include the .dll in the file name for logging files 2018-11-06 18:07:54 -08:00
Nate McMaster 011cf21a5c
Merge branch 'release/2.2' 2018-11-06 17:42:44 -08:00
Nate McMaster 17ee447d26
Upgrade to Extensions 2.2.0-rtm-181106-10 2018-11-06 17:32:06 -08:00
Nate McMaster 3cf8a41e4a
Remove the aspnet/Logging submodule 2018-11-06 17:30:26 -08:00
ASP.NET CI a3902573a5 Updating submodule(s) 
Razor => fd4572874e

[auto-updated: submodules]
 2018-11-06 17:12:19 -08:00
James Newton-King 066c5ce337
Implicitly execute matched endpoint at the end of middleware pipeline (#1059) 2018-11-07 12:57:31 +13:00
Pranav K 032768b063
Merge pull request #301 from aspnet/prkrishn/merge/2.2 
Prkrishn/merge/2.2
 2018-11-06 15:38:58 -08:00
James Newton-King d77b370fb1
Add Endpoint extension methods to HttpContext (#1060) 2018-11-07 12:24:15 +13:00
BrennanConroy 56f78b4593
Retry redis docker (#3265) 2018-11-06 15:23:03 -08:00
ASP.NET CI 2d46064467 Updating submodule(s) 
MvcPrecompilation => 617586a984

[auto-updated: submodules]
 2018-11-06 15:15:25 -08:00
Pranav K 174e53d45c
Merge remote-tracking branch 'origin/release/2.1' into release/2.2 
# Conflicts:
#	test/FunctionalTests/CoreCLRTests/ApplicationWithParseErrorsTest_CoreCLR.cs
#	test/FunctionalTests/CoreCLRTests/ApplicationWithTagHelpersTest_CoreCLR.cs
#	test/FunctionalTests/DesktopTests/ApplicationWithParseErrorsTest_Desktop.cs
#	test/FunctionalTests/DesktopTests/ApplicationWithTagHelpersTest_Desktop.cs
#	test/FunctionalTests/DesktopTests/SimpleAppTestWithPlatformx86_Desktop.cs
 2018-11-06 15:14:43 -08:00
Pavel Krymets 8027397d67 Merge branch 'merge/release/2.2-to-master' 2018-11-06 15:12:04 -08:00
Pavel Krymets f024e779a6 Merge branch 'merge/release/2.2-to-master' of https://github.com/dotnet-maestro-bot/JavaScriptServices into merge/release/2.2-to-master 2018-11-06 15:11:14 -08:00
Pranav K 617586a984 Keep a couple of tests and remove most tests from 2.1 
Fixes https://github.com/aspnet/MvcPrecompilation/issues/293
 2018-11-06 15:10:33 -08:00
BrennanConroy cbbd0278ba Merge branch 'release/2.2' 2018-11-06 14:52:50 -08:00
Pavel Krymets 9d570d791f
Remove obsolete logging API usage (#3953) 2018-11-06 14:50:35 -08:00
Pavel Krymets 7ae4cb0fb6
Remove obsolete logging API usage (#3267) 2018-11-06 14:30:09 -08:00
BrennanConroy bbdf95e449
Skip flaky java test (#3266) 2018-11-06 14:15:53 -08:00
ASP.NET CI 79183729f4 Updating submodule(s) 
DotNetTools => a24b4ee459
HttpSysServer => 60af147f03
Logging => e94b64f96b425190b027f5d956db34bcb529bf8c
SignalR => 71e2f45450

[auto-updated: submodules]
 2018-11-06 14:14:09 -08:00
Pavel Krymets 7819c2f950
Remove obsolete API usage (#1784) 2018-11-06 14:10:24 -08:00
John Luo 5488932e31 Merge branch 'release/2.2' 2018-11-06 14:04:45 -08:00
John Luo 7ef549416f Add prerelease label to deb installer package version 2018-11-06 14:02:48 -08:00
Pavel Krymets f66b074402
Remove obsolete logging API usage (#299) 2018-11-06 13:52:39 -08:00
ASP.NET CI 850688a197 Updating submodule(s) 
SignalR => ffd4bcd850

[auto-updated: submodules]
 2018-11-06 21:33:55 +00:00
Justin Kotalik a00118ada1
Disable IIS tests due to web.config generation issue (#3951) 2018-11-06 13:25:50 -08:00
Nate McMaster e8aab7ae34
Merge branch 'release/2.2' 2018-11-06 12:36:51 -08:00
Nate McMaster 355c6d3a83
Remove the aspnet/Options submodule 2018-11-06 12:28:45 -08:00
Nate McMaster df46dfee73
Merge branch 'release/2.2' 2018-11-06 12:13:05 -08:00
Nate McMaster 67c3a099ec
Remove the aspnet/Configuration submodule (#3948) 2018-11-06 12:04:36 -08:00
Nate McMaster a24b4ee459
Reduce flakiness in tests caused by the OS re-using the PID on test processes (#512) 
We were using PID to assert that dotnet-watch had restarted processes. The OS does not guaranteed the uniqueness of PID, so I've changed tests to use PID + process start time to distinguish between processes.
 2018-11-06 09:57:17 -08:00
Nate McMaster 7f95d6af34
Remove everything from the package archive except Microsoft.AspNetCore.App 2018-11-06 09:43:51 -08:00
Chris Ross (ASP.NET) 60af147f03 Remove net472 test target 2018-11-06 09:39:09 -08:00
BrennanConroy ffd4bcd850
Server per test (#3253) 2018-11-06 09:33:15 -08:00
BrennanConroy 71e2f45450
Wrap log in enabled check 2018-11-06 09:24:34 -08:00
Nate McMaster 4f887e5cd4
Merge branch 'release/2.1' into release/2.2 2018-11-06 09:23:17 -08:00
Chris Ross (ASP.NET) a3eae74580 Merge branch 'release/2.2' 2018-11-06 09:13:00 -08:00
Nate McMaster 17cccade43
Add IsFinalBuild switch to Windows installer script (#3892) 2018-11-06 09:06:10 -08:00
ASP.NET CI 6dc73e256c Updating BuildTools from 3.0.0-alpha1-20181105.2 to 3.0.0-alpha1-20181105.4 
[auto-updated: buildtools]
 2018-11-06 00:06:08 -08:00
ASP.NET CI a3ff786e5e Updating submodule(s) 
Mvc => 65af12f1f5
Routing => 444bf1d93f

[auto-updated: submodules]
 2018-11-06 00:06:00 -08:00
ASP.NET CI 4059e28a3b Updating BuildTools from 2.2.0-preview2-20181104.4 to 2.2.0-preview2-20181105.3 
[auto-updated: buildtools]
 2018-11-06 00:04:32 -08:00
Ajay Bhargav Baaskaran fd4572874e Increase timeout for msbuild processes and added better logging 2018-11-05 18:14:45 -08:00
James Newton-King 444bf1d93f
Add branching functional tests (#905) 2018-11-06 14:23:37 +13:00
ASP.NET CI 0f4ae66176 Updating BuildTools from 3.0.0-alpha1-20181029.3 to 3.0.0-alpha1-20181105.2 
[auto-updated: buildtools]
 2018-11-06 01:19:48 +00:00
ASP.NET CI cdbe6227c5 Updating submodule(s) 
AADIntegration => e27088d9d9
AuthSamples => 3d0793fec4
AzureIntegration => 90b5a51ac4
CORS => be53aa9cac
Diagnostics => c9a53b9067
DotNetTools => 9de04520e0
EntityFrameworkCore => e3cecb21eddd4080d73227ede1cab3ccc49d1b26
HttpAbstractions => 187e89f6f0
HttpSysServer => 2451b68ca0
Identity => 7421ba8087
JavaScriptServices => f47c5901b6
JsonPatch => 891ae28851
KestrelHttpServer => 3327267396
Logging => b454c5a67eeecd388095519dc576944b4434ead0
MetaPackages => 62d9794c63
MusicStore => 2f747d5055
Mvc => 7ea301cc0a
Razor => c0fb1a84cf
ServerTests => 880dd2b706
SignalR => b2037efa08
Templating => 7100d1a797

[auto-updated: submodules]
 2018-11-06 01:19:39 +00:00
Pranav K 65af12f1f5 Update Sdk \ KoreBuild to one that works 2018-11-05 17:17:17 -08:00
Nate McMaster ddd07556e9
Add Newtonsoft.Json.Bson to code signing configuration 2018-11-05 17:14:07 -08:00
Nate McMaster f8a1e14921
Merge branch 'release/2.2' 2018-11-05 16:35:20 -08:00