Commit Graph

36335 Commits

Author SHA1 Message Date
Elitsa Marinovska
a6e0afe57d Migrating classes not inhering or having dependencies to EntityBasic 2020-10-27 15:42:59 +01:00
Bjarke Berg
765140b7cd Moved unit tests to right project + Cleanup + Write info in test console
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-10-27 14:10:19 +01:00
Bjarke Berg
a09e218501 Merge remote-tracking branch 'origin/netcore/bugfix/azure-devops-tests' into netcore/netcore 2020-10-27 12:01:44 +01:00
Bjarke Berg
d4376e00c6 removed test file
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-10-27 12:01:17 +01:00
Bjarke Berg
5d5c4c6904 Remove build warnings
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-10-27 12:00:30 +01:00
Bjarke Berg
1b4f3a9a5f Remove test file again
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-10-27 11:58:54 +01:00
Bjarke Berg
4d260b036b Merge branch 'netcore/bugfix/azure-devops-tests' into netcore/netcore 2020-10-27 11:57:38 +01:00
Bjarke Berg
6c2ece0619 Remove build warnings
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-10-27 11:57:15 +01:00
Paul Johnson
ec66990e72 NetCore: MSDI refactor phase 2 (#9280)
* Moved adapters from Infra -> Core

* Allow Composition to accept a service collection instead of an IRegister

* Composition no longer takes IRegister as constructor arg

all tests passing

* Composition no longer implements IRegister

* Lose _uniques in Composition

* lose Composition OnCreatingFactory actions

* Clean up UmbracoCoreServiceCollectionExtensions & Composition

Less IFactory

* LightInject gone where TFW == netstandard2.0 || TFW == netcoreapp3.1

* Resolve dead code issues

* Rename IFactory methods to match IServiceProvider so they can be trivially swapped later.

* Rename IFactory methods to match IServiceProvider so they can be trivially swapped later (continued)

Thought the counts were low, it's mostly extension method usage
2020-10-27 11:53:01 +01:00
Bjarke Berg
a6ef907427 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/bugfix/azure-devops-tests 2020-10-26 16:26:59 +01:00
Bjarke Berg
10849175f9 post merge fix
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-10-26 16:18:48 +01:00
Bjarke Berg
715071a33f Merge remote-tracking branch 'origin/netcore/task/6973-migrating-authenticationcontroller' into netcore/task/6973-migrating-authenticationcontroller-merge
# Conflicts:
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
#	src/Umbraco.Web.BackOffice/Extensions/BackOfficeApplicationBuilderExtensions.cs
#	src/Umbraco.Web/Logging/WebProfilerComponent.cs
#	src/Umbraco.Web/Logging/WebProfilerComposer.cs
2020-10-26 14:37:56 +01:00
Bjarke Berg
b47f946ffe Merge remote-tracking branch 'origin/netcore/netcore' into netcore/task/6973-migrating-authenticationcontroller
Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.Infrastructure/HealthCheck/NotificationMethods/EmailNotificationMethod.cs
#	src/Umbraco.Web/Editors/AuthenticationController.cs
2020-10-26 14:34:06 +01:00
Andy Butland
507facbdaa NetCore: Further unit test migration (#9269)
* Migrated ContentExtensionsTests.

* Migrated PropertyCollectionTests.

* Migrated AbstractFileSystemTests and PhysicalFileSystem tests.

* Migrated SiteDomainHelper tests.

* Migrated DistributedCacheTests.

* Migrated AppCacheTests and derived test classes.
Amended HttpRequestApp underlying dictionary type to match that available in .NET Core HttpContext Items collection.

* Fixed namespace

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

Co-authored-by: Bjarke Berg <mail@bergmania.dk>
2020-10-26 14:26:49 +01:00
Mole
9cd752c2f8 Netcore: Align Namespaces in Tests and Web.BackOffice (#9274)
* Align namespaces in integration tests

* Align namespaces in unit tests

* Align namespaces in Backoffice.Filters

* Align namespaces in Backoffice.ActionResults

* Align namespaces in Backoffice.Mapping

* Align namespaces in Backoffice.PorpertyEditors and SignalR

* Align namespaces in Backoffice.Trees

* Align unit tests after migration
2020-10-26 13:34:08 +01:00
Paul Johnson
a99f625f6a Netcore: Alternate approach for MSDI refactor (#9247)
* Doesn't make much sense to have Concrete on IRegister, only on IFactory

* Handle FilesTreeController requires IFileSystem of type PhysicalFileSystem

* Handle registration of default MediaFileSystem without using RegisterUniqueFor

* Remove RegisterFor / RegisterUniqueFor from IRegister

* Switch over from LightInject to wrappers around MSDI

* Made mapper dependencies more explicit

* Remove registration for AngularJsonMediaTypeFormatter

It's dependencies aren't registered so container validation fails

* Resolve lifetime issue for EnsureValidSessionId by service locating

else resolve scoped in singleton

* Make registration more explicit for backoffice UserManager

* Make install step registrations more explicit

* Disable service provider validation so site can launch

Maybe this is a problem maybe not, we build about 8000 service providers so maybe everything is fine later...

* Further cleanup of IFactory interface

* Further cleanup of IRegister interface

* Revert "Make registration more explicit for backoffice UserManager"

This reverts commit 7215fe836103c597cd0873c66737a79b91ed4c49.

* Resolve issue where NewInstallStep would fail to reset password for "SuperUser"

Before MSDI, somehow BackOfficeIdentityOptions would be configured with token provider map from IdentityBuilder.AddDefaultTokenProviders.
After switchover those config actions are lost.

Subclass IdentityBuilder to ensure BackOfficeIdentityOptions doesn't miss config setup upstream.

* Initialize current.

* Add todo to turn container validation back on.

* Migrated ScopeFileSystemsTests to integration tests

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* Resolve issue where MediaFileSystem was skipping ShadowFileSystem

* Attempt to fix ScopeFileSystemsTests on azure devops

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

* Be interesting to know what the actual full path is in pipeline.

* Clarify intent of CreateMediaTest

Doesn't help resolve weird UnauthorizedAccessException but it cuts so much cognitive overhead for the future.

* Use ILoggerfactory rather than mock for the manually constructed file PhysicalFileSystem

* Maybe resolve failing test on azure pipeline.

Co-authored-by: Bjarke Berg <mail@bergmania.dk>
2020-10-26 11:47:14 +01:00
Sebastiaan Janssen
b63944b9ef Revert "Adds icons from App_Plugins/**/Icons/*.svg (#8884)"
This reverts commit d7bf980f12.
2020-10-25 09:59:44 +01:00
Bjarke Berg
7f9c1bb998 Merge pull request #9259 from umbraco/netcore/feature/migrate-persistance-tests
Netcore: Migrate Persistance Tests
2020-10-23 16:12:46 +02:00
Niels Lyngsø
cb902c4e08 Fail if settings elementType isnt supported + concept for inner-blocks + debounce for storage update 2020-10-23 15:08:27 +02:00
Sebastiaan Janssen
2d931877be Bump version to 8.8.1 2020-10-23 14:41:09 +02:00
Bjarke Berg
109ccb19b3 Merge pull request #9252 from umbraco/netcore/feature/AB8969-email-message-abstraction
NetCore: Email message abstraction
2020-10-23 14:20:10 +02:00
Bjarke Berg
b2b297ac8a Cleanup tests + Fixed issue in IOHelper related to contentroot vs webroot
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-10-23 13:58:30 +02:00
Bjarke Berg
5fe849c8e2 https://github.com/umbraco/Umbraco-CMS/pull/9252 - Changed EmailMessage to be completely immutable
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-10-23 12:37:23 +02:00
Bjarke Berg
f791bd4426 Fixed unit test, by injecting IHttpContextAccessor instead of using HttpContext directly. Not the test class is mockable again
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-10-23 10:36:47 +02:00
Mole
523a155d88 Fix integration test csproj 2020-10-23 10:11:35 +02:00
Mole
f6316c72dc Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/migrate-persistance-tests 2020-10-23 08:39:20 +02:00
Bjarke Berg
6e7f0502a3 Merge pull request #9221 from anthonydotnet/unique-nodename-refactor
Unique node name unit test fix & refactor
2020-10-23 07:16:25 +02:00
Shannon
e7d22e24db ensures middleware is registered and the external cookie auth is registered. 2020-10-23 14:57:35 +11:00
Shannon
061529c40d Merge branch 'netcore/dev' into netcore/task/6973-migrating-authenticationcontroller-merge
# Conflicts:
#	src/Umbraco.Core/Constants-Security.cs
#	src/Umbraco.Core/Models/Identity/IIdentityUserLogin.cs
#	src/Umbraco.Core/Persistence/Repositories/IExternalLoginRepository.cs
#	src/Umbraco.Core/Services/IExternalLoginService.cs
#	src/Umbraco.Infrastructure/BackOffice/BackOfficeUserManager.cs
#	src/Umbraco.Infrastructure/BackOffice/BackOfficeUserStore.cs
#	src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Infrastructure/Persistence/Factories/ExternalLoginFactory.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ExternalLoginRepository.cs
#	src/Umbraco.Infrastructure/Services/Implement/ExternalLoginService.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.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/OwinExtensions.cs
#	src/Umbraco.Web/Security/AppBuilderExtensions.cs
#	src/Umbraco.Web/Security/AuthenticationManagerExtensions.cs
#	src/Umbraco.Web/Security/AuthenticationOptionsExtensions.cs
#	src/Umbraco.Web/Security/BackOfficeClaimsPrincipalFactory.cs
#	src/Umbraco.Web/Services/IconService.cs
#	src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
#	src/Umbraco.Web/ViewDataExtensions.cs
2020-10-23 14:33:32 +11:00
Shannon
64d8b56eca It builds! 2020-10-23 14:18:53 +11:00
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
Bjarke Berg
1dd7384747 Merge remote-tracking branch 'origin/netcore/netcore' into unique-nodename-refactor 2020-10-22 20:04:14 +02:00
Bjarke Berg
532bbb7050 Merge pull request #9251 from umbraco/netcore/feature/compose_controllers
Netcore: Cleanup + Compose of controllers
2020-10-22 19:58:27 +02:00
Mole
8e321b4364 Migrate Querying tests 2020-10-22 15:31:56 +02:00
Mole
b28548849f Migrate the bare minimum of BaseUsingSqlCeSyntax to be able to migrate NPoco unit tests 2020-10-22 15:17:16 +02:00
Elitsa Marinovska
d7eca3d0d5 Abstracting MailMessage 2020-10-22 15:08:07 +02:00
Sebastiaan Janssen
5b9e2dbad8 Revert "umb-confirmation directive: move trashcan into directive and address accessibility issues (#8198)"
This reverts commit 1cd79d81af.

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/components/umb-confirm-action.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html

(cherry picked from commit f9b49fc5f3)
(cherry picked from commit 22a1423324)
2020-10-22 15:08:06 +02:00
Niels Lyngsø
99e2990d07 Emit event if localStorage changes from another tab 2020-10-22 15:07:45 +02:00
Niels Lyngsø
310c8ec924 finish feature + clean up 2020-10-22 15:02:25 +02:00
Mole
016d3f2b5b Move NPoco unit tests back out of Integration tests 2020-10-22 14:50:01 +02:00
Sebastiaan Janssen
b989457716 Merge branch 'v8/8.8' into v8/dev 2020-10-22 14:36:37 +02:00
Sebastiaan Janssen
a6fe82015e Merge branch 'v8/8.7' into v8/dev 2020-10-22 14:36:22 +02:00
Sebastiaan Janssen
b1b540e687 Merge branch 'v8/8.6' into v8/dev 2020-10-22 14:36:10 +02:00
Sebastiaan Janssen
ba6921ce6f Merge branch 'v8/8.7' into v8/8.8 2020-10-22 14:34:00 +02:00
Sebastiaan Janssen
f3e37428ad Merge branch 'v8/8.6' into v8/8.7 2020-10-22 14:29:53 +02:00
Sebastiaan Janssen
9202550537 Remove unused usings 2020-10-22 14:25:57 +02:00
Sebastiaan Janssen
297671b631 Merge branch 'v8/8.8' into v8/dev
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Packaging/PackageDataInstallation.cs
2020-10-22 14:21:25 +02:00
Sebastiaan Janssen
afa754067b Merge branch 'v8/8.7' into v8/dev 2020-10-22 14:18:53 +02:00
Sebastiaan Janssen
befa23190b Merge branch 'v8/8.6' into v8/dev
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/Implement/MediaRepository.cs
2020-10-22 14:18:21 +02:00
Sebastiaan Janssen
e368607a4d Bump version to 8.8.1 2020-10-22 14:15:57 +02:00