Nate McMaster
7c6bf7f75d
Merge branch 'release/2.2'
2018-11-19 21:00:19 -08:00
Nate McMaster
ae619e6b7f
Include Microsoft.Extensions.Http.dll in signing
2018-11-19 18:38:09 -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
78eb188014
Merge branch 'master' of github.com:aspnet/AspNetCore into rybrande/MondoMaster
2018-11-19 16:01:22 -08:00
Ryan Brandenburg
37399bc217
Merge branch 'master' of github.com:aspnet/AspNetCore into rybrande/MusicStoreMaster
2018-11-19 12:34:59 -08:00
Ryan Brandenburg
af6792afc3
Merge branch 'master' of github.com:aspnet/AspNetCore into rybrande/MondoMaster
2018-11-19 12:24:58 -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
Nate McMaster
9954f5a703
Fix MSB4062 - fix conflicting build tools dependencies by ensuring the same version is used
2018-11-19 11:16:03 -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
Nate McMaster
137a72f85d
React to the removal of Microsoft.AspNetCore.ApplicationInsights.HostingStartup
2018-11-19 09:43:13 -08:00
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
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
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
289050b9f2
Normalize code sign metadata to avoid duplication between projects and cross-gen config settings
2018-11-14 15:14:27 -08:00
Nate McMaster
27acef3d46
Merge branch 'release/2.1' into release/2.2
2018-11-14 14:01:43 -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
Pranav K
fe981c108b
Add Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
2018-11-14 11:32:20 -08:00
John Luo
b4dbaa95d0
Add ChromeDriver dependency
2018-11-14 11:24:59 -08:00
Nate McMaster
0cf9019caa
Remove KestrelHttpServer submodule and update targets and baselines for Kestrel packages
2018-11-14 11:21:15 -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
87092a2590
Update targets and infrastructure for dotnet-watch et. al.
2018-11-13 15:58:22 -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
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
ed1976b862
Update BuildTools to 2.1.3-rtm-15845
2018-11-13 10:02:59 -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
140cf62b56
Re-enable SignCheck
2018-11-09 17:29:24 -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