Updates project to .NET 9 and modernizes dependencies

.github/workflows/dotnet.yml

@@ -6,20 +6,36 @@ on:
   pull_request:
     branches: [ master ]
 
+env:
+  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
+  DOTNET_NOLOGO: true
+
 jobs:
   build:
-
     runs-on: ubuntu-latest
-
+    
     steps:
-    - uses: actions/checkout@v2
+    - name: Checkout code
+      uses: actions/checkout@v4
+
     - name: Setup .NET
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 3.1.x
+        dotnet-version: '9.0.x'
+
+    - name: Cache dependencies
+      uses: actions/cache@v4
+      with:
+        path: ~/.nuget/packages
+        key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}
+        restore-keys: |
+          ${{ runner.os }}-nuget-
+
     - name: Restore dependencies
       run: dotnet restore
+
     - name: Build
-      run: dotnet build --no-restore
+      run: dotnet build --no-restore --configuration Release
+
     - name: Test
-      run: dotnet test --no-build --verbosity normal
+      run: dotnet test --no-build --configuration Release --verbosity normal

NEventSocket.Tests/Applications/Applications.cs

@@ -2,11 +2,12 @@
 {
     using NEventSocket.FreeSwitch;
 
-    using Xunit;
+    using NUnit.Framework;
 
+    [TestFixture]
     public class Applications
     {
-         [Fact]
+         [Test]
          public void can_build_say_string()
          {
              var options = new SayOptions
@@ -20,10 +21,10 @@ public void can_build_say_string()
 
              var toString = options.ToString();
 
-             Assert.Equal("en NUMBER iterated FEMININE 1234", toString);
+             Assert.That(toString, Is.EqualTo("en NUMBER iterated FEMININE 1234"));
          }
 
-         [Fact]
+         [Test]
          public void can_build_originate_string()
          {
              var options = new OriginateOptions()
@@ -50,10 +51,10 @@ public void can_build_originate_string()
 
              const string Expected =
                  "<fooE='barE',bazE='widgetsE'>{origination_uuid='985cea12-4e70-4c03-8a2c-2c4b4502bbbb',bypass_media='true',origination_caller_id_name='Test',origination_caller_id_number='12341234',execute_on_originate='start_dtmf',ignore_early_media='true',originate_retries='3',originate_retry_sleep_ms='4000',return_ring_ready='true',originate_timeout='20',hangup_after_bridge='false',foo='bar',baz='widgets'}";
-             Assert.Equal(Expected, toString);
+             Assert.That(toString, Is.EqualTo(Expected));
          }
 
-        [Fact]
+        [Test]
         public void can_build_play_get_digits_string()
         {
             var options = new PlayGetDigitsOptions()
@@ -72,7 +73,7 @@ public void can_build_play_get_digits_string()
 
             var toString = options.ToString();
 
-            Assert.Equal(@"4 8 3 4000 # ivr/8000/ivr-please_enter_pin_followed_by_pound.wav ivr/8000/ivr-that_was_an_invalid_entry.wav play_get_digits_result ^(1|2|3|4|5|6|7|8|9|0)+ 2000", toString);
+            Assert.That(toString, Is.EqualTo(@"4 8 3 4000 # ivr/8000/ivr-please_enter_pin_followed_by_pound.wav ivr/8000/ivr-that_was_an_invalid_entry.wav play_get_digits_result ^(1|2|3|4|5|6|7|8|9|0)+ 2000"));
           }
     }
 }

NEventSocket.Tests/Applications/BridgeTests.cs

