diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c4953432..bc6de30a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,26 +25,26 @@ jobs:
           - os: windows-2019
             name: win-arm64
             param: -arm64
-          - os: ubuntu-20.04
+          - os: ubuntu-24.04
             name: linux-x64
-          - os: ubuntu-20.04
+          - os: ubuntu-24.04
             name: linux-musl-x64
-          - os: ubuntu-20.04
+          - os: ubuntu-24.04
             name: linux-arm64
-          - os: ubuntu-20.04
+          - os: ubuntu-24.04
             name: linux-musl-arm
-          - os: ubuntu-20.04
+          - os: ubuntu-24.04
             name: linux-musl-arm64
-          - os: ubuntu-20.04
+          - os: ubuntu-24.04
             name: linux-arm
-          - os: macos-11
+          - os: macos-13
             name: osx-x64
-          - os: macos-11
+          - os: macos-13
             name: osx-arm64
       fail-fast: false
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.2
+        uses: actions/checkout@v4.2.2
         with:
           submodules: true
       - name: Build Windows
@@ -54,44 +54,39 @@ jobs:
         if: runner.os == 'macOS'
         run: ./build.libgit2.sh
       - name: Setup QEMU
-        run: docker run --rm --privileged multiarch/qemu-user-static:register --reset
         if: matrix.name == 'linux-musl-arm' || matrix.name == 'linux-musl-arm64'
+        run: docker run --rm --privileged multiarch/qemu-user-static:register --reset
       - name: Build Linux
         if: runner.os == 'Linux'
         run: ./dockerbuild.sh
       - name: Upload artifacts
-        uses: actions/upload-artifact@v4.3.1
+        uses: actions/upload-artifact@v4.4.3
         with:
           name: ${{ matrix.name }}
           path: nuget.package/runtimes/${{ matrix.name }}
   package:
      name: Create package
      needs: build
-     runs-on: windows-2019
+     runs-on: ubuntu-24.04
      env:
        DOTNET_NOLOGO: true
      steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.2
+        uses: actions/checkout@v4.2.2
         with:
           fetch-depth: 0
       - name: Setup .NET SDK
-        uses: actions/setup-dotnet@v4.0.0
+        uses: actions/setup-dotnet@v4.1.0
         with:
-          dotnet-version: 8.0.x
-      - name: Install MinVer
-        run: dotnet tool install --global minver-cli
-      - name: Run MinVer
-        id: minver
-        run: echo "version=$(minver)" >> $env:GITHUB_OUTPUT
+          dotnet-version: 9.0.x
       - name: Download artifacts
-        uses: actions/download-artifact@v4.1.7
+        uses: actions/download-artifact@v4.1.8
         with:
           path: nuget.package/runtimes/
       - name: Create package
-        run: ./nuget.exe Pack nuget.package/NativeBinaries.nuspec -Version ${{ steps.minver.outputs.version }} -NoPackageAnalysis 
+        run: dotnet pack nuget.package
       - name: Upload NuGet package
-        uses: actions/upload-artifact@v4.3.1
+        uses: actions/upload-artifact@v4.4.3
         with:
           name: NuGet package
-          path: ./*.nupkg
+          path: ./nuget.package/*.nupkg
diff --git a/.gitignore b/.gitignore
index 202aff2c..87bac4fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,7 @@
 *.dylib
 *.so
 *.zip
+
+bin/
+obj/
+.vs/
diff --git a/nuget.exe b/nuget.exe
deleted file mode 100644
index a6caf01c..00000000
Binary files a/nuget.exe and /dev/null differ
diff --git a/nuget.package/LibGit2Sharp.NativeBinaries.csproj b/nuget.package/LibGit2Sharp.NativeBinaries.csproj
new file mode 100644
index 00000000..5d72ef07
--- /dev/null
+++ b/nuget.package/LibGit2Sharp.NativeBinaries.csproj
@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <NoBuild>true</NoBuild>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
+    <Authors>LibGit2Sharp contributors</Authors>
+    <PackageLicenseFile>libgit2\libgit2.license.txt</PackageLicenseFile>
+    <PackageProjectUrl>https://github.com/libgit2/libgit2sharp.nativebinaries</PackageProjectUrl>
+    <PackageIcon>libgit2\libgit2.png</PackageIcon>
+    <Description>Native binaries for LibGit2Sharp</Description>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <PackageOutputPath>$(MSBuildThisFileDirectory)</PackageOutputPath>
+    <NoWarn>$(NoWarn);NU5127</NoWarn>
+  </PropertyGroup>
+
+<ItemGroup>
+  <PackageReference Include="MinVer" Version="6.0.0" PrivateAssets="all" />
+</ItemGroup>
+
+  <ItemGroup>
+    <None Update="build\**\*" Pack="true" PackagePath="" />
+    <None Update="buildMultiTargeting\**\*" Pack="true" PackagePath="" />
+    <None Update="libgit2\**\*" Pack="true" PackagePath="" />
+    <None Update="runtimes\**\*" Pack="true" PackagePath="" />
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/nuget.package/NativeBinaries.nuspec b/nuget.package/NativeBinaries.nuspec
deleted file mode 100644
index a3bbd7c0..00000000
--- a/nuget.package/NativeBinaries.nuspec
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
-  <metadata>
-    <id>LibGit2Sharp.NativeBinaries</id>
-    <version>2.0.0</version>
-    <authors>LibGit2Sharp contributors</authors>
-    <license type="file">libgit2\libgit2.license.txt</license>
-    <projectUrl>https://github.com/libgit2/libgit2sharp.nativebinaries</projectUrl>
-    <icon>libgit2\libgit2.png</icon>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>Native binaries for LibGit2Sharp</description>
-    <repository type="git" url="https://github.com/libgit2/libgit2sharp.nativebinaries.git" />
-  </metadata>
-</package>