diff --git a/.gitmodules b/.gitmodules
index 6dae2ac..ff13358 100644
--- 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
index 7a19b26..a618602 160000
--- a/.modules/OTD.EnhancedOutputMode
+++ b/.modules/OTD.EnhancedOutputMode
@@ -1 +1 @@
-Subproject commit 7a19b2609c201c096b7035949a5e4caf48f6c9aa
+Subproject commit a61860267456dbcf3f7ac90dad71595eccfbe8c4
diff --git a/.modules/OTD.EnhancedOutputMode-0.6.x b/.modules/OTD.EnhancedOutputMode-0.6.x
index 5ff86ce..8537c24 160000
--- a/.modules/OTD.EnhancedOutputMode-0.6.x
+++ b/.modules/OTD.EnhancedOutputMode-0.6.x
@@ -1 +1 @@
-Subproject commit 5ff86cefdd1e8f062fa957840b426586f72334b3
+Subproject commit 8537c240c4e3f8e0c178b7deb81c1269319a5f39
diff --git a/.modules/OpenTabletDriver.External b/.modules/OpenTabletDriver.External
index e8c8d8b..a826efd 160000
--- a/.modules/OpenTabletDriver.External
+++ b/.modules/OpenTabletDriver.External
@@ -1 +1 @@
-Subproject commit e8c8d8b830f377f5e00c5416d2f08994416f596e
+Subproject commit a826efdc0af709f7fd75e9ce74da48af795af452
diff --git a/.modules/OpenTabletDriver.External-0.6.x b/.modules/OpenTabletDriver.External-0.6.x
deleted file mode 160000
index 7dd970d..0000000
--- a/.modules/OpenTabletDriver.External-0.6.x
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7dd970dc824053cb44449a539a792c403e70cf3c
diff --git a/Directory.Build.props b/Directory.Build.props
index d1c09df..74dc3d9 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,7 +1,15 @@
- $(NoWarn); NETSDK1138; NU1902; NU1903
- enable
+ $(NoWarn); NETSDK1138
+ critical
11.0.10
+
+
+
+ embedded
+
+
+
+
diff --git a/Targets/FixPackageId.targets b/Targets/FixPackageId.targets
new file mode 100644
index 0000000..6053cfc
--- /dev/null
+++ b/Targets/FixPackageId.targets
@@ -0,0 +1,12 @@
+
+
+
+
+
+ $(AssemblyName)-$(TargetFramework)
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Touch-Gestures-0.6.x/GesturesDaemon.cs b/Touch-Gestures-0.6.x/GesturesDaemon.cs
index 9eea2cc..1c733df 100644
--- a/Touch-Gestures-0.6.x/GesturesDaemon.cs
+++ b/Touch-Gestures-0.6.x/GesturesDaemon.cs
@@ -85,6 +85,8 @@ public override Task> 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
index 20b7ba1..1a86232 100644
--- a/Touch-Gestures-0.6.x/Touch-Gestures.csproj
+++ b/Touch-Gestures-0.6.x/Touch-Gestures.csproj
@@ -2,26 +2,16 @@
net6.0
+ enable
$(NoWarn); NETSDK1138
TouchGestures
Touch-Gestures
-
-
- embedded
-
-
-
+
-
-
-
-
-
-
-
+
diff --git a/Touch-Gestures.Installer/Touch-Gestures.Installer-0.6.x.csproj b/Touch-Gestures.Installer/Touch-Gestures.Installer-0.6.x.csproj
deleted file mode 100644
index 4ca7229..0000000
--- a/Touch-Gestures.Installer/Touch-Gestures.Installer-0.6.x.csproj
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
- net6.0
- NETSDK1138
- Touch-Gestures.Installer
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Touch-Gestures.Installer/Touch-Gestures.Installer.csproj b/Touch-Gestures.Installer/Touch-Gestures.Installer.csproj
index 6f61afa..b2f0281 100644
--- a/Touch-Gestures.Installer/Touch-Gestures.Installer.csproj
+++ b/Touch-Gestures.Installer/Touch-Gestures.Installer.csproj
@@ -1,19 +1,30 @@
- net5.0
+ net5.0;net6.0
+ enable
NETSDK1138
-
+
-
+
+
+
+
+
+
+
-
+
+
+
+
+
diff --git a/Touch-Gestures.Lib/Entities/Gestures/HoldGesture.cs b/Touch-Gestures.Lib/Entities/Gestures/HoldGesture.cs
index 5a8a8ec..5fbb337 100644
--- 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
index 529b9a1..2fb7ee9 100644
--- 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
deleted file mode 100644
index cf4956a..0000000
--- a/Touch-Gestures.Lib/Touch-Gestures.Lib-0.6.x.csproj
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
- net6.0
- TouchGestures.Lib
- $(NoWarn); NETSDK1138; VSTHRD200
- enable
- Touch-Gestures.Lib
-
-
-
-
- embedded
-
-
-
-
-
-
-
-
diff --git a/Touch-Gestures.Lib/Touch-Gestures.Lib.csproj b/Touch-Gestures.Lib/Touch-Gestures.Lib.csproj
index 40dd390..403d78d 100644
--- a/Touch-Gestures.Lib/Touch-Gestures.Lib.csproj
+++ b/Touch-Gestures.Lib/Touch-Gestures.Lib.csproj
@@ -3,45 +3,31 @@
+ net5.0;net6.0
+ preview
TouchGestures.Lib
$(NoWarn); NETSDK1138; VSTHRD200
enable
- $(OTDVersion)
-
-
-
- OTD05
-
-
-
-
-
- net5.0
- preview
-
-
-
- net6.0
-
-
-
-
-
-
- embedded
-
-
+
+ TargetFramework=net5.0
+
-
-
+
+ TargetFramework=net6.0
+
+
+
+
+
+
diff --git a/Touch-Gestures.Tests/Touch-Gestures.Tests.csproj b/Touch-Gestures.Tests/Touch-Gestures.Tests.csproj
index 41c19c9..199a296 100644
--- a/Touch-Gestures.Tests/Touch-Gestures.Tests.csproj
+++ b/Touch-Gestures.Tests/Touch-Gestures.Tests.csproj
@@ -2,6 +2,7 @@
net8.0
+ enable
TouchGestures.Tests
$(NoWarn); NETSDK1138; VSTHRD200; NU1902; NU1903;
@@ -23,7 +24,7 @@
-
+
diff --git a/Touch-Gestures.UX.Desktop/Touch-Gestures.UX.Desktop.csproj b/Touch-Gestures.UX.Desktop/Touch-Gestures.UX.Desktop.csproj
index 6ae91d8..5d3a6b5 100644
--- a/Touch-Gestures.UX.Desktop/Touch-Gestures.UX.Desktop.csproj
+++ b/Touch-Gestures.UX.Desktop/Touch-Gestures.UX.Desktop.csproj
@@ -14,10 +14,6 @@
app.manifest
-
- embedded
-
-
diff --git a/Touch-Gestures.UX/Touch-Gestures.UX.csproj b/Touch-Gestures.UX/Touch-Gestures.UX.csproj
index f010b82..4b2f536 100644
--- a/Touch-Gestures.UX/Touch-Gestures.UX.csproj
+++ b/Touch-Gestures.UX/Touch-Gestures.UX.csproj
@@ -10,10 +10,6 @@
true
Link
-
-
- embedded
-
@@ -34,15 +30,10 @@
-
-
-
-
-
-
+
diff --git a/Touch-Gestures.sln b/Touch-Gestures.sln
index 2346576..500da31 100644
--- 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
index 2a81d2e..731f8cd 100644
--- a/Touch-Gestures/GesturesDaemon.cs
+++ b/Touch-Gestures/GesturesDaemon.cs
@@ -92,6 +92,8 @@ public override Task> 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
index 065c287..494c04c 100644
--- a/Touch-Gestures/Touch-Gestures.csproj
+++ b/Touch-Gestures/Touch-Gestures.csproj
@@ -2,18 +2,15 @@
net5.0
+ enable
$(NoWarn); NETSDK1138
TouchGestures
-
-
- embedded
-
-
-
+
+
diff --git a/build-plugin.sh b/build-plugin.sh
index d971f60..fe045c8 100755
--- a/build-plugin.sh
+++ b/build-plugin.sh
@@ -7,6 +7,11 @@ declare -rA versions=(
["0.6.x"]="OTD06"
)
+declare -rA targetFrameworks=(
+ ["0.5.x"]="net5.0"
+ ["0.6.x"]="net6.0"
+)
+
declare -rA suffixes=(
["OTD05"]=""
["OTD06"]="-0.6.x"
@@ -122,20 +127,16 @@ move_files () {
build_installer () {
echo ""
- echo "Building the installer"
+ echo "Building the installer for $version"
echo ""
- project="Touch-Gestures.Installer/Touch-Gestures.Installer$suffix.csproj"
-
# Build the installer
- if ! dotnet publish $project -c Release -p:noWarn='"NETSDK1138;VSTHRD200"' -o temp/installer/$version;
+ if ! dotnet publish Touch-Gestures.Installer -c Release -f $targetFramework -p:noWarn='"NETSDK1138;VSTHRD200"' -o build/installer/$version;
then
echo "Failed to build Touch-Gestures.Installer for $version"
exit 1
fi
- mv "temp/installer/$version/Touch-Gestures.Installer.dll" "build/installer/$version/Touch-Gestures.Installer.dll"
-
(
cd build/installer/$version
@@ -160,18 +161,17 @@ for version in "${!versions[@]}"
do
# Get suffix for the version (0.5.x -> OTD05 -> "")
version_code=${versions[${version}]}
+ targetFramework=${targetFrameworks[${version}]}
suffix=${suffixes[${version_code}]}
create_plugin_structure
echo ""
- echo "Building Touch-Gestures"
+ echo "Building Touch-Gestures $version"
echo ""
- echo "Building Touch-Gestures$suffix"
-
#Build the plugin, exit on failure
- if ! dotnet publish "Touch-Gestures$suffix" -c Release -p:noWarn='"NETSDK1138;VSTHRD200"' -o temp/plugin/$version -p:OTDVersion=$version_code;
+ if ! dotnet publish "Touch-Gestures$suffix" -c Release -p:noWarn='"NETSDK1138;VSTHRD200"' -o temp/plugin/$version ;
then
echo "Failed to build Touch-Gestures for $version"
exit 1