From 054778b97f361bfc03d08f0cce866ddf1914424c Mon Sep 17 00:00:00 2001
From: liangshiwei <deawback@hotmail.com>
Date: Wed, 12 Jul 2023 16:59:21 +0800
Subject: [PATCH] Enable nullable annotations for Volo.Abp.AspNetCore.TestBase

---
 .../Volo.Abp.AspNetCore.TestBase.csproj              |  2 ++
 .../TestBase/AbpAspNetCoreAsyncIntegratedTestBase.cs | 12 ++++++------
 .../Abp/AspNetCore/TestBase/TestServerAccessor.cs    |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.TestBase/Volo.Abp.AspNetCore.TestBase.csproj b/framework/src/Volo.Abp.AspNetCore.TestBase/Volo.Abp.AspNetCore.TestBase.csproj
index 07e3a08920..a6f6a55f39 100644
--- a/framework/src/Volo.Abp.AspNetCore.TestBase/Volo.Abp.AspNetCore.TestBase.csproj
+++ b/framework/src/Volo.Abp.AspNetCore.TestBase/Volo.Abp.AspNetCore.TestBase.csproj
@@ -5,6 +5,8 @@
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <WarningsAsErrors>Nullable</WarningsAsErrors>
     <AssemblyName>Volo.Abp.AspNetCore.TestBase</AssemblyName>
     <PackageId>Volo.Abp.AspNetCore.TestBase</PackageId>
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
diff --git a/framework/src/Volo.Abp.AspNetCore.TestBase/Volo/Abp/AspNetCore/TestBase/AbpAspNetCoreAsyncIntegratedTestBase.cs b/framework/src/Volo.Abp.AspNetCore.TestBase/Volo/Abp/AspNetCore/TestBase/AbpAspNetCoreAsyncIntegratedTestBase.cs
index aa3ca0621f..8892623364 100644
--- a/framework/src/Volo.Abp.AspNetCore.TestBase/Volo/Abp/AspNetCore/TestBase/AbpAspNetCoreAsyncIntegratedTestBase.cs
+++ b/framework/src/Volo.Abp.AspNetCore.TestBase/Volo/Abp/AspNetCore/TestBase/AbpAspNetCoreAsyncIntegratedTestBase.cs
@@ -16,20 +16,20 @@ namespace Volo.Abp.AspNetCore.TestBase;
 public class AbpAspNetCoreAsyncIntegratedTestBase<TModule>
     where TModule : IAbpModule
 {
-    protected WebApplication WebApplication { get; set; }
+    protected WebApplication WebApplication { get; set; } = default!;
 
-    protected TestServer Server { get; set; }
+    protected TestServer Server { get; set; } = default!;
 
-    protected HttpClient Client { get; set; }
+    protected HttpClient Client { get; set; } = default!;
 
-    protected IServiceProvider ServiceProvider { get; set; }
+    protected IServiceProvider ServiceProvider { get; set; } = default!;
 
-    protected virtual T GetService<T>()
+    protected virtual T? GetService<T>()
     {
         return ServiceProvider.GetService<T>();
     }
 
-    protected virtual T GetRequiredService<T>()
+    protected virtual T GetRequiredService<T>() where T : notnull
     {
         return ServiceProvider.GetRequiredService<T>();
     }
diff --git a/framework/src/Volo.Abp.AspNetCore.TestBase/Volo/Abp/AspNetCore/TestBase/TestServerAccessor.cs b/framework/src/Volo.Abp.AspNetCore.TestBase/Volo/Abp/AspNetCore/TestBase/TestServerAccessor.cs
index dbf2db4495..d7e37f1575 100644
--- a/framework/src/Volo.Abp.AspNetCore.TestBase/Volo/Abp/AspNetCore/TestBase/TestServerAccessor.cs
+++ b/framework/src/Volo.Abp.AspNetCore.TestBase/Volo/Abp/AspNetCore/TestBase/TestServerAccessor.cs
@@ -5,5 +5,5 @@ namespace Volo.Abp.AspNetCore.TestBase;
 
 public class TestServerAccessor : ITestServerAccessor, ISingletonDependency
 {
-    public TestServer Server { get; set; }
+    public TestServer Server { get; set; } = default!;
 }