binarycow · binarycow · Oct 8, 2022
diff --git a/benchmarks/NetworkPrimitives.Benchmarks.csproj b/benchmarks/NetworkPrimitives.Benchmarks.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net48;net5.0;net6.0;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0;net5.0;netcoreapp3.1;net48;</TargetFrameworks>
  </PropertyGroup>
   <PropertyGroup>
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -13,9 +13,9 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
-    <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.1" />
-    <PackageReference Include="IPNetwork2" Version="2.5.381" Aliases="Lib_IPN2" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.2" />
+    <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.2" />
+    <PackageReference Include="IPNetwork2" Version="2.6.472" Aliases="Lib_IPN2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\src\NetworkPrimitives\NetworkPrimitives.csproj" />

diff --git 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);
     }
 }
diff --git a/global.json b/global.json
@@ -1,7 +1,7 @@
 {
   "sdk": {
-    "version": "5.0",
+    "version": "7.0.0",
     "rollForward": "latestMajor",
-    "allowPrerelease": false
+    "allowPrerelease": true
   }
 }
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -2,7 +2,7 @@
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net5.0;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0;net5.0;netstandard2.0</TargetFrameworks>
     <Version>1.1.0</Version>
     <PackageTags>network; networking; subnet; ip-address; ipaddress; ip address; mac address; networking.primitives; network.primitives; primitives;</PackageTags>
     <Description>Lightweight package for working with networking types such as IPv4 addresses, IPv6 addresses, ranges, and subnets.</Description>

diff --git a/src/NetworkPrimitives.JsonConverters/NetworkPrimitives.JsonConverters.csproj b/src/NetworkPrimitives.JsonConverters/NetworkPrimitives.JsonConverters.csproj
@@ -16,8 +16,8 @@
   -->
 
   <ItemGroup>
-    <PackageReference Include="NetworkPrimitives" Version="1.*" />
-    <PackageReference Include="System.Text.Json" Version="6.0.0" />
+    <PackageReference Include="NetworkPrimitives" Version="1.1.0" />
+    <PackageReference Include="System.Text.Json" Version="6.0.6" />
   </ItemGroup>
 
 </Project>
diff --git a/src/NetworkPrimitives/Ipv4/Address/Ipv4Address.cs b/src/NetworkPrimitives/Ipv4/Address/Ipv4Address.cs
@@ -286,6 +286,7 @@ public static Ipv4Address Parse(string? ipString)
         /// <exception cref="ArgumentException">
         ///     <paramref name="ipAddress"/> is not <see cref="AddressFamily.InterNetwork"/>
         /// </exception>
+        // 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
@@ -4,6 +4,7 @@
 using System.Runtime.InteropServices;
 using NetworkPrimitives.Utilities;
 
+#pragma warning disable CS1591
 namespace NetworkPrimitives.Ipv6
 {
     public readonly struct Ipv6Address : IEquatable<Ipv6Address>// , IFormattable

diff --git 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<Ipv6Cidr>

diff --git 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<Ipv6Subnet>

diff --git 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<Ipv6SubnetMask>

diff --git a/src/NetworkPrimitives/NetworkPrimitives.csproj b/src/NetworkPrimitives/NetworkPrimitives.csproj
@@ -24,13 +24,13 @@
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
-    <PackageReference Include="System.Memory" Version="4.5.4" />
-    <PackageReference Include="IsExternalInit" Version="1.0.1">
+    <PackageReference Include="System.Memory" Version="4.5.5" />
+    <PackageReference Include="IsExternalInit" Version="1.0.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="IndexRange" Version="1.0.1-beta.1" />
-    <PackageReference Include="Nullable" Version="1.3.0">
+    <PackageReference Include="IndexRange" Version="1.0.2" />
+    <PackageReference Include="Nullable" Version="1.3.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/tests/NetworkPrimitives.Tests/NetworkPrimitives.Tests.Core.csproj b/tests/NetworkPrimitives.Tests/NetworkPrimitives.Tests.Core.csproj
@@ -1,7 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <AssemblyName>NetworkPrimitives.Tests</AssemblyName>
     <RootNamespace>NetworkPrimitives.Tests</RootNamespace>
   </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Update="NUnit" Version="3.13.3" />
+    <PackageReference Update="NUnit3TestAdapter" Version="4.2.1" />
+    <PackageReference Update="coverlet.collector" Version="3.1.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Update="NunitXml.TestLogger" Version="3.0.127" />
+  </ItemGroup>
 </Project>
diff --git a/tests/NetworkPrimitives.Tests/NetworkPrimitives.Tests.Framework.csproj b/tests/NetworkPrimitives.Tests/NetworkPrimitives.Tests.Framework.csproj
@@ -5,10 +5,18 @@
     <RootNamespace>NetworkPrimitives.Tests</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="IsExternalInit" Version="1.0.1">
+    <PackageReference Include="IsExternalInit" Version="1.0.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="System.Text.Json" Version="6.0.0" />
+    <PackageReference Include="System.Text.Json" Version="6.0.6" />
+    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Update="NUnit" Version="3.13.3" />
+    <PackageReference Update="NUnit3TestAdapter" Version="4.2.1" />
+    <PackageReference Update="coverlet.collector" Version="3.1.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Update="NunitXml.TestLogger" Version="3.0.127" />
   </ItemGroup>
 </Project>