Upgrade to .net 9.0

aimenux · aimenux · commit 25c909cafed8 · 2025-08-14T23:17:11.000+02:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,4 +1,4 @@
-name: .NET 5
+name: .NET
 
 on:
   push:
@@ -12,11 +12,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Setup .NET
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 5.0.x
+        dotnet-version: 9.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build
diff --git a/MemoryCacheNetCore.Tests/InMemoryCacheTests.cs b/MemoryCacheNetCore.Tests/InMemoryCacheTests.cs
@@ -3,7 +3,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace MemoryCacheNetCore.Tests
@@ -16,7 +16,7 @@ public class InMemoryCacheTests
         private const int MoreThanCacheDurationInSeconds = 3;
         private static readonly Random Random = new(Guid.NewGuid().GetHashCode());
 
-        [TestMethod, Timeout(Timeout)]
+        [TestMethod, Timeout(Timeout, CooperativeCancellation = true)]
         public async Task Get_Old_Value_When_Delay_Is_Not_Expired()
         {
             var cache = new InMemoryCache(CacheDurationInSeconds);
@@ -40,7 +40,7 @@ public async Task Get_Old_Value_When_Delay_Is_Not_Expired()
             yy.Should().Be(10);
         }
 
-        [TestMethod, Timeout(Timeout)]
+        [TestMethod, Timeout(Timeout, CooperativeCancellation = true)]
         public async Task Get_New_Value_When_Delay_Is_Expired()
         {
             var cache = new InMemoryCache(CacheDurationInSeconds);
@@ -66,7 +66,7 @@ public async Task Get_New_Value_When_Delay_Is_Expired()
             yy.Should().Be(20);
         }
 
-        [TestMethod, Timeout(Timeout)]
+        [TestMethod, Timeout(Timeout, CooperativeCancellation = true)]
         public async Task Get_New_Value_When_Delay_Is_Not_Expired_And_Cache_Was_Flushed()
         {
             var cache = new InMemoryCache(CacheDurationInSeconds);
@@ -92,7 +92,7 @@ public async Task Get_New_Value_When_Delay_Is_Not_Expired_And_Cache_Was_Flushed(
             yy.Should().Be(20);
         }
 
-        [TestMethod, Timeout(Timeout)]
+        [TestMethod, Timeout(Timeout, CooperativeCancellation = true)]
         public async Task Should_Not_Throw_Exception_When_Cache_Is_Flushed_While_Is_Used_V1()
         {
             try
@@ -105,7 +105,7 @@ public async Task Should_Not_Throw_Exception_When_Cache_Is_Flushed_While_Is_Used
             }
         }
 
