Browse Source

Enable nullable annotations for Volo.Abp.MailKit

pull/17108/head
liangshiwei 3 years ago
parent
commit
a305d9d503
  1. 2
      framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/BackgroundEmailSendingJob.cs
  2. 8
      framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/BackgroundEmailSendingJobArgs.cs
  3. 4
      framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/EmailSenderBase.cs
  4. 8
      framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/IEmailSender.cs
  5. 2
      framework/src/Volo.Abp.MailKit/Volo.Abp.MailKit.csproj

2
framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/BackgroundEmailSendingJob.cs

@ -23,7 +23,7 @@ public class BackgroundEmailSendingJob : AsyncBackgroundJob<BackgroundEmailSendi
}
else
{
await EmailSender.SendAsync(args.From, args.To, args.Subject, args.Body, args.IsBodyHtml);
await EmailSender.SendAsync(args.From!, args.To, args.Subject, args.Body, args.IsBodyHtml);
}
}
}

8
framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/BackgroundEmailSendingJobArgs.cs

@ -5,13 +5,13 @@ namespace Volo.Abp.Emailing;
[Serializable]
public class BackgroundEmailSendingJobArgs
{
public string From { get; set; }
public string? From { get; set; }
public string To { get; set; }
public string To { get; set; } = default!;
public string Subject { get; set; }
public string? Subject { get; set; }
public string Body { get; set; }
public string? Body { get; set; }
/// <summary>
/// Default: true.

4
framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/EmailSenderBase.cs

@ -24,7 +24,7 @@ public abstract class EmailSenderBase : IEmailSender
BackgroundJobManager = backgroundJobManager;
}
public virtual async Task SendAsync(string to, string subject, string body, bool isBodyHtml = true)
public virtual async Task SendAsync(string to, string? subject, string? body, bool isBodyHtml = true)
{
await SendAsync(new MailMessage
{
@ -35,7 +35,7 @@ public abstract class EmailSenderBase : IEmailSender
});
}
public virtual async Task SendAsync(string from, string to, string subject, string body, bool isBodyHtml = true)
public virtual async Task SendAsync(string from, string to, string? subject, string? body, bool isBodyHtml = true)
{
await SendAsync(new MailMessage(from, to, subject, body) { IsBodyHtml = isBodyHtml });
}

8
framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/IEmailSender.cs

@ -13,8 +13,8 @@ public interface IEmailSender
/// </summary>
Task SendAsync(
string to,
string subject,
string body,
string? subject,
string? body,
bool isBodyHtml = true
);
@ -24,8 +24,8 @@ public interface IEmailSender
Task SendAsync(
string from,
string to,
string subject,
string body,
string? subject,
string? body,
bool isBodyHtml = true
);

2
framework/src/Volo.Abp.MailKit/Volo.Abp.MailKit.csproj

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

Loading…
Cancel
Save