Commit Graph

32761 Commits

Author SHA1 Message Date
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 e1d8a986c1 Merge in 'release/2.1' changes 2018-12-13 22:36:04 +00:00
Nate McMaster 96ea326664
Document custom reference resolution (#4806) 2018-12-13 14:35:02 -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 1d0254977e Merge in 'release/2.2' changes 2018-12-12 21:52:26 +00:00
Ajay Bhargav Baaskaran 5e6c2208fd Merge branch 'release/2.1' into release/2.2 2018-12-12 13:14:20 -08: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 4fc47bd43e Merge in 'release/2.1' changes 2018-12-12 20:58:19 +00:00
Justin Kotalik 74753428e9
Add Vs install script (#4607) 2018-12-12 15:57:00 -05: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 6b95b08599 Merge in 'release/2.2' changes 2018-12-12 01:49:14 +00:00
Nate McMaster d53b5569ae
Merge branch 'release/2.1' into release/2.2 2018-12-11 17:47:37 -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 4c8758bb88 Merge in 'release/2.2' changes 2018-12-11 23:54:15 +00:00
seancpeters 21488b2b04 Add a workaround for a bug in `dotnet tool install` and the scaffolding command line tool (#4580) 2018-12-11 15:53:10 -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 06a695e693 Merge in 'release/2.2' changes 2018-12-08 01:39:25 +00:00
Nate McMaster 696a46c449
Update buildtools to 2.2.1-build-20181207.6 2018-12-07 17:38:10 -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 3878f143eb Merge in 'release/2.2' changes 2018-12-07 23:39:02 +00:00
Nate McMaster 9b8684c811
Update buildtools to 2.2.1-build-20181207.3 2018-12-07 15:37:48 -08:00
dotnet-bot c3e0703f9b Merge in 'release/2.1' changes 2018-12-07 23:09:54 +00:00