Merge pull request #10 from Mrcubix/build-cleanup

Build Process Cleanup
Mrcubix · Oct 10, 2024 · bc101fc · bc101fc
2 parents 5b2fee3 + 21b10ac
commit bc101fc
Show file tree

Hide file tree

Showing 22 changed files with 78 additions and 131 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -6,10 +6,6 @@
 	path = .modules/OTD.EnhancedOutputMode
 	url = https://github.com/Mrcubix/OTD.EnhancedOutputMode.git
 	branch = master
-[submodule ".modules/OpenTabletDriver.External-0.6.x"]
-	path = .modules/OpenTabletDriver.External-0.6.x
-	url = https://github.com/Mrcubix/OpenTabletDriver.External.git
-	branch = 0.6.x
 [submodule ".modules/OTD.EnhancedOutputMode-0.6.x"]
 	path = .modules/OTD.EnhancedOutputMode-0.6.x
 	url = https://github.com/Mrcubix/OTD.EnhancedOutputMode.git

diff --git a/.modules/OTD.EnhancedOutputMode b/.modules/OTD.EnhancedOutputMode
diff --git a/.modules/OTD.EnhancedOutputMode-0.6.x b/.modules/OTD.EnhancedOutputMode-0.6.x
diff --git a/.modules/OpenTabletDriver.External b/.modules/OpenTabletDriver.External
diff --git a/.modules/OpenTabletDriver.External-0.6.x b/.modules/OpenTabletDriver.External-0.6.x
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,15 @@
 <Project>
   <PropertyGroup>
-    <NoWarn>$(NoWarn); NETSDK1138; NU1902; NU1903</NoWarn>
-    <Nullable>enable</Nullable>
+    <NoWarn>$(NoWarn); NETSDK1138</NoWarn>
+    <NuGetAuditLevel>critical</NuGetAuditLevel>
     <AvaloniaVersion>11.0.10</AvaloniaVersion>
   </PropertyGroup>
+
+  <!-- Only Embed debug symbols for the Release configuration -->
+  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
+    <DebugType>embedded</DebugType>
+  </PropertyGroup>
+
+  <Import Project="Targets/FixPackageId.targets" />
+
 </Project>
diff --git a/Targets/FixPackageId.targets b/Targets/FixPackageId.targets
@@ -0,0 +1,12 @@
+<Project>
+
+    <Target Name="FixPackageId" BeforeTargets="_GenerateRestoreProjectPathWalk" Condition="$(AssemblyName.Contains('OpenTabletDriver'))">
+
+        <PropertyGroup>
+          <PackageId>$(AssemblyName)-$(TargetFramework)</PackageId>
+        </PropertyGroup>
+
+        <Message Importance="High" Text="changed PackageId in Assembly '$(AssemblyName)' to '$(PackageId)'." />
+    </Target>
+
+</Project>
diff --git a/Touch-Gestures-0.6.x/GesturesDaemon.cs b/Touch-Gestures-0.6.x/GesturesDaemon.cs
@@ -85,6 +85,8 @@ public override Task<List<SerializablePlugin>> GetPlugins()
                 plugins.Add(serializablePlugin);
             }
 
+            Log.Write("Gestures Daemon", $"Found {plugins.Count} Usable Bindings Plugins.");
+
             return Task.FromResult(plugins);
         }
 

diff --git a/Touch-Gestures-0.6.x/Touch-Gestures.csproj b/Touch-Gestures-0.6.x/Touch-Gestures.csproj
@@ -2,26 +2,16 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
+    <Nullable>enable</Nullable>
     <NoWarn>$(NoWarn); NETSDK1138</NoWarn>
     <RootNamespace>TouchGestures</RootNamespace>
     <AssemblyName>Touch-Gestures</AssemblyName>
   </PropertyGroup>
 
-  <!-- Only Embed debug symbols for the Release configuration -->
-  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
-    <DebugType>embedded</DebugType>
-  </PropertyGroup>
-
-  <ItemGroup Condition="'$(OTDVersion)' == 'OTD06'">
+  <ItemGroup>
     <ProjectReference Include="../Touch-Gestures.Lib/Touch-Gestures.Lib.csproj" />
-  </ItemGroup>
 
-  <ItemGroup Condition="'$(OTDVersion)' == ''">
-    <ProjectReference Include="../Touch-Gestures.Lib/Touch-Gestures.Lib-0.6.x.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../.modules/OpenTabletDriver.External-0.6.x/.modules/OpenTabletDriver/OpenTabletDriver.Desktop/OpenTabletDriver.Desktop.csproj" />
+    <ProjectReference Include="../.modules/OTD.EnhancedOutputMode-0.6.x/.modules/OpenTabletDriver/OpenTabletDriver.Desktop/OpenTabletDriver.Desktop.csproj" Nullable="disable" />
     <ProjectReference Include="../.modules/OTD.EnhancedOutputMode-0.6.x/OTD.EnhancedOutputMode.Lib/OTD.EnhancedOutputMode.Lib.csproj" />
   </ItemGroup>
 

