Support dev builds for auto updater

.github/workflows/build.yml

@@ -30,18 +30,18 @@ jobs:
       image: mono:${{ matrix.mono }}
 
     steps:
-      - uses: actions/checkout@v3
-
       - name: Adding HTTPS support to APT for old Mono images
         run: |
           apt-get update || true
           apt-get install -y apt-transport-https
+      - name: Installing checkout/build dependencies
+        run: apt-get update && apt-get install -y git
+      - uses: actions/checkout@v3
+
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v3
         with:
           dotnet-version: '7'
-      - name: Installing build dependencies
-        run: apt-get update && apt-get install -y git
       - name: Install runtime dependencies
         run: apt-get install -y xvfb
       - name: Restore cache for _build/tools

.github/workflows/deploy.yml

@@ -19,6 +19,8 @@ jobs:
       image: mono:latest
 
     steps:
+      - name: Installing checkout/build dependencies
+        run: apt-get update && apt-get install -y git make sed gzip fakeroot lintian dpkg-dev gpg createrepo
       - uses: actions/checkout@v3
 
       - name: Check version
@@ -35,8 +37,6 @@ jobs:
         uses: actions/setup-dotnet@v3
         with:
           dotnet-version: '7'
-      - name: Installing build dependencies
-        run: apt-get update && apt-get install -y git make sed gzip fakeroot lintian dpkg-dev gpg createrepo
       - name: Installing runtime dependencies
         run: apt-get install -y xvfb
       - name: Install Docker
@@ -119,6 +119,9 @@ jobs:
           echo "$DOCKERHUB_PASSWORD" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
           ./build docker-metadata --exclusive
 
+      - name: Create a version.json file for S3
+        shell: bash
+        run: python bin/version_info.py > _build/repack/Release/version.json
       - name: Push ckan.exe and netkan.exe to S3
         # Send ckan.exe and netkan.exe to https://ksp-ckan.s3-us-west-2.amazonaws.com/
         uses: jakejarvis/s3-sync-action@master

.github/workflows/release.yml

@@ -13,14 +13,14 @@ jobs:
       image: mono:latest
 
     steps:
+      - name: Installing checkout/build dependencies
+        run: apt-get update && apt-get install -y git make sed libplist-utils xorriso gzip fakeroot lintian rpm wget jq dpkg-dev gpg createrepo
       - uses: actions/checkout@v3
 
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v3
         with:
           dotnet-version: '7'
-      - name: Installing build dependencies
-        run: apt-get update && apt-get install -y git make sed libplist-utils xorriso gzip fakeroot lintian rpm wget jq dpkg-dev gpg createrepo
       - name: Installing runtime dependencies
         run: apt-get install -y xvfb
 

AutoUpdate/Main.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Diagnostics;
 using System.IO;
+using System.Runtime.InteropServices;
 using System.Threading;
 using System.Windows.Forms;
 
