From b053713730f1643441699cbd09e6eca15c61f7ff Mon Sep 17 00:00:00 2001
From: Gregory Oschwald <goschwald@maxmind.com>
Date: Wed, 15 Nov 2023 09:48:29 -0800
Subject: [PATCH] Do not target .NET 5.0

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

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5f0e2fc..50bb9fb 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -17,20 +17,13 @@ jobs:
         with:
           submodules: true
 
-      - name: Setup dotnet 3.1
+      - name: Setup .NET
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 3.1
-
-      - name: Setup .NET 5.0
-        uses: actions/setup-dotnet@v3
-        with:
-          dotnet-version: 5.0.*
-
-      - name: Setup .NET 6.0
-        uses: actions/setup-dotnet@v3
-        with:
-          dotnet-version: 6.0.*
+          dotnet-version: |
+            3.1.x
+            6.0.x
+            8.0.x
 
       - name: Build
         run: |
@@ -39,7 +32,7 @@ jobs:
               dotnet build MaxMind.Db.Test
 
       - name: Run benchmark
-        run: dotnet run -f netcoreapp3.1 -p MaxMind.Db.Benchmark/MaxMind.Db.Benchmark.csproj
+        run: dotnet run -f net6.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 71f0b61..01ffdac 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;net5.0;net472;netcoreapp3.1</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net6.0;net472</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">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 162cd9d..c1e84c9 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;net5.0;net472;netcoreapp3.1</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net6.0;net472</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">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 61d90cd..eba169f 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;net5.0;netstandard2.1;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>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 acd7c7c..3383f6d 100644
--- a/releasenotes.md
+++ b/releasenotes.md
@@ -1,5 +1,11 @@
 # Release Notes #
 
+## 4.1.0
+
+* .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.
+
 ## 4.0.0 (2022-02-03) ##
 
 * This library no longer targets .NET 4.6.1.