Merge pull request #725 from isaacvale/master

filipw · web-flow · commit cc8e9e7e78ce · 2023-06-05T20:34:53.000+02:00
Remove hardwired return type in ExecuteScriptCommand
diff --git 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
@@ -18,6 +18,11 @@ public PublishCommand(ScriptConsole scriptConsole, LogFactory logFactory)
         }
 
         public void Execute(PublishCommandOptions options)
+        { 
+            Execute<int>(options);
+        }
+
+        public void Execute<TReturn>(PublishCommandOptions options)
         {
             var absoluteFilePath = options.File.Path;
 
@@ -41,11 +46,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
@@ -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;
                 });
             });

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public async Task<TReturn> Run<TReturn, THost>(ExecuteScriptCommandOptions optio`
`31`	`31`	`return await DownloadAndRunCode<TReturn>(options);`
`32`	`32`	`}`
`33`	`33`
`34`		`- var pathToLibrary = GetLibrary(options);`
	`34`	`+ var pathToLibrary = GetLibrary<TReturn>(options);`
`35`	`35`
`36`	`36`	`var libraryOptions = new ExecuteLibraryCommandOptions(pathToLibrary, options.Arguments, options.NoCache)`
`37`	`37`	`{`
`@@ -50,7 +50,7 @@ private async Task<TReturn> DownloadAndRunCode<TReturn>(ExecuteScriptCommandOpti`
`50`	`50`	`return await new ExecuteCodeCommand(_scriptConsole, _logFactory).Execute<TReturn>(options);`
`51`	`51`	`}`
`52`	`52`
`53`		`- private string GetLibrary(ExecuteScriptCommandOptions executeOptions)`
	`53`	`+ private string GetLibrary<TReturn>(ExecuteScriptCommandOptions executeOptions)`
`54`	`54`	`{`
`55`	`55`	`var projectFolder = FileUtils.GetPathToScriptTempFolder(executeOptions.File.Path);`
`56`	`56`	`var executionCacheFolder = Path.Combine(projectFolder, "execution-cache");`
`@@ -70,7 +70,7 @@ private string GetLibrary(ExecuteScriptCommandOptions executeOptions)`
`70`	`70`	`AssemblyLoadContext = executeOptions.AssemblyLoadContext`
`71`	`71`	`#endif`
`72`	`72`	`};`
`73`		`- new PublishCommand(_scriptConsole, _logFactory).Execute(options);`
	`73`	`+ new PublishCommand(_scriptConsole, _logFactory).Execute<TReturn>(options);`
`74`	`74`	`if (hash != null)`
`75`	`75`	`{`
`76`	`76`	`File.WriteAllText(Path.Combine(executionCacheFolder, "script.sha256"), hash);`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,11 @@ public PublishCommand(ScriptConsole scriptConsole, LogFactory logFactory)`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`public void Execute(PublishCommandOptions options)`
	`21`	`+ {`
	`22`	`+ Execute<int>(options);`
	`23`	`+ }`
	`24`	`+`
	`25`	`+ public void Execute<TReturn>(PublishCommandOptions options)`
`21`	`26`	`{`
`22`	`27`	`var absoluteFilePath = options.File.Path;`
`23`	`28`
`@@ -41,11 +46,11 @@ public void Execute(PublishCommandOptions options)`
`41`	`46`
`42`	`47`	`if (options.PublishType == PublishType.Library)`
`43`	`48`	`{`
`44`		`- publisher.CreateAssembly<int, CommandLineScriptGlobals>(context, _logFactory, options.LibraryName);`
	`49`	`+ publisher.CreateAssembly<TReturn, CommandLineScriptGlobals>(context, _logFactory, options.LibraryName);`
`45`	`50`	`}`
`46`	`51`	`else`
`47`	`52`	`{`
`48`		`- publisher.CreateExecutable<int, CommandLineScriptGlobals>(context, _logFactory, options.RuntimeIdentifier, options.LibraryName);`
	`53`	`+ publisher.CreateExecutable<TReturn, CommandLineScriptGlobals>(context, _logFactory, options.RuntimeIdentifier, options.LibraryName);`
`49`	`54`	`}`
`50`	`55`	`}`
`51`	`56`	`}`