Merge pull request #13 from microting/master

Master changes

Author: masudul-tikweb

.github/workflows/dotnet-core-master.yml

@@ -170,7 +170,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 10.0.x
     - name: Install dependencies
       run: dotnet restore eFormAPI/eFormAPI.sln
     - name: Build

.github/workflows/dotnet-core-pr.yml

@@ -169,7 +169,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 10.0.x
     - name: Install dependencies
       run: dotnet restore eFormAPI/eFormAPI.sln
     - name: Build

Dockerfile

@@ -11,7 +11,7 @@ RUN yarn install
 RUN yarn build
 RUN if [ -n "$SENTRY_AUTH_TOKEN" ] && [ "$DISABLE_SENTRY" != "true" ]; then yarn sentrysourcemap; else echo "Sentry sourcemap upload skipped (DISABLE_SENTRY=$DISABLE_SENTRY)"; fi
 
-FROM mcr.microsoft.com/dotnet/sdk:9.0-noble AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:10.0-noble AS build-env
 WORKDIR /app
 ARG GITVERSION
 ARG DISABLE_SENTRY
@@ -22,7 +22,7 @@ RUN dotnet publish -o out /p:Version=$GITVERSION --runtime linux-x64 --configura
 RUN pwd
 
 # Build runtime image
-FROM mcr.microsoft.com/dotnet/aspnet:9.0-noble
+FROM mcr.microsoft.com/dotnet/aspnet:10.0-noble
 WORKDIR /app
 ARG DISABLE_SENTRY
 ENV DISABLE_SENTRY=${DISABLE_SENTRY}

Dockerfile-big

@@ -5,7 +5,7 @@ COPY eform-client ./
 RUN npm install
 RUN npm run build
 
-FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build-env
 WORKDIR /app
 ARG GITVERSION
 
@@ -15,7 +15,7 @@ RUN dotnet publish -o out /p:Version=$GITVERSION --runtime linux-x64 --configura
 RUN pwd
 
 # Build runtime image
-FROM mcr.microsoft.com/dotnet/aspnet:7.0
+FROM mcr.microsoft.com/dotnet/aspnet:10.0
 WORKDIR /app
 COPY --from=build-env /app/out .
 COPY --from=node-env /app/dist wwwroot

eFormAPI/eFormAPI.Web.Integration.Tests/eFormAPI.Web.Integration.Tests.csproj

@@ -2,12 +2,12 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <IsPublishable>false</IsPublishable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
     <PackageReference Include="NUnit" Version="4.4.0" />
     <PackageReference Include="NUnit.Analyzers" Version="4.11.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

eFormAPI/eFormAPI.Web.Tests/eFormAPI.Web.Tests.csproj

@@ -2,12 +2,12 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <IsPublishable>false</IsPublishable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
     <PackageReference Include="NUnit" Version="4.4.0" />
     <PackageReference Include="NUnit.Analyzers" Version="4.11.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

eFormAPI/eFormAPI.Web/Program.cs

@@ -43,8 +43,8 @@ namespace eFormAPI.Web;
 using Hosting.Helpers;
 using Hosting.Helpers.DbOptions;
 using Hosting.Settings;
-using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -147,9 +147,9 @@ public static void Stop()
 
     // public static ReloadDbConfiguration ReloadDbConfigurationDelegate { get; set; }
 
-    public static async void LoadNavigationMenuEnabledPlugins(IWebHost webHost)
+    public static async void LoadNavigationMenuEnabledPlugins(IHost host)
     {
-        using var scope = webHost.Services.GetService<IServiceScopeFactory>().CreateScope();
+        using var scope = host.Services.GetService<IServiceScopeFactory>().CreateScope();
         BaseDbContext dbContext = null;
         try
         {
@@ -182,9 +182,9 @@ public static async void LoadNavigationMenuEnabledPlugins(IWebHost webHost)
         }
     }
 
-    public static void MigrateDb(IWebHost webHost)
+    public static void MigrateDb(IHost host)
     {
-        using var scope = webHost.Services.GetService<IServiceScopeFactory>().CreateScope();
+        using var scope = host.Services.GetService<IServiceScopeFactory>().CreateScope();
         BaseDbContext dbContext = null;
         try
         {
@@ -274,9 +274,9 @@ public static void MigrateDb(IWebHost webHost)
         }
     }
 
