diff --git a/Dockerfile.builder-base b/Dockerfile.builder-base index 7a32f2e4..59aa2f96 100644 --- a/Dockerfile.builder-base +++ b/Dockerfile.builder-base @@ -1,13 +1,13 @@ ARG DbVersion=7000072 -FROM mcr.microsoft.com/dotnet/sdk:6.0 AS lfmerge-builder-base +FROM mcr.microsoft.com/dotnet/sdk:8.0 AS lfmerge-builder-base WORKDIR /build/lfmerge ENV DEBIAN_FRONTEND=noninteractive ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 # Dependencies from Debian "control" file -RUN apt-get update && apt-get install -y curl sudo iputils-ping cpp python-is-python2 python2-dev pkg-config libicu-dev && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install -y curl sudo iputils-ping cpp python-is-python3 python3-dev pkg-config libicu-dev && rm -rf /var/lib/apt/lists/* # 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 3d1406a7..15e62e68 100644 --- a/Dockerfile.runtime-base +++ b/Dockerfile.runtime-base @@ -1,13 +1,13 @@ ARG DbVersion=7000072 -FROM mcr.microsoft.com/dotnet/runtime:6.0 AS lfmerge-builder-base +FROM mcr.microsoft.com/dotnet/runtime:8.0 AS lfmerge-builder-base WORKDIR /build/lfmerge ENV DEBIAN_FRONTEND=noninteractive ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 # Dependencies from Debian "control" file -RUN apt-get update && apt-get install -y curl sudo iputils-ping cpp python-is-python2 python2-dev pkg-config libicu-dev && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install -y curl sudo iputils-ping cpp python-is-python3 python3-dev pkg-config libicu-dev && rm -rf /var/lib/apt/lists/* # 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/LfMerge.TestApp/LfMerge.TestApp.csproj b/LfMerge.TestApp/LfMerge.TestApp.csproj index f28611ed..3340fd07 100644 --- a/LfMerge.TestApp/LfMerge.TestApp.csproj +++ b/LfMerge.TestApp/LfMerge.TestApp.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 Exe LfMerge.TestApp Debug;Release diff --git a/docker/scripts/create-installation-tarball.sh b/docker/scripts/create-installation-tarball.sh index 900ef90a..4797513a 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=net6.0 +export FRAMEWORK=net8.0 export NETSTANDARD=netstandard2.0 export DatabaseVersion=${1:-7000072} @@ -60,7 +60,7 @@ install -d ${DBDESTDIR}/${LIB}/Mercurial/hgext/largefiles install -d ${DBDESTDIR}/${LIB}/Mercurial/hgext/zeroconf install -d ${DBDESTDIR}/${LIB}/Mercurial/mercurial install -d ${DBDESTDIR}/${LIB}/Mercurial/mercurial/hgweb -install -d ${DBDESTDIR}/${LIB}/Mercurial/mercurial/httpclient +install -d ${DBDESTDIR}/${LIB}/Mercurial/mercurial/httpclient || true install -d ${DBDESTDIR}/${LIB}/MercurialExtensions install -d ${DBDESTDIR}/${LIB}/MercurialExtensions/fixutf8 install -m 755 Mercurial/hg ${DBDESTDIR}/${LIB}/Mercurial @@ -72,7 +72,7 @@ install -m 644 Mercurial/hgext/largefiles/*.* ${DBDESTDIR}/${LIB}/Mercurial/hgex install -m 644 Mercurial/hgext/zeroconf/*.* ${DBDESTDIR}/${LIB}/Mercurial/hgext/zeroconf install -m 644 Mercurial/mercurial/*.* ${DBDESTDIR}/${LIB}/Mercurial/mercurial install -m 644 Mercurial/mercurial/hgweb/*.* ${DBDESTDIR}/${LIB}/Mercurial/mercurial/hgweb -install -m 644 Mercurial/mercurial/httpclient/*.* ${DBDESTDIR}/${LIB}/Mercurial/mercurial/httpclient +install -m 644 Mercurial/mercurial/httpclient/*.* ${DBDESTDIR}/${LIB}/Mercurial/mercurial/httpclient || true install -m 644 MercurialExtensions/fixutf8/*.* ${DBDESTDIR}/${LIB}/MercurialExtensions/fixutf8 install -d ${DBDESTDIR}/${LIB}/runtimes install -d ${DBDESTDIR}/${LIB}/runtimes/linux-x64 diff --git a/environ b/environ index ff77d0ae..118ac7c1 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}/net6.0:${BASE}/output/Mercurial:${PATH}" +export PATH="${BASE}/output/${BUILD}/net8.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 dc77f197..0b478392 100644 --- a/src/FixFwData/FixFwData.csproj +++ b/src/FixFwData/FixFwData.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.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 752abde9..e016ab04 100644 --- a/src/LfMerge.Core.Tests/LfMerge.Core.Tests.csproj +++ b/src/LfMerge.Core.Tests/LfMerge.Core.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 LfMerge.Core.Tests Debug;Release LfMerge.Core.Tests @@ -28,23 +28,29 @@ See full changelog at https://github.com/sillsdev/LfMerge/blob/develop/CHANGELOG false 7000072 DEBUG;TRACE;DBVERSION_$(DatabaseVersion); + $(MSBuildProjectDirectory)\$(OutputPath) - - + + - + + + - - + + + SIL.LCModel.Core.dll.config + PreserveNewest + icu.net.dll.config PreserveNewest diff --git a/src/LfMerge.Core/LfMerge.Core.csproj b/src/LfMerge.Core/LfMerge.Core.csproj index 36af47a2..1e17701e 100644 --- a/src/LfMerge.Core/LfMerge.Core.csproj +++ b/src/LfMerge.Core/LfMerge.Core.csproj @@ -30,6 +30,7 @@ See full changelog at https://github.com/sillsdev/LfMerge/blob/develop/CHANGELOG 7000072 DEBUG;TRACE;DBVERSION_$(DatabaseVersion); false + $(MSBuildProjectDirectory)\$(OutputPath) @@ -40,13 +41,14 @@ See full changelog at https://github.com/sillsdev/LfMerge/blob/develop/CHANGELOG - - - - - + + + + + + @@ -61,6 +63,10 @@ See full changelog at https://github.com/sillsdev/LfMerge/blob/develop/CHANGELOG ChorusMerge.runtimeconfig.json PreserveNewest + + SIL.LCModel.Core.dll.config + PreserveNewest + icu.net.dll.config PreserveNewest diff --git a/src/LfMerge.Tests/LfMerge.Tests.csproj b/src/LfMerge.Tests/LfMerge.Tests.csproj index 39c03086..465a5ee8 100644 --- a/src/LfMerge.Tests/LfMerge.Tests.csproj +++ b/src/LfMerge.Tests/LfMerge.Tests.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 LfMerge.Tests Debug;Release LfMerge.Tests @@ -32,8 +32,8 @@ 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 042e00e8..c62602e6 100644 --- a/src/LfMerge/LfMerge.csproj +++ b/src/LfMerge/LfMerge.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 Exe LfMerge Debug;Release diff --git a/src/LfMergeAuxTool/LfMergeAuxTool.csproj b/src/LfMergeAuxTool/LfMergeAuxTool.csproj index 10e3b05c..abe23452 100644 --- a/src/LfMergeAuxTool/LfMergeAuxTool.csproj +++ b/src/LfMergeAuxTool/LfMergeAuxTool.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 LfMergeAuxTool Debug;Release LfMergeAuxTool diff --git a/src/LfMergeQueueManager/LfMergeQueueManager.csproj b/src/LfMergeQueueManager/LfMergeQueueManager.csproj index 448676e5..9e63cf41 100644 --- a/src/LfMergeQueueManager/LfMergeQueueManager.csproj +++ b/src/LfMergeQueueManager/LfMergeQueueManager.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 LfMerge.QueueManager Debug;Release LfMergeQueueManager