From b0599c3ac96ae0b81865fb2d65620761e0c97948 Mon Sep 17 00:00:00 2001
From: "Dr. Christian Geuer-Pollmann" <chgeuer@users.noreply.github.com>
Date: Mon, 15 Apr 2024 18:29:27 +0200
Subject: [PATCH] Updated a bunch of NuGet packages, mostly minor versions.

NUnit 3 -> 4.
---
 src/Aggregator/Aggregator.csproj              |   2 +-
 .../AggregatorFunctionHost.csproj             |   2 +-
 src/Demos/DemoWebApp/DemoWebApp.csproj        |   2 +-
 .../MeteredTimerFunction.csproj               |   2 +-
 .../NotificationFunction.csproj               |   6 +-
 .../ReadEventHubCaptureSample.fsproj          |   2 +-
 .../src/LandingPage/LandingPage.csproj        |  12 +-
 .../src/MeteredPage/MeteredPage.csproj        |   8 +-
 .../Metering.BaseTypes.fsproj                 |   4 +-
 .../Metering.EventHub.csproj                  |   6 +-
 .../Metering.EventHubTypes.fsproj             |   4 +-
 src/Metering.Runtime/Metering.Runtime.fsproj  |  10 +-
 .../Metering.RuntimeCS.csproj                 |   6 +-
 .../Metering.SharedResourceBroker.csproj      |  18 +-
 src/Metering.Tests/BillingUnitTest.fs         | 162 +++++++++---------
 src/Metering.Tests/BusinessLogicTests.fs      |   6 +-
 src/Metering.Tests/Metering.Tests.fsproj      |   8 +-
 src/Metering.Tests/PartitionIdTests.fs        |   2 +-
 src/Metering.Tests/RuntimeUnitTest.fs         |  27 +--
 src/Metering.Tests/SerializationUnitTest.fs   |   8 +-
 src/Metering.Tests/WaterfallUnitTests.fs      |   8 +-
 .../ReplayCaptureForPartition.fsproj          |   3 +
 .../ReprocessLocalEventHubCaptureFiles.fsproj |   5 +-
 23 files changed, 163 insertions(+), 150 deletions(-)

diff --git a/src/Aggregator/Aggregator.csproj b/src/Aggregator/Aggregator.csproj
index dd96f1a..3e288a0 100644
--- a/src/Aggregator/Aggregator.csproj
+++ b/src/Aggregator/Aggregator.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.20.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Metering.EventHub\Metering.EventHub.csproj" />
diff --git a/src/AggregatorFunctionHost/AggregatorFunctionHost.csproj b/src/AggregatorFunctionHost/AggregatorFunctionHost.csproj
index 772f890..c5af297 100644
--- a/src/AggregatorFunctionHost/AggregatorFunctionHost.csproj
+++ b/src/AggregatorFunctionHost/AggregatorFunctionHost.csproj
@@ -7,7 +7,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.2.0" />
+    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.3.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Metering.EventHub\Metering.EventHub.csproj" />
diff --git a/src/Demos/DemoWebApp/DemoWebApp.csproj b/src/Demos/DemoWebApp/DemoWebApp.csproj
index 83905cd..f98de10 100644
--- a/src/Demos/DemoWebApp/DemoWebApp.csproj
+++ b/src/Demos/DemoWebApp/DemoWebApp.csproj
@@ -8,7 +8,7 @@
     <DockerComposeProjectPath>..\..\docker-compose\docker-compose.dcproj</DockerComposeProjectPath>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.20.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Metering.Runtime\Metering.Runtime.fsproj" />
diff --git a/src/Demos/ManagedAppIntegration/src/MeteredTimerFunction/MeteredTimerFunction.csproj b/src/Demos/ManagedAppIntegration/src/MeteredTimerFunction/MeteredTimerFunction.csproj
index 89de2fb..d277bbf 100644
--- a/src/Demos/ManagedAppIntegration/src/MeteredTimerFunction/MeteredTimerFunction.csproj
+++ b/src/Demos/ManagedAppIntegration/src/MeteredTimerFunction/MeteredTimerFunction.csproj
@@ -5,7 +5,7 @@
 	  <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.2.0" />
+    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.3.0" />
   </ItemGroup>
   <ItemGroup>
     <None Update="host.json">
diff --git a/src/Demos/ManagedAppIntegration/src/NotificationFunction/NotificationFunction.csproj b/src/Demos/ManagedAppIntegration/src/NotificationFunction/NotificationFunction.csproj
index 7b876de..edefa19 100644
--- a/src/Demos/ManagedAppIntegration/src/NotificationFunction/NotificationFunction.csproj
+++ b/src/Demos/ManagedAppIntegration/src/NotificationFunction/NotificationFunction.csproj
@@ -4,11 +4,11 @@
     <AzureFunctionsVersion>v4</AzureFunctionsVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.2.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.3.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Metering.BaseTypes\Metering.BaseTypes.fsproj" />
diff --git a/src/Demos/ReadEventHubCaptureSample/ReadEventHubCaptureSample.fsproj b/src/Demos/ReadEventHubCaptureSample/ReadEventHubCaptureSample.fsproj
index febf875..4aac4c4 100644
--- a/src/Demos/ReadEventHubCaptureSample/ReadEventHubCaptureSample.fsproj
+++ b/src/Demos/ReadEventHubCaptureSample/ReadEventHubCaptureSample.fsproj
@@ -5,7 +5,7 @@
     <WarnOn>3390;$(WarnOn)</WarnOn>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="8.0.100" />
