Merge branch 'main' into feature/group_policy

Author: BornToBeRoot

CONTRIBUTORS.md

@@ -12,6 +12,7 @@ List of all contributors.
 - Freeman2016
 - EBWeist
 - mdawsonuk
+- labre_rdc
 
 ## Translators / reviewers on Transifex
 

README.md

@@ -5,10 +5,10 @@
     <b>A powerful tool for managing networks and troubleshoot network problems!</b>
   </p>
   <p>
-    Streamline and simplify your network administration and troubleshooting with <strong>NETworkManager</strong>. Connect, monitor, and troubleshoot your network and server infrastructure using built-in tools like Remote Desktop (RDP), PuTTY (SSH, Telnet, Serial), PowerShell (WinRM), TigerVNC (VNC), and AWS Session Manager. Perform in-depth network diagnostics with features including WiFi Analyzer, IP Scanner, Port Scanner, Ping Monitor, Traceroute, DNS Lookup, LLDP/CDP Capture, and <a href="https://borntoberoot.net/NETworkManager/docs/features">many more</a> — all in a clean, unified interface.
+    Streamline and simplify your network administration and troubleshooting with <strong>NETworkManager</strong>. Connect, monitor, and troubleshoot your network and server infrastructure using built-in tools like Remote Desktop (RDP), PuTTY (SSH, Serial, etc.), PowerShell (WSL, K9s, etc.) and TigerVNC (VNC). Perform in-depth network diagnostics with features including WiFi Analyzer, IP Scanner, Port Scanner, Ping Monitor, Traceroute, DNS Lookup, LLDP/CDP Capture, and <a href="https://borntoberoot.net/NETworkManager/docs/introduction">many more</a> — all in a clean, unified interface.
   </p>
   <p>
-    Organize hosts and networks in encrypted profiles with seamless access across all features. Built for professional environments, NETworkManager is enterprise-ready with an MSI installer, signed binaries, and support for package managers like Chocolatey, Evergreen, and WinGet. Available in over 16 languages with customizable light/dark themes and accent colors.
+    Organize hosts and networks in profiles with seamless access across all features. Profile files can be encrypted to protect your sensitive data and used to separate different customers or environments. NETworkManager is enterprise-ready with an MSI installer, signed binaries, and support for package managers like Chocolatey, Evergreen, and WinGet. Available in over 16 languages with customizable light/dark themes and accent colors.
   </p>
   <p>
     <a href="https://borntoberoot.net/NETworkManager/download" target="_blank">
@@ -54,17 +54,12 @@
     </a>
   </p>
   <p>
-    <a href="#-download">Download</a> • <a href="#-donate">Donate</a> • <a href="#-changelog">Changelog</a> • <a href="#-documentation">Documentation</a> • <a href="#-contributing">Contributing</a> • <a href="#-build">Build</a> • <a href="#-thanks">Thanks</a> • <a href="#-license">License</a>
+    <a href="#-download">Download</a> • <a href="#-donate">Donate</a> • <a href="#-screenshots">Screenshots</a> • <a href="#-changelog">Changelog</a> • <a href="#-documentation">Documentation</a> • <a href="#-contributing">Contributing</a> • <a href="#-build">Build</a> • <a href="#-thanks">Thanks</a> • <a href="#-license">License</a>
   </p>
 </div>
 
 <div align="center">
   <img alt="NETworkManager Features Preview" src="https://github.com/BornToBeRoot/NETworkManager/blob/main/Website/static/img/preview-features.gif?raw=true" />
-  <details>
-    <summary>Click to see screenshots of NETworkManager in action!</summary>
-    <img alt="NETworkManager tabs and drag & drop preview" src="https://github.com/BornToBeRoot/NETworkManager/blob/main/Website/static/img/preview_tabs_drag_drop.gif?raw=true" />
-    <img alt="NETworkManager dark/light theme preview" src="https://github.com/BornToBeRoot/NETworkManager/blob/main/Website/static/img/preview-light-theme.png?raw=true" />
-  </details>
 </div>
 
 ## 🚀 Why NETworkManager?
@@ -73,21 +68,21 @@ NETworkManager is your go-to tool for simplifying network administration and tro
 
 Here's why you'll love it:
 
