yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/core-cannot-use-system-web

Browse Source 
# Conflicts:
#	src/Umbraco.Core/Runtime/CoreInitialComposer.cs
#	src/Umbraco.Core/StringExtensions.cs
#	src/Umbraco.Tests/Membership/MembershipProviderBaseTests.cs
#	src/Umbraco.Tests/Membership/UmbracoServiceMembershipProviderTests.cs
#	src/Umbraco.Tests/Services/MemberServiceTests.cs
#	src/Umbraco.Web/Security/AppBuilderExtensions.cs
#	src/Umbraco.Web/Security/BackOfficeUserManager.cs
#	src/Umbraco.Web/Security/MembershipProviderBase.cs
#	src/Umbraco.Web/Security/MembershipProviderExtensions.cs
#	src/Umbraco.Web/Security/Providers/UsersMembershipProvider.cs
#	src/Umbraco.Web/Security/UmbracoMembershipProviderBase.cs
#	src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
This commit is contained in:
Bjarke Berg
2019-11-26 11:51:50 +01:00
parent 969832310e d58787e965
commit 2fc50c5730
135 changed files with 1500 additions and 4035 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Tests/Web/Controllers/AuthenticationControllerTests.cs
View File

@@ -18,6 +18,7 @@ using Umbraco.Core.Composing;
using Umbraco.Core.Configuration;
using Umbraco.Core.IO;
using Umbraco.Core.Logging;
using Umbraco.Core.Mapping;
using Umbraco.Core.Persistence;
using Umbraco.Core.Persistence.Mappers;
using Umbraco.Core.Persistence.Querying;
@@ -75,6 +76,7 @@ namespace Umbraco.Tests.Web.Controllers
}
IOHelper.ForceNotHosted = true;
var usersController = new AuthenticationController(
new DefaultUserPasswordConfig(),
Factory.GetInstance<IGlobalSettings>(),
umbracoContextAccessor,
Factory.GetInstance<ISqlContext>(),
@@ -82,7 +84,8 @@ namespace Umbraco.Tests.Web.Controllers
Factory.GetInstance<AppCaches>(),
Factory.GetInstance<IProfilingLogger>(),
Factory.GetInstance<IRuntimeState>(),
helper);
helper,
Factory.GetInstance<UmbracoMapper>());
return usersController;
}

8
src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
View File

@@ -21,8 +21,6 @@ using Umbraco.Tests.Testing;
using Umbraco.Web;
using Umbraco.Web.Editors;
using Umbraco.Web.Models.ContentEditing;
using Umbraco.Web.PublishedCache;
using Task = System.Threading.Tasks.Task;
using Umbraco.Core.Dictionary;
using Umbraco.Web.PropertyEditors;
@@ -260,6 +258,7 @@ namespace Umbraco.Tests.Web.Controllers
var propertyEditorCollection = new PropertyEditorCollection(new DataEditorCollection(Enumerable.Empty<DataEditor>()));
var controller = new ContentController(
Factory.GetInstance<ICultureDictionary>(),
propertyEditorCollection,
Factory.GetInstance<IGlobalSettings>(),
umbracoContextAccessor,
@@ -293,6 +292,7 @@ namespace Umbraco.Tests.Web.Controllers
{
var propertyEditorCollection = new PropertyEditorCollection(new DataEditorCollection(Enumerable.Empty<DataEditor>()));
var controller = new ContentController(
Factory.GetInstance<ICultureDictionary>(),
propertyEditorCollection,
Factory.GetInstance<IGlobalSettings>(),
umbracoContextAccessor,
@@ -334,6 +334,7 @@ namespace Umbraco.Tests.Web.Controllers
var propertyEditorCollection = new PropertyEditorCollection(new DataEditorCollection(Enumerable.Empty<DataEditor>()));
var controller = new ContentController(
Factory.GetInstance<ICultureDictionary>(),
propertyEditorCollection,
Factory.GetInstance<IGlobalSettings>(),
umbracoContextAccessor,
@@ -380,6 +381,7 @@ namespace Umbraco.Tests.Web.Controllers
var propertyEditorCollection = new PropertyEditorCollection(new DataEditorCollection(Enumerable.Empty<DataEditor>()));
var controller = new ContentController(
Factory.GetInstance<ICultureDictionary>(),
propertyEditorCollection,
Factory.GetInstance<IGlobalSettings>(),
umbracoContextAccessor,
@@ -418,6 +420,7 @@ namespace Umbraco.Tests.Web.Controllers
var propertyEditorCollection = new PropertyEditorCollection(new DataEditorCollection(Enumerable.Empty<DataEditor>()));
var controller = new ContentController(
Factory.GetInstance<ICultureDictionary>(),
propertyEditorCollection,
Factory.GetInstance<IGlobalSettings>(),
umbracoContextAccessor,
@@ -462,6 +465,7 @@ namespace Umbraco.Tests.Web.Controllers
var propertyEditorCollection = new PropertyEditorCollection(new DataEditorCollection(Enumerable.Empty<DataEditor>()));
var controller = new ContentController(
Factory.GetInstance<ICultureDictionary>(),
propertyEditorCollection,
Factory.GetInstance<IGlobalSettings>(),
umbracoContextAccessor,