From 7442dae90a0f04ff7cd264c753296fa5977bdfe7 Mon Sep 17 00:00:00 2001
From: Charles Nurse <charlesnurse@gmail.com>
Date: Mon, 18 Nov 2024 11:36:41 -0800
Subject: [PATCH] Update to .NET 9, and update Nuget Packages.  Update version
 to 3.4.0-alpha-01

---
 src/Naif.Core/Naif.Core.csproj               |  8 ++++----
 src/Naif.Core/Naif.Core.nuspec               |  2 +-
 tests/Naif.Core.Tests/Naif.Core.Tests.csproj |  8 ++++----
 tests/Naif.Core.Tests/PagedListTests.cs      | 18 +++++++++---------
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/Naif.Core/Naif.Core.csproj b/src/Naif.Core/Naif.Core.csproj
index 1188429..23a8257 100644
--- a/src/Naif.Core/Naif.Core.csproj
+++ b/src/Naif.Core/Naif.Core.csproj
@@ -2,8 +2,8 @@
 
     <PropertyGroup>
         <TargetFramework>netstandard2.1</TargetFramework>
-        <ProductVersion>3.3.3</ProductVersion>
-        <FileVersion>3.3.3.3</FileVersion>
+        <ProductVersion>3.4.0</ProductVersion>
+        <FileVersion>3.4.0.1</FileVersion>
         <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
         <LangVersion>latestmajor</LangVersion>
         <RepositoryUrl>https://github.com/cnurse/Naif.Core</RepositoryUrl>
@@ -11,8 +11,8 @@
 
     <ItemGroup>
       <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
-      <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
-      <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+      <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0" />
+      <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Naif.Core/Naif.Core.nuspec b/src/Naif.Core/Naif.Core.nuspec
index 7fe61af..1e757da 100644
--- a/src/Naif.Core/Naif.Core.nuspec
+++ b/src/Naif.Core/Naif.Core.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>Naif.Core</id>
-        <version>3.3.3-alpha-04</version>
+        <version>3.4.0-alpha-01</version>
         <authors>Charles Nurse</authors>
         <title>Naif.Core</title>
         <description>This package contains a collection of small helper classes and methods</description>
diff --git a/tests/Naif.Core.Tests/Naif.Core.Tests.csproj b/tests/Naif.Core.Tests/Naif.Core.Tests.csproj
index 6a5c8a1..f89e3dd 100644
--- a/tests/Naif.Core.Tests/Naif.Core.Tests.csproj
+++ b/tests/Naif.Core.Tests/Naif.Core.Tests.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <LangVersion>latestmajor</LangVersion>
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
-      <PackageReference Include="NUnit" Version="3.13.3" />
-      <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
+      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+      <PackageReference Include="NUnit" Version="4.2.2" />
+      <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/tests/Naif.Core.Tests/PagedListTests.cs b/tests/Naif.Core.Tests/PagedListTests.cs
index 2e34630..a059311 100644
--- a/tests/Naif.Core.Tests/PagedListTests.cs
+++ b/tests/Naif.Core.Tests/PagedListTests.cs
@@ -128,7 +128,7 @@ public void PagedList_HasNextPage_Has_Correct_Value_When_Given_Valid_Index(int i
             var pagedList = new PagedList<int>(list, index, Naif.Core.Tests.Common.Constants.PAGE_RecordCount);
 
             //Assert
-            Assert.AreEqual(hasNext, pagedList.HasNextPage);
+            Assert.That(pagedList.HasNextPage, Is.EqualTo(hasNext));
         }
 
         [Test]
@@ -144,7 +144,7 @@ public void PagedList_HasPreviousPage_Has_Correct_Value_When_Given_Valid_Index(i
             var pagedList = new PagedList<int>(list, index, Naif.Core.Tests.Common.Constants.PAGE_RecordCount);
 
             //Assert
-            Assert.AreEqual(hasPrevious, pagedList.HasPreviousPage);
+            Assert.That(pagedList.HasPreviousPage, Is.EqualTo(hasPrevious));
         }
 
         [Test]
@@ -160,7 +160,7 @@ public void PagedList_IsFirstPage_Has_Correct_Value_When_Given_Valid_Index(int i
             var pagedList = new PagedList<int>(list, index, Naif.Core.Tests.Common.Constants.PAGE_RecordCount);
 
             //Assert
-            Assert.AreEqual(isFirst, pagedList.IsFirstPage);
+            Assert.That(pagedList.IsFirstPage, Is.EqualTo(isFirst));
         }
 
         [Test]
@@ -176,7 +176,7 @@ public void PagedList_IsLastPage_Has_Correct_Value_When_Given_Valid_Index(int in
             var pagedList = new PagedList<int>(list, index, Naif.Core.Tests.Common.Constants.PAGE_RecordCount);
 
             //Assert
-            Assert.AreEqual(isLast, pagedList.IsLastPage);
+            Assert.That(pagedList.IsLastPage, Is.EqualTo(isLast));
         }
 
         [Test]
@@ -192,7 +192,7 @@ public void PagedList_Returns_Correct_Page_When_Given_Valid_Index(int index)
             var pagedList = new PagedList<int>(list, index, Naif.Core.Tests.Common.Constants.PAGE_RecordCount);
 
             //Assert
-            Assert.AreEqual(index, pagedList.PageIndex);
+            Assert.That(pagedList.PageIndex, Is.EqualTo(index));
         }
 
         [Test]
@@ -207,7 +207,7 @@ public void PagedList_Returns_Correct_RecordCount_When_Given_Valid_Index(int pag
             var pagedList = new PagedList<int>(list, Naif.Core.Tests.Common.Constants.PAGE_First, pageSize);
 
             //Assert
-            Assert.AreEqual(pageSize, pagedList.PageSize);
+            Assert.That(pagedList.PageSize, Is.EqualTo(pageSize));
         }
 
         [Test]
@@ -226,7 +226,7 @@ public void PagedList_Returns_Correct_Values_When_Given_Valid_Index_And_PageSize
             //Assert
             for (int i = 0; i < pageSize; i++)
             {
-                Assert.AreEqual(index * pageSize + i, pagedList[i]);
+                Assert.That(pagedList[i], Is.EqualTo(index * pageSize + i));
             }
         }
 
@@ -244,7 +244,7 @@ public void PagedList_Sets_Correct_PageCount(int index, int pageSize, int pageCo
             var pagedList = new PagedList<int>(list, index, pageSize);
 
             //Assert
-            Assert.AreEqual(pageCount, pagedList.PageCount);
+            Assert.That(pagedList.PageCount, Is.EqualTo(pageCount));
         }
 
         [Test]
@@ -261,7 +261,7 @@ public void PagedList_Sets_TotalCount_To_Total_Number_Of_Items(int index, int pa
             var pagedList = new PagedList<int>(list, index, pageSize);
 
             //Assert
-            Assert.AreEqual(Naif.Core.Tests.Common.Constants.PAGE_TotalCount, pagedList.TotalCount);
+            Assert.That(pagedList.TotalCount, Is.EqualTo(Naif.Core.Tests.Common.Constants.PAGE_TotalCount));
         }
     }
 }