66d35bd153
Merge in 'release/2.2' changes
2018-12-18 23:48:35 +00:00
de954ce702
Fixing IIS Tests ( #5682 )
2018-12-18 18:46:56 -05:00
d481817289
Merge in 'release/2.2' changes
2018-12-18 22:33:43 +00:00
03cb4a6e14
Add missing dependencies to the MVC dependencies.props ( #5714 )
2018-12-19 11:32:23 +13:00
967f551968
Merge in 'release/2.2' changes
2018-12-18 20:38:50 +00:00
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
fe0d8ca083
Merge in 'release/2.1' changes
2018-12-18 20:01:33 +00:00
0cbc52ca15
Convert ServerTests to Reference and move to Server folder ( #4686 )
2018-12-18 14:59:47 -05:00
9dda9a3e2a
Merge in 'release/2.2' changes
2018-12-18 18:58:34 +00:00
647fbbac7b
Merge branch 'release/2.1' into ajbaaska/merge-22
2018-12-17 18:40:08 -08:00
ff4db87283
Merge in 'release/2.1' changes
2018-12-17 20:11:45 +00:00
b079041488
Convert Razor to use Reference ( #4954 )
2018-12-17 12:10:40 -08:00
c3a269adc3
Merge in 'release/2.2' changes
2018-12-15 01:29:18 +00:00
da72ac62ba
Merge remote-tracking branch 'origin/release/2.2' into release/2.2
2018-12-14 16:52:45 -08:00
918dc51a1f
Merge in 'release/2.1' changes
2018-12-15 00:27:56 +00:00
019ba081d3
Fix flakiness in RequestsCanBeAbortedMidRead ( #4881 )
...
Addresses aspnet/AspNetCore-Internal#1521
2018-12-14 16:26:54 -08:00
a6112bf0dd
Merge in 'release/2.2' changes
2018-12-15 00:05:19 +00:00
9183145474
Fix package layout for ANCM packages ( #5119 )
2018-12-14 16:04:15 -08:00
f659f0acce
Merge branch 'release/2.1' into release/2.2
2018-12-14 15:48:40 -08:00
97ee5cbcac
Merge in 'release/2.1' changes
2018-12-14 22:50:26 +00:00
68f0aff144
security to project ref ( #4618 )
2018-12-14 14:49:23 -08:00
9b1be901d3
Merge in 'release/2.2' changes
2018-12-14 19:43:29 +00:00
6402a6a971
Fix aspnet/AspNetCore-Internal#1503 - ensure ANCM packages are code signed
2018-12-14 11:41:56 -08:00
8b682dfe85
Merge in 'release/2.2' changes
2018-12-14 19:01:05 +00:00
feb641ddda
Merge branch 'release/2.1' into release/2.2
2018-12-14 09:44:15 -08:00
6133fa4dd6
Merge in 'release/2.1' changes
2018-12-14 16:37:44 +00:00
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
45dca6d8d4
Merge in 'release/2.2' changes
2018-12-14 09:22:46 +00:00
dd662ed2a7
Fix compiling Mvc.sln in 2.2 ( #4955 )
2018-12-14 22:21:44 +13:00
3b0d1253e1
Merge in 'release/2.2' changes
2018-12-14 08:57:43 +00:00
206db0558e
Update buildtools and add properties to skip IIS tests
2018-12-13 23:36:42 -08:00
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
4998ad8622
Merge branch 'merge/release/2.1-to-release/2.2' into release/2.2 ( #4619 )
2018-12-13 22:24:21 -08:00
6adfa32402
Merge branch 'release/2.1' into release/2.2
2018-12-13 22:12:19 -08:00
345fee0149
Merge in 'release/2.1' changes
2018-12-13 19:40:20 +00:00
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
f5b36aa8f2
Merge in 'release/2.1' changes
2018-12-13 01:15:45 +00:00
a3c99028b2
Fix HttpSys Caching_SendFileWithFullContentLength_Cached test ( #4630 )
2018-12-12 17:14:46 -08:00
f1bfecfa03
Merge in 'release/2.2' changes
2018-12-12 22:37:18 +00:00
9e76bec6e1
Fix CORS Functional Tests ( #4610 )
2018-12-12 14:36:14 -08:00
e8c63f6cf9
Merge in 'release/2.1' changes
2018-12-12 22:00:56 +00:00
429719b91d
Make IISIntegration use Reference instead of PackageReference (and reactionary work) ( #4311 )
2018-12-12 16:59:44 -05:00
6de24d6d2c
Merge in 'release/2.2' changes
2018-12-12 21:00:13 +00:00
ad3835c3e2
Removed unnecessary projects ( #4586 ) ( #4612 )
2018-12-12 12:59:04 -08:00
3a21d78ce6
Merge in 'release/2.1' changes
2018-12-12 18:42:13 +00:00
98f2973880
Removed unnecessary projects ( #4586 )
2018-12-12 10:41:06 -08:00
d11a6c823f
Merge in 'release/2.2' changes
2018-12-12 00:14:21 +00:00
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
0f9ad16b09
Add 2.1.7 package archive baselines
2018-12-11 15:58:50 -08:00
156f1e823b
Merge in 'release/2.1' changes
2018-12-11 22:59:22 +00:00
719ff08409
Add RoutingSample.Web to HttpAbstractions.sln
2018-12-11 14:58:05 -08:00
8876e90846
Merge in 'release/2.1' changes
2018-12-11 22:57:48 +00:00
3acdfb3d26
Convert Session to use Reference and move to Middleware folder ( #4576 )
2018-12-11 14:56:42 -08:00
8825a726c1
Merge in 'release/2.1' changes
2018-12-11 22:06:26 +00:00
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
985d49c566
Merge in 'release/2.2' changes
2018-12-11 00:44:52 +00:00
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
6169f4dd59
Merge in 'release/2.1' changes
2018-12-07 23:46:01 +00:00
4c5debd6ea
Skip Autobahn test ( #4488 )
2018-12-07 15:44:59 -08:00
4b9a884a35
Merge in 'release/2.1' changes
2018-12-07 22:31:49 +00:00
5f843f223e
[2.1] Make Antiforgery, ResponseCaching, StaticFiles, and Cors use project ref ( #4484 )
2018-12-07 14:30:50 -08:00
5e9b60a573
Merge in 'release/2.2' changes
2018-12-07 21:49:04 +00:00
5017afa0ad
Merge branch 'release/2.1' to release/2.2
2018-12-07 12:45:42 -08:00
212f701d31
Merge in 'release/2.2' changes
2018-12-07 20:22:15 +00:00
ab8039e2dc
Merge in 'release/2.1' changes
2018-12-07 20:21:15 +00:00
c331a7be14
Rewrite HttpSys response caching tests #1475 ( #4486 ) ( #4511 )
2018-12-07 12:21:12 -08:00
df3e4b98a2
Backport infrastructure cleanup to share sources and project references ( #4513 )
2018-12-07 12:20:13 -08:00
84b41b6f52
Merge in 'release/2.1' changes
2018-12-07 17:22:37 +00:00
ae11d5d62e
Rewrite HttpSys response caching tests #1475 ( #4486 )
2018-12-07 09:21:33 -08:00
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
ab620a2a0d
Merge in 'release/2.1' changes
2018-12-06 20:22:15 +00:00
5c2a701b38
Remove conditional targetframeworks from routing projects ( #4476 )
2018-12-06 12:21:05 -08:00
dfb6f0941d
Merge in 'release/2.1' changes
2018-12-06 06:15:42 +00: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
5fbec5fbb3
Merge in 'release/2.1' changes
2018-12-06 01:02:05 +00: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
9915395424
Merge in 'release/2.1' changes
2018-12-05 00:45:13 +00: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
b0826ab179
Merge in 'release/2.1' changes
2018-12-04 23:31:58 +00: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
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
dotnet-bot
Justin Kotalik
James Newton-King
Stephen Halter
John Luo
Ajay Bhargav Baaskaran
Ajay Bhargav Baaskaran
John Luo
Nate McMaster
Nate McMaster
Nate McMaster
Chris Ross
Mikael Mengistu
dotnet-maestro-bot
Javier Calvarro Nelson
BrennanConroy
Ryan Brandenburg
Chris Ross (ASP.NET)