Skip to content

Commit 06443e2

Browse files
author
LLT21
committed
Upgrade to .NET 10.0.1
1 parent b0ad9a3 commit 06443e2

File tree

5 files changed

+18
-13
lines changed

5 files changed

+18
-13
lines changed

frameworks/CSharp/appmpower/appmpower-odbc-my.dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
1+
FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
22
RUN apt-get update
33
RUN apt-get -yqq install clang zlib1g-dev
44
RUN apt-get update
@@ -8,7 +8,7 @@ COPY src .
88
RUN dotnet publish -c Release -o out /p:Database=mysql
99

1010
# Construct the actual image that will run
11-
FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS runtime
11+
FROM mcr.microsoft.com/dotnet/aspnet:10.0.1 AS runtime
1212

1313
RUN apt-get update
1414
# The following installs standard versions unixodbc and pgsqlodbc
@@ -51,6 +51,8 @@ RUN cp /usr/lib/x86_64-linux-gnu/libodbc* /app
5151
#TODOLOCAL
5252
#RUN cp /usr/lib/aarch64-linux-gnu/libodbc* /app
5353

54+
#TEST: ./tfb --test appmpower-odbc-my --type db
55+
5456
EXPOSE 8080
5557

5658
ENTRYPOINT ["./appMpower"]

frameworks/CSharp/appmpower/appmpower-odbc-pg.dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
1+
FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
22
RUN apt-get update
33
RUN apt-get -yqq install clang zlib1g-dev
44

@@ -7,7 +7,7 @@ COPY src .
77
RUN dotnet publish -c Release -o out /p:Database=postgresql
88

99
# Construct the actual image that will run
10-
FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS runtime
10+
FROM mcr.microsoft.com/dotnet/aspnet:10.0.1 AS runtime
1111

1212
RUN apt-get update
1313
RUN apt-get install -y unixodbc-dev unixodbc odbc-postgresql
@@ -32,6 +32,8 @@ RUN cp /usr/lib/x86_64-linux-gnu/libodbc* /app
3232
#TODOLOCAL
3333
#RUN cp /usr/lib/aarch64-linux-gnu/libodbc* /app
3434

35+
#TEST: ./tfb --test appmpower-odbc-pg --type db
36+
3537
EXPOSE 8080
3638

3739
ENTRYPOINT ["./appMpower"]

frameworks/CSharp/appmpower/appmpower.dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
1+
FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
22
RUN apt-get update
33
RUN apt-get -yqq install clang zlib1g-dev
44

@@ -8,7 +8,7 @@ COPY src .
88
RUN dotnet publish -c Release -o out
99

1010
# Construct the actual image that will run
11-
FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS runtime
11+
FROM mcr.microsoft.com/dotnet/aspnet:10.0.1 AS runtime
1212
# Full PGO
1313
ENV DOTNET_TieredPGO 1
1414
ENV DOTNET_TC_QuickJitForLoops 1
@@ -18,6 +18,8 @@ ENV ASPNETCORE_URLS http://+:8080
1818
WORKDIR /app
1919
COPY --from=build /app/out ./
2020

21+
#TEST: ./tfb --test appmpower --type json
22+
2123
EXPOSE 8080
2224

2325
ENTRYPOINT ["./appMpower"]

frameworks/CSharp/appmpower/src/appMpower.Orm/appMpower.Orm.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66

77
<PublishAot>true</PublishAot>
@@ -41,7 +41,7 @@
4141
</ItemGroup>
4242

4343
<ItemGroup>
44-
<PackageReference Include="System.Data.Odbc" Version="9.0.6" />
44+
<PackageReference Include="System.Data.Odbc" Version="10.0.1" />
4545
</ItemGroup>
4646

4747
</Project>

frameworks/CSharp/appmpower/src/appMpower/appMpower.csproj

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<OutputType>Exe</OutputType>
66
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
77
</PropertyGroup>
@@ -11,13 +11,12 @@
1111

1212
<!--TODOLOCAL-->
1313
<!--
14-
<Content Include="../appMpower.Orm/bin/Release/net9.0/appMpower.Orm.dll">
14+
<Content Include="../appMpower.Orm/bin/Release/net10.0/appMpower.Orm.dll">
1515
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
1616
</Content>
1717
-->
18-
<!--TODOLOCAL AOT-->
19-
<!--
20-
<Content Include="../appMpower.Orm/bin/Release/net9.0/osx-arm64/native/appMpower.Orm.dylib">
18+
<!--TODOLOCAL AOT
19+
<Content Include="../appMpower.Orm/bin/Release/net10.0/osx-arm64/native/appMpower.Orm.dylib">
2120
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
2221
</Content>
2322
-->

0 commit comments

Comments
 (0)