* Upgraded to .NET Framework 4.8

CodeDead · CodeDead · commit 53ad5e2ce8a2 · 2019-05-07T02:01:09.000+02:00
* External dependencies are now NuGet packages
* Code improvements
diff --git a/Advanced PortChecker/Advanced PortChecker.csproj b/Advanced PortChecker/Advanced PortChecker.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Advanced_PortChecker</RootNamespace>
     <AssemblyName>Advanced PortChecker</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
@@ -44,11 +44,17 @@
     <ApplicationIcon>globe.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Syncfusion.Shared.WPF, Version=14.4460.0.15, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="CodeDead.UpdateManager, Version=1.4.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\CodeDead.UpdateManager.1.4.4\lib\net48\CodeDead.UpdateManager.dll</HintPath>
     </Reference>
-    <Reference Include="Syncfusion.Tools.WPF, Version=16.2460.0.50, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="Syncfusion.Licensing, Version=17.1460.0.43, Culture=neutral, PublicKeyToken=632609b4d040f6b4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Syncfusion.Licensing.17.1.0.43\lib\net46\Syncfusion.Licensing.dll</HintPath>
+    </Reference>
+    <Reference Include="Syncfusion.Shared.WPF, Version=17.1460.0.43, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
+      <HintPath>..\packages\Syncfusion.Shared.WPF.17.1.0.43\lib\net46\Syncfusion.Shared.WPF.dll</HintPath>
+    </Reference>
+    <Reference Include="Syncfusion.Tools.WPF, Version=17.1460.0.43, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
+      <HintPath>..\packages\Syncfusion.Tools.WPF.17.1.0.43\lib\net46\Syncfusion.Tools.WPF.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Drawing" />
@@ -57,9 +63,6 @@
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
     </Reference>
     <Reference Include="System.Xml" />
-    <Reference Include="UpdateManager">
-      <HintPath>..\..\UpdateManager\UpdateManager\bin\Release\UpdateManager.dll</HintPath>
-    </Reference>
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
@@ -121,6 +124,7 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/Advanced PortChecker/App.config b/Advanced PortChecker/App.config
@@ -6,7 +6,7 @@
     </sectionGroup>
   </configSections>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
   </startup>
   <userSettings>
     <Advanced_PortChecker.Properties.Settings>
diff --git a/Advanced PortChecker/App.xaml.cs b/Advanced PortChecker/App.xaml.cs
@@ -1,15 +1,18 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Threading.Tasks;
-using System.Windows;
-
-namespace Advanced_PortChecker
+﻿namespace Advanced_PortChecker
 {
     /// <summary>
     /// Interaction logic for App.xaml
     /// </summary>
-    public partial class App : Application
+    public partial class App
     {
+        /// <inheritdoc />
+        /// <summary>
+        /// Initialize a new App
+        /// </summary>
+        public App()
+        {
+            // Enter your Syncfusion license key here
+            Syncfusion.Licensing.SyncfusionLicenseProvider.RegisterLicense("YOUR LICENSE KEY HERE");
+        }
     }
 }
diff --git a/Advanced PortChecker/Classes/Objects/LvCheck.cs b/Advanced PortChecker/Classes/Objects/LvCheck.cs
@@ -3,7 +3,7 @@
     /// <summary>
     /// Represents the content of a ListViewItem
     /// </summary>
