From 5553c3c6014dfe05371823c198874199cb11cfc4 Mon Sep 17 00:00:00 2001
From: liangshiwei <deawback@hotmail.com>
Date: Wed, 12 Jul 2023 14:40:44 +0800
Subject: [PATCH] Enable nullable annotations for
 Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy

---
 .../Pages/Abp/MultiTenancy/TenantSwitchModal.cshtml.cs | 10 +++++-----
 .../Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.csproj     |  2 ++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Pages/Abp/MultiTenancy/TenantSwitchModal.cshtml.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Pages/Abp/MultiTenancy/TenantSwitchModal.cshtml.cs
index 0110aeff21..f6711be826 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Pages/Abp/MultiTenancy/TenantSwitchModal.cshtml.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Pages/Abp/MultiTenancy/TenantSwitchModal.cshtml.cs
@@ -15,7 +15,7 @@ namespace Pages.Abp.MultiTenancy;
 public class TenantSwitchModalModel : AbpPageModel
 {
     [BindProperty]
-    public TenantInfoModel Input { get; set; }
+    public TenantInfoModel Input { get; set; } = default!;
 
     protected ITenantStore TenantStore { get; }
     protected AbpAspNetCoreMultiTenancyOptions Options { get; }
@@ -45,15 +45,15 @@ public class TenantSwitchModalModel : AbpPageModel
         Guid? tenantId = null;
         if (!Input.Name.IsNullOrEmpty())
         {
-            var tenant = await TenantStore.FindAsync(Input.Name);
+            var tenant = await TenantStore.FindAsync(Input.Name!);
             if (tenant == null)
             {
-                throw new UserFriendlyException(L["GivenTenantIsNotExist", Input.Name]);
+                throw new UserFriendlyException(L["GivenTenantIsNotExist", Input.Name!]);
             }
 
             if (!tenant.IsActive)
             {
-                throw new UserFriendlyException(L["GivenTenantIsNotAvailable", Input.Name]);
+                throw new UserFriendlyException(L["GivenTenantIsNotAvailable", Input.Name!]);
             }
 
             tenantId = tenant.Id;
@@ -65,6 +65,6 @@ public class TenantSwitchModalModel : AbpPageModel
     public class TenantInfoModel
     {
         [InputInfoText("SwitchTenantHint")]
-        public string Name { get; set; }
+        public string? Name { get; set; }
     }
 }
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.csproj b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.csproj
index ed68be0443..c2fad00e3c 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.csproj
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.csproj
@@ -5,6 +5,8 @@
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <WarningsAsErrors>Nullable</WarningsAsErrors>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
     <AssemblyName>Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy</AssemblyName>
     <PackageId>Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy</PackageId>