Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to .Net 8 #42

Merged
merged 5 commits into from
Sep 6, 2024
Merged

Update to .Net 8 #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ac60f14
Updates the project to net8.0-windows
AKruimink Sep 5, 2024
99c022a
Fixed all the warnings that came up
AKruimink Sep 5, 2024
2fc04ed
Updates Nuget packages and fixes all the warnings
AKruimink Sep 5, 2024
cc99bfb
Merge branch 'update-to-net-8' of https://github.com/AKruimink/WinRef…
AKruimink Sep 5, 2024
8df933e
Updates the actions to use v3 and target the new .net version
AKruimink Sep 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions .github/workflows/build-project.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
15 changes: 8 additions & 7 deletions .github/workflows/test-project.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions src/Tests/WinReform.Domain.Tests/Displays/DisplayServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 },
Expand Down
2 changes: 1 addition & 1 deletion src/Tests/WinReform.Domain.Tests/Infrastructure/Messenger/EventBaseTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
43 changes: 22 additions & 21 deletions src/Tests/WinReform.Domain.Tests/Infrastructure/Messenger/EventSubscriptionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;
using Moq;
using Moq;
using WinReform.Domain.Infrastructure.Messenger;
using WinReform.Domain.Infrastructure.Messenger.Strategies;
using Xunit;
Expand All @@ -19,7 +18,7 @@ public void ConstructNonGeneric_NullActionReference_ShouldThrowArgumentNullExcep
// Assert
Assert.Throws<ArgumentNullException>(() =>
{
var eventSubscription = new EventSubscription(null!);
_ = new EventSubscription(null!);
});
}

Expand All @@ -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);
});
}

Expand All @@ -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!);
});
}

Expand All @@ -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);
});
}

Expand All @@ -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);
});
}

Expand All @@ -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);
});
}

Expand All @@ -107,7 +106,7 @@ public void ConstructNonGeneric_DifferentTargetTypeActionReference_ShouldThrowAr
// Assert
Assert.Throws<ArgumentException>(() =>
{
var eventSubscription = new EventSubscription(delegateActionReferenceMock.Object);
_ = new EventSubscription(delegateActionReferenceMock.Object);
});
}

Expand All @@ -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);
});
}

Expand All @@ -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);
});
}

Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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>();
Expand All @@ -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>();
Expand All @@ -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
Expand All @@ -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
Expand Down
Loading
Loading