From f09136c6a98797f60756ed2b1fb7d1ecf1956c5c Mon Sep 17 00:00:00 2001
From: isaacvale <4448394+isaacvale@users.noreply.github.com>
Date: Thu, 25 May 2023 13:21:50 +0200
Subject: [PATCH 1/2] Remove hardwired return type, push up to Program.cs and
 pass generic type

---
 src/Dotnet.Script.Core/Commands/ExecuteScriptCommand.cs | 6 +++---
 src/Dotnet.Script.Core/Commands/PublishCommand.cs       | 6 +++---
 src/Dotnet.Script/Program.cs                            | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Dotnet.Script.Core/Commands/ExecuteScriptCommand.cs b/src/Dotnet.Script.Core/Commands/ExecuteScriptCommand.cs
index 4b3b176a..0712495a 100644
--- a/src/Dotnet.Script.Core/Commands/ExecuteScriptCommand.cs
+++ b/src/Dotnet.Script.Core/Commands/ExecuteScriptCommand.cs
@@ -31,7 +31,7 @@ public async Task<TReturn> Run<TReturn, THost>(ExecuteScriptCommandOptions optio
                 return await DownloadAndRunCode<TReturn>(options);
             }
 
-            var pathToLibrary = GetLibrary(options);
+            var pathToLibrary = GetLibrary<TReturn>(options);
 
             var libraryOptions = new ExecuteLibraryCommandOptions(pathToLibrary, options.Arguments, options.NoCache)
             {
@@ -50,7 +50,7 @@ private async Task<TReturn> DownloadAndRunCode<TReturn>(ExecuteScriptCommandOpti
             return await new ExecuteCodeCommand(_scriptConsole, _logFactory).Execute<TReturn>(options);
         }
 
-        private string GetLibrary(ExecuteScriptCommandOptions executeOptions)
+        private string GetLibrary<TReturn>(ExecuteScriptCommandOptions executeOptions)
         {
             var projectFolder = FileUtils.GetPathToScriptTempFolder(executeOptions.File.Path);
             var executionCacheFolder = Path.Combine(projectFolder, "execution-cache");
@@ -70,7 +70,7 @@ private string GetLibrary(ExecuteScriptCommandOptions executeOptions)
                 AssemblyLoadContext = executeOptions.AssemblyLoadContext
 #endif
             };
-            new PublishCommand(_scriptConsole, _logFactory).Execute(options);
+            new PublishCommand(_scriptConsole, _logFactory).Execute<TReturn>(options);
             if (hash != null)
             {
                 File.WriteAllText(Path.Combine(executionCacheFolder, "script.sha256"), hash);
diff --git a/src/Dotnet.Script.Core/Commands/PublishCommand.cs b/src/Dotnet.Script.Core/Commands/PublishCommand.cs
index 7e5311eb..5e470b1d 100644
--- a/src/Dotnet.Script.Core/Commands/PublishCommand.cs
+++ b/src/Dotnet.Script.Core/Commands/PublishCommand.cs
@@ -17,7 +17,7 @@ public PublishCommand(ScriptConsole scriptConsole, LogFactory logFactory)
             _logFactory = logFactory;
         }
 
-        public void Execute(PublishCommandOptions options)
+        public void Execute<TReturn>(PublishCommandOptions options)
         {
             var absoluteFilePath = options.File.Path;
 
@@ -41,11 +41,11 @@ public void Execute(PublishCommandOptions options)
 
             if (options.PublishType == PublishType.Library)
             {
-                publisher.CreateAssembly<int, CommandLineScriptGlobals>(context, _logFactory, options.LibraryName);
+                publisher.CreateAssembly<TReturn, CommandLineScriptGlobals>(context, _logFactory, options.LibraryName);
             }
             else
             {
-                publisher.CreateExecutable<int, CommandLineScriptGlobals>(context, _logFactory, options.RuntimeIdentifier, options.LibraryName);
+                publisher.CreateExecutable<TReturn, CommandLineScriptGlobals>(context, _logFactory, options.RuntimeIdentifier, options.LibraryName);
             }
         }
     }
diff --git a/src/Dotnet.Script/Program.cs b/src/Dotnet.Script/Program.cs
index f24db369..06edc471 100644
--- a/src/Dotnet.Script/Program.cs
+++ b/src/Dotnet.Script/Program.cs
@@ -188,7 +188,7 @@ private static int Wain(string[] args)
                     );
 
                     var logFactory = CreateLogFactory(verbosity.Value(), debugMode.HasValue());
-                    new PublishCommand(ScriptConsole.Default, logFactory).Execute(options);
+                    new PublishCommand(ScriptConsole.Default, logFactory).Execute<int>(options);
                     return 0;
                 });
             });

From 7df630d3b19c4edf254f56f191066198e9d39a80 Mon Sep 17 00:00:00 2001
From: isaacvale <4448394+isaacvale@users.noreply.github.com>
Date: Mon, 5 Jun 2023 19:40:14 +0200
Subject: [PATCH 2/2] Update PublishCommand.cs

Keep previous method signature for backwards compatibility
---
 src/Dotnet.Script.Core/Commands/PublishCommand.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Dotnet.Script.Core/Commands/PublishCommand.cs b/src/Dotnet.Script.Core/Commands/PublishCommand.cs
index 5e470b1d..08a09ffb 100644
--- a/src/Dotnet.Script.Core/Commands/PublishCommand.cs
+++ b/src/Dotnet.Script.Core/Commands/PublishCommand.cs
@@ -17,6 +17,11 @@ public PublishCommand(ScriptConsole scriptConsole, LogFactory logFactory)
             _logFactory = logFactory;
         }
 
+        public void Execute(PublishCommandOptions options)
+        { 
+            Execute<int>(options);
+        }
+
         public void Execute<TReturn>(PublishCommandOptions options)
         {
             var absoluteFilePath = options.File.Path;