Browse Source

Enable nullable annotations for Volo.Abp.UI

pull/17020/head
liangshiwei 3 years ago
parent
commit
02c74b9660
  1. 2
      framework/src/Volo.Abp.Data/Volo/Abp/Data/AppliedDatabaseMigrationsEto.cs
  2. 2
      framework/src/Volo.Abp.UI/Volo.Abp.UI.csproj
  3. 4
      framework/src/Volo.Abp.UI/Volo/Abp/Ui/Branding/DefaultBrandingProvider.cs
  4. 4
      framework/src/Volo.Abp.UI/Volo/Abp/Ui/Branding/IBrandingProvider.cs
  5. 2
      framework/src/Volo.Abp.UI/Volo/Abp/Ui/LayoutHooks/AbpLayoutHookOptions.cs
  6. 4
      framework/src/Volo.Abp.UI/Volo/Abp/Ui/LayoutHooks/LayoutHookInfo.cs

2
framework/src/Volo.Abp.Data/Volo/Abp/Data/AppliedDatabaseMigrationsEto.cs

@ -7,6 +7,6 @@ namespace Volo.Abp.Data;
[EventName("abp.data.applied_database_migrations")]
public class AppliedDatabaseMigrationsEto
{
public string DatabaseName { get; set; }
public string DatabaseName { get; set; } = default!;
public Guid? TenantId { get; set; }
}

2
framework/src/Volo.Abp.UI/Volo.Abp.UI.csproj

@ -5,6 +5,8 @@
<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
<Nullable>enable</Nullable>
<WarningsAsErrors>Nullable</WarningsAsErrors>
<AssemblyName>Volo.Abp.UI</AssemblyName>
<PackageId>Volo.Abp.UI</PackageId>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>

4
framework/src/Volo.Abp.UI/Volo/Abp/Ui/Branding/DefaultBrandingProvider.cs

@ -6,7 +6,7 @@ public class DefaultBrandingProvider : IBrandingProvider, ITransientDependency
{
public virtual string AppName => "MyApplication";
public virtual string LogoUrl => null;
public virtual string? LogoUrl => null;
public virtual string LogoReverseUrl => null;
public virtual string? LogoReverseUrl => null;
}

4
framework/src/Volo.Abp.UI/Volo/Abp/Ui/Branding/IBrandingProvider.cs

@ -7,10 +7,10 @@ public interface IBrandingProvider
/// <summary>
/// Logo on white background
/// </summary>
string LogoUrl { get; }
string? LogoUrl { get; }
/// <summary>
/// Logo on dark background
/// </summary>
string LogoReverseUrl { get; }
string? LogoReverseUrl { get; }
}

2
framework/src/Volo.Abp.UI/Volo/Abp/Ui/LayoutHooks/AbpLayoutHookOptions.cs

@ -12,7 +12,7 @@ public class AbpLayoutHookOptions
Hooks = new Dictionary<string, List<LayoutHookInfo>>();
}
public AbpLayoutHookOptions Add(string name, Type componentType, string layout = null)
public AbpLayoutHookOptions Add(string name, Type componentType, string? layout = null)
{
Hooks
.GetOrAdd(name, () => new List<LayoutHookInfo>())

4
framework/src/Volo.Abp.UI/Volo/Abp/Ui/LayoutHooks/LayoutHookInfo.cs

@ -13,9 +13,9 @@ public class LayoutHookInfo
/// Specifies the layout name to apply this hook.
/// null indicates that this hook will be applied to all layouts.
/// </summary>
public string Layout { get; }
public string? Layout { get; }
public LayoutHookInfo(Type componentType, string layout = null)
public LayoutHookInfo(Type componentType, string? layout = null)
{
ComponentType = componentType;
Layout = layout;

Loading…
Cancel
Save