From b5c2bc07c5d925eefb1ea97324f17dcb64e6c1cd Mon Sep 17 00:00:00 2001
From: LLT21 <>
Date: Wed, 25 Jun 2025 12:15:40 +0200
Subject: [PATCH 1/2] Build correction for appmpower-odbc-pg.dockerfile and
 upgraded versions

---
 .../CSharp/appmpower/appmpower-odbc-my.dockerfile     |  9 ++++++---
 .../CSharp/appmpower/appmpower-odbc-pg.dockerfile     | 11 ++++++-----
 frameworks/CSharp/appmpower/appmpower.dockerfile      |  6 +++---
 .../appmpower/src/appMpower.Orm/appMpower.Orm.csproj  |  7 ++++++-
 .../CSharp/appmpower/src/appMpower/appMpower.csproj   |  7 ++++---
 5 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/frameworks/CSharp/appmpower/appmpower-odbc-my.dockerfile b/frameworks/CSharp/appmpower/appmpower-odbc-my.dockerfile
index 9df17020863..ad6c396e22b 100644
--- a/frameworks/CSharp/appmpower/appmpower-odbc-my.dockerfile
+++ b/frameworks/CSharp/appmpower/appmpower-odbc-my.dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:9.0.100 AS build
+FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
 RUN apt-get update
 RUN apt-get -yqq install clang zlib1g-dev
 RUN apt-get update
@@ -8,7 +8,7 @@ COPY src .
 RUN dotnet publish -c Release -o out /p:Database=mysql
 
 # Construct the actual image that will run
-FROM mcr.microsoft.com/dotnet/aspnet:9.0.0 AS runtime
+FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS runtime
 
 RUN apt-get update
 # The following installs standard versions unixodbc and pgsqlodbc
@@ -18,6 +18,7 @@ RUN apt-get update
 
 WORKDIR /odbc
 
+#TODOGITHUB
 RUN curl -L -o mariadb-connector-odbc-3.1.20-debian-bookworm-amd64.tar.gz https://downloads.mariadb.com/Connectors/odbc/connector-odbc-3.1.20/mariadb-connector-odbc-3.1.20-debian-bookworm-amd64.tar.gz
 RUN tar -xvzf mariadb-connector-odbc-3.1.20-debian-bookworm-amd64.tar.gz
 RUN cp mariadb-connector-odbc-3.1.20-debian-bookworm-amd64/lib/mariadb/libm* /usr/lib/
@@ -45,8 +46,10 @@ WORKDIR /app
 COPY --from=build /app/out ./
 
 RUN cp /usr/lib/libm* /app
-#RUN cp /usr/lib/aarch64-linux-gnu/libodbc* /app
+#TODOGITHUB
 RUN cp /usr/lib/x86_64-linux-gnu/libodbc* /app
+#TODOLOCAL
+#RUN cp /usr/lib/aarch64-linux-gnu/libodbc* /app
 
 EXPOSE 8080
 
diff --git a/frameworks/CSharp/appmpower/appmpower-odbc-pg.dockerfile b/frameworks/CSharp/appmpower/appmpower-odbc-pg.dockerfile
index ebeab3b6186..881c5cecbc3 100644
--- a/frameworks/CSharp/appmpower/appmpower-odbc-pg.dockerfile
+++ b/frameworks/CSharp/appmpower/appmpower-odbc-pg.dockerfile
@@ -1,13 +1,13 @@
-FROM mcr.microsoft.com/dotnet/sdk:9.0.100 AS build
+FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
 RUN apt-get update
-RUN apt-get -yqq install clang zlib1g-dev libkrb5-dev libtinfo5
+RUN apt-get -yqq install clang zlib1g-dev
 
 WORKDIR /app
 COPY src .
 RUN dotnet publish -c Release -o out /p:Database=postgresql
 
 # Construct the actual image that will run
-FROM mcr.microsoft.com/dotnet/aspnet:9.0.0 AS runtime
+FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS runtime
 
 RUN apt-get update
 RUN apt-get install -y unixodbc-dev unixodbc odbc-postgresql
@@ -27,9 +27,10 @@ ENV ASPNETCORE_URLS http://+:8080
 WORKDIR /app
 COPY --from=build /app/out ./
 
-#RUN cp /usr/lib/aarch64-linux-gnu/libodbc* /app
+#TODOGITHUB
 RUN cp /usr/lib/x86_64-linux-gnu/libodbc* /app
-
+#TODOLOCAL
+RUN cp /usr/lib/aarch64-linux-gnu/libodbc* /app
 
 EXPOSE 8080
 
