Commit Graph

18033 Commits

Author SHA1 Message Date
Ryan Brandenburg c2ab65fa76 Merge branch 'master' of github.com:aspnet/AspNetCore into rybrande/Mondo22ToMaster 2018-11-21 10:34:45 -08:00
Nate McMaster 0295f536ef
Stop shipping packages for assemblies which are shared-framework-only (#4178)
The removes the need to ship packages for assemblies which are part of Microsoft.AspNetCore.App. The implementation of this requires first building packages, and then modifying .nuspec's and categorizing packages as "noship". This will be cleaned up in the future as we continue to refactor the way this repository builds.
2018-11-21 10:33:07 -08:00
Ryan Brandenburg e808301e38 Merge branch 'master' of github.com:aspnet/AspNetCore into rybrande/Mondo22ToMaster 2018-11-21 09:54:05 -08:00
Nate McMaster 40ef11cf54
Fix UserSecretsIdAttribute generation when using FrameworkReference to Microsoft.AspNetCore.App (#4177)
When only Microsoft.AspNetCore.App is referenced, the project will no longer have MSBuild imports from the Microsoft.Extensions.Configuration.UserSecrets package, which takes care of generating the UserSecretsIdAttribute. This ensures the attribute is still generated in default project templates without needing a new package ref to Config.UserSecrets.
2018-11-21 09:12:06 -08:00
Nate McMaster e25c2acb25
Flow BUILD_NUMBER and BUILD_BUILDNUMBER into Docker builds 2018-11-21 08:35:25 -08:00
ASP.NET CI ccb335799f Updating BuildTools from 3.0.0-build-20181120.3 to 3.0.0-build-20181120.4
[auto-updated: buildtools]
2018-11-20 21:15:09 -08:00
Nate McMaster 0cbfa9ce6d
Update branding to 3.0.0-preview (#4171)
Changes:
* This uses date-based versioning
* Builds are `3.0.0-preview-$(buildnumber)`, not alpha1 or preview1.
2018-11-20 19:47:12 -08:00
ASP.NET CI 61b0b83f75 Updating submodule(s)
Mvc => bfdecc8f5e

[auto-updated: submodules]
2018-11-21 01:39:38 +00:00
Ryan Brandenburg c8dddaaafc Merge remote-tracking branch 'Metapackages/rybrande/masterToSrc' into rybrande/Mondo22ToMaster 2018-11-20 16:43:26 -08:00
Ryan Brandenburg 4ab02a9ad9 Merge remote-tracking branch 'JavaScriptServices/rybrande/masterToSrc' into rybrande/Mondo22ToMaster 2018-11-20 16:43:12 -08:00
Ryan Brandenburg 9ecf86fe65 Merge remote-tracking branch 'AADIntegration/rybrande/masterToSrc' into rybrande/Mondo22ToMaster 2018-11-20 16:42:54 -08:00
Ryan Brandenburg 73dbfdbee1 Merge branch 'release/2.2' into rybrande/Mondo22ToMaster 2018-11-20 16:42:11 -08:00
Ryan Brandenburg 41b359c119 Merge branch 'rybrande/release22ToSrc' into rybrande/masterToSrc 2018-11-20 16:32:45 -08:00
Ryan Brandenburg 27eed7e904 Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in d417aacd7c
2018-11-20 16:32:23 -08:00
Ryan Brandenburg cdc621d428 Merge branch 'rybrande/release22ToSrc' into rybrande/masterToSrc 2018-11-20 16:26:40 -08:00
Ryan Brandenburg 00b0bcc665 Merge branch 'rybrande/release22ToSrc' into rybrande/masterToSrc 2018-11-20 16:23:13 -08:00
ASP.NET CI 4a57d28a57 Updating submodule(s)
Identity => 781ca09033
ResponseCaching => 7e6b6c6991
Routing => 47268686c0
Session => e3c711f538
SignalR => dde73d0b8a
StaticFiles => b732ef662e

[auto-updated: submodules]
2018-11-20 15:55:46 -08:00
Nate McMaster 3318d0c7f9
Temporarily add a signcheck exclusion to unblock aspnet builds (#4170)
Workaround dotnet/core-setup#4797
2018-11-20 15:08:46 -08:00
ASP.NET CI c206b18707 Updating BuildTools from 3.0.0-build-20181116.1 to 3.0.0-build-20181120.3
[auto-updated: buildtools]
2018-11-20 13:52:05 -08:00
ASP.NET CI 8e5812e66e Updating submodule(s)
MetaPackages => d417aacd7c
Mvc => 1521f9298b

[auto-updated: submodules]
2018-11-20 13:51:54 -08:00
Jacques Eloff 5a446ecc53
Merge pull request #4165 from aspnet/joeloff/SharedInstall
#3697 - override default install location
2018-11-20 13:41:08 -08:00
Nate McMaster 1d9b77e255
Import DotNetPackageVersionPropsPath into all sub-folder builds 2018-11-20 13:23:55 -08:00
Nate McMaster 0f904c518e
React to breaking changes in Microsoft.Extensions.Logging.Abstractions 2018-11-20 12:52:15 -08:00
Nate McMaster 43fa1ba365
Import DotNetPackageVersionPropsPath into the src/IISIntegration build context 2018-11-20 12:10:44 -08:00
Ryan Brandenburg 9bddef704f Merge branch 'release/2.2' of github.com:aspnet/AspNetCore into rybrande/Mondo2.2 2018-11-20 12:08:54 -08:00
Jacques Eloff 07c3931758 #3697 - override default install location 2018-11-20 12:02:03 -08:00
ASP.NET CI a25bd4e3a5 Updating submodule(s)
EntityFrameworkCore => 5262ff5b16fffd0241975fb0b90b01cb71966fd2
SignalR => d0bcdf3dd9

[auto-updated: submodules]
2018-11-20 19:53:56 +00:00
Nate McMaster 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
Nate McMaster 33095908b9
Add Internal.WebHostBuilderFactory.Sources to the list of build artifacts 2018-11-20 11:19:50 -08:00
Ryan Brandenburg 5e36c334e1 Merge remote-tracking branch 'MetaPackages/rybrande/release22ToSrc' into rybrande/Mondo2.2 2018-11-20 11:10:34 -08:00
Ryan Brandenburg 2b146e5266 Merge remote-tracking branch 'JavaScriptServices/rybrande/release22ToSrc' into rybrande/Mondo2.2 2018-11-20 11:10:19 -08:00
Ryan Brandenburg 65ceeb6560 Merge remote-tracking branch 'AADIntegration/rybrande/release22ToSrc' into rybrande/Mondo2.2 2018-11-20 11:09:14 -08:00
Ryan Brandenburg 00be61dbef Merge branch 'rybrande/release21ToSrc' into rybrande/release22ToSrc 2018-11-20 11:07:06 -08:00
Ryan Brandenburg a6acf47e79 Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 27efce1042
2018-11-20 11:06:50 -08:00
Ryan Brandenburg 128562955e Merge branch 'rybrande/release21ToSrc' into rybrande/release22ToSrc 2018-11-20 11:04:30 -08:00
Ryan Brandenburg 964498a69d Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 7819c2f950
2018-11-20 11:04:10 -08:00
Nate McMaster 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
Ryan Brandenburg fc51b31a34 Merge branch 'rybrande/release21ToSrc' into rybrande/release22ToSrc 2018-11-20 10:58:09 -08:00
Ryan Brandenburg 33b736b4a7 Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 0efa96de73
2018-11-20 10:57:52 -08:00
Nate McMaster d417aacd7c
Update README.md 2018-11-20 10:53:22 -08:00
Nate McMaster 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
Pavel Krymets d17392bc45
Port Resolve C26496 compiler errors when building in release mode with VS 15.9 (#4141) 2018-11-20 10:00:37 -08:00
Nate McMaster 425c196cba
Merge the master branch of aspnet/Hosting 2018-11-20 09:59:15 -08:00
Nate McMaster b6de45ee72
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 241d2c13df
2018-11-20 09:51:45 -08:00
Nate McMaster ee1e2d6173
Merge the master branch of aspnet/HttpAbstractions 2018-11-20 09:49:01 -08:00
Nate McMaster 294b5f2928
Merge branch 'release/2.2' 2018-11-20 09:47:59 -08:00
Luke Latham 5539b0f6e7 Change Google scope in external providers sample (#4138) 2018-11-20 09:38:05 -08:00
Nate McMaster bfba741326
Merge aspnet/Hosting release/2.2 2018-11-20 09:35:34 -08:00
Nate McMaster 0f64aa5c01
Merge aspnet/HttpAbstractions release/2.2 2018-11-20 09:15:59 -08:00
Nate McMaster feb68c1382
Merge branch 'release/2.1' into release/2.2 2018-11-20 09:13:55 -08:00