Skip to content

Commit 5e785ff

Browse files
wherewherewherewhere
committed
Fix split package install count
Update nuget package
1 parent a314432 commit 5e785ff

File tree

6 files changed

+22
-24
lines changed

6 files changed

+22
-24
lines changed

‎.github/workflows/build-and-test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
workflow_dispatch:
1515

1616
env:
17-
DOTNET_VERSION: '8.0.x' # The .NET SDK version to use
17+
DOTNET_VERSION: '9.0.x' # The .NET SDK version to use
1818

1919
jobs:
2020
build-and-test:

‎AdvancedSharpAdbClient.Tests/AdvancedSharpAdbClient.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2424
</PackageReference>
2525
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
26-
<PackageReference Include="NSubstitute" Version="5.1.0" />
26+
<PackageReference Include="NSubstitute" Version="5.3.0" />
2727
<PackageReference Include="xunit" Version="2.9.2" />
2828
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" PrivateAssets="all">
2929
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎AdvancedSharpAdbClient/AdbClient.Async.cs‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -653,8 +653,7 @@ void OnSplitSyncProgressChanged(string? sender, double args)
653653
}
654654
}
655655

656-
int i = 0;
657-
await splitAPKs.Select(splitAPK => InstallWriteAsync(device, splitAPK, $"{nameof(splitAPK)}{i++}", session, OnSplitSyncProgressChanged, cancellationToken)).WhenAll().ConfigureAwait(false);
656+
await splitAPKs.Select((splitAPK, index) => InstallWriteAsync(device, splitAPK, $"{nameof(splitAPK)}{index}", session, OnSplitSyncProgressChanged, cancellationToken)).WhenAll().ConfigureAwait(false);
658657

659658
callback?.Invoke(new InstallProgressEventArgs(PackageInstallProgressState.Installing));
660659
await InstallCommitAsync(device, session, cancellationToken).ConfigureAwait(false);
@@ -697,8 +696,7 @@ void OnSyncProgressChanged(string? sender, double args)
697696
}
698697
}
699698

700-
int i = 0;
701-
await splitAPKs.Select(splitAPK => InstallWriteAsync(device, splitAPK, $"{nameof(splitAPK)}{i++}", session, OnSyncProgressChanged, cancellationToken)).WhenAll().ConfigureAwait(false);
699+
await splitAPKs.Select((splitAPK, index) => InstallWriteAsync(device, splitAPK, $"{nameof(splitAPK)}{index}", session, OnSyncProgressChanged, cancellationToken)).WhenAll().ConfigureAwait(false);
702700

703701
callback?.Invoke(new InstallProgressEventArgs(PackageInstallProgressState.Installing));
704702
await InstallCommitAsync(device, session, cancellationToken).ConfigureAwait(false);
@@ -1053,8 +1051,7 @@ void OnSplitSyncProgressChanged(string? sender, double args)
10531051
}
10541052
}
10551053

1056-
int i = 0;
1057-
await splitAPKs.Select(splitAPK => InstallWriteAsync(device, splitAPK, $"{nameof(splitAPK)}{i++}", session, OnSplitSyncProgressChanged, cancellationToken)).WhenAll().ConfigureAwait(false);
1054+
await splitAPKs.Select((splitAPK, index) => InstallWriteAsync(device, splitAPK, $"{nameof(splitAPK)}{index}", session, OnSplitSyncProgressChanged, cancellationToken)).WhenAll().ConfigureAwait(false);
10581055

10591056
callback?.Invoke(new InstallProgressEventArgs(PackageInstallProgressState.Installing));
10601057
await InstallCommitAsync(device, session, cancellationToken).ConfigureAwait(false);
@@ -1100,8 +1097,7 @@ void OnSyncProgressChanged(string? sender, double args)
11001097
}
11011098
}
11021099

1103-
int i = 0;
1104-
await splitAPKs.Select(splitAPK => InstallWriteAsync(device, splitAPK, $"{nameof(splitAPK)}{i++}", session, OnSyncProgressChanged, cancellationToken)).WhenAll().ConfigureAwait(false);
1100+
await splitAPKs.Select((splitAPK, index) => InstallWriteAsync(device, splitAPK, $"{nameof(splitAPK)}{index}", session, OnSyncProgressChanged, cancellationToken)).WhenAll().ConfigureAwait(false);
11051101

11061102
callback?.Invoke(new InstallProgressEventArgs(PackageInstallProgressState.Installing));
11071103
await InstallCommitAsync(device, session, cancellationToken).ConfigureAwait(false);

‎AdvancedSharpAdbClient/AdvancedSharpAdbClient.csproj‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@
5959
<TargetPlatformMinVersion>10.0.15138.0</TargetPlatformMinVersion>
6060
</PropertyGroup>
6161

62+
<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0-windows10.0.17763.0'))">
63+
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
64+
</PropertyGroup>
65+
6266
<ItemGroup>
6367
<InternalsVisibleTo Include="AdvancedSharpAdbClient.Tests" />
6468
<InternalsVisibleTo Include="AdvancedSharpAdbClient.WinRT" />
@@ -107,7 +111,7 @@
107111
<ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'netstandard2.0'))
108112
and !$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'netcoreapp2.1'))
109113
and !$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'netstandard2.1'))">
110-
<PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
114+
<PackageReference Include="Microsoft.Bcl.HashCode" Version="6.0.0" />
111115
</ItemGroup>
112116

113117
<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'netstandard2.1'))">

