Commit Graph

32612 Commits

Author SHA1 Message Date
dotnet-bot e3f86f3631 Merge in 'release/2.2' changes 2019-01-02 17:58:35 +00: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 0bf06d8cf2 Merge in 'release/2.2' changes 2018-12-21 22:15:53 +00: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
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
Justin Kotalik 37291ea114
Fix IISIntegration folder structure (#6063) 2018-12-21 10:58:10 -08:00
Justin Kotalik 80bb14c3ef
Change build components to C++ Win10 17134 SDK (#4603) 2018-12-21 00:11:06 -08: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
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
Hao Kung efe9b95b14
Improve cdn test reliability (#6044) 2018-12-20 12:21:30 -08: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
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
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
John Luo ddd335be26 Merge branch 'release/2.1' into release/2.2 2018-12-14 16:50:16 -08: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
Justin Kotalik 68f0aff144 security to project ref (#4618) 2018-12-14 14:49:23 -08:00
dotnet-bot a6ff4436ae Merge in 'release/2.2' changes 2018-12-14 20:06:55 +00:00
Nate McMaster cb5458e870
Exclude ancm.mof from code signing
This file is not signable. The sign tool treats .mof as a potential signing candidate by default, even though most .mof files are not signable.
2018-12-14 12:05:30 -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
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