diff --git a/Touch-Gestures.Installer/Touch-Gestures.Installer-0.6.x.csproj b/Touch-Gestures.Installer/Touch-Gestures.Installer-0.6.x.csproj
diff --git a/Touch-Gestures.Installer/Touch-Gestures.Installer.csproj b/Touch-Gestures.Installer/Touch-Gestures.Installer.csproj
@@ -1,19 +1,30 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFrameworks>net5.0;net6.0</TargetFrameworks>
+    <Nullable>enable</Nullable>
     <NoWarn>NETSDK1138</NoWarn>
   </PropertyGroup>
 
   <!-- NET 5 Only -->
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
     <!-- OpenTabletDriver.Plugin -->
-    <ProjectReference Include="../.modules/OpenTabletDriver.External/.modules/OpenTabletDriver/OpenTabletDriver.Plugin/OpenTabletDriver.Plugin.csproj" />
+    <ProjectReference Include="../.modules/OTD.EnhancedOutputMode/.modules/OpenTabletDriver/OpenTabletDriver.Plugin/OpenTabletDriver.Plugin.csproj" Private="False" />
+  </ItemGroup>
+
+  <!-- NET 6 Only -->
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+    <!-- OpenTabletDriver.Plugin -->
+    <ProjectReference Include="../.modules/OTD.EnhancedOutputMode-0.6.x/.modules/OpenTabletDriver/OpenTabletDriver.Plugin/OpenTabletDriver.Plugin.csproj" Private="False" />
   </ItemGroup>
 
   <!-- embed ressource /build/plugin/Wheel-Addon.zip -->
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
     <EmbeddedResource Include="../build/plugin/0.5.x/Touch-Gestures-0.5.x.zip" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+    <EmbeddedResource Include="../build/plugin/0.6.x/Touch-Gestures-0.6.x.zip" />
+  </ItemGroup>
+
 </Project>
diff --git a/Touch-Gestures.Lib/Entities/Gestures/HoldGesture.cs b/Touch-Gestures.Lib/Entities/Gestures/HoldGesture.cs
@@ -17,7 +17,7 @@ namespace TouchGestures.Lib.Entities.Gestures
     [JsonObject(MemberSerialization.OptIn)]
     public partial class HoldGesture : TapGesture
     {
-        private bool _deadlineStarted = false;
+        //private bool _deadlineStarted = false;
 
         #region Constructors
 

diff --git a/Touch-Gestures.Lib/Extensions/PluginSettingsStoreExtensions.cs b/Touch-Gestures.Lib/Extensions/PluginSettingsStoreExtensions.cs
@@ -75,8 +75,8 @@ public static bool SetBindingValue(this PluginSettingStore store, TypeInfo plugi
                     return SetBindingValueCore06(store, plugin, value);
 #else
                     store.Settings.Single(s => s.Property == "Property").SetValue(value!);
-#endif
                     return true;
+#endif
                 }
             }
 

diff --git a/Touch-Gestures.Lib/Touch-Gestures.Lib-0.6.x.csproj b/Touch-Gestures.Lib/Touch-Gestures.Lib-0.6.x.csproj
diff --git a/Touch-Gestures.Lib/Touch-Gestures.Lib.csproj b/Touch-Gestures.Lib/Touch-Gestures.Lib.csproj
@@ -3,45 +3,31 @@
   <!-- Do not build the solution, it won't work with multi-targetting -->
 
   <PropertyGroup>
+    <TargetFrameworks>net5.0;net6.0</TargetFrameworks>
+    <LangVersion>preview</LangVersion>
     <RootNamespace>TouchGestures.Lib</RootNamespace>
     <NoWarn>$(NoWarn); NETSDK1138; VSTHRD200</NoWarn>
     <Nullable>enable</Nullable>
-    <OTDVersion>$(OTDVersion)</OTDVersion>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(OTDVersion)' == ''">
-    <OTDVersion>OTD05</OTDVersion>
-  </PropertyGroup>
-
-  <!-- Target Frameworks -->
-
-  <PropertyGroup Condition="'$(OTDVersion)' == 'OTD05' Or '$(OTDVersion)' == ''">
-    <TargetFramework>net5.0</TargetFramework>
-    <LangVersion>preview</LangVersion>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(OTDVersion)' == 'OTD06'">
-    <TargetFramework>net6.0</TargetFramework>
-  </PropertyGroup>
-
-  <!-- Debug Symbols -->
-
-  <!-- Only Embed debug symbols for the Release configuration -->
-  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
-    <DebugType>embedded</DebugType>
   </PropertyGroup>
 
   <!-- Dependencies -->
 
   <!-- Only for OTD 0.5.x (Running on .NET 5) -->
   <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
