Skip to content

Commit

Permalink
Merge pull request #35 from IntergatedCircuits/basic-ci
Browse files Browse the repository at this point in the history
update to .NET 8, add CI
  • Loading branch information
benedekkupper authored Sep 17, 2024
2 parents b0eca5d + 56e2b3e commit 45e6d55
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 249 deletions.
26 changes: 26 additions & 0 deletions .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# This workflow will build a .NET project
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-net

name: .NET

on:
push:
branches: [ "master" ]
pull_request:
branches: [ "master" ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x
- name: Restore dependencies
run: dotnet restore HidSharp/HidSharp.csproj
- name: Build
run: dotnet build HidSharp/HidSharp.csproj --no-restore
71 changes: 11 additions & 60 deletions HidSharp.Test/HidSharp.Test.csproj
Original file line number Diff line number Diff line change
@@ -1,67 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{5E83ACC1-19FA-4996-BBAE-BF7DB4604812}</ProjectGuid>
<TargetFramework>net8.0</TargetFramework>
<OutputType>Exe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>HidSharp.Test</RootNamespace>
<AssemblyName>HidSharp.Test</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>3.5</OldToolsVersion>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\bin\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<OutputPath>..\bin\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>x86</PlatformTarget>
<Prefer32Bit>false</Prefer32Bit>
<Company>Illusory Studios LLC</Company>
<Copyright>Copyright © 2010-2013 James F. Bellinger &lt;http://www.zer7.com/software/hidsharp&gt;</Copyright>
<Description>HID test program</Description>
<Product>HidSharp</Product>
<AssemblyTitle>HidSharp.Test</AssemblyTitle>
<FileVersion>1.3.0.0</FileVersion>
<AssemblyVersion>1.3.0.0</AssemblyVersion>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
</ItemGroup>
<ItemGroup>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\HidSharp\HidSharp.csproj">
<Project>{0DB86674-2A7B-4BDC-93C1-3F7DC771426C}</Project>
<Name>HidSharp</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<ProjectReference Include="..\HidSharp\HidSharp.csproj" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
8 changes: 0 additions & 8 deletions HidSharp.Test/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,5 @@
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

[assembly: AssemblyCompany("Illusory Studios LLC")]
[assembly: AssemblyCopyright("Copyright © 2010-2013 James F. Bellinger <http://www.zer7.com/software/hidsharp>")]
[assembly: AssemblyDescription("HID test program")]
[assembly: AssemblyProduct("HidSharp")]
[assembly: AssemblyTitle("HidSharp.Test")]
[assembly: AssemblyFileVersion("1.3.0.0")]
[assembly: AssemblyVersion("1.3.0.0")]

[assembly: ComVisible(false)]
[assembly: Guid("2F0DC374-5974-49E6-A7C6-5FFDEDE5E21D")]
184 changes: 12 additions & 172 deletions HidSharp/HidSharp.csproj
Original file line number Diff line number Diff line change
@@ -1,177 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{0DB86674-2A7B-4BDC-93C1-3F7DC771426C}</ProjectGuid>
<TargetFramework>net8.0</TargetFramework>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>HidSharp</RootNamespace>
<AssemblyName>HidSharp</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>3.5</OldToolsVersion>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\bin\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<RegisterForComInterop>false</RegisterForComInterop>
<DocumentationFile>..\bin\HidSharp.XML</DocumentationFile>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<OutputPath>..\bin\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<RegisterForComInterop>false</RegisterForComInterop>
<DocumentationFile>..\bin\HidSharp.XML</DocumentationFile>
<Prefer32Bit>false</Prefer32Bit>
<Company>Illusory Studios LLC</Company>
<Copyright>Copyright © 2010-2019 James F. Bellinger &lt;http://www.zer7.com/software/hidsharp&gt;</Copyright>
<Description>C# HID wrappers</Description>
<Product>HidSharp</Product>
<AssemblyTitle>HidSharp</AssemblyTitle>
<AssemblyVersion>2.1.0.0</AssemblyVersion>
<FileVersion>2.1.0.0</FileVersion>
<InformationalVersion>2.1.0</InformationalVersion>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
</ItemGroup>
<ItemGroup>
<Compile Include="AsyncResult.cs" />
<Compile Include="Experimental\BleCccd.cs" />
<Compile Include="Experimental\BleCharacteristic.cs" />
<Compile Include="Experimental\BleDescriptor.cs" />
<Compile Include="Experimental\BleCharacteristicProperties.cs" />
<Compile Include="Experimental\BleDevice.cs" />
<Compile Include="Experimental\BleDiscovery.cs" />
<Compile Include="Experimental\BleEvent.cs" />
<Compile Include="Experimental\BleUuids.cs" />
<Compile Include="Experimental\BleRequestFlags.cs" />
<Compile Include="Experimental\BleService.cs" />
<Compile Include="Experimental\BleUuid.cs" />
<Compile Include="Experimental\BleStream.cs" />
<Compile Include="CommonException.cs" />
<Compile Include="DeviceTypes.cs" />
<Compile Include="Exceptions\DeviceIOException.cs" />
<Compile Include="Exceptions\DeviceUnauthorizedAccessException.cs" />
<Compile Include="Exceptions\IDeviceException.cs" />
<Compile Include="Device.cs" />
<Compile Include="DeviceFilter.cs" />
<Compile Include="DeviceList.cs" />
<Compile Include="DeviceListChangedEventArgs.cs" />
<Compile Include="DeviceOpenUtility.cs" />
<Compile Include="DeviceException.cs" />
<Compile Include="LocalDeviceList.cs" />
<Compile Include="ImplementationDetail.cs" />
<Compile Include="DeviceStream.cs" />
<Compile Include="OpenOption.cs" />
<Compile Include="OpenPriority.cs" />
<Compile Include="OpenConfiguration.cs" />
<Compile Include="Platform\Linux\LinuxSerialDevice.cs" />
<Compile Include="Platform\Linux\LinuxSerialStream.cs" />
<Compile Include="Platform\Linux\NativeMethodsLibudev.cs" />
<Compile Include="Platform\Linux\NativeMethodsLibudev0.cs" />
<Compile Include="Platform\Linux\NativeMethodsLibudev1.cs" />
<Compile Include="Platform\MacOS\MacSerialDevice.cs" />
<Compile Include="Platform\MacOS\MacSerialStream.cs" />
<Compile Include="Platform\SysBleStream.cs" />
<Compile Include="Platform\SysSerialStream.cs" />
<Compile Include="Platform\SysRefCountHelper.cs" />
<Compile Include="Platform\SystemEvents.cs" />
<Compile Include="Platform\SysHidStream.cs" />
<Compile Include="FilteredDeviceList.cs" />
<Compile Include="Platform\Windows\WinBleCharacteristic.cs" />
<Compile Include="Platform\Windows\WinBleDescriptor.cs" />
<Compile Include="Platform\Windows\WinBleDevice.cs" />
<Compile Include="Platform\Windows\WinBleService.cs" />
<Compile Include="Platform\Windows\WinBleStream.cs" />
<Compile Include="Platform\Windows\WinSerialDevice.cs" />
<Compile Include="Platform\Windows\WinSerialStream.cs" />
<Compile Include="Platform\Windows\WinHidDevice.ReportDescriptorReconstructor.cs" />
<Compile Include="Platform\Windows\WinHidDevice.ReportDescriptorBuilder.cs" />
<Compile Include="Reports\DataConvert.cs" />
<Compile Include="Reports\DataValue.cs" />
<Compile Include="Reports\DeviceItem.cs" />
<Compile Include="Reports\Input\DeviceItemInputParser.cs" />
<Compile Include="Reports\Input\HidDeviceInputReceiver.cs" />
<Compile Include="Reports\ReportDescriptorParseState.cs" />
<Compile Include="Reports\Units\UnitKind.cs" />
<Compile Include="Reports\Usage.cs" />
<Compile Include="Reports\ExpectedUsageType.cs" />
<Compile Include="SerialSettings.cs" />
<Compile Include="SerialDevice.cs" />
<Compile Include="SerialParity.cs" />
<Compile Include="SerialStream.cs" />
<Compile Include="Throw.cs" />
<Compile Include="HidDevice.cs" />
<Compile Include="HidDeviceLoader.cs" />
<Compile Include="HidStream.cs" />
<Compile Include="Platform\HidSelector.cs" />
<Compile Include="Platform\HidManager.cs" />
<Compile Include="Platform\Utf8Marshaler.cs" />
<Compile Include="Platform\Windows\NativeMethods.cs" />
<Compile Include="Platform\Windows\WinHidDevice.cs" />
<Compile Include="Platform\Windows\WinHidManager.cs" />
<Compile Include="Platform\Windows\WinHidStream.cs" />
<Compile Include="Platform\Linux\NativeMethods.cs" />
<Compile Include="Platform\Linux\LinuxHidDevice.cs" />
<Compile Include="Platform\Linux\LinuxHidManager.cs" />
<Compile Include="Platform\Linux\LinuxHidStream.cs" />
<Compile Include="Platform\MacOS\NativeMethods.cs" />
<Compile Include="Platform\MacOS\MacHidDevice.cs" />
<Compile Include="Platform\MacOS\MacHidManager.cs" />
<Compile Include="Platform\MacOS\MacHidStream.cs" />
<Compile Include="Platform\Libusb\NativeMethods.cs" />
<Compile Include="Platform\Libusb\LibusbHidManager.cs" />
<Compile Include="Platform\Unsupported\UnsupportedHidManager.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Reports\Encodings\CollectionType.cs" />
<Compile Include="Reports\DataItemFlags.cs" />
<Compile Include="Reports\Encodings\GlobalItemTag.cs" />
<Compile Include="Reports\Encodings\LocalItemTag.cs" />
<Compile Include="Reports\Encodings\EncodedItem.cs" />
<Compile Include="Reports\Encodings\MainItemTag.cs" />
<Compile Include="Reports\Encodings\ItemType.cs" />
<Compile Include="Reports\Indexes.cs" />
<Compile Include="Reports\IndexList.cs" />
<Compile Include="Reports\IndexRange.cs" />
<Compile Include="Reports\Report.cs" />
<Compile Include="Reports\DescriptorCollectionItem.cs" />
<Compile Include="Reports\ReportDescriptor.cs" />
<Compile Include="Reports\DescriptorItem.cs" />
<Compile Include="Reports\DataItem.cs" />
<Compile Include="Reports\ReportType.cs" />
<Compile Include="Reports\Units\CurrentUnit.cs" />
<Compile Include="Reports\Units\LengthUnit.cs" />
<Compile Include="Reports\Units\LuminousIntensityUnit.cs" />
<Compile Include="Reports\Units\MassUnit.cs" />
<Compile Include="Reports\Units\TemperatureUnit.cs" />
<Compile Include="Reports\Units\TimeUnit.cs" />
<Compile Include="Reports\Units\Unit.cs" />
<Compile Include="Reports\Units\UnitSystem.cs" />
<Compile Include="Utility\BcdHelper.cs" />
<Compile Include="Utility\HResult.cs" />
<Compile Include="Utility\HidSharpDiagnostics.cs" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<ItemGroup />
</Project>
9 changes: 0 additions & 9 deletions HidSharp/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
using System.Reflection;
using System.Runtime.InteropServices;

[assembly: AssemblyCompany("Illusory Studios LLC")]
[assembly: AssemblyCopyright("Copyright © 2010-2019 James F. Bellinger <http://www.zer7.com/software/hidsharp>")]
[assembly: AssemblyDescription("C# HID wrappers")]
[assembly: AssemblyProduct("HidSharp")]
[assembly: AssemblyTitle("HidSharp")]
[assembly: AssemblyVersion("2.1.0.0")]
[assembly: AssemblyFileVersion("2.1.0.0")]
[assembly: AssemblyInformationalVersion("2.1.0")]

[assembly: ComVisible(false)]
[assembly: Guid("1b874372-4c6c-4acb-9f4a-906f6738cff9")]

0 comments on commit 45e6d55

Please sign in to comment.