Remove System.Drawing.Common

wherewhere · wherewhere · commit a3144322b118 · 2024-10-23T15:14:21.000+08:00
diff --git a/AdvancedSharpAdbClient.Tests/AdbClientTests.Async.cs b/AdvancedSharpAdbClient.Tests/AdbClientTests.Async.cs
@@ -1,7 +1,5 @@
 ﻿using System;
 using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Imaging;
 using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -367,7 +365,7 @@ await File.ReadAllBytesAsync("Assets/Framebuffer.bin")
             Assert.Equal(1u, header.Version);
             Assert.Equal(0u, header.ColorSpace);
 
-#if WINDOWS
+#if HAS_IMAGING
             if (!OperatingSystem.IsWindows()) { return; }
 
             using Bitmap image = framebuffer.ToImage();
diff --git a/AdvancedSharpAdbClient.Tests/AdbClientTests.cs b/AdvancedSharpAdbClient.Tests/AdbClientTests.cs
@@ -1,7 +1,5 @@
 ﻿using System;
 using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Imaging;
 using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -489,7 +487,7 @@ public void GetFrameBufferTest()
             Assert.Equal(1u, header.Version);
             Assert.Equal(0u, header.ColorSpace);
 
-#if WINDOWS
+#if HAS_IMAGING
             if (!OperatingSystem.IsWindows()) { return; }
 
             using Bitmap image = framebuffer.ToImage();
diff --git a/AdvancedSharpAdbClient.Tests/AdvancedSharpAdbClient.Tests.csproj b/AdvancedSharpAdbClient.Tests/AdvancedSharpAdbClient.Tests.csproj
@@ -4,12 +4,11 @@
     <LangVersion>latest</LangVersion>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
   </PropertyGroup>
-  
+
   <Choose>
     <When Condition="'$(IsWindows)' == 'True' and '$(IsStandard)' != 'True'">
       <PropertyGroup>
-        <TargetFramework>net8.0-windows10.0.18362.0</TargetFramework>
-        <WindowsSdkPackageVersion>10.0.18362.42</WindowsSdkPackageVersion>
+        <TargetFramework>net8.0-windows10.0.17763.0</TargetFramework>
       </PropertyGroup>
     </When>
     <Otherwise>
@@ -40,5 +39,9 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
+  
+  <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net1.1'))">
+    <DefineConstants>$(DefineConstants);HAS_IMAGING</DefineConstants>
+  </PropertyGroup>
 
 </Project>
diff --git a/AdvancedSharpAdbClient.Tests/DeviceCommands/Receivers/GetPropReceiverTests.cs b/AdvancedSharpAdbClient.Tests/DeviceCommands/Receivers/GetPropReceiverTests.cs
@@ -14,7 +14,7 @@ public void ListPropertiesTest()
             };
 
             DummyAdbClient client = new();