+    <PackageReference Update="FSharp.Core" Version="8.0.200" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Metering.Runtime\Metering.Runtime.fsproj" />
diff --git a/src/Demos/SaaSIntegration/src/LandingPage/LandingPage.csproj b/src/Demos/SaaSIntegration/src/LandingPage/LandingPage.csproj
index 1fd10cc..a150c18 100644
--- a/src/Demos/SaaSIntegration/src/LandingPage/LandingPage.csproj
+++ b/src/Demos/SaaSIntegration/src/LandingPage/LandingPage.csproj
@@ -4,11 +4,11 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Marketplace.SaaS.Client" Version="1.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.0" NoWarn="NU1605" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.0" NoWarn="NU1605" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Identity.Web" Version="2.16.0" />
-    <PackageReference Include="Microsoft.Identity.Web.MicrosoftGraph" Version="2.16.0" />
-    <PackageReference Include="Microsoft.Identity.Web.UI" Version="2.16.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.4" NoWarn="NU1605" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.4" NoWarn="NU1605" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Identity.Web" Version="2.17.4" />
+    <PackageReference Include="Microsoft.Identity.Web.MicrosoftGraph" Version="2.17.4" />
+    <PackageReference Include="Microsoft.Identity.Web.UI" Version="2.17.4" />
   </ItemGroup>
 </Project>
diff --git a/src/Demos/SaaSIntegration/src/MeteredPage/MeteredPage.csproj b/src/Demos/SaaSIntegration/src/MeteredPage/MeteredPage.csproj
index ae4743f..ce087a2 100644
--- a/src/Demos/SaaSIntegration/src/MeteredPage/MeteredPage.csproj
+++ b/src/Demos/SaaSIntegration/src/MeteredPage/MeteredPage.csproj
@@ -3,10 +3,10 @@
     <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.0" NoWarn="NU1605" />
-    <PackageReference Include="Microsoft.Identity.Web" Version="2.16.0" />
-    <PackageReference Include="Microsoft.Identity.Web.MicrosoftGraph" Version="2.16.0" />
-    <PackageReference Include="Microsoft.Identity.Web.UI" Version="2.16.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.4" NoWarn="NU1605" />
+    <PackageReference Include="Microsoft.Identity.Web" Version="2.17.4" />
+    <PackageReference Include="Microsoft.Identity.Web.MicrosoftGraph" Version="2.17.4" />
+    <PackageReference Include="Microsoft.Identity.Web.UI" Version="2.17.4" />
     <!--
     <PackageReference Include="Marketplace.SaaS.Client" Version="1.1.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.0" NoWarn="NU1605" />
diff --git a/src/Metering.BaseTypes/Metering.BaseTypes.fsproj b/src/Metering.BaseTypes/Metering.BaseTypes.fsproj
index 7c963af..6ee2098 100644
--- a/src/Metering.BaseTypes/Metering.BaseTypes.fsproj
+++ b/src/Metering.BaseTypes/Metering.BaseTypes.fsproj
@@ -6,11 +6,11 @@
     <WarnOn>3390;$(WarnOn)</WarnOn>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="NodaTime" Version="3.1.10" />
+    <PackageReference Include="NodaTime" Version="3.1.11" />
     <PackageReference Include="Thoth.Json.Net" Version="11.0.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="8.0.100" />
+    <PackageReference Update="FSharp.Core" Version="8.0.200" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Metering.EventHubTypes\Metering.EventHubTypes.fsproj" />
diff --git a/src/Metering.EventHub/Metering.EventHub.csproj b/src/Metering.EventHub/Metering.EventHub.csproj
index 8b3e9dd..b177d51 100644
--- a/src/Metering.EventHub/Metering.EventHub.csproj
+++ b/src/Metering.EventHub/Metering.EventHub.csproj
@@ -6,9 +6,9 @@
   <ItemGroup>
     <PackageReference Include="FSharp.Control.AsyncSeq" Version="3.2.1" />
     <PackageReference Include="System.Reactive.Linq" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
-    <PackageReference Include="Azure.Messaging.EventHubs" Version="5.10.0" />
-    <PackageReference Include="Azure.Messaging.EventHubs.Processor" Version="5.10.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
+    <PackageReference Include="Azure.Messaging.EventHubs" Version="5.11.2" />
+    <PackageReference Include="Azure.Messaging.EventHubs.Processor" Version="5.11.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Metering.EventHubTypes\Metering.EventHubTypes.fsproj" />
diff --git a/src/Metering.EventHubTypes/Metering.EventHubTypes.fsproj b/src/Metering.EventHubTypes/Metering.EventHubTypes.fsproj
index fe4468e..5614f71 100644
--- a/src/Metering.EventHubTypes/Metering.EventHubTypes.fsproj
+++ b/src/Metering.EventHubTypes/Metering.EventHubTypes.fsproj
@@ -4,10 +4,10 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="NodaTime" Version="3.1.10" />
+    <PackageReference Include="NodaTime" Version="3.1.11" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="8.0.100" />
+    <PackageReference Update="FSharp.Core" Version="8.0.200" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="FSharpFuncUtil.fs" />
diff --git a/src/Metering.Runtime/Metering.Runtime.fsproj b/src/Metering.Runtime/Metering.Runtime.fsproj
index 065b225..91e5527 100644
--- a/src/Metering.Runtime/Metering.Runtime.fsproj
+++ b/src/Metering.Runtime/Metering.Runtime.fsproj
@@ -7,19 +7,19 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="FSharp.Control.AsyncSeq" Version="3.2.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
     <PackageReference Include="System.Reactive.Linq" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
     <PackageReference Include="Azure.Identity" Version="1.11.0" />
     <PackageReference Include="Azure.Storage.Blobs" Version="12.19.1" />
-    <PackageReference Include="Azure.Messaging.EventHubs" Version="5.10.0" />
-    <PackageReference Include="Azure.Messaging.EventHubs.Processor" Version="5.10.0" />
+    <PackageReference Include="Azure.Messaging.EventHubs" Version="5.11.2" />
+    <PackageReference Include="Azure.Messaging.EventHubs.Processor" Version="5.11.2" />
     <PackageReference Include="Apache.Avro" Version="1.11.3" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="8.0.100" />
