Add only standard mode

When IsStandard is True, the project will only target to .NET 2.0, .NET Standard and the earlier LTS .NET Core App. The Nuget ID will change to AdvancedSharpAdbClient.Standard.
SharpAdb · Nov 15, 2023 · d3d3ac7 · d3d3ac7
1 parent 5962ab0
commit d3d3ac7
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 18 deletions.
diff --git a/AdvancedSharpAdbClient.Tests/AdvancedSharpAdbClient.Tests.csproj b/AdvancedSharpAdbClient.Tests/AdvancedSharpAdbClient.Tests.csproj
@@ -3,9 +3,25 @@
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
     <NoWarn>CS1591</NoWarn>
-    <TargetFramework Condition="'$(IsWindows)' != 'True'">net8.0</TargetFramework>
-    <TargetFramework Condition="'$(IsWindows)' == 'True'">net8.0-windows10.0.17763.0</TargetFramework>
   </PropertyGroup>
+
+  <Choose>
+    <When Condition="'$(IsStandard)' == 'True'">
+      <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+      </PropertyGroup>
+    </When>
+    <When Condition="'$(IsWindows)' == 'True'">
+      <PropertyGroup>
+        <TargetFramework Condition="'$(IsWindows)' == 'True'">net8.0-windows10.0.17763.0</TargetFramework>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
 
   <ItemGroup>
     <PackageReference Include="coverlet.msbuild" Version="6.0.0" PrivateAssets="all">

diff --git a/AdvancedSharpAdbClient.Tests/Extensions/ExceptionExtensionsTests.cs b/AdvancedSharpAdbClient.Tests/Extensions/ExceptionExtensionsTests.cs
@@ -48,7 +48,7 @@ public static void ThrowIfLessThanTest()
         [Fact]
         public static void ThrowIfNegativeTest()
         {
-            Assert.Equal(-1, Assert.Throws<ArgumentOutOfRangeException>(() => ExceptionExtensions.ThrowIfNegative(-1)).ActualValue);
+            Assert.Equal(-1d, Assert.Throws<ArgumentOutOfRangeException>(() => ExceptionExtensions.ThrowIfNegative(-1d)).ActualValue);
 
             ExceptionExtensions.ThrowIfNegative(0);
             ExceptionExtensions.ThrowIfNegative(1);

diff --git a/AdvancedSharpAdbClient/AdvancedSharpAdbClient.csproj b/AdvancedSharpAdbClient/AdvancedSharpAdbClient.csproj
@@ -1,24 +1,34 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <FullTargets>False</FullTargets>
+    <FullTargets>True</FullTargets>
     <ImportAsync>True</ImportAsync>
-    <NoWarn>$(NoWarn);CS1685;CA2254</NoWarn>
     <Nullable>Enable</Nullable>
-    <WarningsAsErrors />
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(FullTargets)' == 'True'">
-    <NoWarn>$(NoWarn);NU1603;NU1605;NU1902;NU1903</NoWarn>
-    <TargetFrameworks>net6.0;net8.0;netcoreapp2.1;netcoreapp3.1;netstandard1.3;netstandard2.0;netstandard2.1</TargetFrameworks>
-    <TargetFrameworks Condition="'$(IsWindows)' == 'True'">$(TargetFrameworks);net2.0-client;net3.5-client;net4.0-client;net4.5.2;net4.6.2;net4.8.1;net6.0-windows10.0.17763.0;net8.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>
-
-  <PropertyGroup Condition="'$(FullTargets)' != 'True'">
-    <TargetFrameworks>net8.0;netcoreapp3.1;netstandard1.3;netstandard2.0;netstandard2.1</TargetFrameworks>
-    <TargetFrameworks Condition="'$(IsWindows)' == 'True'">$(TargetFrameworks);net2.0-client;net3.5-client;net4.5.2;net4.8.1;net8.0-windows10.0.17763.0</TargetFrameworks>
-  </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-client</TargetFrameworks>
+      </PropertyGroup>
+    </When>
+    <When Condition="'$(FullTargets)' == 'True'">
+      <PropertyGroup>
+        <NoWarn>$(NoWarn);NU1603;NU1605;NU1902;NU1903</NoWarn>
+        <TargetFrameworks>net6.0;net8.0;netcoreapp2.1;netcoreapp3.1;netstandard1.3;netstandard2.0;netstandard2.1</TargetFrameworks>
+        <TargetFrameworks Condition="'$(IsWindows)' == 'True'">$(TargetFrameworks);net2.0-client;net3.5-client;net4.0-client;net4.5.2;net4.6.2;net4.8.1;net6.0-windows10.0.17763.0;net8.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-client;net3.5-client;net4.5.2;net4.8.1;net8.0-windows10.0.17763.0</TargetFrameworks>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
 
   <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
     <TargetPlatformMinVersion>10.0</TargetPlatformMinVersion>

diff --git a/AdvancedSharpAdbClient/DeviceMonitor.Async.cs b/AdvancedSharpAdbClient/DeviceMonitor.Async.cs
@@ -85,7 +85,7 @@ protected virtual async Task DisposeAsyncCore()
         }
 
         /// <inheritdoc/>
-#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER
+#if NETCOREAPP3_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER
         public async ValueTask DisposeAsync()
 #else
         public async Task DisposeAsync()

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -30,6 +30,7 @@
   <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>