Commit Graph

44788 Commits

Author SHA1 Message Date
Nate McMaster 4c6bbe5a01
Merge the master branch of aspnet/Identity 2018-12-05 09:00:11 -08:00
Nate McMaster a392d4bd6c
Merge release/2.2 2018-12-05 08:59:40 -08:00
Nate McMaster e9fb6d2db6
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 4a717c8563
2018-12-05 08:59:26 -08:00
Nate McMaster 82184e9710
Merge the master branch of aspnet/Localization 2018-12-05 08:56:31 -08:00
Nate McMaster 08e243f982
Merge the master branch of aspnet/BasicMiddleware 2018-12-05 08:55:51 -08:00
Nate McMaster 62f9655a2f
Merge branch 'release/2.2' 2018-12-05 08:54:38 -08:00
Nate McMaster be3b66d1d1
Revert "Remove Razor tooling projects"
This reverts commit 3cfa6c0526.
2018-12-05 08:40:49 -08:00
Pavel Krymets 2e56f056d0
Re-enable IISIntegration tests (#4377) 2018-12-05 08:24:12 -08:00
Steve Sanderson 5c1fbe1af7
Run Components on netcoreapp3.0 (#4391) 2018-12-05 14:46:26 +00:00
dotnet-bot 9fc1a463a9 Merge in 'release/2.2' changes 2018-12-05 08:22:25 +00:00
ASP.NET CI 1733aa0c9a Updating submodule(s)
EntityFrameworkCore => 8e7402701ea1416b7fe55e1863ae65b3147c02c7

[auto-updated: submodules]
2018-12-05 00:02:26 -08:00
Ryan Nowak 3cfa6c0526 Remove Razor tooling projects
Removes the Razor compiler/tooling projects from this repo
2018-12-04 19:58:37 -08:00
Hans van Bakel 98e5c8c0b3 Update OpenIdConnectOptions.cs (#4408) 2018-12-04 18:24:10 -08:00
dotnet-bot 69a0641c53 Merge in 'release/2.2' changes 2018-12-05 02:13:55 +00:00
Stephen Halter f6e691f26a Move InMemory.FunctionalTests to own TestGroup
It looks like some shutdown timeouts are cause by CPU starvation
2018-12-04 17:54:42 -08:00
dotnet-bot 9915395424 Merge in 'release/2.1' changes 2018-12-05 00:45:13 +00:00
Justin Kotalik 736083c2f2
Make HttpSys use ProjectReference and move HttpSys into Servers folder (#4335) 2018-12-04 16:44:07 -08:00
Ajay Bhargav Baaskaran ad0f2a5af4 Group HTML tags (dotnet/aspnetcore-tooling#6)
\n\nCommit migrated from a2d1ac4cea
2018-12-04 16:04:20 -08:00
Nate McMaster 495e4fe4f7
Merge branch 'release/2.2' 2018-12-04 16:03:47 -08:00
N. Taylor Mullen c0b74d916c Add build.cmd to Mvc 2018-12-04 15:35:30 -08:00
N. Taylor Mullen 0728754d08 Update Mvc slns to be builidlable. 2018-12-04 15:35:30 -08:00
dotnet-bot b0826ab179 Merge in 'release/2.1' changes 2018-12-04 23:31:58 +00:00
Nate McMaster 638d6d0630
Merge branch 'release/2.1' 2018-12-04 15:31:29 -08:00
Nate McMaster ab12c706ab
Suppress false-positives in credential scanning (#4392) 2018-12-04 15:30:47 -08:00
Nate McMaster cd3f6e6283
Add Localization assemblies to sign config 2018-12-04 15:29:36 -08:00
Chris R 7bb42126bc Upgrade HttpSys to target netcoreapp3.0 #3754 2018-12-04 15:13:44 -08:00
James Newton-King 6fc7e532f1
Update MVC dependencies (#4395) 2018-12-05 12:04:47 +13:00
Nate McMaster 11fdf9b50a
Fix bad merge of .csproj and update Middleware.sln 2018-12-04 14:59:11 -08:00
Nate McMaster 2c376ebc0c
Merge the release/2.2 branch of aspnet/Identity 2018-12-04 14:49:11 -08:00
Nate McMaster 9400390d51
Merge branch 'release/2.1' into release/2.2 2018-12-04 14:47:40 -08:00
Nate McMaster c5bc96d601
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 4b3d8e5106
2018-12-04 14:45:54 -08:00
Nate McMaster 4a717c8563
Delete msbuild.binlog 2018-12-04 14:33:39 -08:00
Nate McMaster 4b3d8e5106
Delete msbuild.binlog 2018-12-04 14:33:21 -08:00
Nate McMaster e261ca5426
Merge release/2.2 from aspnet/Localization 2018-12-04 14:25:25 -08:00
Nate McMaster 7e823a05ec
Merge release/2.2 from aspnet/BasicMiddleware 2018-12-04 14:24:42 -08:00
Nate McMaster 1be2b427de
Merge branch 'release/2.1' into release/2.2 2018-12-04 14:23:24 -08:00
Nate McMaster b140962a5f
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 268290a8b5
2018-12-04 14:13:34 -08:00
Nate McMaster 44ec52ebfe
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 2d3ad1cb0f
2018-12-04 14:10:25 -08:00
Ryan Nowak ebd37599b6 PR feedback
\n\nCommit migrated from d38687acf2
2018-12-04 14:08:21 -08:00
Nate McMaster ec41d9bcf6
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in c283dfb56c
2018-12-04 14:00:42 -08:00
Nate McMaster d8c434febe
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in de1579bdda
2018-12-04 13:57:22 -08:00
N. Taylor Mullen 3c3d699804 Only add DotNetCoreRazorConfiguration capability in SDK for netcoreapp3.0.
- Prior to this we were unconditionally adding the `DotNetCoreRazorConfiguration` capability resulting in 1.0 projects looking like 2.1+ projects.
- Added a project capability test that verifies we're maintaining project capabilities for netcoreapp3.0 projects.
- Added a project capability test that verifies we don't muck with 1.1 project capabilities.

aspnet/Razordotnet/aspnetcore-tooling#2751
\n\nCommit migrated from 8d733ecc04
2018-12-04 13:01:26 -08:00
Nate McMaster 010d85bbb4 Merge pull request dotnet/extensions#585 from aspnet/namc/merge-2.2
Merge 2.2 to master\n\nCommit migrated from 82ad9d6edd
2018-12-04 11:56:13 -08:00
Nate McMaster a81d3d1b06 Merge the master branch of aspnet/Localization
\n\nCommit migrated from 622c150de5
2018-12-04 10:48:40 -08:00
Nate McMaster 2987427e1a Merge branch 'release/2.2'
\n\nCommit migrated from 75b156c635
2018-12-04 10:48:16 -08:00
Nate McMaster 0b97612ac2 Merge aspnet/Localization release/2.2
\n\nCommit migrated from 54b3e0135d
2018-12-04 10:44:20 -08:00
Nate McMaster 6920d910de Merge branch release/2.1 into release/2.2
\n\nCommit migrated from 909256fb24
2018-12-04 10:43:32 -08:00
Nate McMaster e7c4b678f9 Reorganize source code in preparation to move into aspnet/Extensions
Prior to reorganization, this source code was found in https://github.com/aspnet/Localization/tree/dotnet/extensions@60a3d57a3e8b8b6d69232815a9596b5a495a7d0b
\n\nCommit migrated from b885414e8a
2018-12-04 10:40:35 -08:00
James Newton-King e310ccac7b
Update static files sample to use AuthZ middleware (#4279) 2018-12-05 06:43:39 +13:00
Chris R fef468aad1 Change Antiforgery projects to target netcoreapp3.0 #4343 2018-12-04 09:37:30 -08:00