huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
16,135 Commits 1 Branch 0 Tags 251 MiB
Commit Graph

929 Commits

Author SHA1 Message Date
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 7c6bf7f75d
Merge branch 'release/2.2' 2018-11-19 21:00:19 -08:00
Nate McMaster 21b142b65d
Merge branch 'release/2.1' into release/2.2 2018-11-19 17:04:13 -08:00
Nate McMaster 4173f23e3e
Remove the HttpClientFactory submodule (#4085) 2018-11-19 12:05:39 -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
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 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
John Luo b4dbaa95d0 Add ChromeDriver dependency 2018-11-14 11:24:59 -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
Nate McMaster a8ec75aac4
Prepare for the 2.2.1 patch 
* Generate 2.2.0 package baselines
* Update dependencies to 2.2.0
* Update branding to 2.2.1-servicing
 2018-11-13 18:21:09 -08:00
Nate McMaster a2d855406b
Reorganize source code in preparation to move into aspnet/AspNetCore 
Prior to reorganization, this source code was found in eba014d534
 2018-11-13 15:36:38 -08:00
Nate McMaster bb6901141c
Remove the HtmlAbstractions git submodule and merge Html.Abstractions into this repo 2018-11-13 09:29:27 -08:00
Nate McMaster 1ab08d70ef
Reorganize source code in preparation to move into aspnet/AspNetCore 
Prior to reorganization, this source code was found in 252ae0c434
 2018-11-09 16:17:15 -08:00
dotnet-maestro-bot f64d6a2b50 Updating dependencies (#3996) 2018-11-09 15:48:44 -08:00
Nate McMaster fcb970ec83
Upgrade to EF Core 3.0.0-preview-181109-02 2018-11-09 14:33:52 -08:00
Nate McMaster 59ed8df382
Add targets and tools for ensuring consistent package versions between servicing builds 2018-11-09 13:05:31 -08:00
Nate McMaster 74d9728e95
Reorganize source code in preparation to move into aspnet/AspNetCore 
Prior to reorganization, this source code was found in 218064c300
 2018-11-09 12:49:58 -08:00
Nate McMaster a3baf40c74
Set dependency version on Microsoft.Extensions.DiagnosticAdapter to 2.1.0 and prune unused logging analyzers dependency 
There was never a 2.1.1
 2018-11-09 09:12:52 -08:00
Nate McMaster 34999a804e
Remove submodules for repos that merged to aspnet/Extensions (#3671) 
Builds of the packages in aspnet/Extensions repo go through ProdCon instead of building as a submodule of this repo.
 2018-11-09 08:48:42 -08:00
Nate McMaster bd5bf34351
Merge branch 'release/2.2' 2018-11-09 07:29:37 -08:00
Nate McMaster db0d3c333d
Fix NU1605 build error by ensuring package versions are set correctly in subfolder projects (#3987) 2018-11-08 23:40:14 -08:00
Nate McMaster b75fa54ad2
Remove the EntityFrameworkCore submodule (#3964) 
This removes EntityFrameworkCore as a git submodule. The EFCore repo will build on its own, and the AspNetCore repo will consume EFCore via PackageReference.
 2018-11-07 14:00:19 -08:00
Nate McMaster 0e3260f2b4
Merge branch 'release/2.2' 2018-11-06 21:47:30 -08:00
Nate McMaster 302d8d59dd
Remove the aspnet/Caching submodule 2018-11-06 21:20:06 -08:00
Nate McMaster 011cf21a5c
Merge branch 'release/2.2' 2018-11-06 17:42:44 -08:00
Nate McMaster 17ee447d26
Upgrade to Extensions 2.2.0-rtm-181106-10 2018-11-06 17:32:06 -08:00
Nate McMaster 3cf8a41e4a
Remove the aspnet/Logging submodule 2018-11-06 17:30:26 -08:00
Nate McMaster e8aab7ae34
Merge branch 'release/2.2' 2018-11-06 12:36:51 -08:00
Nate McMaster 355c6d3a83
Remove the aspnet/Options submodule 2018-11-06 12:28:45 -08:00
Nate McMaster df46dfee73
Merge branch 'release/2.2' 2018-11-06 12:13:05 -08:00
Nate McMaster 67c3a099ec
Remove the aspnet/Configuration submodule (#3948) 2018-11-06 12:04:36 -08:00
Nate McMaster f8a1e14921
Merge branch 'release/2.2' 2018-11-05 16:35:20 -08:00
Nate McMaster 62b24f930e
Remove the aspnet/FileSystem submodule (#3884) 2018-11-05 14:19:19 -08:00