Merge pull request #42 from AKruimink/update-to-net-8

Update to .Net 8
AKruimink · Sep 6, 2024 · a77a126 · a77a126
2 parents 8974745 + 8df933e
commit a77a126
Show file tree

Hide file tree

Showing 24 changed files with 405 additions and 191 deletions.
diff --git a/.github/workflows/build-project.yml b/.github/workflows/build-project.yml
@@ -1,35 +1,36 @@
 name: 'build-project'
 
 on:
-  push: #Push always triggers after a merge
+  push: # Push always triggers after a merge
     branches: 
       - master
       - develop
   pull_request:
 
 # Defines environment variables
 env:
-  NETCORE_VERSION: '3.1.200'
+  NETCORE_VERSION: '8.0.x' 
 
 jobs:
   build:
     name: 'run-project-build'
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v2
+      # Checkout the repository
+      - uses: actions/checkout@v3
 
-      #Setup the environment 
-      - name: 'setup .NET Core SDK ${{ env.NETCORE_VERSION }}'
-        uses: actions/setup-dotnet@v1
+      # Setup the .NET 8.0 SDK environment
+      - name: 'setup .NET SDK ${{ env.NETCORE_VERSION }}'
+        uses: actions/setup-dotnet@v3
         with:
           dotnet-version: ${{ env.NETCORE_VERSION }}
 
-      # Restore all nuget packages to prevent issues during build
+      # Restore NuGet packages to ensure dependencies are available for the build
       - name: 'restore nuget packages'
         working-directory: './src'
         run: dotnet restore
 
-      # Build the project
+      # Build the project in Release configuration
       - name: 'build project'
         working-directory: './src'
         run: dotnet build --configuration Release --no-restore
diff --git a/.github/workflows/test-project.yml b/.github/workflows/test-project.yml
@@ -1,30 +1,31 @@
 name: 'test-project'
 
 on:
-  push: #Push always triggers after a merge
+  push: # Push always triggers after a merge
     branches: 
       - master
       - develop
   pull_request:
 
 # Defines environment variables
 env:
-  NETCORE_VERSION: '3.1.200'
+  NETCORE_VERSION: '8.0.x'
 
 jobs:
   build:
     name: 'run-unit-tests'
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v2
+      # Checkout the repository
+      - uses: actions/checkout@v3 
 
-      #Setup the environment 
-      - name: 'setup .NET Core SDK ${{ env.NETCORE_VERSION }}'
-        uses: actions/setup-dotnet@v1
+      # Setup the .NET 8.0 SDK environment
+      - name: 'setup .NET SDK ${{ env.NETCORE_VERSION }}'
+        uses: actions/setup-dotnet@v3 
         with:
           dotnet-version: ${{ env.NETCORE_VERSION }}
 
-      # Restore all nuget packages to prevent issues during build
+      # Restore all NuGet packages to ensure dependencies are available
       - name: 'restore nuget packages'
         working-directory: './src'
         run: dotnet restore

