.net10 and few fixes

.dockerignore

@@ -1,63 +0,0 @@
-# Build artifacts
-**/bin/
-**/obj/
-**/out/
-**/publish/
-
-# IDE and editor files
-**/.vs/
-**/.vscode/
-**/.idea/
-**/.DS_Store
-**/*.user
-**/*.suo
-**/*.userosscache
-**/*.sln.docstates
-**/*.userprefs
-**/.fleet/
-
-# Database files
-**/*.dbmdl
-**/*.jfm
-**/*.mdf
-**/*.ldf
-
-# Temp and swap files
-**/*.swp
-**/*.swo
-**/*~
-**/*.tmp
-**/*.temp
-
-# Logs
-**/*.log
-
-# Node modules (if any frontend dependencies)
-**/node_modules/
-
-# Git files
-.git/
-.gitignore
-.gitattributes
-.git-crypt/
-
-# Documentation
-README.md
-**/*.md
-LICENSE
-
-# Docker files
-docker-compose.yml
-docker-compose.*.yml
-**/Dockerfile
-**/.dockerignore
-
-# Development databases
-docker/
-
-# Test results
-**/TestResults/
-**/*.trx
-
-# macOS
-.DS_Store

.git-crypt/.gitattributes

@@ -1,4 +0,0 @@
-# Do not edit this file.  To specify the files to encrypt, create your own
-# .gitattributes file in the directory where your files are.
-* !filter !diff
-*.gpg binary

.gitattributes

@@ -1,3 +0,0 @@
-BimAI.API/appsettings.Development.json filter=git-crypt diff=git-crypt
-BimAI.UI.Web/appsettings.Development.json filter=git-crypt diff=git-crypt
-BimAI.UI.Mobile/appsettings.Development.json filter=git-crypt diff=git-crypt

.gitignore

@@ -24,10 +24,6 @@ Generated/
 *.db-shm
 *.db-wal
 
-# Visual Studio Code
-.vscode/
-.vscode/*
-
 # MAUI / Mobile (Xcode/iOS)
 **/bin/
 **/obj/
@@ -86,3 +82,8 @@ nunit-*.xml
 .idea/indexLayout.xml
 .idea/tasks.xml
 .idea/.idea_modules
