Skip to content

Commit ee52054

Browse files
BornToBeRootBornToBeRoot
authored
Merge branch 'main' into feature/powershell_path
2 parents fc3636d + a128bd6 commit ee52054

File tree

17 files changed

+563
-505
lines changed

17 files changed

+563
-505
lines changed

‎Chocolatey/networkmanager.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
44
<metadata>
55
<id>NETworkManager</id>
6-
<version>2024.11.11.0</version>
6+
<version>2025.1.18.0</version>
77
<owners>BornToBeRoot</owners>
88
<title>NETworkManager</title>
99
<authors>BornToBeRoot</authors>
@@ -15,7 +15,7 @@
1515
<packageSourceUrl>https://github.com/BornToBeRoot/NETworkManager/tree/main/Chocolatey</packageSourceUrl>
1616
<docsUrl>https://borntoberoot.net/NETworkManager/docs/introduction</docsUrl>
1717
<bugTrackerUrl>https://github.com/BornToBeRoot/NETworkManager/issues</bugTrackerUrl>
18-
<releaseNotes>https://borntoberoot.net/NETworkManager/docs/changelog/2024-11-11-0</releaseNotes>
18+
<releaseNotes>https://borntoberoot.net/NETworkManager/docs/changelog/2025-1-18-0</releaseNotes>
1919
<tags>wifi ipscanner portscanner traceroute pingmonitor dns remotedesktop putty lldp</tags>
2020
<summary>A powerful tool for managing networks and troubleshoot network problems!</summary>
2121
<description>

