Skip to content

Commit f9b4230

Browse files
BornToBeRootBornToBeRoot
authored
Feature: Upgrade to .NET 8.0 (#2560)
* Feature: Upgrade to .NET 8.0 * Feature: Upgrade to .NET 8 * Docs: Add .NET 8.0 * Feature: Upgrade PowerShell.SDK to resolve issue with .NET 8 * Fix: Design issue with grid * CI: Approve image & dependabot manual via label * CI: Update mergify * CI: Try to fix build
1 parent 1fc9ee7 commit f9b4230

File tree

25 files changed

+145
-167
lines changed

25 files changed

+145
-167
lines changed

‎.github/mergify.yml‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,28 @@
11
pull_request_rules:
2-
- name: automatic merge for pull request based on label
2+
- name: automatic merge for pull request based on label and ci success
33
conditions:
4-
- label~=LGTM$
5-
#- check-success=Analyze (csharp)
6-
#- check-success=CodeQL
4+
- label~=LGTM$
75
- check-success=continuous-integration/appveyor/pr
86
actions:
97
merge:
108
method: squash
11-
- name: automatic merge for Dependabot pull requests
9+
- name: automatic merge for Dependabot pull requests based on ci success
1210
conditions:
13-
- author=dependabot[bot]
11+
- author=dependabot[bot]
1412
- check-success=continuous-integration/appveyor/pr
1513
actions:
1614
merge:
1715
method: squash
18-
- name: automatic merge for Transifex pull requests
16+
- name: automatic merge for Transifex pull requests based on ci success
1917
conditions:
2018
- author=transifex-integration[bot]
2119
- check-success=continuous-integration/appveyor/pr
2220
actions:
2321
merge:
2422
method: squash
25-
- name: automatic merge for ImgBot pull requests
23+
- name: automatic merge for ImgBot pull requests based on ci success
2624
conditions:
27-
- author=imgbot[bot]
25+
- author=imgbot[bot]
2826
- check-success=continuous-integration/appveyor/pr
2927
actions:
3028
merge:

‎InnoSetup.iss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
33

44
#define MyAppName "NETworkManager"
5-
#define MyAppVersion "2023.9.21.0"
5+
#define MyAppVersion "2023.11.15.0"
66
#define MyAppPublisher "BornToBeRoot"
77
#define MyAppURL "https://github.com/BornToBeRoot/NETworkManager/"
88
#define MyAppExeName "NETworkManager.exe"

‎Source/3rdparty/Dragablz‎

‎Source/GlobalAssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
[assembly: AssemblyTrademark("")]
77
[assembly: AssemblyCulture("")]
88

9-
[assembly: AssemblyVersion("2023.10.22.0")]
10-
[assembly: AssemblyFileVersion("2023.10.22.0")]
9+
[assembly: AssemblyVersion("2023.11.15.0")]
10+
[assembly: AssemblyFileVersion("2023.11.15.0")]

‎Source/NETworkManager.Controls/NETworkManager.Controls.csproj‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,14 @@
44
<OutputType>Library</OutputType>
55
<RootNamespace>NETworkManager.Controls</RootNamespace>
66
<AssemblyName>NETworkManager.Controls</AssemblyName>
7-
<TargetFramework>net6.0-windows10.0.17763.0</TargetFramework>
8-
<RuntimeIdentifier>win10-x64</RuntimeIdentifier>
7+
<TargetFramework>net8.0-windows10.0.17763.0</TargetFramework>
8+
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
9+
<PlatformTarget>x64</PlatformTarget>
910
<SelfContained>false</SelfContained>
1011
<UseWPF>true</UseWPF>
1112
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
1213
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
13-
</PropertyGroup>
14-
<!-- Target 6.0.0 for compatibility https://github.com/dotnet/core/issues/7176 -->
15-
<ItemGroup>
16-
<FrameworkReference
17-
Update="Microsoft.WindowsDesktop.App;Microsoft.WindowsDesktop.App.WPF;Microsoft.WindowsDesktop.App.WindowsForms"
18-
TargetingPackVersion="6.0.0" />
19-
</ItemGroup>
14+
</PropertyGroup>
2015
<ItemGroup>
2116
<Compile Include="..\GlobalAssemblyInfo.cs" Link="Properties\GlobalAssemblyInfo.cs" />
2217
</ItemGroup>

‎Source/NETworkManager.Converters/NETworkManager.Converters.csproj‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,21 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<ProjectGuid>{BD4DDC21-7B64-41B2-BAC7-8173E0FE84BE}</ProjectGuid>
44
<OutputType>Library</OutputType>
55
<AppDesignerFolder>Properties</AppDesignerFolder>
66
<RootNamespace>NETworkManager.Converters</RootNamespace>
77
<AssemblyName>NETworkManager.Converters</AssemblyName>
8-
<TargetFramework>net6.0-windows10.0.17763.0</TargetFramework>
9-
<RuntimeIdentifier>win10-x64</RuntimeIdentifier>
8+
<TargetFramework>net8.0-windows10.0.17763.0</TargetFramework>
9+
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
10+
<PlatformTarget>x64</PlatformTarget>
1011
<SelfContained>false</SelfContained>
1112
<UseWPF>true</UseWPF>
1213
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
1314
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
1415
</PropertyGroup>
15-
<!-- Target 6.0.0 for compatibility https://github.com/dotnet/core/issues/7176 -->
1616
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
1717
<NoWarn>1701;1702;CS1591</NoWarn>
1818
</PropertyGroup>
19-
<ItemGroup>
20-
<FrameworkReference Update="Microsoft.WindowsDesktop.App;Microsoft.WindowsDesktop.App.WPF;Microsoft.WindowsDesktop.App.WindowsForms" TargetingPackVersion="6.0.0" />
21-
</ItemGroup>
2219
<ItemGroup>
2320
<Compile Include="..\GlobalAssemblyInfo.cs" Link="Properties\GlobalAssemblyInfo.cs" />
2421
</ItemGroup>

‎Source/NETworkManager.Documentation/NETworkManager.Documentation.csproj‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
<AppDesignerFolder>Properties</AppDesignerFolder>
66
<RootNamespace>NETworkManager.Documentation</RootNamespace>
77
<AssemblyName>NETworkManager.Documentation</AssemblyName>
8-
<TargetFramework>net6.0-windows10.0.17763.0</TargetFramework>
9-
<RuntimeIdentifier>win10-x64</RuntimeIdentifier>
8+
<TargetFramework>net8.0-windows10.0.17763.0</TargetFramework>
9+
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
10+
<PlatformTarget>x64</PlatformTarget>
1011
<SelfContained>false</SelfContained>
1112
<UseWPF>true</UseWPF>
1213
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -35,10 +36,6 @@
3536
<None Remove="Licenses\PSDiscoveryProtocol.txt" />
3637
<None Remove="Licenses\SharpSnmpLib.txt" />
3738
</ItemGroup>
38-
<!-- Target 6.0.0 for compatibility https://github.com/dotnet/core/issues/7176 -->
39-
<ItemGroup>
40-
<FrameworkReference Update="Microsoft.WindowsDesktop.App;Microsoft.WindowsDesktop.App.WPF;Microsoft.WindowsDesktop.App.WindowsForms" TargetingPackVersion="6.0.0" />
41-
</ItemGroup>
4239
<ItemGroup>
4340
<Compile Include="..\GlobalAssemblyInfo.cs" Link="Properties\GlobalAssemblyInfo.cs" />
4441
</ItemGroup>

‎Source/NETworkManager.Localization/NETworkManager.Localization.csproj‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<ProjectGuid>{FF225C2E-AA67-4B10-939A-6C046CEF8697}</ProjectGuid>
44
<OutputType>Library</OutputType>
55
<RootNamespace>NETworkManager.Localization</RootNamespace>
66
<AssemblyName>NETworkManager.Localization</AssemblyName>
7-
<TargetFramework>net6.0-windows10.0.17763.0</TargetFramework>
8-
<RuntimeIdentifier>win10-x64</RuntimeIdentifier>
7+
<TargetFramework>net8.0-windows10.0.17763.0</TargetFramework>
8+
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
9+
<PlatformTarget>x64</PlatformTarget>
910
<SelfContained>false</SelfContained>
1011
<UseWPF>true</UseWPF>
1112
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
1213
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
1314
<NoWarn>1701;1702;CA1712</NoWarn>
1415
</PropertyGroup>
15-
<!-- Target 6.0.0 for compatibility https://github.com/dotnet/core/issues/7176 -->
16-
<ItemGroup>
17-
<FrameworkReference Update="Microsoft.WindowsDesktop.App;Microsoft.WindowsDesktop.App.WPF;Microsoft.WindowsDesktop.App.WindowsForms" TargetingPackVersion="6.0.0" />
18-
</ItemGroup>
1916
<ItemGroup>
2017
<None Remove="Resources\Flags\cs-CZ.png" />
2118
<None Remove="Resources\Flags\en-US.png" />

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

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<ProjectGuid>{8A2859DC-38B6-4E9D-A6B2-1828DC6641B3}</ProjectGuid>
44
<OutputType>Library</OutputType>
55
<RootNamespace>NETworkManager.Models</RootNamespace>
66
<AssemblyName>NETworkManager.Models</AssemblyName>
7-
<TargetFramework>net6.0-windows10.0.17763.0</TargetFramework>
8-
<RuntimeIdentifier>win10-x64</RuntimeIdentifier>
7+
<TargetFramework>net8.0-windows10.0.17763.0</TargetFramework>
8+
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
9+
<PlatformTarget>x64</PlatformTarget>
910
<SelfContained>false</SelfContained>
1011
<CsWinRTWindowsMetadata>sdk</CsWinRTWindowsMetadata>
1112
<UseWPF>true</UseWPF>
1213
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
1314
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
1415
</PropertyGroup>
15-
<!-- Target 6.0.0 for compatibility https://github.com/dotnet/core/issues/7176 -->
16-
<ItemGroup>
17-
<FrameworkReference Update="Microsoft.WindowsDesktop.App;Microsoft.WindowsDesktop.App.WPF;Microsoft.WindowsDesktop.App.WindowsForms" TargetingPackVersion="6.0.0" />
18-
</ItemGroup>
1916
<ItemGroup>
2017
<None Remove="Resources\OUI.xml" />
2118
<None Remove="Resources\Ports.xml" />
@@ -29,9 +26,11 @@
2926
<EmbeddedResource Include="Resources\PSDiscoveryProtocol.psm1" />
3027
</ItemGroup>
3128
<ItemGroup>
32-
<PackageReference Include="AWSSDK.Core" Version="3.7.300" />
29+
<PackageReference Include="AWSSDK.Core" Version="3.7.300.3" />
3330
<PackageReference Include="DnsClient" Version="1.7.0" />
34-
<PackageReference Include="IPNetwork2" Version="2.6.618" />
31+
<PackageReference Include="IPNetwork2" Version="2.6.618">
32+
<Aliases>IPNetwork2</Aliases>
33+
</PackageReference>
3534
<PackageReference Include="Lextm.SharpSnmpLib" Version="12.5.2" />
3635
<PackageReference Include="log4net" Version="2.0.15" />
3736
<PackageReference Include="MahApps.Metro" Version="2.4.10" />
@@ -43,7 +42,7 @@
4342
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2151.40" />
4443
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.0.4" />
4544
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
46-
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.2.16" />
45+
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.4.0-rc.1" />
4746
</ItemGroup>
4847

4948
<ItemGroup>

‎Source/NETworkManager.Models/Network/HostRangeHelper.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Amazon.Util.Internal;
1+
extern alias IPNetwork2;
2+
23
using NETworkManager.Utilities;
34
using System;
45
using System.Collections.Concurrent;
@@ -39,7 +40,7 @@ public static IPAddress[] CreateIPAddressesFromIPRanges(string[] ipRanges, Cance
3940

4041
// 192.168.0.0/24 or 192.168.0.0/255.255.255.0
4142
case var _ when Regex.IsMatch(ipOrRange, RegexHelper.IPv4AddressCidrRegex) || Regex.IsMatch(ipOrRange, RegexHelper.IPv4AddressSubnetmaskRegex):
42-
var network = IPNetwork.Parse(ipOrRange);
43+
var network = IPNetwork2.System.Net.IPNetwork.Parse(ipOrRange);
4344

4445
Parallel.For(IPv4Address.ToInt32(network.Network), IPv4Address.ToInt32(network.Broadcast) + 1, parallelOptions, i =>
4546
{

0 commit comments

Comments
 (0)