From 814cbf2bf60e1a7cfdbba627f4b53c639a9d20ff Mon Sep 17 00:00:00 2001
From: Falahati <s_falahati@hotmail.com>
Date: Mon, 10 Jan 2022 22:37:45 +0330
Subject: [PATCH] added netcore5 to release targets and merged a netcore5
 winform sample from @ammarheidari

---
 WindowsFirewallHelper.Net5Sample/MainForm.cs       |  6 +++---
 WindowsFirewallHelper.Sample/MainForm.cs           |  2 +-
 WindowsFirewallHelper/WindowsFirewallHelper.csproj | 11 ++++-------
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/WindowsFirewallHelper.Net5Sample/MainForm.cs b/WindowsFirewallHelper.Net5Sample/MainForm.cs
index 8e7abb7..f0d628f 100644
--- a/WindowsFirewallHelper.Net5Sample/MainForm.cs
+++ b/WindowsFirewallHelper.Net5Sample/MainForm.cs
@@ -27,7 +27,7 @@ private static void NodeDiscovery(TreeNode node)
 
             node.Nodes.Clear();
 
-            if (o is ICollection<FirewallWASRule> || o is ICollection<IFirewallRule>)
+            if (o is ICollection<FirewallWASRule> or ICollection<IFirewallRule>)
             {
                 foreach (var item in ((IEnumerable) o).Cast<IFirewallRule>().OrderBy(rule => rule.FriendlyName))
                 {
@@ -48,7 +48,7 @@ private static void NodeDiscovery(TreeNode node)
                     if (propertyInfo.PropertyType.GetInterfaces().Contains(typeof(IEnumerable)) &&
                         propertyInfo.PropertyType != typeof(string))
                     {
-                        if (!propertyInfo.GetGetMethod().IsStatic)
+                        if (propertyInfo.GetGetMethod()?.IsStatic == false)
                         {
                             var value = propertyInfo.GetValue(o, null);
                             node.Nodes.Add(new TreeNode("[" + propertyInfo.Name + "] ") {Tag = value});
@@ -76,7 +76,7 @@ private void AddApplicationRule(object sender, EventArgs e)
 
                 var newAppRule = FirewallManager.Instance.CreateApplicationRule(
                     profileType.Value,
-                    "!!TETS!! " + Guid.NewGuid().ToString("B"),
+                    "!!TEST!! " + Guid.NewGuid().ToString("B"),
                     FirewallAction.Allow,
                     ofd_app.FileName
                 );
diff --git a/WindowsFirewallHelper.Sample/MainForm.cs b/WindowsFirewallHelper.Sample/MainForm.cs
index 6b2567f..0b3d74a 100644
--- a/WindowsFirewallHelper.Sample/MainForm.cs
+++ b/WindowsFirewallHelper.Sample/MainForm.cs
@@ -76,7 +76,7 @@ private void AddApplicationRule(object sender, EventArgs e)
 
                 var newAppRule = FirewallManager.Instance.CreateApplicationRule(
                     profileType.Value,
-                    "!!TETS!! " + Guid.NewGuid().ToString("B"),
+                    "!!TEST!! " + Guid.NewGuid().ToString("B"),
                     FirewallAction.Allow,
                     ofd_app.FileName
                 );
diff --git a/WindowsFirewallHelper/WindowsFirewallHelper.csproj b/WindowsFirewallHelper/WindowsFirewallHelper.csproj
index a9be5e3..7080fae 100644
--- a/WindowsFirewallHelper/WindowsFirewallHelper.csproj
+++ b/WindowsFirewallHelper/WindowsFirewallHelper.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2;net4;net5.0</TargetFrameworks>
     <PackageId>WindowsFirewallHelper</PackageId>
-    <Version>2.1.4.81</Version>
+    <Version>2.2.0.86</Version>
     <Authors>Soroush Falahati</Authors>
     <Description>A class library to manage the Windows Firewall as well as adding your program to the Windows Firewall Exception list. Supporting Windows XP+.</Description>
     <PackageLicenseUrl>https://github.com/falahati/WindowsFirewallHelper/blob/master/LICENSE</PackageLicenseUrl>
@@ -21,7 +21,6 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <Reference Condition="'$(TargetFramework)'=='net4'" Include="System.ServiceProcess"></Reference>
   </ItemGroup>
   <ItemGroup>
     <Content Include="Icon.png">
@@ -33,12 +32,10 @@
       <PackagePath>\</PackagePath>
     </Content>
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2'">
-    <PackageReference Include="System.ServiceProcess.ServiceController">
-      <Version>5.0.0</Version>
-    </PackageReference>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net4'">
+    <Reference Include="System.ServiceProcess"></Reference>
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
+  <ItemGroup Condition="'$(TargetFramework)' != 'net4'">
     <PackageReference Include="System.ServiceProcess.ServiceController">
       <Version>5.0.0</Version>
     </PackageReference>