20230811-1

This commit is contained in:
Александр Бабаев 2023-08-11 21:19:41 +03:00
parent 42530c234d
commit 4c697863fa
19 changed files with 75 additions and 45 deletions

View File

@ -1,6 +1,4 @@
using MimeKit;
namespace anbs_cp.Classes;
namespace anbs_cp.Classes;
/// <summary>
/// Класс -- расширение для класса File

View File

@ -38,12 +38,12 @@
<ItemGroup>
<PackageReference Include="gfoidl.Base64" Version="2.0.0" />
<PackageReference Include="Microsoft.VisualStudio.Shell.Interop" Version="17.5.33428.366" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.1" />
<PackageReference Include="Microsoft.VisualStudio.Shell.Interop" Version="17.7.37355" />
<PackageReference Include="MimeTypes" Version="2.4.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.Text.Encodings.Web" Version="7.0.0" />
</ItemGroup>

View File

@ -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;
/// <summary>
/// Информация о дисках
/// </summary>
public class OsDriveInfo : IOsDriveInfo
public sealed class OsDriveInfo: IOsDriveInfo
{
/// <summary>
/// Конструктор
/// </summary>
public OsDriveInfo()
public OsDriveInfo ()
{
Type = EDriveType.DtHardDisc;
Caption = null;

View File

@ -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;
/// <summary>
/// Информация о системе

View File

@ -1,6 +1,6 @@
using anbs_cp.Interfaces.OsInfos;
using anbs_cp.OsInfo.Interfaces;
namespace anbs_cp.Classes.OsInfos;
namespace anbs_cp.OsInfo.Classes;
/// <summary>
/// Информация об интернет-соединении

View File

@ -1,16 +1,16 @@
using anbs_cp.Interfaces.OsInfos;
using anbs_cp.OsInfo.Interfaces;
namespace anbs_cp.Classes.OsInfos;
namespace anbs_cp.OsInfo.Classes;
/// <summary>
/// Класс информации о процессоре
/// </summary>
public sealed class OsProcessorInfo : IOsProcessorInfo
public sealed class OsProcessorInfo: IOsProcessorInfo
{
/// <summary>
/// Конструктор
/// </summary>
public OsProcessorInfo()
public OsProcessorInfo ()
{
Caption = null;
Description = null;

View File

@ -1,16 +1,16 @@
using anbs_cp.Interfaces.OsInfos;
using anbs_cp.OsInfo.Interfaces;
namespace anbs_cp.Classes.OsInfos;
namespace anbs_cp.OsInfo.Classes;
/// <summary>
/// Информация о видеокарте
/// </summary>
internal sealed class OsVideoAdapterInfo : IOsVideoAdapterInfo
internal sealed class OsVideoAdapterInfo: IOsVideoAdapterInfo
{
/// <summary>
/// Конструктор
/// </summary>
public OsVideoAdapterInfo()
public OsVideoAdapterInfo ()
{
AdapterRAM = 0;
Caption = null;

View File

@ -1,16 +1,16 @@
using anbs_cp.Interfaces.OsInfos;
using anbs_cp.OsInfo.Interfaces;
namespace anbs_cp.Classes.OsInfos;
namespace anbs_cp.OsInfo.Classes;
/// <summary>
/// Информация о Windows
/// </summary>
public sealed class OsWindowsInfo : IOsWindowsInfo
public sealed class OsWindowsInfo: IOsWindowsInfo
{
/// <summary>
/// Конструктор
///</summary>
public OsWindowsInfo()
public OsWindowsInfo ()
{
Version = null;
Is64 = true;
@ -42,21 +42,21 @@ public sealed class OsWindowsInfo : IOsWindowsInfo
/// <summary>
/// Заголовок
/// </summary>
public string? Caption { get => Version; set => _= value; }
public string? Caption { get => Version; set => _ = value; }
/// <summary>
/// Описание
/// </summary>
public string? Description { get => Version; set => _= value; }
public string? Description { get => Version; set => _ = value; }
/// <summary>
/// Идентификатор
/// </summary>
public string? DeviceId { get => Version; set => _= value; }
public string? DeviceId { get => Version; set => _ = value; }
/// <summary>
/// Имя
/// </summary>
public string? Name { get => Version; set => _= value; }
public string? Name { get => Version; set => _ = value; }
#endregion
}

View File

@ -1,4 +1,4 @@
namespace anbs_cp.Enums;
namespace anbs_cp.OsInfo.Enums;
/// <summary>
/// Тип носителя

View File

@ -1,4 +1,4 @@
namespace anbs_cp.Interfaces.OsInfos;
namespace anbs_cp.OsInfo.Interfaces;
/// <summary>
/// Базовые параметры устройства

View File

@ -1,11 +1,11 @@
using anbs_cp.Enums;
using anbs_cp.OsInfo.Enums;
namespace anbs_cp.Interfaces.OsInfos;
namespace anbs_cp.OsInfo.Interfaces;
/// <summary>
/// Информация о дисках
/// </summary>
public interface IOsDriveInfo : IOsBasicInfo
public interface IOsDriveInfo: IOsBasicInfo
{
/// <summary>
/// Тип диска

View File

@ -1,4 +1,4 @@
namespace anbs_cp.Interfaces.OsInfos;
namespace anbs_cp.OsInfo.Interfaces;
/// <summary>
/// Информация об интернет-соединении

View File

@ -1,9 +1,9 @@
namespace anbs_cp.Interfaces.OsInfos;
namespace anbs_cp.OsInfo.Interfaces;
/// <summary>
/// Информация о процессоре
/// </summary>
public interface IOsProcessorInfo : IOsBasicInfo
public interface IOsProcessorInfo: IOsBasicInfo
{
/// <summary>
/// Заголовок

View File

@ -1,9 +1,9 @@
namespace anbs_cp.Interfaces.OsInfos;
namespace anbs_cp.OsInfo.Interfaces;
/// <summary>
/// Информация о видеокарте
/// </summary>
public interface IOsVideoAdapterInfo : IOsBasicInfo
public interface IOsVideoAdapterInfo: IOsBasicInfo
{
/// <summary>
/// Память

View File

@ -1,4 +1,4 @@
namespace anbs_cp.Interfaces.OsInfos;
namespace anbs_cp.OsInfo.Interfaces;
/// <summary>
/// Информация о Windows

View File

@ -0,0 +1,25 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<RootNamespace>anbs_cp.OsInfo</RootNamespace>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<PackageId>ANBSoftware.ComponentsPackOsInfo</PackageId>
<Version>2023.8.11</Version>
<Authors>Александр Бабаев</Authors>
<Product>Набор компонентов ANB Software для получения информации о Windows</Product>
<Description>Библиотека полезных методов языка C# для получения информации об Windows</Description>
<Copyright>Александр Бабаев</Copyright>
<PackageProjectUrl>https://git.babaev-an.ru/babaev-an/anbsoftware_componentspack</PackageProjectUrl>
<RepositoryUrl>https://git.babaev-an.ru/babaev-an/anbsoftware_componentspack</RepositoryUrl>
<RepositoryType>git</RepositoryType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="ANBSoftware.ComponentsPack" Version="2023.811.0" />
<PackageReference Include="System.Management" Version="7.0.2" />
</ItemGroup>
</Project>

View File

@ -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

View File

@ -1,4 +1,4 @@
using anbs_cp.Classes;
using anbs_cp.OsInfo.Classes;
using Newtonsoft.Json;

View File

@ -23,6 +23,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\anbs_cposinfo\anbs_cposinfo.csproj" />
<ProjectReference Include="..\anbs_cp\anbs_cp.csproj" />
</ItemGroup>