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

Merge remote-tracking branch 'origin/v8/dev' into netcore/merge_umbraco_id_into_netcore_dev

Browse Source 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Persistence/Factories/ExternalLoginFactory.cs
#	src/Umbraco.Core/Persistence/Repositories/IExternalLoginRepository.cs
#	src/Umbraco.Core/Services/IExternalLoginService.cs
#	src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ExternalLoginRepository.cs
#	src/Umbraco.Infrastructure/Services/Implement/ExternalLoginService.cs
#	src/Umbraco.Tests/Services/ExternalLoginServiceTests.cs
#	src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
#	src/Umbraco.Web/Editors/AuthenticationController.cs
#	src/Umbraco.Web/Editors/BackOfficeController.cs
#	src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
#	src/Umbraco.Web/Editors/UsersController.cs
#	src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
#	src/Umbraco.Web/OwinExtensions.cs
#	src/Umbraco.Web/Security/AppBuilderExtensions.cs
#	src/Umbraco.Web/Security/AuthenticationManagerExtensions.cs
#	src/Umbraco.Web/Security/BackOfficeClaimsIdentityFactory.cs
#	src/Umbraco.Web/Security/BackOfficeUserManager.cs
#	src/Umbraco.Web/Security/BackOfficeUserStore.cs
#	src/Umbraco.Web/Security/ExternalSignInAutoLinkOptions.cs
#	src/Umbraco.Web/Security/MembershipProviderBase.cs
#	src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
This commit is contained in:
Bjarke Berg
2020-10-07 09:06:40 +02:00
parent c4cedceda1 ed24a695e4
commit b7e5d28584
4 changed files with 1664 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Umbraco.Core/Migrations/Upgrade/V_8_8_0/ExternalLoginTableUserData.cs Normal file
View File

@@ -0,0 +1,20 @@
using Umbraco.Core.Persistence.Dtos;
namespace Umbraco.Core.Migrations.Upgrade.V_8_8_0
{
public class ExternalLoginTableUserData : MigrationBase
{
public ExternalLoginTableUserData(IMigrationContext context)
: base(context)
{
}
/// <summary>
/// Adds new column to the External Login table
/// </summary>
public override void Migrate()
{
AddColumn<ExternalLoginDto>(Constants.DatabaseSchema.Tables.ExternalLogin, "userData");
}
}
}

1630
src/Umbraco.Core/Umbraco.Core.csproj
View File

File diff suppressed because it is too large Load Diff

1
src/Umbraco.Tests/Services/EntityServiceTests.cs
View File

@@ -8,7 +8,6 @@ using Umbraco.Core.Models;
using Umbraco.Core.Models.Entities;
using Umbraco.Core.Persistence.DatabaseModelDefinitions;
using Umbraco.Core.Services;
using Umbraco.Tests.TestHelpers;
using Umbraco.Tests.TestHelpers.Entities;
using Umbraco.Tests.Testing;

14
src/Umbraco.Web/Umbraco.Web.csproj
View File

@@ -237,11 +237,25 @@
<Compile Include="Trees\ITreeNodeController.cs" />
<Compile Include="Trees\TreeCollectionBuilder.cs" />
<Compile Include="UmbracoContext.cs" />
<Compile Include="Routing\DefaultMediaUrlProvider.cs" />
<Compile Include="Routing\IMediaUrlProvider.cs" />
<Compile Include="Routing\IPublishedRouter.cs" />
<Compile Include="Routing\MediaUrlProviderCollection.cs" />
<Compile Include="Routing\MediaUrlProviderCollectionBuilder.cs" />
<Compile Include="Scheduling\SimpleTask.cs" />
<Compile Include="Scheduling\TempFileCleanup.cs" />
<Compile Include="Search\BackgroundIndexRebuilder.cs" />
<Compile Include="Search\ExamineFinalComponent.cs" />
<Compile Include="Search\ExamineFinalComposer.cs" />
<Compile Include="Search\ExamineUserComponent.cs" />
<Compile Include="Search\IUmbracoTreeSearcherFields.cs" />
<Compile Include="Search\UmbracoTreeSearcherFields.cs" />
<Compile Include="Security\BackOfficeExternalLoginProviderErrorMiddlware.cs" />
<Compile Include="Security\BackOfficeExternalLoginProviderErrors.cs" />
<Compile Include="Security\BackOfficeExternalLoginProviderOptions.cs" />
<Compile Include="Security\SignOutAuditEventArgs.cs" />
<Compile Include="Security\UserInviteEventArgs.cs" />
<Compile Include="Services\DashboardService.cs" />
<Compile Include="Services\IconService.cs" />
<Compile Include="UmbracoContextFactory.cs" />
<Compile Include="Mvc\UmbracoVirtualNodeByUdiRouteHandler.cs" />