diff --git a/anbs_cp/Classes/FileExtensions.cs b/anbs_cp/Classes/FileExtensions.cs index 6dee83e..2988845 100644 --- a/anbs_cp/Classes/FileExtensions.cs +++ b/anbs_cp/Classes/FileExtensions.cs @@ -1,6 +1,4 @@ -using MimeKit; - -namespace anbs_cp.Classes; +namespace anbs_cp.Classes; /// /// Класс -- расширение для класса File diff --git a/anbs_cp/anbs_cp.csproj b/anbs_cp/anbs_cp.csproj index b1d3421..f9514d6 100644 --- a/anbs_cp/anbs_cp.csproj +++ b/anbs_cp/anbs_cp.csproj @@ -38,12 +38,12 @@ - - + all runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/anbs_cp/Classes/OsInfos/OsDriveInfo.cs b/anbs_cposinfo/Classes/OsDriveInfo.cs similarity index 86% rename from anbs_cp/Classes/OsInfos/OsDriveInfo.cs rename to anbs_cposinfo/Classes/OsDriveInfo.cs index b64ef67..8ec8ce0 100644 --- a/anbs_cp/Classes/OsInfos/OsDriveInfo.cs +++ b/anbs_cposinfo/Classes/OsDriveInfo.cs @@ -1,17 +1,17 @@ -using anbs_cp.Enums; -using anbs_cp.Interfaces.OsInfos; +using anbs_cp.OsInfo.Enums; +using anbs_cp.OsInfo.Interfaces; -namespace anbs_cp.Classes.OsInfos; +namespace anbs_cp.OsInfo.Classes; /// /// Информация о дисках /// -public class OsDriveInfo : IOsDriveInfo +public sealed class OsDriveInfo: IOsDriveInfo { /// /// Конструктор /// - public OsDriveInfo() + public OsDriveInfo () { Type = EDriveType.DtHardDisc; Caption = null; diff --git a/anbs_cp/Classes/OsInfo.cs b/anbs_cposinfo/Classes/OsInfo.cs similarity index 99% rename from anbs_cp/Classes/OsInfo.cs rename to anbs_cposinfo/Classes/OsInfo.cs index ad059bc..7b6da2d 100644 --- a/anbs_cp/Classes/OsInfo.cs +++ b/anbs_cposinfo/Classes/OsInfo.cs @@ -2,11 +2,11 @@ using System.Net.NetworkInformation; using System.Net.Sockets; -using anbs_cp.Classes.OsInfos; -using anbs_cp.Enums; -using anbs_cp.Interfaces.OsInfos; +using anbs_cp.Classes; +using anbs_cp.OsInfo.Enums; +using anbs_cp.OsInfo.Interfaces; -namespace anbs_cp.Classes; +namespace anbs_cp.OsInfo.Classes; /// /// Информация о системе diff --git a/anbs_cp/Classes/OsInfos/OsNetInfo.cs b/anbs_cposinfo/Classes/OsNetInfo.cs similarity index 92% rename from anbs_cp/Classes/OsInfos/OsNetInfo.cs rename to anbs_cposinfo/Classes/OsNetInfo.cs index 5e0eb5f..e5b416b 100644 --- a/anbs_cp/Classes/OsInfos/OsNetInfo.cs +++ b/anbs_cposinfo/Classes/OsNetInfo.cs @@ -1,6 +1,6 @@ -using anbs_cp.Interfaces.OsInfos; +using anbs_cp.OsInfo.Interfaces; -namespace anbs_cp.Classes.OsInfos; +namespace anbs_cp.OsInfo.Classes; /// /// Информация об интернет-соединении diff --git a/anbs_cp/Classes/OsInfos/OsProcessorInfo.cs b/anbs_cposinfo/Classes/OsProcessorInfo.cs similarity index 89% rename from anbs_cp/Classes/OsInfos/OsProcessorInfo.cs rename to anbs_cposinfo/Classes/OsProcessorInfo.cs index b99e6af..df3bba8 100644 --- a/anbs_cp/Classes/OsInfos/OsProcessorInfo.cs +++ b/anbs_cposinfo/Classes/OsProcessorInfo.cs @@ -1,16 +1,16 @@ -using anbs_cp.Interfaces.OsInfos; +using anbs_cp.OsInfo.Interfaces; -namespace anbs_cp.Classes.OsInfos; +namespace anbs_cp.OsInfo.Classes; /// /// Класс информации о процессоре /// -public sealed class OsProcessorInfo : IOsProcessorInfo +public sealed class OsProcessorInfo: IOsProcessorInfo { /// /// Конструктор /// - public OsProcessorInfo() + public OsProcessorInfo () { Caption = null; Description = null; diff --git a/anbs_cp/Classes/OsInfos/OsVideoAdapterInfo.cs b/anbs_cposinfo/Classes/OsVideoAdapterInfo.cs similarity index 91% rename from anbs_cp/Classes/OsInfos/OsVideoAdapterInfo.cs rename to anbs_cposinfo/Classes/OsVideoAdapterInfo.cs index 59ede17..2b46a7a 100644 --- a/anbs_cp/Classes/OsInfos/OsVideoAdapterInfo.cs +++ b/anbs_cposinfo/Classes/OsVideoAdapterInfo.cs @@ -1,16 +1,16 @@ -using anbs_cp.Interfaces.OsInfos; +using anbs_cp.OsInfo.Interfaces; -namespace anbs_cp.Classes.OsInfos; +namespace anbs_cp.OsInfo.Classes; /// /// Информация о видеокарте /// -internal sealed class OsVideoAdapterInfo : IOsVideoAdapterInfo +internal sealed class OsVideoAdapterInfo: IOsVideoAdapterInfo { /// /// Конструктор /// - public OsVideoAdapterInfo() + public OsVideoAdapterInfo () { AdapterRAM = 0; Caption = null; diff --git a/anbs_cp/Classes/OsInfos/OsWindowsInfo.cs b/anbs_cposinfo/Classes/OsWindowsInfo.cs similarity index 71% rename from anbs_cp/Classes/OsInfos/OsWindowsInfo.cs rename to anbs_cposinfo/Classes/OsWindowsInfo.cs index e16e1aa..3218361 100644 --- a/anbs_cp/Classes/OsInfos/OsWindowsInfo.cs +++ b/anbs_cposinfo/Classes/OsWindowsInfo.cs @@ -1,16 +1,16 @@ -using anbs_cp.Interfaces.OsInfos; +using anbs_cp.OsInfo.Interfaces; -namespace anbs_cp.Classes.OsInfos; +namespace anbs_cp.OsInfo.Classes; /// /// Информация о Windows /// -public sealed class OsWindowsInfo : IOsWindowsInfo +public sealed class OsWindowsInfo: IOsWindowsInfo { /// /// Конструктор /// - public OsWindowsInfo() + public OsWindowsInfo () { Version = null; Is64 = true; @@ -42,21 +42,21 @@ public sealed class OsWindowsInfo : IOsWindowsInfo /// /// Заголовок /// - public string? Caption { get => Version; set => _= value; } + public string? Caption { get => Version; set => _ = value; } /// /// Описание /// - public string? Description { get => Version; set => _= value; } + public string? Description { get => Version; set => _ = value; } /// /// Идентификатор /// - public string? DeviceId { get => Version; set => _= value; } + public string? DeviceId { get => Version; set => _ = value; } /// /// Имя /// - public string? Name { get => Version; set => _= value; } + public string? Name { get => Version; set => _ = value; } #endregion } \ No newline at end of file diff --git a/anbs_cp/Enums/EDriveType.cs b/anbs_cposinfo/Enums/EDriveType.cs similarity index 87% rename from anbs_cp/Enums/EDriveType.cs rename to anbs_cposinfo/Enums/EDriveType.cs index 7b8c049..c8af779 100644 --- a/anbs_cp/Enums/EDriveType.cs +++ b/anbs_cposinfo/Enums/EDriveType.cs @@ -1,4 +1,4 @@ -namespace anbs_cp.Enums; +namespace anbs_cp.OsInfo.Enums; /// /// Тип носителя diff --git a/anbs_cp/Interfaces/OsInfos/IOsBasicInfo.cs b/anbs_cposinfo/Interfaces/IOsBasicInfo.cs similarity index 93% rename from anbs_cp/Interfaces/OsInfos/IOsBasicInfo.cs rename to anbs_cposinfo/Interfaces/IOsBasicInfo.cs index 986dffd..2d40df6 100644 --- a/anbs_cp/Interfaces/OsInfos/IOsBasicInfo.cs +++ b/anbs_cposinfo/Interfaces/IOsBasicInfo.cs @@ -1,4 +1,4 @@ -namespace anbs_cp.Interfaces.OsInfos; +namespace anbs_cp.OsInfo.Interfaces; /// /// Базовые параметры устройства diff --git a/anbs_cp/Interfaces/OsInfos/IOsDriveInfo.cs b/anbs_cposinfo/Interfaces/IOsDriveInfo.cs similarity index 77% rename from anbs_cp/Interfaces/OsInfos/IOsDriveInfo.cs rename to anbs_cposinfo/Interfaces/IOsDriveInfo.cs index 522dba6..04cfdd1 100644 --- a/anbs_cp/Interfaces/OsInfos/IOsDriveInfo.cs +++ b/anbs_cposinfo/Interfaces/IOsDriveInfo.cs @@ -1,11 +1,11 @@ -using anbs_cp.Enums; +using anbs_cp.OsInfo.Enums; -namespace anbs_cp.Interfaces.OsInfos; +namespace anbs_cp.OsInfo.Interfaces; /// /// Информация о дисках /// -public interface IOsDriveInfo : IOsBasicInfo +public interface IOsDriveInfo: IOsBasicInfo { /// /// Тип диска diff --git a/anbs_cp/Interfaces/OsInfos/IOsNetInfo.cs b/anbs_cposinfo/Interfaces/IOsNetInfo.cs similarity index 89% rename from anbs_cp/Interfaces/OsInfos/IOsNetInfo.cs rename to anbs_cposinfo/Interfaces/IOsNetInfo.cs index 6efac09..5e54e62 100644 --- a/anbs_cp/Interfaces/OsInfos/IOsNetInfo.cs +++ b/anbs_cposinfo/Interfaces/IOsNetInfo.cs @@ -1,4 +1,4 @@ -namespace anbs_cp.Interfaces.OsInfos; +namespace anbs_cp.OsInfo.Interfaces; /// /// Информация об интернет-соединении diff --git a/anbs_cp/Interfaces/OsInfos/IOsProcessorInfo.cs b/anbs_cposinfo/Interfaces/IOsProcessorInfo.cs similarity index 87% rename from anbs_cp/Interfaces/OsInfos/IOsProcessorInfo.cs rename to anbs_cposinfo/Interfaces/IOsProcessorInfo.cs index 87ddc7e..56b8179 100644 --- a/anbs_cp/Interfaces/OsInfos/IOsProcessorInfo.cs +++ b/anbs_cposinfo/Interfaces/IOsProcessorInfo.cs @@ -1,9 +1,9 @@ -namespace anbs_cp.Interfaces.OsInfos; +namespace anbs_cp.OsInfo.Interfaces; /// /// Информация о процессоре /// -public interface IOsProcessorInfo : IOsBasicInfo +public interface IOsProcessorInfo: IOsBasicInfo { /// /// Заголовок diff --git a/anbs_cp/Interfaces/OsInfos/IOsVideoAdapterInfo.cs b/anbs_cposinfo/Interfaces/IOsVideoAdapterInfo.cs similarity index 91% rename from anbs_cp/Interfaces/OsInfos/IOsVideoAdapterInfo.cs rename to anbs_cposinfo/Interfaces/IOsVideoAdapterInfo.cs index 26fced1..9b4c6a2 100644 --- a/anbs_cp/Interfaces/OsInfos/IOsVideoAdapterInfo.cs +++ b/anbs_cposinfo/Interfaces/IOsVideoAdapterInfo.cs @@ -1,9 +1,9 @@ -namespace anbs_cp.Interfaces.OsInfos; +namespace anbs_cp.OsInfo.Interfaces; /// /// Информация о видеокарте /// -public interface IOsVideoAdapterInfo : IOsBasicInfo +public interface IOsVideoAdapterInfo: IOsBasicInfo { /// /// Память diff --git a/anbs_cp/Interfaces/OsInfos/IOsWindowsInfo.cs b/anbs_cposinfo/Interfaces/IOsWindowsInfo.cs similarity index 93% rename from anbs_cp/Interfaces/OsInfos/IOsWindowsInfo.cs rename to anbs_cposinfo/Interfaces/IOsWindowsInfo.cs index 3e3fae4..7459f82 100644 --- a/anbs_cp/Interfaces/OsInfos/IOsWindowsInfo.cs +++ b/anbs_cposinfo/Interfaces/IOsWindowsInfo.cs @@ -1,4 +1,4 @@ -namespace anbs_cp.Interfaces.OsInfos; +namespace anbs_cp.OsInfo.Interfaces; /// /// Информация о Windows diff --git a/anbs_cposinfo/anbs_cposinfo.csproj b/anbs_cposinfo/anbs_cposinfo.csproj new file mode 100644 index 0000000..ea64a25 --- /dev/null +++ b/anbs_cposinfo/anbs_cposinfo.csproj @@ -0,0 +1,25 @@ + + + + net7.0 + enable + enable + anbs_cp.OsInfo + True + ANBSoftware.ComponentsPackOsInfo + 2023.8.11 + Александр Бабаев + Набор компонентов ANB Software для получения информации о Windows + Библиотека полезных методов языка C# для получения информации об Windows + Александр Бабаев + https://git.babaev-an.ru/babaev-an/anbsoftware_componentspack + https://git.babaev-an.ru/babaev-an/anbsoftware_componentspack + git + + + + + + + + diff --git a/anbsoftware.componentspack.sln b/anbsoftware.componentspack.sln index 1443384..e2e10fa 100644 --- a/anbsoftware.componentspack.sln +++ b/anbsoftware.componentspack.sln @@ -10,11 +10,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "demo", "demo\demo.csproj", {442A56CC-1061-4EB5-8B67-3E3D997976D7} = {442A56CC-1061-4EB5-8B67-3E3D997976D7} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "anbs_cpfn", "anbs_cpfn\anbs_cpfn.csproj", "{EDED871B-8A96-4A2F-83CF-AD40FF66F6E2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "anbs_cpfn", "anbs_cpfn\anbs_cpfn.csproj", "{EDED871B-8A96-4A2F-83CF-AD40FF66F6E2}" ProjectSection(ProjectDependencies) = postProject {442A56CC-1061-4EB5-8B67-3E3D997976D7} = {442A56CC-1061-4EB5-8B67-3E3D997976D7} EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "anbs_cposinfo", "anbs_cposinfo\anbs_cposinfo.csproj", "{80E1FEA9-EEDA-4411-8EBA-11991432E98E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -32,6 +34,10 @@ Global {EDED871B-8A96-4A2F-83CF-AD40FF66F6E2}.Debug|Any CPU.Build.0 = Debug|Any CPU {EDED871B-8A96-4A2F-83CF-AD40FF66F6E2}.Release|Any CPU.ActiveCfg = Release|Any CPU {EDED871B-8A96-4A2F-83CF-AD40FF66F6E2}.Release|Any CPU.Build.0 = Release|Any CPU + {80E1FEA9-EEDA-4411-8EBA-11991432E98E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {80E1FEA9-EEDA-4411-8EBA-11991432E98E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {80E1FEA9-EEDA-4411-8EBA-11991432E98E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {80E1FEA9-EEDA-4411-8EBA-11991432E98E}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/demo/OsInfoFrm.cs b/demo/OsInfoFrm.cs index df8694b..f92bea5 100644 --- a/demo/OsInfoFrm.cs +++ b/demo/OsInfoFrm.cs @@ -1,4 +1,4 @@ -using anbs_cp.Classes; +using anbs_cp.OsInfo.Classes; using Newtonsoft.Json; diff --git a/demo/demo.csproj b/demo/demo.csproj index d1ba3bc..05b81c5 100644 --- a/demo/demo.csproj +++ b/demo/demo.csproj @@ -23,6 +23,7 @@ +