‎AdvancedSharpAdbClient/DeviceCommands/PackageManager.Async.cs‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -166,13 +166,12 @@ void OnSplitSyncProgressChanged(string? sender, SyncProgressChangedEventArgs arg
166166

167167
await InstallMultipleRemotePackageAsync(baseRemoteFilePath, splitRemoteFilePaths, callback, cancellationToken, arguments);
168168

169-
callback?.Invoke(new InstallProgressEventArgs(0, splitRemoteFilePaths.Length + 1, PackageInstallProgressState.PostInstall));
170169
int count = 0;
170+
callback?.Invoke(new InstallProgressEventArgs(0, splitRemoteFilePaths.Length + 1, PackageInstallProgressState.PostInstall));
171171
await splitRemoteFilePaths.Select(async x =>
172172
{
173-
count++;
174173
await RemoveRemotePackageAsync(x, cancellationToken).ConfigureAwait(false);
175-
callback?.Invoke(new InstallProgressEventArgs(count, splitRemoteFilePaths.Length + 1, PackageInstallProgressState.PostInstall));
174+
callback?.Invoke(new InstallProgressEventArgs(++count, splitRemoteFilePaths.Length + 1, PackageInstallProgressState.PostInstall));
176175
}).WhenAll().ConfigureAwait(false);
177176

178177
if (count < splitRemoteFilePaths.Length)
@@ -240,13 +239,12 @@ void OnSyncProgressChanged(string? sender, SyncProgressChangedEventArgs args)
240239

241240
await InstallMultipleRemotePackageAsync(splitRemoteFilePaths, packageName, callback, cancellationToken, arguments);
242241

243-
callback?.Invoke(new InstallProgressEventArgs(0, splitRemoteFilePaths.Length, PackageInstallProgressState.PostInstall));
244242
int count = 0;
243+
callback?.Invoke(new InstallProgressEventArgs(0, splitRemoteFilePaths.Length, PackageInstallProgressState.PostInstall));
245244
await splitRemoteFilePaths.Select(async x =>
246245
{
247-
count++;
248246
await RemoveRemotePackageAsync(x, cancellationToken).ConfigureAwait(false);
249-
callback?.Invoke(new InstallProgressEventArgs(count, splitRemoteFilePaths.Length, PackageInstallProgressState.PostInstall));
247+
callback?.Invoke(new InstallProgressEventArgs(++count, splitRemoteFilePaths.Length, PackageInstallProgressState.PostInstall));
250248
}).WhenAll().ConfigureAwait(false);
251249

252250
if (count < splitRemoteFilePaths.Length)
@@ -284,10 +282,10 @@ public async Task InstallMultipleRemotePackageAsync(string baseRemoteFilePath, I
284282
callback?.Invoke(new InstallProgressEventArgs(1, splitRemoteFileCount + 1, PackageInstallProgressState.WriteSession));
285283

286284
int count = 0;
287-
await splitRemoteFilePaths.Select(async splitRemoteFilePath =>
285+
await splitRemoteFilePaths.Select(async (splitRemoteFilePath, index) =>
288286
{
289-
await WriteInstallSessionAsync(session, $"split{count++}", splitRemoteFilePath, cancellationToken).ConfigureAwait(false);
290-
callback?.Invoke(new InstallProgressEventArgs(count, splitRemoteFileCount + 1, PackageInstallProgressState.WriteSession));
287+
await WriteInstallSessionAsync(session, $"split{index}", splitRemoteFilePath, cancellationToken).ConfigureAwait(false);
288+
callback?.Invoke(new InstallProgressEventArgs(++count, splitRemoteFileCount + 1, PackageInstallProgressState.WriteSession));
291289
}).WhenAll().ConfigureAwait(false);
292290

293291
if (count < splitRemoteFileCount)
@@ -329,10 +327,10 @@ public async Task InstallMultipleRemotePackageAsync(IEnumerable<string> splitRem
329327
callback?.Invoke(new InstallProgressEventArgs(0, splitRemoteFileCount, PackageInstallProgressState.WriteSession));
330328

331329
int count = 0;
332-
await splitRemoteFilePaths.Select(async splitRemoteFilePath =>
330+
await splitRemoteFilePaths.Select(async (splitRemoteFilePath, index) =>
333331
{
334-
await WriteInstallSessionAsync(session, $"split{count++}", splitRemoteFilePath, cancellationToken).ConfigureAwait(false);
335-
callback?.Invoke(new InstallProgressEventArgs(count, splitRemoteFileCount, PackageInstallProgressState.WriteSession));
332+
await WriteInstallSessionAsync(session, $"split{index}", splitRemoteFilePath, cancellationToken).ConfigureAwait(false);
333+
callback?.Invoke(new InstallProgressEventArgs(++count, splitRemoteFileCount, PackageInstallProgressState.WriteSession));
336334
}).WhenAll().ConfigureAwait(false);
337335

338336
if (count < splitRemoteFileCount)

‎AdvancedSharpAdbClient/DeviceCommands/PackageManager.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,8 +322,8 @@ void OnSyncProgressChanged(string? sender, SyncProgressChangedEventArgs args)
322322

323323
InstallMultipleRemotePackage(splitRemoteFilePaths, packageName, callback, arguments);
324324

325-
callback?.Invoke(new InstallProgressEventArgs(0, splitRemoteFilePaths.Length, PackageInstallProgressState.PostInstall));
326325
int count = 0;
326+
callback?.Invoke(new InstallProgressEventArgs(0, splitRemoteFilePaths.Length, PackageInstallProgressState.PostInstall));
327327
foreach (string splitRemoteFilePath in splitRemoteFilePaths)
328328
{
329329
RemoveRemotePackage(splitRemoteFilePath);

0 commit comments

Comments
 (0)