10 Commits

Author SHA1 Message Date
FrigaT
dea6be8094 fix
All checks were successful
CI / build-test (push) Successful in 33s
Release / pack-and-publish (release) Successful in 43s
2025-12-12 09:27:51 +03:00
FrigaT
72b0d60f3a доработано обновление
Some checks failed
CI / build-test (push) Failing after 55s
Release / pack-and-publish (release) Failing after 33s
2025-12-12 09:23:48 +03:00
9365aa16cd Добавлено временное копирование updater.exe
All checks were successful
CI / build-test (push) Successful in 37s
Release / pack-and-publish (release) Successful in 39s
2025-12-08 17:01:40 +03:00
36331e8664 Исправлена подпись
All checks were successful
CI / build-test (push) Successful in 35s
Release / pack-and-publish (release) Successful in 29s
2025-12-07 08:47:06 +03:00
d0e57d8d7b Добавлено обновление
All checks were successful
CI / build-test (push) Successful in 31s
2025-11-27 11:19:34 +03:00
16fbddcdc8 ci
All checks were successful
CI / build-test (push) Successful in 27s
Release / pack-and-publish (release) Successful in 33s
2025-11-27 11:14:09 +03:00
ec3d8de187 сборкка Common
All checks were successful
CI / build-test (push) Successful in 26s
Release / pack-and-publish (release) Successful in 28s
2025-11-27 11:10:30 +03:00
4f17192c01 выключение генерации пакета
All checks were successful
CI / build-test (push) Successful in 29s
Release / pack-and-publish (release) Successful in 29s
2025-11-27 11:00:34 +03:00
2cb585c222 Доработан вызов updater.exe
All checks were successful
CI / build-test (push) Successful in 30s
Release / pack-and-publish (release) Successful in 30s
2025-11-27 10:55:38 +03:00
cc490c7112 Добавлено ожидание процесса
All checks were successful
CI / build-test (push) Successful in 25s
Release / pack-and-publish (release) Successful in 27s
2025-11-25 09:52:11 +03:00
19 changed files with 353 additions and 176 deletions

View File

@@ -19,20 +19,31 @@ jobs:
with:
dotnet-version: 8.0.x
- name: Restore ReleaseUpdater
run: dotnet restore ReleaseUpdater
- name: Set version from tag
id: version
run: |
TAG="${GITHUB_REF_NAME#v}"
echo "PACKAGE_VERSION=$TAG" >> $GITHUB_OUTPUT
- name: Build ReleaseUpdater
run: dotnet build ReleaseUpdater -c Release -p:Version=${{ steps.version.outputs.PACKAGE_VERSION }}
- name: Replace ProjectReference with PackageReference
run: |
sed -i "s#<ProjectReference Include=\"..\/ReleaseUpdater.Common\/ReleaseUpdater.Common.csproj\" />#<PackageReference Include=\"ReleaseUpdater.Common\" Version=\"${{ steps.version.outputs.PACKAGE_VERSION }}\" />#" ReleaseUpdater/ReleaseUpdater.csproj
- name: Pack ReleaseUpdater
run: dotnet pack ReleaseUpdater -c Release --no-build -p:PackageVersion=${{ steps.version.outputs.PACKAGE_VERSION }} -o ./artifacts
- name: Build and Pack projects
run: |
mkdir -p artifacts
for proj in $PROJECTS; do
echo "Restoring $proj..."
dotnet restore $proj
echo "Building $proj..."
dotnet build $proj -c Release -p:Version=${{ steps.version.outputs.PACKAGE_VERSION }}
echo "Packing $proj..."
dotnet pack $proj -c Release --no-build -p:PackageVersion=${{ steps.version.outputs.PACKAGE_VERSION }} -o ./artifacts
done
env:
PROJECTS: |
ReleaseUpdater.Common
ReleaseUpdater
- name: Upload package artifact
uses: actions/upload-artifact@v3

View File