diff --git a/src/Tests/WinReform.Domain.Tests/Displays/DisplayServiceTests.cs b/src/Tests/WinReform.Domain.Tests/Displays/DisplayServiceTests.cs
@@ -46,7 +46,7 @@ public void GetDisplays_NoDisplays_ShoulReturnEmptyDisplayList()
         {
             // Prepare
             var winApiServiceMock = new Mock<IWinApiService>();
-            winApiServiceMock.Setup(x => x.GetAllMonitors()).Returns(new List<Monitor>());
+            winApiServiceMock.Setup(x => x.GetAllMonitors()).Returns(new List<Domain.WinApi.Monitor>());
             var displayService = new DisplayService(winApiServiceMock.Object);
 
             // Act
@@ -60,17 +60,17 @@ public void GetDisplays_NoDisplays_ShoulReturnEmptyDisplayList()
         public void GetDisplays_ExistingDisplays_ShoulReturnListWithDisplays()
         {
             // Prepare
-            var monitorList = new List<Monitor>
+            var monitorList = new List<Domain.WinApi.Monitor>
             {
-                new Monitor
+                new Domain.WinApi.Monitor
                 {
                     Size = 1,
                     MonitorSize = new Rect { Left = 1, Top = 2, Right = 3, Bottom = 4 },
                     WorkArea = new Rect { Left = 1, Top = 2, Right = 3, Bottom = 4 },
                     Flags = 1,
                     MonitorHandle = (IntPtr)1
                 },
-                new Monitor
+                new Domain.WinApi.Monitor
                 {
                     Size = 2,
                     MonitorSize = new Rect { Left = 1, Top = 2, Right = 3, Bottom = 4 },

diff --git a/src/Tests/WinReform.Domain.Tests/Infrastructure/Messenger/EventBaseTests.cs b/src/Tests/WinReform.Domain.Tests/Infrastructure/Messenger/EventBaseTests.cs
@@ -106,7 +106,7 @@ public void InternalPublish_NullReference_ShouldPruneStratagies()
             // Prepare
             var eventBase = new EventFixture();
             var eventSubscriptionMock = new Mock<IEventSubscription>();
-            eventSubscriptionMock.Setup(x => x.GetExecutionStrategy()).Returns(null);
+            eventSubscriptionMock.Setup(x => x.GetExecutionStrategy()).Returns<Delegate?>(null!);
             eventSubscriptionMock.SetupAllProperties();
             var token = eventBase.Subscribe(eventSubscriptionMock.Object);
 

diff --git a/src/Tests/WinReform.Domain.Tests/Infrastructure/Messenger/EventSubscriptionTests.cs b/src/Tests/WinReform.Domain.Tests/Infrastructure/Messenger/EventSubscriptionTests.cs
@@ -1,5 +1,4 @@
-using System;
-using Moq;
+using Moq;
 using WinReform.Domain.Infrastructure.Messenger;
 using WinReform.Domain.Infrastructure.Messenger.Strategies;
 using Xunit;
@@ -19,7 +18,7 @@ public void ConstructNonGeneric_NullActionReference_ShouldThrowArgumentNullExcep
             // Assert
             Assert.Throws<ArgumentNullException>(() =>
             {
-                var eventSubscription = new EventSubscription(null!);
+                _ = new EventSubscription(null!);
             });
         }
 
@@ -33,7 +32,7 @@ public void ConstructGeneric_NullActionReference_ShouldThrowArgumentNullExceptio
             // Assert
             Assert.Throws<ArgumentNullException>(() =>
             {
-                var eventSubscription = new EventSubscription<object>(null!, delegateReferenceMock.Object);
+                _ = new EventSubscription<object>(null!, delegateReferenceMock.Object);
             });
         }
 
@@ -47,7 +46,7 @@ public void ConstructGeneric_NullFilterReference_ShouldThrowArgumentNullExceptio
             // Assert
             Assert.Throws<ArgumentNullException>(() =>
             {
-                var eventSubscription = new EventSubscription<object>(delegateReferenceMock.Object, null!);
+                _ = new EventSubscription<object>(delegateReferenceMock.Object, null!);
             });
         }
 
@@ -56,12 +55,12 @@ public void ConstructNonGeneric_NullAction_ShouldThrowArgumentException()
         {
             // Prepare
             var delegateReferenceMock = new Mock<IDelegateReference>();
-            delegateReferenceMock.Setup(x => x.Delegate).Returns(null);
+            delegateReferenceMock.Setup(x => x.Delegate).Returns<Delegate?>(null!);
 
             // Assert
             Assert.Throws<ArgumentException>(() =>
             {
-                var eventSubscription = new EventSubscription(delegateReferenceMock.Object);
+                _ = new EventSubscription(delegateReferenceMock.Object);
             });
         }
 
@@ -70,14 +69,14 @@ public void ConstructGeneric_NullAction_ShouldThrowArgumentException()
         {
             // Prepare
             var delegateActionReferenceMock = new Mock<IDelegateReference>();
-            delegateActionReferenceMock.Setup(x => x.Delegate).Returns(null);
+            delegateActionReferenceMock.Setup(x => x.Delegate).Returns<Delegate?>(null!);
             var delegateFilterReferenceMock = new Mock<IDelegateReference>();
             delegateFilterReferenceMock.Setup(x => x.Delegate).Returns((Predicate<object>)delegate { return true; });
 
             // Assert
             Assert.Throws<ArgumentException>(() =>
             {
-                var eventSubscription = new EventSubscription<object>(delegateActionReferenceMock.Object, delegateFilterReferenceMock.Object);
+                _ = new EventSubscription<object>(delegateActionReferenceMock.Object, delegateFilterReferenceMock.Object);
             });
         }
 
@@ -88,12 +87,12 @@ public void ConstructGeneric_NullFilter_ShouldThrowArgumentException()
             var delegateActionReferenceMock = new Mock<IDelegateReference>();
             delegateActionReferenceMock.Setup(x => x.Delegate).Returns((Action<object>)delegate { });
             var delegateFilterReferenceMock = new Mock<IDelegateReference>();
-            delegateFilterReferenceMock.Setup(x => x.Delegate).Returns(null);
+            delegateFilterReferenceMock.Setup(x => x.Delegate).Returns<Delegate?>(null!);
 
             // Assert
             Assert.Throws<ArgumentException>(() =>
             {
-                var eventSubscription = new EventSubscription<object>(delegateActionReferenceMock.Object, delegateFilterReferenceMock.Object);
+                _ = new EventSubscription<object>(delegateActionReferenceMock.Object, delegateFilterReferenceMock.Object);
             });
         }
 
