diff --git a/Directory.Build.props b/Directory.Build.props
index ef8ca81c..77078fc6 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -10,6 +10,7 @@ SPDX-License-Identifier: GPL-3.0-only
     <!-- Use the latest .NET SDK -->
     <!-- This product requires Windows 10 (Windows Server 2019) or higher -->
     <MainTargetFramework>net8.0-windows10.0.17763</MainTargetFramework>
+    <GitVersionTargetFramework>net8.0</GitVersionTargetFramework>
   </PropertyGroup>
 
   <!-- Sane defaults; override in project where needed -->
diff --git a/Directory.Build.targets b/Directory.Build.targets
deleted file mode 100644
index 1e3c6769..00000000
--- a/Directory.Build.targets
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-SPDX-FileCopyrightText: 2024 Frans van Dorsselaer
-
-SPDX-License-Identifier: GPL-3.0-only
--->
-<Project>
-
-  <PropertyGroup>
-    <!-- Fix GitVersion -->
-    <GitVersionFileExe>dotnet &quot;$(PkgGitVersion_MsBuild)/tools/net8.0/gitversion.dll&quot;</GitVersionFileExe>
-    <GitVersionAssemblyFile>$(PkgGitVersion_MsBuild)/tools/net8.0/GitVersion.MsBuild.dll</GitVersionAssemblyFile>
-  </PropertyGroup>
-
-</Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
index d2b79b11..1481b936 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -7,7 +7,7 @@ SPDX-License-Identifier: GPL-3.0-only
 <Project>
   <ItemGroup>
     <!-- all -->
-    <PackageVersion Include="GitVersion.MsBuild" Version="6.0.1" />
+    <PackageVersion Include="GitVersion.MsBuild" Version="6.0.2" />
     <!-- Usbipd -->
     <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.106" />
diff --git a/GitVersion.yml b/GitVersion.yml
index b9aec8dd..422fef5a 100644
--- a/GitVersion.yml
+++ b/GitVersion.yml
@@ -3,6 +3,6 @@
 # SPDX-License-Identifier: GPL-3.0-only
 
 ---
-# yaml-language-server: $schema=https://raw.githubusercontent.com/GitTools/GitVersion/main/schemas/5.12/GitVersion.configuration.json
+# yaml-language-server: $schema=https://raw.githubusercontent.com/GitTools/GitVersion/main/schemas/6.0/GitVersion.configuration.json
 
 assembly-file-versioning-format: '{Major}.{Minor}.{Patch}.{env:GITHUB_RUN_NUMBER ?? 0}'
