Merge branch 'main' into main

Author: wherewhere

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -32,6 +32,7 @@ body:
       description: Specify the version of AdvancedSharpAdbClient you're using.
       options:
         - "Latest Source"
+        - "2.5.5"
         - "2.5.4"
         - "2.5.3"
         - "2.5.2"

.github/workflows/build-and-test.yml

@@ -22,10 +22,10 @@ jobs:
         dotnet-version: ${{env.DOTNET_VERSION}}
 
     - name: Install dependencies
-      run: dotnet restore
+      run: dotnet restore -p:FullTargets=false
 
     - name: Build
-      run: dotnet build --no-restore
+      run: dotnet build --no-restore -p:FullTargets=false
 
     - name: Test
-      run: dotnet test --no-restore
+      run: dotnet test --no-restore -p:FullTargets=false

AdvancedSharpAdbClient.Tests/AdvancedSharpAdbClient.Tests.csproj

@@ -1,12 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+    <NoWarn>CS1591</NoWarn>
     <LangVersion>latest</LangVersion>
     <NoWarn>CS1591</NoWarn>
     <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="coverlet.msbuild" Version="3.2.0" PrivateAssets="all">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
     <PackageReference Include="Moq" Version="4.18.4" />
     <PackageReference Include="xunit" Version="2.4.2" />

AdvancedSharpAdbClient.Tests/DeviceMonitorTests.cs

@@ -157,7 +157,7 @@ public void StartInitialDeviceListTest()
         }
 
         [Fact]
-        public void DeviceChangedTest()
+        public void DeviceChanged_TriggeredWhenStatusChanged()
         {
             Socket.WaitForNewData = true;
 
@@ -186,6 +186,8 @@ public void DeviceChangedTest()
             Socket.Responses.Clear();
             Socket.Requests.Clear();
 
+            sink.ResetSignals();
+
             // Device disconnects
             ManualResetEvent eventWaiter = sink.CreateEventSignal();
 
@@ -199,13 +201,64 @@ public void DeviceChangedTest()
 
                 Assert.Equal(1, monitor.Devices.Count);
                 Assert.Equal(DeviceState.Online, monitor.Devices.ElementAt(0).State);
-                Assert.Single(sink.ConnectedEvents);
+                Assert.Empty(sink.ConnectedEvents);
                 Assert.Single(sink.ChangedEvents);
                 Assert.Empty(sink.DisconnectedEvents);
                 Assert.Equal("169.254.109.177:5555", sink.ChangedEvents[0].Device.Serial);
             });
         }
 
+        [Fact]
+        public void DeviceChanged_NoTriggerIfStatusIsSame()
+        {
+            Socket.WaitForNewData = true;
+
+            using DeviceMonitor monitor = new(Socket);
+            DeviceMonitorSink sink = new(monitor);
+
+            Assert.Equal(0, monitor.Devices.Count);
+
+            // Start the monitor, detect the initial device.
+            RunTest(
+            OkResponse,
+            ResponseMessages("169.254.109.177:5555\toffline\n"),
+            Requests("host:track-devices"),
+            () =>
+            {
+                monitor.Start();
+
+                Assert.Equal(1, monitor.Devices.Count);
+                Assert.Equal(DeviceState.Offline, monitor.Devices.ElementAt(0).State);
+                Assert.Single(sink.ConnectedEvents);
+                Assert.Empty(sink.ChangedEvents);
+                Assert.Empty(sink.DisconnectedEvents);
+            });
+
+            Socket.ResponseMessages.Clear();
+            Socket.Responses.Clear();
+            Socket.Requests.Clear();
+
+            sink.ResetSignals();
+
+            // Something happens but device does not change
+            ManualResetEvent eventWaiter = sink.CreateEventSignal();
+
+            RunTest(
+            NoResponses,
+            ResponseMessages("169.254.109.177:5555\toffline\n"),
+            Requests(),
+            () =>
+            {
+                eventWaiter.WaitOne(1000);
+
+                Assert.Equal(1, monitor.Devices.Count);
+                Assert.Equal(DeviceState.Offline, monitor.Devices.ElementAt(0).State);
+                Assert.Empty(sink.ConnectedEvents);
+                Assert.Empty(sink.ChangedEvents);
+                Assert.Empty(sink.DisconnectedEvents);
+            });
+        }
+
         /// <summary>
         /// Tests the <see cref="DeviceMonitor"/> in a case where the adb server dies in the middle of the monitor
         /// loop. The <see cref="DeviceMonitor"/> should detect this condition and restart the adb server.

AdvancedSharpAdbClient.Tests/Dummys/DeviceMonitorSink.cs

@@ -18,6 +18,13 @@ public DeviceMonitorSink(DeviceMonitor monitor)
             ConnectedEvents = new Collection<DeviceDataEventArgs>();
         }
 
+        public void ResetSignals()
+        {
+            ChangedEvents.Clear();
+            DisconnectedEvents.Clear();
+            ConnectedEvents.Clear();
+        }
+
         public Collection<DeviceDataEventArgs> DisconnectedEvents { get; private set; }
 
         public Collection<DeviceDataEventArgs> ConnectedEvents { get; private set; }

AdvancedSharpAdbClient.Tests/Dummys/DummyAdbClient.cs

@@ -2,7 +2,6 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Drawing;
 using System.IO;
 using System.Net;
 using System.Text;
