Add TypeForwardedTo

Author: wherewhere

AdvancedSharpAdbClient.Tests/AdvancedSharpAdbClient.Tests.csproj

@@ -25,7 +25,7 @@
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageReference Include="NSubstitute" Version="5.1.0" />
-    <PackageReference Include="xunit" Version="2.9.0" />
+    <PackageReference Include="xunit" Version="2.9.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" PrivateAssets="all">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

AdvancedSharpAdbClient.Tests/Dummys/DummyAdbSocket.cs

@@ -314,7 +314,5 @@ public async Task ReconnectAsync(bool isForce, CancellationToken cancellationTok
             SyncRequests = SyncRequests,
             ShellStreams = ShellStreams
         };
-
-        object ICloneable.Clone() => Clone();
     }
 }

AdvancedSharpAdbClient.Tests/Dummys/DummyTcpSocket.cs

@@ -114,16 +114,10 @@ public async ValueTask<int> SendAsync(ReadOnlyMemory<byte> buffer, SocketFlags s
 
         public byte[] GetBytesSent() => OutputStream.ToArray();
 
-        public DummyTcpSocket Clone()
+        public DummyTcpSocket Clone() => new()
         {
-            DummyTcpSocket socket = new()
-            {
-                Connected = true,
-                ReceiveBufferSize = ReceiveBufferSize
-            };
-            return socket;
-        }
-
-        object ICloneable.Clone() => Clone();
+            Connected = true,
+            ReceiveBufferSize = ReceiveBufferSize
+        };
     }
 }

AdvancedSharpAdbClient/AdbCommandLineClient.cs

@@ -131,7 +131,7 @@ public virtual List<string> ExecuteAdbCommand(string command, int timeout = 5000
 #endif
         public virtual bool CheckAdbFileExists(string adbPath) => adbPath == "adb" ||
 #if HAS_WINRT
-            StorageFile.GetFileFromPathAsync(Extensions.GetFullPath(adbPath)).AwaitByTaskCompleteSource() is StorageFile file && file.IsOfType(StorageItemTypes.File);
+            (StorageFile.GetFileFromPathAsync(Extensions.GetFullPath(adbPath)).AwaitByTaskCompleteSource() is StorageFile file && file.IsOfType(StorageItemTypes.File));
 #else
             File.Exists(adbPath);
 #endif

AdvancedSharpAdbClient/Models/FramebufferHeader.cs

@@ -342,7 +342,7 @@ private PixelFormat StandardizePixelFormat(ref byte[] buffer)
                 int blueIndex = (int)Blue.Offset / 8;
                 int greenIndex = (int)Green.Offset / 8;
                 int alphaIndex = (int)Alpha.Offset / 8;
-                
+
                 byte[] array = new byte[(int)Size * 4];
                 // Loop over the array and re-order as required
                 for (int i = 0; i < (int)Size; i += 4)

AdvancedSharpAdbClient/Polyfills/Interfaces/ICloneable.cs

@@ -2,8 +2,6 @@
 // Copyright (c) The Android Open Source Project, Ryan Conrad, Quamotion, yungd1plomat, wherewhere. All rights reserved.
 // </copyright>
 
-using System;
-
 #if !NETFRAMEWORK && !NETCOREAPP2_0_OR_GREATER && !NETSTANDARD2_0_OR_GREATER && !UAP10_0_15138_0
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
@@ -22,6 +20,9 @@ internal interface ICloneable
         object Clone();
     }
 }
+#else
+[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ICloneable))]
+#endif
 
 namespace AdvancedSharpAdbClient.Polyfills
 {
@@ -38,23 +39,3 @@ public interface ICloneable<out T>
         T Clone();
     }
 }
-#else
-namespace AdvancedSharpAdbClient.Polyfills
-{
-    /// <summary>
-    /// Supports cloning, which creates a new instance of a class with the same value as an existing instance.
-    /// </summary>
-    /// <typeparam name="T">The type of the class.</typeparam>
-    public interface ICloneable<out T> : ICloneable
-#if NET9_0_OR_GREATER
-        where T : allows ref struct
-#endif
-    {
-        /// <summary>
-        /// Creates a new <typeparamref name="T"/> object that is a copy of the current instance.
-        /// </summary>
-        /// <returns>A new <typeparamref name="T"/> object that is a copy of this instance.</returns>
-        new T Clone();
-    }
-}
-#endif

AdvancedSharpAdbClient/Polyfills/Interfaces/IReadOnlyCollection.cs

@@ -20,4 +20,6 @@ internal interface IReadOnlyCollection<T> : IEnumerable<T>
         int Count { get; }
     }
 }
+#else
+[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Collections.Generic.IReadOnlyCollection<>))]
 #endif

AdvancedSharpAdbClient/Polyfills/Interfaces/IReadOnlyList.cs

@@ -21,4 +21,6 @@ internal interface IReadOnlyList<T> : IReadOnlyCollection<T>
         T this[int index] { get; }
     }
 }
+#else
+[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Collections.Generic.IReadOnlyList<>))]
 #endif

AdvancedSharpAdbClient/Polyfills/StringHandler.cs

@@ -361,4 +361,6 @@ private void AppendOrInsertAlignmentIfNeeded(int startingPos, int alignment)
         }
     }
 }
+#else
+[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.CompilerServices.DefaultInterpolatedStringHandler))]
 #endif

AdvancedSharpAdbClient/SyncService.Async.cs

@@ -390,7 +390,7 @@ public virtual async Task PullAsync(string remotePath, IOutputStream stream, Act
                     cancellationToken.ThrowIfCancellationRequested();
                 }
 
-                finish: return;
+            finish: return;
             }
             finally
             {
@@ -480,7 +480,7 @@ public async IAsyncEnumerable<FileStatistics> GetDirectoryAsyncListing(string re
 
             try
             {
-                start:
+            start:
                 // create the stat request message.
                 await Socket.SendSyncRequestAsync(SyncCommand.LIST, remotePath, cancellationToken).ConfigureAwait(false);
                 IsProcessing = true;
@@ -510,7 +510,7 @@ public async IAsyncEnumerable<FileStatistics> GetDirectoryAsyncListing(string re
                     isLocked = true;
                 }
 
-                finish:
+            finish:
                 yield break;
             }
             finally