Commit Graph

37440 Commits

Author SHA1 Message Date
Mikael Mengistu 86f4e80ecf
Merge pull request #3214 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-10-26 13:55:51 -07:00
Nate McMaster d2af13517b
Merge branch 'release/2.2' 2018-10-26 13:39:01 -07:00
Mikael Mengistu e1b602a7c5
Remove BiFunction Ref (#3213) 2018-10-26 13:38:35 -07:00
ASP.NET CI a5d88b0ca2 Updating BuildTools from 2.2.0-preview2-20181024.5 to 2.2.0-preview2-20181026.1
[auto-updated: buildtools]
2018-10-26 13:35:09 -07:00
ASP.NET CI 1353fdb5f8 Updating submodule(s)
AzureIntegration => f58d3d4e94
CORS => a74235c7ec
EntityFrameworkCore => f161d001032c11f4a71af64ba87fc7c233b92093
Identity => 95bc251848
KestrelHttpServer => 395b681348
Mvc => 6bb292cfcc
Scaffolding => 629bb9963377eb9e915013bd8b2f5c724833d82a
SignalR => 2ad1996220
Templating => a504c40165

[auto-updated: submodules]
2018-10-26 13:35:01 -07:00
Mikael Mengistu 64222fa735
Merge pull request #3212 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-10-26 12:56:44 -07:00
Nate McMaster a504c40165
Merge branch 'release/2.1' into release/2.2 2018-10-26 12:30:06 -07:00
Nate McMaster ba67b04d9d
Ensure IsTestProject=false in Microsoft.AspNetCore.Identity.Specification.Tests.csproj
This isn't really a test project. It's a class library which contains testing compontents. Because 'xunit' is referenced, IsTestProject=true, which
messes up some of the build logic we have for handling code signing and test runners
2018-10-26 12:26:16 -07:00
Nate McMaster e0c575000f
Ensure MicrosoftNETCoreAppPackageVersion is always defined 2018-10-26 12:22:37 -07:00
Pranav K ae50cd619f
Merge pull request #8651 from aspnet/prkrishn/master
Merge pull request #8641 from dotnet-maestro-bot/merge/release/2.2-to…
2018-10-26 12:15:34 -07:00
Pranav K f5a0237486
Merge pull request #197 from aspnet/feature/w-m
Feature/w m
2018-10-26 12:15:21 -07:00
Nate McMaster b566e87f27
Remove reference to deleted target 'PreinstallBundledPackages' 2018-10-26 12:07:00 -07:00
ASP.NET CI 311ff231dd Updating BuildTools from 3.0.0-alpha1-20181024.6 to 3.0.0-alpha1-20181026.2
[auto-updated: buildtools]
2018-10-26 12:04:27 -07:00
ASP.NET CI de50008bd8 Updating submodule(s)
AzureIntegration => de39065c3d
EntityFrameworkCore => 2f75cbafe06907f9da692c586bb664376dcd5cde
Identity => 2ab58c47f7
KestrelHttpServer => b2c65bd346
Logging => 03970f7104af079bcf361009102bdb3249874e25

[auto-updated: submodules]
2018-10-26 12:04:18 -07:00
James Newton-King 6bb292cfcc
Add test for metadata precedence (#8642) 2018-10-27 07:59:15 +13:00
Nate McMaster 6bafc157e7
Update code signing config to exclude .js and .ttf files in template packages 2018-10-26 11:51:23 -07:00
Ryan Brandenburg 2adf798ba0 Fix peer dependencies in React templates 2018-10-26 11:46:48 -07:00
Pranav K 6c0bbc7458
Merge remote-tracking branch 'origin/release/2.2' into prkrishn/master 2018-10-26 11:36:55 -07:00
Pranav K e742ce79aa
Merge remote-tracking branch 'origin/release/2.2' into feature/w-m 2018-10-26 11:17:05 -07:00
Pranav K a74235c7ec Reflect Access-Control-Request-Headers and Access-Control-Request-Method when policy is configured to support wildcard
Fixes https://github.com/aspnet/AspNetCore/issues/3684
2018-10-26 11:11:33 -07:00
Pranav K 5656e7f455 React to CORS changes 2018-10-26 11:10:54 -07:00
Stephen Halter b2c65bd346 Merge branch 'release/2.2' 2018-10-26 11:01:02 -07:00
Javier Calvarro Nelson 2ab58c47f7 Merge branch 'release/2.2' 2018-10-26 10:55:39 -07:00
Javier Calvarro Nelson 95bc251848 Avoid file descriptor exhaustion caused by Razor Pages on functional tests 2018-10-26 10:54:46 -07:00
Mikael Mengistu 2ad1996220
Remove LogLevel enum (#3203) 2018-10-26 10:50:24 -07:00
Stephen Halter 395b681348
Add HTTP/2 request body data rate limit (#3051) 2018-10-26 10:46:46 -07:00
Nate McMaster b78ee81a1e
Flow DotNetRestoreSourcePropsPath and DotNetPackageVersionPropsPath into the shared framework build steps 2018-10-26 10:44:47 -07:00
Nate McMaster ee11d10f04
Remove BrowserLink and Scaffolding gitsubmodules (#3730)
As a part of simplifying the way we build ASP.NET Core, the BrowserLink and Scaffolding repos and the packages they produce will be independent from aspnet/AspNetCore.
2018-10-26 10:17:57 -07:00
Pavel Krymets de39065c3d
Merge pull request #246 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-10-26 10:09:00 -07:00
Pavel Krymets f58d3d4e94
Remove unused content from logging site extension (#245) 2018-10-26 09:49:27 -07:00
Pavel Krymets 99f2ecd02f
Move transformation tests from AzureIntegration (#3726) 2018-10-26 09:49:19 -07:00
ASP.NET CI ad9a22f7a5 Updating submodule(s)
CORS => 0c1e02819c
EntityFrameworkCore => 72735eb04550a2519beb95ce0d3be1908f3a37f2
HttpAbstractions => ec176b2e40
Identity => 08074b6714
KestrelHttpServer => a6569e71bc
Logging => 37f61e9db79d9348a3ef987c3a6fa985efe96991
Options => 6a33d19af18125e25a048b88c8ad7f570fec86b9
Razor => 601cba6945
SignalR => dcf21dd486
Templating => 89d493bac8

[auto-updated: submodules]
2018-10-26 07:10:43 +00:00
ASP.NET CI 75cc3fc5b2 Updating submodule(s)
EntityFrameworkCore => f14134387abbacbb4cb76ef18ffee4df08e800d5
Identity => 168be7b561
KestrelHttpServer => d9aba751ae
SignalR => fc3a1fee61
Templating => 958e0b1d9f

[auto-updated: submodules]
2018-10-26 07:06:38 +00:00
Hao Kung ec176b2e40
Merge release/2.2 (#1055)
* Add safe copy for enumeration (#1052)
2018-10-25 18:43:21 -07:00
John Luo a6569e71bc Merge branch 'release/2.2' 2018-10-25 18:02:15 -07:00
Sébastien Ros d9aba751ae Change TargetFramework for micro benchmarks 2018-10-25 17:58:23 -07:00
Mikael Mengistu dcf21dd486
Merge pull request #3205 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-10-25 16:54:54 -07:00
Ryan Brandenburg 89d493bac8
Merge pull request #805 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-10-25 16:23:28 -07:00
Javier Calvarro Nelson 08074b6714
Merge pull request #2025 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-10-25 15:47:18 -07:00
Javier Calvarro Nelson 0c1e02819c
Merge pull request #195 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-10-25 15:45:59 -07:00
Wouter Huysentruit 168be7b561 Use the correct logging category inside RegisterModel 2018-10-25 15:44:59 -07:00
Javier Calvarro Nelson 51de582c83
[Fixes #2002] UI package has path error (#2024) 2018-10-25 15:33:49 -07:00
Javier Calvarro Nelson 03a3955b85
Merge branch 'master' into merge/release/2.2-to-master 2018-10-25 15:33:12 -07:00
Pranav K 601cba6945
Merge pull request #2671 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-10-25 15:24:09 -07:00
Ryan Brandenburg 958e0b1d9f Get rid of Page1 Page2 2018-10-25 15:12:31 -07:00
Mikael Mengistu fc3a1fee61
Remove Dependency on java.util.Function (#3186) 2018-10-25 14:50:21 -07:00
Mikael Mengistu a79d23ea72
Merge pull request #3204 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-10-25 14:49:29 -07:00
ASP.NET CI 7ec22086ce Updating BuildTools from 2.2.0-preview2-20181019.5 to 2.2.0-preview2-20181024.5
[auto-updated: buildtools]
2018-10-25 14:47:19 -07:00
ASP.NET CI 588f91f0e6 Updating submodule(s)
AzureIntegration => c6f9783671
CORS => aa88f16b08
EntityFrameworkCore => 6d92061d2831ab953d080bb87eec68c851d40182
HttpAbstractions => 91db78cf92
IISIntegration => a9c5eb28d7
KestrelHttpServer => 616aeba156
Options => a6d348bccbfd5a6b657383202da32e3f5f92f3ce
Razor => 2d6643bc85
Routing => 3d828221a1
SignalR => 0aab8e5dd0
Templating => b05185f1f1

[auto-updated: submodules]
2018-10-25 14:47:11 -07:00
Nate McMaster ae122d9bc0
Include rid-specific runtime packages in the list of artifacts 2018-10-25 14:42:00 -07:00