@@ -144,7 +143,7 @@ public Task ExecuteRemoteCommandAsync(string command, DeviceData device, IShellO
 
         public Task<List<string>> GetFeatureSetAsync(DeviceData device, CancellationToken cancellationToken) => throw new NotImplementedException();
 
-        public Task<Image> GetFrameBufferAsync(DeviceData device, CancellationToken cancellationToken) => throw new NotImplementedException();
+        public Task<Framebuffer> GetFrameBufferAsync(DeviceData device, CancellationToken cancellationToken) => throw new NotImplementedException();
 
         public void HomeBtn(DeviceData device) => throw new NotImplementedException();
 

AdvancedSharpAdbClient/AdbClient.Async.cs

@@ -7,7 +7,6 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Drawing;
 using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -229,18 +228,15 @@ public async Task ExecuteRemoteCommandAsync(string command, DeviceData device, I
         }
 
         /// <inheritdoc/>
-#if NET
-        [SupportedOSPlatform("windows")]
-#endif
-        public async Task<Image> GetFrameBufferAsync(DeviceData device, CancellationToken cancellationToken = default)
+        public async Task<Framebuffer> GetFrameBufferAsync(DeviceData device, CancellationToken cancellationToken = default)
         {
             EnsureDevice(device);
 
             using Framebuffer framebuffer = CreateRefreshableFramebuffer(device);
             await framebuffer.RefreshAsync(cancellationToken).ConfigureAwait(false);
 
             // Convert the framebuffer to an image, and return that.
-            return framebuffer.ToImage();
+            return framebuffer;
         }
 
         /// <inheritdoc/>

AdvancedSharpAdbClient/AdvancedSharpAdbClient.csproj

@@ -17,14 +17,14 @@
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net3.5-client'">
     <PackageReference Include="AsyncBridge" Version="0.3.1" />
-    <PackageReference Include="Polyfill.System.Buffers.NET35" Version="0.0.4" />
-    <PackageReference Include="Polyfill.System.Runtime.InteropServices.RuntimeInformation.NET35" Version="0.0.4" />
+    <PackageReference Include="Polyfill.System.Buffers.NET35" Version="0.0.5" />
+    <PackageReference Include="Polyfill.System.Runtime.InteropServices.RuntimeInformation.NET35" Version="0.0.5" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net4.0-client'">
     <PackageReference Include="Microsoft.Bcl.Async" Version="1.0.168" />
-    <PackageReference Include="Polyfill.System.Buffers.NET40" Version="0.0.3" />
-    <PackageReference Include="Polyfill.System.Runtime.InteropServices.RuntimeInformation.NET40" Version="0.0.3" />
+    <PackageReference Include="Polyfill.System.Buffers.NET40" Version="0.0.4" />
+    <PackageReference Include="Polyfill.System.Runtime.InteropServices.RuntimeInformation.NET40" Version="0.0.4" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net4.5.2'">
@@ -38,9 +38,7 @@
   <ItemGroup Condition="'$(TargetFramework)' == 'netcore50'
                      or '$(TargetFramework)' == 'netstandard1.3'">
     <PackageReference Include="System.Buffers" Version="4.5.1" />
-    <PackageReference Include="System.Drawing-dotnet-core" Version="1.2.3" />
     <PackageReference Include="System.Net.Sockets" Version="4.3.0" />
-    <PackageReference Include="System.Runtime.Serialization.Formatters" Version="4.3.0" />
     <PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
   </ItemGroup>
 
@@ -80,7 +78,7 @@
 
   <PropertyGroup Condition="'$(TargetFramework)' != 'netcore50'
                         and '$(TargetFramework)' != 'netstandard1.3'">
-    <DefineConstants>$(DefineConstants);HAS_Process</DefineConstants>
+    <DefineConstants>$(DefineConstants);HAS_Process;HAS_Drawing;HAS_Serialization</DefineConstants>
   </PropertyGroup>
 
 </Project>

AdvancedSharpAdbClient/DeviceMonitor.cs

@@ -324,7 +324,7 @@ private void UpdateDevices(List<DeviceData> devices)
                         this.devices.Add(device);
                         OnDeviceConnected(new DeviceDataEventArgs(device));
                     }
-                    else
+                    else if (existingDevice.State != device.State)
                     {
                         existingDevice.State = device.State;
                         OnDeviceChanged(new DeviceDataEventArgs(existingDevice));

AdvancedSharpAdbClient/Exceptions/AdbException.cs

@@ -4,7 +4,10 @@
 
 using System;
 using System.Net.Sockets;
+
+#if HAS_Serialization
 using System.Runtime.Serialization;
+#endif
 
 namespace AdvancedSharpAdbClient.Exceptions
 {
@@ -46,24 +49,16 @@ public AdbException(string message, AdbResponse response) : base(message)
             Response = response;
         }
 
+#if HAS_Serialization
         /// <summary>
         /// Initializes a new instance of the <see cref="AdbException"/> class.
         /// </summary>
         /// <param name="serializationInfo">The serialization info.</param>
         /// <param name="context">The context.</param>
-        public AdbException(SerializationInfo serializationInfo, StreamingContext context) :
-#if HAS_Process
-            base(serializationInfo, context)
-#else
-            base(serializationInfo.GetString("Message"))
-#endif
+        public AdbException(SerializationInfo serializationInfo, StreamingContext context) : base(serializationInfo, context)
         {
-#if !HAS_Process
-            HelpLink = serializationInfo.GetString("HelpURL"); // Do not rename (binary serialization)
-            HResult = serializationInfo.GetInt32("HResult"); // Do not rename (binary serialization)
-            Source = serializationInfo.GetString("Source"); // Do not rename (binary serialization)
-#endif
         }
+#endif
 
         /// <summary>
         /// Initializes a new instance of the <see cref="AdbException"/> class.