From 2087372b0eb3c688e25f85de1776e0893272819f Mon Sep 17 00:00:00 2001 From: Marco Ribeiro Date: Tue, 27 Feb 2024 09:18:52 -0300 Subject: [PATCH] Updated to .NET 8 --- Src/Directory.Build.props | 2 +- .../FluentEmailer.Core.csproj | 8 ++++++-- .../FluentEmailer.Liquid.csproj | 10 +++++++--- .../FluentEmailer.Razor.csproj | 6 +++++- .../FluentEmailer.MailKit.csproj | 8 ++++++-- .../FluentEmailer.MailerSend.csproj | 6 +++++- .../FluentEmailer.Mailgun.csproj | 6 +++++- .../FluentEmailer.Mailtrap.csproj | 6 +++++- .../FluentEmailer.SendGrid.csproj | 6 +++++- .../FluentEmailer.Smtp.csproj | 6 +++++- .../FluentEmailer.Core.Tests.csproj | 18 +++++++++++++++-- .../MailerSendSenderTests.cs | 2 +- .../MailgunSenderTests.cs | 14 ++++++------- .../SendGridSenderTests.cs | 14 ++++++------- .../FluentEmailer.Liquid.Tests.csproj | 20 ++++++++++++++++--- .../FluentEmailer.Razor.Tests.csproj | 16 ++++++++++++++- global.json | 2 +- 17 files changed, 114 insertions(+), 36 deletions(-) diff --git a/Src/Directory.Build.props b/Src/Directory.Build.props index d4b3ce7..0e5de33 100644 --- a/Src/Directory.Build.props +++ b/Src/Directory.Build.props @@ -8,7 +8,7 @@ https://github.com/marcoatribeiro/FluentEmailer MIT fluentemailer_logo_64x64.png - 1.0.0-rc1 + 1.0.0-rc2 true true diff --git a/Src/FluentEmailer.Core/FluentEmailer.Core.csproj b/Src/FluentEmailer.Core/FluentEmailer.Core.csproj index 71d9d03..4136cff 100644 --- a/Src/FluentEmailer.Core/FluentEmailer.Core.csproj +++ b/Src/FluentEmailer.Core/FluentEmailer.Core.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 enable enable Library @@ -14,7 +14,11 @@ - + + + + + diff --git a/Src/Renderers/FluentEmailer.Liquid/FluentEmailer.Liquid.csproj b/Src/Renderers/FluentEmailer.Liquid/FluentEmailer.Liquid.csproj index 07bfae4..b10169f 100644 --- a/Src/Renderers/FluentEmailer.Liquid/FluentEmailer.Liquid.csproj +++ b/Src/Renderers/FluentEmailer.Liquid/FluentEmailer.Liquid.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable enable Generate emails using Liquid templates. Uses the Fluid project under the hood. @@ -9,12 +9,16 @@ - - + + + + + + diff --git a/Src/Renderers/FluentEmailer.Razor/FluentEmailer.Razor.csproj b/Src/Renderers/FluentEmailer.Razor/FluentEmailer.Razor.csproj index 591b97b..0cd3e59 100644 --- a/Src/Renderers/FluentEmailer.Razor/FluentEmailer.Razor.csproj +++ b/Src/Renderers/FluentEmailer.Razor/FluentEmailer.Razor.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable enable Generate emails using Razor templates. Anything you can do in ASP.NET is possible here. Uses the RazorLight project under the hood. @@ -16,4 +16,8 @@ + + + + diff --git a/Src/Senders/FluentEmailer.MailKit/FluentEmailer.MailKit.csproj b/Src/Senders/FluentEmailer.MailKit/FluentEmailer.MailKit.csproj index 4cecc24..36ed618 100644 --- a/Src/Senders/FluentEmailer.MailKit/FluentEmailer.MailKit.csproj +++ b/Src/Senders/FluentEmailer.MailKit/FluentEmailer.MailKit.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable enable Send emails via MailKit. The SmtpClient has been deprecated and Microsoft recommends using MailKit instead. @@ -10,11 +10,15 @@ - + + + + + diff --git a/Src/Senders/FluentEmailer.MailerSend/FluentEmailer.MailerSend.csproj b/Src/Senders/FluentEmailer.MailerSend/FluentEmailer.MailerSend.csproj index 794be04..00cdb52 100644 --- a/Src/Senders/FluentEmailer.MailerSend/FluentEmailer.MailerSend.csproj +++ b/Src/Senders/FluentEmailer.MailerSend/FluentEmailer.MailerSend.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable enable Send emails via MailerSend using their REST API @@ -12,4 +12,8 @@ + + + + diff --git a/Src/Senders/FluentEmailer.Mailgun/FluentEmailer.Mailgun.csproj b/Src/Senders/FluentEmailer.Mailgun/FluentEmailer.Mailgun.csproj index a9fd3e1..79c3298 100644 --- a/Src/Senders/FluentEmailer.Mailgun/FluentEmailer.Mailgun.csproj +++ b/Src/Senders/FluentEmailer.Mailgun/FluentEmailer.Mailgun.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable enable Send emails via MailGun using their REST API @@ -12,4 +12,8 @@ + + + + diff --git a/Src/Senders/FluentEmailer.Mailtrap/FluentEmailer.Mailtrap.csproj b/Src/Senders/FluentEmailer.Mailtrap/FluentEmailer.Mailtrap.csproj index a12b2db..9b9e770 100644 --- a/Src/Senders/FluentEmailer.Mailtrap/FluentEmailer.Mailtrap.csproj +++ b/Src/Senders/FluentEmailer.Mailtrap/FluentEmailer.Mailtrap.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable enable Luke Lowrey;Ben Cull;Anthony Zigenbine;Github Contributors @@ -13,4 +13,8 @@ + + + + diff --git a/Src/Senders/FluentEmailer.SendGrid/FluentEmailer.SendGrid.csproj b/Src/Senders/FluentEmailer.SendGrid/FluentEmailer.SendGrid.csproj index 8c16692..6ce555a 100644 --- a/Src/Senders/FluentEmailer.SendGrid/FluentEmailer.SendGrid.csproj +++ b/Src/Senders/FluentEmailer.SendGrid/FluentEmailer.SendGrid.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 enable enable Send emails via SendGrid using their REST API @@ -16,4 +16,8 @@ + + + + diff --git a/Src/Senders/FluentEmailer.Smtp/FluentEmailer.Smtp.csproj b/Src/Senders/FluentEmailer.Smtp/FluentEmailer.Smtp.csproj index b316549..10a3fac 100644 --- a/Src/Senders/FluentEmailer.Smtp/FluentEmailer.Smtp.csproj +++ b/Src/Senders/FluentEmailer.Smtp/FluentEmailer.Smtp.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable enable Send emails via SMTP with a Fluent API. @@ -12,4 +12,8 @@ + + + + diff --git a/Tests/FluentEmailer.Core.Tests/FluentEmailer.Core.Tests.csproj b/Tests/FluentEmailer.Core.Tests/FluentEmailer.Core.Tests.csproj index 517c885..154576f 100644 --- a/Tests/FluentEmailer.Core.Tests/FluentEmailer.Core.Tests.csproj +++ b/Tests/FluentEmailer.Core.Tests/FluentEmailer.Core.Tests.csproj @@ -1,13 +1,13 @@  - net7.0 + net8.0 enable - + @@ -29,4 +29,18 @@ + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + diff --git a/Tests/FluentEmailer.Core.Tests/MailerSendSenderTests.cs b/Tests/FluentEmailer.Core.Tests/MailerSendSenderTests.cs index 2b28241..ac74f60 100644 --- a/Tests/FluentEmailer.Core.Tests/MailerSendSenderTests.cs +++ b/Tests/FluentEmailer.Core.Tests/MailerSendSenderTests.cs @@ -27,7 +27,7 @@ public async Task Should_Send_Email() .Body("

