修复已启动 ADB 服务器时未判断存在 ADB

#352

Author: wherewhere

APKInstaller/AAPTForNet/AAPTForNet.csproj

@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'">
-    <PackageReference Include="System.Drawing.Common" Version="8.0.17" />
+    <PackageReference Include="System.Drawing.Common" Version="8.0.19" />
   </ItemGroup>
 
   <ItemGroup>

APKInstaller/APKInstaller/APKInstaller.csproj

@@ -55,10 +55,10 @@
     <PackageReference Include="CommunityToolkit.WinUI.UI.Controls.DataGrid" Version="7.1.2" />
     <PackageReference Include="CommunityToolkit.WinUI.UI.Controls.Layout" Version="7.1.2" />
     <PackageReference Include="CommunityToolkit.WinUI.UI.Controls.Markdown" Version="7.1.2" />
-    <PackageReference Include="Downloader" Version="3.3.4" />
+    <PackageReference Include="Downloader" Version="4.0.3" />
     <PackageReference Include="MetroLog.Net6" Version="2.1.0" />
     <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.183" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.4188" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.4654" />
     <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.7.250606001" />
     <PackageReference Include="QRCoder" Version="1.6.0" />
     <PackageReference Include="SharpCompress" Version="0.40.0" />

APKInstaller/APKInstaller/ViewModels/InstallViewModel.cs

@@ -752,14 +752,19 @@ public async Task InitADBFile()
                     {
                         XamlRoot = _page?.XamlRoot,
                         Title = _loader.GetString("ADBMissing"),
-                        //PrimaryButtonText = _loader.GetString("Download"),
                         SecondaryButtonText = _loader.GetString("Select"),
                         CloseButtonText = _loader.GetString("Cancel"),
                         Content = new ScrollViewer
                         {
                             Content = StackPanel
                         },
-                        DefaultButton = ContentDialogButton.Secondary
+                        DefaultButton = ContentDialogButton.Secondary,
+                        IsDoubleTapEnabled = true
+                    };
+                    dialog.DoubleTapped += (s, e) =>
+                    {
+                        dialog.PrimaryButtonText = _loader.GetString("Download");
+                        dialog.DefaultButton = ContentDialogButton.Primary;
                     };
                     ProgressHelper.SetState(ProgressState.None, true);
                     ContentDialogResult result = await dialog.ShowAsync();
@@ -1018,14 +1023,14 @@ private async Task InitializeADB()
                             IsADBReady = false;
                             return;
                         }
-                        IsADBReady = true;
                     }
                     else
                     {
                         IsADBReady = false;
                         return;
                     }
                 }
+                IsADBReady = true;
                 WaitProgressText = _loader.GetString("Loading");
                 if (!await CheckDevice())
                 {

APKInstaller/Zeroconf/Zeroconf.csproj

@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.6" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.8" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>