Commit Graph

11 Commits

Author SHA1 Message Date
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 011cf21a5c
Merge branch 'release/2.2' 2018-11-06 17:42:44 -08:00
Pavel Krymets 9d570d791f
Remove obsolete logging API usage (#3953) 2018-11-06 14:50:35 -08:00
Nate McMaster 7f95d6af34
Remove everything from the package archive except Microsoft.AspNetCore.App 2018-11-06 09:43:51 -08:00
Nate McMaster 6994c4fc48
Merge release/2.2 and aspnet/WebSockets master branch 2018-10-17 16:06:14 -07:00
Nate McMaster 9ce78f36d5
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in afeb7fe49b
2018-10-17 15:57:02 -07:00
Nate McMaster d991c50c82
Merge release/2.1 and aspnet/WebSockets release/2.2 2018-10-17 15:47:04 -07:00
Nate McMaster 24f85a200c
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in a036f920b8
2018-10-17 15:34:25 -07:00
Nate McMaster b1427c759b
Remove the WebSockets submodule 2018-10-17 14:53:22 -07:00
Nate McMaster 5d84c92b74
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganiziation, this source code was found in 67f2c3149e
2018-10-17 14:27:00 -07:00