Fix issue #116: migrate to dotnet 9 and use new features if applicable

kevinboss · Dec 14, 2024 · f93789d · f93789d
1 parent e3abb27
commit f93789d
Show file tree

Hide file tree

Showing 4 changed files with 1,918 additions and 35 deletions.
diff --git a/src/ImageIdentifierAndTagEvaluator.cs b/src/ImageIdentifierAndTagEvaluator.cs
@@ -1,13 +1,8 @@
 namespace port;
 
-internal class ImageIdentifierAndTagEvaluator : IImageIdentifierAndTagEvaluator
+internal class ImageIdentifierAndTagEvaluator(port.Config.Config config) : IImageIdentifierAndTagEvaluator
 {
-    private readonly port.Config.Config _config;
-
-    public ImageIdentifierAndTagEvaluator(port.Config.Config config)
-    {
-        _config = config;
-    }
+    private readonly port.Config.Config _config = config;
 
     public (string identifier, string tag) Evaluate(string imageIdentifier)
     {
@@ -24,4 +19,4 @@ public ImageIdentifierAndTagEvaluator(port.Config.Config config)
 
         return (imageConfig.Identifier, imageConfig.ImageTags.Single());
     }
-}
+}
diff --git a/src/Program.cs b/src/Program.cs
@@ -61,24 +61,16 @@
 app.Configure(appConfig =>
 {
     appConfig.UseAssemblyInformationalVersion();
-    appConfig.AddCommand<PullCliCommand>("pull")
-        .WithAlias("p");
-    appConfig.AddCommand<RunCliCommand>("run")
-        .WithAlias("r");
-    appConfig.AddCommand<ResetCliCommand>("reset")
-        .WithAlias("rs");
-    appConfig.AddCommand<CommitCliCommand>("commit")
-        .WithAlias("c");
-    appConfig.AddCommand<ListCliCommand>("list")
-        .WithAlias("ls");
-    appConfig.AddCommand<RemoveCliCommand>("remove")
-        .WithAlias("rm");
-    appConfig.AddCommand<PruneCliCommand>("prune")
-        .WithAlias("pr");
-    appConfig.AddCommand<StopCliCommand>("stop")
-        .WithAlias("s");
-    appConfig.AddCommand<ConfigCliCommand>("config")
-        .WithAlias("cfg");
+
+    appConfig.AddCommand<PullCliCommand>("pull").WithAlias("p");
+    appConfig.AddCommand<RunCliCommand>("run").WithAlias("r");
+    appConfig.AddCommand<ResetCliCommand>("reset").WithAlias("rs");
+    appConfig.AddCommand<CommitCliCommand>("commit").WithAlias("c");
+    appConfig.AddCommand<ListCliCommand>("list").WithAlias("ls");
+    appConfig.AddCommand<RemoveCliCommand>("remove").WithAlias("rm");
+    appConfig.AddCommand<PruneCliCommand>("prune").WithAlias("pr");
+    appConfig.AddCommand<StopCliCommand>("stop").WithAlias("s");
+    appConfig.AddCommand<ConfigCliCommand>("config").WithAlias("cfg");
 });
 
 AnsiConsole.Console = new CustomConsole();
@@ -87,16 +79,15 @@
 {
     config.SetExceptionHandler((exception, _) =>
     {
-        switch (exception)
+        if (exception is TimeoutException)
         {
-            case TimeoutException:
-                AnsiConsole.MarkupLine("[red]Timeout exception occurred[/], is the Docker daemon running?");
-                return -1;
-            default:
-                AnsiConsole.WriteException(exception, ExceptionFormats.ShortenEverything);
-                return -1;
+            AnsiConsole.MarkupLine("[red]Timeout exception occurred[/], is the Docker daemon running?");
+            return -1;
         }
+
+        AnsiConsole.WriteException(exception, ExceptionFormats.ShortenEverything);
+        return -1;
     });
 });
 
-return app.Run(args);
+return app.Run(args);