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

204 Commits

Author SHA1 Message Date
Pavel Krymets ae9b3992b2
Merge pull request #6759 from aspnet/pakrym/merge22 
Merge 2.2 into master
 2019-01-16 14:04:56 -08:00
Nate McMaster 5a70f5312f
Convert Components projects to use ProjectRef (#6698) 
This addresses #4246 for src/Components/. A few other changes were necessary because components had been using stale dependencies.
 2019-01-16 12:28:04 -08:00
Pavel Krymets 6eca6d201b Merge commit '874a67a' into pakrym/merge22 2019-01-16 11:57:04 -08:00
Pavel Krymets f08f2af8bc Merge commit '852d890' into pakrym/merge22 2019-01-16 11:56:50 -08:00
Pavel Krymets adf7c6628e Merge commit '437baf6' into pakrym/merge22 2019-01-16 11:56:16 -08:00
John Luo 1bd5845b4c
Merge pull request #6735 from aspnet/johluo/merge22 
Johluo/merge22
 2019-01-16 11:43:35 -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
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