+
+# VSCode - ignore personal settings but keep shared configs
+.vscode/*
+!.vscode/launch.json
+!.vscode/tasks.json

.vscode/launch.json

@@ -0,0 +1,47 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "API",
+      "type": "coreclr",
+      "request": "launch",
+      "preLaunchTask": "build-api",
+      "program": "${workspaceFolder}/BimAI.API/bin/Debug/net10.0/BimAI.API.dll",
+      "args": [],
+      "cwd": "${workspaceFolder}/BimAI.API",
+      "stopAtEntry": false,
+      "env": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    {
+      "name": "Web",
+      "type": "coreclr",
+      "request": "launch",
+      "preLaunchTask": "build-web",
+      "program": "${workspaceFolder}/BimAI.UI.Web/bin/Debug/net10.0/BimAI.UI.Web.dll",
+      "args": [],
+      "cwd": "${workspaceFolder}/BimAI.UI.Web",
+      "stopAtEntry": false,
+      "serverReadyAction": {
+        "action": "openExternally",
+        "pattern": "\\bNow listening on:\\s+(https?://\\S+)",
+        "uriFormat": "%s"
+      },
+      "env": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "launchBrowser": {
+        "enabled": true,
+        "args": "${auto-detect-url}",
+        "browser": [
+          {
+            "osx": "Google Chrome",
+            "linux": "chrome",
+            "windows": "chrome"
+          }
+        ]
+      }
+    }
+  ]
+}

.vscode/tasks.json

@@ -0,0 +1,77 @@
+{
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "build-api",
+      "command": "dotnet",
+      "type": "process",
+      "args": [
+        "build",
+        "${workspaceFolder}/BimAI.API/BimAI.API.csproj",
+        "/property:GenerateFullPaths=true",
+        "/consoleloggerparameters:NoSummary;ForceNoAlign"
+      ],
+      "problemMatcher": "$msCompile"
+    },
+    {
+      "label": "build-web",
+      "command": "dotnet",
+      "type": "process",
+      "args": [
+        "build",
+        "${workspaceFolder}/BimAI.UI.Web/BimAI.UI.Web.csproj",
+        "/property:GenerateFullPaths=true",
+        "/consoleloggerparameters:NoSummary;ForceNoAlign"
+      ],
+      "problemMatcher": "$msCompile"
+    },
+    {
+      "label": "publish-api",
+      "command": "dotnet",
+      "type": "process",
+      "args": [
+        "publish",
+        "${workspaceFolder}/BimAI.API/BimAI.API.csproj",
+        "/property:GenerateFullPaths=true",
+        "/consoleloggerparameters:NoSummary;ForceNoAlign"
+      ],
+      "problemMatcher": "$msCompile"
+    },
+    {
+      "label": "publish-web",
+      "command": "dotnet",
+      "type": "process",
+      "args": [
+        "publish",
+        "${workspaceFolder}/BimAI.UI.Web/BimAI.UI.Web.csproj",
+        "/property:GenerateFullPaths=true",
+        "/consoleloggerparameters:NoSummary;ForceNoAlign"
+      ],
+      "problemMatcher": "$msCompile"
+    },
+    {
+      "label": "watch-api",
+      "command": "dotnet",
+      "type": "process",
+      "args": [
+        "watch",
+        "run",
+        "--project",
+        "${workspaceFolder}/BimAI.API/BimAI.API.csproj"
+      ],
+      "problemMatcher": "$msCompile"
+    },
+    {
+      "label": "watch-web",
+      "command": "dotnet",
+      "type": "process",
+      "args": [
+        "watch",
+        "run",
+        "--project",
+        "${workspaceFolder}/BimAI.UI.Web/BimAI.UI.Web.csproj"
+      ],
+      "problemMatcher": "$msCompile"
+    }
+  ]
+}

BimAI.API/BimAI.API.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
@@ -11,14 +11,12 @@
     <PackageReference Include="Hangfire.AspNetCore" Version="1.8.21" />
     <PackageReference Include="Hangfire.Core" Version="1.8.21" />
     <PackageReference Include="Hangfire.SqlServer" Version="1.8.21" />
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.17" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.0-rc.1.25451.107">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.17">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.12.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.10" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.0-rc.1.25451.107" />
   </ItemGroup>
 
   <ItemGroup>

BimAI.API/Dockerfile

@@ -1,5 +1,5 @@
 # Stage 1: Build
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
 WORKDIR /src
 
 # Copy solution and all project files for restore
@@ -20,7 +20,7 @@ WORKDIR /src/BimAI.API
 RUN dotnet publish -c Release -o /app/publish --no-restore
 
 # Stage 2: Runtime
-FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS runtime
+FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS runtime
 WORKDIR /app
 
 # Install wget for health checks

BimAI.API/Program.cs

@@ -18,8 +18,6 @@ builder.Services.AddScoped<ProductSyncService>();
 
 builder.Services.AddHttpClient();
 builder.Services.AddControllers();
-builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen();
 
 // Start Hangfire section
 builder.Services.AddHangfire(configuration => configuration
@@ -110,11 +108,6 @@ using (var scope = app.Services.CreateScope())
     }
 }
 
-if (app.Environment.IsDevelopment())
-{
-    app.UseSwagger();
-    app.UseSwaggerUI();
-}
 
 app.UseHttpsRedirection();
 app.UseCors("AllowAll");

BimAI.API/Services/HangfireAuthorizationFilter.cs

@@ -6,20 +6,15 @@ public class HangfireAuthorizationFilter: IDashboardAsyncAuthorizationFilter
 {
     public Task<bool> AuthorizeAsync(DashboardContext context)
     {
-        // just for now
-        // TODO: add auth
-        return Task.FromResult(true);
-        /*
         var httpContext = context.GetHttpContext();
 
         var env = httpContext.RequestServices.GetService<IWebHostEnvironment>();
-        if (env.IsDevelopment())
+        if (env != null && env.IsDevelopment())
         {
             return Task.FromResult(true);
         }
 
-        var isAuthenticated =  httpContext.User.Identity?.IsAuthenticated ?? false;
+        var isAuthenticated = httpContext.User.Identity?.IsAuthenticated ?? false;
         return Task.FromResult(isAuthenticated);
-        */
     }
 }

