diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml
index f734ea7..9aa2438 100644
--- a/.github/workflows/dotnet-core.yml
+++ b/.github/workflows/dotnet-core.yml
@@ -5,21 +5,29 @@ on:
     branches: [ master ]
   pull_request:
     branches: [ master ]
+  workflow_dispatch:
 
 jobs:
   build:
-
-    runs-on: ubuntu-latest
-
+    runs-on: windows-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 3.1.101
+    - name: Checkout the code
+      uses: actions/checkout@v3
+    - name: Setup MSBuild
+      uses: microsoft/setup-msbuild@v1
+    - name: Setup NuGet
+      uses: NuGet/setup-nuget@v1.0.2
+      env:
+        ACTIONS_ALLOW_UNSECURE_COMMANDS: true
+    - name: Setup VSTest Path
+      uses: darenm/Setup-VSTest@v1.2
+      env:
+        ACTIONS_ALLOW_UNSECURE_COMMANDS: true
     - name: Install dependencies
-      run: dotnet restore
+      run: nuget restore ./src/NLoad.sln
     - name: Build
-      run: dotnet build --configuration Release --no-restore
+      run: msbuild.exe ./src/NLoad.sln
     - name: Test
-      run: dotnet test --no-restore --verbosity normal
+      run: |
+        vstest.console.exe "./src/NLoad.App.Tests/bin/Debug/NLoad.App.Tests.dll" /Logger:trx
+        vstest.console.exe "./src/NLoad.Tests/bin/Debug/net8.0/NLoad.Tests.dll" /Logger:trx
diff --git a/src/NLoad.Tests/NLoad.Tests.csproj b/src/NLoad.Tests/NLoad.Tests.csproj
index 1c83add..594109a 100644
--- a/src/NLoad.Tests/NLoad.Tests.csproj
+++ b/src/NLoad.Tests/NLoad.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ApplicationIcon />
     <OutputType>Library</OutputType>
     <StartupObject />