diff --git a/benchmarks/NetworkPrimitives.Benchmarks.csproj b/benchmarks/NetworkPrimitives.Benchmarks.csproj index 22a058a..a433e70 100644 --- a/benchmarks/NetworkPrimitives.Benchmarks.csproj +++ b/benchmarks/NetworkPrimitives.Benchmarks.csproj @@ -1,7 +1,7 @@ Exe - net48;net5.0;net6.0;netcoreapp3.0 + net7.0;net6.0;net5.0;netcoreapp3.1;net48; AnyCPU @@ -13,9 +13,9 @@ false - - - + + + diff --git a/benchmarks/Program.cs b/benchmarks/Program.cs index af987c5..0f6e4be 100644 --- a/benchmarks/Program.cs +++ b/benchmarks/Program.cs @@ -15,10 +15,6 @@ namespace NetworkPrimitives.Benchmarks { internal static class Program { - internal const int LAUNCH_COUNT = 1; - internal const int WARMUP_COUNT = 0; - internal const int TARGET_COUNT = 1; - private static void Main(string[] args) { var path = "../../../../BenchmarkResults"; @@ -47,14 +43,15 @@ public Config() this.AddDiagnoser(MemoryDiagnoser.Default!); this.AddLogger(ConsoleLogger.Default!); this.AddJob( - Job.Dry! - .WithWarmupCount(Program.WARMUP_COUNT)! - .WithLaunchCount(Program.LAUNCH_COUNT)! - .WithRuntime(CoreRuntime.Core60!)! - .WithRuntime(CoreRuntime.Core50!)! - .WithRuntime(CoreRuntime.Core30!)! - .WithRuntime(ClrRuntime.Net48!)! + CreateJob(CoreRuntime.Core70), + CreateJob(CoreRuntime.Core60), + CreateJob(CoreRuntime.Core50), + CreateJob(CoreRuntime.Core31), + CreateJob(ClrRuntime.Net48) ); } + + private static Job CreateJob(Runtime runtime) + => Job.Default.WithRuntime(runtime); } } \ No newline at end of file diff --git a/global.json b/global.json index 4db6a48..7cd6a1f 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { "sdk": { - "version": "5.0", + "version": "7.0.0", "rollForward": "latestMajor", - "allowPrerelease": false + "allowPrerelease": true } } \ No newline at end of file diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 4f16ce0..e30af7b 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -2,7 +2,7 @@ - net6.0;net5.0;netstandard2.0 + net7.0;net6.0;net5.0;netstandard2.0 1.1.0 network; networking; subnet; ip-address; ipaddress; ip address; mac address; networking.primitives; network.primitives; primitives; Lightweight package for working with networking types such as IPv4 addresses, IPv6 addresses, ranges, and subnets. diff --git a/src/NetworkPrimitives.JsonConverters/NetworkPrimitives.JsonConverters.csproj b/src/NetworkPrimitives.JsonConverters/NetworkPrimitives.JsonConverters.csproj index 77abb6a..e956ed5 100644 --- a/src/NetworkPrimitives.JsonConverters/NetworkPrimitives.JsonConverters.csproj +++ b/src/NetworkPrimitives.JsonConverters/NetworkPrimitives.JsonConverters.csproj @@ -16,8 +16,8 @@ --> - - + + diff --git a/src/NetworkPrimitives/Ipv4/Address/Ipv4Address.cs b/src/NetworkPrimitives/Ipv4/Address/Ipv4Address.cs index 45ea715..1664b36 100644 --- a/src/NetworkPrimitives/Ipv4/Address/Ipv4Address.cs +++ b/src/NetworkPrimitives/Ipv4/Address/Ipv4Address.cs @@ -286,6 +286,7 @@ public static Ipv4Address Parse(string? ipString) /// /// is not /// + // ReSharper disable once SwitchExpressionHandlesSomeKnownEnumValuesWithExceptionInDefault public static Ipv4Address Parse(IPAddress? ipAddress) => ipAddress?.AddressFamily switch { null => throw new ArgumentNullException(nameof(ipAddress)), diff --git a/src/NetworkPrimitives/Ipv6/Address/Ipv6Address.cs b/src/NetworkPrimitives/Ipv6/Address/Ipv6Address.cs index dda2cdd..a90ca50 100644 --- a/src/NetworkPrimitives/Ipv6/Address/Ipv6Address.cs +++ b/src/NetworkPrimitives/Ipv6/Address/Ipv6Address.cs @@ -4,6 +4,7 @@ using System.Runtime.InteropServices; using NetworkPrimitives.Utilities; +#pragma warning disable CS1591 namespace NetworkPrimitives.Ipv6 { public readonly struct Ipv6Address : IEquatable// , IFormattable diff --git a/src/NetworkPrimitives/Ipv6/Subnet/Ipv6Cidr.cs b/src/NetworkPrimitives/Ipv6/Subnet/Ipv6Cidr.cs index 8b9d0d0..c0093f5 100644 --- a/src/NetworkPrimitives/Ipv6/Subnet/Ipv6Cidr.cs +++ b/src/NetworkPrimitives/Ipv6/Subnet/Ipv6Cidr.cs @@ -1,6 +1,7 @@ using System; using NetworkPrimitives.Utilities; +#pragma warning disable CS1591 namespace NetworkPrimitives.Ipv6 { public readonly struct Ipv6Cidr : ITryFormat, IEquatable diff --git a/src/NetworkPrimitives/Ipv6/Subnet/Ipv6Subnet.cs b/src/NetworkPrimitives/Ipv6/Subnet/Ipv6Subnet.cs index dc474ba..df9495d 100644 --- a/src/NetworkPrimitives/Ipv6/Subnet/Ipv6Subnet.cs +++ b/src/NetworkPrimitives/Ipv6/Subnet/Ipv6Subnet.cs @@ -5,6 +5,7 @@ using NetworkPrimitives.Ipv4; using NetworkPrimitives.Utilities; +#pragma warning disable CS1591 namespace NetworkPrimitives.Ipv6 { public readonly struct Ipv6Subnet : IEquatable diff --git a/src/NetworkPrimitives/Ipv6/Subnet/Ipv6SubnetMask.cs b/src/NetworkPrimitives/Ipv6/Subnet/Ipv6SubnetMask.cs index 5978481..729ac2a 100644 --- a/src/NetworkPrimitives/Ipv6/Subnet/Ipv6SubnetMask.cs +++ b/src/NetworkPrimitives/Ipv6/Subnet/Ipv6SubnetMask.cs @@ -1,6 +1,7 @@ using System; using System.Net; +#pragma warning disable CS1591 namespace NetworkPrimitives.Ipv6 { public readonly struct Ipv6SubnetMask : IEquatable diff --git a/src/NetworkPrimitives/NetworkPrimitives.csproj b/src/NetworkPrimitives/NetworkPrimitives.csproj index 1648c9d..6e1409b 100644 --- a/src/NetworkPrimitives/NetworkPrimitives.csproj +++ b/src/NetworkPrimitives/NetworkPrimitives.csproj @@ -24,13 +24,13 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/NetworkPrimitives.Tests/NetworkPrimitives.Tests.Core.csproj b/tests/NetworkPrimitives.Tests/NetworkPrimitives.Tests.Core.csproj index 836e037..9ceca41 100644 --- a/tests/NetworkPrimitives.Tests/NetworkPrimitives.Tests.Core.csproj +++ b/tests/NetworkPrimitives.Tests/NetworkPrimitives.Tests.Core.csproj @@ -1,7 +1,17 @@ - net6.0 + net7.0 NetworkPrimitives.Tests NetworkPrimitives.Tests + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + diff --git a/tests/NetworkPrimitives.Tests/NetworkPrimitives.Tests.Framework.csproj b/tests/NetworkPrimitives.Tests/NetworkPrimitives.Tests.Framework.csproj index 465e550..6ec26a5 100644 --- a/tests/NetworkPrimitives.Tests/NetworkPrimitives.Tests.Framework.csproj +++ b/tests/NetworkPrimitives.Tests/NetworkPrimitives.Tests.Framework.csproj @@ -5,10 +5,18 @@ NetworkPrimitives.Tests - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + +