Readme update & cleanup

* removing old net45 ifdefs and workarounds. (#223)
* update to readme
* fix linux build

Author: Michael Conrad

README.md

@@ -44,15 +44,14 @@ var ip = record?.Address;
 
 ### Supported resource records
 
-* A, AAAA, NS, CNAME, SOA, MB, MG, MR, WKS, HINFO, MINFO, MX, RP, TXT, AFSDB, URI, CAA, NULL, SSHFP, TLSA, RRSIG, NSEC, NSEC3, NSEC3PARAM, DNSKEY, DS
+* A, AAAA, NS, CNAME, SOA, MB, MG, MR, WKS, HINFO, MINFO, MX, RP, TXT, AFSDB, URI, CAA, NULL, SSHFP, TLSA, RRSIG, NSEC, NSEC3, NSEC3PARAM, DNSKEY, DS, NAPTR, CERT
 * PTR for reverse lookups
 * SRV for service discovery. `LookupClient` has some extensions to help with that.
 * AXFR zone transfer (as per spec, LookupClient has to be set to TCP mode only for this type. Also, the result depends on if the DNS server trusts your current connection)
 
 ## Build from Source
 
-To build and contribute to this project, you must have the latest [.NET 5 SDK](https://dotnet.microsoft.com/download) installed.
-Just clone the repository and open the solution in Visual Studio 2019.
+To build and contribute to this project, you must have the latest [.NET SDKs](https://dotnet.microsoft.com/download) and Visual Studio 2022 installed.
 
 ## Examples
 

azure-pipelines-ci.yml

@@ -41,8 +41,8 @@ jobs:
     inputs:
       command: 'test'
       projects: 'test/**/*.csproj'
-      publishTestResults: false      
-      arguments: '-c Release --no-build --no-restore -f netcoreapp3.1'
+      publishTestResults: true      
+      arguments: '-c Release --no-build --no-restore -f net6.0'
 
 - job: Windows
   displayName: 'Build & Test on Windows'

src/DnsClient/DnsClient.csproj

@@ -18,7 +18,7 @@
     <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
 
     <PackageId>DnsClient</PackageId>
-    <PackageTags>dns;client;stub;resolver;name;server;core;service;discovery</PackageTags>
+    <PackageTags>dns;client;resolver;servicediscovery</PackageTags>
 
     <PackageIcon>icon.png</PackageIcon>
     <PackageReadmeFile>README.md</PackageReadmeFile>

src/DnsClient/DnsTcpMessageHandler.cs

@@ -436,11 +436,7 @@ public void DisposeClient()
                 {
                     try
                     {
-#if !NET45
                         Client.Dispose();
-#else
-                        Client.Close();
-#endif
                     }
                     catch { }
                 }

src/DnsClient/Interop/Windows/IpHlpApi/FixedNetworkInformation.cs

@@ -8,8 +8,6 @@
 using System.Net;
 using System.Runtime.InteropServices;
 
-#if !NET45
-
 namespace DnsClient.Windows.IpHlpApi
 {
     internal class FixedNetworkInformation
@@ -82,4 +80,3 @@ public static FixedNetworkInformation GetFixedInformation()
         }
     }
 }
-#endif

src/DnsClient/Interop/Windows/NameResolutionPolicy.cs

@@ -12,8 +12,6 @@
 
 namespace DnsClient.Windows
 {
-#if !NET45
-
     internal static class NameResolutionPolicy
     {
         private static readonly char[] s_splitOn = new char[] { ';' };
@@ -133,5 +131,4 @@ private static void AddServers(HashSet<NameServer> nameServers, string[] names,
             }
         }
     }
-#endif
 }

src/DnsClient/NameServer.cs

