Skip to content

Commit 350f53a

Browse files
committed
Merge branch 'develop'
2 parents 172f5f5 + 87420a2 commit 350f53a

File tree

101 files changed

+1112
-525
lines changed

Some content is hidden

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

101 files changed

+1112
-525
lines changed

Build/Build.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ class Build : NukeBuild
7878
.EnableNoRestore());
7979

8080
// Copy plugin files to service bin path
81-
var fileBlacklist = new[] { "TTController.Common", "OpenHardwareMonitorLib", "HidLibrary", "Newtonsoft.Json" };
81+
var fileBlacklist = new[] { "TTController.Common", "LibreHardwareMonitorLib", "HidLibrary", "Newtonsoft.Json" };
8282
var extensionWhitelist = Configuration == Configuration.Debug ? new[] { ".pdb", ".dll" } : new[] { ".dll" };
8383
Solution.GetProjects("TTController.Plugin.*")
8484
.ForEach(p =>
@@ -90,6 +90,8 @@ class Build : NukeBuild
9090
null,
9191
f => fileBlacklist.Contains(Path.GetFileNameWithoutExtension(f.Name)) || !extensionWhitelist.Contains(Path.GetExtension(f.Name)));
9292
});
93+
94+
CopyDirectoryRecursively(PluginsDirectory / "Devices", ServiceBinPath / "Plugins" / "Devices", DirectoryExistsPolicy.Merge, FileExistsPolicy.OverwriteIfNewer);
9395
});
9496

9597
Target Pack => _ => _

Plugins/Devices/TTController.Plugin.DpsgController/DpsgControllerDefinition.cs renamed to Plugins/Controllers/TTController.Plugin.DpsgController/DpsgControllerDefinition.cs

File renamed without changes.

Plugins/Devices/TTController.Plugin.DpsgController/DpsgControllerProxy.cs renamed to Plugins/Controllers/TTController.Plugin.DpsgController/DpsgControllerProxy.cs

File renamed without changes.

Plugins/Devices/TTController.Plugin.DpsgController/TTController.Plugin.DpsgController.csproj renamed to Plugins/Controllers/TTController.Plugin.DpsgController/TTController.Plugin.DpsgController.csproj

File renamed without changes.

Plugins/Devices/TTController.Plugin.RiingController/RiingControllerDefinition.cs renamed to Plugins/Controllers/TTController.Plugin.RiingController/RiingControllerDefinition.cs

File renamed without changes.

Plugins/Devices/TTController.Plugin.RiingController/RiingControllerProxy.cs renamed to Plugins/Controllers/TTController.Plugin.RiingController/RiingControllerProxy.cs

File renamed without changes.

Plugins/Devices/TTController.Plugin.RiingController/TTController.Plugin.RiingController.csproj renamed to Plugins/Controllers/TTController.Plugin.RiingController/TTController.Plugin.RiingController.csproj

File renamed without changes.

Plugins/Devices/TTController.Plugin.RiingPlusController/RiingPlusControllerDefinition.cs renamed to Plugins/Controllers/TTController.Plugin.RiingPlusController/RiingPlusControllerDefinition.cs

File renamed without changes.

Plugins/Devices/TTController.Plugin.RiingPlusController/RiingPlusControllerProxy.cs renamed to Plugins/Controllers/TTController.Plugin.RiingPlusController/RiingPlusControllerProxy.cs

File renamed without changes.

Plugins/Devices/TTController.Plugin.RiingPlusController/TTController.Plugin.RiingPlusController.csproj renamed to Plugins/Controllers/TTController.Plugin.RiingPlusController/TTController.Plugin.RiingPlusController.csproj

File renamed without changes.

0 commit comments

Comments
 (0)