Change TargetFrameworks

Remove IsStandard
Fix CodeFactor issues

Author: wherewhere

AdvancedSharpAdbClient.Tests/AdvancedSharpAdbClient.Tests.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <Choose>
-    <When Condition="'$(IsWindows)' == 'True' and '$(IsStandard)' != 'True'">
+    <When Condition="'$(IsWindows)' == 'True'">
       <PropertyGroup>
         <TargetFramework>net10.0-windows10.0.17763.0</TargetFramework>
       </PropertyGroup>
@@ -23,10 +23,10 @@
     <PackageReference Include="coverlet.msbuild" Version="6.0.4" PrivateAssets="all">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
     <PackageReference Include="NSubstitute" Version="5.3.0" />
     <PackageReference Include="xunit" Version="2.9.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.4" PrivateAssets="all">
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" PrivateAssets="all">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>

AdvancedSharpAdbClient/AdbClient.cs

@@ -390,7 +390,7 @@ public virtual void ExecuteServerCommand(string target, string command, IAdbSock
                 // break too soon in certain cases (about every 10 loops, so it appears to be a timing
                 // issue). Checking for reader.ReadLine() to return null appears to be much more robust
                 // -- one of the integration test fetches output 1000 times and found no truncations.
-                while (reader.ReadLine() != null) ;
+                while (reader.ReadLine() != null) { }
             }
             catch (Exception e)
             {

AdvancedSharpAdbClient/AdvancedSharpAdbClient.csproj

@@ -10,29 +10,17 @@
     <SuppressTfmSupportBuildWarnings>False</SuppressTfmSupportBuildWarnings>
   </PropertyGroup>
 
-  <Choose>
-    <When Condition="'$(IsStandard)' == 'True'">
-      <PropertyGroup>
-        <PackageId>$(AssemblyName).Standard</PackageId>
-        <TargetFrameworks>netstandard1.3;netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
-        <TargetFrameworks Condition="'$(IsWindows)' == 'True'">$(TargetFrameworks);net2.0;net4.5</TargetFrameworks>
-      </PropertyGroup>
-    </When>
-    <When Condition="'$(FullTargets)' == 'True'">
-      <PropertyGroup>
-        <NoWarn>$(NoWarn);NU1603;NU1605;NU1902;NU1903</NoWarn>
-        <TargetFrameworks>net6.0;net8.0;net10.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.17763.0;net10.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>
-    <Otherwise>
-      <PropertyGroup>
-        <TargetFrameworks>net8.0;netcoreapp3.1;netstandard1.3;netstandard2.0;netstandard2.1</TargetFrameworks>
-        <TargetFrameworks Condition="'$(IsWindows)' == 'True'">$(TargetFrameworks);net2.0;net3.5-client;net4.5;net4.8;net8.0-windows10.0.17763.0</TargetFrameworks>
-      </PropertyGroup>
-    </Otherwise>
-  </Choose>
+  <PropertyGroup>
+    <TargetFrameworks>net8.0;net10.0;netstandard1.3;netstandard2.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks Condition="'$(IsWindows)' == 'True'">$(TargetFrameworks);net2.0;net3.5-client;net4.5;net4.8;net8.0-windows10.0.17763.0;net10.0-windows10.0.17763.0</TargetFrameworks>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(FullTargets)' == 'True'">
+    <NoWarn>$(NoWarn);NU1603;NU1605;NU1902;NU1903</NoWarn>
+    <TargetFrameworks>$(TargetFrameworks);net6.0;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks Condition="'$(IsWindows)' == 'True'">$(TargetFrameworks);net4.0-client;net4.6.1</TargetFrameworks>
+    <TargetFrameworks Condition="'$(GITHUB_ACTIONS)' != 'True' and '$(IsWindows)' == 'True'">$(TargetFrameworks);netcore5.0;uap10.0;uap10.0.15138.0</TargetFrameworks>
+  </PropertyGroup>
 
   <PropertyGroup>
     <PolySharpIncludeGeneratedTypes>

AdvancedSharpAdbClient/Models/DeviceData.cs

@@ -239,7 +239,7 @@ or DeviceState.Authorizing
                     builder.AppendFormatted((int)State, "X");
                     builder.AppendFormatted(')');
                     break;
-            };
+            }
 
             if (!string.IsNullOrEmpty(Message))
             {

Directory.Build.props

@@ -29,7 +29,6 @@
   <PropertyGroup>
     <FullTargets Condition="'$(FullTargets)' == ''">False</FullTargets>
     <ImportAsync Condition="'$(ImportAsync)' == ''">False</ImportAsync>
-    <IsStandard Condition="'$(IsStandard)' == ''">False</IsStandard>
     <IsWindows Condition="'$(IsWindows)' == ''">False</IsWindows>
     <IsWindows Condition="$([MSBuild]::IsOSPlatform('Windows')) == 'True' OR '$(Platform)' == 'Windows NT'">True</IsWindows>
     <IsTestProject Condition="'$(IsTestProject)' == ''">$(MSBuildProjectName.Contains('.Test'))</IsTestProject>

Directory.Build.props.buildschema.json

@@ -11,11 +11,6 @@
       "type": "bool",
       "defaultValue": "false"
     },
-    "IsStandard": {
-      "description": "Value indicating whether only target to .NET Standard",
-      "type": "bool",
-      "defaultValue": "false"
-    },
     "IsWindows": {
       "description": "Value indicating whether is running on Windows",
       "type": "bool"