From 0e0f1866c965c6433095ef8b858c7d0918bc6e8b Mon Sep 17 00:00:00 2001 From: Trudy Date: Wed, 18 Jan 2023 10:38:48 -0800 Subject: [PATCH] Publish v2.6.337 --- Pub/PublishApps.ps1 | 3 +- Pub/PublishServerApps.ps1 | 3 +- VpnHood.Server.App.Net/Pub/publish_linux.ps1 | 37 -------------------- 3 files changed, 4 insertions(+), 39 deletions(-) delete mode 100644 VpnHood.Server.App.Net/Pub/publish_linux.ps1 diff --git a/Pub/PublishApps.ps1 b/Pub/PublishApps.ps1 index ce1ca041c..45b3f40a8 100644 --- a/Pub/PublishApps.ps1 +++ b/Pub/PublishApps.ps1 @@ -46,7 +46,8 @@ if ($client) if ($server) { & "$solutionDir/VpnHood.Server.App.Net/Pub/publish_win.ps1"; - & "$solutionDir/VpnHood.Server.App.Net/Pub/publish_linux.ps1"; + & "$solutionDir/VpnHood.Server.App.Net/Pub/publish_linux_x64.ps1"; + & "$solutionDir/VpnHood.Server.App.Net/Pub/publish_linux_arm64.ps1"; & "$solutionDir/VpnHood.Server.App.Net/Pub/publish_docker.ps1" -distribute $distribute; } diff --git a/Pub/PublishServerApps.ps1 b/Pub/PublishServerApps.ps1 index d6eafce22..d46e3933d 100644 --- a/Pub/PublishServerApps.ps1 +++ b/Pub/PublishServerApps.ps1 @@ -13,7 +13,8 @@ $noclean = $true; # publish server & "$solutionDir/VpnHood.Server.App.Net/Pub/publish_win.ps1"; - & "$solutionDir/VpnHood.Server.App.Net/Pub/publish_linux.ps1"; + & "$solutionDir/VpnHood.Server.App.Net/Pub/publish_linux_x64.ps1"; + & "$solutionDir/VpnHood.Server.App.Net/Pub/publish_linux_arm64.ps1"; & "$solutionDir/VpnHood.Server.App.Net/Pub/publish_docker.ps1" -distribute $distribute; # upload diff --git a/VpnHood.Server.App.Net/Pub/publish_linux.ps1 b/VpnHood.Server.App.Net/Pub/publish_linux.ps1 deleted file mode 100644 index ad4e1d6db..000000000 --- a/VpnHood.Server.App.Net/Pub/publish_linux.ps1 +++ /dev/null @@ -1,37 +0,0 @@ -Write-Host; -Write-Host "*** Creating Linux Server Module..." -BackgroundColor Blue -ForegroundColor White; - -# Init script -$projectDir = Split-Path $PSScriptRoot -Parent; -$projectFile = (Get-ChildItem -path $projectDir -file -Filter "*.csproj").FullName; -. "$projectDir/../Pub/Common.ps1"; - -#update project version -UpdateProjectVersion $projectFile; - -# prepare module folders -$moduleDir = "$packagesServerDir/linux-x64"; -$moduleDirLatest = "$packagesServerDirLatest/linux-x64"; -PrepareModuleFolder $moduleDir $moduleDirLatest; - -# Creating linux package -$templateDir = "$PSScriptRoot/Linux"; -$template_installScriptFile = "$templateDir/install.sh"; -$template_launcherFile = "$templateDir/vhserver.sh"; -$template_updaterFile = "$templateDir/updater.sh"; - -$publishDir = "$projectDir/bin/release/publish-linux"; -$publish_infoDir = "$publishDir/$versionTag/publish_info"; -$publish_updaterFile = "$publish_infoDir/vhupdate"; -$publish_launcherFile = "$publish_infoDir/vhserver"; -$publish_InfoFile = "$publish_infoDir/publish.json"; - -$module_InfoFile = "$moduleDir/VpnHoodServer-linux-x64.json"; -$module_InstallerFile = "$moduleDir/VpnHoodServer-linux-x64.sh"; -$module_PackageFile = "$moduleDir/VpnHoodServer-linux-x64.tar.gz"; - -$lineEnding = "`n"; -$runtime = "linux-x64"; -$launcher_exeFile = "$versionTag/VpnHoodServer"; - -. "$PSScriptRoot\publish_impl.ps1";