From 1e061d82750f6e39162fe000ca7a13762cbab778 Mon Sep 17 00:00:00 2001
From: Gregory Oschwald <goschwald@maxmind.com>
Date: Wed, 15 Nov 2023 10:18:44 -0800
Subject: [PATCH] Add NET 8.0 and NET 7.0 targets

---
 .github/workflows/test.yml                       | 3 ++-
 MaxMind.Db.Benchmark/MaxMind.Db.Benchmark.csproj | 4 ++--
 MaxMind.Db.Test/MaxMind.Db.Test.csproj           | 4 ++--
 MaxMind.Db/MaxMind.Db.csproj                     | 2 +-
 releasenotes.md                                  | 1 +
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 50bb9fb..afda726 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -23,6 +23,7 @@ jobs:
           dotnet-version: |
             3.1.x
             6.0.x
+            7.0.x
             8.0.x
 
       - name: Build
@@ -32,7 +33,7 @@ jobs:
               dotnet build MaxMind.Db.Test
 
       - name: Run benchmark
-        run: dotnet run -f net6.0 --project MaxMind.Db.Benchmark/MaxMind.Db.Benchmark.csproj
+        run: dotnet run -f net8.0 --project MaxMind.Db.Benchmark/MaxMind.Db.Benchmark.csproj
         env:
           MAXMIND_BENCHMARK_DB: ${{ github.workspace }}/MaxMind.Db.Test/TestData/MaxMind-DB/test-data/GeoIP2-City-Test.mmdb
 
diff --git a/MaxMind.Db.Benchmark/MaxMind.Db.Benchmark.csproj b/MaxMind.Db.Benchmark/MaxMind.Db.Benchmark.csproj
index 01ffdac..d909c0f 100644
--- a/MaxMind.Db.Benchmark/MaxMind.Db.Benchmark.csproj
+++ b/MaxMind.Db.Benchmark/MaxMind.Db.Benchmark.csproj
@@ -3,8 +3,8 @@
   <PropertyGroup>
     <Description>Benchmark project to validate .NET reader for the MaxMind DB file format</Description>
     <VersionPrefix>4.0.0</VersionPrefix>
-    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net6.0;net472</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">net6.0</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net8.0;net7.0;net6.0;net472</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">net8.0;net7.0;net6.0</TargetFrameworks>
     <AssemblyName>MaxMind.Db.Benchmark</AssemblyName>
     <OutputType>Exe</OutputType>
     <PackageId>MaxMind.Db.Benchmark</PackageId>
diff --git a/MaxMind.Db.Test/MaxMind.Db.Test.csproj b/MaxMind.Db.Test/MaxMind.Db.Test.csproj
index c1e84c9..b3858f7 100644
--- a/MaxMind.Db.Test/MaxMind.Db.Test.csproj
+++ b/MaxMind.Db.Test/MaxMind.Db.Test.csproj
@@ -3,8 +3,8 @@
   <PropertyGroup>
     <Description>Test project to validate .NET reader for the MaxMind DB file format</Description>
     <VersionPrefix>4.0.0</VersionPrefix>
-    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net6.0;net472</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">net6.0</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net8.0;net7.0;net6.0;net472</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">net8.0;net7.0;net6.0</TargetFrameworks>
     <AssemblyName>MaxMind.Db.Test</AssemblyName>
     <AssemblyOriginatorKeyFile>../MaxMind.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
diff --git a/MaxMind.Db/MaxMind.Db.csproj b/MaxMind.Db/MaxMind.Db.csproj
index eba169f..721aa9d 100644
--- a/MaxMind.Db/MaxMind.Db.csproj
+++ b/MaxMind.Db/MaxMind.Db.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>.NET reader for the MaxMind DB file format</Description>
     <VersionPrefix>4.0.0</VersionPrefix>
-    <TargetFrameworks>net6.0;netstandard2.1;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net7.0;net6.0;netstandard2.1;netstandard2.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>MaxMind.Db</AssemblyName>
     <AssemblyOriginatorKeyFile>../MaxMind.snk</AssemblyOriginatorKeyFile>
diff --git a/releasenotes.md b/releasenotes.md
index 3383f6d..2435eb0 100644
--- a/releasenotes.md
+++ b/releasenotes.md
@@ -5,6 +5,7 @@
 * .NET 5.0 has been removed as a target as it has reach its end of life.
   However, if you are using .NET 5.0, the .NET Standard 2.1 target should
   continue working for you.
+* .NET 7.0 and .NET 8.0 have been added as a target.
 
 ## 4.0.0 (2022-02-03) ##