@@ -0,0 +1,34 @@
using ArgumentsToolkit;
namespace ReleaseUpdater.Common;
/// <summary>Параметры CLI для Updater.exe.</summary>
public sealed class Options
{
[Option(nameof(ZipPath), "z", "Путь к скачанному архиву (.zip).", true)]
/// <summary>Путь к скачанному архиву (.zip).</summary>
public string ZipPath { get; set; }
[Option(nameof(InstallPath), "i", "Целевой каталог установки.", true)]
/// <summary>Целевой каталог установки.</summary>
public string InstallPath { get; set; }
[Option(nameof(AppExe), "a", "Имя исполняемого файла приложения для перезапуска", true)]
/// <summary>Имя исполняемого файла приложения для перезапуска (e.g., MyBot.exe).</summary>
public string AppExe { get; set; }
[Option(nameof(RestartDelayMs), "rd", "Миллисекунды ожидания перед перезапуском", false, 500)]
/// <summary>Необязательно: подождите миллисекунды перед перезапуском.</summary>
public int RestartDelayMs { get; set; } = 500;
[Option(nameof(UpdateDelayMs), "ud", "Миллисекунды ожидания перед обновления", false, 500)]
/// <summary>Необязательно: подождите миллисекунды перед запуском обновления.</summary>
public int UpdateDelayMs { get; set; } = 500;
[Option(nameof(WaitProcess), "wp", "PID процесса, завершение которого необходимо дождаться", false)]
/// <summary>Необязательно: дождаться завершения процесса.</summary>
public int? WaitProcess { get; set; } = null;
public static string Usage =>
"Usage: Updater.exe --zip <path.zip> --installPath <dir> --appExe <file.exe> [--restartDelayMs <int>] [--updateDelayMs <int>] [--waitProcess <int>]";
}

View File

@@ -0,0 +1,25 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageId>ReleaseUpdater.Common</PackageId>
<Version>1.0.0</Version>
<Authors>FrigaT</Authors>
<Company>FrigaT</Company>
<Product>ReleaseUpdater</Product>
<Description>Система обновления приложений через github/gitea системы контроля версий.</Description>
<Copyright>Copyright © 2025 FrigaT</Copyright>
<RepositoryUrl>https://git.frigat.duckdns.org/FrigaT/ReleaseUpdater</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageProjectUrl>https://git.frigat.duckdns.org/FrigaT/ReleaseUpdater</PackageProjectUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="ArgumentsToolkit.Core" Version="0.0.3" />
</ItemGroup>
</Project>

View File

@@ -2,6 +2,8 @@
<Folder Name="/Элементы решения/">
<File Path="README.MD" />
</Folder>
<Project Path="ReleaseUpdater.Common/ReleaseUpdater.Common.csproj" Id="e8c120b2-6520-4652-bb85-00fcfa8077b7" />
<Project Path="ReleaseUpdater/ReleaseUpdater.csproj" />
<Project Path="Updater.Test/Updater.Test.csproj" />
<Project Path="Updater/Updater.csproj" />
</Solution>

View File