diff --git a/Installer/packages.lock.json b/Installer/packages.lock.json
index dfa48777..41af03e3 100644
--- a/Installer/packages.lock.json
+++ b/Installer/packages.lock.json
@@ -4,9 +4,9 @@
     "native,Version=v0.0": {
       "GitVersion.MsBuild": {
         "type": "Direct",
-        "requested": "[6.0.1, )",
-        "resolved": "6.0.1",
-        "contentHash": "7nTvs5Uy+pc6kgmHFsjBEY8XYNWoWW7xp3zyP18YcUibm/Kjf3dPaDXhJKqLwOQmpiTkeAzFU1PvGgn1c8s1OA=="
+        "requested": "[6.0.2, )",
+        "resolved": "6.0.2",
+        "contentHash": "rGj4pT8bBEb92ajJR0eFvY5apVy/U4GdsQ89vLBv0zFGJ8ddEv3Fq27mN8oI+xmCIdx6PlPs+JNFA22FCR5VjA=="
       },
       "WixToolset.Firewall.wixext": {
         "type": "Direct",
diff --git a/UnitTests/packages.lock.json b/UnitTests/packages.lock.json
index ec92a064..c9d6d254 100644
--- a/UnitTests/packages.lock.json
+++ b/UnitTests/packages.lock.json
@@ -10,9 +10,9 @@
       },
       "GitVersion.MsBuild": {
         "type": "Direct",
-        "requested": "[6.0.1, )",
-        "resolved": "6.0.1",
-        "contentHash": "7nTvs5Uy+pc6kgmHFsjBEY8XYNWoWW7xp3zyP18YcUibm/Kjf3dPaDXhJKqLwOQmpiTkeAzFU1PvGgn1c8s1OA=="
+        "requested": "[6.0.2, )",
+        "resolved": "6.0.2",
+        "contentHash": "rGj4pT8bBEb92ajJR0eFvY5apVy/U4GdsQ89vLBv0zFGJ8ddEv3Fq27mN8oI+xmCIdx6PlPs+JNFA22FCR5VjA=="
       },
       "Microsoft.NET.Test.Sdk": {
         "type": "Direct",
diff --git a/UsbIds/packages.lock.json b/UsbIds/packages.lock.json
index 2c365e91..0d597044 100644
--- a/UsbIds/packages.lock.json
+++ b/UsbIds/packages.lock.json
@@ -4,9 +4,9 @@
     ".NETStandard,Version=v2.0": {
       "GitVersion.MsBuild": {
         "type": "Direct",
-        "requested": "[6.0.1, )",
-        "resolved": "6.0.1",
-        "contentHash": "7nTvs5Uy+pc6kgmHFsjBEY8XYNWoWW7xp3zyP18YcUibm/Kjf3dPaDXhJKqLwOQmpiTkeAzFU1PvGgn1c8s1OA=="
+        "requested": "[6.0.2, )",
+        "resolved": "6.0.2",
+        "contentHash": "rGj4pT8bBEb92ajJR0eFvY5apVy/U4GdsQ89vLBv0zFGJ8ddEv3Fq27mN8oI+xmCIdx6PlPs+JNFA22FCR5VjA=="
       },
       "Microsoft.CodeAnalysis.CSharp": {
         "type": "Direct",
diff --git a/Usbipd.Automation/packages.lock.json b/Usbipd.Automation/packages.lock.json
index 5932a8c4..c79d5bfb 100644
--- a/Usbipd.Automation/packages.lock.json
+++ b/Usbipd.Automation/packages.lock.json
@@ -4,9 +4,9 @@
     ".NETStandard,Version=v2.0": {
       "GitVersion.MsBuild": {
         "type": "Direct",
-        "requested": "[6.0.1, )",
-        "resolved": "6.0.1",
-        "contentHash": "7nTvs5Uy+pc6kgmHFsjBEY8XYNWoWW7xp3zyP18YcUibm/Kjf3dPaDXhJKqLwOQmpiTkeAzFU1PvGgn1c8s1OA=="
+        "requested": "[6.0.2, )",
+        "resolved": "6.0.2",
+        "contentHash": "rGj4pT8bBEb92ajJR0eFvY5apVy/U4GdsQ89vLBv0zFGJ8ddEv3Fq27mN8oI+xmCIdx6PlPs+JNFA22FCR5VjA=="
       },
       "NETStandard.Library": {
         "type": "Direct",
@@ -26,9 +26,9 @@
     "net8.0-windows10.0.17763": {
       "GitVersion.MsBuild": {
         "type": "Direct",
-        "requested": "[6.0.1, )",
-        "resolved": "6.0.1",
-        "contentHash": "7nTvs5Uy+pc6kgmHFsjBEY8XYNWoWW7xp3zyP18YcUibm/Kjf3dPaDXhJKqLwOQmpiTkeAzFU1PvGgn1c8s1OA=="
+        "requested": "[6.0.2, )",
+        "resolved": "6.0.2",
+        "contentHash": "rGj4pT8bBEb92ajJR0eFvY5apVy/U4GdsQ89vLBv0zFGJ8ddEv3Fq27mN8oI+xmCIdx6PlPs+JNFA22FCR5VjA=="
       },
       "Microsoft.NET.ILLink.Tasks": {
         "type": "Direct",
diff --git a/Usbipd.PowerShell/packages.lock.json b/Usbipd.PowerShell/packages.lock.json
index 38f91f8e..d18d47ca 100644
--- a/Usbipd.PowerShell/packages.lock.json
+++ b/Usbipd.PowerShell/packages.lock.json
@@ -4,9 +4,9 @@
     ".NETStandard,Version=v2.0": {
       "GitVersion.MsBuild": {
         "type": "Direct",
-        "requested": "[6.0.1, )",
-        "resolved": "6.0.1",
-        "contentHash": "7nTvs5Uy+pc6kgmHFsjBEY8XYNWoWW7xp3zyP18YcUibm/Kjf3dPaDXhJKqLwOQmpiTkeAzFU1PvGgn1c8s1OA=="
+        "requested": "[6.0.2, )",
+        "resolved": "6.0.2",
+        "contentHash": "rGj4pT8bBEb92ajJR0eFvY5apVy/U4GdsQ89vLBv0zFGJ8ddEv3Fq27mN8oI+xmCIdx6PlPs+JNFA22FCR5VjA=="
       },
       "NETStandard.Library": {
         "type": "Direct",
diff --git a/Usbipd/packages.lock.json b/Usbipd/packages.lock.json
index 552b9dba..6c637e1d 100644
--- a/Usbipd/packages.lock.json
+++ b/Usbipd/packages.lock.json
@@ -4,9 +4,9 @@
     "net8.0-windows10.0.17763": {
       "GitVersion.MsBuild": {
         "type": "Direct",
-        "requested": "[6.0.1, )",
-        "resolved": "6.0.1",
-        "contentHash": "7nTvs5Uy+pc6kgmHFsjBEY8XYNWoWW7xp3zyP18YcUibm/Kjf3dPaDXhJKqLwOQmpiTkeAzFU1PvGgn1c8s1OA=="
+        "requested": "[6.0.2, )",
+        "resolved": "6.0.2",
+        "contentHash": "rGj4pT8bBEb92ajJR0eFvY5apVy/U4GdsQ89vLBv0zFGJ8ddEv3Fq27mN8oI+xmCIdx6PlPs+JNFA22FCR5VjA=="
       },
       "Microsoft.DotNet.ILCompiler": {
         "type": "Direct",
diff --git a/usbipd-win.sln b/usbipd-win.sln
index 1281e44f..cef562da 100644
--- a/usbipd-win.sln
+++ b/usbipd-win.sln
@@ -13,7 +13,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		codecov.yml = codecov.yml
 		COPYING.md = COPYING.md
 		Directory.Build.props = Directory.Build.props
-		Directory.Build.targets = Directory.Build.targets
 		Directory.Packages.props = Directory.Packages.props
 		Fake_GitVersionInformation.cs = Fake_GitVersionInformation.cs
 		GitVersion.yml = GitVersion.yml