Commit Graph

302 Commits

Author SHA1 Message Date
Pavel Krymets f44c175ec6
Enable logging branch SiteExtension (#6715) 2019-01-16 08:56:12 -08:00
John Luo 17b6ce8bd6 Merge branch 'release/2.2' 2019-01-15 18:49:54 -08:00
Pranav K 86071c9db4
Add Components packages to shared fx (#6722)
* Add Components packages to shared fx

* Add Microsoft.AspNetCore.Components \ Microsoft.AspNetCore.Components.Browser to shared fx
* Update build to use Microsoft.InteropJS package produced from Extensions repo
* Remove some package references from components template

Fixes https://github.com/aspnet/AspNetCore/issues/6442
2019-01-15 18:05:42 -08:00
Pranav K d74833c2d7
Update Razor Sdk version (#6713)
* Update Razor Sdk version

* Use Razor SDK version with workaround for https://github.com/aspnet/AspNetCore/issues/6500
* Remove package reference to Razor SDK in template
2019-01-15 15:46:21 -08:00
James Newton-King 92680b355f
Change consumes behavior to ignore requests with no content type (#6645) 2019-01-16 11:55:54 +13:00
Stephen Halter 0622513058
Wait to dispose RequestAborted CTS (#4447) 2019-01-15 14:54:10 -08:00
James Newton-King 180f735ac8
Fix non-parameter route constraints not called with endpoint routing for 2.2 (#6587) 2019-01-16 11:16:35 +13:00
Pavel Krymets 874a67a242 Add @aspnet/signalr to PackagesInPatch (#6716) 2019-01-15 11:17:02 -08:00
Mikael Mengistu 852d890cd6
Check HubConnection state before running invoke logic (#4400) 2019-01-15 11:15:21 -08:00
Pavel Krymets 437baf6f5e
Port Handle EOF HResult from async callback to 2.2 (#6483) 2019-01-15 10:33:26 -08:00
Chris Ross 6a44aca6a2
React to WebHostBuilderFactory changes (#6460) 2019-01-15 08:09:27 -08:00
John Luo 38c0d5a50c
Use object indirection in HttpContextAccessor (#1066) (#6036) 2019-01-14 20:31:36 -08:00
Doug Bunting 63ee551b6b
Merge `release/2.2` to `master` 2019-01-14 20:23:51 -08:00
John Luo 8f1eedf5a9 Merge branch 'release/2.1' into release/2.2 2019-01-14 19:04:39 -08:00
BrennanConroy a9b737b793
Fix broken definitions file (#6343) 2019-01-14 18:46:07 -08:00
John Luo c2aa2957f6 Merge fixes 2019-01-14 14:13:40 -08:00
John Luo 90a9fa7aac Merge branch 'release/2.1' into release/2.2 2019-01-14 12:57:34 -08:00
Chris Ross 87af0c3f1f
Update Google Auth UserInfo endpoint (#6338)
* Update Google Auth UserInfo endpoint #6069

* Add Google to PatchConfig
2019-01-14 12:28:25 -08:00
Mikael Mengistu 5e825f4fd8
Update the package baseline (#6614) 2019-01-14 12:21:45 -08:00
Nate McMaster 7f7723bdf2
Consume dependencies updates automatically via darc (#6676)
This refactors the list of dependency versions to support consuming updates automatically via darc and maestro.
2019-01-14 12:01:31 -08:00
Doug Bunting 970bced25c
Update branding to 2.2.2 (#6608)
- pin System.Net.WebSockets.WebSocketProtocol to version 4.5.3
- update Directory.Build.targets files to correct build issues
- fix duplicate metadata during static analysis
2019-01-14 11:40:01 -08:00
Nate McMaster 3d5deb1220
Merge branch 'release/2.2' 2019-01-14 11:14:58 -08:00
Nate McMaster 089912cd1b
Switch queues used during Windows builds (#6667) 2019-01-14 10:07:12 -08:00
Mikael Mengistu a06b0e3968
Prep for 2.1.8 Patch (#6632) 2019-01-11 16:57:45 -08:00
Nate McMaster b4f869b2ff
Switch agent queues used on Windows builds (#6627) 2019-01-11 16:23:13 -08:00
Nate McMaster a9132ad26c
Switch agent queues used during Windows builds 2019-01-11 15:16:57 -08:00
Nate McMaster 676cbee9d0
Merge branch 'release/2.2' 2019-01-11 14:52:01 -08:00
Nate McMaster 5810af5ce7
Fix code-signing metadata for the SignalR java client (#6607) 2019-01-11 11:27:04 -08:00
Nate McMaster 3cd5054eb5
Merge branch 'release/2.2' 2019-01-11 07:20:00 -08:00
Nate McMaster 4c8db32b1c
Don't restore npmproj files in parallel (#6560)
NPM does not handle this well, so only run one NPM command at a time
2019-01-10 08:21:26 -08:00
Nate McMaster 22f3166fa6
Merge branch 'release/2.1' into release/2.2 2019-01-10 01:22:10 -08:00
John Luo e5d943a7e3
Convert MvcPrecomp to Reference (#6472)
* Convert MvcPrecomp to use Reference and move to MVC
2019-01-09 18:48:01 -08:00
Nate McMaster 0f65d44482
Merge branch 'release/2.2' 2019-01-09 18:09:25 -08:00
Pavel Krymets b6bdffe247
Remove copy targets from ResolveIISReferences (#6539) 2019-01-09 14:05:41 -08:00
Nate McMaster d3838620d6
Convert SignalR projects to build with ProjectReference (#6457)
Part of #4246 

Changes:
* Update source code layout to follow the new conventions for this repo
* Update project files to use `<Reference>`
* Update targets to build NPM packages
* Update BuildTools to support custom 'restore' and 'test' targets
2019-01-09 13:12:35 -08:00
Pranav K cdc66c5f98 Move JSON.NET specific features to a separate assembly 2019-01-08 12:49:29 -08:00
Pavel Krymets 3b1a89c1fc
Use TargetPath for signing files (#6485) 2019-01-08 10:08:09 -08:00
Pavel Krymets 412bd4935e
Assign FilesToSign in a target (#6459) 2019-01-07 14:57:35 -08:00
dotnet-bot c06eec1e8f Merge in 'release/2.2' changes 2019-01-07 21:31:03 +00:00
Pavel Krymets 11b531c189
Only sign DynamicLibrary cpp projects (#6450) 2019-01-07 12:04:33 -08:00
Justin Kotalik 2e67864995 Merge branch 'release/2.1' into release/2.2 2019-01-07 10:27:41 -08:00
Pavel Krymets 6699fd056e
Add FilesToSign to all .cpp projects (#6443) 2019-01-07 10:05:12 -08:00
dotnet-bot 973b4b2fbf Merge in 'release/2.1' changes 2019-01-07 17:35:10 +00:00
Justin Kotalik 375e9d2cbd
Make music store project ref (#6313) 2019-01-07 09:34:05 -08:00
Nate McMaster edfb2ab8ab
Merge branch 'release/2.2' 2019-01-05 00:34:13 -08:00
dotnet-bot 590fe38284 Merge in 'release/2.2' changes 2019-01-04 22:20:08 +00:00
Nate McMaster 9556cc133d
Merge branch 'release/2.1' into release/2.2 2019-01-04 14:17:28 -08:00
dotnet-bot da77274259 Merge in 'release/2.1' changes 2019-01-04 18:01:45 +00:00
Nate McMaster 436076fd55
Fix broken tests and VS solutions caused by source code reorganization and other build infra cleanup
Changes:
* Fix broken tests and VS solutions caused by source code reorganization
* Add a check to validate generated code and solutions on PRs
* backport some source code reorg to src/Identity
* Fix startvs.cmd if you've already run build.ps1
* Add PR checks for tests on Linux/macOS
* Skip broken Nginx tests
* Add conditions to skip IIS tests on non-Windows platforms
2019-01-04 10:00:26 -08:00
Pavel Krymets 143a727113
Remove AspNetCoreModule virtual projects (#6317) 2019-01-04 09:40:40 -08:00
Nate McMaster bfec2c14be
Merge branch 'release/2.2' 2019-01-03 12:18:01 -08:00
dotnet-bot 291b346201 Merge in 'release/2.2' changes 2019-01-03 00:55:40 +00:00
Nate McMaster 65ff6e951a
Merge branch release/2.1 into release/2.2 2019-01-02 14:34:45 -08:00
dotnet-bot df29851149 Merge in 'release/2.2' changes 2019-01-02 19:20:51 +00:00
Nate McMaster 7e38b563bd
Merge branch 'release/2.1' to release/2.2 2019-01-02 10:29:38 -08:00
Justin Kotalik 6efb449c26 Merge release/2.2 into master 2019-01-02 10:17:34 -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 d53686868c
Merge branch 'release/2.1' into release/2.2 2018-12-31 14:45:29 -08:00
Justin Kotalik 2b7a3a222a Build Windows Installers using the repo's main build script and repotasks (#6139)
Follow-up to #6078

This should solve race conditions in restoring .wixproj files.

Co-authored-by: Nate McMaster <natemcmaster@users.noreply.github.com>
Co-authored-by: Justin Kotalik <jkotalik@users.noreply.github.com>
2018-12-31 10:54:15 -08:00
Justin Kotalik e8d898dcd9 Merge branch 'release/2.2' 2018-12-26 14:21:28 -08:00
Ajay Bhargav Baaskaran 3787fbf3a3 Merge branch 'release/2.2' 2018-12-21 18:29:32 -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
Nate McMaster 4eb495c74f
Improve InstallVisualStudio.ps1 (#6089)
* Support installing Community, Professional, or Enterprise versions of VS.
* Remove messages about build agents.
* Add examples to docs and the help output.
2018-12-21 14:55:31 -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
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 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
Nate McMaster 354c636498
Update Windows installer projects to use ProjectReference (#6078)
Changes:
* Build installer projects in parallel.
* Use `ProjectReference` to ferry bits between installer projects.
* Don't build wixproj to a unified output directory. This was only done to simplify finding file paths to MSI's built by other projects, but ProjectRef solves that.
* Add a VS solution for working on wixproj and the associated C++ custom actions.
   * To make wixproj work in VS, I replaced default globs with listing .wxs and .wxl files in the wixproj file.
* Add a target to copy the installers to the artifacts directory according to the layout described in /docs/Artifacts.md
2018-12-21 09:44:31 -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
Nate McMaster 92b40a4dbc
Restore accidental deletion of common.psm1 2018-12-20 17:34:06 -08:00
Nate McMaster c3beb1f9b1
build.cmd/sh changes (#5958)
Update the build scripts to support building subfolders or subgroups of projects

* Add build scripts for ci
* Remove obsolete scripts
* Add flags like --test and --pack to control running just test or packaging
* Add flags like --managed and --native to control building sub-types of projects
* Remove KoreBuild bootstrapper flags
* Update to extensions 3.0.0-preview.18619.1 (needed to get a fix for aspnet/Extensions#815 to make this change work on MSBuild.exe)
2018-12-20 16:52:15 -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
Ajay Bhargav Baaskaran 2a696f6a1c Merge branch 'release/2.2' 2018-12-18 12:50:01 -08: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
John Luo b8db81898a Merge remote-tracking branch 'origin/master' 2018-12-17 15:16:21 -08:00
John Luo 98636fed6d Merge branch 'release/2.2' 2018-12-17 14:24:30 -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
James Newton-King 443b1449ff
Update Newtonsoft.Json to 12.0.1 and Newtonsoft.Json.Bson to 1.0.2 (#5122) 2018-12-18 08:55:37 +13: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 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
Nate McMaster 02780bac26
Merge branch 'release/2.2' 2018-12-14 16:03:16 -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 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 3b0d1253e1 Merge in 'release/2.2' changes 2018-12-14 08:57:43 +00: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
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 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
Chris Ross 12966c63a6
Change DataProtection projects to target netcoreapp3.0 #3754 (#4473) 2018-12-12 10:04:36 -08:00
Nate McMaster d12827e609
Merge branch 'release/2.2' 2018-12-11 18:04:58 -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
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
Nate McMaster 790ae47055
Merge branch 'release/2.2' 2018-12-10 17:41:14 -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
Nate McMaster c612eb8730
Merge branch 'release/2.2' 2018-12-07 14:50:17 -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 8d24c99fda Merge in 'release/2.2' changes 2018-12-07 21:59:33 +00:00
John Luo 226330b14c
Exclude binlog files from sign check (#4516) 2018-12-07 13:58:27 -08:00
Nate McMaster 85e2147ff0
Merge branch 'release/2.2' 2018-12-07 11:11:44 -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 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
Nate McMaster e0bbda07fc
Update basic middleware projects to netcoreapp3.0 2018-12-05 10:06:29 -08:00
Nate McMaster 62f9655a2f
Merge branch 'release/2.2' 2018-12-05 08:54:38 -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 1be2b427de
Merge branch 'release/2.1' into release/2.2 2018-12-04 14:23:24 -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 7078102961
Update targets and projects to build Localization projects 2018-11-30 15:13:05 -08:00
Nate McMaster 04fc8ae493
Update targets and projects to build BasicMiddleware projects 2018-11-30 14:44:17 -08:00
Nate McMaster def3dc0f2b
Merge branch 'release/2.2' 2018-11-30 11:15:26 -08:00
Chris R cdb9d0bc68 Prepare to patch WebSockets 2018-11-29 10:55:57 -08:00
Chris R 2720c28047 Prepare to patch WebSockets 2018-11-29 10:39:29 -08:00
Nate McMaster 8b48191120
Ensure static analysis gets the right package versions when patching a package 2018-11-28 16:46:05 -08:00
Nate McMaster b38f936f31
Ensure Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets is included in 2.2.1 (#4308) 2018-11-28 16:04:59 -08:00