From c67852a197d41affa7f54b7cc6f2ad7ac07f967e Mon Sep 17 00:00:00 2001
From: liangshiwei <deawback@hotmail.com>
Date: Wed, 28 Jun 2023 16:04:18 +0800
Subject: [PATCH] Enable nullable annotations for Volo.Abp.Castle.Core

---
 .../src/Volo.Abp.Castle.Core/Volo.Abp.Castle.Core.csproj      | 2 ++
 .../DynamicProxy/CastleAbpMethodInvocationAdapterBase.cs      | 4 ++--
 .../CastleAbpMethodInvocationAdapterWithReturnValue.cs        | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/framework/src/Volo.Abp.Castle.Core/Volo.Abp.Castle.Core.csproj b/framework/src/Volo.Abp.Castle.Core/Volo.Abp.Castle.Core.csproj
index 7125519bb0..d840a3bf69 100644
--- a/framework/src/Volo.Abp.Castle.Core/Volo.Abp.Castle.Core.csproj
+++ b/framework/src/Volo.Abp.Castle.Core/Volo.Abp.Castle.Core.csproj
@@ -5,6 +5,8 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
+    <Nullable>enable</Nullable>
+    <WarningsAsErrors>Nullable</WarningsAsErrors>
     <AssemblyName>Volo.Abp.Castle.Core</AssemblyName>
     <PackageId>Volo.Abp.Castle.Core</PackageId>
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
diff --git a/framework/src/Volo.Abp.Castle.Core/Volo/Abp/Castle/DynamicProxy/CastleAbpMethodInvocationAdapterBase.cs b/framework/src/Volo.Abp.Castle.Core/Volo/Abp/Castle/DynamicProxy/CastleAbpMethodInvocationAdapterBase.cs
index 1a96e20320..138a35c8b0 100644
--- a/framework/src/Volo.Abp.Castle.Core/Volo/Abp/Castle/DynamicProxy/CastleAbpMethodInvocationAdapterBase.cs
+++ b/framework/src/Volo.Abp.Castle.Core/Volo/Abp/Castle/DynamicProxy/CastleAbpMethodInvocationAdapterBase.cs
@@ -20,7 +20,7 @@ public abstract class CastleAbpMethodInvocationAdapterBase : IAbpMethodInvocatio
 
     public MethodInfo Method => Invocation.MethodInvocationTarget ?? Invocation.Method;
 
-    public object ReturnValue { get; set; }
+    public object ReturnValue { get; set; } = default!;
 
     protected IInvocation Invocation { get; }
 
@@ -39,7 +39,7 @@ public abstract class CastleAbpMethodInvocationAdapterBase : IAbpMethodInvocatio
         var methodParameters = Method.GetParameters();
         for (int i = 0; i < methodParameters.Length; i++)
         {
-            dict[methodParameters[i].Name] = Invocation.Arguments[i];
+            dict[methodParameters[i].Name!] = Invocation.Arguments[i];
         }
 
         return dict;
diff --git a/framework/src/Volo.Abp.Castle.Core/Volo/Abp/Castle/DynamicProxy/CastleAbpMethodInvocationAdapterWithReturnValue.cs b/framework/src/Volo.Abp.Castle.Core/Volo/Abp/Castle/DynamicProxy/CastleAbpMethodInvocationAdapterWithReturnValue.cs
index 6bebcf531e..5e6e2b3e3b 100644
--- a/framework/src/Volo.Abp.Castle.Core/Volo/Abp/Castle/DynamicProxy/CastleAbpMethodInvocationAdapterWithReturnValue.cs
+++ b/framework/src/Volo.Abp.Castle.Core/Volo/Abp/Castle/DynamicProxy/CastleAbpMethodInvocationAdapterWithReturnValue.cs
@@ -21,6 +21,6 @@ public class CastleAbpMethodInvocationAdapterWithReturnValue<TResult> : CastleAb
 
     public override async Task ProceedAsync()
     {
-        ReturnValue = await Proceed(Invocation, ProceedInfo);
+        ReturnValue = (await Proceed(Invocation, ProceedInfo))!;
     }
 }