aziascreations/DotNet-ListComPort
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added .NET Framework 4 target for "ComPortHelper" library

Browse Source 
Update ComPortHelper.cs, ComPortInfo.cs, and 2 more files...
This commit is contained in:
Herwin Bozet (NibblePoker)
2024-05-24 16:35:15 +02:00
parent 20052c3fb4
commit 6e4462c8fa
4 changed files with 97 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NibblePoker.Library.ComPortHelpers/ComPortHelper.cs
+14 -6
View File
@@ -1,9 +1,10 @@
using Microsoft.Win32; using System.Collections.Generic;
using System.Linq;
using Microsoft.Win32;
using static NibblePoker.Library.RegistryHelpers.RegistryHelpers; using static NibblePoker.Library.RegistryHelpers.RegistryHelpers;
namespace NibblePoker.Library.ComPortWatcher; namespace NibblePoker.Library.ComPortWatcher {
public static class ComPortHelper {
public static class ComPortHelper {
private const string RegistryKeySerial = "HARDWARE\\DEVICEMAP\\SERIALCOMM"; private const string RegistryKeySerial = "HARDWARE\\DEVICEMAP\\SERIALCOMM";
private const string RegistryKeyDeviceEnum = "SYSTEM\\ControlSet001\\Enum"; private const string RegistryKeyDeviceEnum = "SYSTEM\\ControlSet001\\Enum";
@@ -25,6 +26,7 @@ public static class ComPortHelper {
RegistryKeyDeviceEnum + "\\" + subKey, RegistryKeyDeviceEnum + "\\" + subKey,
true)); true));
} }
subKeys.Clear(); subKeys.Clear();
foreach(string subSubKey in intermediateSubKeys) { foreach(string subSubKey in intermediateSubKeys) {
@@ -33,15 +35,18 @@ public static class ComPortHelper {
subSubKey, subSubKey,
true)); true));
} }
intermediateSubKeys.Clear(); intermediateSubKeys.Clear();
foreach(string finalSubKey in finalSubKeys) { foreach(string finalSubKey in finalSubKeys) {
Dictionary<string, string> mappedKeyValues = GetMappedKeyNameStringValue(Registry.LocalMachine, finalSubKey); Dictionary<string, string> mappedKeyValues =
GetMappedKeyNameStringValue(Registry.LocalMachine, finalSubKey);
if(mappedKeyValues.ContainsKey(RegistryNameFriendlyName)) { if(mappedKeyValues.ContainsKey(RegistryNameFriendlyName)) {
friendlyNames.Add(mappedKeyValues[RegistryNameFriendlyName]); friendlyNames.Add(mappedKeyValues[RegistryNameFriendlyName]);
} }
} }
finalSubKeys.Clear(); finalSubKeys.Clear();
foreach(ComPortInfo comPortInfo in comPortsInfo) { foreach(ComPortInfo comPortInfo in comPortsInfo) {
@@ -54,13 +59,15 @@ public static class ComPortHelper {
break; break;
} }
} }
friendlyNames.Clear(); friendlyNames.Clear();
} }
public static List<ComPortInfo> GetComList(bool addFriendlyNames = false) { public static List<ComPortInfo> GetComList(bool addFriendlyNames = false) {
List<ComPortInfo> portsInfo = new List<ComPortInfo>(); List<ComPortInfo> portsInfo = new List<ComPortInfo>();
foreach(KeyValuePair<string, string> rawPortInfo in GetMappedKeyNameStringValue(Registry.LocalMachine, RegistryKeySerial)) { foreach(KeyValuePair<string, string> rawPortInfo in GetMappedKeyNameStringValue(Registry.LocalMachine,
RegistryKeySerial)) {
portsInfo.Add(new ComPortInfo(rawPortInfo.Value, rawPortInfo.Key)); portsInfo.Add(new ComPortInfo(rawPortInfo.Value, rawPortInfo.Key));
} }
@@ -70,4 +77,5 @@ public static class ComPortHelper {
return portsInfo; return portsInfo;
} }
}
} }
NibblePoker.Library.ComPortHelpers/ComPortInfo.cs
+3 -3
View File
@@ -1,6 +1,5 @@
namespace NibblePoker.Library.ComPortWatcher; namespace NibblePoker.Library.ComPortWatcher {
public class ComPortInfo {
public class ComPortInfo {
public string RawName; public string RawName;
public string DeviceName; public string DeviceName;
public string FriendlyName; public string FriendlyName;
@@ -15,4 +14,5 @@ public class ComPortInfo {
FriendlyName = friendlyName; FriendlyName = friendlyName;
} }
} }
}
} }
NibblePoker.Library.ComPortHelpers/NibblePoker.Library.ComPortHelpers.csproj
+6 -4
View File
@@ -1,9 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net6.0-windows</TargetFramework> <TargetFrameworks>net40;net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <ImplicitUsings>disable</ImplicitUsings>
<Nullable>disable</Nullable>
<RootNamespace>NibblePoker.Library.ComPortWatcher</RootNamespace> <RootNamespace>NibblePoker.Library.ComPortWatcher</RootNamespace>
<AssemblyName>NibblePoker.Library.ComPortHelpers</AssemblyName> <AssemblyName>NibblePoker.Library.ComPortHelpers</AssemblyName>
<Configurations>Release</Configurations> <Configurations>Release</Configurations>
@@ -11,7 +13,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="NibblePoker.Library.RegistryHelpers" Version="0.0.1" /> <PackageReference Include="NibblePoker.Library.RegistryHelpers" Version="1.0.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>
NibblePoker.Library.ComPortHelpers/SortingOrder.cs
+3 -3
View File
@@ -1,7 +1,7 @@
namespace NibblePoker.Library.ComPortWatcher; namespace NibblePoker.Library.ComPortWatcher {
public enum SortingOrder {
public enum SortingOrder {
Descending = -1, Descending = -1,
None = 0, None = 0,
Ascending = 1, Ascending = 1,
}
} }