Migrate Easify.Notifications to .Net 6.0 (icgam#6)

* [DEV-1929] Upgraded to .net 6

* [DEV-1929] Namespace and global using updates

* [DEV-1929] Updated ci.yaml

* [DEV-1929] Added global system usings file

* [DEV-1929] Update to release.yaml file

* [DEV-1929] Upgraded all NetStandard projects to Net 6

* [DEV-1929] Small usings file tidy up

Author: richardcurtis-icg

.github/workflows/ci.yml

@@ -24,11 +24,11 @@ jobs:
       - name: Install GitVersion
         uses: gittools/actions/gitversion/[email protected]
         with:
-          versionSpec: "5.6.x"
+          versionSpec: "5.8.x"
       - name: Setup .NET Core
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v2
         with:
-          dotnet-version: "5.0.x"
+          dotnet-version: "6.0.x"
       - name: Install dependencies
         run: dotnet restore src
       - name: Use GitVersion

.github/workflows/release.yml

@@ -16,11 +16,11 @@ jobs:
       - name: Install GitVersion
         uses: gittools/actions/gitversion/[email protected]
         with:
-          versionSpec: "5.6.x"
+          versionSpec: "5.8.x"
       - name: Setup .NET Core
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v2
         with:
-          dotnet-version: "5.0.x"
+          dotnet-version: "6.0.x"
       - name: Install dependencies
         run: dotnet restore src
       - name: Use GitVersion

src/Directory.Build.props

@@ -0,0 +1,5 @@
+<Project>
+    <ItemGroup>
+        <Compile Include="../GlobalUsings.System.cs" />
+    </ItemGroup>
+</Project>

src/Easify.Notifications.Messaging.MailKit/Easify.Notifications.Messaging.MailKit.csproj

@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
         <Description>MailKit implementation for Easify Notification Messaging</Description>
         <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
         <Authors>Mohammad Moattar,David Cassell</Authors>
@@ -10,17 +9,18 @@
         <RepositoryUrl>https://github.com/icgam/Easify.Notifications</RepositoryUrl>
         <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
         <Version>1.0.0</Version>
-        <LangVersion>9</LangVersion>
+        <LangVersion>10</LangVersion>
+        <TargetFramework>net6.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="MailKit" Version="2.10.0" />
-      <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
-      <PackageReference Include="Microsoft.Extensions.Options" Version="5.0.0" />
+        <PackageReference Include="MailKit" Version="2.10.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Options" Version="5.0.0" />
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\Easify.Notifications.Messaging\Easify.Notifications.Messaging.csproj" />
+        <ProjectReference Include="..\Easify.Notifications.Messaging\Easify.Notifications.Messaging.csproj" />
     </ItemGroup>
 
 </Project>

src/Easify.Notifications.Messaging.MailKit/MailKitMessagingService.cs

@@ -1,85 +1,72 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using Easify.Notifications.Messaging;
-using Easify.Notifications.Messaging.Configuration;
-using Easify.Notifications.Messaging.Exceptions;
-using MailKit.Net.Smtp;
-using MailKit.Security;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using MimeKit;
-
 // This software is part of the Easify framework
 // Copyright (C) 2019 Intermediate Capital Group
-// 
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
-// 
+//
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU Affero General Public License for more details.
-// 
+//
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-namespace Easify.Notifications.Messaging.MailKit
+namespace Easify.Notifications.Messaging.MailKit;
+
+public sealed class MailKitMessagingService : IMessagingService
 {
-    public sealed class MailKitMessagingService : IMessagingService
-    {
-        private readonly ILogger<MailKitMessagingService> _logger;
-        private readonly SmtpOptions _smtpOptions;
+    private readonly ILogger<MailKitMessagingService> _logger;
+    private readonly SmtpOptions _smtpOptions;
 
-        public MailKitMessagingService(IOptions<SmtpOptions> smtpOptionsAccessor, ILogger<MailKitMessagingService> logger)
-        {
-            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
-            _smtpOptions = smtpOptionsAccessor?.Value ?? throw new ArgumentNullException(nameof(smtpOptionsAccessor));
-        }
+    public MailKitMessagingService(IOptions<SmtpOptions> smtpOptionsAccessor, ILogger<MailKitMessagingService> logger)
+    {
+        _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+        _smtpOptions = smtpOptionsAccessor?.Value ?? throw new ArgumentNullException(nameof(smtpOptionsAccessor));
+    }
 
-        public async Task SendAsync(Message message)
-        {
-            if (message == null) throw new ArgumentNullException(nameof(message));
+    public async Task SendAsync(Message message)
+    {
+        if (message == null) throw new ArgumentNullException(nameof(message));
 
-            EnsureOptions();
+        EnsureOptions();
 
-            var emailMessage = new MimeMessage();
+        var emailMessage = new MimeMessage();
 
-            emailMessage.From.Add(CreateAddress(message.Sender));
-            emailMessage.To.AddRange(message.Recipients.Select(CreateAddress).ToList());
-            emailMessage.Subject = message.Subject;
-            emailMessage.Body = new TextPart("html") {Text = message.Content};
+        emailMessage.From.Add(CreateAddress(message.Sender));
+        emailMessage.To.AddRange(message.Recipients.Select(CreateAddress).ToList());
+        emailMessage.Subject = message.Subject;
+        emailMessage.Body = new TextPart("html") { Text = message.Content };
 
-            await SendEmailMessageAsync(emailMessage);
-        }
+        await SendEmailMessageAsync(emailMessage);
+    }
 
-        private void EnsureOptions()
-        {
-            if (string.IsNullOrWhiteSpace(_smtpOptions.LocalDomain))
-                throw new SmtpOptionsException(nameof(_smtpOptions.LocalDomain));
+    private void EnsureOptions()
+    {
+        if (string.IsNullOrWhiteSpace(_smtpOptions.LocalDomain))
+            throw new SmtpOptionsException(nameof(_smtpOptions.LocalDomain));
 
-            if (string.IsNullOrWhiteSpace(_smtpOptions.Server))
-                throw new SmtpOptionsException(nameof(_smtpOptions.Server));
-        }
+        if (string.IsNullOrWhiteSpace(_smtpOptions.Server))
+            throw new SmtpOptionsException(nameof(_smtpOptions.Server));
+    }
 
-        private async Task SendEmailMessageAsync(MimeMessage message)
+    private async Task SendEmailMessageAsync(MimeMessage message)
+    {
+        using (var client = new SmtpClient())
         {
-            using (var client = new SmtpClient())
-            {
-                client.LocalDomain = _smtpOptions.LocalDomain;
-                await client.ConnectAsync(_smtpOptions.Server, _smtpOptions.Port, SecureSocketOptions.None);
-                await client.SendAsync(message);
-                await client.DisconnectAsync(true);
-            }
+            client.LocalDomain = _smtpOptions.LocalDomain;
+            await client.ConnectAsync(_smtpOptions.Server, _smtpOptions.Port, SecureSocketOptions.None);
+            await client.SendAsync(message);
+            await client.DisconnectAsync(true);
         }
+    }
 
-        private MailboxAddress CreateAddress(EmailAddress recipient)
-        {
-            if (recipient == null) throw new ArgumentNullException(nameof(recipient));
+    private MailboxAddress CreateAddress(EmailAddress recipient)
+    {
+        if (recipient == null) throw new ArgumentNullException(nameof(recipient));
 
-            return new MailboxAddress(recipient.Name ?? recipient.Email, recipient.Email);
-        }
+        return new MailboxAddress(recipient.Name ?? recipient.Email, recipient.Email);
     }
 }

src/Easify.Notifications.Messaging.MailKit/Usings.cs

@@ -0,0 +1,9 @@
+global using Easify.Notifications.Messaging.Configuration;
+global using Easify.Notifications.Messaging.Exceptions;
+
+global using Microsoft.Extensions.Logging;
+global using Microsoft.Extensions.Options;
+
+global using MailKit.Net.Smtp;
+global using MailKit.Security;
+global using MimeKit;

src/Easify.Notifications.Messaging/Configuration/NotificationAudience.cs

@@ -1,23 +1,22 @@
 // This software is part of the Easify framework
 // Copyright (C) 2019 Intermediate Capital Group
-// 
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
-// 
+//
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU Affero General Public License for more details.
-// 
+//
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-namespace Easify.Notifications.Messaging.Configuration
+namespace Easify.Notifications.Messaging.Configuration;
+
+public sealed class NotificationAudience
 {
-    public sealed class NotificationAudience
-    {
-        public string Email { get; set; }
-    }
+    public string Email { get; set; }
 }

src/Easify.Notifications.Messaging/Configuration/NotificationOptions.cs

@@ -1,25 +1,24 @@
 // This software is part of the Easify framework
 // Copyright (C) 2019 Intermediate Capital Group
-// 
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
-// 
+//
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU Affero General Public License for more details.
-// 
+//
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-namespace Easify.Notifications.Messaging.Configuration
+namespace Easify.Notifications.Messaging.Configuration;
+
+public sealed class NotificationOptions
 {
-    public sealed class NotificationOptions
-    {
-        public string Sender { get; set; }
-        public NotificationProfile[] Profiles { get; set; } = { };
-        public NotificationTemplate[] Templates { get; set; } = { };
-    }
+    public string Sender { get; set; }
+    public NotificationProfile[] Profiles { get; set; } = { };
+    public NotificationTemplate[] Templates { get; set; } = { };
 }

src/Easify.Notifications.Messaging/Configuration/NotificationProfile.cs

@@ -1,24 +1,23 @@
 // This software is part of the Easify framework
 // Copyright (C) 2019 Intermediate Capital Group
-// 
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
-// 
+//
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU Affero General Public License for more details.
-// 
+//
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-namespace Easify.Notifications.Messaging.Configuration
+namespace Easify.Notifications.Messaging.Configuration;
+
+public sealed class NotificationProfile
 {
-    public sealed class NotificationProfile
-    {
-        public string ProfileName { get; set; }
-        public NotificationAudience[] Audiences { get; set; }
-    }
+    public string ProfileName { get; set; }
+    public NotificationAudience[] Audiences { get; set; }
 }

src/Easify.Notifications.Messaging/Configuration/NotificationProfileNames.cs

@@ -1,23 +1,22 @@
 // This software is part of the Easify framework
 // Copyright (C) 2019 Intermediate Capital Group
-// 
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
-// 
+//
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU Affero General Public License for more details.
-// 
+//
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-namespace Easify.Notifications.Messaging.Configuration
+namespace Easify.Notifications.Messaging.Configuration;
+
+public static class NotificationProfileNames
 {
-    public static class NotificationProfileNames
-    {
-        public const string DefaultProfile = "DefaultProfile";
-    }
+    public const string DefaultProfile = "DefaultProfile";
 }