Skip to content

Commit

Permalink
Merge branch 'release/3.816.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
vc-ci committed Dec 24, 2024
2 parents 6875dd3 + 88b3b8a commit c9469ad
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project>
<!-- These properties will be shared for all projects -->
<PropertyGroup>
<VersionPrefix>3.815.0</VersionPrefix>
<VersionPrefix>3.816.0</VersionPrefix>
<VersionSuffix></VersionSuffix>
<VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,15 @@ public async Task SendNotificationAsync(NotificationMessage message)
var emailNotificationMessage = message as EmailNotificationMessage
?? throw new ArgumentException($"The message is not {nameof(EmailNotificationMessage)} type");

emailNotificationMessage.From ??= _emailSendingOptions.DefaultSender;

try
{
var graphMessage = new Message
{
Subject = emailNotificationMessage.Subject,
Body = new ItemBody { ContentType = BodyType.Html, Content = emailNotificationMessage.Body },
From = NewRecipient(emailNotificationMessage.From ?? _emailSendingOptions.DefaultSender),
From = NewRecipient(emailNotificationMessage.From),
ToRecipients = [NewRecipient(emailNotificationMessage.To)],
CcRecipients = emailNotificationMessage.CC?.Select(NewRecipient).ToList() ?? [],
BccRecipients = emailNotificationMessage.BCC?.Select(NewRecipient).ToList() ?? []
Expand Down
2 changes: 1 addition & 1 deletion src/VirtoCommerce.NotificationsModule.Web/module.manifest
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<id>VirtoCommerce.Notifications</id>
<version>3.815.0</version>
<version>3.816.0</version>
<version-tag />
<platformVersion>3.853.0</platformVersion>
<dependencies>
Expand Down

0 comments on commit c9469ad

Please sign in to comment.