Upgrade to .NET 7; code cleanup.

Author: cerebrate

Arkane.Zeroconf/AddressProtocol.cs

@@ -1,17 +1,16 @@
 #region header
 
-// Arkane.Zeroconf - AddressProtocol.cs
+// Arkane.ZeroConf - AddressProtocol.cs
 // 
 
 #endregion
 
 // ReSharper disable InconsistentNaming
-namespace ArkaneSystems.Arkane.Zeroconf
+namespace ArkaneSystems.Arkane.Zeroconf ;
+
+public enum AddressProtocol
 {
-    public enum AddressProtocol
-    {
-        Any,
-        IPv4,
-        IPv6
-    }
+    Any,
+    IPv4,
+    IPv6,
 }

Arkane.Zeroconf/Arkane.Zeroconf.csproj

@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netcoreapp7.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>1.2.0</Version>
+    <Version>1.3.0</Version>
     <Authors>Arkane Systems</Authors>
     <Company>Arkane Systems</Company>
     <Product />
@@ -14,7 +14,7 @@ Please see project web site for more information.</Description>
     <PackageProjectUrl>https://github.com/cerebrate/Arkane.Zeroconf</PackageProjectUrl>
     <Copyright>MIT License</Copyright>
     <PackageTags>zeroconf bonjour</PackageTags>
-    <PackageReleaseNotes>Converted to .NET Standard. Projects for which this is not suitable should continue to use 1.0.</PackageReleaseNotes>
+    <PackageReleaseNotes>Converted to .NET Core. Projects for which this is not suitable should continue to use 1.2.</PackageReleaseNotes>
     <AssemblyName>Arkane.Zeroconf</AssemblyName>
     <RootNamespace>ArkaneSystems.Arkane.Zeroconf</RootNamespace>
     <SignAssembly>true</SignAssembly>

Arkane.Zeroconf/IRegisterService.cs

@@ -1,6 +1,6 @@
 #region header
 
-// Arkane.Zeroconf - IRegisterService.cs
+// Arkane.ZeroConf - IRegisterService.cs
 // 
 
 #endregion
@@ -11,22 +11,21 @@
 
 #endregion
 
-namespace ArkaneSystems.Arkane.Zeroconf
+namespace ArkaneSystems.Arkane.Zeroconf ;
+
+public interface IRegisterService : IService, IDisposable
 {
-    public interface IRegisterService : IService, IDisposable
-    {
-        new string Name { get ; set ; }
+    new string Name { get ; set ; }
 
-        new string RegType { get ; set ; }
+    new string RegType { get ; set ; }
 
-        new string ReplyDomain { get ; set ; }
+    new string ReplyDomain { get ; set ; }
 
-        short Port { get ; set ; }
+    short Port { get ; set ; }
 
-        ushort UPort { get ; set ; }
+    ushort UPort { get ; set ; }
 
-        event RegisterServiceEventHandler Response ;
+    event RegisterServiceEventHandler Response ;
 
-        void Register () ;
-    }
+    void Register () ;
 }

Arkane.Zeroconf/IResolvableService.cs

@@ -1,6 +1,6 @@
 #region header
 
-// Arkane.Zeroconf - IResolvableService.cs
+// Arkane.ZeroConf - IResolvableService.cs
 // 
 
 #endregion
@@ -11,24 +11,23 @@
 
 #endregion
 
-namespace ArkaneSystems.Arkane.Zeroconf
+namespace ArkaneSystems.Arkane.Zeroconf ;
+
+public interface IResolvableService : IService
 {
-    public interface IResolvableService : IService
-    {
-        string FullName { get ; }
+    string FullName { get ; }
 
-        IPHostEntry HostEntry { get ; }
+    IPHostEntry HostEntry { get ; }
 
-        string HostTarget { get ; }
+    string HostTarget { get ; }
 
-        uint NetworkInterface { get ; }
+    uint NetworkInterface { get ; }
 
-        AddressProtocol AddressProtocol { get ; }
+    AddressProtocol AddressProtocol { get ; }
 
-        short Port { get ; }
+    short Port { get ; }
 
-        event ServiceResolvedEventHandler Resolved ;
+    event ServiceResolvedEventHandler Resolved ;
 
-        void Resolve () ;
-    }
+    void Resolve () ;
 }

Arkane.Zeroconf/IService.cs

@@ -1,20 +1,19 @@
 #region header
 
-// Arkane.Zeroconf - IService.cs
+// Arkane.ZeroConf - IService.cs
 // 
 
 #endregion
 
-namespace ArkaneSystems.Arkane.Zeroconf
+namespace ArkaneSystems.Arkane.Zeroconf ;
+
+public interface IService
 {
-    public interface IService
-    {
-        string Name { get ; }
+    string Name { get ; }
 
-        string RegType { get ; }
+    string RegType { get ; }
 
-        string ReplyDomain { get ; }
+    string ReplyDomain { get ; }
 
-        ITxtRecord TxtRecord { get ; set ; }
-    }
+    ITxtRecord TxtRecord { get ; set ; }
 }

Arkane.Zeroconf/IServiceBrowser.cs

@@ -1,6 +1,6 @@
 #region header
 
-// Arkane.Zeroconf - IServiceBrowser.cs
+// Arkane.ZeroConf - IServiceBrowser.cs
 // 
 
 #endregion
@@ -12,14 +12,13 @@
 
 #endregion
 
-namespace ArkaneSystems.Arkane.Zeroconf
+namespace ArkaneSystems.Arkane.Zeroconf ;
+
+public interface IServiceBrowser : IEnumerable <IResolvableService>, IDisposable
 {
-    public interface IServiceBrowser : IEnumerable <IResolvableService>, IDisposable
-    {
-        event ServiceBrowseEventHandler ServiceAdded ;
+    event ServiceBrowseEventHandler ServiceAdded ;
 
-        event ServiceBrowseEventHandler ServiceRemoved ;
+    event ServiceBrowseEventHandler ServiceRemoved ;
 
-        void Browse (uint interfaceIndex, AddressProtocol addressProtocol, string regtype, string domain) ;
-    }
+    void Browse (uint interfaceIndex, AddressProtocol addressProtocol, string regtype, string domain) ;
 }

Arkane.Zeroconf/ITxtRecord.cs

@@ -1,6 +1,6 @@
 #region header
 
-// Arkane.Zeroconf - ITxtRecord.cs
+// Arkane.ZeroConf - ITxtRecord.cs
 // 
 
 #endregion
@@ -12,24 +12,23 @@
 
 #endregion
 
-namespace ArkaneSystems.Arkane.Zeroconf
+namespace ArkaneSystems.Arkane.Zeroconf ;
+
+public interface ITxtRecord : IEnumerable, IDisposable
 {
-    public interface ITxtRecord : IEnumerable, IDisposable
-    {
-        TxtRecordItem this [string key] { get ; }
+    TxtRecordItem this [string key] { get ; }
 
-        int Count { get ; }
+    int Count { get ; }
 
-        ITxtRecord BaseRecord { get ; }
+    ITxtRecord BaseRecord { get ; }
 
-        void Add (string key, string value) ;
+    void Add (string key, string value) ;
 
-        void Add (string key, byte[] value) ;
+    void Add (string key, byte[] value) ;
 
-        void Add (TxtRecordItem item) ;
+    void Add (TxtRecordItem item) ;
 
-        void Remove (string key) ;
+    void Remove (string key) ;
 
-        TxtRecordItem GetItemAt (int index) ;
-    }
+    TxtRecordItem GetItemAt (int index) ;
 }