+    <PackageReference Update="FSharp.Core" Version="8.0.200" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Metering.BaseTypes\Metering.BaseTypes.fsproj" />
diff --git a/src/Metering.RuntimeCS/Metering.RuntimeCS.csproj b/src/Metering.RuntimeCS/Metering.RuntimeCS.csproj
index 22fd735..b8d70b2 100644
--- a/src/Metering.RuntimeCS/Metering.RuntimeCS.csproj
+++ b/src/Metering.RuntimeCS/Metering.RuntimeCS.csproj
@@ -7,10 +7,10 @@
   <ItemGroup>
     <PackageReference Include="Azure.Identity" Version="1.11.0" />
     <PackageReference Include="Azure.Storage.Blobs" Version="12.19.1" />
-    <PackageReference Include="Azure.Messaging.EventHubs" Version="5.10.0" />
-    <PackageReference Include="Azure.Messaging.EventHubs.Processor" Version="5.10.0" />
+    <PackageReference Include="Azure.Messaging.EventHubs" Version="5.11.2" />
+    <PackageReference Include="Azure.Messaging.EventHubs.Processor" Version="5.11.2" />
     <PackageReference Include="Apache.Avro" Version="1.11.3" />
-    <PackageReference Include="NodaTime" Version="3.1.10" />
+    <PackageReference Include="NodaTime" Version="3.1.11" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Metering.BaseTypes\Metering.BaseTypes.fsproj" />
diff --git a/src/Metering.SharedResourceBroker/Metering.SharedResourceBroker.csproj b/src/Metering.SharedResourceBroker/Metering.SharedResourceBroker.csproj
index 8a4ccf4..6156411 100644
--- a/src/Metering.SharedResourceBroker/Metering.SharedResourceBroker.csproj
+++ b/src/Metering.SharedResourceBroker/Metering.SharedResourceBroker.csproj
@@ -5,21 +5,21 @@
     <ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.3.0" />
-    <PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.5.0" />
+    <PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.3.1" />
+    <PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.6.0" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="6.0.25" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="6.0.29" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.4" />
     <PackageReference Include="Microsoft.Extensions.Logging.ApplicationInsights" Version="2.22.0" />
     <PackageReference Include="Microsoft.Graph.Communications.Core" Version="1.2.0.7270" />
-    <PackageReference Include="Microsoft.Identity.Web" Version="2.16.0" />
-    <PackageReference Include="Microsoft.Identity.Web.MicrosoftGraph" Version="2.16.0" />
-    <PackageReference Include="Microsoft.Identity.Web.UI" Version="2.16.0" />
+    <PackageReference Include="Microsoft.Identity.Web" Version="2.17.4" />
+    <PackageReference Include="Microsoft.Identity.Web.MicrosoftGraph" Version="2.17.4" />
+    <PackageReference Include="Microsoft.Identity.Web.UI" Version="2.17.4" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
     <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="8.0.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="8.0.1" />
     <PackageReference Include="SimpleBase" Version="4.0.0" />
   </ItemGroup>
   <!-- 
diff --git a/src/Metering.Tests/BillingUnitTest.fs b/src/Metering.Tests/BillingUnitTest.fs
index 274a3b0..43bbf29 100644
--- a/src/Metering.Tests/BillingUnitTest.fs
+++ b/src/Metering.Tests/BillingUnitTest.fs
@@ -21,14 +21,13 @@ type SequenceNumberGenerator() =
 let ``checkSequenceNumberGenerator``() =
     let sg1 = SequenceNumberGenerator()
     let sg2 = SequenceNumberGenerator()
+    Assert.That(sg1.Next(), Is.EqualTo(0L));
+    Assert.That(sg1.Next(), Is.EqualTo(1L));
 
-    Assert.AreEqual(0L, sg1.Next())
-    Assert.AreEqual(1L, sg1.Next())
-
-    Assert.AreEqual(0L, sg2.Next())
-    Assert.AreEqual(1L, sg2.Next())
-    Assert.AreEqual(2L, sg2.Next())
-    Assert.AreEqual(3L, sg2.Next())
+    Assert.That(sg2.Next(), Is.EqualTo(0L));
+    Assert.That(sg2.Next(), Is.EqualTo(1L));
+    Assert.That(sg2.Next(), Is.EqualTo(2L));
+    Assert.That(sg2.Next(), Is.EqualTo(3L));
 
 type TimeGenerator(startTime: string) =
     let mutable now = MeteringDateTime.fromStr startTime
@@ -51,10 +50,11 @@ type TimeGenerator(startTime: string) =
 [<Test>]
 let ``CheckTimeGenerator`` () =
     let tg = TimeGenerator("2023-04-15T00:01:00Z")
-    Assert.AreEqual("2023-04-15T00:01:00Z", tg.Now())
-    Assert.AreEqual("2023-04-15T00:01:01Z", tg.InThisHour())
-    Assert.AreEqual("2023-04-15T00:01:02Z", tg.InThisHour())
-    Assert.AreEqual("2023-04-15T01:00:01Z", tg.NextHour())
+
+    Assert.That(tg.Now(), Is.EqualTo("2023-04-15T00:01:00Z"))
+    Assert.That(tg.InThisHour(), Is.EqualTo("2023-04-15T00:01:01Z"))
+    Assert.That(tg.InThisHour(), Is.EqualTo("2023-04-15T00:01:02Z"))
+    Assert.That(tg.NextHour(), Is.EqualTo("2023-04-15T01:00:01Z"))
 
 [<SetUp>]
 let Setup () = ()
