Skip to content

Commit 3c5af72

Browse files
DarthAffeDarthAffe
authored
Merge pull request #451 from DarthAffe/Development
3.2
2 parents b0acc61 + 62a6911 commit 3c5af72

36 files changed

Lines changed: 108 additions & 79 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@ jobs:
2121
with:
2222
fetch-depth: 0
2323
- name: Setup .NET
24-
uses: actions/setup-dotnet@v4
24+
uses: actions/setup-dotnet@v5
2525
with:
2626
dotnet-version: |
27+
10.0.x
2728
9.0.x
2829
8.0.x
2930
- name: Restore dependencies
@@ -32,6 +33,12 @@ jobs:
3233
run: dotnet build --no-restore --configuration Release /p:Version=${{ github.event.inputs.version }}-prerelease.${{ github.event.inputs.increment }}
3334
- name: Test
3435
run: dotnet test --no-build --verbosity normal --configuration Release
36+
- name: Upload a Build Artifact NET10
37+
uses: actions/upload-artifact@v4.3.1
38+
with:
39+
name: RGB.NET-NET10
40+
path: bin/net10.0/RGB.NET.*.dll
41+
if-no-files-found: error
3542
- name: Upload a Build Artifact NET9
3643
uses: actions/upload-artifact@v4.3.1
3744
with:

‎.github/workflows/pr_verify.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ jobs:
1212
steps:
1313
- uses: actions/checkout@v4.1.1
1414
- name: Setup .NET
15-
uses: actions/setup-dotnet@v4
15+
uses: actions/setup-dotnet@v5
1616
with:
1717
dotnet-version: |
18+
10.0.x
1819
9.0.x
1920
8.0.x
2021
- name: Restore dependencies

‎.github/workflows/release.yml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ jobs:
1717
with:
1818
fetch-depth: 0
1919
- name: Setup .NET
20-
uses: actions/setup-dotnet@v4
20+
uses: actions/setup-dotnet@v5
2121
with:
2222
dotnet-version: |
23+
10.0.x
2324
9.0.x
2425
8.0.x
2526
- name: Restore dependencies
@@ -28,6 +29,12 @@ jobs:
2829
run: dotnet build --no-restore --configuration Release /p:Version=${{ github.event.inputs.version }}
2930
- name: Test
3031
run: dotnet test --no-build --verbosity normal --configuration Release
32+
- name: Upload a Build Artifact NET10
33+
uses: actions/upload-artifact@v4.3.1
34+
with:
35+
name: RGB.NET-NET10
36+
path: bin/net10.0/RGB.NET.*.dll
37+
if-no-files-found: error
3138
- name: Upload a Build Artifact NET9
3239
uses: actions/upload-artifact@v4.3.1
3340
with:
@@ -51,6 +58,6 @@ jobs:
5158
with:
5259
tag_name: v${{ github.event.inputs.version }}
5360
generate_release_notes: true
54-
files: bin/net9.0/RGB.NET.*.dll
61+
files: bin/net10.0/RGB.NET.*.dll
5562
- name: Nuget Push
5663
run: dotnet nuget push **\*.nupkg --skip-duplicate --api-key ${{ secrets.NUGET_TOKEN }} --source https://api.nuget.org/v3/index.json

‎RGB.NET.Core/RGB.NET.Core.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
3+
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
44
<LangVersion>latest</LangVersion>
55
<Nullable>enable</Nullable>
66

@@ -15,8 +15,8 @@
1515
<RootNamespace>RGB.NET.Core</RootNamespace>
1616
<Description>Core-Module of RGB.NET</Description>
1717
<Summary>Core-Module of RGB.NET, a C# (.NET) library for accessing various RGB-peripherals</Summary>
18-
<Copyright>Copyright © Darth Affe 2023</Copyright>
19-
<PackageCopyright>Copyright © Darth Affe 2023</PackageCopyright>
18+
<Copyright>Copyright © Darth Affe 2026</Copyright>
19+
<PackageCopyright>Copyright © Darth Affe 2026</PackageCopyright>
2020
<PackageIcon>icon.png</PackageIcon>
2121
<PackageReadmeFile>README.md</PackageReadmeFile>
2222
<PackageProjectUrl>https://github.com/DarthAffe/RGB.NET</PackageProjectUrl>

‎RGB.NET.Devices.Asus/RGB.NET.Devices.Asus.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
3+
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
44
<LangVersion>latest</LangVersion>
55
<Nullable>enable</Nullable>
66

@@ -15,8 +15,8 @@
1515
<RootNamespace>RGB.NET.Devices.Asus</RootNamespace>
1616
<Description>Asus-Device-Implementations of RGB.NET</Description>
1717
<Summary>Asus-Device-Implementations of RGB.NET, a C# (.NET) library for accessing various RGB-peripherals</Summary>
18-
<Copyright>Copyright © Darth Affe 2023</Copyright>
19-
<PackageCopyright>Copyright © Darth Affe 2023</PackageCopyright>
18+
<Copyright>Copyright © Darth Affe 2026</Copyright>
19+
<PackageCopyright>Copyright © Darth Affe 2026</PackageCopyright>
2020
<PackageIcon>icon.png</PackageIcon>
2121
<PackageReadmeFile>README.md</PackageReadmeFile>
2222
<PackageProjectUrl>https://github.com/DarthAffe/RGB.NET</PackageProjectUrl>

