From 69e392bdaf2ed5afda60e8bb03335a186a20ec4a Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 7 Jan 2026 19:27:38 +0100 Subject: [PATCH] Update FANUC! --- IOB-WIN-FANUC/App.config | 20 ++++----- IOB-WIN-FANUC/DATA/CONF/MAIN.ini | 4 +- IOB-WIN-FANUC/IOB-WIN-FANUC.csproj | 45 +++++++++++-------- .../Properties/Resources.Designer.cs | 44 ++++++++---------- IOB-WIN-FANUC/Properties/Settings.Designer.cs | 22 ++++----- IOB-WIN-FANUC/packages.config | 23 +++++----- 6 files changed, 77 insertions(+), 81 deletions(-) diff --git a/IOB-WIN-FANUC/App.config b/IOB-WIN-FANUC/App.config index d23dc068..2ec47542 100644 --- a/IOB-WIN-FANUC/App.config +++ b/IOB-WIN-FANUC/App.config @@ -5,7 +5,7 @@
- + @@ -107,23 +107,23 @@ - + - + - + - + - + @@ -135,11 +135,11 @@ - + - + @@ -147,7 +147,7 @@ - + @@ -163,4 +163,4 @@ - \ No newline at end of file + diff --git a/IOB-WIN-FANUC/DATA/CONF/MAIN.ini b/IOB-WIN-FANUC/DATA/CONF/MAIN.ini index 5ae7ba77..a49d04b2 100644 --- a/IOB-WIN-FANUC/DATA/CONF/MAIN.ini +++ b/IOB-WIN-FANUC/DATA/CONF/MAIN.ini @@ -17,7 +17,7 @@ CLI_INST=SteamWareSim ;--- TEST sul campo ; SIMULAZIONE verso server ufficio ;STARTLIST=SIMUL_01,SIMUL_02,SIMUL_03,SIMUL_04 -;STARTLIST=SIMUL_01 +STARTLIST=SIMUL_01 ;STARTLIST=3025,3027,3028 ;STARTLIST=3025 ;STARTLIST=VL27 @@ -27,8 +27,8 @@ CLI_INST=SteamWareSim ;STARTLIST=3004 ;STARTLIST=3002 ;STARTLIST=GT575 -STARTLIST=3004,3005 ;STARTLIST=3029 +;STARTLIST=3004,3005 MAXCNC=10 \ No newline at end of file diff --git a/IOB-WIN-FANUC/IOB-WIN-FANUC.csproj b/IOB-WIN-FANUC/IOB-WIN-FANUC.csproj index 01794743..a2dc54fb 100644 --- a/IOB-WIN-FANUC/IOB-WIN-FANUC.csproj +++ b/IOB-WIN-FANUC/IOB-WIN-FANUC.csproj @@ -8,12 +8,13 @@ WinExe IOB_WIN_FANUC IOB-WIN-FANUC - v4.6.2 + v4.7.2 512 true true + AnyCPU @@ -47,11 +48,11 @@ ..\packages\EgwProxy.MultiCncLib.3.6.2207.1211\lib\EgwProxy.MultiCncLib.dll - - ..\packages\MapoSDK.6.14.2506.2618\lib\MapoSDK.dll + + ..\packages\MapoSDK.6.14.2509.1018\lib\MapoSDK.dll - - ..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + ..\packages\Microsoft.Bcl.AsyncInterfaces.10.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.9.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll @@ -66,14 +67,14 @@ ..\packages\NLog.5.3.4\lib\net46\NLog.dll - ..\packages\Pipelines.Sockets.Unofficial.2.2.8\lib\net461\Pipelines.Sockets.Unofficial.dll + ..\packages\Pipelines.Sockets.Unofficial.2.2.8\lib\net472\Pipelines.Sockets.Unofficial.dll - ..\packages\StackExchange.Redis.2.8.58\lib\net461\StackExchange.Redis.dll + ..\packages\StackExchange.Redis.2.10.1\lib\net472\StackExchange.Redis.dll - - ..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll + + ..\packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll @@ -84,27 +85,32 @@ ..\packages\System.Diagnostics.PerformanceCounter.9.0.0\lib\net462\System.Diagnostics.PerformanceCounter.dll - - ..\packages\System.IO.Pipelines.9.0.0\lib\net462\System.IO.Pipelines.dll + + ..\packages\System.IO.Hashing.9.0.10\lib\net462\System.IO.Hashing.dll - - ..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll + + ..\packages\System.IO.Pipelines.10.0.0\lib\net462\System.IO.Pipelines.dll + + + ..\packages\System.Memory.4.6.3\lib\net462\System.Memory.dll - - ..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll + + ..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll + + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll + ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll ..\packages\System.Threading.Channels.9.0.0\lib\net462\System.Threading.Channels.dll - - ..\packages\System.Threading.Tasks.Extensions.4.6.0\lib\net462\System.Threading.Tasks.Extensions.dll + + ..\packages\System.Threading.Tasks.Extensions.4.6.3\lib\net462\System.Threading.Tasks.Extensions.dll @@ -145,6 +151,7 @@ True Resources.resx + True App.config diff --git a/IOB-WIN-FANUC/Properties/Resources.Designer.cs b/IOB-WIN-FANUC/Properties/Resources.Designer.cs index 7ab5e0eb..a67a98b2 100644 --- a/IOB-WIN-FANUC/Properties/Resources.Designer.cs +++ b/IOB-WIN-FANUC/Properties/Resources.Designer.cs @@ -8,10 +8,10 @@ // //------------------------------------------------------------------------------ -namespace IOB_WIN_FANUC.Properties -{ - - +namespace IOB_WIN_FANUC.Properties { + using System; + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -19,51 +19,43 @@ namespace IOB_WIN_FANUC.Properties // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources - { - + internal class Resources { + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() - { + internal Resources() { } - + /// /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { - get - { - if ((resourceMan == null)) - { + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("IOB_WIN_FANUC.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; } } - + /// /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture - { - get - { + internal static global::System.Globalization.CultureInfo Culture { + get { return resourceCulture; } - set - { + set { resourceCulture = value; } } diff --git a/IOB-WIN-FANUC/Properties/Settings.Designer.cs b/IOB-WIN-FANUC/Properties/Settings.Designer.cs index 85377438..f78ebe37 100644 --- a/IOB-WIN-FANUC/Properties/Settings.Designer.cs +++ b/IOB-WIN-FANUC/Properties/Settings.Designer.cs @@ -8,21 +8,17 @@ // //------------------------------------------------------------------------------ -namespace IOB_WIN_FANUC.Properties -{ - - +namespace IOB_WIN_FANUC.Properties { + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { - + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.14.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default - { - get - { + + public static Settings Default { + get { return defaultInstance; } } diff --git a/IOB-WIN-FANUC/packages.config b/IOB-WIN-FANUC/packages.config index ada6bb10..bae8657c 100644 --- a/IOB-WIN-FANUC/packages.config +++ b/IOB-WIN-FANUC/packages.config @@ -1,24 +1,25 @@  - - + + - + - - - + + + - - - - + + + + + - + \ No newline at end of file