From cfe2d3cd6c9abbee785bd6e570c354b2c5e84ce0 Mon Sep 17 00:00:00 2001 From: s7emin Date: Fri, 28 Jul 2023 10:11:20 +0500 Subject: [PATCH 1/7] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=20gitignore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..051fef4 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +################################################################################ +# Данный GITIGNORE-файл был автоматически создан Microsoft(R) Visual Studio. +################################################################################ + +*.dll From 50d17855e88d5e4bff3ec420d911f0e69fa4f5c2 Mon Sep 17 00:00:00 2001 From: s7emin Date: Fri, 28 Jul 2023 10:12:01 +0500 Subject: [PATCH 2/7] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=20=D1=86=D0=B5=D0=BB=D0=B5=D0=B2=D1=83=D1=8E=20=D0=BF=D0=BB?= =?UTF-8?q?=D0=B0=D1=82=D1=84=D0=BE=D1=80=D0=BC=D1=83=20=D0=B4=D0=BE=20.NE?= =?UTF-8?q?T=20Framework=204.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 ++ ExternalModuleExample/App.config | 6 ++-- .../ExternalModuleExample.csproj | 3 +- .../Properties/Resources.Designer.cs | 28 ++++++++--------- .../Properties/Settings.Designer.cs | 30 ++++++++----------- 5 files changed, 35 insertions(+), 35 deletions(-) diff --git a/.gitignore b/.gitignore index 051fef4..f8c69ed 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,6 @@ ################################################################################ *.dll +/ExternalModuleExample/obj/Debug +/ExternalModuleExample/.vs +/.vs diff --git a/ExternalModuleExample/App.config b/ExternalModuleExample/App.config index 88fa402..4bfa005 100644 --- a/ExternalModuleExample/App.config +++ b/ExternalModuleExample/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/ExternalModuleExample/ExternalModuleExample.csproj b/ExternalModuleExample/ExternalModuleExample.csproj index d59a7c3..2b841a3 100644 --- a/ExternalModuleExample/ExternalModuleExample.csproj +++ b/ExternalModuleExample/ExternalModuleExample.csproj @@ -9,9 +9,10 @@ Properties ExternalModuleExample ExternalModuleExample - v4.5.2 + v4.8 512 true + AnyCPU diff --git a/ExternalModuleExample/Properties/Resources.Designer.cs b/ExternalModuleExample/Properties/Resources.Designer.cs index 95caf89..68e2411 100644 --- a/ExternalModuleExample/Properties/Resources.Designer.cs +++ b/ExternalModuleExample/Properties/Resources.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Этот код создан программой. +// Исполняемая версия:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае +// повторной генерации кода. // //------------------------------------------------------------------------------ @@ -13,13 +13,13 @@ namespace ExternalModuleExample.Properties { /// - /// A strongly-typed resource class, for looking up localized strings, etc. + /// Класс ресурса со строгой типизацией для поиска локализованных строк и т.д. /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // 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")] + // Этот класс создан автоматически классом StronglyTypedResourceBuilder + // с помощью такого средства, как ResGen или Visual Studio. + // Чтобы добавить или удалить член, измените файл .ResX и снова запустите ResGen + // с параметром /str или перестройте свой проект VS. + [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 { @@ -33,7 +33,7 @@ internal Resources() { } /// - /// Returns the cached ResourceManager instance used by this class. + /// Возвращает кэшированный экземпляр ResourceManager, использованный этим классом. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Resources.ResourceManager ResourceManager { @@ -47,8 +47,8 @@ internal Resources() { } /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. + /// Перезаписывает свойство CurrentUICulture текущего потока для всех + /// обращений к ресурсу с помощью этого класса ресурса со строгой типизацией. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { @@ -61,7 +61,7 @@ internal Resources() { } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Icon { get { diff --git a/ExternalModuleExample/Properties/Settings.Designer.cs b/ExternalModuleExample/Properties/Settings.Designer.cs index c9dad29..c605dfe 100644 --- a/ExternalModuleExample/Properties/Settings.Designer.cs +++ b/ExternalModuleExample/Properties/Settings.Designer.cs @@ -1,28 +1,24 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Этот код создан программой. +// Исполняемая версия:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае +// повторной генерации кода. // //------------------------------------------------------------------------------ -namespace ExternalModuleExample.Properties -{ - - +namespace ExternalModuleExample.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.1.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; } } From 49e46cdf59c5ac82d6323430716af82851806dd8 Mon Sep 17 00:00:00 2001 From: s7emin Date: Fri, 28 Jul 2023 10:20:37 +0500 Subject: [PATCH 3/7] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B2=D0=B5=D0=BB?= =?UTF-8?q?=20=D0=BD=D0=B0=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=D0=B4=D0=BD?= =?UTF-8?q?=D1=8E=D1=8E=20(3.52.3)=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D1=8E?= =?UTF-8?q?=20Lers.Framework?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + ExternalModuleExample/App.config | 20 +- .../ExternalModuleExample.csproj | 196 +++++++++++++++--- ExternalModuleExample/packages.config | 44 ++++ 4 files changed, 234 insertions(+), 27 deletions(-) create mode 100644 ExternalModuleExample/packages.config diff --git a/.gitignore b/.gitignore index f8c69ed..b76c7a2 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /ExternalModuleExample/obj/Debug /ExternalModuleExample/.vs /.vs +/ExternalModuleExample/packages diff --git a/ExternalModuleExample/App.config b/ExternalModuleExample/App.config index 4bfa005..4d03ba9 100644 --- a/ExternalModuleExample/App.config +++ b/ExternalModuleExample/App.config @@ -1,6 +1,22 @@ - + - + + + + + + + + + + + + + + + + + diff --git a/ExternalModuleExample/ExternalModuleExample.csproj b/ExternalModuleExample/ExternalModuleExample.csproj index 2b841a3..86ec257 100644 --- a/ExternalModuleExample/ExternalModuleExample.csproj +++ b/ExternalModuleExample/ExternalModuleExample.csproj @@ -37,42 +37,187 @@ - - False - ..\..\..\..\..\..\Program Files\LERS\Common\Framework\bin\Lers.Plugins.dll - False - - - False - ..\..\..\..\..\..\Program Files\LERS\Common\Framework\bin\Lers.Plugins.Attributes.dll - False - - - False - ..\..\..\..\..\..\Program Files\LERS\Common\Framework\bin\Lers.Reports.dll - False - - - False - ..\..\..\..\..\..\Program Files\LERS\Common\Framework\bin\Lers.System.dll - False - - - False - ..\..\..\..\..\..\Program Files\LERS\Common\Framework\bin\Lers.UI.dll - False + + packages\Lers.Framework.3.52.3\lib\net48\Lers.Core.dll + + + packages\Lers.Framework.3.52.3\lib\net48\Lers.Core.SystemInfo.dll + + + packages\Lers.Framework.3.52.3\lib\net48\Lers.Http.dll + + + packages\Lers.Framework.3.52.3\lib\net48\Lers.Models.dll + + + packages\Lers.Plugins.3.52.3\lib\net48\Lers.Plugins.dll + + + packages\Lers.Plugins.3.52.3\lib\net48\Lers.Plugins.Attributes.dll + + + packages\Lers.Framework.3.52.3\lib\net48\Lers.Reports.dll + + + packages\Lers.Framework.3.52.3\lib\net48\Lers.Serialization.dll + + + packages\Lers.Framework.3.52.3\lib\net48\Lers.System.dll + + + packages\Lers.Plugins.3.52.3\lib\net48\Lers.Telemetry.Utils.dll + + + packages\Lers.Plugins.3.52.3\lib\net48\Lers.UI.dll + + + packages\Lers.Utils.3.52.3\lib\net48\Lers.Utils.dll + + + packages\Microsoft.AspNetCore.Connections.Abstractions.7.0.3\lib\net462\Microsoft.AspNetCore.Connections.Abstractions.dll + + + packages\Microsoft.AspNetCore.Http.Connections.Client.7.0.3\lib\net462\Microsoft.AspNetCore.Http.Connections.Client.dll + + + packages\Microsoft.AspNetCore.Http.Connections.Common.7.0.3\lib\net462\Microsoft.AspNetCore.Http.Connections.Common.dll + + + packages\Microsoft.AspNetCore.SignalR.Client.7.0.3\lib\net462\Microsoft.AspNetCore.SignalR.Client.dll + + + packages\Microsoft.AspNetCore.SignalR.Client.Core.7.0.3\lib\net462\Microsoft.AspNetCore.SignalR.Client.Core.dll + + + packages\Microsoft.AspNetCore.SignalR.Common.7.0.3\lib\net462\Microsoft.AspNetCore.SignalR.Common.dll + + + packages\Microsoft.AspNetCore.SignalR.Protocols.Json.7.0.3\lib\net462\Microsoft.AspNetCore.SignalR.Protocols.Json.dll + + + packages\Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson.7.0.3\lib\net462\Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson.dll + + + packages\Microsoft.Bcl.AsyncInterfaces.7.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + + packages\Microsoft.Extensions.DependencyInjection.7.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.dll + + + packages\Microsoft.Extensions.DependencyInjection.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll + + + packages\Microsoft.Extensions.Features.7.0.3\lib\net462\Microsoft.Extensions.Features.dll + + + packages\Microsoft.Extensions.Logging.7.0.0\lib\net462\Microsoft.Extensions.Logging.dll + + + packages\Microsoft.Extensions.Logging.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll + + + packages\Microsoft.Extensions.Options.7.0.1\lib\net462\Microsoft.Extensions.Options.dll + + + packages\Microsoft.Extensions.Primitives.7.0.0\lib\net462\Microsoft.Extensions.Primitives.dll + + + packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll + + packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + + + + + packages\System.Diagnostics.DiagnosticSource.7.0.0\lib\net462\System.Diagnostics.DiagnosticSource.dll + + + packages\System.IO.4.3.0\lib\net462\System.IO.dll + True + True + + + packages\System.IO.Pipelines.7.0.0\lib\net462\System.IO.Pipelines.dll + + + packages\System.Memory.4.5.5\lib\net461\System.Memory.dll + + + packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll + True + True + + + packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll + True + True + + + + packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + + packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll + True + True + + + packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + + packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll + True + True + + + packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net463\System.Security.Cryptography.Algorithms.dll + True + True + + + packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll + True + True + + + packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll + True + True + + + packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll + True + True + + + packages\System.Text.Encodings.Web.7.0.0\lib\net462\System.Text.Encodings.Web.dll + + + packages\System.Text.Json.7.0.2\lib\net462\System.Text.Json.dll + + + packages\System.Threading.Channels.7.0.0\lib\net462\System.Threading.Channels.dll + + + packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + + + packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll + - + + packages\Lers.Plugins.3.52.3\lib\net48\TelemetryClient.dll + @@ -97,6 +242,7 @@ Resources.resx True + SettingsSingleFileGenerator Settings.Designer.cs diff --git a/ExternalModuleExample/packages.config b/ExternalModuleExample/packages.config new file mode 100644 index 0000000..fdb8e54 --- /dev/null +++ b/ExternalModuleExample/packages.config @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 9a2c24c72971bc5cfe3b709b3ca54d2b6006454c Mon Sep 17 00:00:00 2001 From: s7emin Date: Fri, 28 Jul 2023 10:27:36 +0500 Subject: [PATCH 4/7] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB?= =?UTF-8?q?=20=D0=B2=D1=8B=D1=85=D0=BE=D0=B4=D0=BD=D1=83=D1=8E=20=D0=BF?= =?UTF-8?q?=D0=B0=D0=BF=D0=BA=D1=83=20=D0=BF=D1=80=D0=B8=20=D1=81=D0=B1?= =?UTF-8?q?=D0=BE=D1=80=D0=BA=D0=B5,=20=D1=82.=D0=BA.=20=D0=BD=D0=B5=D1=82?= =?UTF-8?q?=20=D0=BF=D1=80=D0=B0=D0=B2=20=D0=BD=D0=B0=20=D0=B7=D0=B0=D0=BF?= =?UTF-8?q?=D0=B8=D1=81=D1=8C=20=D0=B2=20=D0=BF=D0=B0=D0=BF=D0=BA=D1=83=20?= =?UTF-8?q?=D0=9B=D0=AD=D0=A0=D0=A1=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ExternalModuleExample/ExternalModuleExample.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ExternalModuleExample/ExternalModuleExample.csproj b/ExternalModuleExample/ExternalModuleExample.csproj index 86ec257..e5180a8 100644 --- a/ExternalModuleExample/ExternalModuleExample.csproj +++ b/ExternalModuleExample/ExternalModuleExample.csproj @@ -19,7 +19,7 @@ true full false - ..\..\..\..\..\..\Program Files\LERS\Common\Plugins\ + .\ DEBUG;TRACE prompt 4 From e5850fc5a82a3fd72a116eb8934c112711073fec Mon Sep 17 00:00:00 2001 From: s7emin Date: Fri, 28 Jul 2023 10:34:21 +0500 Subject: [PATCH 5/7] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB?= =?UTF-8?q?=20=D1=86=D0=B5=D0=BB=D0=B5=D0=B2=D1=83=D1=8E=20=D0=BF=D0=BB?= =?UTF-8?q?=D0=B0=D1=82=D1=84=D0=BE=D1=80=D0=BC=D1=83=20=D0=BD=D0=B0=20.NE?= =?UTF-8?q?T=20Framework=204.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 ++ AttributesSample/LersSample.csproj | 14 +++++++++++--- AttributesSample/app.config | 3 +++ 3 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 AttributesSample/app.config diff --git a/.gitignore b/.gitignore index b76c7a2..2f7529e 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ /ExternalModuleExample/.vs /.vs /ExternalModuleExample/packages +/AttributesSample/.vs/LersSample/v17 +/AttributesSample/obj/x64/Debug diff --git a/AttributesSample/LersSample.csproj b/AttributesSample/LersSample.csproj index b3e8686..9ea9e03 100644 --- a/AttributesSample/LersSample.csproj +++ b/AttributesSample/LersSample.csproj @@ -1,5 +1,5 @@  - + Debug x86 @@ -10,8 +10,9 @@ Properties LersSample LersSample - v4.0 - Client + v4.8 + + 512 @@ -24,6 +25,7 @@ prompt 4 false + false x86 @@ -34,6 +36,7 @@ prompt 4 false + false true @@ -45,6 +48,7 @@ prompt false false + false bin\x64\Release\ @@ -54,6 +58,7 @@ x64 false prompt + false @@ -70,6 +75,9 @@ + + +