Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile.builder-base
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.finalresult
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.runtime-base
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion LfMerge.TestApp/LfMerge.TestApp.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks>net10.0</TargetFrameworks>
<OutputType>Exe</OutputType>
<RootNamespace>LfMerge.TestApp</RootNamespace>
<Configurations>Debug;Release</Configurations>
Expand Down
2 changes: 1 addition & 1 deletion docker/scripts/create-installation-tarball.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion environ
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/FixFwData/FixFwData.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks>net10.0</TargetFrameworks>
<OutputType>WinExe</OutputType>
<RootNamespace>FixFwData</RootNamespace>
<Configurations>Debug;Release</Configurations>
Expand Down
6 changes: 3 additions & 3 deletions src/LfMerge.Core.Tests/LfMerge.Core.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks>net10.0</TargetFrameworks>
<RootNamespace>LfMerge.Core.Tests</RootNamespace>
<Configurations>Debug;Release</Configurations>
<Description>LfMerge.Core.Tests</Description>
Expand Down Expand Up @@ -39,8 +39,8 @@ See full changelog at https://github.com/sillsdev/LfMerge/blob/develop/CHANGELOG
<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="6.5.1.25" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
<PackageReference Include="SIL.Chorus.Mercurial" Version="7.*" />
<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" />
Expand Down
2 changes: 1 addition & 1 deletion src/LfMerge.Core/LfMerge.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ See full changelog at https://github.com/sillsdev/LfMerge/blob/develop/CHANGELOG
<PackageReference Include="MongoDB.Driver.Core.signed" Version="2.13.*" />
<PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
<PackageReference Include="SIL.Bugsnag.Signed" Version="2.2.1" />
<PackageReference Include="SIL.Chorus.Mercurial" Version="6.5.1.43" PrivateAssets="All" />
<PackageReference Include="SIL.Chorus.Mercurial" Version="7.*" PrivateAssets="All" />
<PackageReference Include="SIL.Chorus.ChorusMerge" Version="6.0.0-beta0055" GeneratePathProperty="true" />
<PackageReference Include="SIL.ChorusPlugin.LfMergeBridge" Version="4.2.0-beta0028" />
<PackageReference Include="SIL.Chorus.LibChorus" Version="6.0.0-beta0055" />
Expand Down
6 changes: 3 additions & 3 deletions src/LfMerge.Tests/LfMerge.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks>net10.0</TargetFrameworks>
<RootNamespace>LfMerge.Tests</RootNamespace>
<Configurations>Debug;Release</Configurations>
<Description>LfMerge.Tests</Description>
Expand Down Expand Up @@ -36,7 +36,7 @@ See full changelog at https://github.com/sillsdev/LfMerge/blob/develop/CHANGELOG
<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" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/LfMerge/LfMerge.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks>net10.0</TargetFrameworks>
<OutputType>Exe</OutputType>
<RootNamespace>LfMerge</RootNamespace>
<Configurations>Debug;Release</Configurations>
Expand Down
2 changes: 1 addition & 1 deletion src/LfMergeAuxTool/LfMergeAuxTool.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks>net10.0</TargetFrameworks>
<RootNamespace>LfMergeAuxTool</RootNamespace>
<Configurations>Debug;Release</Configurations>
<Description>LfMergeAuxTool</Description>
Expand Down
2 changes: 1 addition & 1 deletion src/LfMergeQueueManager/LfMergeQueueManager.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks>net10.0</TargetFrameworks>
<RootNamespace>LfMerge.QueueManager</RootNamespace>
<Configurations>Debug;Release</Configurations>
<Description>LfMergeQueueManager</Description>
Expand Down
Loading