integrated upf65 updates (microsoft#55)

mklemarczyk · Jun 23, 2021 · 579a918 · 579a918
1 parent 4bb1643
commit 579a918
Show file tree

Hide file tree

Showing 58 changed files with 3,686 additions and 1,175 deletions.
diff --git a/BluetoothLEExplorer/BluetoothLEExplorer.sln b/BluetoothLEExplorer/BluetoothLEExplorer.sln
@@ -99,6 +99,7 @@ Global
 		{AD1CBE3C-A68A-4E02-8001-E02B815560EE}.Release|x86.Deploy.0 = Release|x86
 		{6F503DF9-71C9-4340-90BB-D9AA14ADB686}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{6F503DF9-71C9-4340-90BB-D9AA14ADB686}.Debug|Any CPU.Build.0 = Debug|x86
+		{6F503DF9-71C9-4340-90BB-D9AA14ADB686}.Debug|Any CPU.Deploy.0 = Debug|x86
 		{6F503DF9-71C9-4340-90BB-D9AA14ADB686}.Debug|ARM.ActiveCfg = Debug|ARM
 		{6F503DF9-71C9-4340-90BB-D9AA14ADB686}.Debug|ARM.Build.0 = Debug|ARM
 		{6F503DF9-71C9-4340-90BB-D9AA14ADB686}.Debug|ARM.Deploy.0 = Debug|ARM

diff --git a/BluetoothLEExplorer/BluetoothLEExplorer/App.xaml.cs b/BluetoothLEExplorer/BluetoothLEExplorer/App.xaml.cs
@@ -103,7 +103,7 @@ private void App_Resuming(object sender, object e)
             }
         }
 
-        private void App_UnhandledException(object sender, UnhandledExceptionEventArgs e)
+        private void App_UnhandledException(object sender, Windows.UI.Xaml.UnhandledExceptionEventArgs e)
         {
             showDialog(e.Exception.Message + "\n\n" + e.Exception.StackTrace);
         }

diff --git a/BluetoothLEExplorer/BluetoothLEExplorer/BluetoothLEExplorer.csproj b/BluetoothLEExplorer/BluetoothLEExplorer/BluetoothLEExplorer.csproj
@@ -11,8 +11,8 @@
     <AssemblyName>BluetoothLEExplorer</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.17134.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.15063.0</TargetPlatformMinVersion>
+    <TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile>
     <FileAlignment>512</FileAlignment>
@@ -113,28 +113,35 @@
     <Compile Include="Models\DisposableObservableCollection.cs" />
     <Compile Include="Models\GattSampleContext.cs" />
     <Compile Include="Models\HidHelper.cs" />
+    <Compile Include="Models\ObservableBluetoothLEAdvertisement.cs" />
+    <Compile Include="Models\ObservableBluetoothLEAdvertisementFilter.cs" />
+    <Compile Include="Models\ObservableBluetoothLEBeacon.cs" />
     <Compile Include="Models\ObservableBluetoothLEDevice.cs" />
     <Compile Include="Models\ObservableGattCharacteristics.cs" />
     <Compile Include="Models\ObservableGattDescriptors.cs" />
     <Compile Include="Models\ObservableGattDeviceService.cs" />
     <Compile Include="Models\ObservableHidClient.cs" />
     <Compile Include="Models\VirtualKeyboard.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Services\AdvertisementService\AdvertisementDataTypeService.cs" />
     <Compile Include="Services\Converters\Converters.cs" />
     <Compile Include="Services\DispatcherService\DispatcherService.cs" />
     <Compile Include="Services\GattUuidsService\GattUuidsService.cs" />
     <Compile Include="Services\Other\BytePadder.cs" />
     <Compile Include="Services\Other\GattProtocolErrorParser.cs" />
     <Compile Include="Services\SettingsServices\SettingsService.cs" />
     <Compile Include="Services\ToastService\ToastService.cs" />
