Migration from .NET 7.0 to .NET 8.0

.azure/azure-pipelines.yml

@@ -12,9 +12,9 @@ steps:
     displayName: 'docker compose -f ./docker-compose/docker-compose.tests.yml up -d'
 
   - task: UseDotNet@2
-    displayName: 'install .net sdk 7.x'
+    displayName: 'install .net sdk 8.x'
     inputs:
-      version: 7.x
+      version: 8.x
       installationPath: $(Agent.ToolsDirectory)/dotnet
 
   - script: |

.github/workflows/build_and_test.yml

@@ -21,7 +21,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
 
     - name: docker compose -f ./docker-compose/docker-compose.tests.yml up -d
       run: docker compose -f ./docker-compose/docker-compose.tests.yml up -d

.github/workflows/build_test_and_publish.yml

@@ -32,7 +32,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
 
     - name: Setup NuGet
       uses: nuget/setup-nuget@v1

plugins/OnlineSales.Plugin.EmailSync/OnlineSales.Plugin.EmailSync.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
@@ -27,7 +27,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="MailKit" Version="4.5.0" />
+    <PackageReference Include="MailKit" Version="4.9.0" />
     <!-- Insert additional references above this line -->
   </ItemGroup>
 

plugins/OnlineSales.Plugin.ReverseProxy/OnlineSales.Plugin.ReverseProxy.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <Nullable>enable</Nullable>

plugins/OnlineSales.Plugin.SendGrid/Controllers/SendgridController.cs

@@ -5,8 +5,9 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
 using Newtonsoft.Json;
+using OnlineSales.Configuration;
 using OnlineSales.Entities;
 using OnlineSales.Helpers;
 using OnlineSales.Infrastructure;
