Commit Graph

12 Commits

Author SHA1 Message Date
Justin Kotalik c5e7bd244d Merge branch 'release/2.2' 2018-11-05 09:10:29 -08:00
Justin Kotalik 90b11de8f1
Get IISIntegration CI working (#3875) 2018-11-05 08:45:11 -08:00
Nate McMaster 6994c4fc48
Merge release/2.2 and aspnet/WebSockets master branch 2018-10-17 16:06:14 -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 b1427c759b
Remove the WebSockets submodule 2018-10-17 14:53:22 -07:00
Nate McMaster c2e4a74f7d
React to renaming this repo from Universe to AspNetCore 2018-10-17 10:24:18 -07:00
Nate McMaster a35226131a
Merge branch release/2.2 2018-10-16 12:02:18 -07:00
Nate McMaster 489a88d21e
Merge aspnet/DataProtection release/2.2 into this repo 2018-10-15 10:21:02 -07:00
Nate McMaster a673bfd741
Add build script and CI config for the DataProtection folder 2018-10-15 10:13:04 -07:00
Nate McMaster 1bf8e3985f
Merge branch 'release/2.2' 2018-09-25 10:25:03 -07:00
Nate McMaster d8e9a95ee4
Merge branch 'release/2.1' into release/2.2 2018-09-25 10:23:40 -07:00
Nate McMaster b40544979e
Rename .vsts folder to react to VSTS rebranding to Azure DevOps 2018-09-25 10:22:26 -07:00