-- 🧰 **Unified Experience** - All your essential network tools in one sleek interface — no more juggling apps.
-- 🖥️ **Remote System Management** - Connect to remote systems seamlessly via RDP, PuTTY (SSH, Telnet, Serial), PowerShell (WinRM), TigerVNC (VNC), or AWS Session Manager.
-- 🔍 **Analyze & Troubleshoot** - Deep network diagnostics with WiFi Analyzer, IP/Port Scanners, Ping Monitor, Traceroute, DNS Lookup, LLDP/CDP Capture, and <a href="https://borntoberoot.net/NETworkManager/docs/features">many more</a>.
-- 🔐 **Secure Profiles** - Organize hosts and networks in encrypted profiles with seamless access across all features.
-- 💎 **Open Source & Free** - No ads, no subscriptions, fully community-driven.
-- 🏢 **Enterprise-Ready** - MSI installer, signed binaries, and package manager support (Chocolatey, WinGet, Evergreen).
+- 🧰 **Unified Experience** - All your essential network tools together in a clean, unified interface.
+- 🖥️ **Remote System Management** - Seamlessly connect via Remote Desktop (RDP), PuTTY (SSH, Serial, etc.), PowerShell (WSL, K9s, etc.) or TigerVNC (VNC).
+- 🔍 **Analyze & Troubleshoot** - Deep network diagnostics with WiFi Analyzer, IP Scanner, Port Scanners, Ping Monitor, Traceroute, DNS Lookup, LLDP/CDP Capture, and <a href="https://borntoberoot.net/NETworkManager/docs/introduction">many more</a>.
+- 🔐 **Secure Profiles** - Organize hosts and networks in profiles with seamless access across all features. Encrypt profile files and separate them by customer or environment.
+- 💎 **Open Source & Free** - No ads, no subscriptions, no selling your data, fully community-driven.
+- 🏢 **Enterprise-Ready** - MSI installer, signed binaries, and package manager support (Chocolatey, Evergreen, and WinGet).
 - 🎨 **Personalized Experience** - Available in 16+ languages, with customizable light/dark themes and accent colors.
 