@@ -148,7 +149,8 @@ private async Task<ActionResult> AddEvents<T>(List<T> records)
         try
         {
             // lock is required here because if two webhook events or imports start at the same time and try to create new contacts - one may fail later due too dupliacate email error
-            using (LockManager.GetWaitLock("SendGridAddEventsWaitLock", dbContext.Database.GetConnectionString()!))
+            var postgresConfig = dbContext.Configuration.GetSection("Postgres").Get<PostgresConfig>()!;
+            using (LockManager.GetWaitLock("SendGridAddEventsWaitLock", postgresConfig.ConnectionString))
             {
                 var emailRecords = records.GroupBy(r => r.Email);
 

plugins/OnlineSales.Plugin.SendGrid/OnlineSales.Plugin.SendGrid.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>

plugins/OnlineSales.Plugin.Sms/Exceptions/AwsSnsException.cs

@@ -2,11 +2,8 @@
 // Licensed under the MIT license. See LICENSE file in the samples root for full license information.
 // </copyright>
 
-using System.Runtime.Serialization;
-
 namespace OnlineSales.Plugin.Sms.Exceptions
 {
-    [Serializable]
     public class AwsSnsException : Exception
     {
         public AwsSnsException()
@@ -22,10 +19,5 @@ public AwsSnsException(string? message, Exception? innerException)
             : base(message, innerException)
         {
         }
-
-        protected AwsSnsException(SerializationInfo info, StreamingContext context)
-            : base(info, context)
-        {
-        }
     }
 }

plugins/OnlineSales.Plugin.Sms/Exceptions/GetshoutoutException.cs

@@ -2,11 +2,8 @@
 // Licensed under the MIT license. See LICENSE file in the samples root for full license information.
 // </copyright>
 
-using System.Runtime.Serialization;
-
 namespace OnlineSales.Plugin.Sms.Exceptions;
 
-[Serializable]
 public class GetshoutoutException : Exception
 {
     public GetshoutoutException()
@@ -22,9 +19,4 @@ public GetshoutoutException(string? message, Exception? innerException)
         : base(message, innerException)
     {
     }
-
-    protected GetshoutoutException(SerializationInfo info, StreamingContext context)
-        : base(info, context)
-    {
-    }
 }

plugins/OnlineSales.Plugin.Sms/Exceptions/NotifyLkException.cs

@@ -2,11 +2,8 @@
 // Licensed under the MIT license. See LICENSE file in the samples root for full license information.
 // </copyright>
 
-using System.Runtime.Serialization;
-
 namespace OnlineSales.Plugin.Sms.Exceptions
 {
-    [Serializable]
     public class NotifyLkException : Exception
     {
         public NotifyLkException()
@@ -22,10 +19,5 @@ public NotifyLkException(string? message, Exception? innerException)
             : base(message, innerException)
         {
         }
-
-        protected NotifyLkException(SerializationInfo info, StreamingContext context)
-            : base(info, context)
-        {
-        }
     }
 }

plugins/OnlineSales.Plugin.Sms/Exceptions/SMSPluginException.cs

@@ -2,11 +2,8 @@
 // Licensed under the MIT license. See LICENSE file in the samples root for full license information.
 // </copyright>
 
-using System.Runtime.Serialization;
-
 namespace OnlineSales.Plugin.Sms.Exceptions
 {
-    [Serializable]
     public class SmsPluginException : Exception
     {
         public SmsPluginException()
@@ -22,10 +19,5 @@ public SmsPluginException(string? message, Exception? innerException)
             : base(message, innerException)
         {
         }
-
-        protected SmsPluginException(SerializationInfo info, StreamingContext context)
-            : base(info, context)
-        {
-        }
     }
 }

plugins/OnlineSales.Plugin.Sms/Exceptions/SmscException.cs

@@ -2,11 +2,8 @@
 // Licensed under the MIT license. See LICENSE file in the samples root for full license information.
 // </copyright>
 
-using System.Runtime.Serialization;
-
 namespace OnlineSales.Plugin.Sms.Exceptions
 {
-    [Serializable]
     public class SmscException : Exception
     {
         public SmscException()
@@ -22,10 +19,5 @@ public SmscException(string? message, Exception? innerException)
             : base(message, innerException)
         {
         }
-
-        protected SmscException(SerializationInfo info, StreamingContext context)
-            : base(info, context)
-        {
-        }
     }
 }

plugins/OnlineSales.Plugin.Sms/Exceptions/TwilioException.cs

@@ -2,11 +2,8 @@
 // Licensed under the MIT license. See LICENSE file in the samples root for full license information.
 // </copyright>
 
-using System.Runtime.Serialization;
-
 namespace OnlineSales.Plugin.Sms.Exceptions
 {
-    [Serializable]
     public class TwilioException : Exception
     {
         public TwilioException()
@@ -22,10 +19,5 @@ public TwilioException(string? message, Exception? innerException)
             : base(message, innerException)
         {
         }
-
-        protected TwilioException(SerializationInfo info, StreamingContext context)
-            : base(info, context)
-        {
-        }
     }
 }

plugins/OnlineSales.Plugin.Sms/Exceptions/UnknownCountryCodeException.cs

@@ -2,11 +2,8 @@
 // Licensed under the MIT license. See LICENSE file in the samples root for full license information.
 // </copyright>
 
-using System.Runtime.Serialization;
-
 namespace OnlineSales.Plugin.Sms.Exceptions
 {
-    [Serializable]
     public class UnknownCountryCodeException : Exception
     {
         public UnknownCountryCodeException()
@@ -22,10 +19,5 @@ public UnknownCountryCodeException(string? message, Exception? innerException)
             : base(message, innerException)
         {
         }
-
-        protected UnknownCountryCodeException(SerializationInfo info, StreamingContext context)
-            : base(info, context)
-        {
-        }
     }
 }

plugins/OnlineSales.Plugin.Sms/OnlineSales.Plugin.Sms.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>

plugins/OnlineSales.Plugin.TestPlugin/OnlineSales.Plugin.TestPlugin.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>

plugins/OnlineSales.Plugin.Vsto/OnlineSales.Plugin.Vsto.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>

src/OnlineSales/Controllers/ActivityLogController.cs

@@ -33,8 +33,8 @@ public virtual async Task<ActionResult<List<ActivityLogDetailsDto>>> Get([FromQu
         var qp = queryProviderFactory.BuildQueryProvider();
 
         var result = await qp.GetResult();
-        Response.Headers.Add(ResponseHeaderNames.TotalCount, result.TotalCount.ToString());
-        Response.Headers.Add(ResponseHeaderNames.AccessControlExposeHeader, ResponseHeaderNames.TotalCount);
+        Response.Headers.Append(ResponseHeaderNames.TotalCount, result.TotalCount.ToString());
+        Response.Headers.Append(ResponseHeaderNames.AccessControlExposeHeader, ResponseHeaderNames.TotalCount);
         return Ok(mapper.Map<List<ActivityLogDetailsDto>>(result.Records));
     }
 }

src/OnlineSales/Controllers/BaseController.cs

@@ -104,8 +104,8 @@ public virtual async Task<ActionResult<List<TD>>> Get([FromQuery] string? query)
             var qp = queryProviderFactory.BuildQueryProvider();
 
             var result = await qp.GetResult();
-            Response.Headers.Add(ResponseHeaderNames.TotalCount, result.TotalCount.ToString());
-            Response.Headers.Add(ResponseHeaderNames.AccessControlExposeHeader, ResponseHeaderNames.TotalCount);
+            Response.Headers.Append(ResponseHeaderNames.TotalCount, result.TotalCount.ToString());
+            Response.Headers.Append(ResponseHeaderNames.AccessControlExposeHeader, ResponseHeaderNames.TotalCount);
             var res = mapper.Map<List<TD>>(result.Records);
             RemoveSecondLevelObjects(res);
             return Ok(res);
@@ -120,8 +120,8 @@ public virtual async Task<ActionResult<List<TD>>> Export([FromQuery] string? que
             var qp = queryProviderFactory.BuildQueryProvider(int.MaxValue);
 
             var result = await qp.GetResult();
-            Response.Headers.Add(ResponseHeaderNames.TotalCount, result.TotalCount.ToString());
-            Response.Headers.Add(ResponseHeaderNames.AccessControlExposeHeader, ResponseHeaderNames.TotalCount);
+            Response.Headers.Append(ResponseHeaderNames.TotalCount, result.TotalCount.ToString());
+            Response.Headers.Append(ResponseHeaderNames.AccessControlExposeHeader, ResponseHeaderNames.TotalCount);
             var res = mapper.Map<List<TD>>(result.Records);
             RemoveSecondLevelObjects(res);
             return Ok(res);

src/OnlineSales/Controllers/UsersController.cs

@@ -38,8 +38,8 @@ public async Task<ActionResult<UserDetailsDto[]>> GetAll()
     {
         var allUsers = await userManager.Users.ToListAsync();
         var resultsToClient = mapper.Map<UserDetailsDto[]>(allUsers).ToArray();
-        Response.Headers.Add(ResponseHeaderNames.TotalCount, resultsToClient.Count().ToString());
-        Response.Headers.Add(ResponseHeaderNames.AccessControlExposeHeader, ResponseHeaderNames.TotalCount);
+        Response.Headers.Append(ResponseHeaderNames.TotalCount, resultsToClient.Count().ToString());
+        Response.Headers.Append(ResponseHeaderNames.AccessControlExposeHeader, ResponseHeaderNames.TotalCount);
         return Ok(resultsToClient);
     }
 

src/OnlineSales/Data/DataSourceSingleton.cs

@@ -0,0 +1,44 @@
+// <copyright file="DataSourceSingleton.cs" company="WavePoint Co. Ltd.">
+// Licensed under the MIT license. See LICENSE file in the samples root for full license information.
+// </copyright>
+
+using Npgsql;
+using OnlineSales.Configuration;
+
+namespace OnlineSales.Data;
+
+public static class DataSourceSingleton
+{
+    private static readonly object InstanceLock = new object();
+    private static NpgsqlDataSource? instance = null;
+
+    public static NpgsqlDataSource GetInstance(IConfiguration configuration)
+    {
+        if (instance == null)
+        {
+            lock (InstanceLock)
+            {
+                if (instance == null)
+                {
+                    instance = BuildDataSource(configuration);
+                }
+            }
+        }
+
+        return instance;
+    }
+
+    private static NpgsqlDataSource BuildDataSource(IConfiguration configuration)
+    {
+        var postgresConfig = configuration.GetSection("Postgres").Get<PostgresConfig>();
+
+        if (postgresConfig == null)
+        {
+            throw new MissingConfigurationException("Postgres configuration is mandatory.");
+        }
+
+        var dataSourceBuilder = new NpgsqlDataSourceBuilder(postgresConfig.ConnectionString);
+        dataSourceBuilder.EnableDynamicJson();
+        return dataSourceBuilder.Build();
+    }
+}

src/OnlineSales/Data/PgDbContext.cs

@@ -8,7 +8,6 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 using Microsoft.EntityFrameworkCore.Migrations;
-using OnlineSales.Configuration;
 using OnlineSales.DataAnnotations;
 using OnlineSales.Entities;
 using OnlineSales.Helpers;
@@ -208,15 +207,8 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
             Console.WriteLine("Configuring PgDbContext...");
 
-            var postgresConfig = Configuration.GetSection("Postgres").Get<PostgresConfig>();
-
-            if (postgresConfig == null)
-            {
-                throw new MissingConfigurationException("Postgres configuration is mandatory.");
-            }
-
             optionsBuilder.UseNpgsql(
-                postgresConfig.ConnectionString,
+                DataSourceSingleton.GetInstance(Configuration),
                 b => b.MigrationsHistoryTable("_migrations"))
                         .UseSnakeCaseNamingConvention()
                         .ReplaceService<IMigrationsSqlGenerator, CustomSqlServerMigrationsSqlGenerator>();