396aa9735e
PR feedback
2018-11-20 16:15:51 -08:00
d5587f3c54
Merge remote-tracking branch 'origin/release/2.1' into rybrande/21To22Merge
2018-11-20 15:42:00 -08:00
1d9b77e255
Import DotNetPackageVersionPropsPath into all sub-folder builds
2018-11-20 13:23:55 -08:00
6e439f1396
Fix submodules
2018-11-20 12:57:21 -08:00
48528cf69f
Fix templating casing
2018-11-20 12:53:46 -08:00
73b5d6d0e5
Remove the BrowserLink submodule ( #4087 )
2018-11-20 11:36:26 -08:00
71ca1faa6b
React to MSBuild breaking changes and remove ProdCon v1 variables ( #4161 )
...
This should unblock the consumption of the latest .NET Core SDK, which includes breaking changes in MSBuild. We don't _really_ need the MSBuild APIs which were broken because ProdCon v1 is dead. This removes the unused ProdCon v1 tasks and targets.
2018-11-20 11:34:53 -08:00
33095908b9
Add Internal.WebHostBuilderFactory.Sources to the list of build artifacts
2018-11-20 11:19:50 -08:00
7ffbb6ed3b
Continue to produce .Sources packages from src/Shared/
...
This is temporary until we finish replacing internal PackageReference with project ref
2018-11-20 11:01:36 -08:00
0af21077c3
Update .NET Core 3.0 dependencies ( #4091 )
...
* Update Extensions to 3.0.0-preview.18569.14
* Update EFCore to 3.0.0-preview.18569.2
* Update corefx to preview.18566.8
* Update core-setup to preview-27117-01
2018-11-20 10:37:13 -08:00
b335283ab1
Merge branch 'release/2.1' of github.com:aspnet/AspNetCore into rybrande/Mondo2.1
2018-11-20 10:24:50 -08:00
6fc3eb3bfc
Fix MetaPackage casing
2018-11-20 10:21:21 -08:00
f45dacf924
Fix folder casing ( #4144 )
...
Fix folder casing
2018-11-20 10:02:51 -08:00
294b5f2928
Merge branch 'release/2.2'
2018-11-20 09:47:59 -08:00
bfba741326
Merge aspnet/Hosting release/2.2
2018-11-20 09:35:34 -08:00
feb68c1382
Merge branch 'release/2.1' into release/2.2
2018-11-20 09:13:55 -08:00
3f025e3a38
Make Microsoft.AspNetCore.Server.IntegrationTesting a temporary external dependency
2018-11-19 23:38:13 -08:00
7ccb8dbfe1
Account for the relocation of Microsoft.AspNetCore.Hosting.WebHostBuilderFactory.Sources
2018-11-19 22:50:46 -08:00
05b8745172
Remove aspnet/Hosting submodule and update targets and projects
2018-11-19 22:25:43 -08:00
87ab2744ce
Reorganize source code in preparation to move into aspnet/AspNetCore
...
Prior to reorganization, this source code was found in 3f7ee338d4
2018-11-19 22:00:32 -08:00
4fcc8b9902
Update targets to build HttpAbstractions projects
2018-11-19 21:34:26 -08:00
9cb41d7f80
Fix the casing on the templating submodule group
2018-11-19 21:03:41 -08:00
7c6bf7f75d
Merge branch 'release/2.2'
2018-11-19 21:00:19 -08:00
ae619e6b7f
Include Microsoft.Extensions.Http.dll in signing
2018-11-19 18:38:09 -08:00
6e40f92ed4
Merge branch 'release/2.1' into release/2.2
2018-11-19 17:20:55 -08:00
ea1ba001cc
Fix casing issue in the path the templating code submodule
2018-11-19 17:20:02 -08:00
21b142b65d
Merge branch 'release/2.1' into release/2.2
2018-11-19 17:04:13 -08:00
94f5e2bc1b
Fix submodule
2018-11-19 16:57:06 -08:00
ade4572238
Fix submodules for AADIntegration JavaScriptServices and MetaPackages
2018-11-19 16:28:13 -08:00
78eb188014
Merge branch 'master' of github.com:aspnet/AspNetCore into rybrande/MondoMaster
2018-11-19 16:01:22 -08:00
37399bc217
Merge branch 'master' of github.com:aspnet/AspNetCore into rybrande/MusicStoreMaster
2018-11-19 12:34:59 -08:00
af6792afc3
Merge branch 'master' of github.com:aspnet/AspNetCore into rybrande/MondoMaster
2018-11-19 12:24:58 -08:00
ea68246950
Fix submodules for AuthSamples AzureIntegration and Templating
2018-11-19 12:21:41 -08:00
4173f23e3e
Remove the HttpClientFactory submodule ( #4085 )
2018-11-19 12:05:39 -08:00
2cda14658d
Fix submodules for AuthSamples AzureIntegration and Templating
2018-11-19 11:55:24 -08:00
6044a66a63
Have the trailing slash
2018-11-19 11:28:19 -08:00
69534b5687
Fix AzureIntegration submodule
2018-11-19 11:18:31 -08:00
9954f5a703
Fix MSB4062 - fix conflicting build tools dependencies by ensuring the same version is used
2018-11-19 11:16:03 -08:00
33a92fecd7
Fix AuthSamples submodule
2018-11-19 11:11:59 -08:00
50acf42eda
Fix submodule
2018-11-19 11:03:12 -08:00
c38d6e662a
Remove templating module
2018-11-19 10:50:39 -08:00
137a72f85d
React to the removal of Microsoft.AspNetCore.ApplicationInsights.HostingStartup
2018-11-19 09:43:13 -08:00
c813950439
React to changes in produced corefx packages ( #4077 )
2018-11-19 09:29:33 -08:00
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
6da92b9d6d
Fix dependencies
2018-11-16 15:30:22 -08:00
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
8227f9f819
Fix merge problem
2018-11-16 13:14:45 -08:00
422d30b521
Merge remote-tracking branch 'origin/release/2.1' into rybrande/MusicStore2.2
2018-11-16 11:34:39 -08:00
9adb829eb5
Fix MusicStore RootPath
2018-11-16 10:18:09 -08:00
681d743170
Update MusicStore source
2018-11-16 09:36:17 -08:00
c2685813ab
2.1: Update corefx dependencies ( #4037 )
2018-11-15 12:20:37 -08:00
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
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
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
289050b9f2
Normalize code sign metadata to avoid duplication between projects and cross-gen config settings
2018-11-14 15:14:27 -08:00
27acef3d46
Merge branch 'release/2.1' into release/2.2
2018-11-14 14:01:43 -08:00
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
fe981c108b
Add Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X
2018-11-14 11:32:20 -08:00
b4dbaa95d0
Add ChromeDriver dependency
2018-11-14 11:24:59 -08:00
0cf9019caa
Remove KestrelHttpServer submodule and update targets and baselines for Kestrel packages
2018-11-14 11:21:15 -08:00
e69285a36d
Use Selenium to test Chrome
2018-11-14 11:13:24 -08:00
c1c7d711b6
Merge branch 'release/2.1' into release/2.2
2018-11-14 09:27:23 -08:00
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
87092a2590
Update targets and infrastructure for dotnet-watch et. al.
2018-11-13 15:58:22 -08:00
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
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
ed1976b862
Update BuildTools to 2.1.3-rtm-15845
2018-11-13 10:02:59 -08:00
bb6901141c
Remove the HtmlAbstractions git submodule and merge Html.Abstractions into this repo
2018-11-13 09:29:27 -08:00
140cf62b56
Re-enable SignCheck
2018-11-09 17:29:24 -08:00
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
f64d6a2b50
Updating dependencies ( #3996 )
2018-11-09 15:48:44 -08:00
fcb970ec83
Upgrade to EF Core 3.0.0-preview-181109-02
2018-11-09 14:33:52 -08:00
116f31362a
Remove WebApiCompatShim
2018-11-09 14:32:18 -08:00
dfacde4dee
Fix /t:FastCheck for local-projects
2018-11-09 14:23:04 -08:00
59ed8df382
Add targets and tools for ensuring consistent package versions between servicing builds
2018-11-09 13:05:31 -08:00
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
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
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
bd5bf34351
Merge branch 'release/2.2'
2018-11-09 07:29:37 -08:00
1f19f1a51a
Temporarily disable sign check because the tool crashes and prevents us from getting a build
2018-11-09 07:23:47 -08:00
db0d3c333d
Fix NU1605 build error by ensuring package versions are set correctly in subfolder projects ( #3987 )
2018-11-08 23:40:14 -08:00
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
ba70991d7c
Stop publishing runtime-extension-internal.zip and don't produce StressTestWebsite.zip by default in CI builds ( #3984 )
2018-11-08 17:01:31 -08:00
7f4d10775c
Add signcheck exclusions ( #3985 )
2018-11-08 16:57:07 -08:00
723257ea80
Fix skip condition for artifact ( #3983 )
2018-11-08 15:58:29 -08:00
89a3526769
Move runtime site extension to installers ( #3954 )
2018-11-08 14:13:07 -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
3cb67766a8
Merge branch 'release/2.2'
2018-11-06 18:09:01 -08:00
d81128de11
Fix CodeSign.props to include the .dll in the file name for logging files
2018-11-06 18:07:54 -08:00
011cf21a5c
Merge branch 'release/2.2'
2018-11-06 17:42:44 -08:00
17ee447d26
Upgrade to Extensions 2.2.0-rtm-181106-10
2018-11-06 17:32:06 -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
Ryan Brandenburg
Nate McMaster
Nate McMaster
Matt Mitchell
Arthur Vickers
Pranav K
John Luo
dotnet-maestro-bot
Pavel Krymets