Enable nullable annotations for Volo.Abp.MultiTenancy.Abstractions

framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo.Abp.MultiTenancy.Abstractions.csproj

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

framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/BasicTenantInfo.cs

@@ -9,16 +9,14 @@ public class BasicTenantInfo
     /// Null indicates the host.
     /// Not null value for a tenant.
     /// </summary>
-    [CanBeNull]
     public Guid? TenantId { get; }
 
     /// <summary>
     /// Name of the tenant if <see cref="TenantId"/> is not null.
     /// </summary>
-    [CanBeNull]
+    public string? Name { get; }
-    public string Name { get; }
 
-    public BasicTenantInfo(Guid? tenantId, string name = null)
+    public BasicTenantInfo(Guid? tenantId, string? name = null)
     {
         TenantId = tenantId;
         Name = name;

framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ICurrentTenant.cs

@@ -7,11 +7,9 @@ public interface ICurrentTenant
 {
     bool IsAvailable { get; }
 
-    [CanBeNull]
     Guid? Id { get; }
 
-    [CanBeNull]
+    string? Name { get; }
-    string Name { get; }
 
-    IDisposable Change(Guid? id, string name = null);
+    IDisposable Change(Guid? id, string? name = null);
 }

framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ICurrentTenantAccessor.cs

@@ -7,5 +7,5 @@ namespace Volo.Abp.MultiTenancy;
 
 public interface ICurrentTenantAccessor
 {
-    BasicTenantInfo Current { get; set; }
+    BasicTenantInfo? Current { get; set; }
 }

framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ITenantResolveContext.cs

@@ -5,8 +5,7 @@ namespace Volo.Abp.MultiTenancy;
 
 public interface ITenantResolveContext : IServiceProviderAccessor
 {
-    [CanBeNull]
+    string? TenantIdOrName { get; set; }
-    string TenantIdOrName { get; set; }
 
     bool Handled { get; set; }
 }

framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantConfiguration.cs

@@ -9,9 +9,9 @@ public class TenantConfiguration
 {
     public Guid Id { get; set; }
 
-    public string Name { get; set; }
+    public string Name { get; set; } = default!;
 
-    public ConnectionStrings ConnectionStrings { get; set; }
+    public ConnectionStrings? ConnectionStrings { get; set; }
 
     public bool IsActive { get; set; }
 

framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantConnectionStringUpdatedEto.cs

@@ -10,11 +10,11 @@ public class TenantConnectionStringUpdatedEto : EtoBase
 {
     public Guid Id { get; set; }
 
-    public string Name { get; set; }
+    public string Name { get; set; } = default!;
 
-    public string ConnectionStringName { get; set; }
+    public string ConnectionStringName { get; set; } = default!;
 
-    public string OldValue { get; set; }
+    public string? OldValue { get; set; }
 
-    public string NewValue { get; set; }
+    public string? NewValue { get; set; }
 }

framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantCreatedEto.cs

@@ -10,5 +10,5 @@ public class TenantCreatedEto : EtoBase
 {
     public Guid Id { get; set; }
 
-    public string Name { get; set; }
+    public string Name { get; set; } = default!;
 }

framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantResolveContext.cs

@@ -6,7 +6,7 @@ public class TenantResolveContext : ITenantResolveContext
 {
     public IServiceProvider ServiceProvider { get; }
 
-    public string TenantIdOrName { get; set; }
+    public string? TenantIdOrName { get; set; }
 
     public bool Handled { get; set; }
 

framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantResolveResult.cs

@@ -4,7 +4,7 @@ namespace Volo.Abp.MultiTenancy;
 
 public class TenantResolveResult
 {
-    public string TenantIdOrName { get; set; }
+    public string? TenantIdOrName { get; set; }
 
     public List<string> AppliedResolvers { get; }