Commit Graph

12872 Commits

Author SHA1 Message Date
Ryan Brandenburg 37399bc217 Merge branch 'master' of github.com:aspnet/AspNetCore into rybrande/MusicStoreMaster 2018-11-19 12:34:59 -08:00
ASP.NET CI 0b8fe9ded9 Updating BuildTools from 3.0.0-build-20181114.5 to 3.0.0-build-20181116.1
[auto-updated: buildtools]
2018-11-19 11:56:13 -08:00
ASP.NET CI db42dd7faa Updating submodule(s)
AADIntegration => 3c282a4f5a
AuthSamples => 8f471bf65b
CORS => c39d85f6df
Diagnostics => 082d505977
Hosting => f6cda4fab7
HttpAbstractions => 962ec07bdb
HttpClientFactory => 7c4f9479b4753a37c8b0669a883002e5e448cc94
Identity => 68b878f0e1
JavaScriptServices => e657e7d79a
Localization => 60a3d57a3e
MetaPackages => 501dd3924b
MusicStore => aca4b432e1
Mvc => 2414db256f
Razor => 6c8e900d11
Routing => aed55d4517
Security => e053878464
ServerTests => 619d358585
Session => abbdfb72ef
SignalR => 2c3ebd1648
Templating => 514fcdcba5

