Switch build to use .NET 8.0 instead of 6.0

sillsdev · Mar 5, 2024 · 1f80c15 · 1f80c15
1 parent 92e5cd1
commit 1f80c15
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 11 deletions.
diff --git a/Dockerfile.builder-base b/Dockerfile.builder-base
@@ -1,6 +1,6 @@
 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

diff --git a/Dockerfile.runtime-base b/Dockerfile.runtime-base
@@ -1,6 +1,6 @@
 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

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}

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>

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>

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>