updated dependencies. Expose Win32 BluetoothRadio properties

inthehand · Apr 22, 2021 · fe8c762 · fe8c762
1 parent 44795bd
commit fe8c762
Show file tree

Hide file tree

Showing 35 changed files with 988 additions and 467 deletions.
diff --git a/32feet.sln b/32feet.sln
diff --git a/InTheHand.BluetoothLE/InTheHand.BluetoothLE.csproj b/InTheHand.BluetoothLE/InTheHand.BluetoothLE.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
+<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;monoandroid81;xamarin.ios10;xamarin.tvos10;xamarin.watchos10;xamarin.mac20;uap10.0;netcoreapp3.1;net461</TargetFrameworks>
@@ -38,7 +38,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="MSBuild.Sdk.Extras" Version="2.1.2" PrivateAssets="All" />
+    <PackageReference Include="MSBuild.Sdk.Extras" Version="3.0.23" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>
@@ -74,7 +74,7 @@
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'monoandroid81' ">
-    <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">

diff --git a/InTheHand.BluetoothLE/Platforms/Windows/GattCharacteristic.windows.cs b/InTheHand.BluetoothLE/Platforms/Windows/GattCharacteristic.windows.cs
@@ -125,8 +125,14 @@ private async Task PlatformStartNotifications()
             else
                 return;
 
-            var result = await _characteristic.WriteClientCharacteristicConfigurationDescriptorAsync(value);
-
+            try
+            {
+                var result = await _characteristic.WriteClientCharacteristicConfigurationDescriptorAsync(value);
+            }
+            catch(UnauthorizedAccessException ex)
+            {
+                // not supported
+            }
             return;
         }
 

diff --git a/InTheHand.Net.Bluetooth/InTheHand.Net.Bluetooth.csproj b/InTheHand.Net.Bluetooth/InTheHand.Net.Bluetooth.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
+<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;netcoreapp3.1;net461;monoandroid90;Xamarin.iOS10;uap10.0</TargetFrameworks>
@@ -36,7 +36,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="MSBuild.Sdk.Extras" Version="2.1.2" PrivateAssets="All" />
+    <PackageReference Include="MSBuild.Sdk.Extras" Version="3.0.23" PrivateAssets="All" />
   </ItemGroup>
   <ItemGroup>
     <Compile Remove="Platforms\**\*.*" />
@@ -75,7 +75,7 @@
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'monoandroid90' ">
-    <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">

diff --git a/InTheHand.Net.Bluetooth/Platforms/Win32/BluetoothRadio.win32.cs b/InTheHand.Net.Bluetooth/Platforms/Win32/BluetoothRadio.win32.cs
@@ -2,7 +2,7 @@
 //
 // InTheHand.Net.Bluetooth.BluetoothRadio (Win32)
 // 
-// Copyright (c) 2003-2020 In The Hand Ltd, All rights reserved.
+// Copyright (c) 2003-2021 In The Hand Ltd, All rights reserved.
 // This source code is licensed under the MIT License
 
 using InTheHand.Net.Bluetooth.Win32;
@@ -105,6 +105,28 @@ private void SetMode(RadioMode value)
             }
         }
 
+        /// <summary>
+        /// Manufacturer's revision number of the LMP implementation.
+        /// </summary>
+        public int LmpSubversion
+        {
+            get
+            {
+                return _radio.lmpSubversion;
+            }
+        }
+
+        /// <summary>
+        /// Returns the manufacturer of the BluetoothRadio device.
+        /// </summary>
+        public ushort Manufacturer
+        {
+            get
+            {
+                return _radio.manufacturer;
+            }
+        }
+
         #region IDisposable Support
         private bool disposedValue = false; // To detect redundant calls
 
@@ -128,4 +150,4 @@ void Dispose(bool disposing)
 
         #endregion
     }
-}
+}
diff --git a/InTheHand.Net.IrDA/IrDAClient.cs b/InTheHand.Net.IrDA/IrDAClient.cs
@@ -487,7 +487,6 @@ public void Connect(IrDAEndPoint remoteEP)
         /// <exception cref="T:System.Net.Sockets.SocketException">
         /// A connection could not be formed.  See the exception message or 
         /// <see cref="P:System.Net.Sockets.SocketException.SocketErrorCode"/> 
-        /// (or <see cref="P:System.Net.Sockets.SocketException.ErrorCode"/> on NETCF) 
         /// for what error occurred.
         /// </exception>
         public void Connect(string service)

diff --git a/InTheHand.Net.Obex/InTheHand.Net.Obex.csproj b/InTheHand.Net.Obex/InTheHand.Net.Obex.csproj
@@ -43,7 +43,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="InTheHand.Net.Bluetooth" Version="4.0.12" />
+    <PackageReference Include="InTheHand.Net.Bluetooth" Version="4.0.15" />
     <PackageReference Include="InTheHand.Net.IrDA" Version="4.0.1" />
   </ItemGroup>
 

