Commit Graph

32715 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
BrennanConroy a9b737b793
Fix broken definitions file (#6343) 2019-01-14 18:46:07 -08:00
AndriySvyryd 80b77948da Updating submodule(s)
EntityFrameworkCore => 1cdd769419dc1ef5ea7bff5247786bc2bb1524b4
2019-01-14 16:06:53 -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
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 089912cd1b
Switch queues used during Windows builds (#6667) 2019-01-14 10:07:12 -08:00
Pavel Krymets 8aa8c6b2b0
Build branch logging SE in main build (#6312) 2019-01-14 08:42:53 -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 5810af5ce7
Fix code-signing metadata for the SignalR java client (#6607) 2019-01-11 11:27:04 -08:00
Mikael Mengistu abfdb433f2
Update submodules.props (#6586)
* Update submodules.props

* Update EF submodule
2019-01-11 09:59:03 -08:00
Ajay Bhargav Baaskaran 3b67abecbf
Add an MSBuild target to set MsBuild.exe path (#6401)
* Add an MSBuild target to set MsBuild.exe path

* Added a warning message

* Don't build Razor.Tasks twice

* Compile include inside the target
2019-01-10 17:34:25 -08:00
Mikael Mengistu 1677ed2073
Package Archive Baseline for the 2.1.8 Patch (#6578) 2019-01-10 15:54:13 -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 a6b04bf969
Fix MusicStore tests for 2.2 2019-01-09 17:18: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 ce548479e1
Merge branch 'release/2.1' into release/2.2 2019-01-08 12:00:04 -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 33d42551ac Fix MusicStore PackageReferences and cleanup README 2019-01-07 12:53:08 -08: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 48a74801d3 Merge in 'release/2.2' changes 2019-01-05 00:26:34 +00:00
Nate McMaster 0926b93b98
Ensure Identity.Views.{V3, V4}.dll are the AllItemsFullPathWithTargetPath group so they get copied across ProjectReferences 2019-01-04 14:20: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
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 90b2d60332 Merge in 'release/2.1' changes 2019-01-02 22:31:05 +00:00
Ajay Bhargav Baaskaran a10aff3a03
Specify correct global.json path for Razor.Design tests (#6311) 2019-01-02 14:30:01 -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 7d8eb101a8 Merge in 'release/2.2' changes 2019-01-02 16:46:58 +00:00
Justin Kotalik 6dcb847edf
Reference testsite.props in test asset (#6138) 2018-12-31 14:45:33 -08:00
Justin Kotalik d53686868c
Merge branch 'release/2.1' into release/2.2 2018-12-31 14:45:29 -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