+    <Compile Include="ViewModels\AdvertisementBeaconDetailsPageViewModel.cs" />
+    <Compile Include="ViewModels\AdvertisementMonitorPageViewModel.cs" />
+    <Compile Include="ViewModels\AdvertisementPageViewModel.cs" />
     <Compile Include="ViewModels\ServicePageViewModel.cs" />
     <Compile Include="ViewModels\Services\AlertNotificationServicePageViewModel.cs" />
     <Compile Include="ViewModels\Services\BloodPressureServicePageViewModel.cs" />
     <Compile Include="ViewModels\Services\CurrentTimeServicePageViewModel.cs" />
     <Compile Include="ViewModels\Services\HeartRateServicePageViewModel.cs" />
     <Compile Include="ViewModels\ShellViewModel.cs" />
     <Compile Include="ViewModels\Services\BatteryServicePageViewModel.cs" />
-    <Compile Include="ViewModels\BeaconViewModel.cs" />
+    <Compile Include="ViewModels\AdvertisementBeaconPageViewModel.cs" />
     <Compile Include="ViewModels\CharacteristicPageViewModel.cs" />
     <Compile Include="ViewModels\DeviceServicesPageViewModel.cs" />
     <Compile Include="ViewModels\DiscoverViewModel.cs" />
@@ -144,6 +151,19 @@
     <Compile Include="ViewModels\GenericGattCharacteristicViewModel.cs" />
     <Compile Include="ViewModels\VirtualKeyboardPageViewModel.cs" />
     <Compile Include="ViewModels\VirtualPeripheralPageViewModel.cs" />
+    <Compile Include="Views\AdvertisementBeaconDetailsPage.xaml.cs">
+      <DependentUpon>AdvertisementBeaconDetailsPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\AdvertisementPage.xaml.cs">
+      <DependentUpon>AdvertisementPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\AdvertisementMonitorPage.xaml.cs">
+      <DependentUpon>AdvertisementMonitorPage.xaml</DependentUpon>
+    </Compile>
+    <Page Include="Views\ServicePage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Compile Include="Views\ServicePage.xaml.cs">
       <DependentUpon>ServicePage.xaml</DependentUpon>
     </Compile>
@@ -165,8 +185,8 @@
     <Compile Include="Views\Services\BatteryServicePage.xaml.cs">
       <DependentUpon>BatteryServicePage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\Beacon.xaml.cs">
-      <DependentUpon>Beacon.xaml</DependentUpon>
+    <Compile Include="Views\AdvertisementBeaconPage.xaml.cs">
+      <DependentUpon>AdvertisementBeaconPage.xaml</DependentUpon>
     </Compile>
     <Compile Include="Views\Busy.xaml.cs">
       <DependentUpon>Busy.xaml</DependentUpon>
@@ -242,9 +262,17 @@
       <Generator>MSBuild:Compile</Generator>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Page>
-    <Page Include="Views\ServicePage.xaml">
+    <Page Include="Views\AdvertisementBeaconDetailsPage.xaml">
+      <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\AdvertisementPage.xaml">
       <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\AdvertisementMonitorPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
     </Page>
     <Page Include="Views\Services\AlertNotificationServicePage.xaml">
       <Generator>MSBuild:Compile</Generator>
@@ -270,7 +298,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Views\Beacon.xaml">
+    <Page Include="Views\AdvertisementBeaconPage.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>

diff --git a/BluetoothLEExplorer/BluetoothLEExplorer/Models/DisposableObservableCollection.cs b/BluetoothLEExplorer/BluetoothLEExplorer/Models/DisposableObservableCollection.cs
@@ -1,12 +1,9 @@
-// <copyright file="ObservableBluetoothLEDevice.cs" company="Microsoft Corporation">
+// <copyright file="DisposableObservableCollection.cs" company="Microsoft Corporation">
 // Copyright (c) Microsoft Corporation.  All rights reserved.
 // </copyright>
 //----------------------------------------------------------------------------------------------
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Collections.ObjectModel;
 
 namespace BluetoothLEExplorer.Models
@@ -60,4 +57,4 @@ public void Dispose()
             temp.Dispose();
         }
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -103,7 +103,7 @@ private void App_Resuming(object sender, object e) @@
                 }
             }
-            private void App_UnhandledException(object sender, UnhandledExceptionEventArgs e)
+            private void App_UnhandledException(object sender, Windows.UI.Xaml.UnhandledExceptionEventArgs e)
             {
                 showDialog(e.Exception.Message + "\n\n" + e.Exception.StackTrace);
             }
@@ Expand Down @@