-        [TestMethod, Timeout(Timeout)]
+        [TestMethod, Timeout(Timeout, CooperativeCancellation = true)]
         public async Task Should_Not_Throw_Exception_When_Cache_Is_Flushed_While_Is_Used_V2()
         {
             var cache = new InMemoryCache(CacheDurationInSeconds);
@@ -144,7 +144,7 @@ await Task.Run(async () =>
             cache.Size.Should().BeGreaterThan(0);
         }
 
-        [TestMethod, Timeout(Timeout)]
+        [TestMethod, Timeout(Timeout, CooperativeCancellation = true)]
         public async Task Should_Not_Throw_Exception_When_Cache_Is_Flushed_While_Is_Used_V3()
         {
             var cache = new InMemoryCache(CacheDurationInSeconds);
diff --git a/MemoryCacheNetCore.Tests/MemoryCacheNetCore.Tests.csproj b/MemoryCacheNetCore.Tests/MemoryCacheNetCore.Tests.csproj
@@ -1,16 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-
+    <TargetFramework>net9.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="5.10.3" />
+    <PackageReference Include="AwesomeAssertions" Version="9.1.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.2.5" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.2.5" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.10.2" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.10.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/MemoryCacheNetCore/MemoryCacheNetCore.csproj b/MemoryCacheNetCore/MemoryCacheNetCore.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/README.md b/README.md
@@ -13,4 +13,4 @@ In this demo, i m proposing a MemoryCache wrapper in order to :
 > :writing_hand: `Clear Keys/Entries`
 >
 
-**`Tools`** : vs19, net 5.0
+**`Tools`** : net 9.0

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`using System.Collections.Generic;`
`4`	`4`	`using System.Linq;`
`5`	`5`	`using System.Threading.Tasks;`
`6`		`-using FluentAssertions;`
	`6`	`+using AwesomeAssertions;`
`7`	`7`	`using Microsoft.VisualStudio.TestTools.UnitTesting;`
`8`	`8`
`9`	`9`	`namespace MemoryCacheNetCore.Tests`
`@@ -16,7 +16,7 @@ public class InMemoryCacheTests`
`16`	`16`	`private const int MoreThanCacheDurationInSeconds = 3;`
`17`	`17`	`private static readonly Random Random = new(Guid.NewGuid().GetHashCode());`
`18`	`18`
`19`		`- [TestMethod, Timeout(Timeout)]`
	`19`	`+ [TestMethod, Timeout(Timeout, CooperativeCancellation = true)]`
`20`	`20`	`public async Task Get_Old_Value_When_Delay_Is_Not_Expired()`
`21`	`21`	`{`
`22`	`22`	`var cache = new InMemoryCache(CacheDurationInSeconds);`
`@@ -40,7 +40,7 @@ public async Task Get_Old_Value_When_Delay_Is_Not_Expired()`
`40`	`40`	`yy.Should().Be(10);`
`41`	`41`	`}`
`42`	`42`
`43`		`- [TestMethod, Timeout(Timeout)]`
	`43`	`+ [TestMethod, Timeout(Timeout, CooperativeCancellation = true)]`
`44`	`44`	`public async Task Get_New_Value_When_Delay_Is_Expired()`
`45`	`45`	`{`
`46`	`46`	`var cache = new InMemoryCache(CacheDurationInSeconds);`
`@@ -66,7 +66,7 @@ public async Task Get_New_Value_When_Delay_Is_Expired()`
`66`	`66`	`yy.Should().Be(20);`
`67`	`67`	`}`
`68`	`68`
`69`		`- [TestMethod, Timeout(Timeout)]`
	`69`	`+ [TestMethod, Timeout(Timeout, CooperativeCancellation = true)]`
`70`	`70`	`public async Task Get_New_Value_When_Delay_Is_Not_Expired_And_Cache_Was_Flushed()`
`71`	`71`	`{`
`72`	`72`	`var cache = new InMemoryCache(CacheDurationInSeconds);`
`@@ -92,7 +92,7 @@ public async Task Get_New_Value_When_Delay_Is_Not_Expired_And_Cache_Was_Flushed(`
`92`	`92`	`yy.Should().Be(20);`
`93`	`93`	`}`
`94`	`94`
`95`		`- [TestMethod, Timeout(Timeout)]`
	`95`	`+ [TestMethod, Timeout(Timeout, CooperativeCancellation = true)]`
`96`	`96`	`public async Task Should_Not_Throw_Exception_When_Cache_Is_Flushed_While_Is_Used_V1()`
`97`	`97`	`{`
`98`	`98`	`try`
`@@ -105,7 +105,7 @@ public async Task Should_Not_Throw_Exception_When_Cache_Is_Flushed_While_Is_Used`
`105`	`105`	`}`
`106`	`106`	`}`
`107`	`107`
`108`		`- [TestMethod, Timeout(Timeout)]`
	`108`	`+ [TestMethod, Timeout(Timeout, CooperativeCancellation = true)]`
`109`	`109`	`public async Task Should_Not_Throw_Exception_When_Cache_Is_Flushed_While_Is_Used_V2()`
`110`	`110`	`{`
`111`	`111`	`var cache = new InMemoryCache(CacheDurationInSeconds);`
`@@ -144,7 +144,7 @@ await Task.Run(async () =>`
`144`	`144`	`cache.Size.Should().BeGreaterThan(0);`
`145`	`145`	`}`
`146`	`146`
`147`		`- [TestMethod, Timeout(Timeout)]`
	`147`	`+ [TestMethod, Timeout(Timeout, CooperativeCancellation = true)]`
`148`	`148`	`public async Task Should_Not_Throw_Exception_When_Cache_Is_Flushed_While_Is_Used_V3()`
`149`	`149`	`{`
`150`	`150`	`var cache = new InMemoryCache(CacheDurationInSeconds);`
Original file line number	Diff line number	Diff line change
`@@ -13,4 +13,4 @@ In this demo, i m proposing a MemoryCache wrapper in order to :`
`13`	`13`	> :writing_hand: `Clear Keys/Entries`
`14`	`14`	`>`
`15`	`15`
`16`		-`Tools` : vs19, net 5.0
	`16`	+`Tools` : net 9.0