Skip to content

Commit b7bd969

Browse files
MoshiMoshi0MoshiMoshi0
committed
Merge branch 'develop'
2 parents 661c93f + 9d851b3 commit b7bd969

File tree

89 files changed

+993
-569
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+993
-569
lines changed

‎.gitmodules‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
[submodule "LibreHardwareMonitor"]
2-
path = ThirdParty/LibreHardwareMonitor
3-
url = https://github.com/LibreHardwareMonitor/LibreHardwareMonitor.git
41
[submodule "HidLibrary"]
52
path = ThirdParty/HidLibrary
6-
url = https://github.com/OpenMacroBoard/HidLibrary.git
7-
branch = hid-for-streamdeck
3+
url = https://github.com/MoshiMoshi0/HidLibrary.git
4+
branch = develop
5+
[submodule "LibreHardwareMonitor"]
6+
path = ThirdParty/LibreHardwareMonitor
7+
url = https://github.com/MoshiMoshi0/LibreHardwareMonitor.git
8+
branch = develop

‎Build/Build.cs‎

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,10 @@
2020
[UnsetVisualStudioEnvironmentVariables]
2121
class Build : NukeBuild
2222
{
23-
public static int Main() => Execute<Build>(x => x.Run);
23+
public static int Main() => Execute<Build>(x => x.Compile);
2424

2525
[Parameter("Configuration to build")]
26-
#if DEBUG
2726
readonly Configuration Configuration = Configuration.Debug;
28-
#elif RELEASE
29-
readonly Configuration Configuration = Configuration.Release;
30-
#endif
3127

3228
[Solution] readonly Solution Solution;
3329
[GitVersion] readonly GitVersion GitVersion;
@@ -39,24 +35,6 @@ class Build : NukeBuild
3935

4036
AbsolutePath ServiceBinPath => SourceDirectory / "TTController.Service" / "bin" / Configuration;
4137

42-
protected override void OnBuildFinished()
43-
{
44-
if (string.Compare(InvokedTargets.Last().Name, "Run", true) != 0)
45-
return;
46-
47-
Console.Out.Flush();
48-
Console.Clear();
49-
50-
var process = Process.Start(new ProcessStartInfo()
51-
{
52-
FileName = ServiceBinPath / "TTController.Service.exe",
53-
WorkingDirectory = ServiceBinPath,
54-
UseShellExecute = false
55-
});
56-
57-
process.WaitForExit();
58-
}
59-
6038
Target Clean => _ => _
6139
.Before(Restore)
6240
.Executes(() =>
@@ -97,7 +75,7 @@ protected override void OnBuildFinished()
9775
.EnableNoRestore());
9876

9977
// Copy plugin files to service bin path
100-
var fileBlacklist = new [] { "TTController.Common", "OpenHardwareMonitorLib", "HidLibrary", "Newtonsoft.Json" };
78+
var fileBlacklist = new[] { "TTController.Common", "OpenHardwareMonitorLib", "HidLibrary", "Newtonsoft.Json" };
10179
var extensionWhitelist = Configuration == Configuration.Debug ? new[] { ".pdb", ".dll" } : new[] { ".dll" };
10280
Solution.GetProjects("TTController.Plugin.*")
10381
.ForEach(p =>
@@ -111,9 +89,6 @@ protected override void OnBuildFinished()
11189
});
11290
});
11391

114-
Target Run => _ => _
115-
.DependsOn(Compile);
116-
11792
Target Pack => _ => _
11893
.DependsOn(Clean)
11994
.DependsOn(Compile)
@@ -126,7 +101,7 @@ protected override void OnBuildFinished()
126101
if (Configuration != Configuration.Debug)
127102
files = files.Where(f => Path.GetExtension(f) != ".pdb");
128103

129-
ZipFiles(ArtifactsDirectory / $"TTController_{GitVersion.SemVer}.{GitVersion.Sha}.zip", ServiceBinPath, files);
104+
ZipFiles(ArtifactsDirectory / $"TTController_{GitVersion.AssemblySemVer}{GitVersion.PreReleaseTagWithDash}.{GitVersion.Sha}.zip", ServiceBinPath, files);
130105
});
131106

132107
private static void ZipFiles(string outFile, string workingDirectory, IEnumerable<string> files)