Test

Greetings from the team, you got this message through MailerSend.

", true) .Tag("test_tag") .SendAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); response.ShouldBeSuccessful(); } diff --git a/Tests/FluentEmailer.Core.Tests/MailgunSenderTests.cs b/Tests/FluentEmailer.Core.Tests/MailgunSenderTests.cs index 286bd82..279bbb9 100644 --- a/Tests/FluentEmailer.Core.Tests/MailgunSenderTests.cs +++ b/Tests/FluentEmailer.Core.Tests/MailgunSenderTests.cs @@ -31,7 +31,7 @@ public async Task Should_Send_Email_With_Tag() .Body("

Test

Greetings from the team, you got this message through SendGrid.

", true) .Tag(_fixture.Tag) .SendAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); response.ShouldBeSuccessful(); } @@ -43,7 +43,7 @@ public async Task Should_Send_Email_With_ReplyTo() .ReplyTo(_fixture.ToEmail, _fixture.ToName) .Body(_fixture.Body) .SendAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); response.ShouldBeSuccessful(); } @@ -69,7 +69,7 @@ public async Task Should_Send_Email_With_Attachments() .Body(_fixture.Body) .Attach(attachment) .SendAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); response.ShouldBeSuccessful(); } @@ -92,7 +92,7 @@ public async Task Should_Send_Email_With_Inline_Attachments() "