BimAI.API/appsettings.Production.json

@@ -1,32 +1,19 @@
 {
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning",
-      "Microsoft.EntityFrameworkCore": "Warning"
-    }
-  },
-  "AllowedHosts": "*",
   "ConnectionStrings": {
-    "DefaultConnection": "#{db-connection-string}#",
+    "DefaultConnection": "",
-    "HangfireConnection": "#{hangfire-connection-string}#"
+    "HangfireConnection": ""
   },
   "E5_CRM": {
-    "ApiKey": "#{e5-crm-api-key}#"
+    "ApiKey": ""
   },
   "GoogleAuth": {
-    "ClientId": "#{google-auth-client-id}#"
+    "ClientId": ""
   },
   "JwtSettings": {
-    "SecretKey": "#{jwt-secret-key}#",
+    "SecretKey": ""
-    "Issuer": "#{jwt-issuer}#",
-    "Audience": "#{jwt-audience}#",
-    "ExpiryDays": 7
   },
   "Hangfire": {
-    "ServerName": "#{hangfire-server-name}#",
+    "ServerName": "BimAI-Production"
-    "WorkerCount": 5,
-    "DashboardPath": "/hangfire"
   },
   "Kestrel": {
     "Endpoints": {

BimAI.API/appsettings.json

@@ -0,0 +1,21 @@
+{
+  "AllowedHosts": "*",
+  "JwtSettings": {
+    "Issuer": "BimAI.API",
+    "Audience": "BimAI.Clients",
+    "ExpiryDays": 7
+  },
+  "Hangfire": {
+    "WorkerCount": 5,
+    "DashboardPath": "/hangfire"
+  },
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning",
+      "Microsoft.EntityFrameworkCore": "Warning",
+      "Microsoft.EntityFrameworkCore.Database.Command": "Warning",
+      "Microsoft.EntityFrameworkCore.Infrastructure": "Warning"
+    }
+  }
+}

BimAI.Application/BimAI.Application.csproj

@@ -5,7 +5,7 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

BimAI.Domain/BimAI.Domain.csproj

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

BimAI.Infrastructure/BimAI.Infrastructure.csproj

@@ -6,16 +6,16 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.17" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.0-rc.1.25451.107" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.17" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.0-rc.1.25451.107" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.17">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.0-rc.1.25451.107">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

BimAI.UI.Mobile/BimAI.UI.Mobile.csproj

@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
     <PropertyGroup>
-        <TargetFramework>net8.0-ios</TargetFramework>
+        <TargetFramework>net10.0-ios</TargetFramework>
         <GenerateXcodeProject>true</GenerateXcodeProject>
 
         <!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
-        <!-- <TargetFrameworks>$(TargetFrameworks);net8.0-tizen</TargetFrameworks> -->
+        <!-- <TargetFrameworks>$(TargetFrameworks);net10.0-tizen</TargetFrameworks> -->
 
         <!-- Note for MacCatalyst:
             The default runtime is maccatalyst-x64, except in Release config, in which case the default is maccatalyst-x64;maccatalyst-arm64.
@@ -70,14 +70,14 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.9"/>
+        <PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.0"/>
-        <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.9"/>
+        <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.0"/>
-        <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.9"/>
+        <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0"/>
-        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.9"/>
+        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0"/>
         <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)"/>
         <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)"/>
         <PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="$(MauiVersion)"/>
-        <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1"/>
+        <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.0"/>
         <PackageReference Include="MudBlazor" Version="8.8.0"/>
         <PackageReference Include="ZXing.Net.MAUI" Version="0.4.0"/>
         <PackageReference Include="ZXing.Net.MAUI.Controls" Version="0.4.0"/>