-📖 Explore all features in detail on our [documentation page](https://borntoberoot.net/NETworkManager/docs/features).
+📖 Explore all features in detail in our [documentation](https://borntoberoot.net/NETworkManager/docs/introduction).
 
 ## 📦 Download
 
 Get started with NETworkManager today! Download pre-built, [signed](https://borntoberoot.net/NETworkManager/download#code-signing-policy) binaries (setup, portable, or archive) from our [download page](https://borntoberoot.net/NETworkManager/download) with detailed install instructions (e.g., silent install). Files are hosted on [GitHub Releases](https://github.com/BornToBeRoot/NETworkManager/releases/latest).
 
-Install via package managers for a hassle-free setup:
+Install and update via package managers for a hassle-free setup:
 
 - **Chocolatey**:
 
@@ -102,15 +97,17 @@ Install via package managers for a hassle-free setup:
   ```
 
 - **Evergreen**:
+
   ```powershell
   # Get latest release
   Get-EvergreenApp -Name NETworkManager
   # Save setup file
   Get-EvergreenApp -Name NETworkManager | Save-EvergreenApp -Path C:\Users\$env:Username\Downloads\
   ```
-  Evergreen PowerShell module: <https://github.com/aaronparker/evergreen>
 
-> Pre-release versions with the latest features and fixes are (sometimes) available for testing on [GitHub Releases](https://github.com/BornToBeRoot/NETworkManager/releases).
+  Evergreen PowerShell module (e.g. to automate image building or SCCM/Intune updates): <https://github.com/eucpilots/evergreen-module>
+
+> Pre-release versions with the latest features and fixes are (sometimes) available for testing on [GitHub Releases](https://github.com/BornToBeRoot/NETworkManager/releases). Please note that pre-release versions may be unstable and are not recommended for production use. Please report any issues you encounter on [GitHub Issues](https://github.com/BornToBeRoot/NETworkManager/issues/new/choose).
 
 ## 💖 Donate
 
@@ -133,6 +130,22 @@ If you find it useful, here are ways to support the project:
 
 Thank you for helping keep NETworkManager thriving!
 
+## 📷 Screenshots
+
+<div align="center">
+
+<img alt="NETworkManager tabs and drag & drop preview" src="https://github.com/BornToBeRoot/NETworkManager/blob/main/Website/static/img/preview_tabs_drag_drop.gif?raw=true" />
+
+Preview of tabs and drag & drop functionality.
+
+---
+
+<img alt="NETworkManager dark/light theme preview" src="https://github.com/BornToBeRoot/NETworkManager/blob/main/Website/static/img/preview-light-theme.png?raw=true" />
+
+Customizable light/dark themes and accent colors.
+
+</div>
+
 ## 📃 Changelog
 
 Stay updated with the latest improvements and features. Check the full changelog [here](https://borntoberoot.net/NETworkManager/docs/category/changelog).
@@ -159,16 +172,16 @@ Build NETworkManager yourself with these steps:
 
 1. **Prerequisites**:
 
-   - [.NET 8.x SDK](https://dotnet.microsoft.com/download/dotnet/8.0)
-   - Visual Studio 2022 with `.NET desktop development` and `Universal Windows Platform development`
+   - [.NET 10.x SDK](https://dotnet.microsoft.com/download/dotnet/10.0)
+   - [Visual Studio 2026](https://visualstudio.microsoft.com/) with `.NET desktop development` and `Universal Windows Platform development` (or [JetBrains Rider](https://www.jetbrains.com/rider/) - you still need to install the UWP workload via Visual Studio Installer)
 
 2. **Clone the Repository**:
 
    - Clone with submodules:
      ```powershell
-     git clone https://github.com/BornToBeRoot/NETworkManager
+     git clone https://github.com/BornToBeRoot/NETworkManager.git
      cd NETworkManager
-     git submodule update --init
+     git submodule update --init --recursive
      ```
 
 3. **Build**:
@@ -211,15 +224,15 @@ Star these projects to show your support!
 
 ## 🔒 Code Signing Policy
 
-NETworkManager uses free code signing services from [SignPath.io](https://signpath.io/) and a free code signing certificate provided by the [SignPath Foundation](https://signpath.org/) to sign all official binaries and installers, ensuring the authenticity and integrity of your downloads.
+NETworkManager uses free code signing services from [SignPath.io](https://signpath.io/) and a free code signing certificate provided by the [SignPath Foundation](https://signpath.org/) to sign all official binaries and installers, ensuring the authenticity and integrity.
 
 The binaries and installers are built on [AppVeyor](https://ci.appveyor.com/project/BornToBeRoot/networkmanager) directly from the [GitHub repository](https://github.com/BornToBeRoot/NETworkManager/blob/main/appveyor.yml). After each build, the artifacts are automatically sent to [SignPath.io](https://signpath.io/) via webhook, where they are signed following manual approval by the maintainer. Once signed, the binaries are uploaded to the [GitHub releases page](https://github.com/BornToBeRoot/NETworkManager/releases).
 
 ## 🔐 Privacy Policy
 
 Your privacy matters. NETworkManager will not transfer any information to other networked systems unless specifically requested by the user or the person installing or operating it.
 
-NETworManager has integrated some optional third-party services to enhance functionality. You can choose to enable or disable these services at the first startup or later in the settings:
+NETworManager has integrated some **optional** third-party services to enhance functionality. You can choose to enable or disable these services at the first startup or later in the settings:
 
 - [api.github.com](https://docs.github.com/en/site-policy/privacy-policies/github-general-privacy-statement) - Check for application updates.
 - [ipify.org](https://www.ipify.org/) - Retrieve the public IP address used by the client.

Source/GlobalAssemblyInfo.cs

@@ -6,5 +6,5 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("2025.11.16.0")]
-[assembly: AssemblyFileVersion("2025.11.16.0")]
+[assembly: AssemblyVersion("2025.12.10.0")]
+[assembly: AssemblyFileVersion("2025.12.10.0")]

Source/NETworkManager.Controls/NETworkManager.Controls.csproj

@@ -4,7 +4,7 @@
         <OutputType>Library</OutputType>
         <RootNamespace>NETworkManager.Controls</RootNamespace>
         <AssemblyName>NETworkManager.Controls</AssemblyName>
-        <TargetFramework>net10.0-windows10.0.22621.0</TargetFramework>
+        <TargetFramework>net10.0-windows10.0.22621.0</TargetFramework>        
         <RuntimeIdentifier>win-x64</RuntimeIdentifier>
         <PlatformTarget>x64</PlatformTarget>
         <SelfContained>false</SelfContained>
@@ -16,4 +16,3 @@
         <Compile Include="..\GlobalAssemblyInfo.cs" Link="Properties\GlobalAssemblyInfo.cs"/>
     </ItemGroup>
 </Project>
-

Source/NETworkManager.Converters/DNSServerConnectionInfoProfileToString.cs

@@ -5,7 +5,7 @@
         <AppDesignerFolder>Properties</AppDesignerFolder>
         <RootNamespace>NETworkManager.Converters</RootNamespace>
         <AssemblyName>NETworkManager.Converters</AssemblyName>
-        <TargetFramework>net10.0-windows10.0.22621.0</TargetFramework>
+        <TargetFramework>net10.0-windows10.0.22621.0</TargetFramework>        
         <RuntimeIdentifier>win-x64</RuntimeIdentifier>
         <PlatformTarget>x64</PlatformTarget>
         <SelfContained>false</SelfContained>
@@ -29,6 +29,6 @@
     <ItemGroup>
         <PackageReference Include="LiveCharts.Wpf" Version="0.9.7" />
         <PackageReference Include="MahApps.Metro" Version="2.4.11" />
+        
     </ItemGroup>
 </Project>
-

Source/NETworkManager.Converters/NETworkManager.Converters.csproj

@@ -1,16 +1,15 @@
-using System;
+using NETworkManager.Utilities;
+using System;
 using System.Globalization;
-using System.Text.RegularExpressions;
 using System.Windows.Data;
-using NETworkManager.Utilities;
 
 namespace NETworkManager.Converters;
 
 public sealed class StringIsNotNullOrEmptyOrIPv4AddressToBooleanConverter : IValueConverter
 {
     public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
     {
-        return !string.IsNullOrEmpty(value as string) && !Regex.IsMatch((string)value, RegexHelper.IPv4AddressRegex);
+        return !string.IsNullOrEmpty(value as string) && !RegexHelper.IPv4AddressRegex().IsMatch((string)value);
     }
 
     public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)

Source/NETworkManager.Converters/StringIsNotNullOrEmptyOrIPv4AddressToBooleanConverter.cs

@@ -2,7 +2,6 @@
 using System.Globalization;
 using System.Net;
 using System.Net.Sockets;
-using System.Text.RegularExpressions;
 using System.Windows.Data;
 using NETworkManager.Models.Network;
 using NETworkManager.Utilities;
@@ -40,7 +39,7 @@ public object Convert(object[] values, Type targetType, object parameter, Cultur
         };
 
         // Support subnetmask like 255.255.255.0
-        int newCidr = Regex.IsMatch(newSubnetmaskOrCidr, RegexHelper.SubnetmaskRegex)
+        int newCidr = RegexHelper.SubnetmaskRegex().IsMatch(newSubnetmaskOrCidr)
             ? System.Convert.ToByte(Subnetmask.ConvertSubnetmaskToCidr(IPAddress.Parse(newSubnetmaskOrCidr)))
             : System.Convert.ToByte(newSubnetmaskOrCidr.TrimStart('/'));
 

Source/NETworkManager.Converters/ValidateSubnetCalculatorSubnettingConverter.cs

@@ -199,7 +199,7 @@ public enum DocumentationIdentifier
     ///     Command line arguments.
     /// </summary>
     CommandLineArguments,
-    
+
     /// <summary>
     /// Changelog base documentation page.
     /// </summary>

Source/NETworkManager.Documentation/DocumentationIdentifier.cs

@@ -135,7 +135,7 @@ public static class DocumentationManager
 
         new DocumentationInfo(DocumentationIdentifier.CommandLineArguments,
             @"docs/commandline-arguments"),
-        
+
         new DocumentationInfo(DocumentationIdentifier.ChangelogBase,
         @"docs/changelog")
     ];
@@ -179,9 +179,9 @@ public static void OpenDocumentation(DocumentationIdentifier documentationIdenti
     public static void OpenChangelog()
     {
         var url = CreateUrl(DocumentationIdentifier.ChangelogBase);
-        
+
         url += $"/{AssemblyManager.Current.Version.ToString().Replace('.', '-')}";
-        
+
         ExternalProcessStarter.OpenUrl(url);
     }
 
@@ -207,7 +207,7 @@ public static DocumentationIdentifier GetIdentifierByApplicationName(Application
             ApplicationName.DNSLookup => DocumentationIdentifier.ApplicationDnsLookup,
             ApplicationName.RemoteDesktop => DocumentationIdentifier.ApplicationRemoteDesktop,
             ApplicationName.PowerShell => DocumentationIdentifier.ApplicationPowerShell,
-            ApplicationName.PuTTY => DocumentationIdentifier.ApplicationPutty,            
+            ApplicationName.PuTTY => DocumentationIdentifier.ApplicationPutty,
             ApplicationName.TigerVNC => DocumentationIdentifier.ApplicationTigerVNC,
             ApplicationName.WebConsole => DocumentationIdentifier.ApplicationWebConsole,
             ApplicationName.SNMP => DocumentationIdentifier.ApplicationSnmp,
@@ -255,7 +255,7 @@ public static DocumentationIdentifier GetIdentifierBySettingsName(SettingsName n
             SettingsName.DNSLookup => GetIdentifierByApplicationName(ApplicationName.DNSLookup),
             SettingsName.RemoteDesktop => GetIdentifierByApplicationName(ApplicationName.RemoteDesktop),
             SettingsName.PowerShell => GetIdentifierByApplicationName(ApplicationName.PowerShell),
-            SettingsName.PuTTY => GetIdentifierByApplicationName(ApplicationName.PuTTY),            
+            SettingsName.PuTTY => GetIdentifierByApplicationName(ApplicationName.PuTTY),
             SettingsName.TigerVNC => GetIdentifierByApplicationName(ApplicationName.TigerVNC),
             SettingsName.SNMP => GetIdentifierByApplicationName(ApplicationName.SNMP),
             SettingsName.SNTPLookup => GetIdentifierByApplicationName(ApplicationName.SNTPLookup),