You should see an image without an attachment, or without a download prompt, depending on the email client.

", true) .Attach(attachment) .SendAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); response.ShouldBeSuccessful(); } @@ -104,7 +104,7 @@ public async Task Should_Send_Email_With_Variables() .Body(_fixture.Body) .Header("X-Mailgun-Variables", JsonSerializer.Serialize(new Variable { Var1 = "Test" })) .SendAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); response.ShouldBeSuccessful(); } @@ -116,7 +116,7 @@ public async Task Should_Send_High_Priority_Email() .Body(_fixture.Body) .HighPriority() .SendAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); response.ShouldBeSuccessful(); } @@ -128,7 +128,7 @@ public async Task Should_Send_Low_Priority_Email() .Body(_fixture.Body) .LowPriority() .SendAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); response.ShouldBeSuccessful(); } diff --git a/Tests/FluentEmailer.Core.Tests/SendGridSenderTests.cs b/Tests/FluentEmailer.Core.Tests/SendGridSenderTests.cs index 12f6426..426416d 100644 --- a/Tests/FluentEmailer.Core.Tests/SendGridSenderTests.cs +++ b/Tests/FluentEmailer.Core.Tests/SendGridSenderTests.cs @@ -30,7 +30,7 @@ public async Task Should_Send_Email_With_Tag() .Body("

Test

Greetings from the team, you got this message through SendGrid.

", true) .Tag(_fixture.Tag) .SendAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); response.ShouldBeSuccessful(); } @@ -47,7 +47,7 @@ public async Task Should_Send_Email_Using_Template() var response = await _testEmail .SendWithTemplateAsync(templateId, templateData) - .ConfigureAwait(false); + .ConfigureAwait(true); response.ShouldBeSuccessful(); } @@ -59,7 +59,7 @@ public async Task Should_Send_Email_With_ReplyTo() .ReplyTo(_fixture.ToEmail, _fixture.ToName) .Body(_fixture.Body) .SendAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); response.ShouldBeSuccessful(); } @@ -80,7 +80,7 @@ public async Task Should_Send_Email_With_Attachments() .Body(_fixture.Body) .Attach(attachment) .SendAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); response.ShouldBeSuccessful(); } @@ -103,7 +103,7 @@ public async Task Should_Send_Email_With_Inline_Attachments() .Body(_fixture.Body) .Attach(attachment) .SendAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); response.ShouldBeSuccessful(); } @@ -115,7 +115,7 @@ public async Task Should_Send_High_Priority_Email() .Body(_fixture.Body) .HighPriority() .SendAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); response.ShouldBeSuccessful(); } @@ -127,7 +127,7 @@ public async Task Should_Send_Low_Priority_Email() .Body(_fixture.Body) .LowPriority() .SendAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); response.ShouldBeSuccessful(); } diff --git a/Tests/Renderers/FluentEmailer.Liquid.Tests/FluentEmailer.Liquid.Tests.csproj b/Tests/Renderers/FluentEmailer.Liquid.Tests/FluentEmailer.Liquid.Tests.csproj index 99dfc4e..b298ab4 100644 --- a/Tests/Renderers/FluentEmailer.Liquid.Tests/FluentEmailer.Liquid.Tests.csproj +++ b/Tests/Renderers/FluentEmailer.Liquid.Tests/FluentEmailer.Liquid.Tests.csproj @@ -1,13 +1,13 @@  - net7.0 + net8.0 enable - - + + @@ -19,4 +19,18 @@ + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + diff --git a/Tests/Renderers/FluentEmailer.Razor.Tests/FluentEmailer.Razor.Tests.csproj b/Tests/Renderers/FluentEmailer.Razor.Tests/FluentEmailer.Razor.Tests.csproj index 3a25caf..89a0b46 100644 --- a/Tests/Renderers/FluentEmailer.Razor.Tests/FluentEmailer.Razor.Tests.csproj +++ b/Tests/Renderers/FluentEmailer.Razor.Tests/FluentEmailer.Razor.Tests.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 enable true @@ -23,4 +23,18 @@ + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + diff --git a/global.json b/global.json index 7383a11..b93fcd8 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { "rollForward": "feature", - "version": "7.0.304" + "version": "8.0.100" } } \ No newline at end of file