2c376ebc0c
Merge the release/2.2 branch of aspnet/Identity
2018-12-04 14:49:11 -08:00
c5bc96d601
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 4b3d8e5106
2018-12-04 14:45:54 -08:00
e261ca5426
Merge release/2.2 from aspnet/Localization
2018-12-04 14:25:25 -08:00
7e823a05ec
Merge release/2.2 from aspnet/BasicMiddleware
2018-12-04 14:24:42 -08:00
1be2b427de
Merge branch 'release/2.1' into release/2.2
2018-12-04 14:23:24 -08:00
44ec52ebfe
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 2d3ad1cb0f
2018-12-04 14:10:25 -08:00
d8c434febe
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in de1579bdda
2018-12-04 13:57:22 -08:00
61e9b3eae9
Merge Identity, Localization and BasicMiddleware
2018-12-04 09:02:03 -08:00
f6b4d65218
[Diagnostics] Fix Diagnostics middleware errors ( #4271 )
...
Removes setting two forbidden headers.
2018-12-04 01:18:31 +01:00
a6b5bb16fd
Merge source code from aspnet/Identity
2018-12-03 15:54:12 -08:00
c6459614c7
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in fa3cfd08eb
2018-12-03 15:52:23 -08:00
f89d98f241
Merge in 'release/2.1' changes
2018-12-03 22:06:28 +00:00
81bc0b1ca8
Fix test asset casing in Hosting funcational tests
2018-12-03 12:50:48 -08:00
342d55bef6
Merge in 'release/2.2' changes
2018-12-03 20:13:50 +00:00
d73e3b20b8
Merge remote-tracking branch 'origin/release/2.1' into tratcher/testhost/2.2
...
# Conflicts:
# eng/targets/Packaging.targets
# src/Hosting/TestHost/test/ClientHandlerTests.cs
# src/Middleware/WebSockets/test/ConformanceTests/Microsoft.AspNetCore.WebSockets.ConformanceTests.csproj
2018-12-03 09:26:57 -08:00
3a74f325e2
Merge in 'release/2.1' changes
2018-12-01 00:43:26 +00:00
d9a953dfeb
Autobahn test suite fix( #4302 )
2018-11-30 16:42:23 -08:00
7078102961
Update targets and projects to build Localization projects
2018-11-30 15:13:05 -08:00
7e0f561425
Merge source code from aspnet/Localization
2018-11-30 15:11:31 -08:00
d93796fdef
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 0bcac31dd7
2018-11-30 14:58:51 -08:00
04fc8ae493
Update targets and projects to build BasicMiddleware projects
2018-11-30 14:44:17 -08:00
0843320e3e
Merge source code from aspnet/BasicMiddleware
2018-11-30 14:42:07 -08:00
2f2cec4ace
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 1de636cd18
2018-11-30 14:21:50 -08:00
1f8e00993c
Merge in 'release/2.1' changes
2018-11-30 17:53:17 +00:00
ebe1bea714
Merge in 'release/2.2' changes
2018-11-29 23:05:26 +00:00
7dc01b6928
Fix 2.2 benchmarks ( #4322 )
2018-11-29 15:04:24 -08:00
da7f95dfa2
Merge in 'release/2.2' changes
2018-11-29 17:26:57 +00:00
e435fd1d23
Fix accidental skipped tests ( #4301 )
2018-11-29 09:25:52 -08:00
63b26d42d2
Replace ManualResetEvent with TaskCompletionSource in TestHost tests
2018-11-28 11:00:22 -08:00
93b26d0cc4
Merge in 'release/2.2' changes
2018-11-28 02:33:02 +00:00
079107aa92
Make gradlew executable ( #4275 )
2018-11-27 18:31:57 -08:00
e46623e256
Merge remote-tracking branch 'Razor/rybrande/release22ToSrc' into rybrande/Mondo2.2
2018-11-27 12:26:29 -08:00
9c3fee5fea
Merge remote-tracking branch 'MvcPrecompilation/rybrande/release22ToSrc' into rybrande/Mondo2.2
2018-11-27 12:26:22 -08:00
4d9b60d0ad
Merge remote-tracking branch 'Mvc/rybrande/release22ToSrc' into rybrande/Mondo2.2
2018-11-27 12:26:05 -08:00
c51e6aad29
Merge remote-tracking branch 'SignalR/rybrande/release22ToSrc' into rybrande/Mondo2.2
2018-11-27 12:25:27 -08:00
6f80eeda29
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 8ba0a89425
2018-11-27 12:16:27 -08:00
589db8b413
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 032768b063
2018-11-27 12:12:19 -08:00
b659c82df6
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in a6199bbfba
2018-11-27 12:09:17 -08:00
1992701808
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in d0bcdf3dd9
2018-11-27 12:06:02 -08:00
b8a0023106
Merge in 'release/2.1' changes
2018-11-27 20:01:17 +00:00
70483af8dd
Create Hosting.sln to fix tests
2018-11-27 11:58:52 -08:00
6603195a10
Merge remote-tracking branch 'origin/release/2.1' into rybrande/Mondo2.2
2018-11-27 11:57:39 -08:00
76823911eb
Merge in 'release/2.1' changes
2018-11-27 19:54:08 +00:00
beb142701e
Merge branch 'release/2.1' of github.com:aspnet/AspNetCore into rybrande/Mondo2.1
2018-11-27 11:52:30 -08:00
1716c7bd02
Merge in 'release/2.2' changes
2018-11-27 19:45:47 +00:00
4d856dd279
Revert "Target right version of ANCM nuget package ( #4194 )" ( #4261 )
2018-11-27 11:44:47 -08:00
0ee512f55c
Merge in 'release/2.1' changes
2018-11-27 19:26:29 +00:00
137bf3dde7
Merge remote-tracking branch 'Razor/rybrande/release21ToSrc' into rybrande/Mondo2.1
2018-11-27 10:57:43 -08:00
54e9e55535
Merge remote-tracking branch 'MvcPrecompilation/rybrande/release21ToSrc' into rybrande/Mondo2.1
2018-11-27 10:57:37 -08:00
35d2f10a20
Merge remote-tracking branch 'Mvc/rybrande/release21ToSrc' into rybrande/Mondo2.1
2018-11-27 10:57:22 -08:00
5eae7ec020
Merge remote-tracking branch 'SignalR/rybrande/release21ToSrc' into rybrande/Mondo2.1
2018-11-27 10:57:13 -08:00
1b461749cb
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in fd4572874e
2018-11-27 10:52:49 -08:00
0ea7940af5
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 617586a984
2018-11-27 10:49:05 -08:00
f4578f127c
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 5a4fd3e792
2018-11-27 10:43:55 -08:00
20330961ba
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in bc148a0724
2018-11-27 10:40:07 -08:00
dabf5d8ba9
[2.1] [Kestrel] Move AddressRegistrationTests to own TestGroup
2018-11-26 18:28:23 -08:00
f10e07b745
Merge in 'release/2.2' changes
2018-11-26 23:59:58 +00:00
f7d1e98623
Create Hosting.sln and add Logging.Testing depedendency to fix tests
2018-11-26 15:58:17 -08:00
a382a8eb03
Merge in 'release/2.2' changes
2018-11-26 21:45:57 +00:00
0954a15458
Merge in 'release/2.1' changes
2018-11-26 21:44:29 +00:00
dc11b1b9de
Merge branch 'release/2.2' of github.com:aspnet/AspNetCore into rybrande/Mondo2.2
2018-11-26 11:51:27 -08:00
c8da5ed085
Remove conditional target frameworks on HealthChecks sample ( #4235 )
2018-11-26 11:50:19 -08:00
a5da5612bd
Merge remote-tracking branch 'Security/rybrande/release22ToSrc' into rybrande/Mondo2.2
2018-11-21 16:36:06 -08:00
ee050a4725
Merge remote-tracking branch 'Routing/rybrande/release22ToSrc' into rybrande/Mondo2.2
2018-11-21 16:35:57 -08:00
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
3631aced3c
Merge in 'release/2.1' changes
2018-11-20 16:33:13 +00: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
9822e87e04
Merge in 'release/2.1' changes
2018-11-19 20:02:46 +00: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
091a651036
Merge in 'release/2.1' changes
2018-11-16 19:19:47 +00: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
f7633d8be9
Fix ANCM websocket disconnect issue
2018-11-15 15:38:27 -08:00
4fae8b9838
Fix websocket disconnect issue
2018-11-15 23:27:48 +00:00
88273412b8
Flow the cancellation tokens to ReadAsync and WriteAsync ( #2865 )
2018-11-15 12:24:27 -08: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
1858527fb0
Feedback
2018-11-14 09:32:16 -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
f13a49bd2a
Fix websocket disconnect issue
2018-11-13 16:57:15 -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
db0d3c333d
Fix NU1605 build error by ensuring package versions are set correctly in subfolder projects ( #3987 )
2018-11-08 23:40:14 -08:00
bc44d9d4e0
Remove artifact info for StressTestWebSite.zip
2018-11-08 17:50:34 -08:00
0c6e4bebab
Prepare to build the 2.1.7 patch ( #3970 )
...
* Prepare 2.1.7 patch
* Add documentation for how we prepare servicing updates
2018-11-08 17:07:18 -08:00
ba70991d7c
Stop publishing runtime-extension-internal.zip and don't produce StressTestWebsite.zip by default in CI builds ( #3984 )
2018-11-08 17:01:31 -08:00
7f4d10775c
Add signcheck exclusions ( #3985 )
2018-11-08 16:57:07 -08:00
2b87e7be85
Remove invalid Debug.Assert in Http2Connection ( #3080 )
...
The _streams dictionary may not contain the completing stream in
OnStreamCompleted since the IsDraining flag is applied beforehand
which allows it to be removed by the request processing thread.
2018-11-08 15:16:27 -08:00
50bb0b3bc9
Implement no-op HTTP/2 IHttpUpgradeFeature ( #3082 )
2018-11-08 15:10:07 -08:00
3918724616
Merge branch 'release/2.1' into release/2.2
2018-11-08 08:31:22 -08:00
e0bdbb59f7
Reorganize source code in src/DataProtection
...
* Pair implementations and unit tests side by side in src/ and test/ folders
* Update .sln and project paths
* Rename unit test projects from Test.csproj => Tests.csproj
* Update KoreBuild properties to allow building projects, not solutions
2018-11-07 17:33:30 -08:00
263fb650be
Detect shared configuration in ANCM installers and fail if enabled ( #3962 )
2018-11-07 13:19:27 -08:00
9d570d791f
Remove obsolete logging API usage ( #3953 )
2018-11-06 14:50:35 -08:00
7819c2f950
Remove obsolete API usage ( #1784 )
2018-11-06 14:10:24 -08:00
7ef549416f
Add prerelease label to deb installer package version
2018-11-06 14:02:48 -08:00
4f887e5cd4
Merge branch 'release/2.1' into release/2.2
2018-11-06 09:23:17 -08:00
17cccade43
Add IsFinalBuild switch to Windows installer script ( #3892 )
2018-11-06 09:06:10 -08:00
90b11de8f1
Get IISIntegration CI working ( #3875 )
2018-11-05 08:45:11 -08:00
e8fec8eb52
Enable symbols generation for crossgen'ed assemblies on linux-arm ( #3877 )
2018-11-02 18:06:04 -07:00
d36a480253
Build and crossgen linux-arm shared framework in Docker container
2018-11-02 15:14:19 -07:00
99f352a92f
javiercn/check-integrity-validation ( #2052 )
2018-11-02 14:48:06 -07:00
dcece2090c
Remove IISIntegration submodule, add CI ( #3867 )
2018-11-02 14:34:31 -07:00
0e24161d42
Ensure Microsoft.AspNetCore.Server.IntegrationTesting.IIS doesn't produce a finalized version
2018-11-02 11:07:45 -07:00
f2a383dc76
Don't count long tick intervals against rate measurements ( #3070 )
...
This might help address #3015
This only affects rate timeouts. Normal fixed timeouts might deserve the same treatment, but that would require some additional locking to ensure we don't modify the sentinel value.
2018-11-02 10:58:30 -07:00
afab1a5be6
Remove IISIntegration submodule, add CI [2.2] ( #3865 )
2018-11-02 10:22:04 -07:00
303ee1ff56
Fix the filename for the debian installer
2018-11-01 22:50:58 -07:00
27deb6f6f8
Remove dependency on Docker from MSBuild targets ( #3866 )
...
Changes:
* This removes MSBuild targets which invoke `docker` commands to build
deb and rpm installers
* Remove installer targets from the KoreBuild context. Put them into
separate project files
* Simplify the targets used to build installers by reducing duplicate
variable names and deeply nested MSBuild contexts
* Remove unused dependencies from the Docker build context
2018-11-01 15:02:29 -07:00
b56dc070fb
Ensure ApiAuthorization.IdentityServer doesn't build a 2.2.0 package with the rest of RTM ( #2049 )
2018-11-01 13:32:23 -07:00
d745b8c161
Fix #485
2018-11-01 13:00:20 -07:00
22a32500ac
Fix several issues
...
Fix #502
Fix #492
Fix #491
Fix #486
Improves #489
2018-11-01 13:00:20 -07:00
83fe4c089b
Remove M.A.Server.IIS package from 2.1. Fix signing issues ( #3859 )
2018-11-01 11:30:31 -07:00
5e10eb1d1a
Support for ApiAuth using Identity Server
2018-11-01 11:03:28 -07:00
3f04c928f4
Merge branch 'jkotalik/21Merge' into jkotalik/22Merge
2018-10-31 18:38:00 -07:00
fc17530148
Merge remote-tracking branch 'i/jkotalik/22Merge' into jkotalik/22Merge
2018-10-31 18:25:22 -07:00
ce68c8e5be
remove submodule
2018-10-31 18:14:34 -07:00
04d1f6813c
Merge remote-tracking branch 'i/jkotalik/21Merge' into jkotalik/21Merge
2018-10-31 17:18:48 -07:00
7fbedc602c
Move 22 into subfolder
2018-10-31 16:40:21 -07:00
55e809c5dc
Move more files
2018-10-31 16:38:30 -07:00
040fb6f18a
Move IISIntegration into subfolder
2018-10-31 15:51:17 -07:00
d50c0c13b9
Measure the rate of all HTTP/2 output ( #3067 )
...
Prior to this, only the response body counted toward the HTTP/2 response data rate. This PR aligns the HTTP/2 logic closer to the HTTP/1.x logic and measures the rate for all HTTP/2 response data.
This PR also accounts for all response bytes written, not just those that immediately induced backpressure.
2018-10-31 15:34:17 -07:00
a6199bbfba
Add integration and functional tests of `[BindRequired]` on page properties ( #8677 )
...
- #7353
2018-10-31 14:15:14 -07:00
3b485909eb
Fix aspnet/AspNetCore#3634
2018-10-31 14:12:55 -07:00
c802d5ef5f
Redesign HealthStatus (again) ( #520 )
...
* Redesign HealthStatus (again)
This change brings back the ability to return Healthy/Degraded/Unhealthy
in a HealthCheckResult. We tried making this pass/fail in 2.2.0-preview3
and folks writing health checks for their own use pointed out (rightly
so) that it was too limited.
It's still possible for the app developer to configure the failure
status of a health check, but it requires the health check author to
cooperate.
I also got rid of HealthStatus.Failed since it raises more questions
than it answers. It's really not clear that it's valuable for a health
check for behave different when throwing an unhandled exception.
We would still recommend that a health check library handle exceptions
that they know about and return `context.Registration.FailureStatus`.
2018-10-31 12:51:14 -07:00
f2af66bc31
Cleanup InferParameterBindingInfoConvention ( #8665 )
...
* Cleanup InferParameterBindingInfoConvention
* Infer BindingSource for collection parameters as Body. Fixes https://github.com/aspnet/Mvc/issues/8536
* Introduce a compat switch to keep 2.1.x LTS behavior for collection parameters
* Do not infer BinderModelName in InferParameterBindingInfoConvention
2018-10-31 12:24:37 -07:00
c74a945dda
Convert `RouteValueDictionary` values to `string` using `CultureInfo.InvariantCulture` ( #8674 )
...
* Convert `RouteValueDictionary` values to `string` using `CultureInfo.InvariantCulture`
- #8578
- user may override this choice in one case:
- register a custom `IValueProviderFactory` to pass another `CultureInfo` into the `RouteValueProvider`
- values are used as programmatic tokens outside `RouteValueProvider`
nits:
- take VS suggestions in changed classes
- take VS suggestions in files I had open :)
2018-10-30 20:09:17 -07:00
da9318f431
Block enabled 2fa in the UI without cookie consent ( #2035 )
...
* Block enabled 2fa in the UI without cookie consent
* Guard against feature not being there
* Set up tweak
* Fix
2018-10-30 16:23:55 -07:00
9405d058fa
Merge branch 'release/2.1' into release/2.2
2018-10-30 14:54:51 -07:00
734b919b02
Respect SuppressInferBindingSourcesForParameters
...
Fixes https://github.com/aspnet/Mvc/issues/8657
2018-10-30 14:37:21 -07:00
af6527dcef
Fix XML doc on HttpMethodAttribute and derived ones
2018-10-30 13:21:15 -07:00
4c94bc272b
Rename anti-caching option
...
- Renamed the property for configuration response caching headers
- Renamed the options class to avoid conflicts with other type names
Fixes https://github.com/aspnet/Diagnostics/issues/509
2018-10-29 16:44:45 -07:00
8674dd9236
Removed duplocate Id for a RazorDiagnostic
2018-10-29 11:25:29 -07:00
35d2ab37f7
Allow passing a dictionary to ValidationProblemDetails
...
Fixes https://github.com/aspnet/Mvc/issues/8645
2018-10-29 09:56:17 -07:00
ccde910b29
Specify TaskCreationOptions when using TCS
...
Fixes https://github.com/aspnet/Mvc/issues/8558
2018-10-29 09:33:05 -07:00
1afd5b2594
Don't use Map
...
Fixes aspnet/Diagnostics#511 and aspnet/Diagnostics#514
It's really confusing to people that we use Map. Users expect that the
URL they provide for the health check middleware will only process
exact matches. The way it behaves when using map is not optimal for some
of the common patterns.
2018-10-27 21:01:55 -07:00
37e562902f
Support single `IDocumentProvider` method signature
...
- #8593
- also find `IDocumentProvider` using a more-laborious process
- `Type.GetType(string)` requires an assembly-qualified name and we don't know the assembly
- default method name now `GenerateAsync`
- only supported signature is `public Task GenerateAsync(string, TextWriter)`
also:
- handle more error cases in the tool's inside man
- avoid an empty document file if `IDocumentProvider.GenerateAsync(...)` fails
- unwrap an `AggregateException`
nits:
- remove duplicate comments
- change `GetDocumentCommandWorker.TryProcess(...)` to return `false` on failure
- minor because return value is currently ignored
- rename `GetDocumentCommandContext.Output` -> `OutputPath`
- reflect recent change to `dotnet-getdocument`'s `Resources.resx` file in its designer file
2018-10-27 15:27:33 -07:00
eba014d534
Add additional signing configuration for external assemblies in the tools packages
2018-10-27 02:06:55 -07:00
c8b1d2cfe5
Merge branch 'release/2.1' into release/2.2
2018-10-27 01:31:12 -07:00
d957ac9da0
Remove Microsoft.DotNet.GlobalTools.Sdk, upgrade BuildTools, and change VSIX signing cert name
2018-10-27 01:28:14 -07:00
6ecf5374c6
Use 3PartySHA2 instead of 3PartyDual for code-signing Newtonsoft.Json.dll ( #2678 )
2018-10-26 23:40:22 -07:00
6c45bfc0dc
Merge 2.1 -> 2.2 ( #2030 )
2018-10-26 14:52:03 -07:00
fa3cfd08eb
Remove IdentityService ( #2028 )
...
As a part of preparing this repo for merging into aspnet/AspNetCore, this code is being removed as it is currently not in a "shipping" state for 2.1.
2018-10-26 14:05:44 -07:00
ba67b04d9d
Ensure IsTestProject=false in Microsoft.AspNetCore.Identity.Specification.Tests.csproj
...
This isn't really a test project. It's a class library which contains testing compontents. Because 'xunit' is referenced, IsTestProject=true, which
messes up some of the build logic we have for handling code signing and test runners
2018-10-26 12:26:16 -07:00
6bb292cfcc
Add test for metadata precedence ( #8642 )
2018-10-27 07:59:15 +13:00
6bafc157e7
Update code signing config to exclude .js and .ttf files in template packages
2018-10-26 11:51:23 -07:00
2adf798ba0
Fix peer dependencies in React templates
2018-10-26 11:46:48 -07:00
a74235c7ec
Reflect Access-Control-Request-Headers and Access-Control-Request-Method when policy is configured to support wildcard
...
Fixes https://github.com/aspnet/AspNetCore/issues/3684
2018-10-26 11:11:33 -07:00
395b681348
Add HTTP/2 request body data rate limit ( #3051 )
2018-10-26 10:46:46 -07:00
99f2ecd02f
Move transformation tests from AzureIntegration ( #3726 )
2018-10-26 09:49:19 -07:00
168be7b561
Use the correct logging category inside RegisterModel
2018-10-25 15:44:59 -07:00
51de582c83
[ Fixes #2002 ] UI package has path error ( #2024 )
2018-10-25 15:33:49 -07:00
958e0b1d9f
Get rid of Page1 Page2
2018-10-25 15:12:31 -07:00
ae122d9bc0
Include rid-specific runtime packages in the list of artifacts
2018-10-25 14:42:00 -07:00
77a3089c8d
Workaround quirks in NuGet
...
* Disable package analysis because it incorrectly issues NU5109 on macOS, but not windows
* Normalize file paths because if you mix slashes, NuGet will just skip the entire folder
* Normalize the project path given to restore. If it not normalized, restore skips the project and issues a warning
2018-10-25 14:27:46 -07:00
b05185f1f1
ESLint ( #796 )
...
Include ESLint in react templates
2018-10-25 12:27:39 -07:00
9b3d1f56fd
Handle peer dependency warnings ( #794 )
...
Handle peer dependency warnings
2018-10-25 12:00:49 -07:00
8c20892290
2.2: Remove BrowserLink from templates ( #801 )
...
This removes support for the `--use-browserlink` flag from the templates. The Microsoft.VisualStudio.Web.BrowserLink package will still ship in 2.2, but users who want this should use `dotnet add package Microsoft.VisualStudio.Web.BrowserLink` instead.
2018-10-25 10:49:44 -07:00
2d6643bc85
Cleanup Microsoft.NET.Sdk.Razor package output
...
* Remove unnecessary \ incorrect package references
* Remove extraneous build outputs in the tasks project that weren't present when the tasks were in Razor.Design
2018-10-25 09:26:04 -07:00
044f613804
Include failed HRESULTs and exceptions in FREB log ( #1548 )
2018-10-25 08:48:21 -07:00
de185b6a06
Duplicate debug log handle for console logging ( #1558 )
2018-10-25 08:47:31 -07:00
11d0b328ba
Remove VS.Web.CodeGeneration packages from the fallback folder cache ( #3717 )
2018-10-24 21:05:44 -07:00
7bde7399e9
2.2: remove Microsoft.VisualStudio.Web.CodeGeneration.Design from templates ( #802 )
...
This package does not need to be in the project until someone uses Visual Studio code generation. Visual Studio will automatically add this package when scaffolding is used for the first time, so it's unnecessary to put this in our templates.
2018-10-24 17:42:02 -07:00
Nate McMaster
Javier Calvarro Nelson
dotnet-bot
Chris R
Mikael Mengistu
BrennanConroy
Ryan Brandenburg
Justin Kotalik
Stephen Halter
Chris Ross (ASP.NET)
Nate McMaster
Pavel Krymets
Ben Adams
John Luo
John Luo
Mike Lorbetske
Doug Bunting
Ryan Nowak
Pranav K
Hao Kung
Piotr Wosiek
Ajay Bhargav Baaskaran
Doug Bunting
James Newton-King
Wouter Huysentruit