Skip to content

Commit

Permalink
Обновлены библиотеки
Browse files Browse the repository at this point in the history
  • Loading branch information
hoplik committed May 21, 2024
1 parent 0603f39 commit ccd507f
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 8 deletions.
22 changes: 16 additions & 6 deletions FirehoseFinder.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -465,7 +465,7 @@
</ItemGroup>
<ItemGroup>
<Content Include="adb.exe">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="AdbWinApi.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
Expand Down Expand Up @@ -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">
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
4 changes: 4 additions & 0 deletions Forms/Form1.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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")]

0 comments on commit ccd507f

Please sign in to comment.