Main to Production

.github/workflows/ci.yml

@@ -11,9 +11,5 @@ permissions:
   contents: read
 
 jobs:
-  build-native:
-    uses: ./.github/workflows/reusable-build-native.yml
-
   test:
-    needs: build-native
     uses: ./.github/workflows/reusable-test.yml

.github/workflows/release.yml

@@ -35,12 +35,8 @@ jobs:
           echo "version=$VERSION" >> "$GITHUB_OUTPUT"
           echo "Resolved version: $VERSION"
 
-  build-native:
-    needs: version
-    uses: ./.github/workflows/reusable-build-native.yml
-
   test:
-    needs: [version, build-native]
+    needs: version
     uses: ./.github/workflows/reusable-test.yml
 
   pack:

.github/workflows/reusable-nuget-publish.yml

@@ -18,6 +18,7 @@ jobs:
   publish:
     name: Publish to NuGet
     runs-on: ubuntu-24.04
+    environment: production
     steps:
       - uses: actions/setup-dotnet@v5
         with:

.github/workflows/reusable-test.yml

@@ -7,6 +7,7 @@ env:
   DOTNET_NOLOGO: 'true'
   DOTNET_CLI_TELEMETRY_OPTOUT: 'true'
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 'true'
+  VCPKG_BINARY_SOURCES: 'clear;x-gha,readwrite'
 
 permissions:
   contents: read
@@ -29,26 +30,46 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v6
+        with:
+          submodules: recursive
+          fetch-depth: 0
 
       - uses: actions/setup-dotnet@v5
         with:
           dotnet-version: '10.0.x'
 
-      - name: Install hidapi runtime (macOS)
+      - name: Install hidapi + toolchain (macOS)
         if: runner.os == 'macOS'
         run: brew install hidapi
 
-      - name: Install hidapi runtime (Linux)
+      - name: Install hidapi + toolchain (Linux)
         if: runner.os == 'Linux'
         run: |
           sudo apt-get update
           sudo apt-get install -y --no-install-recommends \
-            libhidapi-hidraw0 libhidapi-libusb0
+            cmake build-essential pkg-config libhidapi-dev
 
-      - uses: actions/download-artifact@v8
+      - name: Expose GHA cache tokens to vcpkg (Windows)
+        if: runner.os == 'Windows'
+        uses: actions/github-script@v9
         with:
-          name: native-${{ matrix.rid }}
-          path: build/native/${{ matrix.rid }}/
+          script: |
+            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
+            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
+
+      - name: Set vcpkg toolchain (Windows)
+        if: runner.os == 'Windows'
+        shell: bash
+        run: |
+          echo "CMAKE_EXTRA_ARGS=-DCMAKE_TOOLCHAIN_FILE=${VCPKG_INSTALLATION_ROOT//\\//}/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows" >> "$GITHUB_ENV"
+
+      - name: Cache CMake build dir
+        uses: actions/cache@v5
+        with:
+          path: build/cmake/${{ matrix.rid }}
+          key: cmake-${{ matrix.rid }}-${{ hashFiles('headsetcontrollib/CMakeLists.txt', 'headsetcontrollib/lib/**/*.cpp', 'headsetcontrollib/lib/**/*.hpp', 'headsetcontrollib/lib/**/*.h', 'headsetcontrollib/vcpkg.json') }}
+          restore-keys: |
+            cmake-${{ matrix.rid }}-
 
       - name: Cache NuGet packages
         uses: actions/cache@v5
@@ -60,6 +81,8 @@ jobs:
 
       - run: dotnet restore
 
+      # The HscPrepareNativeArtifacts target in HeadsetControl.NET.Native.csproj
+      # invokes build/build-native.sh for the host RID if no artefact is present.
       - run: dotnet build -c Release --no-restore
 
       - run: >-
@@ -68,6 +91,14 @@ jobs:
           --logger "trx;LogFileName=test-results.trx"
           --results-directory TestResults
 
+      - name: Upload native artefact
+        uses: actions/upload-artifact@v7
+        with:
+          name: native-${{ matrix.rid }}
+          path: build/native/${{ matrix.rid }}/
+          if-no-files-found: error
+          retention-days: 14
+
       - if: always()
         uses: actions/upload-artifact@v7
         with:

Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <TargetFramework>net10.0</TargetFramework>
+        <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
         <LangVersion>latest</LangVersion>
 
         <Nullable>enable</Nullable>
@@ -35,7 +35,8 @@
         <RepositoryType>git</RepositoryType>
         <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
         <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-        <Version>0.2.0</Version>
+        <PackageReadmeFile>README.md</PackageReadmeFile>
+        <Version>0.3.0</Version>
     </PropertyGroup>
 
     <PropertyGroup>
