Shannon 1400a02798 Merge branch 'netcore/dev' into netcore/task/6973-migrating-authenticationcontroller ...

# Conflicts:
#	src/Umbraco.Core/Constants-Security.cs
#	src/Umbraco.Infrastructure/BackOffice/BackOfficeClaimsPrincipalFactory.cs
#	src/Umbraco.Infrastructure/BackOffice/BackOfficeUserManager.cs
#	src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
#	src/Umbraco.Web.BackOffice/Controllers/DenyLocalLoginAuthorizationAttribute.cs
#	src/Umbraco.Web.BackOffice/Controllers/UsersController.cs
#	src/Umbraco.Web.BackOffice/Extensions/HtmlHelperBackOfficeExtensions.cs
#	src/Umbraco.Web.BackOffice/Services/IconService.cs
#	src/Umbraco.Web.Common/Security/ExternalSignInAutoLinkOptions.cs
#	src/Umbraco.Web.UI.Client/src/common/interceptors/_module.js
#	src/Umbraco.Web.UI.Client/src/common/interceptors/requiredheaders.interceptor.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js
#	src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/Umbraco/Views/AuthorizeUpgrade.cshtml
#	src/Umbraco.Web/Editors/AuthenticationController.cs
#	src/Umbraco.Web/Editors/BackOfficeController.cs
#	src/Umbraco.Web/Editors/Filters/IsCurrentUserModelFilterAttribute.cs
#	src/Umbraco.Web/Security/AppBuilderExtensions.cs
#	src/Umbraco.Web/Security/AuthenticationOptionsExtensions.cs
#	src/Umbraco.Web/UmbracoDefaultOwinStartup.cs

2020-10-23 10:10:02 +11:00

..

Cache

Migrates remaining backofficecontroller but still a bunch of work to do , streamlines Backoffice to BackOffice (but is that what we want?)

2020-10-21 16:51:00 +11:00

IO

Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-logging

2020-10-06 08:13:29 +02:00

Issues

…

LegacyXmlPublishedCache

Use typed logger for XmlPublishedSnapshotService

2020-09-21 15:11:40 +02:00

masterpages/site1

…

Migrations

Clean up and fixed todos

2020-10-06 21:23:15 +02:00

Models

NetCore: migrated further unit tests (#9211)

2020-10-20 14:49:52 +02:00

Packaging

Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-logging

2020-10-06 18:49:03 +02:00

Persistence

Try and fix the merge

2020-10-20 09:06:42 +02:00

Plugins

…

Properties

Move InernalsVisibleTo into AssemblyInfo instead of TestControllerFactory

2020-09-22 10:35:58 +02:00

Published

Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-logging

2020-09-29 08:58:24 +02:00

PublishedContent

Migrates remaining backofficecontroller but still a bunch of work to do , streamlines Backoffice to BackOffice (but is that what we want?)

2020-10-21 16:51:00 +11:00

Publishing

Try and fix the merge

2020-10-20 09:06:42 +02:00

Routing

Migrated RenderMvcController and RenderIndexActionSelectorAttribute

2020-10-15 11:42:16 +02:00

Runtimes

Clean up and fixed todos

2020-10-06 21:23:15 +02:00

Scheduling

Clean up and fixed todos

2020-10-06 21:23:15 +02:00

Scoping

Migrates remaining backofficecontroller but still a bunch of work to do , streamlines Backoffice to BackOffice (but is that what we want?)

2020-10-21 16:51:00 +11:00

Security

removes test that is testing code that will be deleted

2020-10-07 17:07:20 +11:00

Services

Merge branch 'netcore/dev' into netcore/task/6973-migrating-authenticationcontroller

2020-10-23 10:10:02 +11:00

TestHelpers

Migrates remaining backofficecontroller but still a bunch of work to do , streamlines Backoffice to BackOffice (but is that what we want?)

2020-10-21 16:51:00 +11:00

Testing

Migrates remaining backofficecontroller but still a bunch of work to do , streamlines Backoffice to BackOffice (but is that what we want?)

2020-10-21 16:51:00 +11:00

UmbracoExamine

Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-logging

2020-09-29 08:58:24 +02:00

Web

Merge remote-tracking branch 'origin/netcore/netcore' into netcore/task/6973-migrating-authenticationcontroller

2020-10-22 21:16:44 +11:00

App.config

Use generic logger more places and clean up

2020-09-28 14:59:17 +02:00

Umbraco.Tests.csproj

Merge branch 'netcore/dev' into netcore/task/6973-migrating-authenticationcontroller

2020-10-23 10:10:02 +11:00

unit-test-log4net.CI.config

…

unit-test-logger.config

…