-    <ProjectReference Include="../.modules/OpenTabletDriver.External/.modules/OpenTabletDriver/OpenTabletDriver.Desktop/OpenTabletDriver.Desktop.csproj" PrivateAssets="all" />
-    <ProjectReference Include="../.modules/OpenTabletDriver.External/OpenTabletDriver.External.Common/OpenTabletDriver.External.Common.csproj" />
+    <ProjectReference Include="../.modules/OTD.EnhancedOutputMode/.modules/OpenTabletDriver/OpenTabletDriver.Desktop/OpenTabletDriver.Desktop.csproj" PrivateAssets="all" Nullable="disable">
+      <SetTargetFramework>TargetFramework=net5.0</SetTargetFramework>
+    </ProjectReference>
   </ItemGroup>
 
   <!-- Only for OTD 0.6.x (Running on .NET 6) -->
   <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-    <ProjectReference Include="../.modules/OpenTabletDriver.External-0.6.x/.modules/OpenTabletDriver/OpenTabletDriver.Desktop/OpenTabletDriver.Desktop.csproj" PrivateAssets="all" />
-    <ProjectReference Include="../.modules/OpenTabletDriver.External-0.6.x/OpenTabletDriver.External.Common/OpenTabletDriver.External.Common.csproj" />
+    <ProjectReference Include="../.modules/OTD.EnhancedOutputMode-0.6.x/.modules/OpenTabletDriver/OpenTabletDriver.Desktop/OpenTabletDriver.Desktop.csproj" PrivateAssets="all" Nullable="disable">
+      <SetTargetFramework>TargetFramework=net6.0</SetTargetFramework>
+    </ProjectReference>
   </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="../.modules/OpenTabletDriver.External/OpenTabletDriver.External.Common/OpenTabletDriver.External.Common.csproj" Nullable="disable" />
+  </ItemGroup>
+
 </Project>
diff --git a/Touch-Gestures.Tests/Touch-Gestures.Tests.csproj b/Touch-Gestures.Tests/Touch-Gestures.Tests.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
+    <Nullable>enable</Nullable>
     <RootNamespace>TouchGestures.Tests</RootNamespace>
     <NoWarn>$(NoWarn); NETSDK1138; VSTHRD200; NU1902; NU1903;</NoWarn>
 
@@ -23,7 +24,7 @@
 
   <ItemGroup>
     <ProjectReference Include="../Touch-Gestures.Lib/Touch-Gestures.Lib.csproj" />
-    <ProjectReference Include="../.modules/OpenTabletDriver.External/.modules/OpenTabletDriver/OpenTabletDriver.Plugin/OpenTabletDriver.Plugin.csproj" />
+    <ProjectReference Include="../.modules/OTD.EnhancedOutputMode-0.6.x/.modules/OpenTabletDriver/OpenTabletDriver.Plugin/OpenTabletDriver.Plugin.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Touch-Gestures.UX.Desktop/Touch-Gestures.UX.Desktop.csproj b/Touch-Gestures.UX.Desktop/Touch-Gestures.UX.Desktop.csproj
@@ -14,10 +14,6 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
-    <DebugType>embedded</DebugType>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->

diff --git a/Touch-Gestures.UX/Touch-Gestures.UX.csproj b/Touch-Gestures.UX/Touch-Gestures.UX.csproj
@@ -10,10 +10,6 @@
     <PublishTrimmed>true</PublishTrimmed>
     <TrimMode>Link</TrimMode>
   </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
-    <DebugType>embedded</DebugType>
-  </PropertyGroup>
 
   <ItemGroup>
     <AvaloniaResource Include="Assets\**" />
@@ -34,15 +30,10 @@
     <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="StreamJsonRpc" Version="2.6.121" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="../Touch-Gestures.Lib/Touch-Gestures.Lib.csproj" />
     <ProjectReference Include="../.modules/OpenTabletDriver.External/OpenTabletDriver.External.Avalonia/OpenTabletDriver.External.Avalonia.csproj" />
