Merge branch 'update-mercurial-version' into chore/dotnet-build-in-ci

Update Mercurial to version 6
sillsdev · Mar 25, 2024 · 6fa2da2 · 6fa2da2
2 parents 3e6f2f6 + ac548ca
commit 6fa2da2
Show file tree

Hide file tree

Showing 12 changed files with 39 additions and 27 deletions.
diff --git 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
@@ -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
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <RootNamespace>LfMerge.TestApp</RootNamespace>
     <Configurations>Debug;Release</Configurations>

diff --git 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
@@ -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
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <OutputType>WinExe</OutputType>
     <RootNamespace>FixFwData</RootNamespace>
     <Configurations>Debug;Release</Configurations>

diff --git a/src/LfMerge.Core.Tests/LfMerge.Core.Tests.csproj b/src/LfMerge.Core.Tests/LfMerge.Core.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <RootNamespace>LfMerge.Core.Tests</RootNamespace>
     <Configurations>Debug;Release</Configurations>
     <Description>LfMerge.Core.Tests</Description>
@@ -28,23 +28,29 @@ See full changelog at https://github.com/sillsdev/LfMerge/blob/develop/CHANGELOG
     <IsPackable>false</IsPackable>
     <DatabaseVersion Condition="'$(DatabaseVersion)'==''">7000072</DatabaseVersion>
     <DefineConstants>DEBUG;TRACE;DBVERSION_$(DatabaseVersion);</DefineConstants>
+    <TargetDir>$(MSBuildProjectDirectory)\$(OutputPath)</TargetDir>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
     <PackageReference Include="Moq" Version="4.7.0" />
-    <PackageReference Include="NUnit" Version="3.13.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.3.0" />
     <PackageReference Include="NUnitXml.TestLogger" Version="3.0.117" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
-    <PackageReference Include="SIL.Chorus.Mercurial" Version="3.0.1" />
+    <PackageReference Include="SIL.Chorus.Mercurial" Version="6.5.1.25" />
+    <PackageReference Include="SIL.LCModel.Core" Version="11.0.0-beta0077" GeneratePathProperty="true" />
+    <PackageReference Include="SIL.LCModel.Core.Tests" Version="11.0.0-beta0077" />
     <PackageReference Include="icu.net" Version="2.9.1-beta.1" GeneratePathProperty="true" />
-    <PackageReference Include="SIL.LCModel.Core.Tests" Version="10.1.0-beta0382" />
     <PackageReference Include="SIL.ReleaseTasks" Version="2.5.0" PrivateAssets="All" />
-    <PackageReference Include="SIL.TestUtilities" Version="9.0.0" />
+    <PackageReference Include="SIL.TestUtilities" Version="12.0.0" />
   </ItemGroup>
 
   <ItemGroup>
+    <None Include="$(PkgSIL_LCModel_Core)\contentFiles\any\any\SIL.LCModel.Core.dll.config">
+      <Link>SIL.LCModel.Core.dll.config</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="$(Pkgicu_net)\contentFiles\any\any\icu.net.dll.config">
       <Link>icu.net.dll.config</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

diff --git 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
     <DatabaseVersion Condition="'$(DatabaseVersion)'==''">7000072</DatabaseVersion>
     <DefineConstants>DEBUG;TRACE;DBVERSION_$(DatabaseVersion);</DefineConstants>
     <IsPackable>false</IsPackable>
+    <TargetDir>$(MSBuildProjectDirectory)\$(OutputPath)</TargetDir>
   </PropertyGroup>
 
   <ItemGroup>
@@ -40,13 +41,14 @@ See full changelog at https://github.com/sillsdev/LfMerge/blob/develop/CHANGELOG
     <PackageReference Include="MongoDB.Driver.Core.signed" Version="2.14.*" />
     <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
     <PackageReference Include="SIL.Bugsnag.Signed" Version="2.2.1" />
-    <PackageReference Include="SIL.Chorus.Mercurial" Version="3.0.3.6" PrivateAssets="All" />
-    <PackageReference Include="SIL.Chorus.ChorusMerge" Version="5.2.0-beta0002" GeneratePathProperty="true" />
-    <PackageReference Include="icu.net" Version="2.9.1-beta.1" GeneratePathProperty="true" />
-    <PackageReference Include="SIL.ChorusPlugin.LfMergeBridge" Version="3.8.0-beta*" />
-    <PackageReference Include="SIL.Chorus.LibChorus" Version="5.2.0-beta0002" />
+    <PackageReference Include="SIL.Chorus.Mercurial" Version="6.5.1.25" PrivateAssets="All" />
+    <PackageReference Include="SIL.Chorus.ChorusMerge" Version="6.0.0-beta0043" GeneratePathProperty="true" />
+    <PackageReference Include="SIL.ChorusPlugin.LfMergeBridge" Version="4.2.0-beta*" />
+    <PackageReference Include="SIL.Chorus.LibChorus" Version="6.0.0-beta0043" />
     <PackageReference Include="SIL.Core.Desktop" Version="12.0.0" />
     <PackageReference Include="SIL.LCModel" Version="11.0.0-beta0077" />
+    <PackageReference Include="SIL.LCModel.Core" Version="11.0.0-beta0077" GeneratePathProperty="true" />
+    <PackageReference Include="icu.net" Version="2.9.1-beta.1" GeneratePathProperty="true" />
     <PackageReference Include="SIL.ReleaseTasks" Version="2.5.0" PrivateAssets="All" />
     <PackageReference Include="SIL.Lexicon" Version="12.0.0" />
     <PackageReference Include="CommandLineParser" Version="2.7.82" />
@@ -61,6 +63,10 @@ See full changelog at https://github.com/sillsdev/LfMerge/blob/develop/CHANGELOG
       <Link>ChorusMerge.runtimeconfig.json</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="$(PkgSIL_LCModel_Core)\contentFiles\any\any\SIL.LCModel.Core.dll.config">
+      <Link>SIL.LCModel.Core.dll.config</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="$(Pkgicu_net)\contentFiles\any\any\icu.net.dll.config">
       <Link>icu.net.dll.config</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

diff --git a/src/LfMerge.Tests/LfMerge.Tests.csproj b/src/LfMerge.Tests/LfMerge.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <RootNamespace>LfMerge.Tests</RootNamespace>
     <Configurations>Debug;Release</Configurations>
     <Description>LfMerge.Tests</Description>
@@ -32,8 +32,8 @@ See full changelog at https://github.com/sillsdev/LfMerge/blob/develop/CHANGELOG
 
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="NUnit" Version="3.13.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.3.0" />
     <PackageReference Include="NUnitXml.TestLogger" Version="3.0.117" />
     <PackageReference Include="SIL.ReleaseTasks" Version="2.5.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />

diff --git a/src/LfMerge/LfMerge.csproj b/src/LfMerge/LfMerge.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <RootNamespace>LfMerge</RootNamespace>
     <Configurations>Debug;Release</Configurations>

diff --git a/src/LfMergeAuxTool/LfMergeAuxTool.csproj b/src/LfMergeAuxTool/LfMergeAuxTool.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <RootNamespace>LfMergeAuxTool</RootNamespace>
     <Configurations>Debug;Release</Configurations>
     <Description>LfMergeAuxTool</Description>

diff --git a/src/LfMergeQueueManager/LfMergeQueueManager.csproj b/src/LfMergeQueueManager/LfMergeQueueManager.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <RootNamespace>LfMerge.QueueManager</RootNamespace>
     <Configurations>Debug;Release</Configurations>
     <Description>LfMergeQueueManager</Description>