Updates to examples.

Author: StephenHidem

Examples/MAUI-gRPC/MauiAntGrpcClient/MauiAntGrpcClient.csproj

@@ -64,12 +64,12 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="CommunityToolkit.Maui" Version="9.0.2" />
+		<PackageReference Include="CommunityToolkit.Maui" Version="9.0.3" />
 		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
 		<PackageReference Include="Google.Protobuf" Version="3.27.3" />
 		<PackageReference Include="Grpc.Net.Client" Version="2.65.0" />
-		<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.71" />
-		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.71" />
+		<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.80" />
+		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.80" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
 	</ItemGroup>
 

Examples/MAUI-gRPC/MauiAntGrpcClient/MauiProgram.cs

@@ -23,7 +23,7 @@ public static MauiApp CreateMauiApp()
                     fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
                     fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");
                 })
-                .UseMauiAntPlus()
+                .UseAntPlus()
                 .RegisterAppServices()
                 .RegisterViewModels()
                 .RegisterPages();

Examples/WpfUsbStickApp/MainWindow.xaml

@@ -4,7 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:vm="clr-namespace:WpfUsbStickApp.ViewModels"
-        d:DataContext="{d:DesignInstance Type=vm:MainWindowViewModel}"
+        d:DataContext="{d:DesignInstance Type=local:MainWindowViewModel}"
         xmlns:local="clr-namespace:WpfUsbStickApp"
         mc:Ignorable="d"
         Title="WPF USB Stick App" Height="450" Width="457" Icon="{Binding AntImage}">

Examples/WpfUsbStickApp/MainWindow.xaml.cs

@@ -9,7 +9,6 @@
 using System.Windows.Controls;
 using System.Windows.Data;
 using WpfUsbStickApp.CustomAntDevice;
-using WpfUsbStickApp.ViewModels;
 using WpfUsbStickApp.Views;
 
 namespace WpfUsbStickApp

Examples/WpfUsbStickApp/MainWindowViewModel.cs

@@ -12,19 +12,18 @@
 using System.Reflection;
 using WpfUsbStickApp.CustomAntDevice;
 
-namespace WpfUsbStickApp.ViewModels
+namespace WpfUsbStickApp
 {
     internal class MainWindowViewModel
     {
+        private readonly IHost _host;
+
         public DeviceCapabilities DeviceCapabilities { get; }
         public string ProductDescription { get; }
         public uint SerialNumber { get; }
         public string HostVersion { get; }
-
-        private readonly IHost _host;
-
         public AntCollection AntDevices { get; }
-        public static Stream AntImage => AntDevice.AntImage;
+        public static Stream? AntImage => typeof(AntDevice).Assembly.GetManifestResourceStream("SmallEarthTech.AntPlus.Images.AntPlus.png");
 
         public MainWindowViewModel()
         {
@@ -56,15 +55,15 @@ public MainWindowViewModel()
             HostVersion = radio.Version;
 
             // log app info
-            var antAssemblies = Assembly.GetExecutingAssembly().GetReferencedAssemblies().Where(asm => asm.Name!.StartsWith("Ant"));
+            var antAssemblies = Assembly.GetExecutingAssembly().GetReferencedAssemblies().Where(asm => asm.Name!.Contains("Ant"));
             var logger = _host.Services.GetRequiredService<ILogger<App>>();
             logger.LogInformation("{App}", Assembly.GetExecutingAssembly().GetName().FullName);
             foreach (var asm in antAssemblies)
             {
                 logger?.LogInformation("{AntAssembly}", asm.FullName);
             }
 
-            // create the device collection
+            // create the device collection and start scanning for broadcasting ANT devices
             AntDevices = _host.Services.GetRequiredService<AntCollection>();
             _ = AntDevices.StartScanning();
         }