Commit Graph

2076 Commits

Author SHA1 Message Date
Nate McMaster 0af21077c3
Update .NET Core 3.0 dependencies (#4091)
* Update Extensions to 3.0.0-preview.18569.14
* Update EFCore to 3.0.0-preview.18569.2
* Update corefx to preview.18566.8
* Update core-setup to preview-27117-01
2018-11-20 10:37:13 -08:00
Nate McMaster 294b5f2928
Merge branch 'release/2.2' 2018-11-20 09:47:59 -08:00
Nate McMaster bfba741326
Merge aspnet/Hosting release/2.2 2018-11-20 09:35:34 -08:00
Nate McMaster feb68c1382
Merge branch 'release/2.1' into release/2.2 2018-11-20 09:13:55 -08:00
Nate McMaster 3f025e3a38
Make Microsoft.AspNetCore.Server.IntegrationTesting a temporary external dependency 2018-11-19 23:38:13 -08:00
Nate McMaster 7ccb8dbfe1
Account for the relocation of Microsoft.AspNetCore.Hosting.WebHostBuilderFactory.Sources 2018-11-19 22:50:46 -08:00
Nate McMaster 05b8745172
Remove aspnet/Hosting submodule and update targets and projects 2018-11-19 22:25:43 -08:00
Nate McMaster 87ab2744ce
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 3f7ee338d4
2018-11-19 22:00:32 -08:00
Nate McMaster 4fcc8b9902
Update targets to build HttpAbstractions projects 2018-11-19 21:34:26 -08:00
Nate McMaster 9cb41d7f80
Fix the casing on the templating submodule group 2018-11-19 21:03:41 -08:00
Nate McMaster 7c6bf7f75d
Merge branch 'release/2.2' 2018-11-19 21:00:19 -08:00
Nate McMaster ae619e6b7f
Include Microsoft.Extensions.Http.dll in signing 2018-11-19 18:38:09 -08:00
Nate McMaster 6e40f92ed4
Merge branch 'release/2.1' into release/2.2 2018-11-19 17:20:55 -08:00
Nate McMaster ea1ba001cc
Fix casing issue in the path the templating code submodule 2018-11-19 17:20:02 -08:00
Nate McMaster 21b142b65d
Merge branch 'release/2.1' into release/2.2 2018-11-19 17:04:13 -08:00
Ryan Brandenburg 78eb188014 Merge branch 'master' of github.com:aspnet/AspNetCore into rybrande/MondoMaster 2018-11-19 16:01:22 -08:00
Ryan Brandenburg 37399bc217 Merge branch 'master' of github.com:aspnet/AspNetCore into rybrande/MusicStoreMaster 2018-11-19 12:34:59 -08:00
Ryan Brandenburg af6792afc3 Merge branch 'master' of github.com:aspnet/AspNetCore into rybrande/MondoMaster 2018-11-19 12:24:58 -08:00
Ryan Brandenburg ea68246950 Fix submodules for AuthSamples AzureIntegration and Templating 2018-11-19 12:21:41 -08:00
Nate McMaster 4173f23e3e
Remove the HttpClientFactory submodule (#4085) 2018-11-19 12:05:39 -08:00
Ryan Brandenburg 2cda14658d Fix submodules for AuthSamples AzureIntegration and Templating 2018-11-19 11:55:24 -08:00
Ryan Brandenburg 6044a66a63 Have the trailing slash 2018-11-19 11:28:19 -08:00
Ryan Brandenburg 69534b5687 Fix AzureIntegration submodule 2018-11-19 11:18:31 -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 33a92fecd7 Fix AuthSamples submodule 2018-11-19 11:11:59 -08:00
Ryan Brandenburg 50acf42eda Fix submodule 2018-11-19 11:03:12 -08:00
Ryan Brandenburg c38d6e662a Remove templating module 2018-11-19 10:50:39 -08:00
Nate McMaster 137a72f85d
React to the removal of Microsoft.AspNetCore.ApplicationInsights.HostingStartup 2018-11-19 09:43:13 -08:00
Matt Mitchell c813950439 React to changes in produced corefx packages (#4077) 2018-11-19 09:29:33 -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
Ryan Brandenburg 6da92b9d6d Fix dependencies 2018-11-16 15:30:22 -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
Ryan Brandenburg 8227f9f819 Fix merge problem 2018-11-16 13:14:45 -08:00
Ryan Brandenburg 422d30b521 Merge remote-tracking branch 'origin/release/2.1' into rybrande/MusicStore2.2 2018-11-16 11:34:39 -08:00
Ryan Brandenburg 9adb829eb5 Fix MusicStore RootPath 2018-11-16 10:18:09 -08:00
Ryan Brandenburg 681d743170 Update MusicStore source 2018-11-16 09:36:17 -08:00
Nate McMaster c2685813ab
2.1: Update corefx dependencies (#4037) 2018-11-15 12:20:37 -08: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
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
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 0271428dbe
Merge aspnet/KestrelHttpServer release/2.2 and release/2.1 2018-11-14 21:33:33 -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 27acef3d46
Merge branch 'release/2.1' into release/2.2 2018-11-14 14:01:43 -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
Pranav K fe981c108b Add Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X 2018-11-14 11:32:20 -08:00
John Luo b4dbaa95d0 Add ChromeDriver dependency 2018-11-14 11:24:59 -08:00
Nate McMaster 0cf9019caa
Remove KestrelHttpServer submodule and update targets and baselines for Kestrel packages 2018-11-14 11:21:15 -08:00
John Luo e69285a36d Use Selenium to test Chrome 2018-11-14 11:13:24 -08:00
Nate McMaster c1c7d711b6
Merge branch 'release/2.1' into release/2.2 2018-11-14 09:27:23 -08:00