Skip to content

Commit 779b3f1

Browse files
logicallysyncedlogicallysynced
authored
Merge pull request #171 from logicallysynced/chromatics-3.x
Updated RGB.NET to latest major release - v3
2 parents a75df95 + e24723e commit 779b3f1

4 files changed

Lines changed: 221 additions & 192 deletions

File tree

‎Chromatics/Chromatics.csproj‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<TargetFramework>net8.0-windows7.0</TargetFramework>
66
<UseWindowsForms>true</UseWindowsForms>
77
<StartupObject>Chromatics.Program</StartupObject>
8-
<Version>3.1.6.0</Version>
8+
<Version>3.2.0.0</Version>
99
<Authors>Danielle Thompson</Authors>
1010
<ApplicationManifest>app.manifest</ApplicationManifest>
1111
<Copyright>Danielle Thompson 2024</Copyright>
@@ -37,27 +37,27 @@
3737
<PackageReference Include="Cyotek.Windows.Forms.ColorPicker" Version="2.0.0-beta.7" />
3838
<PackageReference Include="FFXIVWeather" Version="1.0.17" />
3939
<PackageReference Include="HidSharp" Version="2.1.0" />
40-
<PackageReference Include="HueApi" Version="1.6.3" />
41-
<PackageReference Include="HueApi.ColorConverters" Version="1.5.1" />
42-
<PackageReference Include="HueApi.Entertainment" Version="1.5.1" />
40+
<PackageReference Include="HueApi" Version="1.7.0" />
41+
<PackageReference Include="HueApi.ColorConverters" Version="1.7.1" />
42+
<PackageReference Include="HueApi.Entertainment" Version="1.7.0" />
4343
<PackageReference Include="MouseKeyHook.NetCore" Version="5.6.1.1" />
4444
<PackageReference Include="NAudio" Version="2.2.1" />
4545
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
46-
<PackageReference Include="NLog" Version="5.3.3" />
47-
<PackageReference Include="RGB.NET.Core" Version="3.0.0-prerelease.3" />
48-
<PackageReference Include="RGB.NET.Devices.Asus" Version="3.0.0-prerelease.3" />
49-
<PackageReference Include="RGB.NET.Devices.CoolerMaster" Version="3.0.0-prerelease.3" />
50-
<PackageReference Include="RGB.NET.Devices.Corsair" Version="3.0.0-prerelease.3" />
51-
<PackageReference Include="RGB.NET.Devices.Logitech" Version="3.0.0-prerelease.3" />
52-
<PackageReference Include="RGB.NET.Devices.Msi" Version="3.0.0-prerelease.3" />
53-
<PackageReference Include="RGB.NET.Devices.Novation" Version="3.0.0-prerelease.3" />
54-
<PackageReference Include="RGB.NET.Devices.OpenRGB" Version="3.0.0-prerelease.3" />
55-
<PackageReference Include="RGB.NET.Devices.Razer" Version="3.0.0-prerelease.3" />
56-
<PackageReference Include="RGB.NET.Devices.SteelSeries" Version="3.0.0-prerelease.3" />
57-
<PackageReference Include="RGB.NET.Devices.Wooting" Version="3.0.0-prerelease.3" />
58-
<PackageReference Include="RGB.NET.HID" Version="3.0.0-prerelease.3" />
59-
<PackageReference Include="RGB.NET.Layout" Version="3.0.0-prerelease.3" />
60-
<PackageReference Include="RGB.NET.Presets" Version="3.0.0-prerelease.3" />
46+
<PackageReference Include="NLog" Version="5.4.0" />
47+
<PackageReference Include="RGB.NET.Core" Version="3.0.0" />
48+
<PackageReference Include="RGB.NET.Devices.Asus" Version="3.0.0" />
49+
<PackageReference Include="RGB.NET.Devices.CoolerMaster" Version="3.0.0" />
50+
<PackageReference Include="RGB.NET.Devices.Corsair" Version="3.0.0" />
51+
<PackageReference Include="RGB.NET.Devices.Logitech" Version="3.0.0" />
52+
<PackageReference Include="RGB.NET.Devices.Msi" Version="3.0.0" />
53+
<PackageReference Include="RGB.NET.Devices.Novation" Version="3.0.0" />
54+
<PackageReference Include="RGB.NET.Devices.OpenRGB" Version="3.0.0" />
55+
<PackageReference Include="RGB.NET.Devices.Razer" Version="3.0.0" />
56+
<PackageReference Include="RGB.NET.Devices.SteelSeries" Version="3.0.0" />
57+
<PackageReference Include="RGB.NET.Devices.Wooting" Version="3.0.0" />
58+
<PackageReference Include="RGB.NET.HID" Version="3.0.0" />
59+
<PackageReference Include="RGB.NET.Layout" Version="3.0.0" />
60+
<PackageReference Include="RGB.NET.Presets" Version="3.0.0" />
6161
<PackageReference Include="Sanford.Multimedia.Midi" Version="6.6.2" />
6262
<PackageReference Include="Sharlayan" Version="8.0.1" />
6363
</ItemGroup>

‎Chromatics/Forms/Fm_MainWindow.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,15 +252,16 @@ private void SetupChromatics()
252252
}
253253

254254
var assembly = typeof(Program).Assembly;
255+
var beta = false;
255256

