Dependency Injection Rewrite

AT-Geist · Jul 20, 2022 · 10a3c07 · 10a3c07
1 parent 325c28c
commit 10a3c07
Show file tree

Hide file tree

Showing 769 changed files with 12,707 additions and 15,750 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <VersionBase>0.6.0.4</VersionBase>
+    <VersionBase>0.7.0.0</VersionBase>
     <FrameworkBase>net6.0</FrameworkBase>
     <LangVersion>preview</LangVersion>
     <VersionPrefix>$(VersionBase)</VersionPrefix>

diff --git a/OpenTabletDriver.Benchmarks/OpenTabletDriver.Benchmarks.csproj b/OpenTabletDriver.Benchmarks/OpenTabletDriver.Benchmarks.csproj
@@ -7,6 +7,7 @@
 
   <ItemGroup Label="NuGet Packages">
     <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
+    <PackageReference Include="Moq" Version="4.16.1" />
   </ItemGroup>
 
   <ItemGroup Label="Project References">

diff --git a/OpenTabletDriver.Benchmarks/Output/NoopAbsoluteMode.cs b/OpenTabletDriver.Benchmarks/Output/NoopAbsoluteMode.cs
@@ -1,6 +1,6 @@
 using System.Numerics;
-using OpenTabletDriver.Plugin.Output;
-using OpenTabletDriver.Plugin.Platform.Pointer;
+using OpenTabletDriver.Output;
+using OpenTabletDriver.Platform.Pointer;
 
 namespace OpenTabletDriver.Benchmarks.Output
 {

diff --git a/OpenTabletDriver.Benchmarks/Output/OutputBenchmark.cs b/OpenTabletDriver.Benchmarks/Output/OutputBenchmark.cs
@@ -1,8 +1,8 @@
 using System;
 using BenchmarkDotNet.Attributes;
 using OpenTabletDriver.Desktop.Profiles;
-using OpenTabletDriver.Plugin.Output;
-using OpenTabletDriver.Plugin.Tablet;
+using OpenTabletDriver.Output;
+using OpenTabletDriver.Tablet;
 
 namespace OpenTabletDriver.Benchmarks.Output
 {

diff --git a/OpenTabletDriver.Benchmarks/Parser/ReportParserBenchmark.cs b/OpenTabletDriver.Benchmarks/Parser/ReportParserBenchmark.cs
@@ -1,7 +1,7 @@
 using System;
 using BenchmarkDotNet.Attributes;
 using OpenTabletDriver.Configurations.Parsers;
-using OpenTabletDriver.Plugin.Tablet;
+using OpenTabletDriver.Tablet;
 
 namespace OpenTabletDriver.Benchmarks.Parser
 {

diff --git a/OpenTabletDriver.Benchmarks/Plugin/PluginManagerBenchmark.cs b/OpenTabletDriver.Benchmarks/Plugin/PluginManagerBenchmark.cs
@@ -1,17 +1,20 @@
 using BenchmarkDotNet.Attributes;
+using Moq;
+using OpenTabletDriver.Desktop.Interop.AppInfo;
 using OpenTabletDriver.Desktop.Reflection;
 
 namespace OpenTabletDriver.Benchmarks.Plugin
 {
     [DryJob]
     public class PluginManagerBenchmark
     {
-        public PluginManager pluginManager;
+        private PluginManager _pluginManager;
 
         [Benchmark]
         public void PluginManagerCtor()
         {
-            pluginManager = new PluginManager();
+            var appInfo = new Mock<AppInfo>();
+            _pluginManager = new PluginManager(appInfo.Object);
         }
     }
 }
diff --git a/OpenTabletDriver.Configurations/Configurations/10moon/1060N.json b/OpenTabletDriver.Configurations/Configurations/10moon/1060N.json
@@ -9,9 +9,7 @@
     },
     "Pen": {
       "MaxPressure": 8191,
-      "Buttons": {
-        "ButtonCount": 2
-      }
+      "ButtonCount": 2
     },
     "AuxiliaryButtons": {
       "ButtonCount": 12
@@ -32,7 +30,7 @@
       "InitializationStrings": []
     }
   ],
-  "AuxilaryDeviceIdentifiers": [
+  "AuxiliaryDeviceIdentifiers": [
     {
       "VendorID": 2290,
       "ProductID": 26641,
@@ -53,4 +51,4 @@
   "Attributes": {
     "libinputoverride": "1"
   }
-}
+}
diff --git a/OpenTabletDriver.Configurations/Configurations/Acepen/AP 1060.json b/OpenTabletDriver.Configurations/Configurations/Acepen/AP 1060.json
@@ -9,9 +9,7 @@
     },
     "Pen": {
       "MaxPressure": 8191,
-      "Buttons": {
-        "ButtonCount": 2
-      }
+      "ButtonCount": 2
     },
     "AuxiliaryButtons": {
       "ButtonCount": 8
@@ -36,6 +34,6 @@
       "InitializationStrings": []
     }
   ],
