78eb188014
Merge branch 'master' of github.com:aspnet/AspNetCore into rybrande/MondoMaster
2018-11-19 16:01:22 -08:00
ea68246950
Fix submodules for AuthSamples AzureIntegration and Templating
2018-11-19 12:21:41 -08:00
50acf42eda
Fix submodule
2018-11-19 11:03:12 -08:00
68cc5e7846
Merge release/2.2 and aspnet/KestrelHttpServer
...
* Merges latest changes from the master branch of aspnet/KestrelHttpServer
* Merges changes on release/2.2
2018-11-15 08:41:55 -08:00
6cc9f6f130
Merge release/2.2 and replace submodules
...
* Replace the aspnet/JsonPatch git submodule and merge the master branch of its source to this repo
* Likewise for aspnet/DotNetTools
* And aspnet/HtmlAbstractions
* merge latest infrastructure changes from the release/2.2 branch
2018-11-14 22:57:10 -08:00
0271428dbe
Merge aspnet/KestrelHttpServer release/2.2 and release/2.1
2018-11-14 21:33:33 -08:00
27acef3d46
Merge branch 'release/2.1' into release/2.2
2018-11-14 14:01:43 -08:00
0cf9019caa
Remove KestrelHttpServer submodule and update targets and baselines for Kestrel packages
2018-11-14 11:21:15 -08:00
c1c7d711b6
Merge branch 'release/2.1' into release/2.2
2018-11-14 09:27:23 -08:00
87092a2590
Update targets and infrastructure for dotnet-watch et. al.
2018-11-13 15:58:22 -08:00
bb6901141c
Remove the HtmlAbstractions git submodule and merge Html.Abstractions into this repo
2018-11-13 09:29:27 -08:00
32622d1a0a
Remove the JsonPatch git submodule
2018-11-09 13:06:34 -08:00
34999a804e
Remove submodules for repos that merged to aspnet/Extensions ( #3671 )
...
Builds of the packages in aspnet/Extensions repo go through ProdCon instead of building as a submodule of this repo.
2018-11-09 08:48:42 -08:00
b75fa54ad2
Remove the EntityFrameworkCore submodule ( #3964 )
...
This removes EntityFrameworkCore as a git submodule. The EFCore repo will build on its own, and the AspNetCore repo will consume EFCore via PackageReference.
2018-11-07 14:00:19 -08:00
0e3260f2b4
Merge branch 'release/2.2'
2018-11-06 21:47:30 -08:00
302d8d59dd
Remove the aspnet/Caching submodule
2018-11-06 21:20:06 -08:00
011cf21a5c
Merge branch 'release/2.2'
2018-11-06 17:42:44 -08:00
3cf8a41e4a
Remove the aspnet/Logging submodule
2018-11-06 17:30:26 -08:00
e8aab7ae34
Merge branch 'release/2.2'
2018-11-06 12:36:51 -08:00
355c6d3a83
Remove the aspnet/Options submodule
2018-11-06 12:28:45 -08:00
df46dfee73
Merge branch 'release/2.2'
2018-11-06 12:13:05 -08:00
67c3a099ec
Remove the aspnet/Configuration submodule ( #3948 )
2018-11-06 12:04:36 -08:00
f8a1e14921
Merge branch 'release/2.2'
2018-11-05 16:35:20 -08:00
62b24f930e
Remove the aspnet/FileSystem submodule ( #3884 )
2018-11-05 14:19:19 -08:00
dcece2090c
Remove IISIntegration submodule, add CI ( #3867 )
2018-11-02 14:34:31 -07:00
50e1e60247
Merge branch 'release/2.2'
2018-11-02 10:49:11 -07:00
afab1a5be6
Remove IISIntegration submodule, add CI [2.2] ( #3865 )
2018-11-02 10:22:04 -07:00
cb85ffa8f6
Merge branch 'release/2.2'
2018-11-02 10:10:49 -07:00
c92536a21a
Remove the DependencyInjection submodule
2018-11-02 09:58:20 -07:00
868dc32c97
Merge branch 'release/2.2'
2018-10-31 21:04:25 -07:00
3f04c928f4
Merge branch 'jkotalik/21Merge' into jkotalik/22Merge
2018-10-31 18:38:00 -07:00
4b99a85a5f
Merge branch 'release/2.1' into release/2.2
2018-10-31 17:25:20 -07:00
f2c1eb73a6
Remove the Microsoft.Data.Sqlite submodule
2018-10-31 16:24:18 -07:00
908a8b3013
Merge branch 'release/2.2'
2018-10-30 17:18:22 -07:00
eb79d8f75e
Remove the EventNotification submodule
2018-10-30 17:10:11 -07:00
ee11d10f04
Remove BrowserLink and Scaffolding gitsubmodules ( #3730 )
...
As a part of simplifying the way we build ASP.NET Core, the BrowserLink and Scaffolding repos and the packages they produce will be independent from aspnet/AspNetCore.
2018-10-26 10:17:57 -07:00
43792f20b2
Merge branch 'release/2.2'
2018-10-24 12:45:15 -07:00
37915c9b58
Remove the aspnet/Common git submodule ( #3715 )
...
As a part of merging and reducing the number of repos we use, the aspnet/Common repo was renamed to aspnet/Extensions and it now builds on its own and not as a submodule of this repo.
2018-10-24 12:38:03 -07:00
6994c4fc48
Merge release/2.2 and aspnet/WebSockets master branch
2018-10-17 16:06:14 -07:00
d991c50c82
Merge release/2.1 and aspnet/WebSockets release/2.2
2018-10-17 15:47:04 -07:00
b1427c759b
Remove the WebSockets submodule
2018-10-17 14:53:22 -07:00
a35226131a
Merge branch release/2.2
2018-10-16 12:02:18 -07:00
489a88d21e
Merge aspnet/DataProtection release/2.2 into this repo
2018-10-15 10:21:02 -07:00
4dfd351c84
Remove DataProtection submodule and update path to DP source code to local folder
2018-10-15 09:46:20 -07:00
89866bbbd2
Remove aspnet/WebHooks from building in Universe ( #1474 )
...
Remove the aspnet/WebHooks universe from building with Universe.
This is part of consolidating repos and preparing aspnet/Universe to move into https://github.com/aspnet/AspNetCore
2018-10-09 15:23:12 -07:00
cc8cc7b443
Merge branch 'release/2.2'
2018-10-09 13:24:13 -07:00
8e13235732
Remove the Proxy submodule ( #1471 )
...
Part of https://github.com/aspnet/AspNetCore/issues/3598 - unifying and reducing repos. Proxy does not ship, so its code will move to aspnet/AspLabs.
2018-10-09 13:16:03 -07:00
0670796d8e
Stop building MvcPrecompilation package
2018-08-30 11:23:45 -07:00
a21d455b51
Change default branch to master
2018-07-02 11:50:02 -07:00
fd3b979b56
Remove aspnet/WebHooks from release/2.2
2018-06-29 11:10:56 -07:00
Ryan Brandenburg
Nate McMaster
Nate McMaster
Justin Kotalik
Pranav K