22f3166fa6
Merge branch 'release/2.1' into release/2.2
2019-01-10 01:22:10 -08:00
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
c06eec1e8f
Merge in 'release/2.2' changes
2019-01-07 21:31:03 +00:00
2e67864995
Merge branch 'release/2.1' into release/2.2
2019-01-07 10:27:41 -08:00
973b4b2fbf
Merge in 'release/2.1' changes
2019-01-07 17:35:10 +00:00
375e9d2cbd
Make music store project ref ( #6313 )
2019-01-07 09:34:05 -08:00
291b346201
Merge in 'release/2.2' changes
2019-01-03 00:55:40 +00:00
65ff6e951a
Merge branch release/2.1 into release/2.2
2019-01-02 14:34:45 -08:00
13253dab22
Merge in 'release/2.1' changes
2018-12-21 23:30:46 +00:00
edcee859f0
Convert Identity to Reference ( #6086 )
...
* Convert Identity to Reference
* Remove Microsoft.AspNet.Identity.AspNetCoreCompat
2018-12-21 15:29:35 -08:00
68bd2329e1
Merge in 'release/2.2' changes
2018-12-21 21:19:09 +00:00
af2461d524
Merge branch 'release/2.1' into release/2.2
2018-12-21 11:38:25 -08:00
594e4c4c35
Merge in 'release/2.2' changes
2018-12-21 01:28:47 +00:00
d9cf76f63d
Merge release/2.1 into 2.2
2018-12-20 16:51:06 -08:00
108fa3f911
Merge in 'release/2.1' changes
2018-12-21 00:28:36 +00:00
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
66d35bd153
Merge in 'release/2.2' changes
2018-12-18 23:48:35 +00:00
de954ce702
Fixing IIS Tests ( #5682 )
2018-12-18 18:46:56 -05:00
fe0d8ca083
Merge in 'release/2.1' changes
2018-12-18 20:01:33 +00:00
0cbc52ca15
Convert ServerTests to Reference and move to Server folder ( #4686 )
2018-12-18 14:59:47 -05:00
8b682dfe85
Merge in 'release/2.2' changes
2018-12-14 19:01:05 +00:00
feb641ddda
Merge branch 'release/2.1' into release/2.2
2018-12-14 09:44:15 -08:00
6133fa4dd6
Merge in 'release/2.1' changes
2018-12-14 16:37:44 +00:00
13ae0057fb
Replace .Sources package references with local code ( #4801 )
...
Replaces package references the following packages with local code:
Microsoft.AspNetCore.Certificates.Generation.Sources
Microsoft.Extensions.CopyOnWriteDictionary.Sources
Microsoft.Extensions.ClosedGenericMatcher.Sources
Microsoft.Extensions.ObjectMethodExecutor.Sources
Microsoft.Extensions.PropertyActivator.Sources
Microsoft.Extensions.PropertyHelper.Sources
Microsoft.Extensions.RazorViews.Sources
Microsoft.Extensions.SecurityHelper.Sources
Microsoft.Extensions.StackTrace.Sources
Microsoft.Extensions.WebEncoders.Sources
2018-12-14 08:36:36 -08:00
3b0d1253e1
Merge in 'release/2.2' changes
2018-12-14 08:57:43 +00:00
206db0558e
Update buildtools and add properties to skip IIS tests
2018-12-13 23:36:42 -08:00
f0990ec531
Fix build issues with IIS integration projects
...
Changes:
* Ensure IIS managed and pkg projects build after the native projects
* Update projects to build test
* Update CI checks to build on macOS and Linux
* Use package baselines to manage ANCM packages
2018-12-13 22:53:31 -08:00
6adfa32402
Merge branch 'release/2.1' into release/2.2
2018-12-13 22:12:19 -08:00
495e4fe4f7
Merge branch 'release/2.2'
2018-12-04 16:03:47 -08:00
b0826ab179
Merge in 'release/2.1' changes
2018-12-04 23:31:58 +00:00
1be2b427de
Merge branch 'release/2.1' into release/2.2
2018-12-04 14:23:24 -08:00
36c482af6f
Merge in 'release/2.2' changes
2018-12-01 01:54:37 +00:00
197c5567f4
Update EFCore submodule ( #4349 )
...
Prepare EF Core to build in 2.2.1
Fixes aspnet/AspNetCore-Internal#1441
2018-11-30 17:53:19 -08:00
7078102961
Update targets and projects to build Localization projects
2018-11-30 15:13:05 -08:00
cdb9d0bc68
Prepare to patch WebSockets
2018-11-29 10:55:57 -08:00
2720c28047
Prepare to patch WebSockets
2018-11-29 10:39:29 -08:00
925746158e
Merge the release/2.2 branch of Diagnostics
2018-11-21 15:36:05 -08:00
71b1bb8887
Merge branch 'release/2.1' into release/2.2
2018-11-21 14:57:45 -08:00
6a6c88d80b
Merge source code from aspnet/Diagnostics to this repo
2018-11-21 14:23:55 -08:00
ed0b421695
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 8893337fb0
2018-11-21 13:54:33 -08:00
396aa9735e
PR feedback
2018-11-20 16:15:51 -08:00
d5587f3c54
Merge remote-tracking branch 'origin/release/2.1' into rybrande/21To22Merge
2018-11-20 15:42:00 -08:00
73b5d6d0e5
Remove the BrowserLink submodule ( #4087 )
2018-11-20 11:36:26 -08:00
bfba741326
Merge aspnet/Hosting release/2.2
2018-11-20 09:35:34 -08:00
feb68c1382
Merge branch 'release/2.1' into release/2.2
2018-11-20 09:13:55 -08:00
3f025e3a38
Make Microsoft.AspNetCore.Server.IntegrationTesting a temporary external dependency
2018-11-19 23:38:13 -08:00
7ccb8dbfe1
Account for the relocation of Microsoft.AspNetCore.Hosting.WebHostBuilderFactory.Sources
2018-11-19 22:50:46 -08:00
05b8745172
Remove aspnet/Hosting submodule and update targets and projects
2018-11-19 22:25:43 -08:00
87ab2744ce
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 3f7ee338d4
2018-11-19 22:00:32 -08:00
21b142b65d
Merge branch 'release/2.1' into release/2.2
2018-11-19 17:04:13 -08:00
Nate McMaster
Nate McMaster
dotnet-bot
Justin Kotalik
John Luo
Ajay Bhargav Baaskaran
Ajay Bhargav Baaskaran
Nate McMaster
Chris R
Ryan Brandenburg