‎RGB.NET.Devices.CoolerMaster/Native/_CoolerMasterSDK.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ private static void LoadCMSDK()
4747
#if NET6_0
4848
if (_handle == IntPtr.Zero) throw new RGBDeviceException($"CoolerMaster LoadLibrary failed with error code {Marshal.GetLastPInvokeError()}");
4949
#else
50-
if (_handle == 0) throw new RGBDeviceException($"CoolerMaster LoadLibrary failed with error code {Marshal.GetLastWin32Error()}");
50+
if (_handle == 0) throw new RGBDeviceException($"CoolerMaster LoadLibrary failed with error code {Marshal.GetLastSystemError()}");
5151
#endif
5252

5353
_getSDKVersionPointer = (GetSDKVersionPointer)Marshal.GetDelegateForFunctionPointer(GetProcAddress(_handle, "GetCM_SDK_DllVer"), typeof(GetSDKVersionPointer));

‎RGB.NET.Devices.CoolerMaster/RGB.NET.Devices.CoolerMaster.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
3+
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
44
<LangVersion>latest</LangVersion>
55
<Nullable>enable</Nullable>
66

@@ -15,8 +15,8 @@
1515
<RootNamespace>RGB.NET.Devices.CoolerMaster</RootNamespace>
1616
<Description>Cooler Master-Device-Implementations of RGB.NET</Description>
1717
<Summary>Cooler Master-Device-Implementations of RGB.NET, a C# (.NET) library for accessing various RGB-peripherals</Summary>
18-
<Copyright>Copyright © Darth Affe 2023</Copyright>
19-
<PackageCopyright>Copyright © Darth Affe 2023</PackageCopyright>
18+
<Copyright>Copyright © Darth Affe 2026</Copyright>
19+
<PackageCopyright>Copyright © Darth Affe 2026</PackageCopyright>
2020
<PackageIcon>icon.png</PackageIcon>
2121
<PackageReadmeFile>README.md</PackageReadmeFile>
2222
<PackageProjectUrl>https://github.com/DarthAffe/RGB.NET</PackageProjectUrl>

‎RGB.NET.Devices.Corsair/RGB.NET.Devices.Corsair.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
3+
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
44
<LangVersion>latest</LangVersion>
55
<Nullable>enable</Nullable>
66

@@ -15,8 +15,8 @@
1515
<RootNamespace>RGB.NET.Devices.Corsair</RootNamespace>
1616
<Description>Corsair-Device-Implementations of RGB.NET</Description>
1717
<Summary>Corsair-Device-Implementations of RGB.NET, a C# (.NET) library for accessing various RGB-peripherals</Summary>
18-
<Copyright>Copyright © Darth Affe 2023</Copyright>
19-
<PackageCopyright>Copyright © Darth Affe 2023</PackageCopyright>
18+
<Copyright>Copyright © Darth Affe 2026</Copyright>
19+
<PackageCopyright>Copyright © Darth Affe 2026</PackageCopyright>
2020
<PackageIcon>icon.png</PackageIcon>
2121
<PackageReadmeFile>README.md</PackageReadmeFile>
2222
<PackageProjectUrl>https://github.com/DarthAffe/RGB.NET</PackageProjectUrl>

‎RGB.NET.Devices.Corsair_Legacy/Native/_CUESDK.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ private static void LoadCUESDK()
4040
#if NET6_0
4141
throw new RGBDeviceException($"Corsair LoadLibrary failed with error code {Marshal.GetLastPInvokeError()}");
4242
#else
43-
throw new RGBDeviceException($"Corsair LoadLibrary failed with error code {Marshal.GetLastWin32Error()}");
43+
throw new RGBDeviceException($"Corsair LoadLibrary failed with error code {Marshal.GetLastSystemError()}");
4444
#endif
4545

4646
if (!NativeLibrary.TryGetExport(_handle, "CorsairSetLedsColorsBufferByDeviceIndex", out _corsairSetLedsColorsBufferByDeviceIndexPointer)) throw new RGBDeviceException("Failed to load Corsair function 'CorsairSetLedsColorsBufferByDeviceIndex'");

‎RGB.NET.Devices.Corsair_Legacy/RGB.NET.Devices.Corsair_Legacy.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
3+
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
44
<LangVersion>latest</LangVersion>
55
<Nullable>enable</Nullable>
66

@@ -15,8 +15,8 @@
1515
<RootNamespace>RGB.NET.Devices.CorsairLegacy</RootNamespace>
1616
<Description>Corsair-Device-Implementations of RGB.NET using the old SDK</Description>
1717
<Summary>Corsair-Device-Implementations of RGB.NET, a C# (.NET) library for accessing various RGB-peripherals</Summary>
18-
<Copyright>Copyright © Darth Affe 2023</Copyright>
19-
<PackageCopyright>Copyright © Darth Affe 2023</PackageCopyright>
18+
<Copyright>Copyright © Darth Affe 2026</Copyright>
19+
<PackageCopyright>Copyright © Darth Affe 2026</PackageCopyright>
2020
<PackageIcon>icon.png</PackageIcon>
2121
<PackageReadmeFile>README.md</PackageReadmeFile>
2222
<PackageProjectUrl>https://github.com/DarthAffe/RGB.NET</PackageProjectUrl>

0 commit comments

Comments
 (0)