From 61972e24a99632919bf7030e14945ddc5eefd557 Mon Sep 17 00:00:00 2001 From: Stian Myhre Date: Thu, 5 Dec 2024 14:34:34 +0100 Subject: [PATCH 1/3] make LegacyUsbRegistry public (USB discovery research) --- stage/LibUsbDotNet/Main/LegacyUsbRegistry.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stage/LibUsbDotNet/Main/LegacyUsbRegistry.cs b/stage/LibUsbDotNet/Main/LegacyUsbRegistry.cs index f4aad730..072c2cee 100644 --- a/stage/LibUsbDotNet/Main/LegacyUsbRegistry.cs +++ b/stage/LibUsbDotNet/Main/LegacyUsbRegistry.cs @@ -39,7 +39,7 @@ public class LegacyUsbRegistry : UsbRegistry { private readonly UsbDevice mUSBDevice; - internal LegacyUsbRegistry(UsbDevice usbDevice) + public LegacyUsbRegistry(UsbDevice usbDevice) { mUSBDevice = usbDevice; GetPropertiesSPDRP(mUSBDevice, mDeviceProperties); @@ -247,4 +247,4 @@ public override string DevicePath get { return mUSBDevice.DevicePath; } } } -} \ No newline at end of file +} From 7d60921235baef96c4ebcbddbaf5f81916ac13c2 Mon Sep 17 00:00:00 2001 From: Thomas Mittet Date: Fri, 6 Dec 2024 12:12:48 +0100 Subject: [PATCH 2/3] Bump version to 2.2.34 --- stage/version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stage/version.json b/stage/version.json index 972cee58..64650b06 100644 --- a/stage/version.json +++ b/stage/version.json @@ -1,4 +1,4 @@ { "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "2.2.33" + "version": "2.2.34" } From 7156f80f48f8685f0fbb2ed4f199651b488ae953 Mon Sep 17 00:00:00 2001 From: Stian Myhre Date: Fri, 6 Dec 2024 14:05:00 +0100 Subject: [PATCH 3/3] update deprecated items in the github workflow --- .github/workflows/build.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index f50c2e10..eb90e955 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -2,7 +2,7 @@ name: build on: push: branches: - - v2 + - v2-huddly pull_request: jobs: @@ -27,21 +27,21 @@ jobs: run: vcpkg install ${{ matrix.package.name }}:${{ matrix.triplet }} - name: Upload vcpkg artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 if: always() with: name: ${{ matrix.package.name }}-${{ github.run_id }} path: ${{ env.VCPKG_ROOT }}/installed/ - name: Upload vcpkg build tree - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 if: always() with: name: ${{ matrix.package.name }}-${{ github.run_id }}-buildtree path: ${{ env.VCPKG_ROOT }}/buildtrees/${{ matrix.package.name }}/ libusb_osx: - runs-on: macos-12 + runs-on: macos-13 strategy: matrix: @@ -63,7 +63,7 @@ jobs: run: vcpkg install ${{ matrix.package.name }}:${{ matrix.triplet }} --overlay-triplets=${{ env.VCPKG_ROOT }}/triplets/community/ - name: Upload vcpkg artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 if: always() with: name: ${{ matrix.package.name }}-${{ github.run_id }} @@ -83,7 +83,7 @@ jobs: fetch-depth: 0 ref: 'v2' - - uses: actions/download-artifact@v2 + - uses: actions/download-artifact@v3 with: name: libusb-${{ github.run_id }} path: ${{ env.VCPKG_ROOT }}/installed/ @@ -99,14 +99,14 @@ jobs: run: dotnet pack .\stage\LibUsbDotNet\LibUsbDotNet.csproj -c Release -o ${{ github.workspace }}/nuget/ - name: Upload LibUsbDotNet NuGet package - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 if: always() with: name: LibUsbDotNet-${{ github.run_id }} path: '${{ github.workspace }}/nuget/' libusbdotnet_macos: - runs-on: macos-12 + runs-on: macos-13 needs: [ libusb_windows, libusb_osx ] @@ -119,7 +119,7 @@ jobs: fetch-depth: 0 ref: 'v2' - - uses: actions/download-artifact@v2 + - uses: actions/download-artifact@v3 with: name: libusb-${{ github.run_id }} path: ${{ env.VCPKG_ROOT }}/installed/