From 31b17a75ea5750d5afbaa226b3e502ca42b67b59 Mon Sep 17 00:00:00 2001 From: Robin Munn Date: Thu, 12 Nov 2026 15:05:20 +0700 Subject: [PATCH] Update to .NET 10 and Mercurial 7.2.4 --- Dockerfile.builder-base | 2 +- Dockerfile.finalresult | 2 +- Dockerfile.runtime-base | 2 +- LfMerge.TestApp/LfMerge.TestApp.csproj | 2 +- docker/scripts/create-installation-tarball.sh | 2 +- environ | 2 +- src/FixFwData/FixFwData.csproj | 2 +- src/LfMerge.Core.Tests/LfMerge.Core.Tests.csproj | 6 +++--- src/LfMerge.Core/LfMerge.Core.csproj | 2 +- src/LfMerge.Tests/LfMerge.Tests.csproj | 6 +++--- src/LfMerge/LfMerge.csproj | 2 +- src/LfMergeAuxTool/LfMergeAuxTool.csproj | 2 +- src/LfMergeQueueManager/LfMergeQueueManager.csproj | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Dockerfile.builder-base b/Dockerfile.builder-base index 59aa2f96..95d0e8a4 100644 --- a/Dockerfile.builder-base +++ b/Dockerfile.builder-base @@ -1,6 +1,6 @@ ARG DbVersion=7000072 -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS lfmerge-builder-base +FROM mcr.microsoft.com/dotnet/sdk:10.0 AS lfmerge-builder-base WORKDIR /build/lfmerge ENV DEBIAN_FRONTEND=noninteractive diff --git a/Dockerfile.finalresult b/Dockerfile.finalresult index a12cb0f8..47ab8867 100644 --- a/Dockerfile.finalresult +++ b/Dockerfile.finalresult @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:experimental ARG DbVersion=7000072 -FROM mcr.microsoft.com/dotnet/runtime:8.0 AS lfmerge-builder-base +FROM mcr.microsoft.com/dotnet/runtime:10.0 AS lfmerge-builder-base # Ensure fieldworks group exists in case lfmerge-fdo package didn't install it, and that www-data is part of that group # Also ensure that www-data has a .local dir in its home directory (/var/www) since some of lfmerge's dependencies assume that $HOME/.local exists diff --git a/Dockerfile.runtime-base b/Dockerfile.runtime-base index 15e62e68..00a434a1 100644 --- a/Dockerfile.runtime-base +++ b/Dockerfile.runtime-base @@ -1,6 +1,6 @@ ARG DbVersion=7000072 -FROM mcr.microsoft.com/dotnet/runtime:8.0 AS lfmerge-builder-base +FROM mcr.microsoft.com/dotnet/runtime:10.0 AS lfmerge-builder-base WORKDIR /build/lfmerge ENV DEBIAN_FRONTEND=noninteractive diff --git a/LfMerge.TestApp/LfMerge.TestApp.csproj b/LfMerge.TestApp/LfMerge.TestApp.csproj index 3340fd07..0815a68e 100644 --- a/LfMerge.TestApp/LfMerge.TestApp.csproj +++ b/LfMerge.TestApp/LfMerge.TestApp.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0 Exe LfMerge.TestApp Debug;Release diff --git a/docker/scripts/create-installation-tarball.sh b/docker/scripts/create-installation-tarball.sh index 556d0995..e6794fe3 100755 --- a/docker/scripts/create-installation-tarball.sh +++ b/docker/scripts/create-installation-tarball.sh @@ -8,7 +8,7 @@ set -e export HOME=/tmp export XDG_CONFIG_HOME=/tmp/.config export BUILD=Release -export FRAMEWORK=net8.0 +export FRAMEWORK=net10.0 export NETSTANDARD=netstandard2.0 export DatabaseVersion=${1:-7000072} diff --git a/environ b/environ index 118ac7c1..8e8283f3 100644 --- a/environ +++ b/environ @@ -4,7 +4,7 @@ # the sourcing script should cd/pushd to the directory containing this script BASE="$(pwd)" -export PATH="${BASE}/output/${BUILD}/net8.0:${BASE}/output/Mercurial:${PATH}" +export PATH="${BASE}/output/${BUILD}/net10.0:${BASE}/output/Mercurial:${PATH}" # set HGRCPATH so that we ignore ~/.hgrc files which might have content that is # incompatible with our version of Mercurial diff --git a/src/FixFwData/FixFwData.csproj b/src/FixFwData/FixFwData.csproj index 0b478392..47cf2186 100644 --- a/src/FixFwData/FixFwData.csproj +++ b/src/FixFwData/FixFwData.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0 WinExe FixFwData Debug;Release diff --git a/src/LfMerge.Core.Tests/LfMerge.Core.Tests.csproj b/src/LfMerge.Core.Tests/LfMerge.Core.Tests.csproj index daa93089..a733cabb 100644 --- a/src/LfMerge.Core.Tests/LfMerge.Core.Tests.csproj +++ b/src/LfMerge.Core.Tests/LfMerge.Core.Tests.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 LfMerge.Core.Tests Debug;Release LfMerge.Core.Tests @@ -39,8 +39,8 @@ See full changelog at https://github.com/sillsdev/LfMerge/blob/develop/CHANGELOG - - + + diff --git a/src/LfMerge.Core/LfMerge.Core.csproj b/src/LfMerge.Core/LfMerge.Core.csproj index 3e60a9da..9a339d24 100644 --- a/src/LfMerge.Core/LfMerge.Core.csproj +++ b/src/LfMerge.Core/LfMerge.Core.csproj @@ -41,7 +41,7 @@ See full changelog at https://github.com/sillsdev/LfMerge/blob/develop/CHANGELOG - + diff --git a/src/LfMerge.Tests/LfMerge.Tests.csproj b/src/LfMerge.Tests/LfMerge.Tests.csproj index 465a5ee8..0e8c9120 100644 --- a/src/LfMerge.Tests/LfMerge.Tests.csproj +++ b/src/LfMerge.Tests/LfMerge.Tests.csproj @@ -1,7 +1,7 @@ - + - net8.0 + net10.0 LfMerge.Tests Debug;Release LfMerge.Tests @@ -36,7 +36,7 @@ See full changelog at https://github.com/sillsdev/LfMerge/blob/develop/CHANGELOG - + diff --git a/src/LfMerge/LfMerge.csproj b/src/LfMerge/LfMerge.csproj index c62602e6..598ae07d 100644 --- a/src/LfMerge/LfMerge.csproj +++ b/src/LfMerge/LfMerge.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0 Exe LfMerge Debug;Release diff --git a/src/LfMergeAuxTool/LfMergeAuxTool.csproj b/src/LfMergeAuxTool/LfMergeAuxTool.csproj index abe23452..9e478ff2 100644 --- a/src/LfMergeAuxTool/LfMergeAuxTool.csproj +++ b/src/LfMergeAuxTool/LfMergeAuxTool.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0 LfMergeAuxTool Debug;Release LfMergeAuxTool diff --git a/src/LfMergeQueueManager/LfMergeQueueManager.csproj b/src/LfMergeQueueManager/LfMergeQueueManager.csproj index 9e63cf41..ab3a116f 100644 --- a/src/LfMergeQueueManager/LfMergeQueueManager.csproj +++ b/src/LfMergeQueueManager/LfMergeQueueManager.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0 LfMerge.QueueManager Debug;Release LfMergeQueueManager