-  "AuxilaryDeviceIdentifiers": [],
+  "AuxiliaryDeviceIdentifiers": [],
   "Attributes": {}
-}
+}
diff --git a/OpenTabletDriver.Configurations/Configurations/Artisul/A1201.json b/OpenTabletDriver.Configurations/Configurations/Artisul/A1201.json
@@ -9,9 +9,7 @@
     },
     "Pen": {
       "MaxPressure": 8191,
-      "Buttons": {
-        "ButtonCount": 2
-      }
+      "ButtonCount": 2
     },
     "AuxiliaryButtons": {
       "ButtonCount": 8
@@ -36,8 +34,8 @@
       ]
     }
   ],
-  "AuxilaryDeviceIdentifiers": [],
+  "AuxiliaryDeviceIdentifiers": [],
   "Attributes": {
     "libinputoverride": "1"
   }
-}
+}
diff --git a/OpenTabletDriver.Configurations/Configurations/Artisul/AP604.json b/OpenTabletDriver.Configurations/Configurations/Artisul/AP604.json
@@ -9,9 +9,7 @@
     },
     "Pen": {
       "MaxPressure": 2047,
-      "Buttons": {
-        "ButtonCount": 2
-      }
+      "ButtonCount": 2
     },
     "AuxiliaryButtons": null,
     "MouseButtons": null,
@@ -30,8 +28,8 @@
       "InitializationStrings": []
     }
   ],
-  "AuxilaryDeviceIdentifiers": [],
+  "AuxiliaryDeviceIdentifiers": [],
   "Attributes": {
     "libinputoverride": "1"
   }
-}
+}
diff --git a/OpenTabletDriver.Configurations/Configurations/Artisul/M0610 Pro.json b/OpenTabletDriver.Configurations/Configurations/Artisul/M0610 Pro.json
@@ -9,9 +9,7 @@
     },
     "Pen": {
       "MaxPressure": 8191,
-      "Buttons": {
-        "ButtonCount": 2
-      }
+      "ButtonCount": 2
     },
     "AuxiliaryButtons": {
       "ButtonCount": 8
@@ -25,7 +23,7 @@
       "ProductID": 129,
       "InputReportLength": 10,
       "OutputReportLength": null,
-      "ReportParser": "OpenTabletDriver.Plugin.Tablet.TabletReportParser",
+      "ReportParser": "OpenTabletDriver.Tablet.TabletReportParser",
       "FeatureInitReport": null,
       "OutputInitReport": null,
       "DeviceStrings": {
@@ -36,8 +34,8 @@
       ]
     }
   ],
-  "AuxilaryDeviceIdentifiers": [],
+  "AuxiliaryDeviceIdentifiers": [],
   "Attributes": {
     "libinputoverride": "1"
   }
-}
+}
diff --git a/OpenTabletDriver.Configurations/Configurations/Gaomon/1060 Pro.json b/OpenTabletDriver.Configurations/Configurations/Gaomon/1060 Pro.json
@@ -9,9 +9,7 @@
     },
     "Pen": {
       "MaxPressure": 8191,
-      "Buttons": {
-        "ButtonCount": 2
-      }
+      "ButtonCount": 2
     },
     "AuxiliaryButtons": {
       "ButtonCount": 12
@@ -51,8 +49,8 @@
       ]
     }
   ],
-  "AuxilaryDeviceIdentifiers": [],
+  "AuxiliaryDeviceIdentifiers": [],
   "Attributes": {
     "libinputoverride": "1"
   }
-}
+}
diff --git a/OpenTabletDriver.Configurations/Configurations/Gaomon/M106K Pro.json b/OpenTabletDriver.Configurations/Configurations/Gaomon/M106K Pro.json
@@ -9,9 +9,7 @@
     },
     "Pen": {
       "MaxPressure": 8191,
-      "Buttons": {
-        "ButtonCount": 2
-      }
+      "ButtonCount": 2
     },
     "AuxiliaryButtons": {
       "ButtonCount": 12
@@ -36,8 +34,8 @@
       ]
     }
   ],
