Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: build
on:
push:
branches:
- v2
- v2-huddly
pull_request:

jobs:
Expand All @@ -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:
Expand All @@ -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 }}
Expand All @@ -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/
Expand All @@ -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 ]

Expand All @@ -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/
Expand Down
4 changes: 2 additions & 2 deletions stage/LibUsbDotNet/Main/LegacyUsbRegistry.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -247,4 +247,4 @@ public override string DevicePath
get { return mUSBDevice.DevicePath; }
}
}
}
}
2 changes: 1 addition & 1 deletion stage/version.json
Original file line number Diff line number Diff line change
@@ -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"
}
Loading