@@ -107,7 +106,7 @@ public void ConstructNonGeneric_DifferentTargetTypeActionReference_ShouldThrowAr
             // Assert
             Assert.Throws<ArgumentException>(() =>
             {
-                var eventSubscription = new EventSubscription(delegateActionReferenceMock.Object);
+                _ = new EventSubscription(delegateActionReferenceMock.Object);
             });
         }
 
@@ -123,7 +122,7 @@ public void ConstructGeneric_DifferentTargetTypeActionReference_ShouldThrowArgum
             // Assert
             Assert.Throws<ArgumentException>(() =>
             {
-                var eventSubscription = new EventSubscription<object>(delegateActionReferenceMock.Object, delegateFilterReferenceMock.Object);
+                _ = new EventSubscription<object>(delegateActionReferenceMock.Object, delegateFilterReferenceMock.Object);
             });
         }
 
@@ -139,7 +138,7 @@ public void ConstructGeneric_DifferentTargetTypeFilterReference_ShouldThrowArgum
             // Assert
             Assert.Throws<ArgumentException>(() =>
             {
-                var eventSubscription = new EventSubscription<object>(delegateActionReferenceMock.Object, delegateFilterReferenceMock.Object);
+                _ = new EventSubscription<object>(delegateActionReferenceMock.Object, delegateFilterReferenceMock.Object);
             });
         }
 
@@ -206,7 +205,7 @@ public void GetActionNonGeneric_NullAction_ShouldReturnNull()
             Assert.NotNull(publishAction);
 
             // Act
-            delegateActionReferenceMock.Setup(x => x.Delegate).Returns(null);
+            delegateActionReferenceMock.Setup(x => x.Delegate).Returns<Delegate?>(null!);
             publishAction = eventSubscription.GetExecutionStrategy();
 
             // Assert
@@ -232,7 +231,7 @@ public void GetActionGeneric_NullAction_ShouldReturnNull()
             Assert.NotNull(publishAction);
 
             // Act
-            delegateActionReferenceMock.Setup(x => x.Delegate).Returns(null);
+            delegateActionReferenceMock.Setup(x => x.Delegate).Returns<Delegate?>(null!);
             publishAction = eventSubscription.GetExecutionStrategy();
 
             // Assert
@@ -267,7 +266,9 @@ public void GetExecutionStrategyGeneric_PassArgument_ShouldPassArgumentToDelegat
         }
 
         [Fact]
-        public void GetExecutionStrategyNonGeneric_NullAction_ShouldReturnNull()
+#pragma warning disable S4144 // Methods should not have identical implementations
+        public void GetExecutionStrategy_NonGenericAction_ShouldReturnNull()
+#pragma warning restore S4144 // Methods should not have identical implementations
         {
             // Prepare
             var delegateActionReferenceMock = new Mock<IDelegateReference>();
@@ -283,15 +284,15 @@ public void GetExecutionStrategyNonGeneric_NullAction_ShouldReturnNull()
             Assert.NotNull(publishAction);
 
             // Act
-            delegateActionReferenceMock.Setup(x => x.Delegate).Returns(null);
+            delegateActionReferenceMock.Setup(x => x.Delegate).Returns<Delegate?>(null!);
             publishAction = eventSubscription.GetExecutionStrategy();
 
             // Assert
             Assert.Null(publishAction);
         }
 
         [Fact]
-        public void GetExecutionStrategyGeneric_NullAction_ShouldReturnNull()
+        public void GetExecutionStrategy_GenericAction_ShouldReturnNull()
         {
             // Prepare
             var delegateActionReferenceMock = new Mock<IDelegateReference>();
@@ -309,7 +310,7 @@ public void GetExecutionStrategyGeneric_NullAction_ShouldReturnNull()
             Assert.NotNull(publishAction);
 
             // Act
-            delegateActionReferenceMock.Setup(x => x.Delegate).Returns(null);
+            delegateActionReferenceMock.Setup(x => x.Delegate).Returns<Delegate?>(null!);
             publishAction = eventSubscription.GetExecutionStrategy();
 
             // Assert
@@ -335,7 +336,7 @@ public void GetExecutionStrategyGeneric_NullFilter_ShouldReturnNull()
             Assert.NotNull(publishAction);
 
             // Act
-            delegateFilterReferenceMock.Setup(x => x.Delegate).Returns(null);
+            delegateFilterReferenceMock.Setup(x => x.Delegate).Returns<Delegate?>(null!);
             publishAction = eventSubscription.GetExecutionStrategy();
 
             // Assert