-    <ProjectReference Include="../.modules/OTD.EnhancedOutputMode/.modules/OpenTabletDriver/OpenTabletDriver.Plugin/OpenTabletDriver.Plugin.csproj" />
+    <ProjectReference Include="../.modules/OTD.EnhancedOutputMode-0.6.x/.modules/OpenTabletDriver/OpenTabletDriver.Plugin/OpenTabletDriver.Plugin.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Touch-Gestures.sln b/Touch-Gestures.sln
@@ -9,12 +9,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Touch-Gestures-0.6.x", "Tou
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Touch-Gestures.Installer", "Touch-Gestures.Installer\Touch-Gestures.Installer.csproj", "{C0D3603B-06B8-4B88-9122-EB1B9D401E85}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Touch-Gestures.Installer-0.6.x", "Touch-Gestures.Installer\Touch-Gestures.Installer-0.6.x.csproj", "{723927FA-2CC1-4944-81F8-42B1F4C9E80D}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Touch-Gestures.Lib", "Touch-Gestures.Lib\Touch-Gestures.Lib.csproj", "{D305D418-F65C-4335-8996-140E383894B0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Touch-Gestures.Lib-0.6.x", "Touch-Gestures.Lib\Touch-Gestures.Lib-0.6.x.csproj", "{8BBE54A7-CF26-414B-AE8E-E34E2D40F654}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Touch-Gestures.Tests", "Touch-Gestures.Tests\Touch-Gestures.Tests.csproj", "{FE73A8D2-F3C5-4A5E-98D9-9EFE0F4FAFA3}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Touch-Gestures.UX", "Touch-Gestures.UX\Touch-Gestures.UX.csproj", "{EBFA8512-1EA5-4D8C-B4AC-AB5B48A6D568}"

diff --git a/Touch-Gestures/GesturesDaemon.cs b/Touch-Gestures/GesturesDaemon.cs
@@ -92,6 +92,8 @@ public override Task<List<SerializablePlugin>> GetPlugins()
                 plugins.Add(serializablePlugin);
             }
 
+            Log.Write("Gestures Daemon", $"Found {plugins.Count} Usable Bindings Plugins.");
+
             return Task.FromResult(plugins);
         }
 

diff --git a/Touch-Gestures/Touch-Gestures.csproj b/Touch-Gestures/Touch-Gestures.csproj
@@ -2,18 +2,15 @@
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
+    <Nullable>enable</Nullable>
     <NoWarn>$(NoWarn); NETSDK1138</NoWarn>
     <RootNamespace>TouchGestures</RootNamespace>
   </PropertyGroup>
 
-  <!-- Only Embed debug symbols for the Release configuration -->
-  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
-    <DebugType>embedded</DebugType>
-  </PropertyGroup>
-
   <ItemGroup>
     <ProjectReference Include="../Touch-Gestures.Lib/Touch-Gestures.Lib.csproj" />
-    <ProjectReference Include="../.modules/OpenTabletDriver.External/.modules/OpenTabletDriver/OpenTabletDriver.Desktop/OpenTabletDriver.Desktop.csproj" />
+
+    <ProjectReference Include="../.modules/OTD.EnhancedOutputMode/.modules/OpenTabletDriver/OpenTabletDriver.Desktop/OpenTabletDriver.Desktop.csproj" Nullable="disable" />
     <ProjectReference Include="../.modules/OTD.EnhancedOutputMode/OTD.EnhancedOutputMode.Lib/OTD.EnhancedOutputMode.Lib.csproj" />
   </ItemGroup>
+1 −3		OTD.EnhancedOutputMode.Lib/Tools/TouchSettings.cs
+0 −2		OTD.EnhancedOutputMode/OTD.EnhancedOutputMode.csproj
+6 −6		OTD.EnhancedOutputMode/Output/EnhancedAbsoluteOutputMode.cs
+1 −1		OTD.EnhancedOutputMode/Output/EnhancedRelativeOutputMode.cs
+1 −4		OTD.EnhancedOutputMode/OTD.EnhancedOutputMode.csproj
+7 −12		OTD.EnhancedOutputMode/Output/EnhancedAbsoluteOutputMode.cs
+5 −3		OTD.EnhancedOutputMode/Output/EnhancedRelativeOutputMode.cs
+0 −1		Directory.Build.props
+17 −0		OpenTabletDriver.External.Avalonia/Controls/AreaDisplay.axaml.cs
+0 −2		OpenTabletDriver.External.Avalonia/OpenTabletDriver.External.Avalonia.csproj
+9 −0		OpenTabletDriver.External.Avalonia/TemplatedControls/DoubleInput.cs
+1 −1		OpenTabletDriver.External.Avalonia/Themes/Default/Controls/DoubleInput.axaml
+5 −5		OpenTabletDriver.External.Common/OpenTabletDriver.External.Common.csproj
+1 −2		OpenTabletDriver.External.Common/RPC/RPCServer.cs
-Original file line number
+Diff line change
@@ Expand Up / @@ -85,6 +85,8 @@ public override Task<List<SerializablePlugin>> GetPlugins() @@
                     plugins.Add(serializablePlugin);
                 }
+                Log.Write("Gestures Daemon", $"Found {plugins.Count} Usable Bindings Plugins.");
                 return Task.FromResult(plugins);
             }
@@ Expand Down @@