From db149d16a7b5d78aa6b2673f9fc942e9a035b2f0 Mon Sep 17 00:00:00 2001 From: JustArchi Date: Thu, 13 Jul 2017 05:37:17 +0200 Subject: [PATCH] Fix AutoUpdate for self-builds, #586 --- ArchiSteamFarm/ASF.cs | 6 ++++++ ArchiSteamFarm/ArchiSteamFarm.csproj | 3 +++ ArchiSteamFarm/ArchiSteamFarm.version | 1 + ArchiSteamFarm/Program.cs | 4 +--- appveyor.yml | 2 +- 5 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 ArchiSteamFarm/ArchiSteamFarm.version diff --git a/ArchiSteamFarm/ASF.cs b/ArchiSteamFarm/ASF.cs index 97f003974..9a00c0de3 100644 --- a/ArchiSteamFarm/ASF.cs +++ b/ArchiSteamFarm/ASF.cs @@ -37,6 +37,7 @@ using ArchiSteamFarm.Localization; namespace ArchiSteamFarm { internal static class ASF { private const byte AutoUpdatePeriodInHours = 24; + private const string DefaultVersion = "source"; // Default entry of ArchiSteamFarm.version internal static readonly ArchiLogger ArchiLogger = new ArchiLogger(SharedInfo.ASF); @@ -81,6 +82,10 @@ namespace ArchiSteamFarm { return; } + if (version.Equals(DefaultVersion)) { + return; + } + if ((AutoUpdatesTimer == null) && Program.GlobalConfig.AutoUpdates) { TimeSpan autoUpdatePeriod = TimeSpan.FromHours(AutoUpdatePeriodInHours); @@ -290,6 +295,7 @@ namespace ArchiSteamFarm { } switch (version) { + case DefaultVersion: case "generic": case "linux-arm": case "linux-x64": diff --git a/ArchiSteamFarm/ArchiSteamFarm.csproj b/ArchiSteamFarm/ArchiSteamFarm.csproj index 44c69cefa..931865629 100644 --- a/ArchiSteamFarm/ArchiSteamFarm.csproj +++ b/ArchiSteamFarm/ArchiSteamFarm.csproj @@ -44,6 +44,9 @@ + + PreserveNewest + PreserveNewest diff --git a/ArchiSteamFarm/ArchiSteamFarm.version b/ArchiSteamFarm/ArchiSteamFarm.version new file mode 100644 index 000000000..5a18cd2fb --- /dev/null +++ b/ArchiSteamFarm/ArchiSteamFarm.version @@ -0,0 +1 @@ +source diff --git a/ArchiSteamFarm/Program.cs b/ArchiSteamFarm/Program.cs index f172e00c8..3b56d6cd5 100644 --- a/ArchiSteamFarm/Program.cs +++ b/ArchiSteamFarm/Program.cs @@ -184,9 +184,7 @@ namespace ArchiSteamFarm { ParsePostInitArgs(args); } - if (!Debugging.IsDebugBuild) { - await ASF.CheckForUpdate().ConfigureAwait(false); - } + await ASF.CheckForUpdate().ConfigureAwait(false); await ASF.InitBots().ConfigureAwait(false); ASF.InitEvents(); diff --git a/appveyor.yml b/appveyor.yml index 0f744cce6..86d3f303a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -33,7 +33,7 @@ after_test: dotnet publish -c "$env:CONFIGURATION" -r "$RUNTIME" -o "out\$RUNTIME" } - Add-Content "ArchiSteamFarm\out\$RUNTIME\ArchiSteamFarm.version" "$RUNTIME" + Set-Content -Path "ArchiSteamFarm\out\$RUNTIME\ArchiSteamFarm.version" -Value "$RUNTIME" 7z a -bd -tzip -mm=Deflate64 -mx=5 "ArchiSteamFarm\out\ASF-$RUNTIME.zip" "$env:APPVEYOR_BUILD_FOLDER\ArchiSteamFarm\out\$RUNTIME\*" Push-AppveyorArtifact "ArchiSteamFarm\out\ASF-$RUNTIME.zip" -FileName "ASF-$RUNTIME.zip" -DeploymentName "ASF-$RUNTIME.zip"