From 60f1c232fb40625042a85353a49843d8d11b9a4d Mon Sep 17 00:00:00 2001
From: James A Sutherland <j.a.sutherland@dundee.ac.uk>
Date: Thu, 20 Jun 2024 09:36:33 -0500
Subject: [PATCH 1/3] CI on Ubuntu 22.04

---
 .github/workflows/dotnet-core.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml
index 7f1a49b3..7e715920 100644
--- a/.github/workflows/dotnet-core.yml
+++ b/.github/workflows/dotnet-core.yml
@@ -10,7 +10,7 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     services:
       postgres:
         image: postgres:latest

From 4bf69cecebda87e52c47a0a15e15e6b0c7bf1935 Mon Sep 17 00:00:00 2001
From: Ruairidh MacLeod <ruairidh@rkm.dev>
Date: Wed, 17 Jul 2024 14:27:17 +0100
Subject: [PATCH 2/3] test with HIC.Tesseract

---
 Directory.Packages.props                  | 2 +-
 IsIdentifiable/IsIdentifiable.csproj      | 2 +-
 IsIdentifiable/TesseractLinuxLoaderFix.cs | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 349a6ea5..48dc4ad0 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -13,6 +13,7 @@
     <PackageVersion Include="HIC.DicomTypeTranslation" Version="4.1.2" />
     <PackageVersion Include="HIC.FAnsiSql" Version="3.2.5" />
     <PackageVersion Include="HIC.RDMP.Plugin" Version="8.2.0" />
+    <PackageVersion Include="HIC.Tesseract" Version="4.1.1" />
     <PackageVersion Include="IKVM" Version="8.7.1" />
     <PackageVersion Include="Lib.Harmony" Version="2.2.2" />
     <PackageVersion Include="Magick.NET-Q16-AnyCPU" Version="13.9.1" />
@@ -26,7 +27,6 @@
     <PackageVersion Include="System.IO.Abstractions" Version="21.0.26" />
     <PackageVersion Include="System.IO.FileSystem" Version="4.3.0" />
     <PackageVersion Include="Terminal.Gui" Version="1.17.1" />
-    <PackageVersion Include="Tesseract" Version="4.1.1" />
     <PackageVersion Include="YamlDotNet" Version="16.0.0" />
     <!-- Test Packages -->
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
diff --git a/IsIdentifiable/IsIdentifiable.csproj b/IsIdentifiable/IsIdentifiable.csproj
index ef817991..ae94c356 100644
--- a/IsIdentifiable/IsIdentifiable.csproj
+++ b/IsIdentifiable/IsIdentifiable.csproj
@@ -35,6 +35,6 @@
         <PackageReference Include="SixLabors.ImageSharp" />
         <PackageReference Include="System.IO.Abstractions" />
         <PackageReference Include="System.IO.FileSystem" />
-        <PackageReference Include="Tesseract" />
+        <PackageReference Include="HIC.Tesseract" />
     </ItemGroup>
 </Project>
diff --git a/IsIdentifiable/TesseractLinuxLoaderFix.cs b/IsIdentifiable/TesseractLinuxLoaderFix.cs
index f1685e66..b605c737 100644
--- a/IsIdentifiable/TesseractLinuxLoaderFix.cs
+++ b/IsIdentifiable/TesseractLinuxLoaderFix.cs
@@ -1,6 +1,6 @@
-using InteropDotNet;
 using System;
 using System.Runtime.InteropServices;
+using Tesseract;
 
 namespace IsIdentifiable;
 
@@ -16,6 +16,6 @@ public static void Patch()
     {
         // Only apply patch on Linux
         if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
-            LibraryLoader.Instance.CustomSearchPath = $"{AppDomain.CurrentDomain.BaseDirectory}/runtimes";
+            TesseractEnviornment.CustomSearchPath = $"{AppDomain.CurrentDomain.BaseDirectory}/runtimes";
     }
 }

From b3a1fe13db9d5cf8ed4f62bdab7cc93a38a09eaf Mon Sep 17 00:00:00 2001
From: Ruairidh MacLeod <ruairidh@rkm.dev>
Date: Wed, 17 Jul 2024 14:47:43 +0100
Subject: [PATCH 3/3] fixup apt source for u22

---
 .github/workflows/dotnet-core.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml
index 7e715920..43d8fe84 100644
--- a/.github/workflows/dotnet-core.yml
+++ b/.github/workflows/dotnet-core.yml
@@ -48,7 +48,7 @@ jobs:
       - name: Install MS SQL Server
         run: |
           sudo wget -qO/etc/apt/trusted.gpg.d/microsoft.asc https://packages.microsoft.com/keys/microsoft.asc
-          sudo add-apt-repository "$(wget -qO- https://packages.microsoft.com/config/ubuntu/20.04/mssql-server-2022.list)"
+          sudo add-apt-repository "$(wget -qO- https://packages.microsoft.com/config/ubuntu/22.04/mssql-server-2022.list)"
           sudo apt-get install -y --no-install-recommends postgresql mssql-tools mssql-server
           sudo -E /opt/mssql/bin/mssql-conf -n setup accept-eula
       - name: Fetch tessdata