From 2baae210e43de6fbaffcedf7b628f445ed16a9d9 Mon Sep 17 00:00:00 2001
From: liangshiwei <deawback@hotmail.com>
Date: Mon, 10 Jul 2023 14:36:15 +0800
Subject: [PATCH] Enable nullable annotations for
 Volo.Abp.MultiTenancy.Abstractions

---
 .../Volo.Abp.MultiTenancy.Abstractions.csproj             | 2 ++
 .../Volo/Abp/MultiTenancy/BasicTenantInfo.cs              | 6 ++----
 .../Volo/Abp/MultiTenancy/ICurrentTenant.cs               | 6 ++----
 .../Volo/Abp/MultiTenancy/ICurrentTenantAccessor.cs       | 2 +-
 .../Volo/Abp/MultiTenancy/ITenantResolveContext.cs        | 3 +--
 .../Volo/Abp/MultiTenancy/TenantConfiguration.cs          | 4 ++--
 .../Abp/MultiTenancy/TenantConnectionStringUpdatedEto.cs  | 8 ++++----
 .../Volo/Abp/MultiTenancy/TenantCreatedEto.cs             | 2 +-
 .../Volo/Abp/MultiTenancy/TenantResolveContext.cs         | 2 +-
 .../Volo/Abp/MultiTenancy/TenantResolveResult.cs          | 2 +-
 10 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo.Abp.MultiTenancy.Abstractions.csproj b/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo.Abp.MultiTenancy.Abstractions.csproj
index 77b0ba2894..20fa6c7a24 100644
--- a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo.Abp.MultiTenancy.Abstractions.csproj
+++ b/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>
diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/BasicTenantInfo.cs b/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/BasicTenantInfo.cs
index 26517eac34..a11a892a11 100644
--- a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/BasicTenantInfo.cs
+++ b/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;
diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ICurrentTenant.cs b/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ICurrentTenant.cs
index f0348cbc68..09ab641562 100644
--- a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ICurrentTenant.cs
+++ b/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);
 }
diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ICurrentTenantAccessor.cs b/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ICurrentTenantAccessor.cs
index 398bfb756d..ce5ef36d96 100644
--- a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ICurrentTenantAccessor.cs
+++ b/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; }
 }
diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ITenantResolveContext.cs b/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ITenantResolveContext.cs
index 8844390814..e703fd487b 100644
--- a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ITenantResolveContext.cs
+++ b/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; }
 }
diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantConfiguration.cs b/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantConfiguration.cs
index 39824f41a9..0e5faf9386 100644
--- a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantConfiguration.cs
+++ b/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; }
 
diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantConnectionStringUpdatedEto.cs b/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantConnectionStringUpdatedEto.cs
index 838252cd7a..f36c0d4f64 100644
--- a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantConnectionStringUpdatedEto.cs
+++ b/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; }
 }
diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantCreatedEto.cs b/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantCreatedEto.cs
index 57e564bd78..73f3754a8c 100644
--- a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantCreatedEto.cs
+++ b/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!;
 }
diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantResolveContext.cs b/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantResolveContext.cs
index 86b0586c56..bc661f42c4 100644
--- a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantResolveContext.cs
+++ b/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; }
 
diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantResolveResult.cs b/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantResolveResult.cs
index e707ba27c2..8ce75be339 100644
--- a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantResolveResult.cs
+++ b/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; }