v1.0.4 commit

Author: scaryghost

README.md

@@ -10,7 +10,7 @@ PM> Install-Package Warble.Net
 
 Or add a **PackageReference** tag to your *.csproj file:
 ```xml
-<PackageReference Include="Warble.Net" Version="[1.0, 2.0)" />
+<PackageReference Include="Warble.Net" Version="[1.0.4, 2.0)" />
 ```
 
 Linux developers will also need to build Warble on their machine and place the .so files in the appropriate folders.  

Warble.NetStandard/Gatt.cs

@@ -35,13 +35,13 @@ public Gatt(string mac, string hci = null, string addrType = null) {
             options[0].key = "mac";
             options[0].value = mac;
             if (hci != null && RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) {
-                options[1].key = "hci";
-                options[1].value = hci;
+                options[actualSize].key = "hci";
+                options[actualSize].value = hci;
                 actualSize++;
             }
             if (addrType != null) {
-                options[2].key = "address-type";
-                options[2].value = addrType;
+                options[actualSize].key = "address-type";
+                options[actualSize].value = addrType;
                 actualSize++;
             }
 

Warble.NetStandard/GattChar.cs

@@ -13,7 +13,7 @@ public class GattChar {
         /// </summary>
         public String Uuid { get => Marshal.PtrToStringAnsi(warble_gattchar_get_uuid(WarbleGattChar)); }
         /// <summary>
-        /// Handler to process characteristic notifications
+        /// Handler to process characteristic notifications, <see cref="EnableNotificationsAsync"/>
         /// </summary>
         public Action<byte[]> OnNotificationReceived { get; set; }
 
@@ -102,20 +102,29 @@ private async Task EditNotification(Action<FnVoid_VoidP_WarbleGattCharP_CharP> f
             await warbleTaskSrc.Task;
         }
         /// <summary>
-        /// Enables characteristic notifications, which are forwarded to <see cref="OnNotificationReceived"/>
+        /// Enables characteristic notifications, which are forwarded to the <see cref="OnNotificationReceived"/> delegate
         /// </summary>
         /// <returns>Null when notifications are enabled</returns>
         /// <exception cref="WarbleException">If notify enable operation fails</exception>
-        public Task EnableNotifications() {
+        public Task EnableNotificationsAsync() {
             return EditNotification(completed => warble_gattchar_enable_notifications_async(WarbleGattChar, IntPtr.Zero, completed));
         }
         /// <summary>
         /// Disables characteristic notifications 
         /// </summary>
         /// <returns>Null when notifications are disabled</returns>
         /// <exception cref="WarbleException">If notify disable operation fails</exception>
-        public Task DisableNotifications() {
+        public Task DisableNotificationsAsync() {
             return EditNotification(completed => warble_gattchar_disable_notifications_async(WarbleGattChar, IntPtr.Zero, completed));
         }
+
+        [Obsolete("Deprecated in v1.0.4, use EnableNotificationsAsync instead")]
+        public Task EnableNotifications() {
+            return EnableNotificationsAsync();
+        }
+        [Obsolete("Deprecated in v1.0.4, use DisableNotificationsAsync instead")]
+        public Task DisableNotifications() {
+            return DisableNotificationsAsync();
+        }
     }
 }

Warble.NetStandard/Warble.NetStandard.csproj

@@ -5,8 +5,9 @@
     <AssemblyName>Warble.NetStandard</AssemblyName>
     <RootNamespace>MbientLab.Warble</RootNamespace>
     <SignAssembly>false</SignAssembly>
-    <AssemblyOriginatorKeyFile>mbientlab.pfx</AssemblyOriginatorKeyFile>
-    <DelaySign>false</DelaySign>
+    <Version>1.0.4</Version>
+    <NeutralLanguage>en-US</NeutralLanguage>
+    <AssemblyVersion>1.0.0.0</AssemblyVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

clibs/warble

@@ -3,15 +3,15 @@
   <metadata minClientVersion="4.1">
     <id>Warble.Net</id>
     <title>Warble.Net</title>
-    <version>1.0.0</version>
+    <version>1.0.4</version>
     <authors>MbientLab</authors>
     <owners>MbientLab</owners>
     <licenseUrl>https://mbientlab.com/license/</licenseUrl>
     <projectUrl>https://github.com/mbientlab/Warble.NET</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <copyright>Copyright 2018(c). MbientLab Inc</copyright>
     <summary>.NET Standard C# Bluetooth LE API</summary>
-    <description>Warble.NET provides a platform agnostic C# API for both Linux and Windows 10.</description>
+    <description>Warble.NET provides a platform agnostic C# API around the Warble C library</description>
     <tags>bluetoothle netstandard2.0 native</tags>
   </metadata>
   <files>
@@ -20,4 +20,4 @@
     <file src="..\clibs\warble\vs2017\Release\warble.dll" target="runtimes\win10-x86\native" />
     <file src="..\clibs\warble\vs2017\x64\Release\warble.dll" target="runtimes\win10-x64\native" />
   </files>
-</package>
+</package>