@@ -1,15 +1,15 @@
 namespace NEventSocket.Tests.Applications
 {
-    using System.IO;
-    using System.Runtime.Serialization.Formatters.Binary;
+    using System.Text.Json;
 
     using NEventSocket.FreeSwitch;
 
-    using Xunit;
+    using NUnit.Framework;
 
+    [TestFixture]
     public class BridgeTests
     {
-        [Fact]
+        [Test]
         public void can_format_BridgeOptions()
         {
             var options = new BridgeOptions()
@@ -24,45 +24,38 @@ public void can_format_BridgeOptions()
                 RingBack = "${uk-ring}"
             };
 
-            // channel variables have no effect on ToString(), they're set on the a-leg of the call before initiating the bridge.
             // todo: allow exporting variables?
             options.ChannelVariables.Add("foo", "bar");
             options.ChannelVariables.Add("baz", "widgets");
 
             var toString = options.ToString();
             const string Expected = "{origination_uuid='985cea12-4e70-4c03-8a2c-2c4b4502bbbb',leg_timeout='20',origination_caller_id_name='Dan B Leg',origination_caller_id_number='987654321',ignore_early_media='true'}";
-            Assert.Equal(Expected, toString);
+            Assert.That(toString, Is.EqualTo(Expected));
         }
 
-        [Fact]
+        [Test]
         public void can_serialize_and_deserialize_BridgeOptions()
         {
-            using (var ms = new MemoryStream())
+            var options = new BridgeOptions()
             {
-                var formatter = new BinaryFormatter();
-
-                var options = new BridgeOptions()
-                {
-                    UUID = "985cea12-4e70-4c03-8a2c-2c4b4502bbbb",
-                    TimeoutSeconds = 20,
-                    CallerIdName = "Dan B Leg",
-                    CallerIdNumber = "987654321",
-                    HangupAfterBridge = false,
-                    IgnoreEarlyMedia = true,
-                    ContinueOnFail = true,
-                    RingBack = "${uk-ring}"
-                };
+                UUID = "985cea12-4e70-4c03-8a2c-2c4b4502bbbb",
+                TimeoutSeconds = 20,
+                CallerIdName = "Dan B Leg",
+                CallerIdNumber = "987654321",
+                HangupAfterBridge = false,
+                IgnoreEarlyMedia = true,
+                ContinueOnFail = true,
+                RingBack = "${uk-ring}"
+            };
 
-                options.ChannelVariables.Add("foo", "bar");
-                options.ChannelVariables.Add("baz", "widgets");
+            options.ChannelVariables.Add("foo", "bar");
+            options.ChannelVariables.Add("baz", "widgets");
 
-                formatter.Serialize(ms, options);
+            var json = JsonSerializer.Serialize(options);
 
-                ms.Seek(0, SeekOrigin.Begin);
+            var fromJson = JsonSerializer.Deserialize<BridgeOptions>(json);
 
-                var fromStream = formatter.Deserialize(ms) as BridgeOptions;
-                Assert.Equal(options, fromStream);
-            }
+            Assert.That(fromJson.ChannelVariables, Is.EquivalentTo(options.ChannelVariables));
         }
     }
 }

NEventSocket.Tests/Applications/OriginateTests.cs

