From ccd507f0bf15f096c69617b05626ee5c889d85c1 Mon Sep 17 00:00:00 2001
From: Alexander Sergeev <sergeevalexander@hotmail.com>
Date: Wed, 22 May 2024 01:20:55 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D1=8B=20=D0=B1=D0=B8=D0=B1=D0=BB=D0=B8=D0=BE=D1=82=D0=B5?=
 =?UTF-8?q?=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FirehoseFinder.csproj      | 22 ++++++++++++++++------
 Forms/Form1.cs             |  4 ++++
 Properties/AssemblyInfo.cs |  4 ++--
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/FirehoseFinder.csproj b/FirehoseFinder.csproj
index 35ac6e9..cb425b7 100644
--- a/FirehoseFinder.csproj
+++ b/FirehoseFinder.csproj
@@ -35,8 +35,8 @@
     <WebPage>publish.htm</WebPage>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
     <AutorunEnabled>true</AutorunEnabled>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>24.5.22.0</ApplicationVersion>
+    <ApplicationRevision>2</ApplicationRevision>
+    <ApplicationVersion>24.5.22.2</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
@@ -424,7 +424,7 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
     <Content Include="fastboot.exe">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <Content Include="ForFound.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -465,7 +465,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="adb.exe">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <Content Include="AdbWinApi.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -515,6 +515,16 @@
       <IncludeHash>True</IncludeHash>
       <FileType>File</FileType>
     </PublishFile>
+    <PublishFile Include="zh-Hans\FirehoseFinder.resources">
+      <Visible>False</Visible>
+      <Group>
+      </Group>
+      <TargetPath>
+      </TargetPath>
+      <PublishState>Include</PublishState>
+      <IncludeHash>True</IncludeHash>
+      <FileType>Satellite</FileType>
+    </PublishFile>
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions">
@@ -530,7 +540,7 @@
       <Version>2.0.3</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Packaging">
-      <Version>6.9.1</Version>
+      <Version>6.10.0</Version>
     </PackageReference>
     <PackageReference Include="SharpAdbClient">
       <Version>2.3.23</Version>
@@ -566,7 +576,7 @@
       <Version>4.3.0</Version>
     </PackageReference>
     <PackageReference Include="System.Drawing.Common">
-      <Version>8.0.4</Version>
+      <Version>8.0.5</Version>
     </PackageReference>
     <PackageReference Include="System.Globalization">
       <Version>4.3.0</Version>
diff --git a/Forms/Form1.cs b/Forms/Form1.cs
index a53c1c2..ffae488 100644
--- a/Forms/Form1.cs
+++ b/Forms/Form1.cs
@@ -2226,6 +2226,10 @@ private bool ADB_Check()
             textBox_main_term.AppendText(result.ToString() + Environment.NewLine);
             //Подключаем клиента (устройства)
             AdbClient client = new AdbClient();
+            //Пишем версию ADB
+            int version = client.GetAdbVersion();
+            textBox_soft_term.AppendText(LocRes.GetString("version") + '\u003A' + '\u0020' + version.ToString() + Environment.NewLine);
+            textBox_main_term.AppendText(LocRes.GetString("version") + '\u003A' + '\u0020' + version.ToString() + Environment.NewLine);
             List<DeviceData> devices = new List<DeviceData>(client.GetDevices());
             //Заполнили листвью наименованием и транспортом
             foreach (DeviceData dev in devices)
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
index e983215..9b2d52c 100644
--- a/Properties/AssemblyInfo.cs
+++ b/Properties/AssemblyInfo.cs
@@ -32,6 +32,6 @@
 // Можно задать все значения или принять номера сборки и редакции по умолчанию 
 // используя "*", как показано ниже:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("24.5.22.0")]
-[assembly: AssemblyFileVersion("24.5.22.0")]
+[assembly: AssemblyVersion("24.5.22.2")]
+[assembly: AssemblyFileVersion("24.5.22.2")]
 [assembly: NeutralResourcesLanguage("ru-RU")]