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

Fix last build errors

Browse Source
This commit is contained in:
Nikolaj Geisle
2022-02-24 14:39:29 +01:00
parent 3bf2778803
commit 2009f7585b
93 changed files with 556 additions and 450 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Core/Models/Entities/EntityBase.cs
View File

@@ -19,8 +19,8 @@ namespace Umbraco.Cms.Core.Models.Entities
private bool _hasIdentity;
private int _id;
private Guid _key;
private DateTime? _createDate;
private DateTime? _updateDate;
private DateTime _createDate;
private DateTime _updateDate;
/// <inheritdoc />
[DataMember]
@@ -50,7 +50,7 @@ namespace Umbraco.Cms.Core.Models.Entities
/// <inheritdoc />
[DataMember]
public DateTime? CreateDate
public DateTime CreateDate
{
get => _createDate;
set => SetPropertyValueAndDetectChanges(value, ref _createDate, nameof(CreateDate));
@@ -58,7 +58,7 @@ namespace Umbraco.Cms.Core.Models.Entities
/// <inheritdoc />
[DataMember]
public DateTime? UpdateDate
public DateTime UpdateDate
{
get => _updateDate;
set => SetPropertyValueAndDetectChanges(value, ref _updateDate, nameof(UpdateDate));

2
src/Umbraco.Core/Models/IKeyValue.cs
View File

@@ -4,7 +4,7 @@ namespace Umbraco.Cms.Core.Models
{
public interface IKeyValue : IEntity
{
string? Identifier { get; set; }
string Identifier { get; set; }
string? Value { get; set; }
}

6
src/Umbraco.Core/Models/KeyValue.cs
View File

@@ -11,14 +11,14 @@ namespace Umbraco.Cms.Core.Models
[DataContract(IsReference = true)]
public class KeyValue : EntityBase, IKeyValue, IEntity
{
private string? _identifier;
private string _identifier = null!;
private string? _value;
/// <inheritdoc />
public string? Identifier
public string Identifier
{
get => _identifier;
set => SetPropertyValueAndDetectChanges(value, ref _identifier, nameof(Identifier));
set => SetPropertyValueAndDetectChanges(value, ref _identifier!, nameof(Identifier));
}
/// <inheritdoc />

6
src/Umbraco.Core/Models/Language.cs
View File

@@ -16,13 +16,13 @@ namespace Umbraco.Cms.Core.Models
{
private readonly GlobalSettings _globalSettings;
private string _isoCode = string.Empty;
private string? _isoCode;
private string? _cultureName;
private bool _isDefaultVariantLanguage;
private bool _mandatory;
private int? _fallbackLanguageId;
public Language(GlobalSettings globalSettings, string isoCode)
public Language(GlobalSettings globalSettings, string? isoCode)
{
IsoCode = isoCode;
_globalSettings = globalSettings;
@@ -38,7 +38,7 @@ namespace Umbraco.Cms.Core.Models
/// <inheritdoc />
[DataMember]
public string CultureName
public string? CultureName
{
// CultureInfo.DisplayName is the name in the installed .NET language
// .NativeName is the name in culture info's language

4
src/Umbraco.Core/Models/Macro.cs
View File

@@ -68,8 +68,8 @@ namespace Umbraco.Cms.Core.Models
/// <param name="cacheByMember"></param>
/// <param name="dontRender"></param>
/// <param name="macroSource"></param>
public Macro(IShortStringHelper shortStringHelper, string @alias, string name,
string macroSource,
public Macro(IShortStringHelper shortStringHelper, string @alias, string? name,
string? macroSource,
bool cacheByPage = false,
bool cacheByMember = false,
bool dontRender = true,

2
src/Umbraco.Core/Models/MacroProperty.cs
View File

@@ -25,7 +25,7 @@ namespace Umbraco.Cms.Core.Models
/// <param name="name"></param>
/// <param name="sortOrder"></param>
/// <param name="editorAlias"></param>
public MacroProperty(string @alias, string name, int sortOrder, string editorAlias)
public MacroProperty(string @alias, string? name, int sortOrder, string editorAlias)
{
_alias = alias;
_name = name;

4
src/Umbraco.Core/Models/Member.cs
View File

@@ -362,7 +362,7 @@ namespace Umbraco.Cms.Core.Models
/// Part of the standard properties collection.
/// </remarks>
[DataMember]
public DateTime? LastLoginDate
public DateTime LastLoginDate
{
get
{
@@ -398,7 +398,7 @@ namespace Umbraco.Cms.Core.Models
/// Part of the standard properties collection.
/// </remarks>
[DataMember]
public DateTime? LastPasswordChangeDate
public DateTime LastPasswordChangeDate
{
get
{

4
src/Umbraco.Core/Models/Membership/IMembershipUser.cs
View File

@@ -25,8 +25,8 @@ namespace Umbraco.Cms.Core.Models.Membership
string? Comments { get; set; }
bool IsApproved { get; set; }
bool IsLockedOut { get; set; }
DateTime? LastLoginDate { get; set; }
DateTime? LastPasswordChangeDate { get; set; }
DateTime LastLoginDate { get; set; }
DateTime LastPasswordChangeDate { get; set; }
DateTime LastLockoutDate { get; set; }
/// <summary>

2
src/Umbraco.Core/Models/ServerRegistration.cs
View File

@@ -31,7 +31,7 @@ namespace Umbraco.Cms.Core.Models
/// <param name="accessed">The date and time the registration was last accessed.</param>
/// <param name="isActive">A value indicating whether the registration is active.</param>
/// <param name="isMaster">A value indicating whether the registration is master.</param>
public ServerRegistration(int id, string? serverAddress, string? serverIdentity, DateTime? registered, DateTime? accessed, bool isActive, bool isSchedulingPublisher)
public ServerRegistration(int id, string? serverAddress, string? serverIdentity, DateTime registered, DateTime accessed, bool isActive, bool isSchedulingPublisher)
{
UpdateDate = accessed;
CreateDate = registered;

4
src/Umbraco.Core/Models/Template.cs
View File

@@ -22,12 +22,12 @@ namespace Umbraco.Cms.Core.Models
: this(shortStringHelper, name, alias, null)
{ }
public Template(IShortStringHelper shortStringHelper, string? name, string alias, Func<File, string?>? getFileContent)
public Template(IShortStringHelper shortStringHelper, string? name, string? alias, Func<File, string?>? getFileContent)
: base(string.Empty, getFileContent)
{
_shortStringHelper = shortStringHelper;
_name = name;
_alias = alias.ToCleanString(shortStringHelper, CleanStringType.UnderscoreAlias);
_alias = alias?.ToCleanString(shortStringHelper, CleanStringType.UnderscoreAlias) ?? string.Empty;
_masterTemplateId = new Lazy<int>(() => -1);
}