Skip to content

Commit 7f774ac

Browse files
wherewherewherewhere
committed
Improve conditional compilation
1 parent 9ef80be commit 7f774ac

20 files changed

+157
-119
lines changed

‎AdvancedSharpAdbClient/AdbClient.Async.cs‎

Lines changed: 38 additions & 38 deletions
Large diffs are not rendered by default.

‎AdvancedSharpAdbClient/AdbClient.cs‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ public List<DeviceData> GetDevices()
161161
/// <inheritdoc/>
162162
public int CreateForward(DeviceData device, string local, string remote, bool allowRebind)
163163
{
164-
AdbClient.EnsureDevice(device);
164+
EnsureDevice(device);
165165

166166
using IAdbSocket socket = adbSocketFactory(EndPoint);
167167
string rebind = allowRebind ? string.Empty : "norebind:";
@@ -181,7 +181,7 @@ public int CreateForward(DeviceData device, ForwardSpec local, ForwardSpec remot
181181
/// <inheritdoc/>
182182
public int CreateReverseForward(DeviceData device, string remote, string local, bool allowRebind)
183183
{
184-
AdbClient.EnsureDevice(device);
184+
EnsureDevice(device);
185185

186186
using IAdbSocket socket = adbSocketFactory(EndPoint);
187187
socket.SetDevice(device);
@@ -199,7 +199,7 @@ public int CreateReverseForward(DeviceData device, string remote, string local,
199199
/// <inheritdoc/>
200200
public void RemoveReverseForward(DeviceData device, string remote)
201201
{
202-
AdbClient.EnsureDevice(device);
202+
EnsureDevice(device);
203203

204204
using IAdbSocket socket = adbSocketFactory(EndPoint);
205205
socket.SetDevice(device);
@@ -211,7 +211,7 @@ public void RemoveReverseForward(DeviceData device, string remote)
211211
/// <inheritdoc/>
212212
public void RemoveAllReverseForwards(DeviceData device)
213213
{
214-
AdbClient.EnsureDevice(device);
214+
EnsureDevice(device);
215215

216216
using IAdbSocket socket = adbSocketFactory(EndPoint);
217217
socket.SetDevice(device);
@@ -223,7 +223,7 @@ public void RemoveAllReverseForwards(DeviceData device)
223223
/// <inheritdoc/>
224224
public void RemoveForward(DeviceData device, int localPort)
225225
{
226-
AdbClient.EnsureDevice(device);
226+
EnsureDevice(device);
227227

228228
using IAdbSocket socket = adbSocketFactory(EndPoint);
229229
socket.SendAdbRequest($"host-serial:{device.Serial}:killforward:tcp:{localPort}");
@@ -233,7 +233,7 @@ public void RemoveForward(DeviceData device, int localPort)
233233
/// <inheritdoc/>
234234
public void RemoveAllForwards(DeviceData device)
235235
{
236-
AdbClient.EnsureDevice(device);
236+
EnsureDevice(device);
237237

238238
using IAdbSocket socket = adbSocketFactory(EndPoint);
239239
socket.SendAdbRequest($"host-serial:{device.Serial}:killforward-all");
@@ -243,7 +243,7 @@ public void RemoveAllForwards(DeviceData device)
243243
/// <inheritdoc/>
244244
public IEnumerable<ForwardData> ListForward(DeviceData device)
245245
{
246-
AdbClient.EnsureDevice(device);
246+
EnsureDevice(device);
247247

248248
using IAdbSocket socket = adbSocketFactory(EndPoint);
249249
socket.SendAdbRequest($"host-serial:{device.Serial}:list-forward");
@@ -259,7 +259,7 @@ public IEnumerable<ForwardData> ListForward(DeviceData device)
259259
/// <inheritdoc/>
260260
public IEnumerable<ForwardData> ListReverseForward(DeviceData device)
261261
{
262-
AdbClient.EnsureDevice(device);
262+
EnsureDevice(device);
263263

264264
using IAdbSocket socket = adbSocketFactory(EndPoint);
265265
socket.SetDevice(device);
@@ -281,7 +281,7 @@ public void ExecuteRemoteCommand(string command, DeviceData device, IShellOutput
281281
/// <inheritdoc/>
282282
public void ExecuteRemoteCommand(string command, DeviceData device, IShellOutputReceiver receiver, Encoding encoding)
283283
{
284-
AdbClient.EnsureDevice(device);
284+
EnsureDevice(device);
285285

286286
using IAdbSocket socket = adbSocketFactory(EndPoint);
287287

@@ -314,15 +314,15 @@ public void ExecuteRemoteCommand(string command, DeviceData device, IShellOutput
314314
/// <inheritdoc/>
315315
public Framebuffer CreateRefreshableFramebuffer(DeviceData device)
316316
{
317-
AdbClient.EnsureDevice(device);
317+
EnsureDevice(device);
318318

319319
return new Framebuffer(device, this);
320320
}
321321

322322
/// <inheritdoc/>
323323
public void Reboot(string into, DeviceData device)
324324
{
325-
AdbClient.EnsureDevice(device);
325+
EnsureDevice(device);
326326

327327
string request = $"reboot:{into}";
328328

@@ -381,7 +381,7 @@ public string Disconnect(DnsEndPoint endpoint)
381381
/// <param name="device">The device on which to restart ADB with root privileges.</param>
382382
protected void Root(string request, DeviceData device)
383383
{
384-
AdbClient.EnsureDevice(device);
384+
EnsureDevice(device);
385385

386386
using IAdbSocket socket = adbSocketFactory(EndPoint);
387387
socket.SetDevice(device);
@@ -396,7 +396,7 @@ protected void Root(string request, DeviceData device)
396396

397397
// see https://android.googlesource.com/platform/packages/modules/adb/+/refs/heads/master/daemon/restart_service.cpp
398398
// for possible return strings
399-
#if NET
399+
#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER
400400
if (!responseMessage.Contains("restarting", StringComparison.OrdinalIgnoreCase))
401401
#else
402402
if (responseMessage.IndexOf("restarting", StringComparison.OrdinalIgnoreCase) == -1)
@@ -415,7 +415,7 @@ protected void Root(string request, DeviceData device)
415415
/// <inheritdoc/>
416416
public void Install(DeviceData device, Stream apk, params string[] arguments)
417417
{
418-
AdbClient.EnsureDevice(device);
418+
EnsureDevice(device);
419419

420420
ExceptionExtensions.ThrowIfNull(apk);
421421

@@ -466,7 +466,7 @@ public void Install(DeviceData device, Stream apk, params string[] arguments)
466466
/// <inheritdoc/>
467467
public void InstallMultiple(DeviceData device, Stream[] splitAPKs, string packageName, params string[] arguments)
468468
{
469-
AdbClient.EnsureDevice(device);
469+
EnsureDevice(device);
470470

471471
ExceptionExtensions.ThrowIfNull(packageName);
472472

@@ -497,7 +497,7 @@ public void InstallMultiple(DeviceData device, Stream[] splitAPKs, string packag
497497
/// <inheritdoc/>
498498
public void InstallMultiple(DeviceData device, Stream baseAPK, Stream[] splitAPKs, params string[] arguments)
499499
{
500-
AdbClient.EnsureDevice(device);
500+
EnsureDevice(device);
501501

502502
ExceptionExtensions.ThrowIfNull(baseAPK);
503503

@@ -535,7 +535,7 @@ public void InstallMultiple(DeviceData device, Stream baseAPK, Stream[] splitAPK
535535
/// <inheritdoc/>
536536
public string InstallCreate(DeviceData device, string packageName = null, params string[] arguments)
537537
{
538-
AdbClient.EnsureDevice(device);
538+
EnsureDevice(device);
539539

540540
StringBuilder requestBuilder = new();
541541
_ = requestBuilder.Append("exec:cmd package 'install-create' ");
@@ -572,7 +572,7 @@ public string InstallCreate(DeviceData device, string packageName = null, params
572572
/// <inheritdoc/>
573573
public void InstallWrite(DeviceData device, Stream apk, string apkName, string session)
574574
{
575-
AdbClient.EnsureDevice(device);
575+
EnsureDevice(device);
576576

577577
ExceptionExtensions.ThrowIfNull(apk);
578578

@@ -670,7 +670,7 @@ public XmlDocument DumpScreen(DeviceData device)
670670
/// <inheritdoc/>
671671
public void Click(DeviceData device, Cords cords)
672672
{
673-
AdbClient.EnsureDevice(device);
673+
EnsureDevice(device);
674674

675675
using IAdbSocket socket = adbSocketFactory(EndPoint);
676676
socket.SetDevice(device);
@@ -686,7 +686,7 @@ public void Click(DeviceData device, Cords cords)
686686
/// <inheritdoc/>
687687
public void Click(DeviceData device, int x, int y)
688688
{
689-
AdbClient.EnsureDevice(device);
689+
EnsureDevice(device);
690690

691691
using IAdbSocket socket = adbSocketFactory(EndPoint);
692692
socket.SetDevice(device);
@@ -702,7 +702,7 @@ public void Click(DeviceData device, int x, int y)
702702
/// <inheritdoc/>
703703
public void Swipe(DeviceData device, Element first, Element second, long speed)
704704
{
705-
AdbClient.EnsureDevice(device);
705+
EnsureDevice(device);
706706

707707
using IAdbSocket socket = adbSocketFactory(EndPoint);
708708
socket.SetDevice(device);
@@ -718,7 +718,7 @@ public void Swipe(DeviceData device, Element first, Element second, long speed)
718718
/// <inheritdoc/>
719719
public void Swipe(DeviceData device, int x1, int y1, int x2, int y2, long speed)
720720
{
721-
AdbClient.EnsureDevice(device);
721+
EnsureDevice(device);
722722

723723
using IAdbSocket socket = adbSocketFactory(EndPoint);
724724
socket.SetDevice(device);
@@ -848,7 +848,7 @@ public Element[] FindElements(DeviceData device, string xpath, TimeSpan timeout
848848
/// <inheritdoc/>
849849
public void SendKeyEvent(DeviceData device, string key)
850850
{
851-
AdbClient.EnsureDevice(device);
851+
EnsureDevice(device);
852852

853853
using IAdbSocket socket = adbSocketFactory(EndPoint);
854854
socket.SetDevice(device);
@@ -864,7 +864,7 @@ public void SendKeyEvent(DeviceData device, string key)
864864
/// <inheritdoc/>
865865
public void SendText(DeviceData device, string text)
866866
{
867-
AdbClient.EnsureDevice(device);
867+
EnsureDevice(device);
868868

869869
using IAdbSocket socket = adbSocketFactory(EndPoint);
870870
socket.SetDevice(device);

‎AdvancedSharpAdbClient/AdbSocket.Async.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -202,11 +202,7 @@ protected async Task<AdbResponse> ReadAdbResponseInnerAsync(CancellationToken ca
202202
AdbResponse resp = new();
203203

204204
byte[] reply = new byte[4];
205-
await ReadAsync(reply
206-
#if NET8_0_OR_GREATER
207-
, cancellationToken
208-
#endif
209-
);
205+
await ReadAsync(reply, cancellationToken);
210206

211207
resp.IOSuccess = true;
212208

‎AdvancedSharpAdbClient/AdvancedSharpAdbClient.csproj‎

Lines changed: 53 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3+
<PropertyGroup>
4+
<FullTargets>True</FullTargets>
5+
<NoWarn>CA2254</NoWarn>
6+
</PropertyGroup>
7+
38
<PropertyGroup Condition="'$(FullTargets)' == 'true'">
4-
<NoWarn>NU1603</NoWarn>
5-
<TargetFrameworks>net3.5-client;net4.0-client;net4.5.2;net4.6.2;net4.7.2;net4.8.1;net6.0;net8.0;netcore50;netcoreapp3.1;netstandard1.3;netstandard2.0;uap10.0</TargetFrameworks>
9+
<NoWarn>NU1603;$(NoWarn)</NoWarn>
10+
<TargetFrameworks>net3.5-client;net4.0-client;net4.5.2;net4.6.2;net4.7.2;net4.8.1;net6.0;net8.0;netcore50;netcoreapp2.1;netcoreapp3.1;netstandard1.3;netstandard2.0;netstandard2.1;uap10.0</TargetFrameworks>
611
</PropertyGroup>
712

813
<PropertyGroup Condition="'$(FullTargets)' != 'true'">
914
<TargetFramework Condition="'$(GITHUB_ACTIONS)' == 'true'">netstandard2.0</TargetFramework>
10-
<TargetFrameworks Condition="'$(GITHUB_ACTIONS)' != 'true' And '$(IsWindows)'">net3.5-client;net4.0-client;net4.5.2;net4.6.2;net4.7.2;net4.8.1;net6.0;net8.0;netcoreapp3.1;netstandard1.3;netstandard2.0</TargetFrameworks>
15+
<TargetFrameworks Condition="'$(GITHUB_ACTIONS)' != 'true' And '$(IsWindows)'">net3.5-client;net4.5.2;net4.8.1;net6.0;net8.0;netcoreapp3.1;netstandard1.3;netstandard2.0</TargetFrameworks>
1116
<TargetFrameworks Condition="'$(GITHUB_ACTIONS)' != 'true' And !'$(IsWindows)'">net6.0;net8.0;netcoreapp3.1;netstandard1.3;netstandard2.0</TargetFrameworks>
1217
</PropertyGroup>
1318

@@ -35,34 +40,71 @@
3540
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
3641
</ItemGroup>
3742

38-
<ItemGroup Condition="'$(TargetFramework)' == 'netcore50'&#xD;&#xA; or '$(TargetFramework)' == 'netstandard1.3'">
43+
<ItemGroup Condition="'$(TargetFramework)' == 'netcore50'
44+
or '$(TargetFramework)' == 'netcoreapp1.0'
45+
or '$(TargetFramework)' == 'netcoreapp1.1'
46+
or '$(TargetFramework)' == 'netstandard1.3'">
3947
<PackageReference Include="System.Buffers" Version="4.5.1" />
4048
<PackageReference Include="System.Net.Sockets" Version="4.3.0" />
4149
<PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
4250
</ItemGroup>
4351

44-
<ItemGroup Condition="'$(TargetFramework)' == 'net4.5.2'&#xD;&#xA; or '$(TargetFramework)' == 'netcore50'&#xD;&#xA; or '$(TargetFramework)' == 'netstandard1.3'">
52+
<ItemGroup Condition="'$(TargetFramework)' == 'net4.5.2'
53+
or '$(TargetFramework)' == 'netcore50'
54+
or '$(TargetFramework)' == 'netcoreapp1.0'
55+
or '$(TargetFramework)' == 'netcoreapp1.1'
56+
or '$(TargetFramework)' == 'netstandard1.3'">
4557
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.1.2" />
4658
</ItemGroup>
4759

48-
<ItemGroup Condition="'$(TargetFramework)' == 'net4.6.2'&#xD;&#xA; or '$(TargetFramework)' == 'net4.7.2'&#xD;&#xA; or '$(TargetFramework)' == 'net4.8.1'&#xD;&#xA; or '$(TargetFramework)' == 'net6.0'&#xD;&#xA; or '$(TargetFramework)' == 'net8.0'&#xD;&#xA; or '$(TargetFramework)' == 'netcoreapp3.1'&#xD;&#xA; or '$(TargetFramework)' == 'netstandard2.0'&#xD;&#xA; or '$(TargetFramework)' == 'uap10.0'">
60+
<ItemGroup Condition="'$(TargetFramework)' == 'net4.6.2'
61+
or '$(TargetFramework)' == 'net4.7.2'
62+
or '$(TargetFramework)' == 'net4.8.1'
63+
or '$(TargetFramework)' == 'net6.0'
64+
or '$(TargetFramework)' == 'net8.0'
65+
or '$(TargetFramework)' == 'netcoreapp2.1'
66+
or '$(TargetFramework)' == 'netcoreapp3.1'
67+
or '$(TargetFramework)' == 'netstandard2.0'
68+
or '$(TargetFramework)' == 'netstandard2.1'
69+
or '$(TargetFramework)' == 'uap10.0'">
4970
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
5071
</ItemGroup>
5172

52-
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'&#xD;&#xA; or '$(TargetFramework)' == 'net8.0'&#xD;&#xA; or '$(TargetFramework)' == 'netcoreapp3.1'&#xD;&#xA; or '$(TargetFramework)' == 'netstandard2.0'&#xD;&#xA; or '$(TargetFramework)' == 'uap10.0'">
73+
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'
74+
or '$(TargetFramework)' == 'net8.0'
75+
or '$(TargetFramework)' == 'netcoreapp2.1'
76+
or '$(TargetFramework)' == 'netcoreapp3.1'
77+
or '$(TargetFramework)' == 'netstandard2.0'
78+
or '$(TargetFramework)' == 'netstandard2.1'
79+
or '$(TargetFramework)' == 'uap10.0'">
5380
<PackageReference Include="System.Drawing.Common" Version="7.0.0" />
5481
</ItemGroup>
5582

56-
<PropertyGroup Condition="'$(TargetFramework)' != 'net3.5-client'&#xD;&#xA; and '$(TargetFramework)' != 'net4.0-client'">
83+
<PropertyGroup Condition="'$(TargetFramework)' != 'net3.5-client'
84+
and '$(TargetFramework)' != 'net4.0-client'">
5785
<DefineConstants>$(DefineConstants);HAS_LOGGER</DefineConstants>
5886
</PropertyGroup>
5987

60-
<PropertyGroup Condition="'$(TargetFramework)' == 'net4.5.2'&#xD;&#xA; or '$(TargetFramework)' == 'netcore50'&#xD;&#xA; or '$(TargetFramework)' == 'netstandard1.3'">
88+
<PropertyGroup Condition="'$(TargetFramework)' == 'net4.5.2'
89+
or '$(TargetFramework)' == 'netcore50'
90+
or '$(TargetFramework)' == 'netcoreapp1.0'
91+
or '$(TargetFramework)' == 'netcoreapp1.1'
92+
or '$(TargetFramework)' == 'netstandard1.3'">
6193
<DefineConstants>$(DefineConstants);HAS_OLDLOGGER</DefineConstants>
6294
</PropertyGroup>
6395

64-
<PropertyGroup Condition="'$(TargetFramework)' != 'netcore50'&#xD;&#xA; and '$(TargetFramework)' != 'netstandard1.3'">
96+
<PropertyGroup Condition="'$(TargetFramework)' == 'net6.0'
97+
or '$(TargetFramework)' == 'net8.0'
98+
or '$(TargetFramework)' == 'netcoreapp3.1'
99+
or '$(TargetFramework)' == 'netstandard2.1'">
100+
<DefineConstants>$(DefineConstants);HAS_IndexRange</DefineConstants>
101+
</PropertyGroup>
102+
103+
<PropertyGroup Condition="'$(TargetFramework)' != 'netcore50'
104+
and '$(TargetFramework)' != 'netcoreapp1.0'
105+
and '$(TargetFramework)' != 'netcoreapp1.1'
106+
and '$(TargetFramework)' != 'netstandard1.3'">
65107
<DefineConstants>$(DefineConstants);HAS_Process;HAS_Drawing;HAS_Serialization</DefineConstants>
66108
</PropertyGroup>
67-
109+
68110
</Project>

‎AdvancedSharpAdbClient/DeviceCommands/LinuxPath.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public static string Combine(params string[] paths)
6161
{
6262
capacity += paths[i].Length;
6363
}
64-
#if NETCOREAPP
64+
#if HAS_IndexRange
6565
char ch = paths[i][^1];
6666
#else
6767
char ch = paths[i][paths[i].Length - 1];
@@ -84,7 +84,7 @@ public static string Combine(params string[] paths)
8484
}
8585
else
8686
{
87-
#if NETCOREAPP
87+
#if HAS_IndexRange
8888
char ch2 = builder[^1];
8989
#else
9090
char ch2 = builder[builder.Length - 1];
@@ -123,15 +123,15 @@ public static string GetDirectoryName(string path)
123123
string tpath = path;
124124
if (tpath.Length > 1)
125125
{
126-
#if NETCOREAPP
126+
#if NETCOREAPP2_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER
127127
if (tpath.EndsWith(DirectorySeparatorChar))
128128
#else
129129
if (tpath.EndsWith(new string(new char[] { DirectorySeparatorChar })))
130130
#endif
131131
{
132132
return tpath;
133133
}
134-
#if NETCOREAPP
134+
#if HAS_IndexRange
135135
tpath = tpath[..(tpath.LastIndexOf(DirectorySeparatorChar) + 1)];
136136
#else
137137
tpath = tpath.Substring(0, tpath.LastIndexOf(DirectorySeparatorChar) + 1);
@@ -237,7 +237,7 @@ private static string FixupPath(string path)
237237
string sb = path;
238238
sb = sb.Replace(Path.DirectorySeparatorChar, DirectorySeparatorChar);
239239

240-
#if NETCOREAPP
240+
#if NETCOREAPP2_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER
241241
if (sb != "." && !sb.StartsWith(DirectorySeparatorChar))
242242
#else
243243
if (sb != "." && !sb.StartsWith(new string(new char[] { DirectorySeparatorChar })))
@@ -246,7 +246,7 @@ private static string FixupPath(string path)
246246
sb = string.Format(".{0}{1}", DirectorySeparatorChar, sb);
247247
}
248248

249-
#if NETCOREAPP
249+
#if NETCOREAPP2_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER
250250
if (!sb.EndsWith(DirectorySeparatorChar))
251251
#else
252252
if (!sb.EndsWith(new string(new char[] { DirectorySeparatorChar })))

0 commit comments

Comments
 (0)