Commit Graph

14329 Commits

Author SHA1 Message Date
dotnet-bot f94a5f6fd0 Merge in 'release/2.1' changes 2018-12-21 07:52:15 +00:00
Justin Kotalik ce481c6c79
Make JavaScriptServices use ProjectReference (#5953) 2018-12-20 23:50:53 -08:00
dotnet-bot 594e4c4c35 Merge in 'release/2.2' changes 2018-12-21 01:28:47 +00:00
Justin Kotalik d9cf76f63d Merge release/2.1 into 2.2 2018-12-20 16:51:06 -08:00
dotnet-bot 108fa3f911 Merge in 'release/2.1' changes 2018-12-21 00:28:36 +00:00
Ajay Bhargav Baaskaran 7f17d095d8
Convert Mvc to use Reference (#6047)
* Convert Mvc to use Reference

* Use ProjectReference for test assets
2018-12-20 16:27:32 -08:00
dotnet-bot 47325a6419 Merge in 'release/2.1' changes 2018-12-20 20:23:06 +00:00
Hao Kung efe9b95b14
Improve cdn test reliability (#6044) 2018-12-20 12:21:30 -08:00
dotnet-bot 94a236e196 Merge in 'release/2.1' changes 2018-12-20 18:55:13 +00:00
Nate McMaster 686ce02cc8
Remove code for building an analyzers package that never shipped (#6053)
Microsoft.AspNetCore.Analyzers didn't ship in 2.1, and we don't have plans to every ship it in a 2.1.x release.
2018-12-20 10:53:42 -08:00
dotnet-bot 6772da9d90 Merge in 'release/2.2' changes 2018-12-20 18:35:02 +00:00
James Newton-King 4601a26ec2
Fix order in DFA matcher test (#5954) 2018-12-21 07:33:54 +13:00
dotnet-bot 66d35bd153 Merge in 'release/2.2' changes 2018-12-18 23:48:35 +00:00
Justin Kotalik de954ce702
Fixing IIS Tests (#5682) 2018-12-18 18:46:56 -05:00
dotnet-bot d481817289 Merge in 'release/2.2' changes 2018-12-18 22:33:43 +00:00
James Newton-King 03cb4a6e14
Add missing dependencies to the MVC dependencies.props (#5714) 2018-12-19 11:32:23 +13:00
dotnet-bot 967f551968 Merge in 'release/2.2' changes 2018-12-18 20:38:50 +00:00
Stephen Halter 21ef9f3c39
Revert "Fix flakiness in RequestsCanBeAbortedMidRead (#4881)" (#5708)
This was never supposed be be merged into release/2.2 or master since both those branches include aspnet/KestrelHttpServer#2844.

This reverts commit 019ba081d3.
2018-12-18 12:37:25 -08:00
dotnet-bot fe0d8ca083 Merge in 'release/2.1' changes 2018-12-18 20:01:33 +00:00
John Luo 0cbc52ca15 Convert ServerTests to Reference and move to Server folder (#4686) 2018-12-18 14:59:47 -05:00
dotnet-bot 9dda9a3e2a Merge in 'release/2.2' changes 2018-12-18 18:58:34 +00:00
Ajay Bhargav Baaskaran 647fbbac7b Merge branch 'release/2.1' into ajbaaska/merge-22 2018-12-17 18:40:08 -08:00
dotnet-bot ff4db87283 Merge in 'release/2.1' changes 2018-12-17 20:11:45 +00:00
Ajay Bhargav Baaskaran b079041488
Convert Razor to use Reference (#4954) 2018-12-17 12:10:40 -08:00
dotnet-bot c3a269adc3 Merge in 'release/2.2' changes 2018-12-15 01:29:18 +00:00
John Luo da72ac62ba Merge remote-tracking branch 'origin/release/2.2' into release/2.2 2018-12-14 16:52:45 -08:00
dotnet-bot 918dc51a1f Merge in 'release/2.1' changes 2018-12-15 00:27:56 +00:00
Stephen Halter 019ba081d3
Fix flakiness in RequestsCanBeAbortedMidRead (#4881)
Addresses aspnet/AspNetCore-Internal#1521
2018-12-14 16:26:54 -08:00
dotnet-bot a6112bf0dd Merge in 'release/2.2' changes 2018-12-15 00:05:19 +00:00
Nate McMaster 9183145474
Fix package layout for ANCM packages (#5119) 2018-12-14 16:04:15 -08:00
John Luo f659f0acce Merge branch 'release/2.1' into release/2.2 2018-12-14 15:48:40 -08:00
dotnet-bot 97ee5cbcac Merge in 'release/2.1' changes 2018-12-14 22:50:26 +00:00
Justin Kotalik 68f0aff144 security to project ref (#4618) 2018-12-14 14:49:23 -08:00
dotnet-bot 9b1be901d3 Merge in 'release/2.2' changes 2018-12-14 19:43:29 +00:00
Nate McMaster 6402a6a971
Fix aspnet/AspNetCore-Internal#1503 - ensure ANCM packages are code signed 2018-12-14 11:41:56 -08:00
dotnet-bot 8b682dfe85 Merge in 'release/2.2' changes 2018-12-14 19:01:05 +00:00
Nate McMaster feb641ddda
Merge branch 'release/2.1' into release/2.2 2018-12-14 09:44:15 -08:00
dotnet-bot 6133fa4dd6 Merge in 'release/2.1' changes 2018-12-14 16:37:44 +00:00
Nate McMaster 13ae0057fb
Replace .Sources package references with local code (#4801)
Replaces package references the following packages with local code:

Microsoft.AspNetCore.Certificates.Generation.Sources
Microsoft.Extensions.CopyOnWriteDictionary.Sources 
Microsoft.Extensions.ClosedGenericMatcher.Sources
Microsoft.Extensions.ObjectMethodExecutor.Sources
Microsoft.Extensions.PropertyActivator.Sources
Microsoft.Extensions.PropertyHelper.Sources
Microsoft.Extensions.RazorViews.Sources
Microsoft.Extensions.SecurityHelper.Sources
Microsoft.Extensions.StackTrace.Sources
Microsoft.Extensions.WebEncoders.Sources
2018-12-14 08:36:36 -08:00
dotnet-bot 45dca6d8d4 Merge in 'release/2.2' changes 2018-12-14 09:22:46 +00:00
James Newton-King dd662ed2a7
Fix compiling Mvc.sln in 2.2 (#4955) 2018-12-14 22:21:44 +13:00
dotnet-bot 3b0d1253e1 Merge in 'release/2.2' changes 2018-12-14 08:57:43 +00:00
Nate McMaster 206db0558e
Update buildtools and add properties to skip IIS tests 2018-12-13 23:36:42 -08:00
Nate McMaster f0990ec531
Fix build issues with IIS integration projects
Changes:
* Ensure IIS managed and pkg projects build after the native projects
* Update projects to build test
* Update CI checks to build on macOS and Linux
* Use package baselines to manage ANCM packages
2018-12-13 22:53:31 -08:00
Nate McMaster 4998ad8622
Merge branch 'merge/release/2.1-to-release/2.2' into release/2.2 (#4619) 2018-12-13 22:24:21 -08:00
Justin Kotalik 6adfa32402
Merge branch 'release/2.1' into release/2.2 2018-12-13 22:12:19 -08:00
dotnet-bot 345fee0149 Merge in 'release/2.1' changes 2018-12-13 19:40:20 +00:00
John Luo a026e7a4e7
Convert MetaPackages to Reference and move to DefauldBuilder folder (#4687)
* Convert ServerTests to Reference and move to Server folder

* Fix NU1105
2018-12-13 11:39:15 -08:00
dotnet-bot f5b36aa8f2 Merge in 'release/2.1' changes 2018-12-13 01:15:45 +00:00
Chris Ross a3c99028b2
Fix HttpSys Caching_SendFileWithFullContentLength_Cached test (#4630) 2018-12-12 17:14:46 -08:00
dotnet-bot f1bfecfa03 Merge in 'release/2.2' changes 2018-12-12 22:37:18 +00:00
Mikael Mengistu 9e76bec6e1
Fix CORS Functional Tests (#4610) 2018-12-12 14:36:14 -08:00
dotnet-bot e8c63f6cf9 Merge in 'release/2.1' changes 2018-12-12 22:00:56 +00:00
Justin Kotalik 429719b91d
Make IISIntegration use Reference instead of PackageReference (and reactionary work) (#4311) 2018-12-12 16:59:44 -05:00
dotnet-bot 6de24d6d2c Merge in 'release/2.2' changes 2018-12-12 21:00:13 +00:00
Ajay Bhargav Baaskaran ad3835c3e2
Removed unnecessary projects (#4586) (#4612) 2018-12-12 12:59:04 -08:00
dotnet-bot 3a21d78ce6 Merge in 'release/2.1' changes 2018-12-12 18:42:13 +00:00
Ajay Bhargav Baaskaran 98f2973880
Removed unnecessary projects (#4586) 2018-12-12 10:41:06 -08:00
dotnet-bot d11a6c823f Merge in 'release/2.2' changes 2018-12-12 00:14:21 +00:00
dotnet-maestro-bot 38785d0be9 [automated] Merge branch 'release/2.1' => 'release/2.2' (#4577)
* Workaround problems when opening solution files in Visual Studio (#4569)

Changes:

* Condense Routing.sln into HttpAbstractions.sln
* Workaround NU1105 by adding all ProjectReferences to the .sln
* Workaround exceptions in the ReferencesHostBridge by moving Reference items to a temporary item group
* Add a 'startvs.cmd' script for launching VS with the right env variables
* Remove RangeHelper test project
* Move RangeHelper tests into StaticFiles.Tests and add target for NPM restore

* Convert Session to use Reference and move to Middleware folder (#4576)

* Add RoutingSample.Web to HttpAbstractions.sln
2018-12-11 16:13:20 -08:00
Nate McMaster 0f9ad16b09
Add 2.1.7 package archive baselines 2018-12-11 15:58:50 -08:00
dotnet-bot 156f1e823b Merge in 'release/2.1' changes 2018-12-11 22:59:22 +00:00
Nate McMaster 719ff08409
Add RoutingSample.Web to HttpAbstractions.sln 2018-12-11 14:58:05 -08:00
dotnet-bot 8876e90846 Merge in 'release/2.1' changes 2018-12-11 22:57:48 +00:00
John Luo 3acdfb3d26
Convert Session to use Reference and move to Middleware folder (#4576) 2018-12-11 14:56:42 -08:00
dotnet-bot 8825a726c1 Merge in 'release/2.1' changes 2018-12-11 22:06:26 +00:00
Nate McMaster 5151e7b1ed
Workaround problems when opening solution files in Visual Studio (#4569)
Changes:

* Condense Routing.sln into HttpAbstractions.sln
* Workaround NU1105 by adding all ProjectReferences to the .sln
* Workaround exceptions in the ReferencesHostBridge by moving Reference items to a temporary item group
* Add a 'startvs.cmd' script for launching VS with the right env variables
* Remove RangeHelper test project
* Move RangeHelper tests into StaticFiles.Tests and add target for NPM restore
2018-12-11 14:05:21 -08:00
dotnet-bot 985d49c566 Merge in 'release/2.2' changes 2018-12-11 00:44:52 +00:00
Nate McMaster 2c4d586809
Merge 'release/2.1' into release/2.2
Co-authored-by: Justin Kotalik <jukotali@microsoft.com>
2018-12-10 15:56:42 -08:00
dotnet-bot 6169f4dd59 Merge in 'release/2.1' changes 2018-12-07 23:46:01 +00:00
Mikael Mengistu 4c5debd6ea
Skip Autobahn test (#4488) 2018-12-07 15:44:59 -08:00
dotnet-bot 4b9a884a35 Merge in 'release/2.1' changes 2018-12-07 22:31:49 +00:00
Justin Kotalik 5f843f223e
[2.1] Make Antiforgery, ResponseCaching, StaticFiles, and Cors use project ref (#4484) 2018-12-07 14:30:50 -08:00
dotnet-bot 5e9b60a573 Merge in 'release/2.2' changes 2018-12-07 21:49:04 +00:00
Nate McMaster 5017afa0ad
Merge branch 'release/2.1' to release/2.2 2018-12-07 12:45:42 -08:00
dotnet-bot 212f701d31 Merge in 'release/2.2' changes 2018-12-07 20:22:15 +00:00
dotnet-bot ab8039e2dc Merge in 'release/2.1' changes 2018-12-07 20:21:15 +00:00
dotnet-maestro-bot c331a7be14 Rewrite HttpSys response caching tests #1475 (#4486) (#4511) 2018-12-07 12:21:12 -08:00
Nate McMaster df3e4b98a2
Backport infrastructure cleanup to share sources and project references (#4513) 2018-12-07 12:20:13 -08:00
dotnet-bot 84b41b6f52 Merge in 'release/2.1' changes 2018-12-07 17:22:37 +00:00
Chris Ross ae11d5d62e
Rewrite HttpSys response caching tests #1475 (#4486) 2018-12-07 09:21:33 -08:00
dotnet-bot 44f04c8b4d Merge in 'release/2.2' changes 2018-12-07 01:43:13 +00:00
Nate McMaster 569a14ecb8
Merge branch 'release/2.1' into release/2.2 2018-12-06 17:09:03 -08:00
dotnet-bot ab620a2a0d Merge in 'release/2.1' changes 2018-12-06 20:22:15 +00:00
Nate McMaster 5c2a701b38
Remove conditional targetframeworks from routing projects (#4476) 2018-12-06 12:21:05 -08:00
dotnet-bot dfb6f0941d Merge in 'release/2.1' changes 2018-12-06 06:15:42 +00:00
Nate McMaster 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
dotnet-bot 5fbec5fbb3 Merge in 'release/2.1' changes 2018-12-06 01:02:05 +00:00
Justin Kotalik 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
dotnet-bot 19511ed4e9 Merge in 'release/2.2' changes 2018-12-06 00:30:18 +00:00
Nate McMaster c430342dee
Ensure Internal.AspNetCore.Sdk does not end up in the LZMA (#4448) 2018-12-05 16:29:12 -08:00
dotnet-bot b19997eff8 Merge in 'release/2.2' changes 2018-12-05 18:12:44 +00:00
Justin Kotalik 0646bb98b0
Call Flush With fMoreData=false when response isn't allowed to have body (#4403) 2018-12-05 10:11:36 -08:00
dotnet-bot 69a0641c53 Merge in 'release/2.2' changes 2018-12-05 02:13:55 +00:00
Stephen Halter 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
dotnet-bot 9915395424 Merge in 'release/2.1' changes 2018-12-05 00:45:13 +00:00
Justin Kotalik 736083c2f2
Make HttpSys use ProjectReference and move HttpSys into Servers folder (#4335) 2018-12-04 16:44:07 -08:00
Nate McMaster 495e4fe4f7
Merge branch 'release/2.2' 2018-12-04 16:03:47 -08:00
dotnet-bot b0826ab179 Merge in 'release/2.1' changes 2018-12-04 23:31:58 +00:00
Nate McMaster 11fdf9b50a
Fix bad merge of .csproj and update Middleware.sln 2018-12-04 14:59:11 -08:00
Nate McMaster 2c376ebc0c
Merge the release/2.2 branch of aspnet/Identity 2018-12-04 14:49:11 -08:00
Nate McMaster 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
Nate McMaster e261ca5426
Merge release/2.2 from aspnet/Localization 2018-12-04 14:25:25 -08:00
Nate McMaster 7e823a05ec
Merge release/2.2 from aspnet/BasicMiddleware 2018-12-04 14:24:42 -08:00
Nate McMaster 1be2b427de
Merge branch 'release/2.1' into release/2.2 2018-12-04 14:23:24 -08:00
Nate McMaster 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
Nate McMaster 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
Nate McMaster 61e9b3eae9
Merge Identity, Localization and BasicMiddleware 2018-12-04 09:02:03 -08:00
Javier Calvarro Nelson f6b4d65218
[Diagnostics] Fix Diagnostics middleware errors (#4271)
Removes setting two forbidden headers.
2018-12-04 01:18:31 +01:00
Nate McMaster a6b5bb16fd
Merge source code from aspnet/Identity 2018-12-03 15:54:12 -08:00
Nate McMaster 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
dotnet-bot f89d98f241 Merge in 'release/2.1' changes 2018-12-03 22:06:28 +00:00
Chris R 81bc0b1ca8 Fix test asset casing in Hosting funcational tests 2018-12-03 12:50:48 -08:00
dotnet-bot 342d55bef6 Merge in 'release/2.2' changes 2018-12-03 20:13:50 +00:00
Chris R 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
dotnet-bot 3a74f325e2 Merge in 'release/2.1' changes 2018-12-01 00:43:26 +00:00
Mikael Mengistu d9a953dfeb
Autobahn test suite fix(#4302) 2018-11-30 16:42:23 -08:00
Nate McMaster 7078102961
Update targets and projects to build Localization projects 2018-11-30 15:13:05 -08:00
Nate McMaster 7e0f561425
Merge source code from aspnet/Localization 2018-11-30 15:11:31 -08:00
Nate McMaster 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
Nate McMaster 04fc8ae493
Update targets and projects to build BasicMiddleware projects 2018-11-30 14:44:17 -08:00
Nate McMaster 0843320e3e
Merge source code from aspnet/BasicMiddleware 2018-11-30 14:42:07 -08:00
Nate McMaster 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
dotnet-bot 1f8e00993c Merge in 'release/2.1' changes 2018-11-30 17:53:17 +00:00
dotnet-bot ebe1bea714 Merge in 'release/2.2' changes 2018-11-29 23:05:26 +00:00
BrennanConroy 7dc01b6928 Fix 2.2 benchmarks (#4322) 2018-11-29 15:04:24 -08:00
dotnet-bot da7f95dfa2 Merge in 'release/2.2' changes 2018-11-29 17:26:57 +00:00
BrennanConroy e435fd1d23
Fix accidental skipped tests (#4301) 2018-11-29 09:25:52 -08:00
Chris R 63b26d42d2 Replace ManualResetEvent with TaskCompletionSource in TestHost tests 2018-11-28 11:00:22 -08:00
dotnet-bot 93b26d0cc4 Merge in 'release/2.2' changes 2018-11-28 02:33:02 +00:00
Mikael Mengistu 079107aa92 Make gradlew executable (#4275) 2018-11-27 18:31:57 -08:00
Ryan Brandenburg e46623e256 Merge remote-tracking branch 'Razor/rybrande/release22ToSrc' into rybrande/Mondo2.2 2018-11-27 12:26:29 -08:00
Ryan Brandenburg 9c3fee5fea Merge remote-tracking branch 'MvcPrecompilation/rybrande/release22ToSrc' into rybrande/Mondo2.2 2018-11-27 12:26:22 -08:00
Ryan Brandenburg 4d9b60d0ad Merge remote-tracking branch 'Mvc/rybrande/release22ToSrc' into rybrande/Mondo2.2 2018-11-27 12:26:05 -08:00
Ryan Brandenburg c51e6aad29 Merge remote-tracking branch 'SignalR/rybrande/release22ToSrc' into rybrande/Mondo2.2 2018-11-27 12:25:27 -08:00
Ryan Brandenburg 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
Ryan Brandenburg 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
Ryan Brandenburg 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
Ryan Brandenburg 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
dotnet-bot b8a0023106 Merge in 'release/2.1' changes 2018-11-27 20:01:17 +00:00
Chris R 70483af8dd Create Hosting.sln to fix tests 2018-11-27 11:58:52 -08:00
Ryan Brandenburg 6603195a10 Merge remote-tracking branch 'origin/release/2.1' into rybrande/Mondo2.2 2018-11-27 11:57:39 -08:00
dotnet-bot 76823911eb Merge in 'release/2.1' changes 2018-11-27 19:54:08 +00:00
Ryan Brandenburg beb142701e Merge branch 'release/2.1' of github.com:aspnet/AspNetCore into rybrande/Mondo2.1 2018-11-27 11:52:30 -08:00
dotnet-bot 1716c7bd02 Merge in 'release/2.2' changes 2018-11-27 19:45:47 +00:00
Justin Kotalik 4d856dd279
Revert "Target right version of ANCM nuget package (#4194)" (#4261) 2018-11-27 11:44:47 -08:00
dotnet-bot 0ee512f55c Merge in 'release/2.1' changes 2018-11-27 19:26:29 +00:00
Ryan Brandenburg 137bf3dde7 Merge remote-tracking branch 'Razor/rybrande/release21ToSrc' into rybrande/Mondo2.1 2018-11-27 10:57:43 -08:00
Ryan Brandenburg 54e9e55535 Merge remote-tracking branch 'MvcPrecompilation/rybrande/release21ToSrc' into rybrande/Mondo2.1 2018-11-27 10:57:37 -08:00
Ryan Brandenburg 35d2f10a20 Merge remote-tracking branch 'Mvc/rybrande/release21ToSrc' into rybrande/Mondo2.1 2018-11-27 10:57:22 -08:00
Ryan Brandenburg 5eae7ec020 Merge remote-tracking branch 'SignalR/rybrande/release21ToSrc' into rybrande/Mondo2.1 2018-11-27 10:57:13 -08:00
Ryan Brandenburg 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
Ryan Brandenburg 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
Ryan Brandenburg 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
Ryan Brandenburg 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
Stephen Halter dabf5d8ba9 [2.1] [Kestrel] Move AddressRegistrationTests to own TestGroup 2018-11-26 18:28:23 -08:00
dotnet-bot f10e07b745 Merge in 'release/2.2' changes 2018-11-26 23:59:58 +00:00
Chris Ross (ASP.NET) f7d1e98623 Create Hosting.sln and add Logging.Testing depedendency to fix tests 2018-11-26 15:58:17 -08:00
dotnet-bot a382a8eb03 Merge in 'release/2.2' changes 2018-11-26 21:45:57 +00:00
dotnet-bot 0954a15458 Merge in 'release/2.1' changes 2018-11-26 21:44:29 +00:00
Ryan Brandenburg dc11b1b9de Merge branch 'release/2.2' of github.com:aspnet/AspNetCore into rybrande/Mondo2.2 2018-11-26 11:51:27 -08:00
Nate McMaster c8da5ed085
Remove conditional target frameworks on HealthChecks sample (#4235) 2018-11-26 11:50:19 -08:00
Ryan Brandenburg a5da5612bd Merge remote-tracking branch 'Security/rybrande/release22ToSrc' into rybrande/Mondo2.2 2018-11-21 16:36:06 -08:00
Ryan Brandenburg ee050a4725 Merge remote-tracking branch 'Routing/rybrande/release22ToSrc' into rybrande/Mondo2.2 2018-11-21 16:35:57 -08:00
Ryan Brandenburg 7860280dd9 Merge remote-tracking branch 'ResponseCaching/rybrande/release22ToSrc' into rybrande/Mondo2.2 2018-11-21 16:35:46 -08:00
Ryan Brandenburg 33a5544c90 Merge remote-tracking branch 'HttpSysServer/rybrande/release22ToSrc' into rybrande/Mondo2.2 2018-11-21 16:35:36 -08:00
Ryan Brandenburg 396bb7a2d8 Merge remote-tracking branch 'CORS/rybrande/release22ToSrc' into rybrande/Mondo2.2 2018-11-21 16:35:26 -08:00
Ryan Brandenburg 68eafa9d3c Merge remote-tracking branch 'Antiforgery/rybrande/release22ToSrc' into rybrande/Mondo2.2 2018-11-21 16:35:18 -08:00
Ryan Brandenburg 1ee4e2b936 Merge remote-tracking branch 'origin/release/2.1' into rybrande/Mondo2.2 2018-11-21 16:33:42 -08:00
Ryan Brandenburg 7ee9dac67f Merge branch 'release/2.1' of github.com:aspnet/AspNetCore into rybrande/Mondo2.1 2018-11-21 16:26:13 -08:00
Ryan Brandenburg 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
Nate McMaster b2d4f8f2f1
Merge branch 'namc/merge-diag' into release/2.2 2018-11-21 16:11:17 -08:00
Ryan Brandenburg 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
Ryan Brandenburg 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
Ryan Brandenburg 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
Ryan Brandenburg 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
Ryan Brandenburg 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
Ryan Brandenburg 101303eceb Fix RepositoryUrls 2018-11-21 15:55:40 -08:00
Justin Kotalik 89330075b4
Target right version of ANCM nuget package (#4194) 2018-11-21 15:42:55 -08:00
Nate McMaster 8ce7bb7f16
Add HealthChecks to Middleware.sln 2018-11-21 15:39:10 -08:00
Nate McMaster 925746158e
Merge the release/2.2 branch of Diagnostics 2018-11-21 15:36:05 -08:00
Nate McMaster 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
Ryan Brandenburg db7b28d475 Merge remote-tracking branch 'Security/rybrande/release21ToSrc' into rybrande/Mondo2.1 2018-11-21 15:17:40 -08:00
Ryan Brandenburg ff3891fa7a Merge remote-tracking branch 'Routing/rybrande/release21ToSrc' into rybrande/Mondo2.1 2018-11-21 15:17:30 -08:00
Ryan Brandenburg c8e271e8ac Merge remote-tracking branch 'ResponseCaching/rybrande/release21ToSrc' into rybrande/Mondo2.1 2018-11-21 15:17:21 -08:00
Ryan Brandenburg 5c0097bf69 Merge remote-tracking branch 'HttpSysServer/rybrande/release21ToSrc' into rybrande/Mondo2.1 2018-11-21 15:17:11 -08:00
Ryan Brandenburg af2f57386e Merge remote-tracking branch 'CORS/rybrande/release21ToSrc' into rybrande/Mondo2.1 2018-11-21 15:17:00 -08:00
Ryan Brandenburg 3e59973378 Merge remote-tracking branch 'Antiforgery/rybrande/release21ToSrc' into rybrande/Mondo2.1 2018-11-21 15:16:52 -08:00
Ryan Brandenburg 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
Ryan Brandenburg 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
Ryan Brandenburg 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
Ryan Brandenburg 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
Ryan Brandenburg 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
Ryan Brandenburg 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
Nate McMaster 71b1bb8887
Merge branch 'release/2.1' into release/2.2 2018-11-21 14:57:45 -08:00
Ryan Brandenburg c80604a7da
Fix directory structure (#4201)
Fix directory structure
2018-11-21 14:55:25 -08:00
Nate McMaster 6a6c88d80b
Merge source code from aspnet/Diagnostics to this repo 2018-11-21 14:23:55 -08:00
Nate McMaster 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
Ryan Brandenburg 1ac92426ab Merge remote-tracking branch 'Session/rybrande/release22ToSrc' into rybrande/Mondo2.2 2018-11-21 11:15:09 -08:00
Ryan Brandenburg 7b708c291c Merge remote-tracking branch 'StaticFiles/rybrande/release22ToSrc' into rybrande/Mondo2.2 2018-11-21 11:15:02 -08:00