From 72eb3f76311c358c279c5c7a9194aa1cec0e24c7 Mon Sep 17 00:00:00 2001
From: Stefan Herfert <stefan.herfert@gmx.de>
Date: Fri, 27 Mar 2026 17:37:59 +0100
Subject: [PATCH 1/2] Target frameworks updated, NuGet packages modified, Build
 version incremented

---
 .github/workflows/dotnet.yml                  | 22 ++++-----
 .../DataMatrix.NetCore.csproj                 | 14 +++---
 source/Directory.Build.props                  |  2 +-
 .../Test.DataMatrix.NetCore.csproj            | 46 +++++++++----------
 4 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 5e3342d..09f6547 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -12,14 +12,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 5.0.x
-    - name: Restore dependencies
-      run: dotnet restore source/DataMatrix.NetCore.sln
-    - name: Build
-      run: dotnet build --no-restore source/DataMatrix.NetCore.sln
-    - name: Test
-      run: dotnet test --no-build --verbosity normal source/Test.DataMatrix.NetCore/Test.DataMatrix.NetCore.csproj
+      - uses: actions/checkout@v2
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 8.0.x
+      - name: Restore dependencies
+        run: dotnet restore source/DataMatrix.NetCore.sln
+      - name: Build
+        run: dotnet build --no-restore source/DataMatrix.NetCore.sln
+      - name: Test
+        run: dotnet test --no-build --verbosity normal source/Test.DataMatrix.NetCore/Test.DataMatrix.NetCore.csproj
diff --git a/source/DataMatrix.NetCore/DataMatrix.NetCore.csproj b/source/DataMatrix.NetCore/DataMatrix.NetCore.csproj
index ff74005..8ae5acf 100644
--- a/source/DataMatrix.NetCore/DataMatrix.NetCore.csproj
+++ b/source/DataMatrix.NetCore/DataMatrix.NetCore.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFrameworks>net5.0;netcoreapp3.1;net461;netstandard2.0;netstandard2.1</TargetFrameworks>
-    <PackageId>DataMatrix.NetCore</PackageId>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFrameworks>net8.0;net9.0;net10.0;netstandard2.0;netstandard2.1</TargetFrameworks>
+		<PackageId>DataMatrix.NetCore</PackageId>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="System.Drawing.Common" Version="5.0.2" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="System.Drawing.Common" Version="10.0.5" />
+	</ItemGroup>
 
 </Project>
diff --git a/source/Directory.Build.props b/source/Directory.Build.props
index 485ad6c..47b416f 100644
--- a/source/Directory.Build.props
+++ b/source/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>0.4.2</Version>
+    <Version>0.4.3</Version>
     <Description>Encode and Decode DataMatrix strings and images.</Description>
     <Authors>Scott Downing, Michael Faschinger</Authors>
     <Company>Figz International UG</Company>
diff --git a/source/Test.DataMatrix.NetCore/Test.DataMatrix.NetCore.csproj b/source/Test.DataMatrix.NetCore/Test.DataMatrix.NetCore.csproj
index 14e4454..fbd5ebe 100644
--- a/source/Test.DataMatrix.NetCore/Test.DataMatrix.NetCore.csproj
+++ b/source/Test.DataMatrix.NetCore/Test.DataMatrix.NetCore.csproj
@@ -1,31 +1,31 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFrameworks>net5.0</TargetFrameworks>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFrameworks>net10.0</TargetFrameworks>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <None Remove="Resources\encodedMosaicImg.png" />
-    <None Remove="Resources\gs1DataMatrix1.png" />
-    <None Remove="Resources\gs1DataMatrix2.gif" />
-    <None Remove="Resources\helloWorld.png" />
-  </ItemGroup>
+	<ItemGroup>
+		<None Remove="Resources\encodedMosaicImg.png" />
+		<None Remove="Resources\gs1DataMatrix1.png" />
+		<None Remove="Resources\gs1DataMatrix2.gif" />
+		<None Remove="Resources\helloWorld.png" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\encodedMosaicImg.png" />
-    <EmbeddedResource Include="Resources\gs1DataMatrix1.png" />
-    <EmbeddedResource Include="Resources\gs1DataMatrix2.gif" />
-    <EmbeddedResource Include="Resources\helloWorld.png" />
-  </ItemGroup>
+	<ItemGroup>
+		<EmbeddedResource Include="Resources\encodedMosaicImg.png" />
+		<EmbeddedResource Include="Resources\gs1DataMatrix1.png" />
+		<EmbeddedResource Include="Resources\gs1DataMatrix2.gif" />
+		<EmbeddedResource Include="Resources\helloWorld.png" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
-    <PackageReference Include="NUnit" Version="3.13.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
+		<PackageReference Include="NUnit" Version="4.5.1" />
+		<PackageReference Include="NUnit3TestAdapter" Version="6.2.0" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\DataMatrix.NetCore\DataMatrix.NetCore.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\DataMatrix.NetCore\DataMatrix.NetCore.csproj" />
+	</ItemGroup>
 
 </Project>

From f25f271b3ca2b3743ceb3278b5908b57f3e9cef2 Mon Sep 17 00:00:00 2001
From: Stefan Herfert <stefan.herfert@gmx.de>
Date: Fri, 27 Mar 2026 18:02:42 +0100
Subject: [PATCH 2/2] Put net461 back in

---
 source/DataMatrix.NetCore/DataMatrix.NetCore.csproj | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/source/DataMatrix.NetCore/DataMatrix.NetCore.csproj b/source/DataMatrix.NetCore/DataMatrix.NetCore.csproj
index 8ae5acf..b356c93 100644
--- a/source/DataMatrix.NetCore/DataMatrix.NetCore.csproj
+++ b/source/DataMatrix.NetCore/DataMatrix.NetCore.csproj
@@ -1,11 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net8.0;net9.0;net10.0;netstandard2.0;netstandard2.1</TargetFrameworks>
+		<TargetFrameworks>net8.0;net9.0;net10.0;net461;netstandard2.0;netstandard2.1</TargetFrameworks>
 		<PackageId>DataMatrix.NetCore</PackageId>
 	</PropertyGroup>
 
-	<ItemGroup>
+ <!-- On .NET Framework the System.Drawing types come from the framework assembly
+		 including the NuGet package causes duplicate type errors (System.Drawing vs System.Drawing.Common).
+		 Only reference System.Drawing.Common for non-.NET Framework targets. -->
+	<ItemGroup Condition="'$(TargetFramework)' != 'net461'">
 		<PackageReference Include="System.Drawing.Common" Version="10.0.5" />
 	</ItemGroup>