‎Chocolatey/tools/chocolateyinstall.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ $packageArgs = @{
77
packageName = $packageName
88
unzipLocation = $toolsDir
99
fileType = 'MSI'
10-
url = 'https://github.com/BornToBeRoot/NETworkManager/releases/download/2024.11.11.0/NETworkManager_2024.11.11.0_Setup.msi'
10+
url = 'https://github.com/BornToBeRoot/NETworkManager/releases/download/2025.1.18.0/NETworkManager_2025.1.18.0_Setup.msi'
1111

1212
softwareName = 'NETworkManager*'
1313

14-
checksum = 'B3B2128F752B6CA84C9FE0B84CA279C284AEB3BB479508E546633BF34E59A125'
14+
checksum = '0E8722AB821FDFC5079C8E914CDBC293F373F551924EFBA14CA4AF6E68B678F9'
1515
checksumType = 'sha256'
1616

1717
silentArgs = "/qn /norestart /l*v `"$($env:TEMP)\$($packageName).$($env:chocolateyPackageVersion).MsiInstall.log`""

‎Source/NETworkManager.Models/NETworkManager.Models.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
<EmbeddedResource Include="Resources\PSDiscoveryProtocol.psm1"/>
2727
</ItemGroup>
2828
<ItemGroup>
29-
<PackageReference Include="AWSSDK.Core" Version="3.7.400.70"/>
29+
<PackageReference Include="AWSSDK.Core" Version="3.7.401.6"/>
3030
<PackageReference Include="DnsClient" Version="1.8.0"/>
31-
<PackageReference Include="IPNetwork2" Version="3.0.667"/>
31+
<PackageReference Include="IPNetwork2" Version="3.0.712"/>
3232
<PackageReference Include="Lextm.SharpSnmpLib" Version="12.5.5"/>
3333
<PackageReference Include="log4net" Version="3.0.3"/>
3434
<PackageReference Include="MahApps.Metro" Version="2.4.10"/>
@@ -37,7 +37,7 @@
3737
<PackageReference Include="MahApps.Metro.IconPacks.MaterialLight" Version="5.1.0"/>
3838
<PackageReference Include="MahApps.Metro.IconPacks.Modern" Version="5.1.0"/>
3939
<PackageReference Include="MahApps.Metro.IconPacks.Octicons" Version="5.1.0"/>
40-
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2903.40"/>
40+
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2957.106"/>
4141
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.2.0"/>
4242
<PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>
4343
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.4.6"/>

‎Source/NETworkManager.Update/NETworkManager.Update.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818
</ItemGroup>
1919
<ItemGroup>
2020
<PackageReference Include="log4net" Version="3.0.3"/>
21-
<PackageReference Include="Octokit" Version="13.0.1"/>
21+
<PackageReference Include="Octokit" Version="14.0.0"/>
2222
</ItemGroup>
2323
</Project>

‎Source/NETworkManager/Controls/DragablzTabHostWindow.xaml.cs‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
using System;
1+
using Dragablz;
2+
using MahApps.Metro.Controls.Dialogs;
3+
using NETworkManager.Localization;
4+
using NETworkManager.Localization.Resources;
5+
using NETworkManager.Models;
6+
using NETworkManager.Models.RemoteDesktop;
7+
using NETworkManager.Settings;
8+
using NETworkManager.Utilities;
9+
using System;
210
using System.Collections.Generic;
311
using System.ComponentModel;
412
using System.Diagnostics;
@@ -9,15 +17,6 @@
917
using System.Windows.Forms;
1018
using System.Windows.Input;
1119
using System.Windows.Interop;
12-
using Dragablz;
13-
using MahApps.Metro.Controls.Dialogs;
14-
using NETworkManager.Localization;
15-
using NETworkManager.Localization.Resources;
16-
using NETworkManager.Models;
17-
using NETworkManager.Models.RemoteDesktop;
18-
using NETworkManager.Settings;
19-
using NETworkManager.Utilities;
20-
using Application = System.Windows.Application;
2120

2221
namespace NETworkManager.Controls;
2322

@@ -71,7 +70,7 @@ private async void FocusEmbeddedWindow()
7170

7271
// Focus embedded window in the selected tab
7372
(((DragablzTabItem)tabablzControl.SelectedItem)?.View as IEmbeddedWindow)?.FocusEmbeddedWindow();
74-
73+
7574
break;
7675
}
7776
}
@@ -169,7 +168,7 @@ private bool RemoteDesktop_IsConnected_CanExecute(object view)
169168
private bool RemoteDesktop_IsDisconnected_CanExecute(object view)
170169
{
171170
if (view is RemoteDesktopControl control)
172-
return !control.IsConnected;
171+
return !control.IsConnected && !control.IsConnecting;
173172

174173
return false;
175174
}
@@ -376,8 +375,8 @@ private void DragablzTabHostWindow_OnClosing(object sender, CancelEventArgs e)
376375
{
377376
// Find all TabablzControl in the active window
378377
foreach (var tabablzControl in VisualTreeHelper.FindVisualChildren<TabablzControl>(this))
379-
foreach (var tabItem in tabablzControl.Items.OfType<DragablzTabItem>())
380-
((IDragablzTabItem)tabItem.View).CloseTab();
378+
foreach (var tabItem in tabablzControl.Items.OfType<DragablzTabItem>())
379+
((IDragablzTabItem)tabItem.View).CloseTab();
381380

382381
// Reset the dragging state
383382
switch (ApplicationName)
@@ -481,14 +480,14 @@ private IntPtr HwndHook(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref
481480
}
482481

483482
private void UpdateOnWindowResize()
484-
{
483+
{
485484
// Find all TabablzControl
486485
foreach (var tabablzControl in VisualTreeHelper.FindVisualChildren<TabablzControl>(this))
487486
{
488487
// Skip if no items
489488
if (tabablzControl.Items.Count == 0)
490489
continue;
491-
490+
492491
foreach (var item in tabablzControl.Items.OfType<DragablzTabItem>())
493492
{
494493
if (item.View is RemoteDesktopControl control)

‎Source/NETworkManager/Controls/RemoteDesktopControl.xaml.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,9 @@ private void Connect()
327327

328328
private void Reconnect()
329329
{
330+
if (IsConnecting)
331+
return;
332+
330333
if (IsConnected)
331334
return;
332335

‎Source/NETworkManager/NETworkManager.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@
6060
</ItemGroup>
6161
<ItemGroup>
6262
<PackageReference Include="AirspaceFixer" Version="1.0.6" />
63-
<PackageReference Include="AWSSDK.EC2" Version="3.7.425.6" />
63+
<PackageReference Include="AWSSDK.EC2" Version="3.7.429.1" />
6464
<PackageReference Include="DnsClient" Version="1.8.0" />
6565
<PackageReference Include="gong-wpf-dragdrop" Version="4.0.0" />
66-
<PackageReference Include="IPNetwork2" Version="3.0.667" />
66+
<PackageReference Include="IPNetwork2" Version="3.0.712" />
6767
<PackageReference Include="Lextm.SharpSnmpLib" Version="12.5.5" />
6868
<PackageReference Include="LiveCharts.Wpf" Version="0.9.7" />
6969
<PackageReference Include="log4net" Version="3.0.3" />
@@ -74,7 +74,7 @@
7474
<PackageReference Include="MahApps.Metro.IconPacks.Modern" Version="5.1.0" />
7575
<PackageReference Include="MahApps.Metro.IconPacks.Octicons" Version="5.1.0" />
7676
<PackageReference Include="MahApps.Metro.SimpleChildWindow" Version="2.2.1" />
77-
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2903.40" />
77+
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2957.106" />
7878
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
7979
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.135" />
8080
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />

‎Source/NETworkManager/ViewModels/RemoteDesktopHostViewModel.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ private bool IsConnected_CanExecute(object view)
245245
private bool IsDisconnected_CanExecute(object view)
246246
{
247247
if (view is RemoteDesktopControl control)
248-
return !control.IsConnected;
248+
return !control.IsConnected && !control.IsConnecting;
249249

250250
return false;
251251
}
@@ -281,7 +281,7 @@ private void FullscreenAction(object view)
281281
private void AdjustScreenAction(object view)
282282
{
283283
if (view is RemoteDesktopControl control)
284-
control.AdjustScreen(force:true);
284+
control.AdjustScreen(force: true);
285285
}
286286

287287
public ICommand SendCtrlAltDelCommand => new RelayCommand(SendCtrlAltDelAction, IsConnected_CanExecute);

‎Source/global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "8.0.404",
3+
"version": "8.0.405",
44
"rollForward": "latestFeature",
55
"allowPrerelease": false
66
}

‎Website/docs/changelog/2025-1-18-0.md‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
---
2+
sidebar_position: 983
3+
---
4+
5+
# 2025.1.18.0
6+
7+
Version: **2025.1.18.0** <br />
8+
Release date: **18.01.2025**
9+
10+
| File | `SHA256` |
11+
| ----------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------ |
12+
| [`NETworkManager_2025.1.18.0_Setup.msi`](https://github.com/BornToBeRoot/NETworkManager/releases/download/2025.1.18.0/NETworkManager_2025.1.18.0_Setup.msi) | `0E8722AB821FDFC5079C8E914CDBC293F373F551924EFBA14CA4AF6E68B678F9` |
13+
| [`NETworkManager_2025.1.18.0_Portable.zip`](https://github.com/BornToBeRoot/NETworkManager/releases/download/2025.1.18.0/NETworkManager_2025.1.18.0_Portable.zip) | `85000CC7E9892C14B3C1F7DE2D540A57E2C90CF5AE25E27960844751AADCF166` |
14+
| [`NETworkManager_2025.1.18.0_Archive.zip`](https://github.com/BornToBeRoot/NETworkManager/releases/download/2025.1.18.0/NETworkManager_2025.1.18.0_Archive.zip) | `68FFC7A42F0CF27B83525BB6AE79C730C96C40A956869F5C45D60B97CCECAE74` |
15+
16+
**System requirements**
17+
18+
- Windows 10 / Server x64 (22H2 or later)
19+
- [.NET Desktop Runtime 8.0 (LTS) - x64](https://dotnet.microsoft.com/en-us/download/dotnet/8.0/runtime)
20+
21+
## Breaking Changes
22+
23+
- Minimum supported Windows version increased to `22H2` to support:
24+
- WiFi 6 GHz, WPA3, 802.11be [#2912](https://github.com/BornToBeRoot/NETworkManager/pull/2912)
25+
- Remote Desktop high DPI, scaling and fast resizing [#2968](https://github.com/BornToBeRoot/NETworkManager/pull/2968)
26+
27+
## What's new?
28+
29+
- **WiFi**
30+
31+
- 6 GHz networks are now supported. [#2912](https://github.com/BornToBeRoot/NETworkManager/pull/2912) [#2928](https://github.com/BornToBeRoot/NETworkManager/pull/2928)
32+
- `WPA3 Personal (SAE)`, `WPA3 Enterprise` and `WPA3 Enterprise (192-bit)` are now supported. [#2912](https://github.com/BornToBeRoot/NETworkManager/pull/2912)
33+
- `802.11be` (`EHT`) is now supported. [#2912](https://github.com/BornToBeRoot/NETworkManager/pull/2912)
34+
35+
- **Remote Desktop**
36+
37+
- Scale rdp session and control to support high DPI (e.g. per Monitor DPI like 125%, 150%, etc.). [#2968](https://github.com/BornToBeRoot/NETworkManager/pull/2968)
38+
- Resizing now uses [`IMsRdpClient9::UpdateSessionDisplaySettings`](<https://learn.microsoft.com/en-us/previous-versions/windows/desktop/legacy/mt703457(v=vs.85)>) instead of [`IMsRdpClient::Reconnect`](https://learn.microsoft.com/en-us/windows/win32/termserv/imsrdpclient8-reconnect) to support scaling and faster resizing (without the need of reconnecting). [#2968](https://github.com/BornToBeRoot/NETworkManager/pull/2968).
39+
40+
:::warning
41+
42+
The new features for high DPI, scaling and resizing may cause issues or doesn't work with legacy servers/clients. Please report any issues you find here: [#2911](https://github.com/BornToBeRoot/NETworkManager/issues/2911)
43+
44+
:::
45+
46+
## Improvements
47+
48+
- Improve ToolTips (e.g. migrate from Twitter to X, etc.), Buttons, etc. [#2955](https://github.com/BornToBeRoot/NETworkManager/pull/2955)
49+
- **WiFi**
50+
- Improve search, cleanup/remove some converters to make the code more readable and faster. [#2940](https://github.com/BornToBeRoot/NETworkManager/pull/2940)
51+
52+
## Bugfixes
53+
54+
- Horizontal scrollbar fixed for some views. [#2945](https://github.com/BornToBeRoot/NETworkManager/pull/2945)
55+
- Fixed an issue with DPI scaling where the application was blurry if a second monitor had a different dpi setting than the main monitor. [#2941](https://github.com/BornToBeRoot/NETworkManager/pull/2941)
56+
- Changed the Welcome dialog from `MahApps.Metro.Controls.Dialogs` to `MahApps.Metro.SimpleChildWindow`, so the main window can be dragged and resized on the first start. [#2914](https://github.com/BornToBeRoot/NETworkManager/pull/2914)
57+
58+
- **WiFi**
59+
60+
- Fixed a bug that caused the scan process to crash when a 6 GHz network was found. [#2912](https://github.com/BornToBeRoot/NETworkManager/pull/2912)
61+
62+
- **IP Scanner**
63+
64+
- Fixed two `NullReferenceException` in ICMP & NETBIOS for some IP addresses. [#2964](https://github.com/BornToBeRoot/NETworkManager/pull/2964)
65+
66+
- **Remote Desktop**
67+
68+
- Fixed an app crash when a reconnect was triggered while it was already trying to connect. [#2988](https://github.com/BornToBeRoot/NETworkManager/pull/2988)
69+
70+
## Dependencies, Refactoring & Documentation
71+
72+
- Migrated code for some loading indicators from the library [LoadingIndicators.WPF] (https://github.com/zeluisping/LoadingIndicators.WPF) to the NETworkManager repo, as the original repo looks unmaintained and has problems with MahApps.Metro version 2 and later. [#2963](https://github.com/BornToBeRoot/NETworkManager/pull/2963)
73+
- Code cleanup & refactoring [#2940](https://github.com/BornToBeRoot/NETworkManager/pull/2940) [#2976](https://github.com/BornToBeRoot/NETworkManager/pull/2976)
74+
- Language files updated via [#transifex](https://github.com/BornToBeRoot/NETworkManager/pulls?q=author%3Aapp%2Ftransifex-integration)
75+
- Dependencies updated via [#dependabot](https://github.com/BornToBeRoot/NETworkManager/pulls?q=author%3Aapp%2Fdependabot)

0 commit comments

Comments
 (0)