-  "AuxilaryDeviceIdentifiers": [],
+  "AuxiliaryDeviceIdentifiers": [],
   "Attributes": {
     "libinputoverride": "1"
   }
-}
+}
diff --git a/OpenTabletDriver.Configurations/Configurations/Gaomon/M106K.json b/OpenTabletDriver.Configurations/Configurations/Gaomon/M106K.json
@@ -9,9 +9,7 @@
     },
     "Pen": {
       "MaxPressure": 2047,
-      "Buttons": {
-        "ButtonCount": 2
-      }
+      "ButtonCount": 2
     },
     "AuxiliaryButtons": {
       "ButtonCount": 12
@@ -36,8 +34,8 @@
       ]
     }
   ],
-  "AuxilaryDeviceIdentifiers": [],
+  "AuxiliaryDeviceIdentifiers": [],
   "Attributes": {
     "libinputoverride": "1"
   }
-}
+}
diff --git a/OpenTabletDriver.Configurations/Configurations/Gaomon/M10K Pro.json b/OpenTabletDriver.Configurations/Configurations/Gaomon/M10K Pro.json
@@ -9,9 +9,7 @@
     },
     "Pen": {
       "MaxPressure": 8191,
-      "Buttons": {
-        "ButtonCount": 2
-      }
+      "ButtonCount": 2
     },
     "AuxiliaryButtons": {
       "ButtonCount": 10
@@ -36,8 +34,8 @@
       ]
     }
   ],
-  "AuxilaryDeviceIdentifiers": [],
+  "AuxiliaryDeviceIdentifiers": [],
   "Attributes": {
     "libinputoverride": "1"
   }
-}
+}
diff --git a/OpenTabletDriver.Configurations/Configurations/Gaomon/M10K.json b/OpenTabletDriver.Configurations/Configurations/Gaomon/M10K.json
@@ -9,9 +9,7 @@
     },
     "Pen": {
       "MaxPressure": 8191,
-      "Buttons": {
-        "ButtonCount": 2
-      }
+      "ButtonCount": 2
     },
     "AuxiliaryButtons": {
       "ButtonCount": 11
@@ -36,8 +34,8 @@
       ]
     }
   ],
-  "AuxilaryDeviceIdentifiers": [],
+  "AuxiliaryDeviceIdentifiers": [],
   "Attributes": {
     "libinputoverride": "1"
   }
-}
+}
diff --git a/OpenTabletDriver.Configurations/Configurations/Gaomon/M1220.json b/OpenTabletDriver.Configurations/Configurations/Gaomon/M1220.json
@@ -9,9 +9,7 @@
     },
     "Pen": {
       "MaxPressure": 8191,
-      "Buttons": {
-        "ButtonCount": 2
-      }
+      "ButtonCount": 2
     },
     "AuxiliaryButtons": {
       "ButtonCount": 8
@@ -36,8 +34,8 @@
       ]
     }
   ],
-  "AuxilaryDeviceIdentifiers": [],
+  "AuxiliaryDeviceIdentifiers": [],
   "Attributes": {
     "libinputoverride": "1"
   }
-}
+}
diff --git a/OpenTabletDriver.Configurations/Configurations/Gaomon/M1230.json b/OpenTabletDriver.Configurations/Configurations/Gaomon/M1230.json
@@ -9,9 +9,7 @@
     },
     "Pen": {
       "MaxPressure": 8191,
-      "Buttons": {
-        "ButtonCount": 2
-      }
+      "ButtonCount": 2
     },
     "AuxiliaryButtons": {
       "ButtonCount": 12
@@ -36,8 +34,8 @@
       ]
     }
   ],
-  "AuxilaryDeviceIdentifiers": [],
+  "AuxiliaryDeviceIdentifiers": [],
   "Attributes": {
     "libinputoverride": "1"
   }
-}
+}
diff --git a/OpenTabletDriver.Configurations/Configurations/Gaomon/M6.json b/OpenTabletDriver.Configurations/Configurations/Gaomon/M6.json
@@ -9,9 +9,7 @@
     },
     "Pen": {
       "MaxPressure": 8191,
-      "Buttons": {
-        "ButtonCount": 2
-      }
+      "ButtonCount": 2
     },
     "AuxiliaryButtons": {
       "ButtonCount": 13
@@ -36,8 +34,8 @@
       ]
     }
   ],
-  "AuxilaryDeviceIdentifiers": [],
+  "AuxiliaryDeviceIdentifiers": [],
   "Attributes": {
     "libinputoverride": "1"
   }
-}
+}