Commit eca32da4bd1e015b7c4ce77b3b90d38c575a45f9
1 parent
0e407387
- KeyGroups elem bevezetése
Showing
2 changed files
with
11 additions
and
8 deletions
Show diff stats
Vrh.Log4Pro.MaintenanceConsole/Manager - WindowsServiceManager.cs
| @@ -1023,13 +1023,16 @@ namespace Vrh.Log4Pro.MaintenanceConsole.WindowsServiceManagerNS | @@ -1023,13 +1023,16 @@ namespace Vrh.Log4Pro.MaintenanceConsole.WindowsServiceManagerNS | ||
| 1023 | #region XmlStructure | 1023 | #region XmlStructure |
| 1024 | public static class XmlStructure | 1024 | public static class XmlStructure |
| 1025 | { | 1025 | { |
| 1026 | - public static class KeyGroup | 1026 | + public static class KeyGroups |
| 1027 | { | 1027 | { |
| 1028 | - public static class Attributes | 1028 | + public static class KeyGroup |
| 1029 | { | 1029 | { |
| 1030 | - public static class Key { public static class Values { public static string DEFAULT = ""; } } | ||
| 1031 | - public static class Description { public static class Values { public static string DEFAULT = ""; } } | ||
| 1032 | - public static class KeyList { public static class Values { public static string DEFAULT = ""; } } | 1030 | + public static class Attributes |
| 1031 | + { | ||
| 1032 | + public static class Key { public static class Values { public static string DEFAULT = ""; } } | ||
| 1033 | + public static class Description { public static class Values { public static string DEFAULT = ""; } } | ||
| 1034 | + public static class KeyList { public static class Values { public static string DEFAULT = ""; } } | ||
| 1035 | + } | ||
| 1033 | } | 1036 | } |
| 1034 | } | 1037 | } |
| 1035 | } | 1038 | } |
| @@ -1037,7 +1040,7 @@ namespace Vrh.Log4Pro.MaintenanceConsole.WindowsServiceManagerNS | @@ -1037,7 +1040,7 @@ namespace Vrh.Log4Pro.MaintenanceConsole.WindowsServiceManagerNS | ||
| 1037 | } | 1040 | } |
| 1038 | public static KeyGroupList Factory(XElement keygrouplistcontainer) | 1041 | public static KeyGroupList Factory(XElement keygrouplistcontainer) |
| 1039 | { | 1042 | { |
| 1040 | - var wsgxmllist = keygrouplistcontainer.Elements(XName.Get(nameof(KeyGroup.XmlStructure.KeyGroup))); | 1043 | + var wsgxmllist = keygrouplistcontainer.Element(XName.Get(nameof(KeyGroup.XmlStructure.KeyGroups)))?.Elements(XName.Get(nameof(KeyGroup.XmlStructure.KeyGroups.KeyGroup))); |
| 1041 | if (wsgxmllist == null || !wsgxmllist.Any()) return null; | 1044 | if (wsgxmllist == null || !wsgxmllist.Any()) return null; |
| 1042 | var kgl = new KeyGroupList(); | 1045 | var kgl = new KeyGroupList(); |
| 1043 | foreach (var wsgxml in wsgxmllist) { var wsg = new KeyGroup(wsgxml); if (wsg.Valid) { kgl.Add(wsg); } } | 1046 | foreach (var wsgxml in wsgxmllist) { var wsg = new KeyGroup(wsgxml); if (wsg.Valid) { kgl.Add(wsg); } } |
Vrh.Log4Pro.MaintenanceConsole/Properties/AssemblyInfo.cs
| @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; | @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; | ||
| 32 | // You can specify all the values or you can default the Build and Revision Numbers | 32 | // You can specify all the values or you can default the Build and Revision Numbers |
| 33 | // by using the '*' as shown below: | 33 | // by using the '*' as shown below: |
| 34 | // [assembly: AssemblyVersion("1.0.*")] | 34 | // [assembly: AssemblyVersion("1.0.*")] |
| 35 | -[assembly: AssemblyVersion("1.11.4.0")] | ||
| 36 | -[assembly: AssemblyFileVersion("1.11.4.0")] | 35 | +[assembly: AssemblyVersion("1.11.5.0")] |
| 36 | +[assembly: AssemblyFileVersion("1.11.5.0")] |