[auto-updated: submodules]
2018-11-19 11:56:01 -08:00
Ryan Brandenburg 6044a66a63 Have the trailing slash 2018-11-19 11:28:19 -08:00
Nate McMaster 9954f5a703
Fix MSB4062 - fix conflicting build tools dependencies by ensuring the same version is used 2018-11-19 11:16:03 -08:00
Ryan Brandenburg 50acf42eda Fix submodule 2018-11-19 11:03:12 -08:00
Ryan Brandenburg 9149fb825d Merge remote-tracking branch 'MusicStore/rybrande/masterToSrc' into rybrande/MusicStoreMaster 2018-11-19 11:01:06 -08:00
Ryan Brandenburg 92c01ef13e Merge branch 'rybrande/release22Src' into rybrande/masterToSrc 2018-11-19 10:57:51 -08:00
Ryan Brandenburg 6b45771a1b Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in aca4b432e1
2018-11-19 10:57:15 -08:00
Nate McMaster 137a72f85d
React to the removal of Microsoft.AspNetCore.ApplicationInsights.HostingStartup 2018-11-19 09:43:13 -08:00
Nate McMaster dcba1953de
Fix failing test when building the win-arm shared framework 2018-11-16 17:56:34 -08:00
Nate McMaster fd1a5b43f1
Generate PlatformManifest and package conflict overrides for Microsoft.AspNetCore.App (#4072)
This generates additional metadata for the .NET Core SDK to resolve conflicts between Microsoft.AspNetCore.App and PackageReferences which contain the same assemblies.
2018-11-16 16:36:14 -08:00
Stephen Halter fb055cddf9 Merge branch 'release/2.2' 2018-11-16 16:21:08 -08:00
Ben Adams f7c26f9912 [2.2.1] Use non-pinnable buffer for zero byte read (#4066) 2018-11-16 16:18:23 -08:00
Nate McMaster 0e12274a8e
Flatten the dependency graph of Microsoft.AspNetCore.App (#4061)
This changes the way Microsoft.AspNetCore.App works to follow patterns set by Microsoft.NETCore.App. Instead of being a metapackage with dozens of dependencies, this package has no dependencies. It uses RID-splitting to deliver standalone assets for self-contained deployments.

Changes:
* Implements RID-split packages for Microsoft.AspNetCore.App.
* Update shared fx deps.json generation to only include entries for the RID-specific metapackages
* Include platform-specific packages in publish output
* Remove all nuspec dependencies of Microsoft.AspNetCore.App and collect all references into the package.
2018-11-16 15:16:15 -08:00
ASP.NET CI 658653808d Updating submodule(s)
HttpClientFactory => 7c4f9479b4753a37c8b0669a883002e5e448cc94
MusicStore => aca4b432e1
Templating => 514fcdcba5

[auto-updated: submodules]
2018-11-16 20:04:04 +00:00
Ryan Brandenburg 6809eeeda4 Merge branch 'ryrande/release21ToSrc' into rybrande/release22Src 2018-11-16 11:29:28 -08:00
Javier Calvarro Nelson aca4b432e1 Switch async void to async Task (#879)
Switch async void to async Task
2018-11-16 11:16:43 -08:00
Ryan Brandenburg ece5fa46c6 Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 33978da1f7
2018-11-16 10:49:57 -08:00
Pavel Krymets 20f7d3be9d
Prevent SiteExtension OOB build from including root Directory.props/targets (#4064) 2018-11-16 09:06:48 -08:00
ASP.NET CI e550cb59b3 Updating submodule(s)
HttpAbstractions => 49d785c934
Localization => b8747c8b6b
Mvc => 7c68233125
Security => 7e14b052ea
Templating => 0af2acd6ff

[auto-updated: submodules]
2018-11-16 09:10:27 +00:00
= 35f876e190 Merge branch 'release/2.2' 2018-11-16 00:32:36 -08:00
John Luo 1782a70601
Disable flaky selenium tests while debugging (#4053) 2018-11-16 00:29:46 -08:00
Stephen Halter 7e9b11ef3f
Add test and src folders to Kestrel.sln (#4039)
- Move ThrowHelper.cs into core project
2018-11-15 16:24:31 -08:00
Ryan Brandenburg aed127198a Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in c14416f26f
2018-11-15 16:22:25 -08:00
Nate McMaster d1ee458982
Remove assemblies from the shared framework (#4004)
Remove assemblies from the shared framework that depend on or contain the following:

* Entity Framework Core
* Owin
* Node and SPA services
* Identity UI
* Middleware analysis
* SQL Client
* Third-party oauth integrations
* Runtime razor components
* JsonPatch
2018-11-15 16:18:58 -08:00
Pavel Krymets 7e890e8fa0
Update versions of logging site extensions (#4038) 2018-11-15 15:54:50 -08:00
Pavel Krymets e11f05863f
Enable MultiProcessorCompilation in more projects (#4036) 2018-11-15 12:54:10 -08:00
ASP.NET CI 67335899ba Updating submodule(s)
AzureIntegration => 202a87088f

[auto-updated: submodules]
2018-11-15 20:02:57 +00:00
Arthur Vickers f942ca4bbe
Update version for Azure Services App Authentication (#4029)
See https://github.com/aspnet/Configuration/pull/881/files

/cc @HaoK @joshgav @nonik0
2018-11-15 10:23:38 -08:00
ASP.NET CI e28b5b31c8 Updating submodule(s)
Mvc => 6270ea48a6

[auto-updated: submodules]
2018-11-15 17:46:59 +00:00
Nate McMaster 68cc5e7846
Merge release/2.2 and aspnet/KestrelHttpServer
* Merges latest changes from the master branch of aspnet/KestrelHttpServer
* Merges changes on release/2.2
2018-11-15 08:41:55 -08:00
Pavel Krymets 09e5daa037
Update schema before running tests (#4030) 2018-11-15 08:13:20 -08:00
Nate McMaster 3a657c6fdf
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 5d80016b4f
2018-11-14 23:23:58 -08:00
Nate McMaster 6cc9f6f130
Merge release/2.2 and replace submodules
* Replace the aspnet/JsonPatch git submodule and merge the master branch of its source to this repo
* Likewise for aspnet/DotNetTools
* And aspnet/HtmlAbstractions
* merge latest infrastructure changes from the release/2.2 branch
2018-11-14 22:57:10 -08:00
Nate McMaster 3346efc471
Include shfxproj symbols packages in artifact info metadata 2018-11-14 22:55:09 -08:00
Nate McMaster b7a24492b0
Implement a custom GetArtifactInfo target for shfxproj files 2018-11-14 22:46:53 -08:00
Nate McMaster 0271428dbe
Merge aspnet/KestrelHttpServer release/2.2 and release/2.1 2018-11-14 21:33:33 -08:00
Nate McMaster f1e60a8083
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in a24b4ee459
2018-11-14 18:16:17 -08:00
ASP.NET CI d85f34c1df Updating BuildTools from 3.0.0-alpha1-20181112.1 to 3.0.0-alpha1-20181114.4
[auto-updated: buildtools]
2018-11-15 01:36:42 +00:00
ASP.NET CI f232b8e975 Updating submodule(s)
AADIntegration => 1e26b6673d
AzureIntegration => 5cf821d1b4
Hosting => cfe9b26a34
HttpAbstractions => ea1ee2b68c
Identity => 073b0377e8
KestrelHttpServer => 5d80016b4f
Mvc => 9ff5a441f5
Routing => b6a1de5676
Security => 42dd66647d
SignalR => 05b0d41533
Templating => 2ca560f0b2

[auto-updated: submodules]
2018-11-15 01:36:32 +00:00
Nate McMaster ad84a1cc71
Merge branch 'release/2.1' into release/2.2 2018-11-14 16:28:38 -08:00
Nate McMaster 406c80bfb0
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 4598850c20
2018-11-14 16:03:24 -08:00
Nate McMaster 289050b9f2
Normalize code sign metadata to avoid duplication between projects and cross-gen config settings 2018-11-14 15:14:27 -08:00
Nate McMaster 0782a9dfa9
Merge aspnet/DotNetTools release/2.2 2018-11-14 14:12:52 -08:00
Nate McMaster 401fd68985
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in d745b8c161
2018-11-14 14:10:28 -08:00
Nate McMaster 27acef3d46
Merge branch 'release/2.1' into release/2.2 2018-11-14 14:01:43 -08:00
Stephen Halter 5d80016b4f Merge branch 'release/2.2' 2018-11-14 13:43:25 -08:00
Stephen Halter 4598850c20 Revert "Use non-pinnable buffer for zero byte read (#3094)"
This reverts commit 0029b8f053.
2018-11-14 13:42:55 -08:00
Nate McMaster 51c9b7355d
Create Kestrel.sln, update documentation and README, and ensure all Kestrel test projects have the test logger installed 2018-11-14 13:14:47 -08:00