Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update MailMergeLib to v5.11.0 #81

Merged
merged 1 commit into from
Jul 4, 2023
Merged

Update MailMergeLib to v5.11.0 #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion League/BackgroundTasks/SendEmailTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public async Task RunAsync(CancellationToken cancellationToken)
{
try
{
await _mailMergeService.Sender.SendAsync(mmm, null);
await _mailMergeService.Sender.SendAsync(mmm, null!);
}
catch (Exception e) when (e is TaskCanceledException || e is OperationCanceledException)
{
Expand Down
2 changes: 1 addition & 1 deletion League/Emailing/Creators/ContactFormCreator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public async IAsyncEnumerable<MailMergeMessage> GetMailMergeMessages(ITenantCont

var mailMergeMessage = mailMergeService.CreateStandardMessage();
mailMergeMessage.EnableFormatter = false;
mailMergeMessage.Subject = model.Form.Subject; // user-generated, cannot localize!
mailMergeMessage.Subject = model.Form.Subject!; // user-generated, cannot localize!

mailMergeMessage.MailMergeAddresses.Add(new MailMergeAddress(MailAddressType.From, tenantContext.SiteContext.Email.ContactFrom.Address));
mailMergeMessage.MailMergeAddresses.Add(new MailMergeAddress(MailAddressType.To, tenantContext.SiteContext.Email.ContactTo.Address));
Expand Down
8 changes: 4 additions & 4 deletions League/League.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Localizations for English and German are included. The library is in operation o
<ItemGroup>
<PackageReference Include="Axuno.TextTemplating" Version="2.0.1" />
<PackageReference Include="JSNLog" Version="3.0.1" />
<PackageReference Include="MailMergeLib" Version="5.9.1" />
<PackageReference Include="MailMergeLib" Version="5.11.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="6.0.3" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="6.0.3" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="6.0.3" />
Expand All @@ -57,9 +57,9 @@ Localizations for English and German are included. The library is in operation o
</PackageReference>
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="NLog" Version="5.1.1" />
<PackageReference Include="NLog.Web.AspNetCore" Version="5.2.1" />
<PackageReference Include="NuGetizer" Version="0.9.1">
<PackageReference Include="NLog" Version="5.2.1" />
<PackageReference Include="NLog.Web.AspNetCore" Version="5.3.1" />
<PackageReference Include="NuGetizer" Version="1.0.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion League/LeagueStartup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ public static void ConfigureServices(WebHostBuilderContext context, IServiceColl
$@"MailMergeLib.{environment.EnvironmentName}.config"),
System.Text.Encoding.UTF8);
var fms = FileMessageStore.Deserialize(Path.Combine(environment.ContentRootPath, League.LeagueStartup.ConfigurationFolder,
"MailMergeLibMessageStore.config"), System.Text.Encoding.UTF8);
"MailMergeLibMessageStore.config"), System.Text.Encoding.UTF8)!;
for (var i = 0; i < fms.SearchFolders.Length; i++)
{
// make relative paths absolute - ready to use
Expand Down