7860280dd9
Merge remote-tracking branch 'ResponseCaching/rybrande/release22ToSrc' into rybrande/Mondo2.2
2018-11-21 16:35:46 -08:00
33a5544c90
Merge remote-tracking branch 'HttpSysServer/rybrande/release22ToSrc' into rybrande/Mondo2.2
2018-11-21 16:35:36 -08:00
396bb7a2d8
Merge remote-tracking branch 'CORS/rybrande/release22ToSrc' into rybrande/Mondo2.2
2018-11-21 16:35:26 -08:00
68eafa9d3c
Merge remote-tracking branch 'Antiforgery/rybrande/release22ToSrc' into rybrande/Mondo2.2
2018-11-21 16:35:18 -08:00
1ee4e2b936
Merge remote-tracking branch 'origin/release/2.1' into rybrande/Mondo2.2
2018-11-21 16:33:42 -08:00
7ee9dac67f
Merge branch 'release/2.1' of github.com:aspnet/AspNetCore into rybrande/Mondo2.1
2018-11-21 16:26:13 -08:00
ca8ce2e58d
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 93926543f8
2018-11-21 16:13:09 -08:00
b2d4f8f2f1
Merge branch 'namc/merge-diag' into release/2.2
2018-11-21 16:11:17 -08:00
d18558c3ab
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 3d828221a1
2018-11-21 16:10:55 -08:00
c593daa1f9
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 9f49398f28
2018-11-21 16:03:25 -08:00
bd3a77ec8e
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 3e08bf8833
2018-11-21 16:02:22 -08:00
e8849f6626
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in f05b0e792d
2018-11-21 16:01:19 -08:00
d5f14412c2
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 9e5146cff9
2018-11-21 15:59:55 -08:00
101303eceb
Fix RepositoryUrls
2018-11-21 15:55:40 -08:00
89330075b4
Target right version of ANCM nuget package ( #4194 )
2018-11-21 15:42:55 -08:00
8ce7bb7f16
Add HealthChecks to Middleware.sln
2018-11-21 15:39:10 -08:00
925746158e
Merge the release/2.2 branch of Diagnostics
2018-11-21 15:36:05 -08:00
16212ae6df
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in c802d5ef5f
2018-11-21 15:22:25 -08:00
db7b28d475
Merge remote-tracking branch 'Security/rybrande/release21ToSrc' into rybrande/Mondo2.1
2018-11-21 15:17:40 -08:00
ff3891fa7a
Merge remote-tracking branch 'Routing/rybrande/release21ToSrc' into rybrande/Mondo2.1
2018-11-21 15:17:30 -08:00
c8e271e8ac
Merge remote-tracking branch 'ResponseCaching/rybrande/release21ToSrc' into rybrande/Mondo2.1
2018-11-21 15:17:21 -08:00
5c0097bf69
Merge remote-tracking branch 'HttpSysServer/rybrande/release21ToSrc' into rybrande/Mondo2.1
2018-11-21 15:17:11 -08:00
af2f57386e
Merge remote-tracking branch 'CORS/rybrande/release21ToSrc' into rybrande/Mondo2.1
2018-11-21 15:17:00 -08:00
3e59973378
Merge remote-tracking branch 'Antiforgery/rybrande/release21ToSrc' into rybrande/Mondo2.1
2018-11-21 15:16:52 -08:00
f7b51eedda
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 930ed239e4
2018-11-21 15:12:11 -08:00
3840ca4451
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 58b66f7cbb
2018-11-21 15:09:05 -08:00
ce2f7908e4
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 777b2fbf7e
2018-11-21 15:06:37 -08:00
03db4faa68
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in d8d1f36f28
2018-11-21 15:05:23 -08:00
2374a67d55
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in ec429447bf
2018-11-21 15:03:35 -08:00
42a93c8153
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 93b496090e
2018-11-21 15:01:46 -08:00
71b1bb8887
Merge branch 'release/2.1' into release/2.2
2018-11-21 14:57:45 -08:00
c80604a7da
Fix directory structure ( #4201 )
...
Fix directory structure
2018-11-21 14:55:25 -08:00
6a6c88d80b
Merge source code from aspnet/Diagnostics to this repo
2018-11-21 14:23:55 -08:00
ed0b421695
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 8893337fb0
2018-11-21 13:54:33 -08:00
1ac92426ab
Merge remote-tracking branch 'Session/rybrande/release22ToSrc' into rybrande/Mondo2.2
2018-11-21 11:15:09 -08:00
7b708c291c
Merge remote-tracking branch 'StaticFiles/rybrande/release22ToSrc' into rybrande/Mondo2.2
2018-11-21 11:15:02 -08:00
7a9e1f9ec9
Merge remote-tracking branch 'ServerTests/rybrande/release22ToSrc' into rybrande/Mondo2.2
2018-11-21 11:14:50 -08:00
bfffb3c31e
Merge remote-tracking branch 'origin/release/2.1' into rybrande/Mondo2.2
2018-11-21 11:11:35 -08:00
feb5e3ac9b
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 774079d60d
2018-11-21 11:02:38 -08:00
c391301dce
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in a5fcd9dd87
2018-11-21 10:59:42 -08:00
04096c9225
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 04c6c6bab8
2018-11-21 10:58:10 -08:00
e6b3a5b79b
Merge remote-tracking branch 'Session/rybrande/release21ToSrc' into rybrande/Mondo2.1
2018-11-21 10:05:41 -08:00
93238389a7
Merge remote-tracking branch 'StaticFiles/rybrande/release21ToSrc' into rybrande/Mondo2.1
2018-11-21 10:05:32 -08:00
c75177033a
Merge remote-tracking branch 'ServerTests/rybrande/release21ToSrc' into rybrande/Mondo2.1
2018-11-21 10:05:22 -08:00
95928c0c64
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in d20c2c8f04
2018-11-21 10:02:17 -08:00
98bbdf6e34
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 2b285667a8
2018-11-21 10:00:40 -08:00
9ba11244f2
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 019ba1722e
2018-11-21 09:58:26 -08:00
564f5a45ba
Fix about
2018-11-20 16:09:50 -08:00
d0c73c16d5
Fix tests
2018-11-20 16:08:17 -08:00
70260923ef
Remove extras
2018-11-20 16:06:40 -08:00
0f2ae895e3
Remove bower files
2018-11-20 16:02:55 -08:00
dd914d9430
Revert back to 2.2
2018-11-20 16:00:48 -08:00
d5587f3c54
Merge remote-tracking branch 'origin/release/2.1' into rybrande/21To22Merge
2018-11-20 15:42:00 -08:00
4046c842af
Update Identity Server dependencies to 2.3.0 ( #2077 )
2018-11-20 15:19:14 -08:00
48528cf69f
Fix templating casing
2018-11-20 12:53:46 -08:00
bd54395fe5
Remove duplicate keys
2018-11-20 12:07:14 -08:00
5e36c334e1
Merge remote-tracking branch 'MetaPackages/rybrande/release22ToSrc' into rybrande/Mondo2.2
2018-11-20 11:10:34 -08:00
2b146e5266
Merge remote-tracking branch 'JavaScriptServices/rybrande/release22ToSrc' into rybrande/Mondo2.2
2018-11-20 11:10:19 -08:00
65ceeb6560
Merge remote-tracking branch 'AADIntegration/rybrande/release22ToSrc' into rybrande/Mondo2.2
2018-11-20 11:09:14 -08:00
a6acf47e79
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 27efce1042
2018-11-20 11:06:50 -08:00
964498a69d
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 7819c2f950
2018-11-20 11:04:10 -08:00
33b736b4a7
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 0efa96de73
2018-11-20 10:57:52 -08:00
b335283ab1
Merge branch 'release/2.1' of github.com:aspnet/AspNetCore into rybrande/Mondo2.1
2018-11-20 10:24:50 -08:00
550435373b
Fix casing in MetaPackages
2018-11-20 10:24:34 -08:00
6fc3eb3bfc
Fix MetaPackage casing
2018-11-20 10:21:21 -08:00
f45dacf924
Fix folder casing ( #4144 )
...
Fix folder casing
2018-11-20 10:02:51 -08:00
d17392bc45
Port Resolve C26496 compiler errors when building in release mode with VS 15.9 ( #4141 )
2018-11-20 10:00:37 -08:00
bfba741326
Merge aspnet/Hosting release/2.2
2018-11-20 09:35:34 -08:00
0f64aa5c01
Merge aspnet/HttpAbstractions release/2.2
2018-11-20 09:15:59 -08:00
feb68c1382
Merge branch 'release/2.1' into release/2.2
2018-11-20 09:13:55 -08:00
9b1cfd59b5
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 0724e6cde1
2018-11-20 09:03:14 -08:00
0063d5a031
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 91db78cf92
2018-11-20 08:37:32 -08:00
3f025e3a38
Make Microsoft.AspNetCore.Server.IntegrationTesting a temporary external dependency
2018-11-19 23:38:13 -08:00
05b8745172
Remove aspnet/Hosting submodule and update targets and projects
2018-11-19 22:25:43 -08:00
dc4c18e9ac
Merge source code from aspnet/Hosting into this repo
2018-11-19 22:02:46 -08:00
87ab2744ce
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 3f7ee338d4
2018-11-19 22:00:32 -08:00
4fcc8b9902
Update targets to build HttpAbstractions projects
2018-11-19 21:34:26 -08:00
98190bdaf9
Merge source code from aspnet/HttpAbstractions into this repo
2018-11-19 21:13:15 -08:00
0ef9993f46
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in d142d58eb4
2018-11-19 21:12:01 -08:00
838cafcc4f
Fix the casing
2018-11-19 17:01:30 -08:00
a11f4c2409
Fix the casing
2018-11-19 17:00:44 -08:00
85f8d8fed5
Merge in 'release/2.2' changes
2018-11-20 00:59:51 +00:00
f98aa3b4a3
Merge remote-tracking branch 'MetaPackages/rybrande/release21ToSrc' into rybrande/Mondo2.1
2018-11-19 16:23:58 -08:00
544b5e68e1
Merge remote-tracking branch 'AADIntegration/rybrande/release21ToSrc' into rybrande/Mondo2.1
2018-11-19 16:23:43 -08:00
80167655b3
Merge remote-tracking branch 'JavaScriptServices/rybrande/release21ToSrc' into rybrande/Mondo2.1
2018-11-19 16:23:20 -08:00
219fd0b300
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 975011071b
2018-11-19 16:20:16 -08:00
151dd77fb8
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 6f02048c3c
2018-11-19 16:18:06 -08:00
f6f7628718
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in ea3a7bc897
2018-11-19 16:14:42 -08:00
4f84c1f58c
Merge remote-tracking branch 'Templating/rybrande/release22ToSrc' into rybrande/Mondo2.2
2018-11-19 11:51:17 -08:00
9dda18a355
Merge remote-tracking branch 'AzureIntegration/rybrande/release22ToSrc' into rybrande/Mondo2.2
2018-11-19 11:51:03 -08:00
8c81ace1a2
Merge remote-tracking branch 'AuthSamples/rybrande/release22ToSrc' into rybrande/Mondo2.2
2018-11-19 11:50:44 -08:00
357c79f619
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in d26f89a6bc
2018-11-19 11:47:50 -08:00
2becec387b
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 7383e532c9
2018-11-19 11:44:35 -08:00
f3ccfa326a
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 031a2ed214
2018-11-19 11:42:11 -08:00
c9e0295d1d
Merge remote-tracking branch 'AzureIntegration/rybrande/release21ToSrc' into rybrande/Mondo2.1
2018-11-19 11:16:52 -08:00
bb361b02f3
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 47e2ba3755
2018-11-19 11:15:08 -08:00
2b46511407
Merge remote-tracking branch 'AuthSamples/rybrande/release21ToSrc' into rybrande/Mondo2.1
2018-11-19 11:10:33 -08:00
b19a969a96
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in d861b70515
2018-11-19 11:07:58 -08:00
5b445e7122
Merge in 'release/2.2' changes
2018-11-19 18:53:48 +00:00
8e77b5f6c0
Merge branch 'release/2.2' of github.com:aspnet/AspNetCore into rybrande/MusicStore2.2
2018-11-19 10:52:23 -08:00
39071a3a4d
Merge remote-tracking branch 'Templating/rybrande/release21ToSrc' into rybrande/Mondo2.1
2018-11-19 10:47:00 -08:00
6cd4ffb192
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 3f26b56fef
2018-11-19 10:38:14 -08:00
50fc0e5e41
Merge in 'release/2.2' changes
2018-11-19 16:43:12 +00:00
e4249dade0
Fix the SiteExtension signing exclusion
2018-11-19 08:42:21 -08:00
46ee4532fb
Merge in 'release/2.2' changes
2018-11-19 16:27:28 +00:00
ca42d0295e
Use property group for sign exclussions
2018-11-19 08:26:28 -08:00
1302590dc8
Merge in 'release/2.2' changes
2018-11-17 01:18:29 +00:00
5e961e27ea
Ignore apphost.exe in runtime store ( #4073 )
2018-11-16 17:17:44 -08:00
83abe6fb00
Merge in 'release/2.2' changes
2018-11-17 00:19:01 +00:00
f7c26f9912
[2.2.1] Use non-pinnable buffer for zero byte read ( #4066 )
2018-11-16 16:18:23 -08:00
9182204495
Merge remote-tracking branch 'MusicStore/rybrande/release22Src' into rybrande/MusicStore2.2
2018-11-16 11:30:49 -08:00
ece5fa46c6
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 33978da1f7
2018-11-16 10:49:57 -08:00
d720319b3a
Merge in 'release/2.2' changes
2018-11-16 17:07:27 +00:00
20f7d3be9d
Prevent SiteExtension OOB build from including root Directory.props/targets ( #4064 )
2018-11-16 09:06:48 -08:00
535282f4e6
Merge in 'release/2.2' changes
2018-11-16 08:30:31 +00:00
1782a70601
Disable flaky selenium tests while debugging ( #4053 )
2018-11-16 00:29:46 -08:00
e6eb842cc9
Merge remote-tracking branch 'MusicStore/ryrande/release21ToSrc' into rybrande/MusicStore21
2018-11-15 16:31:12 -08:00
aed127198a
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in c14416f26f
2018-11-15 16:22:25 -08:00
218281cb8f
Merge in 'release/2.2' changes
2018-11-15 23:55:29 +00:00
7e890e8fa0
Update versions of logging site extensions ( #4038 )
2018-11-15 15:54:50 -08:00
4fae8b9838
Fix websocket disconnect issue
2018-11-15 23:27:48 +00:00
0271428dbe
Merge aspnet/KestrelHttpServer release/2.2 and release/2.1
2018-11-14 21:33:33 -08:00
ad84a1cc71
Merge branch 'release/2.1' into release/2.2
2018-11-14 16:28:38 -08:00
406c80bfb0
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 4598850c20
2018-11-14 16:03:24 -08:00
0782a9dfa9
Merge aspnet/DotNetTools release/2.2
2018-11-14 14:12:52 -08:00
401fd68985
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in d745b8c161
2018-11-14 14:10:28 -08:00
27acef3d46
Merge branch 'release/2.1' into release/2.2
2018-11-14 14:01:43 -08:00
4598850c20
Revert "Use non-pinnable buffer for zero byte read ( #3094 )"
...
This reverts commit 0029b8f053
2018-11-14 13:42:55 -08:00
51c9b7355d
Create Kestrel.sln, update documentation and README, and ensure all Kestrel test projects have the test logger installed
2018-11-14 13:14:47 -08:00
0029b8f053
Use non-pinnable buffer for zero byte read ( #3094 )
2018-11-14 12:05:26 -08:00
02536ff991
Merge source code from aspnet/KestrelHttpServer into this repo
2018-11-14 11:21:49 -08:00
9d0c69f277
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 15ba5065a9
2018-11-14 11:18:51 -08:00
c1c7d711b6
Merge branch 'release/2.1' into release/2.2
2018-11-14 09:27:23 -08:00
a8ec75aac4
Prepare for the 2.2.1 patch
...
* Generate 2.2.0 package baselines
* Update dependencies to 2.2.0
* Update branding to 2.2.1-servicing
2018-11-13 18:21:09 -08:00
87092a2590
Update targets and infrastructure for dotnet-watch et. al.
2018-11-13 15:58:22 -08:00
b3ad3aa989
Merge source code from aspnet/DotNetTools into this repo
2018-11-13 15:37:55 -08:00
a2d855406b
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in eba014d534
2018-11-13 15:36:38 -08:00
9671b9d8c3
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 3b485909eb
2018-11-13 11:21:52 -08:00
ccd098ecad
Update DataProtection to use custom reference resolution
...
This changes DataProtection to build as projects instead of a pseudo-submodule. It replaces Package and ProjectReference with <Reference> items which custom targets then resolve.
2018-11-13 10:28:42 -08:00
bb6901141c
Remove the HtmlAbstractions git submodule and merge Html.Abstractions into this repo
2018-11-13 09:29:27 -08:00
de9609b343
Remove implicit reference to InteralAspNetCoreSdk ( #3998 )
2018-11-12 09:05:17 -08:00
1ab08d70ef
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 252ae0c434
2018-11-09 16:17:15 -08:00
0a44f1c068
Merge branch 'release/2.1' into namc/mondo
2018-11-09 13:11:09 -08:00
fd6b46bc7f
Merge the source code of aspnet/JsonPatch into this repo
2018-11-09 13:07:24 -08:00
27a47d07c5
Reorganize the src/WebSockets/ folder to follow new source code organization conventions
2018-11-09 13:06:13 -08:00
59ed8df382
Add targets and tools for ensuring consistent package versions between servicing builds
2018-11-09 13:05:31 -08:00
74d9728e95
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 218064c300
2018-11-09 12:49:58 -08:00
5db6394769
Always decrement count on HTTP/2 stream completion ( #3087 )
...
#3079
2018-11-09 12:40:51 -08:00
4b4bd68fc7
Downgrade stable package versions and remove duplicate test project ( #3991 )
2018-11-09 11:27:08 -08:00
8356baf7a6
Port ANCM installer changes to 2.1 ( #3874 )
2018-11-09 11:10:33 -08:00
Ryan Brandenburg
Nate McMaster
Justin Kotalik
Javier Calvarro Nelson
Pavel Krymets
dotnet-bot
Ben Adams
John Luo
Stephen Halter