diff --git a/frameworks/CSharp/appmpower/appmpower.dockerfile b/frameworks/CSharp/appmpower/appmpower.dockerfile
index d10a8ad3c2e..6621b6b6deb 100644
--- a/frameworks/CSharp/appmpower/appmpower.dockerfile
+++ b/frameworks/CSharp/appmpower/appmpower.dockerfile
@@ -1,6 +1,6 @@
-FROM mcr.microsoft.com/dotnet/sdk:9.0.100 AS build
+FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
 RUN apt-get update
-RUN apt-get -yqq install clang zlib1g-dev libkrb5-dev libtinfo5
+RUN apt-get -yqq install clang zlib1g-dev
 
 WORKDIR /app
 COPY src .
@@ -8,7 +8,7 @@ COPY src .
 RUN dotnet publish -c Release -o out
 
 # Construct the actual image that will run
-FROM mcr.microsoft.com/dotnet/aspnet:9.0.0 AS runtime
+FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS runtime
 # Full PGO
 ENV DOTNET_TieredPGO 1 
 ENV DOTNET_TC_QuickJitForLoops 1 
diff --git a/frameworks/CSharp/appmpower/src/appMpower.Orm/appMpower.Orm.csproj b/frameworks/CSharp/appmpower/src/appMpower.Orm/appMpower.Orm.csproj
index 858f6f66ae4..23a9b6c47cb 100644
--- a/frameworks/CSharp/appmpower/src/appMpower.Orm/appMpower.Orm.csproj
+++ b/frameworks/CSharp/appmpower/src/appMpower.Orm/appMpower.Orm.csproj
@@ -8,6 +8,7 @@
     <SelfContained>true</SelfContained>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     
+    <!--TODOGITHUB-->
     <RuntimeIdentifier>linux-x64</RuntimeIdentifier> <!-- docker server -->
     <!--TODOLOCAL-->
     <!--<RuntimeIdentifier>linux-arm64</RuntimeIdentifier>--> <!-- docker local -->
@@ -36,7 +37,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Data.Odbc" Version="9.0.0" />
+    <RuntimeHostConfigurationOption Include="System.Threading.ThreadPool.HillClimbing.Disable" Value="true" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Data.Odbc" Version="9.0.6" />
   </ItemGroup>
 
 </Project>
diff --git a/frameworks/CSharp/appmpower/src/appMpower/appMpower.csproj b/frameworks/CSharp/appmpower/src/appMpower/appMpower.csproj
index ba6fe6f7059..5db0aac55f8 100644
--- a/frameworks/CSharp/appmpower/src/appMpower/appMpower.csproj
+++ b/frameworks/CSharp/appmpower/src/appMpower/appMpower.csproj
@@ -9,14 +9,15 @@
   <ItemGroup>
     <None Include="appsettings.json" CopyToOutputDirectory="PreserveNewest" />
 
+    <!--TODOLOCAL-->
     <!--
-    <Content Include="../appMpower.Orm/bin/Release/net8.0/appMpower.Orm.dll">
+    <Content Include="../appMpower.Orm/bin/Release/net9.0/appMpower.Orm.dll">
         <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content> 
     -->
-    <!--TODOLOCAL-->
+    <!--TODOLOCAL AOT-->
     <!--
-    <Content Include="../appMpower.Orm/bin/Release/net8.0/osx-arm64/native/appMpower.Orm.dylib">
+    <Content Include="../appMpower.Orm/bin/Release/net9.0/osx-arm64/native/appMpower.Orm.dylib">
         <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content> 
     -->

From 0ed9c30192e4564beb6f829204b79f2f2b4985c9 Mon Sep 17 00:00:00 2001
From: LLT21 <>
Date: Wed, 25 Jun 2025 12:21:56 +0200
Subject: [PATCH 2/2] appmpower-odbc-pg.dockerfile correction

---
 frameworks/CSharp/appmpower/appmpower-odbc-pg.dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frameworks/CSharp/appmpower/appmpower-odbc-pg.dockerfile b/frameworks/CSharp/appmpower/appmpower-odbc-pg.dockerfile
index 881c5cecbc3..1cf7855dd7f 100644
--- a/frameworks/CSharp/appmpower/appmpower-odbc-pg.dockerfile
+++ b/frameworks/CSharp/appmpower/appmpower-odbc-pg.dockerfile
@@ -30,7 +30,7 @@ COPY --from=build /app/out ./
 #TODOGITHUB
 RUN cp /usr/lib/x86_64-linux-gnu/libodbc* /app
 #TODOLOCAL
-RUN cp /usr/lib/aarch64-linux-gnu/libodbc* /app
+#RUN cp /usr/lib/aarch64-linux-gnu/libodbc* /app
 
 EXPOSE 8080