@@ -1,16 +1,16 @@
 namespace NEventSocket.Tests.Applications
 {
     using System.Collections.Generic;
-    using System.IO;
-    using System.Runtime.Serialization.Formatters.Binary;
+    using System.Text.Json;
 
     using NEventSocket.FreeSwitch;
 
-    using Xunit;
+    using NUnit.Framework;
 
+    [TestFixture]
     public class OriginateTests
     {
-        [Fact]
+        [Test]
         public void can_format_originate_options()
         {
             var options = new OriginateOptions()
@@ -26,77 +26,69 @@ public void can_format_originate_options()
                                   IgnoreEarlyMedia = true,
                               };
 
-            Assert.Equal(
-                "{origination_caller_id_name='Dan',origination_caller_id_number='0123457890',execute_on_originate='my_app::my_arg',originate_retries='5',originate_retry_sleep_ms='200',return_ring_ready='true',originate_timeout='60',origination_uuid='83fe4f3d-b957-4b26-b6bf-3879d7e21972',ignore_early_media='true'}",
-                options.ToString());
+            Assert.That(options.ToString(), Is.EqualTo(
+                "{origination_caller_id_name='Dan',origination_caller_id_number='0123457890',execute_on_originate='my_app::my_arg',originate_retries='5',originate_retry_sleep_ms='200',return_ring_ready='true',originate_timeout='60',origination_uuid='83fe4f3d-b957-4b26-b6bf-3879d7e21972',ignore_early_media='true'}"));
         }
 
-        [Fact]
+        [Test]
         public void can_set_enterprise_channel_variables()
         {
-            var options = new OriginateOptions 
-                { 
+            var options = new OriginateOptions
+                {
                     EnterpriseChannelVariables = new Dictionary<string, string>
                     {
                          {"e1" , "ev1"},
                          {"e2" , "ev2"}
                     }
                 }.ToString();
-            Assert.Contains("<e1='ev1',e2='ev2'>", options);
+            Assert.That(options, Does.Contain("<e1='ev1',e2='ev2'>"));
         }
 
-        [Fact]
+        [Test]
         public void can_set_enterprise_channel_variables_and_channel_variables()
         {
             var options = new OriginateOptions
                           {
                               EnterpriseChannelVariables = new Dictionary<string, string> { { "e1", "ev1" }, { "e2", "ev2" } },
                               ChannelVariables = new Dictionary<string, string> { { "c1", "cv1" }, { "c2", "cv2" } }
                           }.ToString();
-            Assert.Contains("<e1='ev1',e2='ev2'>{c1='cv1',c2='cv2'}", options);
+            Assert.That(options, Does.Contain("<e1='ev1',e2='ev2'>{c1='cv1',c2='cv2'}"));
         }
 
-        [Fact]
+        [Test]
         public void can_set_caller_id_type()
         {
             var options = new OriginateOptions() { SipCallerIdType = SipCallerIdType.RPid }.ToString();
-            Assert.Contains("sip_cid_type='rpid'", options);
+            Assert.That(options, Does.Contain("sip_cid_type='rpid'"));
         }
 
-        [Fact]
+        [Test]
         public void can_set_privacy()
         {
             var options = new OriginateOptions() { OriginationPrivacy = OriginationPrivacy.HideName | OriginationPrivacy.HideNumber | OriginationPrivacy.Screen}.ToString();
-            Assert.Contains("origination_privacy='hide_name:hide_number:screen'", options);
+            Assert.That(options, Does.Contain("origination_privacy='hide_name:hide_number:screen'"));
         }
 
-        [Fact]
+        [Test]
         public void can_serialize_and_deserialize_OriginateOptions()
         {
-            using (var ms = new MemoryStream())
-            {
-                var formatter = new BinaryFormatter();
-
                 var options = new OriginateOptions()
-                {
-                    CallerIdName = "Dan",
-                    CallerIdNumber = "0123457890",
-                    ExecuteOnOriginate = "my_app::my_arg",
-                    Retries = 5,
-                    RetrySleepMs = 200,
-                    ReturnRingReady = true,
-                    TimeoutSeconds = 60,
-                    UUID = "83fe4f3d-b957-4b26-b6bf-3879d7e21972",
-                    IgnoreEarlyMedia = true,
-                };
-
-                formatter.Serialize(ms, options);
+            {
+                CallerIdName = "Dan",
+                CallerIdNumber = "0123457890",
+                ExecuteOnOriginate = "my_app::my_arg",
+                Retries = 5,
+                RetrySleepMs = 200,
+                ReturnRingReady = true,
+                TimeoutSeconds = 60,
+                UUID = "83fe4f3d-b957-4b26-b6bf-3879d7e21972",
+                IgnoreEarlyMedia = true,
+            };
 
-                ms.Seek(0, SeekOrigin.Begin);
+            var json = JsonSerializer.Serialize(options);
+            var fromJson = JsonSerializer.Deserialize<OriginateOptions>(json);
 
-                var fromStream = formatter.Deserialize(ms) as OriginateOptions;
-                Assert.Equal(options, fromStream);
-            }
+            Assert.That(fromJson.ChannelVariables, Is.EquivalentTo(options.ChannelVariables));
         }
     }
 }

NEventSocket.Tests/NEventSocket.Tests.csproj

@@ -1,17 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="5.10.2" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.2" />
-    <PackageReference Include="xunit" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
-    <PackageReference Include="coverlet.collector" Version="1.0.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.7" />
+    <PackageReference Include="FluentAssertions" Version="8.5.0" />
+    <PackageReference Include="NSubstitute" Version="5.3.0" />
+    <PackageReference Include="NUnit" Version="4.3.2" />
+    <PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>