From 85f6a4f0e87e53c11126de007a29999ab334915f Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Mon, 20 Oct 2025 21:06:42 +0300 Subject: Fixerd issue with assembly binding. --- Software/Visual_Studio/PPC/Tango.PPC.UI/App.config | 10 +--------- Software/Visual_Studio/PPC/Tango.PPC.UI/MainWindow.xaml.cs | 2 +- Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj | 6 ++---- Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest | 2 +- 4 files changed, 5 insertions(+), 15 deletions(-) (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI') diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/App.config b/Software/Visual_Studio/PPC/Tango.PPC.UI/App.config index 8357e17a5..3d6a524e6 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/App.config +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/App.config @@ -108,7 +108,7 @@ - + @@ -127,14 +127,6 @@ - - - - - - - - diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/MainWindow.xaml.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/MainWindow.xaml.cs index 33d57e2b1..aeb491276 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/MainWindow.xaml.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/MainWindow.xaml.cs @@ -76,7 +76,7 @@ namespace Tango.PPC.UI var touch_screen = screens.OrderBy(x => x.Bounds.X).Last(); - bool hasTouch = TouchHelper.IsTouchEnabled() || settings.ForceTouchMode; + bool hasTouch = (TouchHelper.IsTouchEnabled() && !Debugger.IsAttached) || settings.ForceTouchMode; if (!hasTouch) { diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj index 0f70a1932..477648080 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj @@ -169,9 +169,7 @@ ..\..\packages\Microsoft.WindowsAPICodePack-Core.1.1.0.0\lib\Microsoft.WindowsAPICodePack.dll - - ..\..\packages\WindowsAzure.Storage.7.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll - + ..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll @@ -1215,7 +1213,7 @@ if $(ConfigurationName) == X1 copy /Y "$(ProjectDir)Intro.wmv" "$(TargetDir)" - + diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest index d72e75011..efc5f8179 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest @@ -16,7 +16,7 @@ Remove this element if your application requires this virtualization for backwards compatibility. --> - + -- cgit v1.3.1