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

Merge remote-tracking branch 'origin/v10/dev' into v10/feature/nullable-reference-types-in-Umbraco.Web.Backoffice

Browse Source 
# Conflicts:
#	src/Umbraco.Core/Models/Mapping/MemberTabsAndPropertiesMapper.cs
#	src/Umbraco.Core/Models/Member.cs
#	src/Umbraco.Core/Models/Membership/User.cs
#	src/Umbraco.Core/Services/MemberService.cs
#	src/Umbraco.Infrastructure/Security/BackOfficeUserStore.cs
#	src/Umbraco.Infrastructure/Security/MemberUserStore.cs
This commit is contained in:
Nikolaj Geisle
2022-04-22 12:32:57 +02:00
parent 001f7035f3 379d2e3e4e
commit 70a75d8c9b
55 changed files with 932 additions and 553 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
tests/Umbraco.Tests.Common/Builders/MemberTypeBuilder.cs
View File

@@ -35,47 +35,11 @@ namespace Umbraco.Cms.Tests.Common.Builders
.WithId(99)
.WithName(Constants.Conventions.Member.StandardPropertiesGroupName)
.AddPropertyType()
.WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextArea)
.WithValueStorageType(ValueStorageType.Ntext)
.WithAlias(Constants.Conventions.Member.Comments)
.WithName(Constants.Conventions.Member.CommentsLabel)
.Done()
.AddPropertyType()
.WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.Boolean)
.WithValueStorageType(ValueStorageType.Integer)
.WithAlias(Constants.Conventions.Member.IsApproved)
.WithName(Constants.Conventions.Member.IsApprovedLabel)
.Done()
.AddPropertyType()
.WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.Boolean)
.WithValueStorageType(ValueStorageType.Integer)
.WithAlias(Constants.Conventions.Member.IsLockedOut)
.WithName(Constants.Conventions.Member.IsLockedOutLabel)
.Done()
.AddPropertyType()
.WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.Label)
.WithValueStorageType(ValueStorageType.Date)
.WithAlias(Constants.Conventions.Member.LastLoginDate)
.WithName(Constants.Conventions.Member.LastLoginDateLabel)
.Done()
.AddPropertyType()
.WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.Label)
.WithValueStorageType(ValueStorageType.Date)
.WithAlias(Constants.Conventions.Member.LastPasswordChangeDate)
.WithName(Constants.Conventions.Member.LastPasswordChangeDateLabel)
.Done()
.AddPropertyType()
.WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.Label)
.WithValueStorageType(ValueStorageType.Date)
.WithAlias(Constants.Conventions.Member.LastLockoutDate)
.WithName(Constants.Conventions.Member.LastLockoutDateLabel)
.Done()
.AddPropertyType()
.WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.Label)
.WithValueStorageType(ValueStorageType.Integer)
.WithAlias(Constants.Conventions.Member.FailedPasswordAttempts)
.WithName(Constants.Conventions.Member.FailedPasswordAttemptsLabel)
.Done();
.WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextArea)
.WithValueStorageType(ValueStorageType.Ntext)
.WithAlias(Constants.Conventions.Member.Comments)
.WithName(Constants.Conventions.Member.CommentsLabel)
.Done();
_propertyGroupBuilders.Add(builder);
return this;
}

4
tests/Umbraco.Tests.Common/Umbraco.Tests.Common.csproj
View File

@@ -16,10 +16,10 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="MiniProfiler.AspNetCore" Version="4.2.22" />
<PackageReference Include="Moq" Version="4.13.1" />
<PackageReference Include="Moq" Version="4.17.2" />
<PackageReference Include="AutoFixture.NUnit3" Version="4.17.0" />
<PackageReference Include="Moq" Version="4.16.1" />
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="NUnit" Version="3.13.3" />
</ItemGroup>
<ItemGroup>