Commit Graph

1025 Commits

Author SHA1 Message Date
Matt Mitchell c813950439 React to changes in produced corefx packages (#4077) 2018-11-19 09:29:33 -08:00
Nate McMaster fd1a5b43f1
Generate PlatformManifest and package conflict overrides for Microsoft.AspNetCore.App (#4072)
This generates additional metadata for the .NET Core SDK to resolve conflicts between Microsoft.AspNetCore.App and PackageReferences which contain the same assemblies.
2018-11-16 16:36:14 -08:00
Ryan Brandenburg 6da92b9d6d Fix dependencies 2018-11-16 15:30:22 -08:00
Nate McMaster 0e12274a8e
Flatten the dependency graph of Microsoft.AspNetCore.App (#4061)
This changes the way Microsoft.AspNetCore.App works to follow patterns set by Microsoft.NETCore.App. Instead of being a metapackage with dozens of dependencies, this package has no dependencies. It uses RID-splitting to deliver standalone assets for self-contained deployments.

Changes:
* Implements RID-split packages for Microsoft.AspNetCore.App.
* Update shared fx deps.json generation to only include entries for the RID-specific metapackages
* Include platform-specific packages in publish output
* Remove all nuspec dependencies of Microsoft.AspNetCore.App and collect all references into the package.
2018-11-16 15:16:15 -08:00
Ryan Brandenburg 8227f9f819 Fix merge problem 2018-11-16 13:14:45 -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
Nate McMaster c2685813ab
2.1: Update corefx dependencies (#4037) 2018-11-15 12:20:37 -08:00
Arthur Vickers f942ca4bbe
Update version for Azure Services App Authentication (#4029)
See https://github.com/aspnet/Configuration/pull/881/files

/cc @HaoK @joshgav @nonik0
2018-11-15 10:23:38 -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 406c80bfb0
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 4598850c20
2018-11-14 16:03:24 -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
John Luo b4dbaa95d0 Add ChromeDriver dependency 2018-11-14 11:24:59 -08:00
John Luo e69285a36d Use Selenium to test Chrome 2018-11-14 11:13:24 -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 a2d855406b
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in eba014d534
2018-11-13 15:36:38 -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 1ab08d70ef
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 252ae0c434
2018-11-09 16:17:15 -08:00
dotnet-maestro-bot f64d6a2b50 Updating dependencies (#3996) 2018-11-09 15:48:44 -08:00
Nate McMaster fcb970ec83
Upgrade to EF Core 3.0.0-preview-181109-02 2018-11-09 14:33:52 -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 74d9728e95
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 218064c300
2018-11-09 12:49:58 -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 bd5bf34351
Merge branch 'release/2.2' 2018-11-09 07:29:37 -08:00
Nate McMaster db0d3c333d
Fix NU1605 build error by ensuring package versions are set correctly in subfolder projects (#3987) 2018-11-08 23:40:14 -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 17ee447d26
Upgrade to Extensions 2.2.0-rtm-181106-10 2018-11-06 17:32:06 -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
dotnet-maestro-bot 9d794af34d Update to .NET Core 2.2.0-rtm-27105-02 and Extensions 2.2.0-rtm-181105-01 2018-11-05 10:12:15 -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
Javier Calvarro Nelson f170981fec Add auth server package 2018-11-01 11:24:41 -07:00
Nate McMaster 57d52d392d
Add Microsoft.NETFramework.ReferenceAssemblies to list of external dependencies 2018-11-01 00:25:05 -07:00
Ryan Nowak 48f4e6390f Rolling back the version of Roslyn for analyzers
Rolling back the version used by analyzers. This isn't something that I
need for the Razor tooling work, so I'm going for a less impactful
change for now.
2018-10-31 17:21:38 -07:00
BrennanConroy 18664f4e63
Remove old redis packages (#3779) 2018-10-31 15:43:07 -07:00
Ryan Nowak d193e66566 Update to Dev16 Roslyn 2018-10-31 12:34:48 -07:00
Brice Lambson 4a5d7cf930 Merge branch 'release/2.2' 2018-10-31 11:35:26 -07:00
Brice Lambson 1f896dc61b ⬆️ Update NetTopologySuite.IO.SqlServerBytes to 1.15.0 2018-10-31 11:30:17 -07:00
Nate McMaster c629400a73
Fix syntax error caused by bad merge on build/dependencies.props 2018-10-30 17:28:41 -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
Ryan Nowak b253f9dc56 Update CPS packages to incorporate breaking change
We need to consume a new Dev16 package since they are making breaking
changes. The changes have already been merged into dev16 so now is a
good time to mainline this change.
2018-10-29 08:50:43 -07:00
Nate McMaster d957ac9da0
Remove Microsoft.DotNet.GlobalTools.Sdk, upgrade BuildTools, and change VSIX signing cert name 2018-10-27 01:28:14 -07:00
Nate McMaster e0c575000f
Ensure MicrosoftNETCoreAppPackageVersion is always defined 2018-10-26 12:22:37 -07:00
John Luo 31f1e170d0 Add interop tests with headless chrome 2018-10-25 10:38:41 -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 0e51d2ecdd Fix version of StreamJsonRpc
I got a little too ambitious with bumping up this version. This isn't in
the VS that we're using yet, so I have to bump it back down.
2018-10-23 16:37:11 -07:00
dotnet-maestro-bot bc8984dfea Upgrade to .NET Core 2.2.0-rtm-27023-02 2018-10-23 13:36:09 -07:00
N. Taylor Mullen 4e24414b7f Update tooling package versions. 2018-10-19 15:10:11 -07:00
Nate McMaster 36add43f11
Merge branch release/2.1 into release/2.2 2018-10-18 16:53:03 -07:00
dotnet-maestro-bot 31849575f1 Upgrade to .NET Core 2.1.6-servicing-27017-02 2018-10-18 13:48:06 -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
Nate McMaster 4d631ffed3
Merge branch 'release/2.2' 2018-10-16 12:06:16 -07:00
Nate McMaster a35226131a
Merge branch release/2.2 2018-10-16 12:02:18 -07:00
dotnet-maestro-bot f2ddc6efc0 Update .NET Core to 2.2.0-preview3-27014-02 2018-10-16 09:07:50 -07:00
John Luo cc45d0cb41 Use dev certs
- Also update tfms
2018-10-15 11:29:55 -07:00
Nate McMaster 3eb0764fae
Reorganize source code from aspnet/DataProtection into a subfolder
Prior to reorg, this source existed at 9c7731f1fa
2018-10-15 10:47:38 -07:00
dotnet-maestro-bot 31f60d75d3 Update dependencies.props (#3001)
[auto-updated: dependencies]
2018-10-12 11:43:41 -07:00
BrennanConroy 9c7731f1fa Merge branch 'release/2.2' 2018-10-11 10:23:24 -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
Hao Kung 06e9531d50
Update IdentityModel packages 2018-10-10 22:34:38 -07:00
BrennanConroy 3f5f419df8
Add Redis 2.0 package (#325) 2018-10-10 16:40:52 -07:00
BrennanConroy 26eecf5d92 Merge release/2.2 to master 2018-10-10 08:57:30 -07:00
Ryan Nowak 904c9d3623 Use Moq v4.10 2018-10-09 15:09:26 -07:00
BrennanConroy 85ecc5ba4c
Add Redis 2.0 (#1459) 2018-10-09 14:50:50 -07:00
Ryan Nowak 0a1c60e2d3 Update Moq to 4.11.0
This is the latest version of Moq, should have a fix for
https://github.com/aspnet/Home/issues/3569
2018-10-09 13:41:21 -07:00
N. Taylor Mullen 18b61e9217 Revert "Update Roslyn version."
This reverts commit 70f2d3abd9.
2018-10-09 11:53:37 -07:00
dotnet-maestro-bot 3cd98acda3 Updating external dependencies (#1464) 2018-10-09 11:33:03 -07:00
N. Taylor Mullen 70f2d3abd9 Update Roslyn version.
aspnet/Razor#2634
2018-10-09 11:04:04 -07:00
Pavel Krymets 21b98de09b
Update System.IO.Pipelines to 4.5.2 (#1458) 2018-10-09 10:46:27 -07:00
ASP.NET CI 6164ec7225 Update dependencies.props
[auto-updated: dependencies]
2018-10-07 19:23:18 +00:00
ASP.NET CI 3acb4dd4e9 Update dependencies.props
[auto-updated: dependencies]
2018-10-07 19:10:34 +00:00
ASP.NET CI b4d5eeafa3 Update dependencies.props
[auto-updated: dependencies]
2018-10-07 12:09:41 -07:00
Chris Ross (ASP.NET) daf6e1ecd7 Http/2 response trailers #622 2018-10-05 12:50:46 -07:00
Stephen Halter 80ba49368b Merge branch 'release/2.2' 2018-10-05 10:43:12 -07:00
Stephen Halter 730564d32b
React to aspnet/Logging#884 (#1450) 2018-10-04 16:53:54 -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
dotnet-maestro-bot aad0f719d5 Upgrade to .NET Core 2.2.0-preview3-27001-02 (#1441) 2018-10-01 13:31:46 -07:00
ASP.NET CI 21e9c12b62 Update dependencies.props
[auto-updated: dependencies]
2018-09-30 12:22:40 -07:00
ASP.NET CI 018a252560 Update dependencies.props
[auto-updated: dependencies]
2018-09-30 12:10:12 -07:00
ASP.NET CI 8e3b940e91 Update dependencies.props
[auto-updated: dependencies]
2018-09-30 12:09:33 -07:00
Nate McMaster 6effb13bbd
Update to .NET Core 2.1.5 2018-09-28 19:39:46 -07:00
dotnet-maestro-bot 66ba370a0a Update .NET Core to 2.2.0-preview3-26927-02 2018-09-27 16:19:50 -07:00