BimAI.UI.Shared/BimAI.UI.Shared.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
@@ -12,10 +12,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.17" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="10.0.0-rc.1.25451.107" />
     <PackageReference Include="MudBlazor" Version="8.8.0" />
-    <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="10.0.0-rc.1.25451.107" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="10.0.0-rc.1.25451.107" />
   </ItemGroup>
 
   <ItemGroup>

BimAI.UI.Web/BimAI.UI.Web.csproj

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

BimAI.UI.Web/Dockerfile

@@ -1,5 +1,5 @@
 # Stage 1: Build
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
 WORKDIR /src
 
 # Copy solution and all project files for restore
@@ -20,7 +20,7 @@ WORKDIR /src/BimAI.UI.Web
 RUN dotnet publish -c Release -o /app/publish --no-restore
 
 # Stage 2: Runtime
-FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS runtime
+FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS runtime
 WORKDIR /app
 
 # Install wget for health checks

BimAI.UI.Web/appsettings.Production.json

@@ -1,16 +1,9 @@
 {
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  },
-  "AllowedHosts": "*",
-  "ApiSettings": {
-    "BaseUrl": "#{api-base-url}#"
-  },
   "GoogleAuth": {
-    "ClientId": "#{google-auth-client-id}#"
+    "ClientId": ""
+  },
+  "ApiSettings": {
+    "BaseUrl": ""
   },
   "Kestrel": {
     "Endpoints": {

BimAI.UI.Web/appsettings.json

@@ -0,0 +1,9 @@
+{
+  "AllowedHosts": "*",
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  }
+}

BimAI.sln

@@ -51,8 +51,6 @@ Global
 		{7ACBFE74-E72C-4033-9172-30512233A518}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7ACBFE74-E72C-4033-9172-30512233A518}.Release|Any CPU.Build.0 = Release|Any CPU
 		{12FB8E56-08C1-47CF-B0FC-4BE9F01F020A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{12FB8E56-08C1-47CF-B0FC-4BE9F01F020A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{12FB8E56-08C1-47CF-B0FC-4BE9F01F020A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{12FB8E56-08C1-47CF-B0FC-4BE9F01F020A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal

docker-compose.yml

@@ -1,57 +0,0 @@
-services:
-  mssql:
-    image: mcr.microsoft.com/mssql/server:2022-latest
-    container_name: bimai-mssql
-    hostname: bimai-mssql
-    environment:
-      - ACCEPT_EULA=Y
-      - SA_PASSWORD=BimAI_Dev_Pass_2024!
-      - MSSQL_PID=Developer
-    ports:
-      - "1433:1433"
-    volumes:
-      - mssql-data:/var/opt/mssql
-      - ./docker/mssql/init:/docker-entrypoint-initdb.d
-    networks:
-      - bimai-network
-    healthcheck:
-      test: /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P "BimAI_Dev_Pass_2024!" -Q "SELECT 1" || exit 1
-      interval: 10s
-      timeout: 3s
-      retries: 10
-      start_period: 10s
-
-  mongodb:
-    image: mongo:7.0
-    container_name: bimai-mongodb
-    hostname: bimai-mongodb
-    environment:
-      - MONGO_INITDB_ROOT_USERNAME=admin
-      - MONGO_INITDB_ROOT_PASSWORD=BimAI_Mongo_2024!
-      - MONGO_INITDB_DATABASE=bimai
-    ports:
-      - "27017:27017"
-    volumes:
-      - mongodb-data:/data/db
-      - mongodb-config:/data/configdb
-      - ./docker/mongodb/init:/docker-entrypoint-initdb.d
-    networks:
-      - bimai-network
-    healthcheck:
-      test: echo 'db.runCommand("ping").ok' | mongosh localhost:27017/test --quiet
-      interval: 10s
-      timeout: 5s
-      retries: 5
-      start_period: 10s
-
-networks:
-  bimai-network:
-    driver: bridge
-
-volumes:
-  mssql-data:
-    name: bimai-mssql-data
-  mongodb-data:
-    name: bimai-mongodb-data
-  mongodb-config:
-    name: bimai-mongodb-config