Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SDK-492/Make LegacyUsbRegistry constructor public #8

Merged
merged 3 commits into from
Dec 6, 2024
Merged

SDK-492/Make LegacyUsbRegistry constructor public #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
61972e2
make LegacyUsbRegistry public (USB discovery research)
smy-huddly Dec 5, 2024
7d60921
Bump version to 2.2.34
tmittet Dec 6, 2024
7156f80
update deprecated items in the github workflow
smy-huddly Dec 6, 2024
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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