@@ -80,7 +80,7 @@ let ``MeterValue.subtractQuantity``() =
     let now =        "2021-10-28T13:38:00" |> MeteringDateTime.fromStr
     let test (idx, testcase) =
         let result = testcase.State |> SimpleMeterLogic.consume now testcase.Quantity
-        Assert.AreEqual(testcase.Expected, result, sprintf "Failure test case %d" idx)
+        Assert.That(result, Is.EqualTo(testcase.Expected), message = (sprintf "Failure test case %d" idx));
 
     [
         {
@@ -123,7 +123,7 @@ let ``MeterValue.createIncluded``() =
 
     let test (idx, testcase) =
         let result = SimpleMeterLogic.createIncluded now (Quantity.create testcase.Value)
-        Assert.AreEqual(testcase.Expected, result, sprintf "Failure test case %d" idx)
+        Assert.That(result, Is.EqualTo(testcase.Expected), message = (sprintf "Failure test case %d" idx));
 
     [
         {
@@ -140,7 +140,7 @@ let ``Meter.previousBillingIntervalCanBeClosedNewEvent``() =
                 (prev |> MeteringDateTime.fromStr)
                 (curEv |> MeteringDateTime.fromStr)
 
-        Assert.AreEqual(expected, result, sprintf "Failure test case #%d" idx)
+        Assert.That(result, Is.EqualTo(expected), message = (sprintf "Failure test case %d" idx));
 
     [
         ("2021-01-10T11:59:58", "2021-01-10T11:59:59", false) // Even though we're already 10 seconds in the new hour, the given event belongs to the previous hour, so there might be more
@@ -153,28 +153,28 @@ let ``MarketplaceResourceId.equality``() =
     let resourceIdStr1 = "8151a707-467c-4105-df0b-44c3fca5880d"
     let resourceUriStr1 = "/subscriptions/..../resourceGroups/.../providers/Microsoft.SaaS/resources/SaaS Accelerator Test Subscription"
 
-    Assert.AreNotEqual(
-        MarketplaceResourceId.fromResourceID resourceIdStr1,
-        MarketplaceResourceId.fromResourceURI resourceUriStr1)
+    Assert.That(
+        MarketplaceResourceId.fromResourceURI resourceUriStr1,
+        Is.Not.EqualTo(MarketplaceResourceId.fromResourceID resourceIdStr1))
 
-    Assert.AreEqual(
-        MarketplaceResourceId.fromResourceID resourceIdStr1,
-        MarketplaceResourceId.fromStr resourceIdStr1)
+    Assert.That(
+        MarketplaceResourceId.fromStr resourceIdStr1,
+        Is.EqualTo(MarketplaceResourceId.fromResourceID resourceIdStr1))
 
-    Assert.AreEqual(
-        MarketplaceResourceId.fromResourceURI resourceUriStr1,
-        MarketplaceResourceId.fromStr resourceUriStr1)
+    Assert.That(
+        MarketplaceResourceId.fromStr resourceUriStr1,
+        Is.EqualTo(MarketplaceResourceId.fromResourceURI resourceUriStr1))
 
     let x1 = MarketplaceResourceId.fromResourceURI resourceUriStr1
     let x2 = x1.addResourceId resourceIdStr1
 
-    Assert.IsTrue(x1.Matches(x2))
-    Assert.IsTrue(x2.Matches(x1))
+    Assert.That(x1.Matches(x2), Is.True)
+    Assert.That(x2.Matches(x1), Is.True)
 
 [<Test>]
 let ``Quantity.Serialization`` () =
     let test (idx, v) =
-        Assert.AreEqual(v, v |> Json.toStr 1 |> Json.fromStr<Quantity>, sprintf "Failure testc case #%d" idx)
+        Assert.That(v |> Json.toStr 1 |> Json.fromStr<Quantity>, Is.EqualTo(v), message = sprintf "Failure testc case #%d" idx)
 
     [
         Infinite
@@ -187,17 +187,17 @@ let ``Quantity.Math`` () =
     let q : (int -> Quantity) = uint32 >> Quantity.create
     let f : (float -> Quantity) = float >> Quantity.create
 
-    Assert.AreEqual(q 10, (q 3) + (q 7))
-    Assert.AreEqual(q 7, (q 10) - (q 3))
-    Assert.AreEqual(Infinite, Infinite - (q 3))
-    Assert.AreEqual(Infinite, Infinite + (q 3))
+    Assert.That((q 3) + (q 7), Is.EqualTo(q 10))
+    Assert.That((q 10) - (q 3), Is.EqualTo(q 7))
+    Assert.That(Infinite - (q 3), Is.EqualTo(Infinite))
+    Assert.That(Infinite + (q 3), Is.EqualTo(Infinite))
 
-    Assert.AreEqual(f 10.0, (f 3.0) + (f 7.0))
-    Assert.AreEqual(f 7.0, (f 10.0) - (f 3.0))
-    Assert.AreEqual(Infinite, Infinite - (f 3.0))
-    Assert.AreEqual(Infinite, Infinite + (f 3.0))
+    Assert.That((f 3.0) + (f 7.0), Is.EqualTo(f 10.0))
+    Assert.That((f 10.0) - (f 3.0), Is.EqualTo(f 7.0))
+    Assert.That(Infinite - (f 3.0), Is.EqualTo(Infinite))
+    Assert.That(Infinite + (f 3.0), Is.EqualTo(Infinite))
 
-    Assert.AreEqual(f 11.1, (q 3) + (f 8.1))
+    Assert.That((q 3) + (f 8.1), Is.EqualTo(f 11.1))
 
 let partitionId = "2"
 
@@ -293,13 +293,13 @@ let ``MeterCollectionLogic.handleMeteringEvent`` () =
         // Ensures that the given MeterValue is exactly the given quantity
         match mv with
         | IncludedQuantity iq ->
-            Assert.AreEqual(q, iq.RemainingQuantity)
+            Assert.That(iq.RemainingQuantity, Is.EqualTo(q))
         | _ -> failwith "Not an IncludedQuantity"
 
     let overageOf (q: Quantity) (mv: SimpleMeterValue) : unit =
         match mv with
         | ConsumedQuantity cq ->
-            Assert.AreEqual(q, cq.CurrentHour)
+            Assert.That(cq.CurrentHour, Is.EqualTo(q))
         | _ -> failwith "Not an ConsumedQuantity"
 
     let assertUsageReported (marketplaceResourceId: MarketplaceResourceId)  (dimension: string) (timeSlot: string) (quantity: uint) (mc: MeterCollection) : MeterCollection =
@@ -312,7 +312,7 @@ let ``MeterCollectionLogic.handleMeteringEvent`` () =
         |> _.UsageToBeReported
         |> List.filter (fun i -> i.DimensionId = dimension && i.EffectiveStartTime = timeSlot && i.MarketplaceResourceId = marketplaceResourceId && i.Quantity = quantity)
         |> List.length
-        |> (fun length -> Assert.AreEqual(1, length))
+        |> (fun length -> Assert.That(length, Is.EqualTo(1)))
 
         mc
 
@@ -326,7 +326,7 @@ let ``MeterCollectionLogic.handleMeteringEvent`` () =
             |> Seq.sumBy _.Quantity.AsInt
             |> Quantity.create
 
-        Assert.AreEqual(overallquantity, totalToBeSubmitted)
+        Assert.That(totalToBeSubmitted, Is.EqualTo(overallquantity), message = "Overall quantity to be submitted")
 
         mc
 
@@ -347,7 +347,7 @@ let ``MeterCollectionLogic.handleMeteringEvent`` () =
         check (fun m ->
             match m.LastUpdate with
             | None -> Assert.Fail "missing LastUpdate"
-            | Some u -> Assert.AreEqual(sn.Current(), u.SequenceNumber)
+            | Some u -> Assert.That(u.SequenceNumber, Is.EqualTo(sn.Current()))
         )
 
     let inspectJson (header: string) (a: 'a) : 'a =
@@ -365,8 +365,8 @@ let ``MeterCollectionLogic.handleMeteringEvent`` () =
     |> handle (createSubsc (sn.Next()) "2021-11-29T17:04:00Z" (subCreation sub1 "2021-11-29T17:00:00Z"))
     |> ensureSequenceNumberHasBeenApplied
     // ... all meters should be at their original levels
-    |> check (fun m -> Assert.AreEqual(1, m.Meters.Length))
-    |> check (fun m -> Assert.IsTrue(m |> MeterCollection.contains sub1))
+    |> check (fun m -> Assert.That(m.Meters.Length, Is.EqualTo(1)))
+    |> check (fun m -> Assert.That(m |> MeterCollection.contains sub1, Is.True))
     |> assertIncluded      sub1 "dimension1" (Quantity.create 1000u)
     |> assertIncluded      sub1 "dimension2" Quantity.Infinite
     // Up until now, there should nothing to be reported.
@@ -408,7 +408,7 @@ let ``MeterCollectionLogic.handleMeteringEvent`` () =
     |> handle (createSubsc (sn.Next()) "2021-11-29T19:04:00Z" (subCreation sub2 "2021-11-29T18:58:00Z"))
     |> ensureSequenceNumberHasBeenApplied
     // Now we should have 2 subsriptions
-    |> check (fun m -> Assert.AreEqual(2, m.Meters.Length))
+    |> check (fun m -> Assert.That(m.Meters.Length, Is.EqualTo(2)))
     // Submit usage to sub1 and then an hour later to sub2
     |> newusage            sub1 "2021-11-29T21:00:03Z" 1u "d1"
     |> newusage            sub2 "2021-11-29T22:00:03Z" 1u "d1"
@@ -475,28 +475,28 @@ let ``Quantity.Comparison``() =
     let fiveFloat = Quantity.create 5.0
     let tenFloat = Quantity.create 10.0
 
-    Assert.AreEqual(fiveFloat, fiveInt)
-    Assert.AreEqual(tenFloat, tenInt)
+    Assert.That(fiveFloat, Is.EqualTo(fiveInt))
+    Assert.That(tenInt, Is.EqualTo(tenFloat))
 
-    Assert.IsTrue(fiveFloat < tenFloat)
-    Assert.IsTrue(fiveInt < tenFloat)
-    Assert.IsTrue(fiveFloat < tenInt)
-    Assert.IsTrue(fiveInt < tenInt)
+    Assert.That(fiveFloat < tenFloat, Is.True)
+    Assert.That(fiveInt < tenFloat, Is.True)
+    Assert.That(fiveFloat < tenInt, Is.True)
+    Assert.That(fiveInt < tenInt, Is.True)
 
-    Assert.IsTrue(tenFloat > fiveFloat)
-    Assert.IsTrue(tenFloat > fiveInt)
-    Assert.IsTrue(tenInt > fiveFloat)
-    Assert.IsTrue(tenInt > fiveInt)
+    Assert.That(tenFloat > fiveFloat, Is.True)
+    Assert.That(tenFloat > fiveInt, Is.True)
+    Assert.That(tenInt > fiveFloat, Is.True)
+    Assert.That(tenInt > fiveInt, Is.True)
 
-    Assert.IsTrue(fiveFloat <= tenFloat)
-    Assert.IsTrue(fiveInt <= tenFloat)
-    Assert.IsTrue(fiveFloat <= tenInt)
-    Assert.IsTrue(fiveInt <= tenInt)
+    Assert.That(fiveFloat <= tenFloat, Is.True)
+    Assert.That(fiveInt <= tenFloat, Is.True)
+    Assert.That(fiveFloat <= tenInt, Is.True)
+    Assert.That(fiveInt <= tenInt, Is.True)
 
-    Assert.IsTrue(tenFloat >= fiveFloat)
-    Assert.IsTrue(tenFloat >= fiveInt)
-    Assert.IsTrue(tenInt >= fiveFloat)
-    Assert.IsTrue(tenInt >= fiveInt)
+    Assert.That(tenFloat >= fiveFloat, Is.True)
+    Assert.That(tenFloat >= fiveInt, Is.True)
+    Assert.That(tenInt >= fiveFloat, Is.True)
+    Assert.That(tenInt >= fiveInt, Is.True)
 
 [<Test>]
 let ``CaptureProcessor.isRelevantBlob`` () =
@@ -506,21 +506,25 @@ let ``CaptureProcessor.isRelevantBlob`` () =
             (EventHubName.create "meteringhack-standard" "hub2",  (PartitionID.create "0"))
             blobName
 
-    Assert.IsTrue(isRelevant
-        "meteringhack-standard/hub2/p0--2021-12-08--15-17-12.avro"
-        (MeteringDateTime.create 2021 12 08 15 17 12))
+    Assert.That(
+        isRelevant
+            "meteringhack-standard/hub2/p0--2021-12-08--15-17-12.avro"
+            (MeteringDateTime.create 2021 12 08 15 17 12),
+        Is.True)
 
-    Assert.IsFalse(isRelevant
-        "meteringhack-standard/hub2/p0--2021-12-08--15-17-12.avro"
-        (MeteringDateTime.create 2021 12 08 15 17 13))
+    Assert.That(
+        isRelevant
+            "meteringhack-standard/hub2/p0--2021-12-08--15-17-12.avro"
+            (MeteringDateTime.create 2021 12 08 15 17 13),
+        Is.False)
 
 [<Test>]
 let ``CaptureProcessor.getPrefixForRelevantBlobs`` () =
     let ehContext = (EventHubName.create "meteringhack-standard" "hub2", (PartitionID.create "0"))
 
-    Assert.AreEqual(
-        "meteringhack-standard/hub2/p0--",
-        CaptureProcessor.getPrefixForRelevantBlobs "{Namespace}/{EventHub}/p{PartitionId}--{Year}-{Month}-{Day}--{Hour}-{Minute}-{Second}" ehContext)
+    Assert.That(
+        CaptureProcessor.getPrefixForRelevantBlobs "{Namespace}/{EventHub}/p{PartitionId}--{Year}-{Month}-{Day}--{Hour}-{Minute}-{Second}" ehContext,
+        Is.EqualTo("meteringhack-standard/hub2/p0--"))
 
 module E =
     open System.Collections.Generic
@@ -549,11 +553,11 @@ let ``MarketplaceResourceId.Equal`` () =
     let u = MarketplaceResourceId.fromResourceURI "/subscriptions/..../resourceGroups/.../providers/Microsoft.SaaS/resources/SaaS Accelerator Test Subscription"
     let ui = MarketplaceResourceId.from "/subscriptions/..../resourceGroups/.../providers/Microsoft.SaaS/resources/SaaS Accelerator Test Subscription" "8151a707-467c-4105-df0b-44c3fca5880d"
 
-    Assert.IsTrue(ui.Matches(u))
-    Assert.IsTrue(u.Matches(ui))
-    Assert.IsTrue(i.Matches(ui))
-    Assert.IsTrue(ui.Matches(i))
-    Assert.IsFalse(u.Matches(i))
+    Assert.That(ui.Matches(u), Is.True)
+    Assert.That(u.Matches(ui), Is.True)
+    Assert.That(i.Matches(ui), Is.True)
+    Assert.That(ui.Matches(i), Is.True)
+    Assert.That(u.Matches(i), Is.False)
 
 [<Test>]
 let ``Meter.handleUnsuccessfulMeterSubmission.Expired``() =
@@ -598,11 +602,11 @@ let ``Meter.handleUnsuccessfulMeterSubmission.Expired``() =
             | Some x ->
                 match x with
                 | IncludedQuantity iq -> ()
-                | ConsumedQuantity cq -> Assert.AreEqual(m, cq.CurrentHour)
+                | ConsumedQuantity cq -> Assert.That(cq.CurrentHour, Is.EqualTo(m))
         | WaterfallBillingDimension wbd ->
             match wbd.Meter with
             | None -> ()
-            | Some x -> Assert.AreEqual(m, x.Total)
+            | Some x -> Assert.That(x.Total, Is.EqualTo(m))
 
     let assertUsageToBeReported (expected: bool) expectedRequest (meterCollection: MeterCollection) : MeterCollection =
         let containsElement =
@@ -610,7 +614,7 @@ let ``Meter.handleUnsuccessfulMeterSubmission.Expired``() =
             |> MeterCollectionLogic.usagesToBeReported
             |> List.contains expectedRequest
 
-        Assert.AreEqual(expected, containsElement)
+        Assert.That(containsElement, Is.EqualTo(expected))
 
         meterCollection
 
@@ -725,7 +729,7 @@ let ``RenewalInterval.check``() =
             |> Subscription.areDifferentBillingCycles
                 (MeteringDateTime.fromStr testcase.LastEvent)
                 (MeteringDateTime.fromStr testcase.Now)
-        Assert.AreEqual(testcase.NewIntervalStarted, result, sprintf "Failure test case %d: %A" idx testcase)
+        Assert.That(result, Is.EqualTo(testcase.NewIntervalStarted), message = sprintf "Failure test case %d: %A" idx testcase)
 
     [
         { SubscriptionStarted = "2023-04-15T13:18:00Z"; LastEvent = "2023-05-14T23:23:58Z"; Now = "2023-05-14T23:23:59Z"; NewIntervalStarted = false; Interval = RenewalInterval.Monthly }
diff --git a/src/Metering.Tests/BusinessLogicTests.fs b/src/Metering.Tests/BusinessLogicTests.fs
index 131372a..7cad9b4 100644
--- a/src/Metering.Tests/BusinessLogicTests.fs
+++ b/src/Metering.Tests/BusinessLogicTests.fs
@@ -91,7 +91,7 @@ let ``Comparator works`` () =
         newState "2"
     ]
 
-    Assert.IsTrue((l = List.sort l)) // Ensure the list is already sorted
+    Assert.That((l = List.sort l), Is.True) // Ensure the list is already sorted
 
 let getEvents (files: TestFile seq) = files |> Seq.choose (function | Event e -> Some e | _ -> None)
 
@@ -140,7 +140,7 @@ let private checkFolder folder =
         let actualState = MeterCollectionLogic.handleMeteringEvent initialState event
 
         try
-            Assert.AreEqual(expectedState, actualState)
+            Assert.That(actualState, Is.EqualTo(expectedState))
         with :? Exception ->
             // When the comparison fails, we write the actual state into a file for better inspection
             writeCalculatedState folder (event.MessagePosition.SequenceNumber) actualState
@@ -174,7 +174,7 @@ let private checkOneState folder (initialStateNumber: SequenceNumber) =
     let calculatedTargetState = MeterCollectionLogic.handleMeteringEvent initialState eventMessage
 
     try
-        Assert.AreEqual(expectedTargetState, calculatedTargetState)
+        Assert.That(calculatedTargetState, Is.EqualTo(expectedTargetState))
     with :? Exception ->
         // When the comparison fails, we write the actual state into a file for better inspection
         writeCalculatedState folder (initialStateNumber + 1L) calculatedTargetState
diff --git a/src/Metering.Tests/Metering.Tests.fsproj b/src/Metering.Tests/Metering.Tests.fsproj
index 0888668..d6559fa 100644
--- a/src/Metering.Tests/Metering.Tests.fsproj
+++ b/src/Metering.Tests/Metering.Tests.fsproj
@@ -6,16 +6,16 @@
     <GenerateProgramFile>false</GenerateProgramFile>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="NUnit" Version="3.14.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="NUnit" Version="4.1.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="8.0.100" />
+    <PackageReference Update="FSharp.Core" Version="8.0.200" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Metering.RuntimeCS\Metering.RuntimeCS.csproj" />
diff --git a/src/Metering.Tests/PartitionIdTests.fs b/src/Metering.Tests/PartitionIdTests.fs
index 145780e..5bb8e3a 100644
--- a/src/Metering.Tests/PartitionIdTests.fs
+++ b/src/Metering.Tests/PartitionIdTests.fs
@@ -9,7 +9,7 @@ open Metering.RuntimeCS
 [<Test>]
 let ``PartitionID tests`` () =
     let test ((partitionId,partitionCount,partitionKey) : int16*int16*string) =
-        Assert.AreEqual(partitionId, PartitionIDHashExtensions.DeterminePartitionId(partitionKey, partitionCount))
+        Assert.That(PartitionIDHashExtensions.DeterminePartitionId(partitionKey, partitionCount), Is.EqualTo(partitionId))
 
     [
         (0s, 1s, "00000000-0000-0101-9A83-DEADDEADBEEF")
diff --git a/src/Metering.Tests/RuntimeUnitTest.fs b/src/Metering.Tests/RuntimeUnitTest.fs
index 0c416e1..90ea124 100644
--- a/src/Metering.Tests/RuntimeUnitTest.fs
+++ b/src/Metering.Tests/RuntimeUnitTest.fs
@@ -20,41 +20,44 @@ let ``checkGenerateSnapshot``() =
 
     let time sequenceNr dateTimeStr = MessagePosition.create "0" sequenceNr (MeteringDateTime.fromStr dateTimeStr)
 
-    Assert.IsTrue(
+    Assert.That(
         cfg (Some "00:05:00") (Some "2000")
         |> SnapshotIntervalConfiguration.shouldCreateSnapshot
             (time    0l "2024-01-01T00:00:00Z")
             (time 2001l "2024-01-01T00:00:01Z")
-        )
+        , Is.True)
 
-    Assert.IsFalse(
+    Assert.That(
         cfg (Some "00:05:00") (Some "2000")
         |> SnapshotIntervalConfiguration.shouldCreateSnapshot
             (time    0l "2024-01-01T00:00:00Z")
             (time 1999l "2024-01-01T00:00:01Z")
-        )
+        , Is.False)
 
-    Assert.IsFalse(
+    Assert.That(
         cfg (Some "1.00:00:00") None
         |> SnapshotIntervalConfiguration.shouldCreateSnapshot
             (time   0l "2024-01-01T00:00:00Z")
-            (time 999l "2024-01-01T00:00:01Z"))
+            (time 999l "2024-01-01T00:00:01Z")
+        , Is.False)
 
-    Assert.IsFalse(
+    Assert.That(
         cfg None (Some "2000")
         |> SnapshotIntervalConfiguration.shouldCreateSnapshot
             (time    0l "2024-01-01T00:00:00Z")
-            (time 1999l "2024-01-01T00:00:01Z"))
+            (time 1999l "2024-01-01T00:00:01Z")
+        , Is.False)
 
-    Assert.IsTrue(
+    Assert.That(
         cfg None (Some "2000")
         |> SnapshotIntervalConfiguration.shouldCreateSnapshot
             (time    0l "2024-01-01T00:00:00Z")
-            (time 1999l "2024-01-01T01:00:01Z"))
+            (time 1999l "2024-01-01T01:00:01Z")
+        , Is.True)
 
     // Without configuration, we should use the default values (at least hourly, or every 1000 events)
-    Assert.IsTrue(
+    Assert.That(
         cfg None None
         |> SnapshotIntervalConfiguration.shouldCreateSnapshot
             (time    0l "2024-01-01T00:00:00Z")
-            (time 1001l "2024-01-01T00:00:01Z"))
+            (time 1001l "2024-01-01T00:00:01Z"), Is.True)
diff --git a/src/Metering.Tests/SerializationUnitTest.fs b/src/Metering.Tests/SerializationUnitTest.fs
index 6366e87..b302677 100644
--- a/src/Metering.Tests/SerializationUnitTest.fs
+++ b/src/Metering.Tests/SerializationUnitTest.fs
@@ -27,7 +27,7 @@ let private roundTrip<'T> (filename: string) =
         //|> (fun s -> printfn "%s" s; s)
         |> Json.fromStr<'T>
 
-    Assert.AreEqual(t1, t2, message = $"Inputfile: data/{filename}")
+    Assert.That(t1, Is.EqualTo(t2), message = $"Inputfile: data/{filename}")
 
 [<Test>]
 let ``InternalMessages.AllInOne`` () =
@@ -132,7 +132,7 @@ let ``InternalDataStructures.ParsePlan`` () =
         }
         """
         |> Json.fromStr<Plan>
-    Assert.AreEqual("the_plan", p.PlanId.value)
+    Assert.That(p.PlanId.value, Is.EqualTo("the_plan"))
 
     let check (appInternalName: string) (expected: Quantity) =
         let actual =
@@ -142,7 +142,7 @@ let ``InternalDataStructures.ParsePlan`` () =
                 | SimpleBillingDimension dim -> dim.IncludedQuantity
                 | _ -> failwith $"Should have been a {nameof(SimpleBillingDimension)}"
 
-        Assert.AreEqual(expected, actual)
+        Assert.That(actual, Is.EqualTo(expected))
 
     check "infinite" Quantity.Infinite
     check "literal" (Quantity.create 2u)
@@ -209,5 +209,5 @@ let ``EventHub.Avro`` () =
                 e
             )
 
-        Assert.IsTrue(events |> Seq.length > 0)
+        Assert.That(events |> Seq.length > 0, Is.True)
     )
diff --git a/src/Metering.Tests/WaterfallUnitTests.fs b/src/Metering.Tests/WaterfallUnitTests.fs
index 8457247..1d1bff4 100644
--- a/src/Metering.Tests/WaterfallUnitTests.fs
+++ b/src/Metering.Tests/WaterfallUnitTests.fs
@@ -14,11 +14,11 @@ let GigaByte (x: uint) = Quantity.create x
 let TeraByte x = GigaByte (1000u * x) // yeah, I know, 1024, but this helps readability
 
 let assertTotal expected meter =
-    Assert.AreEqual(expected, meter.Total)
+    Assert.That(meter.Total, Is.EqualTo(expected))
     meter
 
 let assertConsumption expected (meter: WaterfallMeterValue) =
-    Assert.AreEqual(expected, meter.Consumption)
+    Assert.That(meter.Consumption, Is.EqualTo(expected))
     meter
 
 let tier0_0_99 = "First 100GB / Month" |> DimensionId.create
@@ -64,7 +64,7 @@ let CreateMeterWithIncludedQuantities () =
         Overage { LowerIncluding = (GigaByte 500_100u);                                       DimensionId = tier5_500100_and_more }
     ]
 
-    Assert.AreEqual(expectedModel, model)
+    Assert.That(model, Is.EqualTo(expectedModel))
 
     let dimension =
         { Tiers = incrementalDescription
@@ -126,4 +126,4 @@ let CreateMeterWithOutIncludedQuantities () =
             Overage { LowerIncluding = (GigaByte 500_100u);                                       DimensionId = tier5_500100_and_more }
           ]
 
-    Assert.AreEqual(expectedModel, model)
+    Assert.That(model, Is.EqualTo(expectedModel))
diff --git a/src/Tools/ReplayCaptureForPartition/ReplayCaptureForPartition.fsproj b/src/Tools/ReplayCaptureForPartition/ReplayCaptureForPartition.fsproj
index aa76603..9cf1c81 100644
--- a/src/Tools/ReplayCaptureForPartition/ReplayCaptureForPartition.fsproj
+++ b/src/Tools/ReplayCaptureForPartition/ReplayCaptureForPartition.fsproj
@@ -9,4 +9,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\Metering.Runtime\Metering.Runtime.fsproj" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Update="FSharp.Core" Version="8.0.200" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Tools/ReprocessLocalEventHubCaptureFiles/ReprocessLocalEventHubCaptureFiles.fsproj b/src/Tools/ReprocessLocalEventHubCaptureFiles/ReprocessLocalEventHubCaptureFiles.fsproj
index 4d331e6..e4adfe0 100644
--- a/src/Tools/ReprocessLocalEventHubCaptureFiles/ReprocessLocalEventHubCaptureFiles.fsproj
+++ b/src/Tools/ReprocessLocalEventHubCaptureFiles/ReprocessLocalEventHubCaptureFiles.fsproj
@@ -7,7 +7,10 @@
     <Compile Include="ReprocessLocalEventHubCaptureFilesProgram.fs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Azure.Messaging.EventHubs" Version="5.10.0" />
+    <PackageReference Include="Azure.Messaging.EventHubs" Version="5.11.2" />
     <ProjectReference Include="..\..\Metering.Runtime\Metering.Runtime.fsproj" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Update="FSharp.Core" Version="8.0.200" />
+  </ItemGroup>
 </Project>