@@ -46,7 +47,7 @@ public static int Main(string[] args)
             // Wait for CKAN to close
             try
             {
-                if (IsOnWindows())
+                if (IsOnWindows)
                 {
                     // On Unix you can only wait for CHILD processes to exit
                     var process = Process.GetProcessById(Math.Abs(pid));
@@ -121,19 +122,19 @@ public static int Main(string[] args)
         private static void StartCKAN(string path)
         {
             // Start CKAN
-            if (IsOnMono())
+            if (IsOnMono)
             {
                 Process.Start("mono", string.Format("\"{0}\"", path));
             }
             else
             {
-                Process.Start(path);
+                Process.Start(path, "--asroot");
             }
         }
 
         private static void MakeExecutable(string path)
         {
-            if (!IsOnWindows())
+            if (!IsOnWindows)
             {
                 // TODO: It would be really lovely (and safer!) to use the native system
                 // call here: http://docs.go-mono.com/index.aspx?link=M:Mono.Unix.Native.Syscall.chmod
@@ -151,20 +152,14 @@ private static void MakeExecutable(string path)
         /// <summary>
         /// Are we on Mono?
         /// </summary>
-        private static bool IsOnMono()
-        {
-            return Type.GetType("Mono.Runtime") != null;
-        }
+        private static bool IsOnMono
+            => Type.GetType("Mono.Runtime") != null;
 
         /// <summary>
         /// Are we on Windows?
         /// </summary>
-        private static bool IsOnWindows()
-        {
-            PlatformID platform = Environment.OSVersion.Platform;
-            return platform != PlatformID.MacOSX &&
-                platform != PlatformID.Unix && platform != PlatformID.Xbox;
-        }
+        private static bool IsOnWindows
+            => RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
 
         /// <summary>
         /// Display unexpected exceptions to user

Cmdline/Action/Filter.cs

@@ -5,6 +5,8 @@
 using CommandLine;
 using CommandLine.Text;
 
+using CKAN.Configuration;
+
 namespace CKAN.CmdLine
 {
     /// <summary>
@@ -78,7 +80,7 @@ private int ListFilters(FilterListOptions opts)
                 return exitCode;
             }
 
-            var cfg = ServiceLocator.Container.Resolve<Configuration.IConfiguration>();
+            var cfg = ServiceLocator.Container.Resolve<IConfiguration>();
             user.RaiseMessage(Properties.Resources.FilterListGlobalHeader);
             foreach (string filter in cfg.GlobalInstallFilters)
             {
@@ -111,7 +113,7 @@ private int AddFilters(FilterAddOptions opts, string verb)
 
             if (opts.global)
             {
-                var cfg = ServiceLocator.Container.Resolve<Configuration.IConfiguration>();
+                var cfg = ServiceLocator.Container.Resolve<IConfiguration>();
                 var duplicates = cfg.GlobalInstallFilters
                     .Intersect(opts.filters)
                     .ToArray();
@@ -172,7 +174,7 @@ private int RemoveFilters(FilterRemoveOptions opts, string verb)
 
             if (opts.global)
             {
-                var cfg = ServiceLocator.Container.Resolve<Configuration.IConfiguration>();
+                var cfg = ServiceLocator.Container.Resolve<IConfiguration>();
                 var notFound = opts.filters
                     .Except(cfg.GlobalInstallFilters)
                     .ToArray();

Cmdline/Action/Upgrade.cs

@@ -3,9 +3,11 @@
 using System.Collections.Generic;
 using System.Transactions;
 
+using Autofac;
 using log4net;
 
 using CKAN.Versioning;
+using CKAN.Configuration;
 
 namespace CKAN.CmdLine
 {
@@ -47,38 +49,63 @@ public int RunCommand(CKAN.GameInstance instance, object raw_options)
                 user.RaiseMessage("  or   ckan upgrade --all");
                 if (AutoUpdate.CanUpdate)
                 {
-                    user.RaiseMessage("  or   ckan upgrade ckan");
+                    user.RaiseMessage("  or   ckan upgrade ckan [--stable-release|--dev-build]");
                 }
                 return Exit.BADOPT;
             }
 
             if (!options.upgrade_all && options.modules[0] == "ckan" && AutoUpdate.CanUpdate)
             {
-                user.RaiseMessage(Properties.Resources.UpgradeQueryingCKAN);
-                AutoUpdate.Instance.FetchLatestReleaseInfo();
-                var latestVersion = AutoUpdate.Instance.latestUpdate.Version;
-                var currentVersion = new ModuleVersion(Meta.GetVersion(VersionFormat.Short));
+                if (options.dev_build && options.stable_release)
+                {
+                    user.RaiseMessage(Properties.Resources.UpgradeCannotCombineFlags);
+                    return Exit.BADOPT;
+                }
+                var config = ServiceLocator.Container.Resolve<IConfiguration>();
+                var devBuild = options.dev_build
+                               || (!options.stable_release && config.DevBuilds);
+                if (devBuild != config.DevBuilds)
+                {
+                    config.DevBuilds = devBuild;
+                    user.RaiseMessage(
+                        config.DevBuilds
+                            ? Properties.Resources.UpgradeSwitchingToDevBuilds
+                            : Properties.Resources.UpgradeSwitchingToStableReleases);
+                }
 
-                if (latestVersion.IsGreaterThan(currentVersion))
+                user.RaiseMessage(Properties.Resources.UpgradeQueryingCKAN);
+                try
                 {
-                    user.RaiseMessage(Properties.Resources.UpgradeNewCKANAvailable, latestVersion);
-                    var releaseNotes = AutoUpdate.Instance.latestUpdate.ReleaseNotes;
-                    user.RaiseMessage(releaseNotes);
-                    user.RaiseMessage("");
-                    user.RaiseMessage("");
+                    var upd = new AutoUpdate();
+                    var update = upd.GetUpdate(config.DevBuilds);
+                    var latestVersion = update.Version;
+                    var currentVersion = new ModuleVersion(Meta.GetVersion());
 
-                    if (user.RaiseYesNoDialog(Properties.Resources.UpgradeProceed))
+                    if (!latestVersion.Equals(currentVersion))
                     {
-                        user.RaiseMessage(Properties.Resources.UpgradePleaseWait);
-                        AutoUpdate.Instance.StartUpdateProcess(false);
+                        user.RaiseMessage(Properties.Resources.UpgradeNewCKANAvailable, latestVersion);
+                        var releaseNotes = update.ReleaseNotes;
+                        user.RaiseMessage(releaseNotes);
+                        user.RaiseMessage("");
+                        user.RaiseMessage("");
+
+                        if (user.RaiseYesNoDialog(Properties.Resources.UpgradeProceed))
+                        {
+                            user.RaiseMessage(Properties.Resources.UpgradePleaseWait);
+                            upd.StartUpdateProcess(false, config.DevBuilds, user);
+                        }
+                    }
+                    else
+                    {
+                        user.RaiseMessage(Properties.Resources.UpgradeAlreadyHaveLatest);
                     }
+                    return Exit.OK;
                 }
-                else
+                catch (Exception exc)
                 {
-                    user.RaiseMessage(Properties.Resources.UpgradeAlreadyHaveLatest);
+                    user.RaiseError("Upgrade failed: {0}", exc.Message);
+                    return Exit.ERROR;
                 }
-
-                return Exit.OK;
             }
 
             try

Cmdline/Main.cs

@@ -113,27 +113,20 @@ public static int Execute(GameInstanceManager manager, CommonOptions opts, strin
                 }
             }
             catch (NoGameInstanceKraken)
-            {
-                return printMissingInstanceError(new ConsoleUser(false));
-            }
-            finally
             {
                 log.Info("CKAN exiting.");
+                return printMissingInstanceError(new ConsoleUser(false));
             }
 
-            // Why do we print "CKAN exiting" twice???
             Options cmdline;
             try
             {
                 cmdline = new Options(args);
             }
             catch (BadCommandKraken)
-            {
-                return AfterHelp();
-            }
-            finally
             {
                 log.Info("CKAN exiting.");
+                return AfterHelp();
             }
 
             // Process commandline options.
@@ -301,7 +294,7 @@ private static int Gui(GameInstanceManager manager, GuiOptions options, string[]
             // but trying to catch it here doesn't seem to help. Dunno why.
 
             // GUI expects its first param to be an identifier, don't confuse it
-            GUI.GUI.Main_(args.Except(new string[] {"--verbose", "--debug", "--show-console"})
+            GUI.GUI.Main_(args.Except(new string[] {"--verbose", "--debug", "--show-console", "--asroot"})
                               .ToArray(),
                           manager, options.ShowConsole);
 

Cmdline/Options.cs

@@ -405,6 +405,14 @@ internal class UpgradeOptions : InstanceSpecificOptions
         [Option("all", DefaultValue = false, HelpText = "Upgrade all available updated modules")]
         public bool upgrade_all { get; set; }
 
+        [Option("dev-build", DefaultValue = false,
+                HelpText = "For `ckan` option only, use dev builds")]
+        public bool dev_build { get; set; }
+
+        [Option("stable-release", DefaultValue = false,
+                HelpText = "For `ckan` option only, use stable releases")]
+        public bool stable_release { get; set; }
+
         [ValueList(typeof (List<string>))]
         [InstalledIdentifiers]
         public List<string> modules { get; set; }

Cmdline/Properties/Resources.resx

@@ -362,6 +362,9 @@ Try `ckan list` for a list of installed mods.</value></data>
   <data name="UpdateRemovedHeader" xml:space="preserve"><value>Removed modules [Name (CKAN identifier)]:</value></data>
   <data name="UpdateUpdatedHeader" xml:space="preserve"><value>Updated modules [Name (CKAN identifier)]:</value></data>
   <data name="UpdateSummary" xml:space="preserve"><value>Updated information on {0} compatible modules</value></data>
+  <data name="UpgradeCannotCombineFlags" xml:space="preserve"><value>The `--dev-build` and `--stable-release` flags cannot be combined!</value></data>
+  <data name="UpgradeSwitchingToDevBuilds" xml:space="preserve"><value>Switching to dev builds</value></data>
+  <data name="UpgradeSwitchingToStableReleases" xml:space="preserve"><value>Switching to stable releases</value></data>
   <data name="UpgradeQueryingCKAN" xml:space="preserve"><value>Querying the latest CKAN version</value></data>
   <data name="UpgradeNewCKANAvailable" xml:space="preserve"><value>New CKAN version available - {0}</value></data>
   <data name="UpgradeProceed" xml:space="preserve"><value>Proceed with install?</value></data>

ConsoleUI/ModListScreen.cs

@@ -9,6 +9,7 @@
 using CKAN.ConsoleUI.Toolkit;
 using CKAN.Extensions;
 using CKAN.Games;
+using CKAN.Configuration;
 
 namespace CKAN.ConsoleUI {
 
@@ -540,7 +541,7 @@ private bool EditAuthTokens(ConsoleTheme theme)
         private bool EditInstallFilters(ConsoleTheme theme)
         {
             LaunchSubScreen(theme, new InstallFiltersScreen(
-                ServiceLocator.Container.Resolve<Configuration.IConfiguration>(),
+                ServiceLocator.Container.Resolve<IConfiguration>(),
                 manager.CurrentInstance
             ));
             return true;