Source/TTController.Service/Controller/Definition/DpsgControllerDefinition.cs renamed to Plugins/Devices/TTController.Plugin.DpsgController/DpsgControllerDefinition.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
using System;
22
using System.Collections.Generic;
3-
using TTController.Service.Controller.Proxy;
3+
using TTController.Common.Plugin;
44

5-
namespace TTController.Service.Controller.Definition
5+
namespace TTController.Plugin.DpsgController
66
{
77
public class DpsgControllerDefinition : IControllerDefinition
88
{

Source/TTController.Service/Controller/Proxy/DpsgControllerProxy.cs renamed to Plugins/Devices/TTController.Plugin.DpsgController/DpsgControllerProxy.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22
using System.Linq;
33
using System.Text;
44
using TTController.Common;
5-
using TTController.Service.Controller.Definition;
6-
using TTController.Service.Hardware;
5+
using TTController.Common.Plugin;
76

8-
namespace TTController.Service.Controller.Proxy
7+
namespace TTController.Plugin.DpsgController
98
{
109
public class DpsgControllerProxy : AbstractControllerProxy
1110
{

‎Plugins/Devices/TTController.Plugin.DpsgController/TTController.Plugin.DpsgController.csproj‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<TargetFramework>net471</TargetFramework>
4+
<AssemblyTitle>TTController.Plugin.DpsgController</AssemblyTitle>
5+
<Product>TTController.Plugin.DpsgController</Product>
6+
<Copyright>Copyright © 2019</Copyright>
7+
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
8+
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
9+
</PropertyGroup>
10+
<ItemGroup>
11+
<ProjectReference Include="..\..\..\Source\TTController.Common\TTController.Common.csproj" />
12+
</ItemGroup>
13+
</Project>

Source/TTController.Service/Controller/Definition/RiingControllerDefinition.cs renamed to Plugins/Devices/TTController.Plugin.RiingController/RiingControllerDefinition.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Linq;
4-
using TTController.Service.Controller.Proxy;
4+
using TTController.Common.Plugin;
55

6-
namespace TTController.Service.Controller.Definition
6+
namespace TTController.Plugin.RiingController
77
{
88
public class RiingControllerDefinition : IControllerDefinition
99
{

‎Plugins/Devices/TTController.Plugin.RiingController/TTController.Plugin.RiingController.csproj‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<TargetFramework>net471</TargetFramework>
4+
<AssemblyTitle>TTController.Plugin.RiingController</AssemblyTitle>
5+
<Product>TTController.Plugin.RiingController</Product>
6+
<Copyright>Copyright © 2019</Copyright>
7+
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
8+
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
9+
</PropertyGroup>
10+
<ItemGroup>
11+
<ProjectReference Include="..\..\..\Source\TTController.Common\TTController.Common.csproj" />
12+
</ItemGroup>
13+
</Project>

Source/TTController.Service/Controller/Definition/RiingPlusControllerDefinition.cs renamed to Plugins/Devices/TTController.Plugin.RiingPlusController/RiingPlusControllerDefinition.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Linq;
4-
using TTController.Service.Controller.Proxy;
4+
using TTController.Common.Plugin;
55

6-
namespace TTController.Service.Controller.Definition
6+
namespace TTController.Plugin.RiingPlusController
77
{
88
public class RiingPlusControllerDefinition : IControllerDefinition
99
{

‎Plugins/Devices/TTController.Plugin.RiingPlusController/TTController.Plugin.RiingPlusController.csproj‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<TargetFramework>net471</TargetFramework>
4+
<AssemblyTitle>TTController.Plugin.RiingPlusController</AssemblyTitle>
5+
<Product>TTController.Plugin.RiingPlusController</Product>
6+
<Copyright>Copyright © 2019</Copyright>
7+
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
8+
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
9+
</PropertyGroup>
10+
<ItemGroup>
11+
<ProjectReference Include="..\..\..\Source\TTController.Common\TTController.Common.csproj" />
12+
</ItemGroup>
13+
</Project>

Source/TTController.Service/Controller/Definition/RiingTrioControllerDefinition.cs renamed to Plugins/Devices/TTController.Plugin.RiingTrioController/RiingTrioControllerDefinition.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Linq;
4-
using TTController.Service.Controller.Proxy;
4+
using TTController.Common.Plugin;
55

6-
namespace TTController.Service.Controller.Definition
6+
namespace TTController.Plugin.RiingTrioController
77
{
88
public class RiingTrioControllerDefinition : IControllerDefinition
99
{

0 commit comments

Comments
 (0)