diff --git a/IOB-WIN-OSAI/App.config b/IOB-WIN-OSAI/App.config index 70defdec..d22a26d1 100644 --- a/IOB-WIN-OSAI/App.config +++ b/IOB-WIN-OSAI/App.config @@ -5,7 +5,7 @@
- + @@ -111,15 +111,15 @@ - + - + - + @@ -127,15 +127,15 @@ - + - + - + @@ -147,7 +147,7 @@ - + @@ -163,7 +163,7 @@ - + @@ -179,4 +179,4 @@ - \ No newline at end of file + diff --git a/IOB-WIN-OSAI/IOB-WIN-OSAI.csproj b/IOB-WIN-OSAI/IOB-WIN-OSAI.csproj index 248f7b7d..575baa5d 100644 --- a/IOB-WIN-OSAI/IOB-WIN-OSAI.csproj +++ b/IOB-WIN-OSAI/IOB-WIN-OSAI.csproj @@ -8,12 +8,13 @@ WinExe IOB_WIN_OSAI IOB-WIN-OSAI - v4.6.2 + v4.7.2 512 true true + AnyCPU @@ -56,21 +57,51 @@ ..\packages\EgwProxy.OsaiCncLib.3.6.2205.2015\lib\EgwProxy.OsaiCncLib.XmlSerializers.dll - - ..\packages\MapoSDK.6.14.2505.2916\lib\MapoSDK.dll + + ..\packages\MapoSDK.6.14.2509.1018\lib\MapoSDK.dll + + + ..\packages\Microsoft.Bcl.AsyncInterfaces.10.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll ..\packages\NLog.5.3.4\lib\net46\NLog.dll + + ..\packages\Pipelines.Sockets.Unofficial.2.2.8\lib\net472\Pipelines.Sockets.Unofficial.dll + - ..\packages\StackExchange.Redis.2.8.24\lib\net461\StackExchange.Redis.dll + ..\packages\StackExchange.Redis.2.10.1\lib\net472\StackExchange.Redis.dll + + ..\packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll + ..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll + + ..\packages\System.IO.Hashing.9.0.10\lib\net462\System.IO.Hashing.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.1\lib\net462\System.Numerics.Vectors.dll + + + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll + + + + ..\packages\System.Threading.Tasks.Extensions.4.6.3\lib\net462\System.Threading.Tasks.Extensions.dll + @@ -109,6 +140,7 @@ True Resources.resx + True App.config @@ -194,13 +226,6 @@ - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - @@ -211,4 +236,11 @@ + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + \ No newline at end of file diff --git a/IOB-WIN-OSAI/Properties/Resources.Designer.cs b/IOB-WIN-OSAI/Properties/Resources.Designer.cs index 3a31d2fe..3c021bc7 100644 --- a/IOB-WIN-OSAI/Properties/Resources.Designer.cs +++ b/IOB-WIN-OSAI/Properties/Resources.Designer.cs @@ -8,10 +8,10 @@ // //------------------------------------------------------------------------------ -namespace IOB_WIN_OSAI.Properties -{ - - +namespace IOB_WIN_OSAI.Properties { + using System; + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -19,51 +19,43 @@ namespace IOB_WIN_OSAI.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_OSAI.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-OSAI/Properties/Settings.Designer.cs b/IOB-WIN-OSAI/Properties/Settings.Designer.cs index a90b611c..9c1e8b83 100644 --- a/IOB-WIN-OSAI/Properties/Settings.Designer.cs +++ b/IOB-WIN-OSAI/Properties/Settings.Designer.cs @@ -8,21 +8,17 @@ // //------------------------------------------------------------------------------ -namespace IOB_WIN_OSAI.Properties -{ - - +namespace IOB_WIN_OSAI.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-OSAI/packages.config b/IOB-WIN-OSAI/packages.config index 99ca24e1..c3cffd5f 100644 --- a/IOB-WIN-OSAI/packages.config +++ b/IOB-WIN-OSAI/packages.config @@ -2,24 +2,25 @@ - - + + - + - - - + + + - - - - + + + + + - + \ No newline at end of file