Add OpenRGB integration; Framework upgrade to 4.8;

infra223 · Dec 15, 2022 · 5875eea · 5875eea
1 parent 9108ac3
commit 5875eea
Show file tree

Hide file tree

Showing 44 changed files with 2,479 additions and 312 deletions.
diff --git a/Inno Setup LogiLockLED/Inno Setup LogiLockLED.vcxproj b/Inno Setup LogiLockLED/Inno Setup LogiLockLED.vcxproj
@@ -27,22 +27,22 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Makefile</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Makefile</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Makefile</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Makefile</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -118,6 +118,9 @@
     <None Include="scripts\products\winversion.iss" />
     <None Include="Setup LogiLockLED.iss" />
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="scripts\products\dotnetfx48.iss" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

diff --git a/Inno Setup LogiLockLED/Inno Setup LogiLockLED.vcxproj.filters b/Inno Setup LogiLockLED/Inno Setup LogiLockLED.vcxproj.filters
@@ -96,4 +96,7 @@
       <Filter>scripts\products</Filter>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="scripts\products\dotnetfx48.iss" />
+  </ItemGroup>
 </Project>
diff --git a/Inno Setup LogiLockLED/Setup LogiLockLED.iss b/Inno Setup LogiLockLED/Setup LogiLockLED.iss
@@ -7,7 +7,7 @@
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
 AppId={{37738065-07D8-4618-9F70-62F502D902BB}
 AppName=LogiLockLED
-AppVersion=1.3
+AppVersion=1.4
 ;AppVerName=LogiLockLED 1.0
 AppPublisherURL=https://github.com/infra223/LogiLockLED
 AppSupportURL=https://github.com/infra223/LogiLockLED
@@ -25,14 +25,15 @@ UninstallDisplayIcon={app}\LogiLockLED.exe
 #include "scripts\products\stringversion.iss"
 #include "scripts\products\winversion.iss"
 #include "scripts\products\dotnetfxversion.iss"
-#include "scripts\products\dotnetfx46.iss"
+//#include "scripts\products\dotnetfx46.iss"
+#include "scripts\products\dotnetfx48.iss"
 
 [Code]
 function InitializeSetup(): Boolean;
 begin
 	// initialize windows version
 	initwinversion();
-  dotnetfx46(60); // install if version < 4.6.0  
+  dotnetfx48(80); // install if version < 4.8.0  
   Result := true;
 end;
 
@@ -44,6 +45,7 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 Source: "..\LogiLockLED\bin\Release\LogiLockLED.exe"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\LogiLockLED\bin\Release\LogiLockLED.exe.config"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\LogiLockLED\bin\Release\LogitechLedEnginesWrapper.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\LogiLockLED\bin\Release\OpenRGB.NET.dll"; DestDir: "{app}"; Flags: ignoreversion
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]

diff --git a/Inno Setup LogiLockLED/scripts/products/dotnetfx48.iss b/Inno Setup LogiLockLED/scripts/products/dotnetfx48.iss
@@ -0,0 +1,23 @@
+// requires Windows 7 Service Pack 1, Windows 8.1, Windows Server 2008 R2 SP1, Windows Server 2012, Windows Server 2012 R2
+// express setup (downloads and installs the components depending on your OS) if you want to deploy it locally download the full installer on website below
+// https://dotnet.microsoft.com/en-us/download/dotnet-framework/thank-you/net481-offline-installer
+
+[CustomMessages]
+dotnetfx48_title=.NET Framework 4.8.1
+
+dotnetfx48_size=59 MB
+
+[Code]
+const
+	dotnetfx48_url = 'https://go.microsoft.com/fwlink/?LinkId=2203304';
+
+procedure dotnetfx48(minVersion: Integer);
+begin
+	if (dotnetfxspversion(NetFx4x, '') < minVersion) then
+		AddProduct('dotnetfx48.exe',
+			'/lcid ' + CustomMessage('lcid') + ' /passive /norestart',
+			CustomMessage('dotnetfx48_title'),
+			CustomMessage('dotnetfx48_size'),
+			dotnetfx48_url,
+			false, false, false);
+end;
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,9 @@
+LogiLockLED
+https://github.com/infra223/LogiLockLED
+================================================================================
 MIT License
 
-Copyright (c) 2020 infra223
+Copyright (c) 2022 infra223
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -19,3 +22,30 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+
+
+
+OpenRGB.Net
+https://github.com/diogotr7/OpenRGB.NET
+================================================================================
+MIT License
+
+Copyright (c) 2022 Diogo Trindade
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/LogiLockLED.sln b/LogiLockLED.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
-VisualStudioVersion = 16.0.30503.244
+VisualStudioVersion = 16.0.33027.164
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LogiLockLED", "LogiLockLED\LogiLockLED.csproj", "{FCB10E99-94CD-4CB1-8BEA-B092C9AEC878}"
 EndProject
@@ -10,6 +10,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Inno Setup LogiLockLED", "I
 		{FCB10E99-94CD-4CB1-8BEA-B092C9AEC878} = {FCB10E99-94CD-4CB1-8BEA-B092C9AEC878}
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRGB.NET", "OpenRGB.NET\OpenRGB.NET.csproj", "{B31BF217-DA00-4EDD-A7ED-7FF2568B9E85}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -42,6 +44,18 @@ Global
 		{C9F7A1A6-87F7-41FF-B1AA-71B63DE9D8DA}.Release|x64.Build.0 = Release|x64
 		{C9F7A1A6-87F7-41FF-B1AA-71B63DE9D8DA}.Release|x86.ActiveCfg = Release|Win32
 		{C9F7A1A6-87F7-41FF-B1AA-71B63DE9D8DA}.Release|x86.Build.0 = Release|Win32
+		{B31BF217-DA00-4EDD-A7ED-7FF2568B9E85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B31BF217-DA00-4EDD-A7ED-7FF2568B9E85}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B31BF217-DA00-4EDD-A7ED-7FF2568B9E85}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B31BF217-DA00-4EDD-A7ED-7FF2568B9E85}.Debug|x64.Build.0 = Debug|Any CPU
+		{B31BF217-DA00-4EDD-A7ED-7FF2568B9E85}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B31BF217-DA00-4EDD-A7ED-7FF2568B9E85}.Debug|x86.Build.0 = Debug|Any CPU
+		{B31BF217-DA00-4EDD-A7ED-7FF2568B9E85}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B31BF217-DA00-4EDD-A7ED-7FF2568B9E85}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B31BF217-DA00-4EDD-A7ED-7FF2568B9E85}.Release|x64.ActiveCfg = Release|Any CPU
+		{B31BF217-DA00-4EDD-A7ED-7FF2568B9E85}.Release|x64.Build.0 = Release|Any CPU
+		{B31BF217-DA00-4EDD-A7ED-7FF2568B9E85}.Release|x86.ActiveCfg = Release|Any CPU
+		{B31BF217-DA00-4EDD-A7ED-7FF2568B9E85}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/LogiLockLED/App.config b/LogiLockLED/App.config
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <configSections>
-        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-            <section name="LogiLockLED.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+            <section name="LogiLockLED.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
         </sectionGroup>
     </configSections>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/>
     </startup>
     <userSettings>
         <LogiLockLED.Properties.Settings>
@@ -106,6 +106,9 @@
             <setting name="OsdShowScroll" serializeAs="String">
                 <value>True</value>
             </setting>
+            <setting name="LedController" serializeAs="String">
+                <value>OpenRGB</value>
+            </setting>
         </LogiLockLED.Properties.Settings>
     </userSettings>
-</configuration>
+</configuration>