Commit Graph

2100 Commits

Author SHA1 Message Date
John Luo 8f1eedf5a9 Merge branch 'release/2.1' into release/2.2 2019-01-14 19:04:39 -08:00
John Luo 90a9fa7aac Merge branch 'release/2.1' into release/2.2 2019-01-14 12:57:34 -08:00
Mikael Mengistu 5e825f4fd8
Update the package baseline (#6614) 2019-01-14 12:21:45 -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
Pavel Krymets 8aa8c6b2b0
Build branch logging SE in main build (#6312) 2019-01-14 08:42:53 -08:00
Mikael Mengistu abfdb433f2
Update submodules.props (#6586)
* Update submodules.props

* Update EF submodule
2019-01-11 09:59:03 -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 a3f9b74bb9
Merge branch 'release/2.1' into release/2.2 2019-01-09 14:52:53 -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
Nate McMaster 5d16f97965
Remove netcoreapp2.0 test TFMs (#6461)
.NET Core 2.0 reached EOL last year. This removes multi-targeting our test projects and test assets to only use .NET Core 2.1 and .NET Framework 4.6.1.
2019-01-08 11:20:09 -08:00
dotnet-bot c06eec1e8f Merge in 'release/2.2' changes 2019-01-07 21:31:03 +00:00
Justin Kotalik 2e67864995 Merge branch 'release/2.1' into release/2.2 2019-01-07 10:27:41 -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
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
Nate McMaster 436076fd55
Fix broken tests and VS solutions caused by source code reorganization and other build infra cleanup
Changes:
* Fix broken tests and VS solutions caused by source code reorganization
* Add a check to validate generated code and solutions on PRs
* backport some source code reorg to src/Identity
* Fix startvs.cmd if you've already run build.ps1
* Add PR checks for tests on Linux/macOS
* Skip broken Nginx tests
* Add conditions to skip IIS tests on non-Windows platforms
2019-01-04 10:00:26 -08:00
dotnet-bot 291b346201 Merge in 'release/2.2' changes 2019-01-03 00:55:40 +00:00
Nate McMaster 65ff6e951a
Merge branch release/2.1 into release/2.2 2019-01-02 14:34:45 -08:00
dotnet-bot df29851149 Merge in 'release/2.2' changes 2019-01-02 19:20:51 +00:00
Nate McMaster 7e38b563bd
Merge branch 'release/2.1' to release/2.2 2019-01-02 10:29:38 -08:00
dotnet-bot e3f86f3631 Merge in 'release/2.2' changes 2019-01-02 17:58:35 +00:00
dotnet-bot 47d2a6722c Merge in 'release/2.1' changes 2019-01-02 17:57:44 +00:00
Nate McMaster d66537c7d1
Convert Azure hosting startup and integration projects to use ProjectRef (#6207) 2019-01-02 09:56:39 -08:00
Nate McMaster 61e505c894
Merge branch 'release/2.1' into release/2.2 2019-01-02 08:58:22 -08:00
dotnet-bot 13253dab22 Merge in 'release/2.1' changes 2018-12-21 23:30:46 +00:00
John Luo edcee859f0
Convert Identity to Reference (#6086)
* Convert Identity to Reference
* Remove Microsoft.AspNet.Identity.AspNetCoreCompat
2018-12-21 15:29:35 -08:00
dotnet-bot 0bf06d8cf2 Merge in 'release/2.2' changes 2018-12-21 22:15:53 +00:00
Nate McMaster f4bb260444
Merge branch release/2.1 into release/2.2 2018-12-21 13:24:33 -08:00
dotnet-bot 68bd2329e1 Merge in 'release/2.2' changes 2018-12-21 21:19:09 +00:00
dotnet-bot d13dd578f8 Merge in 'release/2.1' changes 2018-12-21 19:44:18 +00:00
Nate McMaster 3641761d18
Convert AADIntegration projects to ProjectRef (#6082) 2018-12-21 11:43:09 -08:00
Ajay Bhargav Baaskaran af2461d524 Merge branch 'release/2.1' into release/2.2 2018-12-21 11:38:25 -08:00
dotnet-bot f94a5f6fd0 Merge in 'release/2.1' changes 2018-12-21 07:52:15 +00:00
Justin Kotalik ce481c6c79
Make JavaScriptServices use ProjectReference (#5953) 2018-12-20 23:50:53 -08:00
dotnet-bot 594e4c4c35 Merge in 'release/2.2' changes 2018-12-21 01:28:47 +00:00
Justin Kotalik d9cf76f63d Merge release/2.1 into 2.2 2018-12-20 16:51:06 -08:00
dotnet-bot 108fa3f911 Merge in 'release/2.1' changes 2018-12-21 00:28:36 +00:00
Ajay Bhargav Baaskaran 7f17d095d8
Convert Mvc to use Reference (#6047)
* Convert Mvc to use Reference

* Use ProjectReference for test assets
2018-12-20 16:27:32 -08:00
dotnet-bot 94a236e196 Merge in 'release/2.1' changes 2018-12-20 18:55:13 +00:00
Nate McMaster 686ce02cc8
Remove code for building an analyzers package that never shipped (#6053)
Microsoft.AspNetCore.Analyzers didn't ship in 2.1, and we don't have plans to every ship it in a 2.1.x release.
2018-12-20 10:53:42 -08:00
dotnet-bot 66d35bd153 Merge in 'release/2.2' changes 2018-12-18 23:48:35 +00:00
Justin Kotalik de954ce702
Fixing IIS Tests (#5682) 2018-12-18 18:46:56 -05:00
dotnet-bot fe0d8ca083 Merge in 'release/2.1' changes 2018-12-18 20:01:33 +00:00
John Luo 0cbc52ca15 Convert ServerTests to Reference and move to Server folder (#4686) 2018-12-18 14:59:47 -05:00
dotnet-bot 9dda9a3e2a Merge in 'release/2.2' changes 2018-12-18 18:58:34 +00:00
Ajay Bhargav Baaskaran 647fbbac7b Merge branch 'release/2.1' into ajbaaska/merge-22 2018-12-17 18:40:08 -08:00