ToolPack1
Changes
.gitignore 3(+3 -0)
ToolPack1/Nuget/Nuget build.bat 3(+2 -1)
ToolPack1/ToolPack1.sln 8(+8 -0)
Details
.gitignore 3(+3 -0)
diff --git a/.gitignore b/.gitignore
index da3e57c..f5fcaea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,5 +43,8 @@ ToolPack1/Tools/Tools.SingletonTool/obj/
ToolPack1/Tools/Tools.ConfigurationTool/bin/
ToolPack1/Tools/Tools.ConfigurationTool/obj/
+
+ToolPack1/Tools/Tools.XMLExtensions/bin/
+ToolPack1/Tools/Tools.XMLExtensions/obj/
#----------------------------------------
ToolPack1/Nuget/Nuget build.bat 3(+2 -1)
diff --git a/ToolPack1/Nuget/Nuget build.bat b/ToolPack1/Nuget/Nuget build.bat
index 5a2f049..03a6c40 100644
--- a/ToolPack1/Nuget/Nuget build.bat
+++ b/ToolPack1/Nuget/Nuget build.bat
@@ -2,4 +2,5 @@
nuget pack ToolPack1.RW_Tool.nuspec -OutputDirectory ".\Packages"
nuget pack ToolPack1.Tools.SingletonTool.nuspec -OutputDirectory ".\Packages"
nuget pack ToolPack1.Tools.SimpleBenchmark.nuspec -OutputDirectory ".\Packages"
-nuget pack ToolPack1.Tools.ConfigurationTool.nuspec -OutputDirectory ".\Packages"
\ No newline at end of file
+nuget pack ToolPack1.Tools.ConfigurationTool.nuspec -OutputDirectory ".\Packages"
+nuget pack ToolPack1.Tools.XMLExtensions.nuspec -OutputDirectory ".\Packages"
\ No newline at end of file
diff --git a/ToolPack1/Nuget/ToolPack1.Tools.XMLExtensions.nuspec b/ToolPack1/Nuget/ToolPack1.Tools.XMLExtensions.nuspec
new file mode 100644
index 0000000..8adf3ba
--- /dev/null
+++ b/ToolPack1/Nuget/ToolPack1.Tools.XMLExtensions.nuspec
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+ <metadata>
+ <!-- Required elements-->
+ <id>ToolPack1.Tools.XMLExtensions</id>
+ <version>2.0.0</version>
+ <description>
+ Содержит набор расширений для работы с System.Xml и System.Xml.Linq
+ </description>
+ <authors>cccc1808</authors>
+ <repository type="git" branch="master" commit="dec83f6ce091623679de426ff9e14a128c53eb84" />
+
+ <dependencies>
+ <group targetFramework=".NETFramework4.0" />
+ </dependencies>
+
+ </metadata>
+
+ <files>
+ <file src="..\Tools\Tools.XMLExtensions\bin\Release\Tools.XMLExtensions.dll" target="lib" />
+ </files>
+
+</package>
\ No newline at end of file
ToolPack1/ToolPack1.sln 8(+8 -0)
diff --git a/ToolPack1/ToolPack1.sln b/ToolPack1/ToolPack1.sln
index 5af3b26..7115b1a 100644
--- a/ToolPack1/ToolPack1.sln
+++ b/ToolPack1/ToolPack1.sln
@@ -34,8 +34,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Nuget", "Nuget", "{39D3096C
Nuget\ToolPack1.Tools.ConfigurationTool.nuspec = Nuget\ToolPack1.Tools.ConfigurationTool.nuspec
Nuget\ToolPack1.Tools.SimpleBenchmark.nuspec = Nuget\ToolPack1.Tools.SimpleBenchmark.nuspec
Nuget\ToolPack1.Tools.SingletonTool.nuspec = Nuget\ToolPack1.Tools.SingletonTool.nuspec
+ Nuget\ToolPack1.Tools.XMLExtensions.nuspec = Nuget\ToolPack1.Tools.XMLExtensions.nuspec
EndProjectSection
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tools.XMLExtensions", "Tools\Tools.XMLExtensions\Tools.XMLExtensions.csproj", "{2E2FAECF-9A02-4500-877B-C28AA053189C}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -78,6 +81,10 @@ Global
{030EFB46-4E9A-412A-BEE2-C09E7FFED9E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{030EFB46-4E9A-412A-BEE2-C09E7FFED9E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{030EFB46-4E9A-412A-BEE2-C09E7FFED9E6}.Release|Any CPU.Build.0 = Release|Any CPU
+ {2E2FAECF-9A02-4500-877B-C28AA053189C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {2E2FAECF-9A02-4500-877B-C28AA053189C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {2E2FAECF-9A02-4500-877B-C28AA053189C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {2E2FAECF-9A02-4500-877B-C28AA053189C}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -92,6 +99,7 @@ Global
{9F92F1E3-A1B2-4D28-BBBB-CCE462C8A769} = {9FC03DF2-3AFE-4A62-B380-B9CBFF6486D1}
{BDFFE46F-BB48-491B-8834-5C834BFE44DF} = {9FC03DF2-3AFE-4A62-B380-B9CBFF6486D1}
{030EFB46-4E9A-412A-BEE2-C09E7FFED9E6} = {9FC03DF2-3AFE-4A62-B380-B9CBFF6486D1}
+ {2E2FAECF-9A02-4500-877B-C28AA053189C} = {9FC03DF2-3AFE-4A62-B380-B9CBFF6486D1}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {408C4B5A-5AF0-418D-A722-B2B253B5F831}
diff --git a/ToolPack1/Tools/Tools.XMLExtensions/Properties/AssemblyInfo.cs b/ToolPack1/Tools/Tools.XMLExtensions/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..4b35c9f
--- /dev/null
+++ b/ToolPack1/Tools/Tools.XMLExtensions/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// Общие сведения об этой сборке предоставляются следующим набором
+// набора атрибутов. Измените значения этих атрибутов для изменения сведений,
+// связанные со сборкой.
+[assembly: AssemblyTitle("Tools.XMLExtensions")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Tools.XMLExtensions")]
+[assembly: AssemblyCopyright("Copyright © 2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Установка значения False для параметра ComVisible делает типы в этой сборке невидимыми
+// для компонентов COM. Если необходимо обратиться к типу в этой сборке через
+// COM, задайте атрибуту ComVisible значение TRUE для этого типа.
+[assembly: ComVisible(false)]
+
+// Следующий GUID служит для идентификации библиотеки типов, если этот проект будет видимым для COM
+[assembly: Guid("2e2faecf-9a02-4500-877b-c28aa053189c")]
+
+// Сведения о версии сборки состоят из указанных ниже четырех значений:
+//
+// Основной номер версии
+// Дополнительный номер версии
+// Номер сборки
+// Редакция
+//
+// Можно задать все значения или принять номера сборки и редакции по умолчанию
+// используя "*", как показано ниже:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/ToolPack1/Tools/Tools.XMLExtensions/Tools.XMLExtensions.csproj b/ToolPack1/Tools/Tools.XMLExtensions/Tools.XMLExtensions.csproj
new file mode 100644
index 0000000..fe6bb11
--- /dev/null
+++ b/ToolPack1/Tools/Tools.XMLExtensions/Tools.XMLExtensions.csproj
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProjectGuid>{2E2FAECF-9A02-4500-877B-C28AA053189C}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>Tools.XMLExtensions</RootNamespace>
+ <AssemblyName>Tools.XMLExtensions</AssemblyName>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <FileAlignment>512</FileAlignment>
+ <Deterministic>true</Deterministic>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="System" />
+ <Reference Include="System.Core" />
+ <Reference Include="System.Xml.Linq" />
+ <Reference Include="System.Data.DataSetExtensions" />
+ <Reference Include="Microsoft.CSharp" />
+ <Reference Include="System.Data" />
+ <Reference Include="System.Xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="XDoc_Extensions.cs" />
+ <Compile Include="XmlDoc_Extensions.cs" />
+ </ItemGroup>
+ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/ToolPack1/Tools/Tools.XMLExtensions/XDoc_Extensions.cs b/ToolPack1/Tools/Tools.XMLExtensions/XDoc_Extensions.cs
new file mode 100644
index 0000000..533d6a6
--- /dev/null
+++ b/ToolPack1/Tools/Tools.XMLExtensions/XDoc_Extensions.cs
@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using System.Xml.Linq;
+
+namespace Tools.XMLExtensions
+{
+ public static class XDoc_Extensions
+ {
+ /// <summary>
+ /// Локальное имя
+ /// </summary>
+ public static string LocalName(this XElement xelem)
+ => xelem.Name.LocalName;
+
+ public static XElement Element_LN(this XContainer xelem, string Name)
+ => xelem.Elements().FirstOrDefault(e => e.LocalName() == Name);
+
+ public static IEnumerable<XElement> Elements_LN(this XContainer xelem, string Name)
+ => xelem.Elements().Where(e => e.LocalName() == Name);
+
+ public static IEnumerable<XElement> Descendants_LN(this XContainer xelem, string Name)
+ => xelem.Descendants().Where(e => e.LocalName() == Name);
+
+
+ /// <summary>
+ /// Путь от корня документа
+ /// </summary>
+ public static List<XObject> Path(this XObject xelem)
+ {
+ List<XObject> res = new List<XObject>();
+
+ for (XObject elem = xelem; elem != null; elem = elem.Parent)
+ res.Add(elem);
+
+ res.Reverse();
+ return res;
+ }
+
+ /// <summary>
+ /// Путь от корня документа
+ /// </summary>
+ /// <param name="split">Символ разделитель</param>
+ public static string PathString(this XElement xelem, char split = '\\')
+ {
+ StringBuilder res = new StringBuilder();
+
+ xelem.Path()
+ .ForEach(e => res.Append(split + ((XElement)e).LocalName()));
+
+ return res.ToString();
+ }
+
+ }
+}
diff --git a/ToolPack1/Tools/Tools.XMLExtensions/XmlDoc_Extensions.cs b/ToolPack1/Tools/Tools.XMLExtensions/XmlDoc_Extensions.cs
new file mode 100644
index 0000000..a83dec5
--- /dev/null
+++ b/ToolPack1/Tools/Tools.XMLExtensions/XmlDoc_Extensions.cs
@@ -0,0 +1,83 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using System.Xml;
+
+namespace Tools.XMLExtensions
+{
+ public static class XmlDoc_Extensions
+ {
+ /// <summary>
+ /// Пространство имен по умолчанию
+ /// </summary>
+ /// <param name="NS_Prefix">Префикс для пространства</param>
+ public static XmlNamespaceManager DefaultNamespace(this XmlDocument doc, string NS_Prefix = "x")
+ {
+ XmlNamespaceManager nsmgr = new XmlNamespaceManager(doc.NameTable);
+ nsmgr.AddNamespace(NS_Prefix, doc.DocumentElement.NamespaceURI);
+ return nsmgr;
+ }
+
+ /// <summary>
+ /// Выполнить XPath запрос используя стандартное пространство имен
+ /// </summary>
+ /// <param name="XPath"></param>
+ /// <param name="NS_Prefix">Префикс для пространства</param>
+ public static List<XmlNode> SelectNodes_WithNS(this XmlNode xelem, string XPath, string NS_Prefix = "x")
+ {
+ return xelem
+ .SelectNodes(XPath, xelem.OwnerDocument.DefaultNamespace(NS_Prefix))
+ .ToList();
+ }
+
+
+ /// <summary>
+ /// Преобразование в List
+ /// </summary>
+ public static List<XmlNode> ToList(this XmlNodeList xelems)
+ {
+ List<XmlNode> res = new List<XmlNode>(xelems.Count);
+
+ foreach (XmlNode elem in xelems)
+ {
+ res.Add(elem);
+ }
+
+ return res;
+ }
+
+
+ /// <summary>
+ /// Путь от корня документа
+ /// </summary>
+ public static List<XmlNode> Path(this XmlNode xelem)
+ {
+ List<XmlNode> res = new List<XmlNode>();
+
+ for (XmlNode elem = xelem; elem != null; elem = elem.ParentNode)
+ {
+ res.Add(elem);
+ }
+
+ res.Reverse();
+ return res;
+ }
+
+ /// <summary>
+ /// Путь от корня документа
+ /// </summary>
+ /// <param name="split">Символ разделитель</param>
+ public static string PathString(this XmlNode xelem, char split = '\\')
+ {
+ StringBuilder res = new StringBuilder();
+
+ xelem.Path()
+ .ForEach(e => res.Append(split + e.LocalName));
+
+ return res.ToString();
+ }
+
+ }
+}