44f04c8b4d
Merge in 'release/2.2' changes
2018-12-07 01:43:13 +00:00
569a14ecb8
Merge branch 'release/2.1' into release/2.2
2018-12-06 17:09:03 -08:00
5c2a701b38
Remove conditional targetframeworks from routing projects ( #4476 )
2018-12-06 12:21:05 -08:00
50bea05918
Refactor Routing to use ProjectReference and move into src/Http folder ( #4441 )
...
Changes:
* Stop producing Microsoft.AspNetCore.Routing.DecisionTree.Sources. I could not find any usages outside of the Microsoft.AspNetCore.Routing assembly, so I've moved this to be a subfolder of code in the Microsoft.AspNetCore.Routing project.
* Stop building src/Routing as a submodule. Use ProjectReference instead
* Move projects from src/Routing into src/Http/Routing/ and src/Http/Routing.Abstractions/
* Update package baselines and dependencies to support building routing projects and samples
2018-12-05 22:14:22 -08:00
0588b13f5b
Fix 2.1 build issues and remove obsolete build code ( #4443 )
...
- Stop producing the 'Universe' lineup package
- Removes all PackageLineup code
- Use full msbuild on Windows
- Fix invalid reference to internal.aspnetcore.sdk in 2.1.x
- Fix shared folder references for PackageArchive task.
2018-12-05 17:01:02 -08:00
19511ed4e9
Merge in 'release/2.2' changes
2018-12-06 00:30:18 +00:00
c430342dee
Ensure Internal.AspNetCore.Sdk does not end up in the LZMA ( #4448 )
2018-12-05 16:29:12 -08:00
b19997eff8
Merge in 'release/2.2' changes
2018-12-05 18:12:44 +00:00
0646bb98b0
Call Flush With fMoreData=false when response isn't allowed to have body ( #4403 )
2018-12-05 10:11:36 -08:00
69a0641c53
Merge in 'release/2.2' changes
2018-12-05 02:13:55 +00:00
f6e691f26a
Move InMemory.FunctionalTests to own TestGroup
...
It looks like some shutdown timeouts are cause by CPU starvation
2018-12-04 17:54:42 -08:00
736083c2f2
Make HttpSys use ProjectReference and move HttpSys into Servers folder ( #4335 )
2018-12-04 16:44:07 -08:00
495e4fe4f7
Merge branch 'release/2.2'
2018-12-04 16:03:47 -08:00
11fdf9b50a
Fix bad merge of .csproj and update Middleware.sln
2018-12-04 14:59:11 -08:00
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
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
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
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
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
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
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
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
dotnet-bot
Nate McMaster
Nate McMaster
Justin Kotalik
Stephen Halter
Javier Calvarro Nelson
Chris R
Mikael Mengistu
BrennanConroy
Ryan Brandenburg
Chris Ross (ASP.NET)