Merge pull request #14 from null-d3v/net8.0

null-d3v · web-flow · commit a0abcdf07d3c · 2023-11-18T20:02:05.000-06:00
chore: net8.0
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,7 +15,7 @@ jobs:
           - name: Setup
             uses: actions/setup-dotnet@v3
             with:
-                dotnet-version: 7
+                dotnet-version: 8
           - name: Build
             run: dotnet build -c Release
           - name: Test
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -20,7 +20,7 @@ jobs:
           - name: Setup
             uses: actions/setup-dotnet@v3
             with:
-                dotnet-version: 7
+                dotnet-version: 8
           - name: Build
             run: dotnet build -c Release
           - name: Test
diff --git a/src/Configuration/MessagingConfigurationVerifier.cs b/src/Configuration/MessagingConfigurationVerifier.cs
@@ -3,7 +3,8 @@
 
 namespace L1L2RedisCache;
 
-internal sealed class MessagingConfigurationVerifier :
+internal sealed class MessagingConfigurationVerifier(
+    IOptions<L1L2RedisCacheOptions> l1L2RedisCacheOptionsOptionsAccessor) :
     IMessagingConfigurationVerifier
 {
     private const string config = "notify-keyspace-events";
@@ -18,15 +19,10 @@ static MessagingConfigurationVerifier()
         };
     }
 
-    public MessagingConfigurationVerifier(
-        IOptions<L1L2RedisCacheOptions> l1L2RedisCacheOptionsOptionsAccessor)
-    {
-        L1L2RedisCacheOptions = l1L2RedisCacheOptionsOptionsAccessor.Value;
-    }
-
     internal static IDictionary<MessagingType, string> NotifyKeyspaceEventsConfig { get; }
 
