From 19bb57fb31c18a4b5e9d5b1960b198be1c43ec90 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Sun, 26 Dec 2021 12:02:11 -0700 Subject: [PATCH] Prepare for .NET 6 binary --- IPBan/IPBan.csproj | 2 +- IPBanCore/Core/IPBan/IPBanBaseFirewall.cs | 1 + IPBanCore/Core/IPBan/IPBanMemoryFirewall.cs | 1 + IPBanCore/IPBanCore.csproj | 155 +++++++++---------- IPBanCore/Linux/IPBanLinuxBaseFirewall.cs | 4 + IPBanCore/Linux/IPBanLinuxFirewall.cs | 4 + IPBanCore/Linux/Scripts/Install.sh | 2 +- IPBanCore/Windows/IPBanWindowsFirewall.cs | 1 + IPBanCore/Windows/Scripts/install_latest.ps1 | 2 +- IPBanTests/IPBanTests.csproj | 80 +++++----- 10 files changed, 131 insertions(+), 121 deletions(-) diff --git a/IPBan/IPBan.csproj b/IPBan/IPBan.csproj index c1aeaefc..d8b5aa31 100644 --- a/IPBan/IPBan.csproj +++ b/IPBan/IPBan.csproj @@ -23,8 +23,8 @@ true Off ../ipban_favicon.ico - false true + false diff --git a/IPBanCore/Core/IPBan/IPBanBaseFirewall.cs b/IPBanCore/Core/IPBan/IPBanBaseFirewall.cs index c6acf6c7..fe7a0485 100644 --- a/IPBanCore/Core/IPBan/IPBanBaseFirewall.cs +++ b/IPBanCore/Core/IPBan/IPBanBaseFirewall.cs @@ -32,6 +32,7 @@ namespace DigitalRuby.IPBanCore /// /// Base firewall class that all firewall implementations should inherit from /// + [System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] public abstract class IPBanBaseFirewall : IIPBanFirewall { protected bool Disposed { get; private set; } diff --git a/IPBanCore/Core/IPBan/IPBanMemoryFirewall.cs b/IPBanCore/Core/IPBan/IPBanMemoryFirewall.cs index c57bcfce..4280eb4e 100644 --- a/IPBanCore/Core/IPBan/IPBanMemoryFirewall.cs +++ b/IPBanCore/Core/IPBan/IPBanMemoryFirewall.cs @@ -40,6 +40,7 @@ namespace DigitalRuby.IPBanCore /// [RequiredOperatingSystemAttribute(null, Priority = -99)] // low priority, basically any other firewall is preferred unless this one is explicitly specified in the config [CustomName("Memory")] + [System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] public class IPBanMemoryFirewall : IPBanBaseFirewall { public interface IMemoryFirewallRuleRanges diff --git a/IPBanCore/IPBanCore.csproj b/IPBanCore/IPBanCore.csproj index e67043b9..9701fd7c 100644 --- a/IPBanCore/IPBanCore.csproj +++ b/IPBanCore/IPBanCore.csproj @@ -1,78 +1,77 @@ - - - - net6.0 - DigitalRuby.IPBanCore - true - true - DigitalRuby.IPBanCore - 1.6.1 - 1.6.1 - 1.6.1 - Jeff Johnson - Digital Ruby, LLC - IPBan - IPBan is the leading solution to block hackers and botnets. Easily monitor events for all kinds of sources and put the bad ip addresses in the firewall automatically. - (c) 2012 Digital Ruby, LLC - https://github.com/DigitalRuby/IPBan - LICENSE.md - https://github.com/DigitalRuby/IPBan - git - windows linux firewall hacker botnet block rule security software service email smtp rdp remote desktop ssh auto - Upgrade to .NET core 5 - true - en - false - DigitalRuby.IPBanCore - - Library - - Off - false - true - - - - - - - - - - - - - - - - - - - PreserveNewest - - - PreserveNewest - - - - - - - - - - True - True - IPBanResources.resx - - - - - - DigitalRuby.IPBanCore - IPBanResources.Designer.cs - PublicResXFileCodeGenerator - - - - + + + + net6.0 + DigitalRuby.IPBanCore + true + true + DigitalRuby.IPBanCore + 1.7.0 + 1.7.0 + 1.7.0 + Jeff Johnson + Digital Ruby, LLC + IPBan + IPBan is the leading solution to block hackers and botnets. Easily monitor events for all kinds of sources and put the bad ip addresses in the firewall automatically. + (c) 2012 Digital Ruby, LLC + https://github.com/DigitalRuby/IPBan + LICENSE.md + https://github.com/DigitalRuby/IPBan + git + windows linux firewall hacker botnet block rule security software service email smtp rdp remote desktop ssh auto + Upgrade to .NET core 5 + true + en + false + DigitalRuby.IPBanCore + + Library + + Off + true + false + + + + + + + + + + + + + + + + + + PreserveNewest + + + PreserveNewest + + + + + + + + + + True + True + IPBanResources.resx + + + + + + DigitalRuby.IPBanCore + IPBanResources.Designer.cs + PublicResXFileCodeGenerator + + + + \ No newline at end of file diff --git a/IPBanCore/Linux/IPBanLinuxBaseFirewall.cs b/IPBanCore/Linux/IPBanLinuxBaseFirewall.cs index a0b95b30..d01ec288 100644 --- a/IPBanCore/Linux/IPBanLinuxBaseFirewall.cs +++ b/IPBanCore/Linux/IPBanLinuxBaseFirewall.cs @@ -35,6 +35,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE namespace DigitalRuby.IPBanCore { + /// + /// Linux firewall base class + /// + [System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] public abstract class IPBanLinuxBaseFirewall : IPBanBaseFirewall { private readonly AddressFamily addressFamily; diff --git a/IPBanCore/Linux/IPBanLinuxFirewall.cs b/IPBanCore/Linux/IPBanLinuxFirewall.cs index 266d4cfa..31136e46 100644 --- a/IPBanCore/Linux/IPBanLinuxFirewall.cs +++ b/IPBanCore/Linux/IPBanLinuxFirewall.cs @@ -30,8 +30,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE namespace DigitalRuby.IPBanCore { + /// + /// Linux firewall implementation + /// [RequiredOperatingSystem(OSUtility.Linux)] [CustomName("Default")] + [System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] public class IPBanLinuxFirewall : IPBanLinuxBaseFirewall { /// diff --git a/IPBanCore/Linux/Scripts/Install.sh b/IPBanCore/Linux/Scripts/Install.sh index 2492e7da..65fd70b9 100644 --- a/IPBanCore/Linux/Scripts/Install.sh +++ b/IPBanCore/Linux/Scripts/Install.sh @@ -8,7 +8,7 @@ # To uninstall: sudo systemctl stop ipban; sudo systemctl disable ipban; sudo rm /opt/ipban -r # -VERSION_DOTS="1.6.1" +VERSION_DOTS="1.7.0" VERSION_UNDERSCORES=${VERSION_DOTS//./_} FILE_NAME="IPBan-Linux-x64_$VERSION_UNDERSCORES.zip" diff --git a/IPBanCore/Windows/IPBanWindowsFirewall.cs b/IPBanCore/Windows/IPBanWindowsFirewall.cs index 366d87c3..8177cb55 100644 --- a/IPBanCore/Windows/IPBanWindowsFirewall.cs +++ b/IPBanCore/Windows/IPBanWindowsFirewall.cs @@ -49,6 +49,7 @@ namespace DigitalRuby.IPBanCore /// [RequiredOperatingSystem(OSUtility.Windows)] [CustomName("Default")] + [System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembers(System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All)] public class IPBanWindowsFirewall : IPBanBaseFirewall { // DO NOT CHANGE THESE CONST AND READONLY FIELDS! diff --git a/IPBanCore/Windows/Scripts/install_latest.ps1 b/IPBanCore/Windows/Scripts/install_latest.ps1 index c0af225f..d142f697 100644 --- a/IPBanCore/Windows/Scripts/install_latest.ps1 +++ b/IPBanCore/Windows/Scripts/install_latest.ps1 @@ -25,7 +25,7 @@ if ($PSVersionTable.PSVersion.Major -lt 5 -or ($PSVersionTable.PSVersion.Major - exit -1 } -$VERSION_DOTS = "1.6.1" +$VERSION_DOTS = "1.7.0" $VERSION_UNDERSCORES = $VERSION_DOTS -replace "\.","_" $FILE_NAME = "IPBan-Windows-x64_$VERSION_UNDERSCORES.zip" $INSTALL_PATH = "C:/Program Files/IPBan" diff --git a/IPBanTests/IPBanTests.csproj b/IPBanTests/IPBanTests.csproj index 6bb108bc..22e0baf2 100644 --- a/IPBanTests/IPBanTests.csproj +++ b/IPBanTests/IPBanTests.csproj @@ -1,47 +1,47 @@  - - net6.0 - AnyCPU - false - DigitalRuby.IPBanTests - DigitalRuby.IPBanTests - true - latest - Off - false - + + net6.0 + AnyCPU + false + DigitalRuby.IPBanTests + DigitalRuby.IPBanTests + true + latest + Off + false + - - - - - + + + + + - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + - - - + + + - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + - + \ No newline at end of file