Добавлено временное копирование updater.exe

.gitea/workflows/release-package.yaml

@@ -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

ReleaseUpdater.Common/Options.cs

@@ -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>]";
+}

ReleaseUpdater.Common/ReleaseUpdater.Common.csproj

@@ -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>

ReleaseUpdater.slnx

@@ -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>

ReleaseUpdater/ReleaseUpdater.csproj

@@ -1,9 +1,29 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
+	  <TargetFramework>net8.0</TargetFramework>
+	  <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>

ReleaseUpdater/ReleaseUpdaterFacade.cs

@@ -72,7 +72,7 @@ public static class ReleaseUpdaterFacade
     /// Обновление через внешний 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)
+        string apiUrl, string? token, string installPath, string appExe, string versionOrLatest = "latest", string? updaterExePath = null, bool exitCurrentApp = false, string? tempUpdaterDirectory = null)
     {
         try
         {
@@ -83,24 +83,55 @@ public static class ReleaseUpdaterFacade
             var asset = release.Assets.FirstOrDefault(a => a.Name.EndsWith(".zip"))
                         ?? throw new Exception("No zip asset found");
 
+            string tempNumber = $"{Guid.NewGuid():N}";
+            var tempUpdaterName = $"updater_{tempNumber}.exe";
+
+            if (updaterExePath == null) updaterExePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Updater.exe");
+
+            if (string.IsNullOrWhiteSpace(tempUpdaterDirectory))
+            {
+                tempUpdaterDirectory = Path.GetDirectoryName(updaterExePath);
+                tempUpdaterDirectory = Path.Combine(tempUpdaterDirectory!, "tempUpdater");
+            }
+
+            if (!Directory.Exists(tempUpdaterDirectory)) 
+            { 
+                Directory.CreateDirectory(tempUpdaterDirectory);
+            }
+
+            var tempUpdaterPath = Path.Combine(tempUpdaterDirectory, tempUpdaterName!);
+
+
             var downloader = new HttpAssetDownloader();
-            var zipPath = await downloader.DownloadAssetAsync(asset.DownloadUrl, token);
+            var zipPath = await downloader.DownloadAssetAsync(asset.DownloadUrl, token, Path.Combine(tempUpdaterDirectory, $"updater_{tempNumber}.zip"));
 
             BeforeInstall?.Invoke();
 
+            File.Copy(updaterExePath, tempUpdaterPath);
 
-            if (updaterExePath == null) updaterExePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Updater.exe");
-            var args = $"--zip \"{zipPath}\" --installPath \"{installPath}\" --appExe \"{appExe}\"";
+            if (installPath.EndsWith("\\"))
+            {
+                installPath = installPath[0..(installPath.Length - 1)];
+            }
+
+            var updaterOptions = new Common.Options()
+            {
+                ZipPath = zipPath,
+                InstallPath = installPath,
+                AppExe = appExe,
+            };
 
             if (exitCurrentApp)
             {
                 int pid = Process.GetCurrentProcess().Id;
-                args += $" --waitProcess \"{pid}\"";
+                updaterOptions.WaitProcess = pid;
             }
 
+            var args = ArgumentsToolkit.ArgumentsParser.ToArguments(updaterOptions, true);
+
             var process = Process.Start(new ProcessStartInfo
             {
-                FileName = updaterExePath,
+                FileName = tempUpdaterPath,
                 Arguments = args,
                 UseShellExecute = true,
                 WorkingDirectory = AppDomain.CurrentDomain.BaseDirectory

Updater.Test/Program.cs

@@ -0,0 +1,21 @@
+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"; //токен
+
+        await ReleaseUpdaterFacade.UpdateWithExternalAsync(url, APIKey, installPath, appExe, "latest", updaterPath, true);
+
+        Console.ReadKey();
+    }
+}

Updater.Test/Updater.Test.csproj

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

Updater/Core/ExitCodes.cs

@@ -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;
+}

Updater/Core/Options.cs

@@ -1,74 +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;
-
-    /// <summary>Необязательно: дождаться завершения процесса.</summary>
-    public int? WaitProcess { get; init; } = null;
-
-    public static string Usage =>
-        "Usage: Updater.exe --zip <path.zip> --installPath <dir> --appExe <file.exe> [--restartDelayMs <int>] [--updateDelayMs <int>] [--waitProcess <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,
-            WaitProcess = dict.TryGetValue("waitProcess", out var pid) && int.TryParse(pid, out var pid_) ? pid_ : null,
-        };
-    }
-
-    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;
-}

Updater/Core/UpdaterApp.cs

@@ -1,4 +1,6 @@
-namespace Updater.Core;
+using ReleaseUpdater.Common;
+
+namespace Updater.Core;
 
 /// <summary>
 /// Управляет потоком обновлений: извлечение, установка, перезапуск.

Updater/Program.cs

@@ -1,5 +1,5 @@
-using System.Diagnostics;
-using System.Security.Cryptography;
+using ReleaseUpdater.Common;
+using System.Diagnostics;
 using Updater.Core;
 
 namespace Updater;
@@ -9,35 +9,34 @@ 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))
+            try
             {
-                logger.Info($"Waiting for the process to complete {options.WaitProcess}...");
-                proc.WaitForExit(); // блокирует выполнение до завершения процесса
-                logger.Info("Process is completed.");
+                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)
-        {
+            catch (ArgumentException)
+            {
                 logger.Info($"Process with PID {options.WaitProcess} not found.");
-        }
+            }
 
 
         var extractor = new ZipExtractor(logger);
@@ -45,6 +44,8 @@ internal sealed class Program
         var procMgr = new ProcessManager(logger);
         var app = new UpdaterApp(logger, extractor, installer, procMgr);
 
-        return app.Run(options);
+
+        var exitCode = app.Run(options);
+        return exitCode;
     }
 }

Updater/Updater.csproj

@@ -1,10 +1,29 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
+	<PropertyGroup>
+		<OutputType>Exe</OutputType>
+		<TargetFramework>net8.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+		<GenerateDocumentationFile>true</GenerateDocumentationFile>
+		<Version>1.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>

nuget.config

@@ -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>