Nate McMaster
7e38b563bd
Merge branch 'release/2.1' to release/2.2
2019-01-02 10:29:38 -08:00
dotnet-bot
e3f86f3631
Merge in 'release/2.2' changes
2019-01-02 17:58:35 +00:00
dotnet-bot
47d2a6722c
Merge in 'release/2.1' changes
2019-01-02 17:57:44 +00:00
Nate McMaster
d66537c7d1
Convert Azure hosting startup and integration projects to use ProjectRef ( #6207 )
2019-01-02 09:56:39 -08:00
Nate McMaster
61e505c894
Merge branch 'release/2.1' into release/2.2
2019-01-02 08:58:22 -08:00
dotnet-bot
7d8eb101a8
Merge in 'release/2.2' changes
2019-01-02 16:46:58 +00:00
Justin Kotalik
6dcb847edf
Reference testsite.props in test asset ( #6138 )
2018-12-31 14:45:33 -08:00
Justin Kotalik
d53686868c
Merge branch 'release/2.1' into release/2.2
2018-12-31 14:45:29 -08:00
dotnet-bot
13253dab22
Merge in 'release/2.1' changes
2018-12-21 23:30:46 +00:00
John Luo
edcee859f0
Convert Identity to Reference ( #6086 )
...
* Convert Identity to Reference
* Remove Microsoft.AspNet.Identity.AspNetCoreCompat
2018-12-21 15:29:35 -08:00
dotnet-bot
0bf06d8cf2
Merge in 'release/2.2' changes
2018-12-21 22:15:53 +00:00
dotnet-bot
ae6d9d772f
Merge in 'release/2.1' changes
2018-12-21 21:38:00 +00:00
Justin Kotalik
167695fad2
Port native project ref changes to 2.1 ( #6071 )
2018-12-21 13:36:57 -08:00
Nate McMaster
f4bb260444
Merge branch release/2.1 into release/2.2
2018-12-21 13:24:33 -08:00
dotnet-bot
68bd2329e1
Merge in 'release/2.2' changes
2018-12-21 21:19:09 +00:00
Nate McMaster
21bdedbe4f
Merge release/2.1 into release/2.2
2018-12-21 12:38:10 -08:00
dotnet-bot
d13dd578f8
Merge in 'release/2.1' changes
2018-12-21 19:44:18 +00:00
Nate McMaster
3641761d18
Convert AADIntegration projects to ProjectRef ( #6082 )
2018-12-21 11:43:09 -08:00
Ajay Bhargav Baaskaran
af2461d524
Merge branch 'release/2.1' into release/2.2
2018-12-21 11:38:25 -08:00
dotnet-bot
0ec3101fe1
Merge in 'release/2.2' changes
2018-12-21 19:03:24 +00:00
Justin Kotalik
f1b125d69f
Restore IISIntegration Unit test project ( #6068 )
2018-12-21 11:02:18 -08:00
dotnet-bot
2ef7d55ef8
Merge in 'release/2.1' changes
2018-12-21 18:59:15 +00:00
Justin Kotalik
37291ea114
Fix IISIntegration folder structure ( #6063 )
2018-12-21 10:58:10 -08:00
dotnet-bot
10953c65c7
Merge in 'release/2.1' changes
2018-12-21 08:12:24 +00:00
Justin Kotalik
80bb14c3ef
Change build components to C++ Win10 17134 SDK ( #4603 )
2018-12-21 00:11:06 -08:00
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