-    public L1L2RedisCacheOptions L1L2RedisCacheOptions { get; }
+    public L1L2RedisCacheOptions L1L2RedisCacheOptions { get; } =
+        l1L2RedisCacheOptionsOptionsAccessor.Value;
 
     public async Task<bool> VerifyConfigurationAsync(
         IDatabase database,
diff --git a/src/L1L2RedisCache.csproj b/src/L1L2RedisCache.csproj
@@ -17,10 +17,10 @@
     <None Include="../README.md" Pack="true" PackagePath="\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="7.0.*" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.*" />
-    <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="7.0.*" />
-    <PackageReference Include="System.Text.Json" Version="7.0.*" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.*" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.*" />
+    <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.*" />
+    <PackageReference Include="System.Text.Json" Version="8.0.*" />
   </ItemGroup>
   <ItemGroup>
     <InternalsVisibleTo Include="L1L2RedisCache.Tests.System" />
diff --git a/src/Messaging/DefaultMessagePublisher.cs b/src/Messaging/DefaultMessagePublisher.cs
@@ -4,19 +4,15 @@
 
 namespace L1L2RedisCache;
 
-internal sealed class DefaultMessagePublisher :
+internal sealed class DefaultMessagePublisher(
+    IOptions<JsonSerializerOptions> jsonSerializerOptionsAccessor,
+    IOptions<L1L2RedisCacheOptions> l1L2RedisCacheOptionsOptionsAccessor) :
     IMessagePublisher
 {
-    public DefaultMessagePublisher(
-        IOptions<JsonSerializerOptions> jsonSerializerOptionsAccessor,
-        IOptions<L1L2RedisCacheOptions> l1L2RedisCacheOptionsOptionsAccessor)
-    {
-        JsonSerializerOptions = jsonSerializerOptionsAccessor.Value;
-        L1L2RedisCacheOptions = l1L2RedisCacheOptionsOptionsAccessor.Value;
-    }
-
-    public JsonSerializerOptions JsonSerializerOptions { get; set; }
-    public L1L2RedisCacheOptions L1L2RedisCacheOptions { get; set; }
+    public JsonSerializerOptions JsonSerializerOptions { get; set; } =
+        jsonSerializerOptionsAccessor.Value;
+    public L1L2RedisCacheOptions L1L2RedisCacheOptions { get; set; } =
+        l1L2RedisCacheOptionsOptionsAccessor.Value;
 
     public void Publish(
         IConnectionMultiplexer connectionMultiplexer,
diff --git a/src/Messaging/DefaultMessageSubscriber.cs b/src/Messaging/DefaultMessageSubscriber.cs
@@ -5,22 +5,18 @@
 
 namespace L1L2RedisCache;
 
-internal class DefaultMessageSubscriber :
+internal class DefaultMessageSubscriber(
+    IOptions<JsonSerializerOptions> jsonSerializerOptionsAcccessor,
+    IMemoryCache l1Cache,
+    IOptions<L1L2RedisCacheOptions> l1L2RedisCacheOptionsOptionsAccessor) :
     IMessageSubscriber
 {
-    public DefaultMessageSubscriber(
-        IOptions<JsonSerializerOptions> jsonSerializerOptionsAcccessor,
-        IMemoryCache l1Cache,
-        IOptions<L1L2RedisCacheOptions> l1L2RedisCacheOptionsOptionsAccessor)
-    {
-        JsonSerializerOptions = jsonSerializerOptionsAcccessor.Value;
-        L1Cache = l1Cache;
-        L1L2RedisCacheOptions = l1L2RedisCacheOptionsOptionsAccessor.Value;
-    }
-
-    public JsonSerializerOptions JsonSerializerOptions { get; set; }
-    public L1L2RedisCacheOptions L1L2RedisCacheOptions { get; set; }
-    public IMemoryCache L1Cache { get; set; }
+    public JsonSerializerOptions JsonSerializerOptions { get; set; } =
+        jsonSerializerOptionsAcccessor.Value;
+    public L1L2RedisCacheOptions L1L2RedisCacheOptions { get; set; } =
+        l1L2RedisCacheOptionsOptionsAccessor.Value;
+    public IMemoryCache L1Cache { get; set; } =
+        l1Cache;
     public EventHandler<OnMessageEventArgs>? OnMessage { get; set; }
     public EventHandler? OnSubscribe { get; set; }
 
diff --git a/src/Messaging/KeyeventMessageSubscriber.cs b/src/Messaging/KeyeventMessageSubscriber.cs
@@ -4,19 +4,15 @@
 
 namespace L1L2RedisCache;
 
-internal class KeyeventMessageSubscriber :
+internal class KeyeventMessageSubscriber(
+    IMemoryCache l1Cache,
+    IOptions<L1L2RedisCacheOptions> l1L2RedisCacheOptionsOptionsAccessor) :
     IMessageSubscriber
 {
-    public KeyeventMessageSubscriber(
-        IMemoryCache l1Cache,
-        IOptions<L1L2RedisCacheOptions> l1L2RedisCacheOptionsOptionsAccessor)
-    {
-        L1Cache = l1Cache;
-        L1L2RedisCacheOptions = l1L2RedisCacheOptionsOptionsAccessor.Value;
-    }
-
-    public L1L2RedisCacheOptions L1L2RedisCacheOptions { get; set; }
-    public IMemoryCache L1Cache { get; set; }
+    public L1L2RedisCacheOptions L1L2RedisCacheOptions { get; set; } =
+        l1L2RedisCacheOptionsOptionsAccessor.Value;
+    public IMemoryCache L1Cache { get; set; } =
+        l1Cache;
     public EventHandler<OnMessageEventArgs>? OnMessage { get; set; }
     public EventHandler? OnSubscribe { get; set; }
 
diff --git a/src/Messaging/KeyspaceMessageSubscriber.cs b/src/Messaging/KeyspaceMessageSubscriber.cs
@@ -4,19 +4,15 @@
 
 namespace L1L2RedisCache;
 
-internal class KeyspaceMessageSubscriber :
+internal class KeyspaceMessageSubscriber(
+    IMemoryCache l1Cache,
+    IOptions<L1L2RedisCacheOptions> l1L2RedisCacheOptionsOptionsAccessor) :
     IMessageSubscriber
 {
-    public KeyspaceMessageSubscriber(
-        IMemoryCache l1Cache,
-        IOptions<L1L2RedisCacheOptions> l1L2RedisCacheOptionsOptionsAccessor)
-    {
-        L1Cache = l1Cache;
-        L1L2RedisCacheOptions = l1L2RedisCacheOptionsOptionsAccessor.Value;
-    }
-
-    public L1L2RedisCacheOptions L1L2RedisCacheOptions { get; set; }
-    public IMemoryCache L1Cache { get; set; }
+    public L1L2RedisCacheOptions L1L2RedisCacheOptions { get; set; } =
+        l1L2RedisCacheOptionsOptionsAccessor.Value;
+    public IMemoryCache L1Cache { get; set; } =
+        l1Cache;
     public EventHandler<OnMessageEventArgs>? OnMessage { get; set; }
     public EventHandler? OnSubscribe { get; set; }
 
diff --git a/src/Messaging/OnMessageEventArgs.cs b/src/Messaging/OnMessageEventArgs.cs
@@ -3,19 +3,16 @@ namespace L1L2RedisCache;
 /// <summary>
 /// Supplies information about a message event from an <c>IMessageSubscriber</c>.
 /// </summary>
-public class OnMessageEventArgs : EventArgs
+/// <remarks>
+/// Initializes a new instance of OnMessageEventArgs.
+/// </remarks>
+public class OnMessageEventArgs(
+    string key) :
+    EventArgs
 {
-    /// <summary>
-    /// Initializes a new instance of OnMessageEventArgs.
-    /// </summary>
-    public OnMessageEventArgs(
-        string key)
-    {
-        Key = key;
-    }
 
     /// <summary>
     /// The cache key pertaining to the message event.
     /// </summary>
-    public string Key { get; set; }
+    public string Key { get; set; } = key;
 }
diff --git a/tests/System/L1L2RedisCache.Tests.System.csproj b/tests/System/L1L2RedisCache.Tests.System.csproj
@@ -5,28 +5,22 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <IsPackable>false</IsPackable>
     <Nullable>enable</Nullable>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
-  <ItemGroup>
-    <AssemblyAttribute Include="Xunit.CollectionBehaviorAttribute">
-      <MaxParallelThreads>-1</MaxParallelThreads>
-      <MaxParallelThreads_TypeName>System.Int32</MaxParallelThreads_TypeName>
-    </AssemblyAttribute>
-  </ItemGroup>
   <ItemGroup>
     <None CopyToOutputDirectory="PreserveNewest" Include="appsettings.json" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\L1L2RedisCache.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.*" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.*" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.*" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.*" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.*" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.*" />
-    <PackageReference Include="xunit" Version="2.5.*" />
-    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" Version="2.5.*" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.*" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.*" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.*" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.*" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.*" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.*" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.1.*" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.1.*" />
   </ItemGroup>
 </Project>
diff --git a/tests/System/MessagingTests.cs b/tests/System/MessagingTests.cs
@@ -2,11 +2,11 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
-using Xunit;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace L1L2RedisCache.Tests.System;
 
-[Collection("System")]
+[TestClass]
 public class MessagingTests
 {
     public MessagingTests()
@@ -21,10 +21,10 @@ public MessagingTests()
     public IConfiguration Configuration { get; }
     public TimeSpan EventTimeout { get; }
 
-    [InlineData(100, MessagingType.Default)]
-    [InlineData(100, MessagingType.KeyeventNotifications)]
-    [InlineData(100, MessagingType.KeyspaceNotifications)]
-    [Theory]
+    [DataRow(100, MessagingType.Default)]
+    [DataRow(100, MessagingType.KeyeventNotifications)]
+    [DataRow(100, MessagingType.KeyspaceNotifications)]
+    [TestMethod]
     public async Task MessagingTypeTest(
         int iterations,
         MessagingType messagingType)
@@ -76,7 +76,7 @@ await SetAndVerifyConfigurationAsync(
         var secondaryL1L2Cache = secondaryServiceProvider
             .GetRequiredService<IDistributedCache>();
 
-        Assert.True(
+        Assert.IsTrue(
             subscribeAutoResetEvent
                 .WaitOne(EventTimeout));
 
@@ -90,10 +90,10 @@ await primaryL1L2Cache
                 .SetStringAsync(
                     key, value)
                 .ConfigureAwait(false);
-            Assert.True(
+            Assert.IsTrue(
                 messageAutoResetEvent
                     .WaitOne(EventTimeout));
-            Assert.Equal(
+            Assert.AreEqual(
                 value,
                 await secondaryL1L2Cache
                     .GetStringAsync(key)
@@ -105,10 +105,10 @@ await primaryL1L2Cache
                 .SetStringAsync(
                     key, value)
                 .ConfigureAwait(false);
-            Assert.True(
+            Assert.IsTrue(
                 messageAutoResetEvent
                     .WaitOne(EventTimeout));
-            Assert.Equal(
+            Assert.AreEqual(
                 value,
                 await secondaryL1L2Cache
                     .GetStringAsync(key)
@@ -118,10 +118,10 @@ await secondaryL1L2Cache
             await primaryL1L2Cache
                 .RemoveAsync(key)
                 .ConfigureAwait(false);
-            Assert.True(
+            Assert.IsTrue(
                 messageAutoResetEvent
                     .WaitOne(EventTimeout));
-            Assert.Null(
+            Assert.IsNull(
                 await secondaryL1L2Cache
                     .GetStringAsync(key)
                     .ConfigureAwait(false));
@@ -146,7 +146,7 @@ await l1L2Cache!.Database.Value
 
         var configurationVerifier = serviceProvider
             .GetRequiredService<IMessagingConfigurationVerifier>();
-        Assert.True(
+        Assert.IsTrue(
             await configurationVerifier
                 .VerifyConfigurationAsync(
                     l1L2Cache.Database.Value)
diff --git a/tests/System/PerformanceTests.cs b/tests/System/PerformanceTests.cs
@@ -2,12 +2,12 @@
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.Diagnostics;
-using Xunit;
 
 namespace L1L2RedisCache.Tests.System;
 
-[Collection("System")]
+[TestClass]
 public class PerformanceTests
 {
     public PerformanceTests()
@@ -41,8 +41,8 @@ public PerformanceTests()
     public IDistributedCache L2Cache { get; }
     public Stopwatch Stopwatch { get; }
 
-    [InlineData(10000)]
-    [Theory]
+    [DataRow(10000)]
+    [TestMethod]
     public async Task PerformanceTest(
         int iterations)
     {
@@ -113,15 +113,15 @@ await L1L2Cache
         Stopwatch.Stop();
         var l1L2GetTicks = Stopwatch.ElapsedTicks;
 
-        Assert.True(
+        Assert.IsTrue(
             l1L2SetTicks / l2SetTicks < 3,
             "L1L2Cache Set cannot perform significantly worse than RedisCache Set.");
 
-        Assert.True(
+        Assert.IsTrue(
             l2GetTicks / l1L2GetTicks > 100,
             "L1L2Cache Get must perform significantly better than RedisCache Get.");
 
-        Assert.True(
+        Assert.IsTrue(
             l1L2GetPropagationTicks / l2GetTicks < 3,
             "L1L2Cache Get with propagation cannot perform significantly worse than RedisCache Get.");
     }
diff --git a/tests/System/ReliabilityTests.cs b/tests/System/ReliabilityTests.cs
diff --git a/tests/Unit/L1L2RedisCache.Tests.Unit.csproj b/tests/Unit/L1L2RedisCache.Tests.Unit.csproj
diff --git a/tests/Unit/L1L2RedisCacheTests.cs b/tests/Unit/L1L2RedisCacheTests.cs
