Commit Graph

109 Commits

Author SHA1 Message Date
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 51c9b7355d
Create Kestrel.sln, update documentation and README, and ensure all Kestrel test projects have the test logger installed 2018-11-14 13:14:47 -08:00
Nate McMaster c1c7d711b6
Merge branch 'release/2.1' into release/2.2 2018-11-14 09:27:23 -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 a3baf40c74
Set dependency version on Microsoft.Extensions.DiagnosticAdapter to 2.1.0 and prune unused logging analyzers dependency
There was never a 2.1.1
2018-11-09 09:12:52 -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 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
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 5abb3f1f57
Merge branch 'release/2.2' 2018-11-01 14:15:50 -07:00
Nate McMaster 57d52d392d
Add Microsoft.NETFramework.ReferenceAssemblies to list of external dependencies 2018-11-01 00:25:05 -07:00
BrennanConroy 18664f4e63
Remove old redis packages (#3779) 2018-10-31 15:43:07 -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 5e4166f940
Merge branch 'release/2.2' 2018-10-29 16:05:19 -07:00
Nate McMaster e0c575000f
Ensure MicrosoftNETCoreAppPackageVersion is always defined 2018-10-26 12:22:37 -07:00
Nate McMaster 968df9578b
Refactor shared framework projects targets and project layout (#3703)
This refactors the targets used to build the shared framework and its .zip files. There are lots of reasons motivating this: Arcade convergence, migration to VSTS, making it easier to build this locally, etc.

Changes:
* Moves move content of build/Sharedfx.{props/targets} into eng/targets/SharedFx.Common.{props/targets}
* Update the build to produce a `runtime.$rid.Microsoft.AspNetCore.App` package (not just the one with symbols in it)
* Refactor the targets which produce .tar.gz/.zip files into separate projects in `src/Installers/`
* Refactor installers, unit tests, and the framework projects to use ProjectReference to flow dependencies between different parts of the build.
* Makes it easier to build the shared framework locally (for the inner dev loop, you can run `dotnet build -p src/Framework/Microsoft.AspNetCore.App/src/ -r win-x64`)
2018-10-24 15:42:06 -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
Ryan Nowak 2f57888a97 Update visual studio dependencies (#1500)
This is an update of our VS dependencies to the RTM versions based on
15.8. We anticipate updating again soon in master to pick up 16.0
versions - this change is just to catch up with the current state so
there are fewer surprises.
2018-10-16 15:03:50 -07:00
Brice Lambson 2a28f7b069 Merge branch 'release/2.2' 2018-10-11 10:05:27 -07:00
Brice Lambson e0883c2da3 Add NetTopologySuite.IO.SqlServerBytes dependency 2018-10-11 09:59:13 -07:00
Nate McMaster b4fbc1a6e3
Merge branch 'release/2.2' 2018-10-04 16:08:21 -07:00
Nate McMaster b0b65a530a
Support using Internal.AspNetCore.Sdk as an MSBuild SDK (#1452)
* Add Microsoft.AspNetCore.BuildTools.ApiCheck as an external dependency
* Move the global.json files temporarily to avoid loading the wrong version of Internal.AspNetCore.Sdk
2018-10-04 11:07:06 -07:00
Brice Lambson e2e88c3d03 Merge branch 'release/2.2' 2018-09-10 13:26:38 -07:00
Brice Lambson 2f7359d20f
React to aspnet/EntityFrameworkCore#13245 2018-09-10 13:14:48 -07:00
Nate McMaster 63b7efc380
Merge branch 'release/2.2' 2018-09-05 17:25:17 -07:00
Nate McMaster 12f4235342
Merge branch 'release/2.1' into release/2.2 2018-09-05 17:23:44 -07:00
Nate McMaster e9b0415bb9
Make System.IO.Pipelines a direct dependency of Microsoft.AspNetCore.App 2018-09-05 15:20:11 -07:00
Brice Lambson 33a3551e0e Merge branch 'release/2.2' 2018-08-20 11:32:00 -07:00
Brice Lambson 2560815501 Add NetTopologySuite external dependency 2018-08-20 11:30:05 -07:00
N. Taylor Mullen 7d6b56f5c6 Update package versions that are important to new completion APIs.
aspnet/Razor#2227
2018-08-10 11:37:28 -07: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 aee905e359
Sort list of artifacts and add selenium to external artifacts 2018-07-25 09:18:53 -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 fb7a5b92cc
Merge branch 'release/2.2' 2018-07-05 15:18:12 -07:00
Justin Kotalik 8b39e98477
Add web.administation to universe (#1233) 2018-07-02 13:03:48 -07:00