Remove C#/WinRT reference

Author: wherewhere

AdvancedSharpAdbClient/AdvancedSharpAdbClient.csproj

@@ -20,7 +20,7 @@
       <PropertyGroup>
         <NoWarn>$(NoWarn);NU1603;NU1605;NU1902;NU1903</NoWarn>
         <TargetFrameworks>net6.0;net8.0;net9.0;netcoreapp2.1;netcoreapp3.1;netstandard1.3;netstandard2.0;netstandard2.1</TargetFrameworks>
-        <TargetFrameworks Condition="'$(IsWindows)' == 'True'">$(TargetFrameworks);net2.0;net3.5-client;net4.0-client;net4.5;net4.6.1;net4.8;net8.0-windows10.0.18362.0;net9.0-windows10.0.18362.0</TargetFrameworks>
+        <TargetFrameworks Condition="'$(IsWindows)' == 'True'">$(TargetFrameworks);net2.0;net3.5-client;net4.0-client;net4.5;net4.6.1;net4.8;net8.0-windows10.0.17763.0;net9.0-windows10.0.17763.0</TargetFrameworks>
         <TargetFrameworks Condition="'$(GITHUB_ACTIONS)' != 'True' and '$(IsWindows)' == 'True'">$(TargetFrameworks);netcore5.0;uap10.0;uap10.0.15138.0</TargetFrameworks>
       </PropertyGroup>
     </When>
@@ -111,7 +111,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net5.0-windows'))">
-    <PackageReference Include="System.Drawing.Common" Version="8.0.8" />
+    <PackageReference Include="System.Drawing.Common" Version="8.0.10" />
   </ItemGroup>
 
   <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'netstandard2.1'))">
@@ -133,8 +133,7 @@
     <DefineConstants>$(DefineConstants);HAS_WINRT</DefineConstants>
   </PropertyGroup>
 
-  <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'uap'))
-                         or $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0-windows10.0.17763.0'))">
+  <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'uap'))">
     <DefineConstants>$(DefineConstants);HAS_WUXC</DefineConstants>
   </PropertyGroup>
 

AdvancedSharpAdbClient/Extensions/UnixFileStatusExtensions.cs

@@ -216,7 +216,7 @@ public static string ToPermissionCode(this UnixFileStatus mode)
 #else
             char[] code = new char[10];
 #endif
-            BitArray array = new(new[] { (int)mode });
+            BitArray array = new([(int)mode]);
 
             code[9] = array[0]
                 ? array[9] ? 't' : 'x'

AdvancedSharpAdbClient/Polyfills/Extensions/ExceptionExtensions.cs

@@ -76,15 +76,15 @@ public static void ThrowIfLessThan<T>(T value, T other, [CallerArgumentExpressio
         /// </summary>
         /// <param name="value">The argument to validate as non-negative.</param>
         /// <param name="paramName">The name of the parameter with which <paramref name="value"/> corresponds.</param>
-#if NET8_0_OR_GREATER
         public static void ThrowIfNegative<T>(T value, [CallerArgumentExpression(nameof(value))] string? paramName = null)
+#if NET8_0_OR_GREATER
             where T : INumberBase<T>
         {
             ArgumentOutOfRangeException.ThrowIfNegative(value, paramName);
 #else
-        public static void ThrowIfNegative(double value, [CallerArgumentExpression(nameof(value))] string? paramName = null)
+            where T : struct, IComparable<T>
         {
-            if (value < 0)
+            if (value.CompareTo(default) < 0)
             {
                 throw new ArgumentOutOfRangeException(paramName, value, $"{paramName} ('{value}') must be a non-negative value.");
             }

AdvancedSharpAdbClient/Polyfills/Extensions/StringExtensions.cs

@@ -63,7 +63,7 @@ public static bool Contains(this string text, string value, StringComparison com
         /// <param name="options">A bitwise combination of the enumeration values that specifies whether to trim substrings and include empty substrings.</param>
         /// <returns>An array whose elements contain the substrings from this instance that are delimited by <paramref name="separator"/>.</returns>
         public static string[] Split(this string text, char separator, StringSplitOptions options = StringSplitOptions.None) =>
-            text.Split(new[] { separator }, options);
+            text.Split([separator], options);
 
         /// <summary>
         /// Splits a string into a maximum number of substrings based on a specified delimiting
@@ -77,7 +77,7 @@ public static string[] Split(this string text, char separator, StringSplitOption
         /// <param name="options">A bitwise combination of the enumeration values that specifies whether to trim substrings and include empty substrings.</param>
         /// <returns>An array that contains at most count substrings from this instance that are delimited by <paramref name="separator"/>.</returns>
         public static string[] Split(this string text, char separator, int count, StringSplitOptions options = StringSplitOptions.None) =>
-            text.Split(new[] { separator }, count, options);
+            text.Split([separator], count, options);
 
         /// <summary>
         /// Determines whether this string instance starts with the specified character.

AdvancedSharpAdbClient/Polyfills/Interfaces/ICloneable.cs

@@ -31,6 +31,9 @@ namespace AdvancedSharpAdbClient.Polyfills
     /// </summary>
     /// <typeparam name="T">The type of the class.</typeparam>
     public interface ICloneable<out T>
+#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.

AdvancedSharpAdbClient/Properties/GlobalUsings.cs

@@ -22,6 +22,7 @@
 global using Windows.ApplicationModel;
 global using Windows.Foundation;
 global using Windows.Foundation.Metadata;
+global using Windows.Storage;
 global using Windows.Storage.Streams;
 global using Buffer = System.Buffer;
 global using DateTime = System.DateTime;
@@ -31,7 +32,6 @@
 
 #if HAS_WUXC
 global using Windows.Graphics.Imaging;
-global using Windows.Storage;
 global using Windows.System;
 global using Windows.UI.Core;
 global using Windows.UI.Xaml.Media.Imaging;

Directory.Build.props

@@ -60,9 +60,8 @@
     <TargetPlatformVersion>10.0.22621.0</TargetPlatformVersion>
   </PropertyGroup>
 
-  <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0-windows10.0.18362.0'))">
+  <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0-windows10.0.17763.0'))">
     <TargetPlatformMinVersion>10.0</TargetPlatformMinVersion>
-    <WindowsSdkPackageVersion>10.0.18362.42</WindowsSdkPackageVersion>
   </PropertyGroup>
 
 </Project>

Directory.Build.targets

@@ -15,8 +15,4 @@
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.14" PrivateAssets="all" IsImplicitlyDefined="true" />
   </ItemGroup>
 
-  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0-windows10.0.17763.0'))">
-    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.1" PrivateAssets="all" IsImplicitlyDefined="true" />
-  </ItemGroup>
-
 </Project>