Commit b83e80f61d526a9eafad85d891dd173e679169bd
1 parent
270019f6
v1.11.1
- Windows feature list határoló karakterek bővítése
Showing
3 changed files
with
8 additions
and
5 deletions
Show diff stats
Vrh.Log4Pro.MaintenanceConsole/Manager - InstallManager.cs
| ... | ... | @@ -162,14 +162,17 @@ namespace Vrh.Log4Pro.MaintenanceConsole.InstallManagerNS |
| 162 | 162 | { |
| 163 | 163 | OS = GetValue(nameof(InstallManagerXmlParser.XmlStructure.EnvironmentInstall.WindowsFeatureList.Attributes.OS), wfgXml, InstallManagerXmlParser.XmlStructure.EnvironmentInstall.WindowsFeatureList.Attributes.OS.DEFAULT); |
| 164 | 164 | Group = GetValue(nameof(InstallManagerXmlParser.XmlStructure.EnvironmentInstall.WindowsFeatureList.Attributes.Group), wfgXml, InstallManagerXmlParser.XmlStructure.EnvironmentInstall.WindowsFeatureList.Attributes.Group.DEFAULT); |
| 165 | - FeatureList = wfgXml.Value?.Split(new char[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries).Select(x => x.Trim()).ToList(); | |
| 165 | + FeatureList = wfgXml.Value?.Split(new char[] { '\r', '\n', ';',',', }, StringSplitOptions.RemoveEmptyEntries).Select(x => x.Trim()).ToList(); | |
| 166 | 166 | } |
| 167 | 167 | public InstallManagerXmlParser.XmlStructure.EnvironmentInstall.WindowsFeatureList.Attributes.OS.Values OS; |
| 168 | 168 | public InstallManagerXmlParser.XmlStructure.EnvironmentInstall.WindowsFeatureList.Attributes.Group.Values Group; |
| 169 | 169 | public List<string> FeatureList; |
| 170 | 170 | } |
| 171 | 171 | public List<WindowsFeatures> WindowsFeatureGroups; |
| 172 | - public List<string> GetFeatureList(InstallManagerXmlParser.XmlStructure.EnvironmentInstall.WindowsFeatureList.Attributes.OS.Values os, InstallManagerXmlParser.XmlStructure.EnvironmentInstall.WindowsFeatureList.Attributes.Group.Values group) { return WindowsFeatureGroups?.FirstOrDefault(x => x.OS == os && x.Group == group)?.FeatureList; } | |
| 172 | + public List<string> GetFeatureList(InstallManagerXmlParser.XmlStructure.EnvironmentInstall.WindowsFeatureList.Attributes.OS.Values os, InstallManagerXmlParser.XmlStructure.EnvironmentInstall.WindowsFeatureList.Attributes.Group.Values group) | |
| 173 | + { | |
| 174 | + return WindowsFeatureGroups?.FirstOrDefault(x => x.OS == os && x.Group == group)?.FeatureList; | |
| 175 | + } | |
| 173 | 176 | #region XmlStructure |
| 174 | 177 | public static class XmlStructure |
| 175 | 178 | { | ... | ... |
Vrh.Log4Pro.MaintenanceConsole/Manager - MSMQManager.cs
| ... | ... | @@ -39,7 +39,7 @@ namespace Vrh.Log4Pro.MaintenanceConsole.MSMQManagerNS |
| 39 | 39 | .AddMenuItem(new Menu.Item(CLP.Module.MSMQManager.Function.SetPermissions.KEY, "Set MSMQ permisssions", SetPermissions, ep)) |
| 40 | 40 | .AddMenuItem(new Menu.Item(CLP.Module.MSMQManager.Function.SetDefaultPermissions.KEY, "Set default MSMQ permisssions", SetDefaultPermissions, ep)) |
| 41 | 41 | .AddMenuItem(new Menu.Item(CLP.Module.MSMQManager.Function.GetLocalInfo.KEY, "Get local MSMQ information", GetLocalInfo, ep)) |
| 42 | - .AddMenuItem(new Menu.Item(CLP.Module.MSMQManager.Function.GetRemoteInfo.KEY, "Get remoteMSMQ information", GetRemoteInfo, ep)) | |
| 42 | + .AddMenuItem(new Menu.Item(CLP.Module.MSMQManager.Function.GetRemoteInfo.KEY, "Get remote MSMQ information", GetRemoteInfo, ep)) | |
| 43 | 43 | .AddMenuItem(new Menu.Item(CLP.Module.MSMQManager.Function.Peek.KEY, "Peek MSMQ message", Peek, ep)) |
| 44 | 44 | .AddMenuItem(new Menu.Item(CLP.Module.MSMQManager.Function.Read.KEY, "Read MSMQ message", Read, ep)) |
| 45 | 45 | .AddMenuItem(new Menu.Item(CLP.Module.MSMQManager.Function.Send.KEY, "Send MSMQ message", Send, ep)) | ... | ... |
Vrh.Log4Pro.MaintenanceConsole/Properties/AssemblyInfo.cs
| ... | ... | @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; |
| 32 | 32 | // You can specify all the values or you can default the Build and Revision Numbers |
| 33 | 33 | // by using the '*' as shown below: |
| 34 | 34 | // [assembly: AssemblyVersion("1.0.*")] |
| 35 | -[assembly: AssemblyVersion("1.11.0.0")] | |
| 36 | -[assembly: AssemblyFileVersion("1.11.0.0")] | |
| 35 | +[assembly: AssemblyVersion("1.11.1.0")] | |
| 36 | +[assembly: AssemblyFileVersion("1.11.1.0")] | ... | ... |