@@ -245,7 +245,6 @@ public override int GetHashCode()
         /// </returns>
         public static IReadOnlyCollection<NameServer> ResolveNameServers(bool skipIPv6SiteLocal = true, bool fallbackToGooglePublicDns = true)
         {
-            // TODO: Use Array.Empty after dropping NET45
             IReadOnlyCollection<NameServer> nameServers = Array.Empty<NameServer>();
 
             var exceptions = new List<Exception>();
@@ -263,7 +262,6 @@ public static IReadOnlyCollection<NameServer> ResolveNameServers(bool skipIPv6Si
                 exceptions.Add(ex);
             }
 
-#if !NET45
             if (exceptions.Count > 0)
             {
                 logger?.LogDebug("Using native path to resolve servers.");
@@ -309,7 +307,6 @@ public static IReadOnlyCollection<NameServer> ResolveNameServers(bool skipIPv6Si
                 logger?.LogInformation(ex, "Resolving name servers from NRPT failed.");
             }
 
-#endif
             IReadOnlyCollection<NameServer> filtered = nameServers
                 .Where(p => (p.IPEndPoint.Address.AddressFamily == AddressFamily.InterNetwork
                             || p.IPEndPoint.Address.AddressFamily == AddressFamily.InterNetworkV6)
@@ -349,8 +346,6 @@ public static IReadOnlyCollection<NameServer> ResolveNameServers(bool skipIPv6Si
             return filtered;
         }
 
-#if !NET45
-
         /// <summary>
         /// Using my custom native implementation to support UWP apps and such until <see cref="NetworkInterface.GetAllNetworkInterfaces"/>
         /// gets an implementation in netstandard2.1.
@@ -410,8 +405,6 @@ public static IReadOnlyCollection<NameServer> ResolveNameResolutionPolicyServers
             return NameResolutionPolicy.Resolve();
         }
 
-#endif
-
         internal static IReadOnlyCollection<NameServer> ValidateNameServers(IReadOnlyCollection<NameServer> servers, ILogger logger = null)
         {
             // Right now, I'm only checking for ANY address, but might be more validation rules at some point...

src/DnsClient/Protocol/RRSigRecord.cs

@@ -153,8 +153,8 @@ public RRSigRecord(
             Algorithm = (DnsSecurityAlgorithm)algorithm;
             Labels = labels;
             OriginalTtl = originalTtl;
-            SignatureExpiration = FromUnixTimeSeconds(signatureExpiration);
-            SignatureInception = FromUnixTimeSeconds(signatureInception);
+            SignatureExpiration = DateTimeOffset.FromUnixTimeSeconds(signatureExpiration);
+            SignatureInception = DateTimeOffset.FromUnixTimeSeconds(signatureInception);
             KeyTag = keyTag;
             SignersName = signersName ?? throw new ArgumentNullException(nameof(signersName));
             Signature = signature ?? throw new ArgumentNullException(nameof(signature));
@@ -175,12 +175,5 @@ private protected override string RecordToString()
                 SignersName,
                 SignatureAsString);
         }
-
-        // DateTimeOffset does have that method build in .NET47+ but not .NET45 which we will support. TODO: delete this when we drop support for .NET 4.5
-        private static DateTimeOffset FromUnixTimeSeconds(long seconds)
-        {
-            long ticks = seconds * TimeSpan.TicksPerSecond + new DateTime(1970, 1, 1, 0, 0, 0).Ticks;
-            return new DateTimeOffset(ticks, TimeSpan.Zero);
-        }
     }
-}
+}

test-other/OldReference/OldReference.csproj

@@ -7,12 +7,6 @@
     <NoWarn>CA1707</NoWarn>
   </PropertyGroup>
 
-  <ItemGroup>
-  </ItemGroup>
-  <!--<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
-    <PackageReference Include="DnsClient" Version="1.1.0" />
-  </ItemGroup>-->
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
     <PackageReference Include="DnsClient" Version="1.1.0" />
   </ItemGroup>

test/DnsClient.Tests/UdpServer.cs

@@ -67,11 +67,7 @@ protected virtual void DataReceivedInternal(IPEndPoint receivedEndPoint, byte[]
 
         public void Dispose()
         {
-#if !NET45
             _client.Dispose();
-#else
-            _client.Close();
-#endif
 
             _disposed = true;
         }