use Smdn.MSBuild.DefineConstants.NETSdkApi

smdn · Mar 15, 2022 · a318cb8 · a318cb8
1 parent 63f0216
commit a318cb8
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 10 deletions.
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -19,6 +19,10 @@ SPDX-License-Identifier: MIT
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)\stylecop.json" Link="stylecop.json" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Smdn.MSBuild.DefineConstants.NETSdkApi" Version="[1.1.0]" PrivateAssets="all" IncludeAssets="build" />
+  </ItemGroup>
+
   <PropertyGroup Label="package properties">
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://smdn.jp/electronics/libs/Smdn.Devices.MCP2221/</PackageProjectUrl>

diff --git a/src/Smdn.Devices.MCP2221/Smdn.Devices.MCP2221/MCP2221.I2C.Scanning.cs b/src/Smdn.Devices.MCP2221/Smdn.Devices.MCP2221/MCP2221.I2C.Scanning.cs
@@ -7,7 +7,7 @@
 using System.Threading.Tasks;
 
 using IReadOnlyI2CAddressSet =
-#if NET5_0_OR_GREATER
+#if SYSTEM_COLLECTIONS_GENERIC_IREADONLYSET
 System.Collections.Generic.IReadOnlySet
 #else
 System.Collections.Generic.IReadOnlyCollection

diff --git a/src/Smdn.Devices.MCP2221/Smdn.Devices.MCP2221/MCP2221.I2C.cs b/src/Smdn.Devices.MCP2221/Smdn.Devices.MCP2221/MCP2221.I2C.cs
@@ -54,7 +54,7 @@ public static I2CEngineState ParseResponse(ReadOnlySpan<byte> resp, (I2CAddress
 
         var state = I2CEngineState.Parse(resp);
         var isBusStatusDefined =
-#if NET5_0_OR_GREATER
+#if SYSTEM_ENUM_ISDEFINED_OF_TENUM
           Enum.IsDefined<I2CEngineState.TransferStatus>(state.BusStatus);
 #else
           Enum.IsDefined(typeof(I2CEngineState.TransferStatus), state.BusStatus);

diff --git a/src/Smdn.Devices.MCP2221/Smdn.Devices.UsbHid.HidSharp/Device.cs b/src/Smdn.Devices.MCP2221/Smdn.Devices.UsbHid.HidSharp/Device.cs
@@ -125,7 +125,7 @@ public ValueTask DisposeAsync()
   {
     hidDevice = null;
 
-#if NET5_0_OR_GREATER
+#if SYSTEM_THREADING_TASKS_VALUETASK_COMPLETEDTASK
     return ValueTask.CompletedTask;
 #else
     return new ValueTask(Task.CompletedTask);

diff --git a/src/Smdn.Devices.MCP2221/Smdn.Devices.UsbHid.HidSharp/Stream.cs b/src/Smdn.Devices.MCP2221/Smdn.Devices.UsbHid.HidSharp/Stream.cs
@@ -75,7 +75,7 @@ public ValueTask WriteAsync(ReadOnlyMemory<byte> buffer)
       ArrayPool<byte>.Shared.Return(buf);
     }
 
-#if NET5_0_OR_GREATER
+#if SYSTEM_THREADING_TASKS_VALUETASK_COMPLETEDTASK
     return ValueTask.CompletedTask;
 #else
     return default;
@@ -118,7 +118,7 @@ public ValueTask<int> ReadAsync(Memory<byte> buffer)
 
     try {
 #pragma warning disable SA1114
-#if NET5_0_OR_GREATER
+#if SYSTEM_THREADING_TASKS_VALUETASK_FROMRESULT
       return ValueTask.FromResult<int>(
 #else
       return new ValueTask<int>(

diff --git a/src/Smdn.Devices.MCP2221/Smdn.Devices.UsbHid.LibUsbDotNet/Device.cs b/src/Smdn.Devices.MCP2221/Smdn.Devices.UsbHid.LibUsbDotNet/Device.cs
@@ -165,7 +165,7 @@ private Stream OpenEndpointStream()
   public ValueTask<IUsbHidStream> OpenStreamAsync()
   {
     return
-#if NET5_0_OR_GREATER
+#if SYSTEM_THREADING_TASKS_VALUETASK_FROMRESULT
     ValueTask.FromResult<IUsbHidStream>
 #else
     new ValueTask<IUsbHidStream>
@@ -187,7 +187,7 @@ public ValueTask DisposeAsync()
     _usbDevice?.Dispose();
     _usbDevice = null;
 
-#if NET5_0_OR_GREATER
+#if SYSTEM_THREADING_TASKS_VALUETASK_FROMRESULT
     return ValueTask.CompletedTask;
 #else
     return new ValueTask(Task.CompletedTask);

diff --git a/src/Smdn.Devices.MCP2221/Smdn.Devices.UsbHid.LibUsbDotNet/Stream.cs b/src/Smdn.Devices.MCP2221/Smdn.Devices.UsbHid.LibUsbDotNet/Stream.cs
@@ -55,7 +55,7 @@ public ValueTask DisposeAsync()
     _writer = null;
     _reader = null;
 
-#if NET5_0_OR_GREATER
+#if SYSTEM_THREADING_TASKS_VALUETASK_COMPLETEDTASK
     return ValueTask.CompletedTask;
 #else
     return new ValueTask(Task.CompletedTask);
@@ -98,7 +98,7 @@ public unsafe ValueTask WriteAsync(ReadOnlyMemory<byte> buffer)
       out var transferLength
     );
 
-#if NET5_0_OR_GREATER
+#if SYSTEM_THREADING_TASKS_VALUETASK_COMPLETEDTASK
     return ValueTask.CompletedTask;
 #else
     return default;
@@ -136,7 +136,7 @@ out var transferLength
     );
 
     return
-#if NET5_0_OR_GREATER
+#if SYSTEM_THREADING_TASKS_VALUETASK_FROMRESULT
     ValueTask.FromResult<int>
 #else
     new ValueTask<int>