-            client.Commands["shell:/system/bin/getprop"] = 
+            client.Commands["shell:/system/bin/getprop"] =
                 """
                 [init.svc.BGW]: [running]
                 [init.svc.MtkCodecService]: [running]
diff --git a/AdvancedSharpAdbClient.Tests/Dummys/DummyAdbSocket.cs b/AdvancedSharpAdbClient.Tests/Dummys/DummyAdbSocket.cs
@@ -11,7 +11,7 @@ namespace AdvancedSharpAdbClient.Tests
     /// <summary>
     /// A mock implementation of the <see cref="IAdbSocket"/> class.
     /// </summary>
-    internal class DummyAdbSocket : IDummyAdbSocket, ICloneable<DummyAdbSocket>
+    internal partial class DummyAdbSocket : IDummyAdbSocket, ICloneable<DummyAdbSocket>
     {
         /// <summary>
         /// Use this message to cause <see cref="ReadString"/> and <see cref="ReadStringAsync(CancellationToken)"/> to throw
diff --git a/AdvancedSharpAdbClient.Tests/Dummys/DummySyncService.cs b/AdvancedSharpAdbClient.Tests/Dummys/DummySyncService.cs
@@ -9,7 +9,7 @@ namespace AdvancedSharpAdbClient.Tests
     /// <summary>
     /// A mock implementation of the <see cref="ISyncService"/> class.
     /// </summary>
-    internal class DummySyncService : ISyncService
+    internal partial class DummySyncService : ISyncService
     {
         public Dictionary<string, Stream> UploadedFiles { get; } = [];
 
diff --git a/AdvancedSharpAdbClient.Tests/Dummys/DummyTcpSocket.cs b/AdvancedSharpAdbClient.Tests/Dummys/DummyTcpSocket.cs
@@ -10,7 +10,7 @@ namespace AdvancedSharpAdbClient.Tests
     /// <summary>
     /// A mock implementation of the <see cref="ITcpSocket"/> class.
     /// </summary>
-    internal class DummyTcpSocket : ITcpSocket, ICloneable<DummyTcpSocket>
+    internal partial class DummyTcpSocket : ITcpSocket, ICloneable<DummyTcpSocket>
     {
         /// <summary>
         /// The stream from which the <see cref="DummyTcpSocket"/> reads.
diff --git a/AdvancedSharpAdbClient.Tests/Dummys/TracingAdbSocket.cs b/AdvancedSharpAdbClient.Tests/Dummys/TracingAdbSocket.cs
@@ -8,7 +8,7 @@
 
 namespace AdvancedSharpAdbClient.Tests
 {
-    internal class TracingAdbSocket(EndPoint endPoint) : AdbSocket(endPoint), IDummyAdbSocket
+    internal partial class TracingAdbSocket(EndPoint endPoint) : AdbSocket(endPoint), IDummyAdbSocket
     {
         private readonly EndPoint endPoint = endPoint;
 
diff --git a/AdvancedSharpAdbClient.Tests/Extensions/FactoriesLocker.cs b/AdvancedSharpAdbClient.Tests/Extensions/FactoriesLocker.cs
@@ -7,7 +7,7 @@ namespace AdvancedSharpAdbClient.Tests
     /// <summary>
     /// Locker for the <see cref="Factories"/> class.
     /// </summary>
-    public class FactoriesLocker : IDisposable
+    public partial class FactoriesLocker : IDisposable
     {
         public static SemaphoreSlim SlimLocker { get; } = new(1, 1);
 
diff --git a/AdvancedSharpAdbClient.Tests/Models/FramebufferHeaderTests.cs b/AdvancedSharpAdbClient.Tests/Models/FramebufferHeaderTests.cs
@@ -1,6 +1,4 @@
 ﻿using System;
-using System.Drawing;
-using System.Drawing.Imaging;
 using System.IO;
 using Xunit;
 
@@ -71,7 +69,7 @@ public void ReadFramebufferV2Test()
             Assert.Equal(data.AsSpan(), [.. header]);
         }
 
-#if WINDOWS
+#if HAS_IMAGING
         [Fact]
         public void ToImageTest()
         {
diff --git a/AdvancedSharpAdbClient.Tests/Models/FramebufferTests.cs b/AdvancedSharpAdbClient.Tests/Models/FramebufferTests.cs
@@ -1,6 +1,4 @@
 ﻿using System;
-using System.Drawing;
-using System.Drawing.Imaging;
 using System.IO;
 using System.Net;
 using System.Threading.Tasks;
@@ -69,7 +67,7 @@ public void RefreshTest()
             Assert.Equal(1u, header.Version);
             Assert.Equal(0u, header.ColorSpace);
 
-#if WINDOWS
+#if HAS_IMAGING
             if (!OperatingSystem.IsWindows()) { return; }
 
             using Bitmap image = (Bitmap)framebuffer;
@@ -132,7 +130,7 @@ public async Task RefreshAsyncTest()
             Assert.Equal(1u, header.Version);
             Assert.Equal(0u, header.ColorSpace);
 
-#if WINDOWS
+#if HAS_IMAGING
             if (!OperatingSystem.IsWindows()) { return; }
 
             using Bitmap image = (Bitmap)framebuffer;
diff --git a/AdvancedSharpAdbClient/AdvancedSharpAdbClient.csproj b/AdvancedSharpAdbClient/AdvancedSharpAdbClient.csproj
@@ -110,10 +110,6 @@
     <PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
   </ItemGroup>
 
-  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net5.0-windows'))">
-    <PackageReference Include="System.Drawing.Common" Version="8.0.10" />
-  </ItemGroup>
-  
   <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'netstandard2.1'))">
     <DefineConstants>$(DefineConstants);COMP_NETSTANDARD2_1</DefineConstants>
   </PropertyGroup>
@@ -137,8 +133,7 @@
     <DefineConstants>$(DefineConstants);HAS_WUXC</DefineConstants>
   </PropertyGroup>
 
-  <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net1.1'))
-                         or $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net5.0-windows'))">
+  <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net1.1'))">
     <DefineConstants>$(DefineConstants);HAS_IMAGING</DefineConstants>
   </PropertyGroup>
 

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ namespace AdvancedSharpAdbClient.Tests`
`11`	`11`	`/// <summary>`
`12`	`12`	`/// A mock implementation of the <see cref="IAdbSocket"/> class.`
`13`	`13`	`/// </summary>`
`14`		`- internal class DummyAdbSocket : IDummyAdbSocket, ICloneable<DummyAdbSocket>`
	`14`	`+ internal partial class DummyAdbSocket : IDummyAdbSocket, ICloneable<DummyAdbSocket>`
`15`	`15`	`{`
`16`	`16`	`/// <summary>`
`17`	`17`	`/// Use this message to cause <see cref="ReadString"/> and <see cref="ReadStringAsync(CancellationToken)"/> to throw`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace AdvancedSharpAdbClient.Tests`
`9`	`9`	`/// <summary>`
`10`	`10`	`/// A mock implementation of the <see cref="ISyncService"/> class.`
`11`	`11`	`/// </summary>`
`12`		`- internal class DummySyncService : ISyncService`
	`12`	`+ internal partial class DummySyncService : ISyncService`
`13`	`13`	`{`
`14`	`14`	`public Dictionary<string, Stream> UploadedFiles { get; } = [];`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ namespace AdvancedSharpAdbClient.Tests`
`10`	`10`	`/// <summary>`
`11`	`11`	`/// A mock implementation of the <see cref="ITcpSocket"/> class.`
`12`	`12`	`/// </summary>`
`13`		`- internal class DummyTcpSocket : ITcpSocket, ICloneable<DummyTcpSocket>`
	`13`	`+ internal partial class DummyTcpSocket : ITcpSocket, ICloneable<DummyTcpSocket>`
`14`	`14`	`{`
`15`	`15`	`/// <summary>`
`16`	`16`	`/// The stream from which the <see cref="DummyTcpSocket"/> reads.`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`
`9`	`9`	`namespace AdvancedSharpAdbClient.Tests`
`10`	`10`	`{`
`11`		`- internal class TracingAdbSocket(EndPoint endPoint) : AdbSocket(endPoint), IDummyAdbSocket`
	`11`	`+ internal partial class TracingAdbSocket(EndPoint endPoint) : AdbSocket(endPoint), IDummyAdbSocket`
`12`	`12`	`{`
`13`	`13`	`private readonly EndPoint endPoint = endPoint;`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace AdvancedSharpAdbClient.Tests`
`7`	`7`	`/// <summary>`
`8`	`8`	`/// Locker for the <see cref="Factories"/> class.`
`9`	`9`	`/// </summary>`
`10`		`- public class FactoriesLocker : IDisposable`
	`10`	`+ public partial class FactoriesLocker : IDisposable`
`11`	`11`	`{`
`12`	`12`	`public static SemaphoreSlim SlimLocker { get; } = new(1, 1);`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`	`1`	`using System;`
`2`		`-using System.Drawing;`
`3`		`-using System.Drawing.Imaging;`
`4`	`2`	`using System.IO;`
`5`	`3`	`using Xunit;`
`6`	`4`
`@@ -71,7 +69,7 @@ public void ReadFramebufferV2Test()`
`71`	`69`	`Assert.Equal(data.AsSpan(), [.. header]);`
`72`	`70`	`}`
`73`	`71`
`74`		`-#if WINDOWS`
	`72`	`+#if HAS_IMAGING`
`75`	`73`	`[Fact]`
`76`	`74`	`public void ToImageTest()`
`77`	`75`	`{`