-    private static async Task InitializeSettings(IWebHost webHost, string[] args)
+    private static async Task InitializeSettings(IHost host, string[] args)
     {
-        using var scope = webHost.Services.GetService<IServiceScopeFactory>().CreateScope();
+        using var scope = host.Services.GetService<IServiceScopeFactory>().CreateScope();
         var settingsService = scope.ServiceProvider.GetRequiredService<ISettingsService>();
         var existsResult = settingsService.ConnectionStringExist();
         if(!existsResult.Success)// do need to initialize database
@@ -407,7 +407,7 @@ await SeedAdminHelper.SeedAdmin(adminSetupModel,
         }
     }
 
-    private static IWebHost BuildWebHost(string[] args)
+    private static IHost BuildWebHost(string[] args)
     {
         Console.WriteLine("BuildWebHost");
         // print all args
@@ -480,93 +480,96 @@ private static IWebHost BuildWebHost(string[] args)
         Environment.SetEnvironmentVariable("PROJECT_ID", projectId);
         Console.WriteLine("PROJECT_ID: " + projectId);
 
-        return WebHost.CreateDefaultBuilder(args)
-            .ConfigureKestrel(serverOptions =>
+        return Host.CreateDefaultBuilder(args)
+            .ConfigureWebHostDefaults(webBuilder =>
             {
-                serverOptions.Limits.MaxRequestBodySize = 100 * 1024 * 1024;// 100Mb
-            })
-            .UseUrls($"http://0.0.0.0:{port}")
-            // .UseIISIntegration()
-            .ConfigureAppConfiguration((hostContext, config) =>
-            {
-                Log.LogEvent("Delete all default configuration providers");
-                // delete all default configuration providers
-                config.Sources.Clear();
-                config.SetBasePath(hostContext.HostingEnvironment.ContentRootPath);
-
-                var filePath = Path.Combine(hostContext.HostingEnvironment.ContentRootPath,
-                    "connection.json");
-
-                if (!File.Exists(filePath))
+                webBuilder.ConfigureKestrel(serverOptions =>
                 {
-                    ConnectionStringManager.CreateDefault(filePath);
-                }
-
-                if (!string.IsNullOrEmpty(connectionString))
+                    serverOptions.Limits.MaxRequestBodySize = 100 * 1024 * 1024;// 100Mb
+                })
+                .UseUrls($"http://0.0.0.0:{port}")
+                // .UseIISIntegration()
+                .ConfigureAppConfiguration((hostContext, config) =>
                 {
-                    Log.LogEvent($"Creating ConnectionString file with the ConnectionString: {connectionString}");
-                    ConnectionStringManager.CreateWithConnectionString(filePath, connectionString);
-                }
+                    Log.LogEvent("Delete all default configuration providers");
+                    // delete all default configuration providers
+                    config.Sources.Clear();
+                    config.SetBasePath(hostContext.HostingEnvironment.ContentRootPath);
 
-                config.AddJsonFile("connection.json", optional: true, reloadOnChange: true);
-                var mainSettings = ConnectionStringManager.Read(filePath);
-                _defaultConnectionString = mainSettings?.ConnectionStrings?.DefaultConnection;
-                config.AddEfConfiguration(_defaultConnectionString);
-                EnabledPlugins = PluginHelper.GetPlugins(_defaultConnectionString);
-                DisabledPlugins = PluginHelper.GetDisablePlugins(_defaultConnectionString);
+                    var filePath = Path.Combine(hostContext.HostingEnvironment.ContentRootPath,
+                        "connection.json");
 
-                var contextFactory = new BaseDbContextFactory();
-                if (_defaultConnectionString != "...")
-                {
-                    string pattern = @"Database=(\d+)_Angular;";
-                    Match match = Regex.Match(_defaultConnectionString!, pattern);
+                    if (!File.Exists(filePath))
+                    {
+                        ConnectionStringManager.CreateDefault(filePath);
+                    }
 
-                    if (match.Success)
+                    if (!string.IsNullOrEmpty(connectionString))
                     {
-                        string numberString = match.Groups[1].Value;
-                        int number = int.Parse(numberString);
-                        var disableSentry = Environment.GetEnvironmentVariable("DISABLE_SENTRY");
-                        var sentryDisabled = !string.IsNullOrEmpty(disableSentry) && 
-                                            (disableSentry.ToLower() == "true" || disableSentry == "1");
-                        if (!sentryDisabled)
-                        {
-                            SentrySdk.ConfigureScope(scope =>
-                            {
-                                scope.SetTag("customerNo", number.ToString());
-                                Console.WriteLine("customerNo: " + number);
-                                scope.SetTag("osVersion", Environment.OSVersion.ToString());
-                                Console.WriteLine("osVersion: " + Environment.OSVersion);
-                                scope.SetTag("osArchitecture", RuntimeInformation.OSArchitecture.ToString());
-                                Console.WriteLine("osArchitecture: " + RuntimeInformation.OSArchitecture);
-                                scope.SetTag("osName", RuntimeInformation.OSDescription);
-                                Console.WriteLine("osName: " + RuntimeInformation.OSDescription);
-                            });
-                        }
+                        Log.LogEvent($"Creating ConnectionString file with the ConnectionString: {connectionString}");
+                        ConnectionStringManager.CreateWithConnectionString(filePath, connectionString);
                     }
 
-                    using var dbContext = contextFactory.CreateDbContext([_defaultConnectionString]);
-                    foreach (var plugin in EnabledPlugins)
+                    config.AddJsonFile("connection.json", optional: true, reloadOnChange: true);
+                    var mainSettings = ConnectionStringManager.Read(filePath);
+                    _defaultConnectionString = mainSettings?.ConnectionStrings?.DefaultConnection;
+                    config.AddEfConfiguration(_defaultConnectionString);
+                    EnabledPlugins = PluginHelper.GetPlugins(_defaultConnectionString);
+                    DisabledPlugins = PluginHelper.GetDisablePlugins(_defaultConnectionString);
+
+                    var contextFactory = new BaseDbContextFactory();
+                    if (_defaultConnectionString != "...")
                     {
-                        var pluginEntity = dbContext.EformPlugins
-                            .FirstOrDefault(x => x.PluginId == plugin.PluginId);
+                        string pattern = @"Database=(\d+)_Angular;";
+                        Match match = Regex.Match(_defaultConnectionString!, pattern);
 
-                        if (pluginEntity != null && !string.IsNullOrEmpty(pluginEntity.ConnectionString))
+                        if (match.Success)
                         {
-                            if (_defaultConnectionString.Contains("127.0.0.1"))
+                            string numberString = match.Groups[1].Value;
+                            int number = int.Parse(numberString);
+                            var disableSentry = Environment.GetEnvironmentVariable("DISABLE_SENTRY");
+                            var sentryDisabled = !string.IsNullOrEmpty(disableSentry) && 
+                                                (disableSentry.ToLower() == "true" || disableSentry == "1");
+                            if (!sentryDisabled)
                             {
-                                pluginEntity.ConnectionString = pluginEntity.ConnectionString.Replace(
-                                    "mariadb-cluster-mariadb-galera",
-                                    "127.0.0.1");
+                                SentrySdk.ConfigureScope(scope =>
+                                {
+                                    scope.SetTag("customerNo", number.ToString());
+                                    Console.WriteLine("customerNo: " + number);
+                                    scope.SetTag("osVersion", Environment.OSVersion.ToString());
+                                    Console.WriteLine("osVersion: " + Environment.OSVersion);
+                                    scope.SetTag("osArchitecture", RuntimeInformation.OSArchitecture.ToString());
+                                    Console.WriteLine("osArchitecture: " + RuntimeInformation.OSArchitecture);
+                                    scope.SetTag("osName", RuntimeInformation.OSDescription);
+                                    Console.WriteLine("osName: " + RuntimeInformation.OSDescription);
+                                });
                             }
+                        }
 
-                            plugin.AddPluginConfig(config, pluginEntity.ConnectionString);
+                        using var dbContext = contextFactory.CreateDbContext([_defaultConnectionString]);
+                        foreach (var plugin in EnabledPlugins)
+                        {
+                            var pluginEntity = dbContext.EformPlugins
+                                .FirstOrDefault(x => x.PluginId == plugin.PluginId);
+
+                            if (pluginEntity != null && !string.IsNullOrEmpty(pluginEntity.ConnectionString))
+                            {
+                                if (_defaultConnectionString.Contains("127.0.0.1"))
+                                {
+                                    pluginEntity.ConnectionString = pluginEntity.ConnectionString.Replace(
+                                        "mariadb-cluster-mariadb-galera",
+                                        "127.0.0.1");
+                                }
+
+                                plugin.AddPluginConfig(config, pluginEntity.ConnectionString);
+                            }
                         }
                     }
-                }
 
-                config.AddEnvironmentVariables();
+                    config.AddEnvironmentVariables();
+                })
+                .UseStartup<Startup>();
             })
-            .UseStartup<Startup>()
             .Build();
     }
 }

eFormAPI/eFormAPI.Web/Resources/SharedResource.da.resx

@@ -694,8 +694,6 @@
   </data>
   <data name="PasswordSuccessfullyUpdated" xml:space="preserve">
     <value>Adgangskode opdateret</value>
-  </data><data name="UserNotFound" xml:space="preserve">
-    <value>User with {0} not found</value>
   </data>
     <data name="ForgotPasswordEmailSubject" xml:space="preserve">
       <value>Nulstilling af adgangskode</value>