@@ -17,7 +17,7 @@ public sealed class ReleaseProvider
/// <param name="token">Токен авторизации (если требуется).</param>
/// <returns>Список релизов.</returns>
public async Task<IReadOnlyList<ReleaseInfo>> GetReleasesAsync(string apiUrl, string? token = null)
public async Task<IReadOnlyList<ReleaseInfo>> GetReleasesAsync(Uri apiUrl, string? token = null)
{
using var client = CreateClient(token);
using var resp = await client.GetAsync(apiUrl);
@@ -38,7 +38,7 @@ public sealed class ReleaseProvider
/// <param name="token">Токен авторизации (если требуется).</param>
/// <returns>Информация о релизе или null.</returns>
public async Task<ReleaseInfo?> FindReleaseAsync(string apiUrl, string? versionOrLatest, string? token = null)
public async Task<ReleaseInfo?> FindReleaseAsync(Uri apiUrl, string? versionOrLatest, string? token = null)
{
var all = await GetReleasesAsync(apiUrl, token);
if (string.IsNullOrWhiteSpace(versionOrLatest) || versionOrLatest.Equals("latest", StringComparison.OrdinalIgnoreCase))

View File

@@ -2,8 +2,28 @@
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageId>ReleaseUpdater</PackageId>
<Version>1.0.0</Version>
<Authors>FrigaT</Authors>
<Company>FrigaT</Company>
<Product>ReleaseUpdater</Product>
<Description>Система обновления приложений через github/gitea системы контроля версий.</Description>
<Copyright>Copyright © 2025 FrigaT</Copyright>
<RepositoryUrl>https://git.frigat.duckdns.org/FrigaT/ReleaseUpdater</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageProjectUrl>https://git.frigat.duckdns.org/FrigaT/ReleaseUpdater</PackageProjectUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="ArgumentsToolkit.Core" Version="0.0.3" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ReleaseUpdater.Common\ReleaseUpdater.Common.csproj" />
</ItemGroup>
</Project>

View File

@@ -1,5 +1,6 @@
using System.Diagnostics;
using System.IO.Compression;
using System.Reflection;
namespace ReleaseUpdater;
@@ -14,65 +15,47 @@ public static class ReleaseUpdaterFacade
/// </summary>
public static event Action? BeforeInstall;
/// <summary>
/// Событие вызывается после успешной установки новой версии.
/// </summary>
public static event Action? AfterInstall;
/// <summary>
/// Событие вызывается при ошибке обновления.
/// </summary>
public static event Action<Exception>? UpdateFailed;
/// <summary>
/// Событие вызывается, если текущая версия совпадает с требуемой.
/// </summary>
public static event Action<string>? AlreadyUp;
/// <summary>
/// Получает список доступных версий из Gitea.
/// </summary>
public static async Task<IReadOnlyList<string>> GetVersionsAsync(string apiUrl, string? token = null)
public static async Task<IReadOnlyList<string>> GetVersionsAsync(Uri apiUrl, string? token = null)
{
var provider = new ReleaseProvider();
var releases = await provider.GetReleasesAsync(apiUrl, token);
return releases.Select(r => r.TagName).ToList();
}
/// <summary>
/// Обновление без Updater.exe: скачивание, распаковка и перезапуск прямо из DLL.
/// </summary>
public static async Task UpdateInlineAsync(
string apiUrl, string? token, string installPath, string appExe, string versionOrLatest = "latest")
{
try
{
var provider = new ReleaseProvider();
var release = await provider.FindReleaseAsync(apiUrl, versionOrLatest, token)
?? throw new Exception("Release not found");
var asset = release.Assets.FirstOrDefault(a => a.Name.EndsWith(".zip"))
?? throw new Exception("No zip asset found");
var downloader = new HttpAssetDownloader();
var zipPath = await downloader.DownloadAssetAsync(asset.DownloadUrl, token);
BeforeInstall?.Invoke();
ZipFile.ExtractToDirectory(zipPath, installPath, true);
AfterInstall?.Invoke();
Process.Start(Path.Combine(installPath, appExe));
Environment.Exit(0);
}
catch (Exception ex)
{
UpdateFailed?.Invoke(ex);
RestartCurrent(installPath, appExe);
}
}
/// <summary>
/// Обновление через внешний Updater.exe.
/// </summary>
public static async Task UpdateWithExternalAsync(
string apiUrl, string? token, string installPath, string appExe, string versionOrLatest = "latest", string? updaterExePath = null, bool exitCurrentApp = false)
/// <param name="apiUrl">API github/gitea release</param>
/// <param name="token">Token авторизации</param>
/// <param name="installPath">Путь для установки приложения</param>
/// <param name="appExeName">Наименование файла приложения</param>
/// <param name="tempDirectory">Папка для временного хранилища zip архива</param>
/// <param name="updaterExePath">Путь к updater.exe</param>
/// <param name="versionOrLatest">Тэг с версией / "latest"</param>
/// <param name="assetMask">Маска наименовая ассета обновления. В маске может содержаться {version}</param>
public static async Task UpdateAsync(
Uri apiUrl,
string? token,
string installPath,
string appExeName,
string tempDirectory,
string updaterExePath,
string versionOrLatest = "latest",
string? assetMask = null
)
{
try
{
@@ -80,55 +63,90 @@ public static class ReleaseUpdaterFacade
var release = await provider.FindReleaseAsync(apiUrl, versionOrLatest, token)
?? throw new Exception("Release not found");
var asset = release.Assets.FirstOrDefault(a => a.Name.EndsWith(".zip"))
?? throw new Exception("No zip asset found");
var currentVersion = GetCurrentVersion(); // реализуй сам
if (SemVerService.Compare(release.TagName, currentVersion) > 0)
{
AlreadyUp?.Invoke(currentVersion);
return;
}
// Маска: myapp-{version}.zip
string? mask = assetMask?.Replace("{version}", release.TagName);
var asset = release.Assets.FirstOrDefault(a =>
mask != null
? a.Name.Equals(mask, StringComparison.OrdinalIgnoreCase)
: a.Name.EndsWith(".zip", StringComparison.OrdinalIgnoreCase)
) ?? throw new Exception("No matching asset found");
string tempNumber = $"{Guid.NewGuid():N}";
var tempUpdaterName = $"updater_{tempNumber}.exe";
if (string.IsNullOrWhiteSpace(tempDirectory))
{
tempDirectory = Path.GetTempPath();
}
else if (!Directory.Exists(tempDirectory))
{
Directory.CreateDirectory(tempDirectory);
}
var tempUpdaterPath = Path.Combine(tempDirectory, tempUpdaterName);
var downloader = new HttpAssetDownloader();
var zipPath = await downloader.DownloadAssetAsync(asset.DownloadUrl, token);
var zipPath = await downloader.DownloadAssetAsync(asset.DownloadUrl, token, Path.Combine(tempDirectory, $"updater_{tempNumber}.zip"));
File.Copy(updaterExePath, tempUpdaterPath);
if (installPath.EndsWith("\\"))
{
installPath = installPath[0..(installPath.Length - 1)];
}
var updaterOptions = new Common.Options()
{
ZipPath = zipPath,
InstallPath = installPath,
AppExe = appExeName,
};
int pid = Process.GetCurrentProcess().Id;
updaterOptions.WaitProcess = pid;
var args = ArgumentsToolkit.ArgumentsParser.ToArguments(updaterOptions, true);
BeforeInstall?.Invoke();
if (updaterExePath == null) updaterExePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Updater.exe");
var args = $"--zip \"{zipPath}\" --installPath \"{installPath}\" --appExe \"{appExe}\"";
var process = Process.Start(new ProcessStartInfo
{
FileName = updaterExePath,
FileName = tempUpdaterPath,
Arguments = args,
UseShellExecute = true,
WorkingDirectory = AppDomain.CurrentDomain.BaseDirectory
});
if (exitCurrentApp) { Environment.Exit(0); }
process?.WaitForExit();
if (process?.ExitCode == 0)
AfterInstall?.Invoke();
else
throw new Exception($"Updater.exe завершился с кодом {process?.ExitCode}");
Environment.Exit(0);
}
catch (Exception ex)
{
UpdateFailed?.Invoke(ex);
RestartCurrent(installPath, appExe);
}
}
private static void RestartCurrent(string installPath, string appExe)
/// <summary>
/// Получение текущей версии приложения
/// </summary>
/// <returns></returns>
public static string GetCurrentVersion()
{
var currentApp = Path.Combine(installPath, appExe);
if (File.Exists(currentApp))
{
Process.Start(new ProcessStartInfo
{
FileName = currentApp,
UseShellExecute = true,
WorkingDirectory = installPath
});
var entryAssembly = Assembly.GetEntryAssembly();
var attr = entryAssembly?.GetCustomAttribute<AssemblyInformationalVersionAttribute>();
return attr?.InformationalVersion
?? entryAssembly?.GetName().Version?.ToString().Split("+")[0]
?? "unknown";
}
}
}

View File

@@ -11,7 +11,7 @@ public sealed class SemVerService
/// <param name="version">Строка версии (например, "3.5.2").</param>
/// <param name="parsed">Результат парсинга.</param>
/// <returns>true, если парсинг успешен.</returns>
public bool TryParse(string version, out Version parsed)
public static bool TryParse(string version, out Version parsed)
{
var v = version.Trim().TrimStart('v');
return Version.TryParse(Normalize(v), out parsed);
@@ -34,7 +34,7 @@ public sealed class SemVerService
/// <param name="v1">Первая версия.</param>
/// <param name="v2">Вторая версия.</param>
/// <returns>-1 если v1 < v2, 0 если равны, 1 если v1 > v2.</returns>
public int Compare(string v1, string v2)
public static int Compare(string v1, string v2)
{
TryParse(v1, out var a);
TryParse(v2, out var b);

36
Updater.Test/Program.cs Normal file
View File

@@ -0,0 +1,36 @@
using ReleaseUpdater;
namespace Updater.Test;
internal class Program
{
static async Task Main(string[] args)
{
string installPath = AppDomain.CurrentDomain.BaseDirectory;
string appExe = "RetailUpdatesBot.exe";
string updaterPath = Path.Combine(installPath, "Tools\\Updater.exe");
var url = "https://git.frigat.duckdns.org/api/v1/repos/automacon/RetailUpdatesBot/releases";
var APIKey = "0552a77699d7506711946fc71cc6635515726bd1"; //токен
SemVerService.TryParse("v0.1.2", out var v1);
Console.WriteLine($"v0.1.2 - {v1}");
SemVerService.TryParse(ReleaseUpdaterFacade.GetCurrentVersion(), out var v2);
Console.WriteLine($"{ReleaseUpdaterFacade.GetCurrentVersion()} - {v2}");
Console.WriteLine(SemVerService.Compare("v0.1.2", ReleaseUpdaterFacade.GetCurrentVersion()));
await ReleaseUpdaterFacade.UpdateAsync(
apiUrl: new Uri(url),
token: APIKey,
installPath: installPath,
appExeName: appExe,
tempDirectory: Path.Combine(updaterPath, "Tools", "Temp"),
updaterExePath: updaterPath,
versionOrLatest: "latest",
assetMask: "RetailUpdatesBot-{version}.zip"
);
Console.ReadKey();
}
}

Binary file not shown.

View File

@@ -0,0 +1,21 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Version>2.0.0</Version>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\ReleaseUpdater\ReleaseUpdater.csproj" />
</ItemGroup>
<ItemGroup>
<None Update="Tools\Updater.exe">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
</Project>

15
Updater/Core/ExitCodes.cs Normal file
View File

@@ -0,0 +1,15 @@
namespace Updater.Core;
public static class ExitCodes
{
/// <summary>Успешное обновление.</summary>
public const int Ok = 0;
/// <summary>Неверные аргументы командной строки.</summary>
public const int InvalidArgs = 2;
/// <summary>Ошибка извлечения.</summary>
public const int ExtractFailed = 3;
/// <summary>Ошибка установки (копировать/заменить).</summary>
public const int InstallFailed = 4;
/// <summary>Ошибка перезапуска.</summary>
public const int RestartFailed = 5;
}

View File

@@ -1,70 +0,0 @@
namespace Updater.Core;
/// <summary>Параметры CLI для Updater.exe.</summary>
public sealed class Options
{
/// <summary>Путь к скачанному архиву (.zip).</summary>
public required string ZipPath { get; init; }
/// <summary>Целевой каталог установки.</summary>
public required string InstallPath { get; init; }
/// <summary>Имя исполняемого файла приложения для перезапуска (e.g., MyBot.exe).</summary>
public required string AppExe { get; init; }
/// <summary>Необязательно: подождите миллисекунды перед перезапуском.</summary>
public int RestartDelayMs { get; init; } = 500;
/// <summary>Необязательно: подождите миллисекунды перед запуском обновления.</summary>
public int UpdateDelayMs { get; init; } = 500;
public static string Usage =>
"Usage: Updater.exe --zip <path.zip> --installPath <dir> --appExe <file.exe> [--restartDelayMs <int>] [--updateDelayMs <int>]";
/// <summary>Папрсинг CLI аргументов в Options.</summary>
public static Options Parse(string[] args)
{
var dict = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
for (int i = 0; i < args.Length; i++)
{
if (!args[i].StartsWith("--")) continue;
var key = args[i][2..];
var val = (i + 1 < args.Length && !args[i + 1].StartsWith("--")) ? args[i + 1] : "true";
dict[key] = val;
}
var zip = Require(dict, "zip");
var install = Require(dict, "installPath");
var exe = Require(dict, "appExe");
if (!File.Exists(zip)) throw new FileNotFoundException("Zip not found", zip);
Directory.CreateDirectory(install);
return new Options
{
ZipPath = Path.GetFullPath(zip),
InstallPath = Path.GetFullPath(install),
AppExe = exe,
RestartDelayMs = dict.TryGetValue("restartDelayMs", out var d) && int.TryParse(d, out var n) ? n : 500,
UpdateDelayMs = dict.TryGetValue("updateDelayMs", out var d2) && int.TryParse(d2, out var n2) ? n2 : 500
};
}
private static string Require(IDictionary<string, string> dict, string key)
=> dict.TryGetValue(key, out var v) && !string.IsNullOrWhiteSpace(v)
? v : throw new ArgumentException($"Missing --{key}");
}
public static class ExitCodes
{
/// <summary>Успешное обновление.</summary>
public const int Ok = 0;
/// <summary>Неверные аргументы командной строки.</summary>
public const int InvalidArgs = 2;
/// <summary>Ошибка извлечения.</summary>
public const int ExtractFailed = 3;
/// <summary>Ошибка установки (копировать/заменить).</summary>
public const int InstallFailed = 4;
/// <summary>Ошибка перезапуска.</summary>
public const int RestartFailed = 5;
}

View File

@@ -23,12 +23,13 @@ public sealed class SafeFileInstaller : IInstaller
var rel = Path.GetRelativePath(sourceDir, src);
var dst = Path.Combine(installPath, rel);
var dstDir = Path.GetDirectoryName(dst)!;
Directory.CreateDirectory(dstDir);
if (!Directory.Exists(dstDir)) Directory.CreateDirectory(dstDir);
if (File.Exists(dst))
{
var bkp = Path.Combine(backupDir, rel);
Directory.CreateDirectory(Path.GetDirectoryName(bkp)!);
var bkpDir = Path.GetDirectoryName(bkp);
if (!Directory.Exists(bkpDir)) Directory.CreateDirectory(bkpDir!);
File.Copy(dst, bkp, overwrite: true);
}
@@ -63,7 +64,8 @@ public sealed class SafeFileInstaller : IInstaller
{
var rel = Path.GetRelativePath(backupDir, bkp);
var dst = Path.Combine(installPath, rel);
Directory.CreateDirectory(Path.GetDirectoryName(dst)!);
var dstDir = Path.GetDirectoryName(dst);
if (!Directory.Exists(dstDir)) Directory.CreateDirectory(dstDir!);
File.Copy(bkp, dst, overwrite: true);
}
}

View File

@@ -1,4 +1,6 @@
namespace Updater.Core;
using ReleaseUpdater.Common;
namespace Updater.Core;
/// <summary>
/// Управляет потоком обновлений: извлечение, установка, перезапуск.
@@ -10,6 +12,7 @@ public sealed class UpdaterApp
private readonly IInstaller _installer;
private readonly IProcessManager _proc;
/// <inheritdoc/>
public UpdaterApp(ILogger log, IExtractor extractor, IInstaller installer, IProcessManager proc)
{
_log = log;
@@ -32,6 +35,7 @@ public sealed class UpdaterApp
{
_log.Error($"Extraction failed: {ex.Message}");
Cleanup(tempExtractDir);
_proc.StartApp(opts.InstallPath, opts.AppExe, opts.RestartDelayMs);
return ExitCodes.ExtractFailed;
}
@@ -43,6 +47,7 @@ public sealed class UpdaterApp
{
_log.Error($"Install failed: {ex.Message}");
Cleanup(tempExtractDir);
_proc.StartApp(opts.InstallPath, opts.AppExe, opts.RestartDelayMs);
return ExitCodes.InstallFailed;
}

View File

@@ -1,4 +1,6 @@
using Updater.Core;
using ReleaseUpdater.Common;
using System.Diagnostics;
using Updater.Core;
namespace Updater;
@@ -7,26 +9,43 @@ internal sealed class Program
static int Main(string[] args)
{
var logger = new ConsoleLogger();
Options? options;
try
var parseResult = ArgumentsToolkit.ArgumentsParser.Parse<Options>(args);
if (!parseResult.Success)
{
options = Options.Parse(args);
}
catch (Exception ex)
{
logger.Error($"Arguments error: {ex.Message}");
Console.WriteLine(Options.Usage);
logger.Error($"Arguments error:");
parseResult.Errors.ForEach(t => logger.Error(t.Message));
return ExitCodes.InvalidArgs;
}
var options = parseResult.Value!;
Thread.Sleep(options.UpdateDelayMs);
if (options.WaitProcess != null)
try
{
using (var proc = Process.GetProcessById(options.WaitProcess.Value))
{
logger.Info($"Waiting for the process to complete {options.WaitProcess}...");
proc.WaitForExit(); // блокирует выполнение до завершения процесса
logger.Info("Process is completed.");
}
}
catch (ArgumentException)
{
logger.Info($"Process with PID {options.WaitProcess} not found.");
}
var extractor = new ZipExtractor(logger);
var installer = new SafeFileInstaller(logger);
var procMgr = new ProcessManager(logger);
var app = new UpdaterApp(logger, extractor, installer, procMgr);
return app.Run(options);
var exitCode = app.Run(options);
return exitCode;
}
}

View File

@@ -0,0 +1,8 @@
{
"profiles": {
"Updater": {
"commandName": "Project",
"commandLineArgs": "-z \"C:\\Job\\Projects\\FrigaT\\ReleaseUpdater\\Updater.Test\\bin\\Debug\\net8.0\\Tools\\tempUpdater\\updater_32f606dc1cda473ab953206927bf047b.zip\" -i \"C:\\Job\\Projects\\FrigaT\\ReleaseUpdater\\Updater.Test\\bin\\Debug\\net8.0\" -a \"RetailUpdatesBot.exe\" -rd \"500\" -ud \"500\" -wp \"31408\""
}
}
}

View File

@@ -5,6 +5,25 @@
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<Version>2.0.0</Version>
<Authors>FrigaT</Authors>
<Company>FrigaT</Company>
<Product>ReleaseUpdater</Product>
<Description>Запускатор обновления</Description>
<Copyright>Copyright © 2025 FrigaT</Copyright>
<RepositoryUrl>https://git.frigat.duckdns.org/FrigaT/ReleaseUpdater</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageProjectUrl>https://git.frigat.duckdns.org/FrigaT/ReleaseUpdater</PackageProjectUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="ArgumentsToolkit" Version="0.0.3" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ReleaseUpdater.Common\ReleaseUpdater.Common.csproj" />
</ItemGroup>
</Project>

12
nuget.config Normal file
View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="Gitea_FrigaT" value="https://git.frigat.duckdns.org/api/packages/FrigaT/nuget/index.json" />
</packageSources>
<packageSourceCredentials>
<GiteaFeed>
<add key="Username" value="FrigaT" />
<add key="ClearTextPassword" value="e5a0d9cc9684bbb4bf8d3f12fd2d0b43f9b0f336" />
</GiteaFeed>
</packageSourceCredentials>
</configuration>