Commit Graph

147 Commits

Author SHA1 Message Date
Ryan Brandenburg 48528cf69f Fix templating casing 2018-11-20 12:53:46 -08:00
Nate McMaster 73b5d6d0e5
Remove the BrowserLink submodule (#4087) 2018-11-20 11:36:26 -08:00
Ryan Brandenburg b335283ab1 Merge branch 'release/2.1' of github.com:aspnet/AspNetCore into rybrande/Mondo2.1 2018-11-20 10:24:50 -08:00
Ryan Brandenburg 6fc3eb3bfc Fix MetaPackage casing 2018-11-20 10:21:21 -08:00
Ryan Brandenburg f45dacf924
Fix folder casing (#4144)
Fix folder casing
2018-11-20 10:02:51 -08:00
Nate McMaster 294b5f2928
Merge branch 'release/2.2' 2018-11-20 09:47:59 -08:00
Nate McMaster feb68c1382
Merge branch 'release/2.1' into release/2.2 2018-11-20 09:13:55 -08:00
Nate McMaster 05b8745172
Remove aspnet/Hosting submodule and update targets and projects 2018-11-19 22:25:43 -08:00
Nate McMaster 4fcc8b9902
Update targets to build HttpAbstractions projects 2018-11-19 21:34:26 -08:00
Nate McMaster 9cb41d7f80
Fix the casing on the templating submodule group 2018-11-19 21:03:41 -08:00
Nate McMaster 7c6bf7f75d
Merge branch 'release/2.2' 2018-11-19 21:00:19 -08:00
Nate McMaster 6e40f92ed4
Merge branch 'release/2.1' into release/2.2 2018-11-19 17:20:55 -08:00
Nate McMaster ea1ba001cc
Fix casing issue in the path the templating code submodule 2018-11-19 17:20:02 -08:00
Nate McMaster 21b142b65d
Merge branch 'release/2.1' into release/2.2 2018-11-19 17:04:13 -08:00
Ryan Brandenburg 94f5e2bc1b Fix submodule 2018-11-19 16:57:06 -08:00
Ryan Brandenburg ade4572238 Fix submodules for AADIntegration JavaScriptServices and MetaPackages 2018-11-19 16:28:13 -08:00
Ryan Brandenburg 78eb188014 Merge branch 'master' of github.com:aspnet/AspNetCore into rybrande/MondoMaster 2018-11-19 16:01:22 -08:00
Ryan Brandenburg ea68246950 Fix submodules for AuthSamples AzureIntegration and Templating 2018-11-19 12:21:41 -08:00
Nate McMaster 4173f23e3e
Remove the HttpClientFactory submodule (#4085) 2018-11-19 12:05:39 -08:00
Ryan Brandenburg 2cda14658d Fix submodules for AuthSamples AzureIntegration and Templating 2018-11-19 11:55:24 -08:00
Ryan Brandenburg 6044a66a63 Have the trailing slash 2018-11-19 11:28:19 -08:00
Ryan Brandenburg 69534b5687 Fix AzureIntegration submodule 2018-11-19 11:18:31 -08:00
Ryan Brandenburg 33a92fecd7 Fix AuthSamples submodule 2018-11-19 11:11:59 -08:00
Ryan Brandenburg 50acf42eda Fix submodule 2018-11-19 11:03:12 -08:00
Ryan Brandenburg c38d6e662a Remove templating module 2018-11-19 10:50:39 -08:00
Ryan Brandenburg 422d30b521 Merge remote-tracking branch 'origin/release/2.1' into rybrande/MusicStore2.2 2018-11-16 11:34:39 -08:00
Ryan Brandenburg 9adb829eb5 Fix MusicStore RootPath 2018-11-16 10:18:09 -08:00
Ryan Brandenburg 681d743170 Update MusicStore source 2018-11-16 09:36:17 -08:00
Nate McMaster 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
Nate McMaster 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
Nate McMaster 0271428dbe
Merge aspnet/KestrelHttpServer release/2.2 and release/2.1 2018-11-14 21:33:33 -08:00
Nate McMaster 27acef3d46
Merge branch 'release/2.1' into release/2.2 2018-11-14 14:01:43 -08:00
Nate McMaster 0cf9019caa
Remove KestrelHttpServer submodule and update targets and baselines for Kestrel packages 2018-11-14 11:21:15 -08:00
Nate McMaster c1c7d711b6
Merge branch 'release/2.1' into release/2.2 2018-11-14 09:27:23 -08:00
Nate McMaster a8ec75aac4
Prepare for the 2.2.1 patch
* Generate 2.2.0 package baselines
* Update dependencies to 2.2.0
* Update branding to 2.2.1-servicing
2018-11-13 18:21:09 -08:00
Nate McMaster 87092a2590
Update targets and infrastructure for dotnet-watch et. al. 2018-11-13 15:58:22 -08:00
Nate McMaster ccd098ecad
Update DataProtection to use custom reference resolution
This changes DataProtection to build as projects instead of a pseudo-submodule. It replaces Package and ProjectReference with <Reference> items which custom targets then resolve.
2018-11-13 10:28:42 -08:00
Nate McMaster bb6901141c
Remove the HtmlAbstractions git submodule and merge Html.Abstractions into this repo 2018-11-13 09:29:27 -08:00
Nate McMaster 59ed8df382
Add targets and tools for ensuring consistent package versions between servicing builds 2018-11-09 13:05:31 -08:00
Nate McMaster 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
Nate McMaster 0c6e4bebab
Prepare to build the 2.1.7 patch (#3970)
* Prepare 2.1.7 patch
* Add documentation for how we prepare servicing updates
2018-11-08 17:07:18 -08:00
Nate McMaster 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
Nate McMaster 0e3260f2b4
Merge branch 'release/2.2' 2018-11-06 21:47:30 -08:00
Nate McMaster 302d8d59dd
Remove the aspnet/Caching submodule 2018-11-06 21:20:06 -08:00
Nate McMaster 011cf21a5c
Merge branch 'release/2.2' 2018-11-06 17:42:44 -08:00
Nate McMaster 3cf8a41e4a
Remove the aspnet/Logging submodule 2018-11-06 17:30:26 -08:00
Nate McMaster e8aab7ae34
Merge branch 'release/2.2' 2018-11-06 12:36:51 -08:00
Nate McMaster 355c6d3a83
Remove the aspnet/Options submodule 2018-11-06 12:28:45 -08:00
Nate McMaster df46dfee73
Merge branch 'release/2.2' 2018-11-06 12:13:05 -08:00
Nate McMaster 67c3a099ec
Remove the aspnet/Configuration submodule (#3948) 2018-11-06 12:04:36 -08:00
Nate McMaster f8a1e14921
Merge branch 'release/2.2' 2018-11-05 16:35:20 -08:00
Nate McMaster 62b24f930e
Remove the aspnet/FileSystem submodule (#3884) 2018-11-05 14:19:19 -08:00
Justin Kotalik dcece2090c
Remove IISIntegration submodule, add CI (#3867) 2018-11-02 14:34:31 -07:00
Nate McMaster 50e1e60247
Merge branch 'release/2.2' 2018-11-02 10:49:11 -07:00
Justin Kotalik afab1a5be6
Remove IISIntegration submodule, add CI [2.2] (#3865) 2018-11-02 10:22:04 -07:00
Nate McMaster cb85ffa8f6
Merge branch 'release/2.2' 2018-11-02 10:10:49 -07:00
Nate McMaster c92536a21a
Remove the DependencyInjection submodule 2018-11-02 09:58:20 -07:00
Nate McMaster 4b1ce19689
Merge branch 'release/2.2' 2018-10-31 17:32:12 -07:00
Nate McMaster 4b99a85a5f
Merge branch 'release/2.1' into release/2.2 2018-10-31 17:25:20 -07:00
Nate McMaster f2c1eb73a6
Remove the Microsoft.Data.Sqlite submodule 2018-10-31 16:24:18 -07:00
Nate McMaster 908a8b3013
Merge branch 'release/2.2' 2018-10-30 17:18:22 -07:00
Nate McMaster eb79d8f75e
Remove the EventNotification submodule 2018-10-30 17:10:11 -07:00
Nate McMaster 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
Nate McMaster 43792f20b2
Merge branch 'release/2.2' 2018-10-24 12:45:15 -07:00
Nate McMaster 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
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 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 4dfd351c84
Remove DataProtection submodule and update path to DP source code to local folder 2018-10-15 09:46:20 -07:00
Nate McMaster 24d13700d7
Merge branch 'release/2.2' 2018-10-12 17:56:10 -07:00
Nate McMaster c37a332a6a
Merge branch 'release/2.1' into release/2.2 2018-10-12 16:56:47 -07:00
Nate McMaster fb3f5d95c2
Backport infrastructure changes and source reorganization
* Add build definition for Azure DevOps
* Put code for metapackages in a subfolder
* Update targets to prepare for submodules merging into this repo
* Add source code for windows installer
* Add source code for Debian installers
2018-10-12 13:59:43 -07:00
Nate McMaster 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
Nate McMaster cc8cc7b443
Merge branch 'release/2.2' 2018-10-09 13:24:13 -07:00
Nate McMaster 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
Nate McMaster 72cd5eedcf
Prepare the 2.1.6 patch (#1434) 2018-09-28 17:57:33 -07:00
Pranav K b2a88824e1 Remove more MvcPrecompilation (#1373) 2018-09-04 12:31:36 -07:00
Nate McMaster b206d59612
Prepare 2.1.5 patch 2018-08-28 09:14:43 -07:00
Nate McMaster e4161d8971 Prepare 2.1.4 patch
* Update submodules for EF Core, Scaffolding, and Templating
* Change version number for metapackages to 2.1.4
2018-08-07 21:24:01 +00:00
Nate McMaster 68fd26a46b
Merge branch 'release/2.2' 2018-07-25 11:19:21 -07:00
Nate McMaster 2e96271e69
Merge branch 'release/2.1' into release/2.2 2018-07-25 09:29:48 -07:00
Nate McMaster e69a47f230
Implement patch policies per repo and set default to ProductChangesOnly
Our policy since 1.0.0 has been to always cascade version updates in the packages we own. e.g. if Logging has a product change in 2.1.x, then Kestrel, EF Core, Mvc, etc also re-ship with the updated Logging dependency. This has been done for a variety of reasons:

* NuGet does not show updates for transitive dependencies, only direct ones
* NuGet does resolves the lowest compatible transitive dependencies
* ASP.NET Core ships to both .NET Framework (where transitive dependency version matters) and .NET Core (where it matters less if you use the shared framework)

While transitive dependencies is still an important scenario, this practice of always patching has led to bigger issues.

* High probability users will unintentionally upgrade out of the shared framework: #3307
* Conflicts with metapackages that attempt to use exact version constraints: aspnet/Universe#1180
* A quality perception issue: the high volume of new versions in servicing updates with only metadata changes has created the impression that new versions of packages may not be very important. It's also made it appear like there are more issues product than there really are.
* High volume of packages changing with only metadata changes. Of the last 301 packages published in a servicing update, only 11 contained actual changes to the implementation assemblies. (3.5%)

This change implements a system to verify a new, non-cascading versioning policy for servicing updates. This required changes to repos to pin version variables to that matter per-repo,
and to remove some of the restrictions and checks.

Incidentally, this should make defining new patches easier because it automatically determines which packages are or are not patching in the release.
2018-07-12 21:33:50 -07:00
Nate McMaster fd3b979b56
Remove aspnet/WebHooks from release/2.2 2018-06-29 11:10:56 -07:00
Nate McMaster 6b8aac13e0
Prepare infrastructure for the 2.1.3 patch 2018-06-27 14:51:05 -07:00
Nate McMaster e4e3551a1e
Prepare 2.1.2 patch 2018-06-12 15:18:36 -07:00
Nate McMaster a373d7e5d7
React to changes in corefx
New package versions incoming to this patch causes a cascading change to preserve transitive dependencies

* System.Data.SqlClient
* System.Memory
* System.Runtime.CompilerServices.Unsafe
* System.Threading.Tasks.Extensions
2018-06-05 09:19:06 -07:00
Nate McMaster f126871a4c
[2.1.x] Remove WebHooks and Proxy from servicing (#1189)
These repos do not produce packages that will ship in 2.1.x.
2018-05-30 15:16:22 -07:00
Nate McMaster faf600ce71
Fixup the effect of cascading versions (#1187)
The PR #1175 was incomplete. This fixes the cascading effect of patching to 2.1.1

Changes:
 - add CheckRepoGraph (ported directly from the release/2.0 branch)
 - Update submodules
2018-05-30 10:58:10 -07:00
Nate McMaster 81355b508b
Add Razor to the list of patching repos 2018-05-29 13:51:42 -07:00
Nate McMaster 6cf45a4f8a
Prepare the 2.1.1 patch 2018-05-23 15:38:16 -07:00
Pavel Krymets facd3c10bc
Remove testing submodule (#1138) 2018-05-03 17:03:22 -07:00
Javier Calvarro Nelson 7eb13646d5 Add AAD Integration repo 2018-03-22 11:34:11 -07:00
Doug Bunting 6162476e0a Add aspnet/WebHooks to Universe 2018-01-25 10:46:13 -08:00
Chris Ross b05ec85f35
Add AuthSamples repo (#659) 2017-11-21 12:24:16 -08:00
Nate McMaster cccfe3dd57
Use submodules for source dependencies (#621)
As a part of making builds more reproducible, we want to start committing the exact sha of source dependencies used to build aspnetcore. This implements that using git submodules, and removes targets that were previously used to clone source on demand.

Initial submodule status:

Antiforgery => e1884586
AzureIntegration => c998d74e
BasicMiddleware => 9f3ed006
BrowserLink => 7e2ff85a
Caching => c6a9cbbe
Common => 062ad3e7
CORS => 8fd36866
DataProtection => 49b2e22a
DependencyInjection => 88297e3c
Diagnostics => 7ac0e06a
DotNet=>ols => 1836201b
EntityFrameworkCore => e70d7dae
EventNotification => 3f881f18
FileSystem => 51e14a62
Hosting => 82ccf4f0
HtmlAbstractions => d687617a
HttpAbstractions => c0f93723
HttpSysServer => 02331040
Identity => 52dfb021
JavaScriptServices => e583a17e
JsonPatch => e453fafa
KestrelHttpServer => 0c34523e
Logging => e8e3e707
MetaPackages => d63542ca
Mvc => 2e4bc548
Razor => 6c7551d9
Routing => bb413c6a
Security => 88cb3df0
SignalR => 2419867d

[auto-updated: submodules]
2017-11-01 13:03:46 -07:00