diff --git a/InTheHand.Nfc/InTheHand.Nfc.csproj b/InTheHand.Nfc/InTheHand.Nfc.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
+<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;uap10.0;monoandroid90;Xamarin.iOS10</TargetFrameworks>
@@ -12,7 +12,7 @@
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <PackageProjectUrl>https://github.com/inthehand/32feet</PackageProjectUrl>
-    <Copyright>Copyright (c) 2020 In The Hand Ltd</Copyright>
+    <Copyright>Copyright (c) 2020-21 In The Hand Ltd</Copyright>
     <Description>32feet.NET is an open-source project to make personal area networking technologies such as Bluetooth easily accessible from .NET code.</Description>
     <FileVersion>1.0.1.908</FileVersion>
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
@@ -30,11 +30,11 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="MSBuild.Sdk.Extras" Version="2.1.2" PrivateAssets="All" /> 
+    <PackageReference Include="MSBuild.Sdk.Extras" Version="3.0.23" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'monoandroid90'">
-    <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Samples/BluetoothClassicConsole/Program.cs b/Samples/BluetoothClassicConsole/Program.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -17,14 +18,28 @@ static void Main(string[] args)
             BluetoothDeviceInfo device = null;
             foreach(var dev in client.DiscoverDevices())
             {
-                if(dev.DeviceName.Contains("RequiredName"))
+                if(dev.DeviceName.Contains("PREFIX"))
                 {
                     device = dev;
                     break;
                 }
             }
 
+            if (!device.Authenticated)
+            {
+                BluetoothSecurity.PairRequest(device.DeviceAddress, "1234");
+            }
+
+            device.Refresh();
+            System.Diagnostics.Debug.WriteLine(device.Authenticated);
+
             client.Connect(device.DeviceAddress, BluetoothService.SerialPort);
+
+            var stream = client.GetStream();
+            StreamWriter sw = new StreamWriter(stream, System.Text.Encoding.ASCII);
+            sw.WriteLine("Hello world!\r\n\r\n");
+            sw.Close();
+
             client.Close();
         }
     }

diff --git a/Samples/NfcReaderApp/NfcReaderApp.Android/NfcReaderApp.Android.csproj b/Samples/NfcReaderApp/NfcReaderApp.Android/NfcReaderApp.Android.csproj
@@ -57,8 +57,8 @@
     <Reference Include="System.Numerics.Vectors" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="4.6.0.1141" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2012" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MainActivity.cs" />

diff --git a/Samples/NfcReaderApp/NfcReaderApp.UWP/NfcReaderApp.UWP.csproj b/Samples/NfcReaderApp/NfcReaderApp.UWP/NfcReaderApp.UWP.csproj
@@ -143,16 +143,22 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="4.6.0.1141" />
-    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.1.9"/>
-    <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2012" />
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.1.9" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NfcReaderApp\NfcReaderApp.csproj">
       <Project>{A9CCD2EB-AA98-4BF8-9004-E7C541331BDA}</Project>
       <Name>NfcReaderApp</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Reference Include="InTheHand.Nfc, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\InTheHand.Nfc\bin\Debug\uap10.0\InTheHand.Nfc.dll</HintPath>
+    </Reference>
+  </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>

diff --git a/Samples/NfcReaderApp/NfcReaderApp.UWP/Package.appxmanifest b/Samples/NfcReaderApp/NfcReaderApp.UWP/Package.appxmanifest
@@ -51,5 +51,6 @@
 
   <Capabilities>
     <Capability Name="internetClient" />
+    <DeviceCapability Name="proximity"/>
   </Capabilities>
 </Package>
diff --git a/Samples/NfcReaderApp/NfcReaderApp.iOS/NfcReaderApp.iOS.csproj b/Samples/NfcReaderApp/NfcReaderApp.iOS/NfcReaderApp.iOS.csproj
@@ -125,8 +125,8 @@
     <Reference Include="System.Numerics.Vectors" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="4.6.0.1141" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2012" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
   <ItemGroup>

diff --git a/Samples/NfcReaderApp/NfcReaderApp/MainPage.xaml.cs b/Samples/NfcReaderApp/NfcReaderApp/MainPage.xaml.cs
@@ -50,7 +50,7 @@ private async void Button_Clicked(object sender, EventArgs e)
             options.Signal = cts.Token;
             await reader.ScanAsync(options);
 
-            cts.CancelAfter(30000);
+            //cts.CancelAfter(30000);
         }
     }
 }
diff --git a/Samples/NfcReaderApp/NfcReaderApp/NfcReaderApp.csproj b/Samples/NfcReaderApp/NfcReaderApp/NfcReaderApp.csproj
@@ -11,8 +11,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="4.6.0.1141" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2012" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Samples/RfcommXamarinForms/RfcommXamarinForms.Android/Properties/AssemblyInfo.cs b/Samples/RfcommXamarinForms/RfcommXamarinForms.Android/Properties/AssemblyInfo.cs
@@ -11,7 +11,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("RfcommXamarinForms.Android")]
-[assembly: AssemblyCopyright("Copyright ©  2014")]
+[assembly: AssemblyCopyright("Copyright © In The Hand Ltd 2014-21")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]