@@ -48,6 +49,11 @@
               PackagePath="\"
               Visible="false"
               Condition="Exists('$(MSBuildThisFileDirectory)LICENSE')" />
+        <None Include="$(MSBuildThisFileDirectory)README.md"
+              Pack="true"
+              PackagePath="\"
+              Visible="false"
+              Condition="Exists('$(MSBuildThisFileDirectory)README.md')" />
     </ItemGroup>
 
 </Project>

README.md

@@ -20,7 +20,6 @@ headsetcontrollib/               git submodule with the native source
 
 ```bash
 git submodule update --init --recursive
-build/build-native.sh              # host RID — or: --rid linux-x64
 dotnet test -c Release
 ```
 

build/build-native.sh

@@ -44,6 +44,37 @@ BUILD_DIR="${BUILD_ROOT}/${RID}"
 OUT_DIR="${OUT_ROOT}/${RID}"
 mkdir -p "${BUILD_DIR}" "${OUT_DIR}"
 
+# Serialise concurrent invocations for the same RID — when this script is
+# wired into a multi-targeted .NET build, MSBuild may run it in parallel for
+# each TFM, and the inner CMake build directory is not concurrency-safe.
+# `mkdir` is atomic across processes, so we use a sentinel directory as the
+# lock. The first process builds; later ones wait, then exit early once the
+# artefact is in place.
+LOCK_DIR="${BUILD_DIR}.lock"
+trap 'rmdir "${LOCK_DIR}" 2>/dev/null || true' EXIT
+
+WAITED=0
+while ! mkdir "${LOCK_DIR}" 2>/dev/null; do
+    if [[ ${WAITED} -ge 600 ]]; then
+        echo "error: timed out waiting for ${LOCK_DIR}" >&2
+        exit 1
+    fi
+    sleep 1
+    WAITED=$((WAITED + 1))
+done
+
+case "${RID}" in
+    osx-*)  EXPECTED="${OUT_DIR}/libheadsetcontrol.dylib" ;;
+    linux-*) EXPECTED="${OUT_DIR}/libheadsetcontrol.so"   ;;
+    win-*)  EXPECTED="${OUT_DIR}/headsetcontrol.dll"      ;;
+    *)      EXPECTED=""                                    ;;
+esac
+
+if [[ -n "${EXPECTED}" && -f "${EXPECTED}" ]]; then
+    echo ">> ${EXPECTED} already present, skipping build"
+    exit 0
+fi
+
 echo ">> Configuring native HeadsetControl for ${RID}"
 # shellcheck disable=SC2086
 cmake -S "${NATIVE_SRC}" -B "${BUILD_DIR}" \

samples/HeadsetControl.NET.Sample/Program.cs

@@ -1,6 +1,7 @@
 using HeadsetControl.NET;
+using HeadsetControl.NET.Exceptions;
 
-bool useTestDevice = args.Contains("--test", StringComparer.OrdinalIgnoreCase);
+var useTestDevice = args.Contains("--test", StringComparer.OrdinalIgnoreCase);
 
 Console.WriteLine($"HeadsetControl native version: {HeadsetControlLibrary.Version}");
 Console.WriteLine($"Supported device models: {HeadsetControlLibrary.SupportedDeviceCount}");
@@ -13,17 +14,17 @@
     Console.WriteLine();
 }
 
-using HeadsetCollection headsets = HeadsetControlLibrary.Discover();
+using var headsets = HeadsetControlLibrary.Discover();
 
 if (headsets.Count == 0)
 {
     Console.WriteLine("No supported headset connected.");
     return 0;
 }
 
-for (int i = 0; i < headsets.Count; i++)
+for (var i = 0; i < headsets.Count; i++)
 {
-    Headset headset = headsets[i];
+    var headset = headsets[i];
 
     Console.WriteLine($"[{i}] {headset}");
     Console.WriteLine($"     Vendor : {headset.VendorName ?? "(unknown)"} (0x{headset.VendorId:X4})");
@@ -47,8 +48,8 @@ static void TryReadBattery(Headset headset)
 
     try
     {
-        BatteryInfo battery = headset.GetBattery();
-        string level = battery.LevelPercent is int pct ? $"{pct}%" : "n/a";
+        var battery = headset.GetBattery();
+        var level = battery.LevelPercent is int pct ? $"{pct}%" : "n/a";
         Console.WriteLine($"     Battery: {battery.Status} ({level})");
     }
     catch (HeadsetControlException ex)
@@ -66,7 +67,7 @@ static void TryReadChatMix(Headset headset)
 
     try
     {
-        ChatMixInfo mix = headset.GetChatMix();
+        var mix = headset.GetChatMix();
         Console.WriteLine($"     ChatMix: level={mix.Level} game={mix.GameVolumePercent}% chat={mix.ChatVolumePercent}%");
     }
     catch (HeadsetControlException ex)