-    public class LvCheck
+    public sealed class LvCheck
     {
         /// <summary>
         /// The address that was scanned
diff --git a/Advanced PortChecker/Classes/Scanner/PortScanner.cs b/Advanced PortChecker/Classes/Scanner/PortScanner.cs
@@ -1,5 +1,4 @@
 ﻿using System;
-using System.Collections.Generic;
 using System.Globalization;
 using System.Net;
 using System.Net.Sockets;
@@ -23,20 +22,18 @@ internal static class PortScanner
         /// <param name="scanOperation">The ScanInformation object containing information regarding this scan</param>
         /// <returns>A list of LvCheck objects containing information regarding the ports and address that were scanned</returns>
         // ReSharper disable once IdentifierTypo
-        internal static List<LvCheck> CheckTCPUDP(string address, int startPort, int stopPort, int timeout, ScanOperation scanOperation)
+        internal static void CheckTCPUDP(string address, int startPort, int stopPort, int timeout, ScanOperation scanOperation)
         {
-            List<LvCheck> lv = new List<LvCheck>();
             for (int i = startPort; i <= stopPort; i++)
             {
                 if (scanOperation.IsCancelled) break;
 
-                lv.AddRange(CheckTCP(address, i, i, timeout, scanOperation, false));
-                lv.AddRange(CheckUDP(address, i, i, timeout, scanOperation, false));
+                CheckTCP(address, i, i, timeout, scanOperation, false);
+                CheckUDP(address, i, i, timeout, scanOperation, false);
 
                 scanOperation.Progress.Report(1);
             }
             scanOperation.ScanCompletedEvent?.Invoke();
-            return lv;
         }
 
         // ReSharper disable once InconsistentNaming
@@ -49,10 +46,8 @@ internal static List<LvCheck> CheckTCPUDP(string address, int startPort, int sto
         /// <param name="timeout">The amount of time before the connection times out</param>
         /// <param name="scanOperation">The ScanInformation object containing information regarding this scan</param>
         /// <param name="reportProgress">A boolean to represent whether this method should report the current progress or not</param>
-        /// <returns>A list of LvCheck objects containing information regarding the ports and address that were scanned</returns>
-        internal static List<LvCheck> CheckTCP(string address, int startPort, int stopPort, int timeout, ScanOperation scanOperation, bool reportProgress)
+        internal static void CheckTCP(string address, int startPort, int stopPort, int timeout, ScanOperation scanOperation, bool reportProgress)
         {
-            List<LvCheck> lv = new List<LvCheck>();
             for (int i = startPort; i <= stopPort; i++)
             {
                 if (scanOperation.IsCancelled) break;
@@ -66,7 +61,6 @@ internal static List<LvCheck> CheckTCP(string address, int startPort, int stopPo
                     Description = IsTcpOpen(address, i, timeout) ? "Open" : "Closed",
                     ScanDate = DateTime.Now.ToString(CultureInfo.CurrentCulture)
                 };
-                lv.Add(check);
 
                 if (reportProgress)
                 {
@@ -79,8 +73,6 @@ internal static List<LvCheck> CheckTCP(string address, int startPort, int stopPo
             {
                 scanOperation.ScanCompletedEvent?.Invoke();
             }
-            
-            return lv;
         }
 
         // ReSharper disable once InconsistentNaming
@@ -93,10 +85,8 @@ internal static List<LvCheck> CheckTCP(string address, int startPort, int stopPo
         /// <param name="timeout">The amount of time before the connection times out</param>
         /// <param name="scanOperation">The ScanInformation object containing information regarding this scan</param>
         /// <param name="reportProgress">A boolean to represent whether this method should report the current progress or not</param>
-        /// <returns>A list of LvCheck objects containing information regarding the ports and address that were scanned</returns>
-        internal static List<LvCheck> CheckUDP(string address, int startPort, int stopPort, int timeout, ScanOperation scanOperation, bool reportProgress)
+        internal static void CheckUDP(string address, int startPort, int stopPort, int timeout, ScanOperation scanOperation, bool reportProgress)
         {
-            List<LvCheck> lv = new List<LvCheck>();
             for (int i = startPort; i <= stopPort; i++)
             {
                 if (scanOperation.IsCancelled) break;
@@ -110,7 +100,6 @@ internal static List<LvCheck> CheckUDP(string address, int startPort, int stopPo
                     Description = IsUdpOpen(address, i, timeout) ? "Open" : "Closed",
                     ScanDate = DateTime.Now.ToString(CultureInfo.CurrentCulture)
                 };
-                lv.Add(check);
 
                 if (reportProgress)
                 {
@@ -123,7 +112,6 @@ internal static List<LvCheck> CheckUDP(string address, int startPort, int stopPo
             {
                 scanOperation.ScanCompletedEvent?.Invoke();
             }
-            return lv;
         }
 
 
@@ -174,7 +162,7 @@ private static bool IsUdpOpen(string address, int port, int timeout)
                     byte[] sendBytes = new byte[4];
                     new Random().NextBytes(sendBytes);
                     udpClient.Send(sendBytes, sendBytes.Length);
-                    
+
                     IPEndPoint remoteIpEndPoint = new IPEndPoint(IPAddress.Any, 0);
 
                     byte[] result = udpClient.Receive(ref remoteIpEndPoint);
diff --git a/Advanced PortChecker/Classes/Utils/GridViewSorter.cs b/Advanced PortChecker/Classes/Utils/GridViewSorter.cs
@@ -116,7 +116,7 @@ private static void ColumnHeader_Click(object sender, RoutedEventArgs e)
         /// <typeparam name="T">DependencyObject</typeparam>
         /// <param name="reference">A DependencyObject</param>
         /// <returns>The parent of a DependencyObject</returns>
-        internal static T GetAncestor<T>(DependencyObject reference) where T : DependencyObject
+        private static T GetAncestor<T>(DependencyObject reference) where T : DependencyObject
         {
             DependencyObject parent = VisualTreeHelper.GetParent(reference);
             while (!(parent is T))
@@ -131,7 +131,7 @@ internal static T GetAncestor<T>(DependencyObject reference) where T : Dependenc
         /// </summary>
         /// <param name="view">The ICollectionView</param>
         /// <param name="propertyName">The name of the property</param>
-        internal static void ApplySort(ICollectionView view, string propertyName)
+        private static void ApplySort(ICollectionView view, string propertyName)
         {
             ListSortDirection direction = ListSortDirection.Ascending;
             if (view.SortDescriptions.Count > 0)
diff --git a/Advanced PortChecker/Properties/AssemblyInfo.cs b/Advanced PortChecker/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("CodeDead")]
 [assembly: AssemblyProduct("Advanced PortChecker")]
-[assembly: AssemblyCopyright("Copyright © CodeDead 2018")]
+[assembly: AssemblyCopyright("Copyright © 2019 CodeDead")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -49,5 +49,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4.0.0")]
-[assembly: AssemblyFileVersion("1.4.0.0")]
+[assembly: AssemblyVersion("1.5.0.0")]
+[assembly: AssemblyFileVersion("1.5.0.0")]
diff --git a/Advanced PortChecker/Properties/Resources.Designer.cs b/Advanced PortChecker/Properties/Resources.Designer.cs
diff --git a/Advanced PortChecker/Properties/Settings.Designer.cs b/Advanced PortChecker/Properties/Settings.Designer.cs
diff --git a/Advanced PortChecker/Windows/AboutWindow.xaml b/Advanced PortChecker/Windows/AboutWindow.xaml
@@ -29,9 +29,9 @@
 
 Images: small-n-flat by paomedia
 Theme by: Syncfusion
-Version: 1.4.0.0
+Version: 1.5.0.0
 
-Copyright © CodeDead 2018</TextBlock.Text>
+Copyright © 2019 CodeDead</TextBlock.Text>
             </TextBlock>
         </Grid>
         <Grid Grid.Row="1">
diff --git a/Advanced PortChecker/Windows/MainWindow.xaml.cs b/Advanced PortChecker/Windows/MainWindow.xaml.cs
@@ -13,8 +13,8 @@
 using Advanced_PortChecker.Classes.Objects;
 using Advanced_PortChecker.Classes.Scanner;
 using Advanced_PortChecker.Classes.Utils;
+using CodeDead.UpdateManager.Classes;
 using Microsoft.Win32;
-using UpdateManager.Classes;
 
 namespace Advanced_PortChecker.Windows
 {
@@ -28,7 +28,7 @@ public partial class MainWindow
         /// <summary>
         /// The UpdateManager object that can be used to check for updates
         /// </summary>
-        private readonly UpdateManager.Classes.UpdateManager _updateManager;
+        private readonly UpdateManager _updateManager;
         /// <summary>
         /// The list of ScanOperation objects
         /// </summary>
@@ -56,7 +56,7 @@ public MainWindow()
                 TitleText = "Advanced PortChecker",
                 UpdateNowText = "Would you like to update the application now?"
             };
-            _updateManager = new UpdateManager.Classes.UpdateManager(Assembly.GetExecutingAssembly().GetName().Version, "https://codedead.com/Software/Advanced%20PortChecker/update.xml", stringVariables);
+            _updateManager = new UpdateManager(Assembly.GetExecutingAssembly().GetName().Version, "https://codedead.com/Software/Advanced%20PortChecker/update.xml", stringVariables);
 
             WindowDraggable();
             // Change the theme
@@ -221,7 +221,7 @@ private void BtnScan_Click(object sender, RoutedEventArgs e)
                         PgbStatus.Value += 1;
                         TaskbarItemInfo.ProgressValue += (1 / (PgbStatus.Maximum - PgbStatus.Minimum));
                     }),
-                    ItemProgress = new Progress<LvCheck>(value => { LvPorts.Items.Add(value); }),
+                    ItemProgress = new Progress<LvCheck>(value => LvPorts.Items.Add(value)),
                     IsCancelled = false
                 };
                 scan.ScanCompletedEvent += ScanThreadCompleted;
diff --git a/Advanced PortChecker/packages.config b/Advanced PortChecker/packages.config
@@ -0,0 +1,7 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="CodeDead.UpdateManager" version="1.4.4" targetFramework="net48" />
+  <package id="Syncfusion.Licensing" version="17.1.0.43" targetFramework="net48" />
+  <package id="Syncfusion.Shared.WPF" version="17.1.0.43" targetFramework="net48" />
+  <package id="Syncfusion.Tools.WPF" version="17.1.0.43" targetFramework="net48" />
+</packages>
diff --git a/README.md b/README.md

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`/// <summary>`
`4`	`4`	`/// Represents the content of a ListViewItem`
`5`	`5`	`/// </summary>`
`6`		`- public class LvCheck`
	`6`	`+ public sealed class LvCheck`
`7`	`7`	`{`
`8`	`8`	`/// <summary>`
`9`	`9`	`/// The address that was scanned`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using System;`
`2`		`-using System.Collections.Generic;`
`3`	`2`	`using System.Globalization;`
`4`	`3`	`using System.Net;`
`5`	`4`	`using System.Net.Sockets;`
`@@ -23,20 +22,18 @@ internal static class PortScanner`
`23`	`22`	`/// <param name="scanOperation">The ScanInformation object containing information regarding this scan</param>`
`24`	`23`	`/// <returns>A list of LvCheck objects containing information regarding the ports and address that were scanned</returns>`
`25`	`24`	`// ReSharper disable once IdentifierTypo`
`26`		`- internal static List<LvCheck> CheckTCPUDP(string address, int startPort, int stopPort, int timeout, ScanOperation scanOperation)`
	`25`	`+ internal static void CheckTCPUDP(string address, int startPort, int stopPort, int timeout, ScanOperation scanOperation)`
`27`	`26`	`{`
`28`		`- List<LvCheck> lv = new List<LvCheck>();`
`29`	`27`	`for (int i = startPort; i <= stopPort; i++)`
`30`	`28`	`{`
`31`	`29`	`if (scanOperation.IsCancelled) break;`
`32`	`30`
`33`		`- lv.AddRange(CheckTCP(address, i, i, timeout, scanOperation, false));`
`34`		`- lv.AddRange(CheckUDP(address, i, i, timeout, scanOperation, false));`
	`31`	`+ CheckTCP(address, i, i, timeout, scanOperation, false);`
	`32`	`+ CheckUDP(address, i, i, timeout, scanOperation, false);`
`35`	`33`
`36`	`34`	`scanOperation.Progress.Report(1);`
`37`	`35`	`}`
`38`	`36`	`scanOperation.ScanCompletedEvent?.Invoke();`
`39`		`- return lv;`
`40`	`37`	`}`
`41`	`38`
`42`	`39`	`// ReSharper disable once InconsistentNaming`
`@@ -49,10 +46,8 @@ internal static List<LvCheck> CheckTCPUDP(string address, int startPort, int sto`
`49`	`46`	`/// <param name="timeout">The amount of time before the connection times out</param>`
`50`	`47`	`/// <param name="scanOperation">The ScanInformation object containing information regarding this scan</param>`
`51`	`48`	`/// <param name="reportProgress">A boolean to represent whether this method should report the current progress or not</param>`
`52`		`- /// <returns>A list of LvCheck objects containing information regarding the ports and address that were scanned</returns>`
`53`		`- internal static List<LvCheck> CheckTCP(string address, int startPort, int stopPort, int timeout, ScanOperation scanOperation, bool reportProgress)`
	`49`	`+ internal static void CheckTCP(string address, int startPort, int stopPort, int timeout, ScanOperation scanOperation, bool reportProgress)`
`54`	`50`	`{`
`55`		`- List<LvCheck> lv = new List<LvCheck>();`
`56`	`51`	`for (int i = startPort; i <= stopPort; i++)`
`57`	`52`	`{`
`58`	`53`	`if (scanOperation.IsCancelled) break;`
`@@ -66,7 +61,6 @@ internal static List<LvCheck> CheckTCP(string address, int startPort, int stopPo`
`66`	`61`	`Description = IsTcpOpen(address, i, timeout) ? "Open" : "Closed",`
`67`	`62`	`ScanDate = DateTime.Now.ToString(CultureInfo.CurrentCulture)`
`68`	`63`	`};`
`69`		`- lv.Add(check);`
`70`	`64`
`71`	`65`	`if (reportProgress)`
`72`	`66`	`{`
`@@ -79,8 +73,6 @@ internal static List<LvCheck> CheckTCP(string address, int startPort, int stopPo`
`79`	`73`	`{`
`80`	`74`	`scanOperation.ScanCompletedEvent?.Invoke();`
`81`	`75`	`}`
`82`		`-`
`83`		`- return lv;`
`84`	`76`	`}`
`85`	`77`
`86`	`78`	`// ReSharper disable once InconsistentNaming`
`@@ -93,10 +85,8 @@ internal static List<LvCheck> CheckTCP(string address, int startPort, int stopPo`
`93`	`85`	`/// <param name="timeout">The amount of time before the connection times out</param>`
`94`	`86`	`/// <param name="scanOperation">The ScanInformation object containing information regarding this scan</param>`
`95`	`87`	`/// <param name="reportProgress">A boolean to represent whether this method should report the current progress or not</param>`
`96`		`- /// <returns>A list of LvCheck objects containing information regarding the ports and address that were scanned</returns>`
`97`		`- internal static List<LvCheck> CheckUDP(string address, int startPort, int stopPort, int timeout, ScanOperation scanOperation, bool reportProgress)`
	`88`	`+ internal static void CheckUDP(string address, int startPort, int stopPort, int timeout, ScanOperation scanOperation, bool reportProgress)`
`98`	`89`	`{`
`99`		`- List<LvCheck> lv = new List<LvCheck>();`
`100`	`90`	`for (int i = startPort; i <= stopPort; i++)`
`101`	`91`	`{`
`102`	`92`	`if (scanOperation.IsCancelled) break;`
`@@ -110,7 +100,6 @@ internal static List<LvCheck> CheckUDP(string address, int startPort, int stopPo`
`110`	`100`	`Description = IsUdpOpen(address, i, timeout) ? "Open" : "Closed",`
`111`	`101`	`ScanDate = DateTime.Now.ToString(CultureInfo.CurrentCulture)`
`112`	`102`	`};`
`113`		`- lv.Add(check);`
`114`	`103`
`115`	`104`	`if (reportProgress)`
`116`	`105`	`{`
`@@ -123,7 +112,6 @@ internal static List<LvCheck> CheckUDP(string address, int startPort, int stopPo`
`123`	`112`	`{`
`124`	`113`	`scanOperation.ScanCompletedEvent?.Invoke();`
`125`	`114`	`}`
`126`		`- return lv;`
`127`	`115`	`}`
`128`	`116`
`129`	`117`
`@@ -174,7 +162,7 @@ private static bool IsUdpOpen(string address, int port, int timeout)`
`174`	`162`	`byte[] sendBytes = new byte[4];`
`175`	`163`	`new Random().NextBytes(sendBytes);`
`176`	`164`	`udpClient.Send(sendBytes, sendBytes.Length);`
`177`		`-`
	`165`	`+`
`178`	`166`	`IPEndPoint remoteIpEndPoint = new IPEndPoint(IPAddress.Any, 0);`
`179`	`167`
`180`	`168`	`byte[] result = udpClient.Receive(ref remoteIpEndPoint);`