256-
if (assembly.GetName().Version.Revision != 0 || assembly.GetName().Version.Revision != 1)
257+
if (beta)
257258
{
258259
Logger.WriteConsole(LoggerTypes.System, $"Chromatics {assembly.GetName().Version.Major}.{assembly.GetName().Version.Minor}.{assembly.GetName().Version.Build}.{assembly.GetName().Version.Revision} (BETA) has loaded");
259260
//this.Text = $"Chromatics {assembly.GetName().Version.Major}.{assembly.GetName().Version.Minor}.{assembly.GetName().Version.Build}.{assembly.GetName().Version.Revision} (BETA)";
260261
}
261262
else
262263
{
263-
Logger.WriteConsole(LoggerTypes.System, $"Chromatics {assembly.GetName().Version.Major}.{assembly.GetName().Version.Minor} has loaded");
264+
Logger.WriteConsole(LoggerTypes.System, $"Chromatics {assembly.GetName().Version.Major}.{assembly.GetName().Version.Minor}.{assembly.GetName().Version.Build} has loaded");
264265
}
265266

266267

‎Chromatics/obj/Chromatics.csproj.nuget.dgspec.json‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
},
66
"projects": {
77
"D:\\Git Projects\\roxaskeyheart\\Chromatics Workbench\\Chromatics-3.x\\Chromatics\\Chromatics.csproj": {
8-
"version": "3.1.6",
8+
"version": "3.2.0",
99
"restore": {
1010
"projectUniqueName": "D:\\Git Projects\\roxaskeyheart\\Chromatics Workbench\\Chromatics-3.x\\Chromatics\\Chromatics.csproj",
1111
"projectName": "Chromatics",
@@ -72,15 +72,15 @@
7272
},
7373
"HueApi": {
7474
"target": "Package",
75-
"version": "[1.6.3, )"
75+
"version": "[1.7.0, )"
7676
},
7777
"HueApi.ColorConverters": {
7878
"target": "Package",
79-
"version": "[1.5.1, )"
79+
"version": "[1.7.1, )"
8080
},
8181
"HueApi.Entertainment": {
8282
"target": "Package",
83-
"version": "[1.5.1, )"
83+
"version": "[1.7.0, )"
8484
},
8585
"MouseKeyHook.NetCore": {
8686
"target": "Package",
@@ -92,67 +92,67 @@
9292
},
9393
"NLog": {
9494
"target": "Package",
95-
"version": "[5.3.3, )"
95+
"version": "[5.4.0, )"
9696
},
9797
"Newtonsoft.Json": {
9898
"target": "Package",
9999
"version": "[13.0.3, )"
100100
},
101101
"RGB.NET.Core": {
102102
"target": "Package",
103-
"version": "[3.0.0-prerelease.3, )"
103+
"version": "[3.0.0, )"
104104
},
105105
"RGB.NET.Devices.Asus": {
106106
"target": "Package",
107-
"version": "[3.0.0-prerelease.3, )"
107+
"version": "[3.0.0, )"
108108
},
109109
"RGB.NET.Devices.CoolerMaster": {
110110
"target": "Package",
111-
"version": "[3.0.0-prerelease.3, )"
111+
"version": "[3.0.0, )"
112112
},
113113
"RGB.NET.Devices.Corsair": {
114114
"target": "Package",
115-
"version": "[3.0.0-prerelease.3, )"
115+
"version": "[3.0.0, )"
116116
},
117117
"RGB.NET.Devices.Logitech": {
118118
"target": "Package",
119-
"version": "[3.0.0-prerelease.3, )"
119+
"version": "[3.0.0, )"
120120
},
121121
"RGB.NET.Devices.Msi": {
122122
"target": "Package",
123-
"version": "[3.0.0-prerelease.3, )"
123+
"version": "[3.0.0, )"
124124
},
125125
"RGB.NET.Devices.Novation": {
126126
"target": "Package",
127-
"version": "[3.0.0-prerelease.3, )"
127+
"version": "[3.0.0, )"
128128
},
129129
"RGB.NET.Devices.OpenRGB": {
130130
"target": "Package",
131-
"version": "[3.0.0-prerelease.3, )"
131+
"version": "[3.0.0, )"
132132
},
133133
"RGB.NET.Devices.Razer": {
134134
"target": "Package",
135-
"version": "[3.0.0-prerelease.3, )"
135+
"version": "[3.0.0, )"
136136
},
137137
"RGB.NET.Devices.SteelSeries": {
138138
"target": "Package",
139-
"version": "[3.0.0-prerelease.3, )"
139+
"version": "[3.0.0, )"
140140
},
141141
"RGB.NET.Devices.Wooting": {
142142
"target": "Package",
143-
"version": "[3.0.0-prerelease.3, )"
143+
"version": "[3.0.0, )"
144144
},
145145
"RGB.NET.HID": {
146146
"target": "Package",
147-
"version": "[3.0.0-prerelease.3, )"
147+
"version": "[3.0.0, )"
148148
},
149149
"RGB.NET.Layout": {
150150
"target": "Package",
151-
"version": "[3.0.0-prerelease.3, )"
151+
"version": "[3.0.0, )"
152152
},
153153
"RGB.NET.Presets": {
154154
"target": "Package",
155-
"version": "[3.0.0-prerelease.3, )"
155+
"version": "[3.0.0, )"
156156
},
157157
"Sanford.Multimedia.Midi": {
158158
"target": "Package",

0 commit comments

Comments
 (0)