[release/9.0.1xx-preview7] Add support to generate publish WebJob Run command file compatible wi… (#42313)

Author: anvillan

src/WebSdk/Publish/Targets/TransformTargets/Microsoft.NET.Sdk.Publish.TransformFiles.targets

@@ -244,6 +244,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
       <_UseAppHost Condition=" '$(_UseAppHost)' == '' ">$(SelfContained)</_UseAppHost>
       <_UseAppHost Condition=" '$(_UseAppHost)' == '' Or '$(RuntimeIdentifier)' == '' ">false</_UseAppHost>
       <_ExecutableExtension Condition=" '$(_ExecutableExtension)' == '' And $(RuntimeIdentifier.StartsWith('win')) ">.exe</_ExecutableExtension>
+      <_IsLinux Condition=" '$(IsLinux)' == 'True'">true</_IsLinux>
     </PropertyGroup>
 
     <GenerateRunCommandFile
@@ -252,6 +253,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
         TargetPath="$(TargetPath)"
         WebJobsDirectory="$(PublishIntermediateOutputPath)\app_data\Jobs\$(WebJobType)\$(WebJobName)\"
         UseAppHost="$(_UseAppHost)"
-        ExecutableExtension="$(_ExecutableExtension)" />
+        ExecutableExtension="$(_ExecutableExtension)"
+        IsLinux="$(_IsLinux)" />
   </Target>
 </Project>

src/WebSdk/Publish/Tasks/Tasks/WebJobs/GenerateRunCommandFile.cs

@@ -7,7 +7,7 @@ namespace Microsoft.NET.Sdk.Publish.Tasks.WebJobs
 {
     public class GenerateRunCommandFile : Task
     {
-        private const string RunCommandFile = "run.cmd";
+        private const string RunCommandFile = "run";
         [Required]
         public string ProjectDirectory { get; set; }
         [Required]
@@ -17,14 +17,18 @@ public class GenerateRunCommandFile : Task
         [Required]
         public bool UseAppHost { get; set; }
         public string ExecutableExtension { get; set; }
+        public bool IsLinux { get; set; }
 
         public override bool Execute()
         {
-            bool isRunCommandFilePresent = File.Exists(Path.Combine(ProjectDirectory, RunCommandFile));
+            string runCmdFileExtension = IsLinux ? "sh" : "cmd";
+            string runCmdFileName = $"{RunCommandFile}.{runCmdFileExtension}";
+
+            bool isRunCommandFilePresent = File.Exists(Path.Combine(ProjectDirectory, runCmdFileName));
             if (!isRunCommandFilePresent)
             {
-                string command = WebJobsCommandGenerator.RunCommand(TargetPath, UseAppHost, ExecutableExtension);
-                File.WriteAllText(Path.Combine(WebJobsDirectory, RunCommandFile), command);
+                string command = WebJobsCommandGenerator.RunCommand(TargetPath, UseAppHost, ExecutableExtension, IsLinux);
+                File.WriteAllText(Path.Combine(WebJobsDirectory, runCmdFileName), command);
             }
 
             return true;

src/WebSdk/Publish/Tasks/WebJobsCommandGenerator.cs

@@ -5,14 +5,20 @@ namespace Microsoft.NET.Sdk.Publish.Tasks
 {
     public static class WebJobsCommandGenerator
     {
-        public static string RunCommand(string targetPath, bool useAppHost, string executableExtension)
+        public static string RunCommand(string targetPath, bool useAppHost, string executableExtension, bool isLinux)
         {
             string appName = Path.GetFileName(targetPath);
 
             string command = $"dotnet {appName}";
             if (useAppHost)
             {
                 command = Path.ChangeExtension(appName, !string.IsNullOrWhiteSpace(executableExtension) ? executableExtension : null);
+
+                // dot-space syntax to execute the command
+                if (isLinux)
+                {
+                    command = $". {command}";
+                }
             }
 
             // For Apps targeting .NET Framework, the extension is always exe. RID is not set for .NETFramework apps with PlatformType set to AnyCPU.
@@ -21,7 +27,17 @@ public static string RunCommand(string targetPath, bool useAppHost, string execu
                 command = Path.ChangeExtension(appName, ".exe");
             }
 
-            return $"{command} %*";
+            //  pass-all-parameters argument
+            var passParamsArg = isLinux ? "\"$@\"" : "%*";
+            command = $"{command} {passParamsArg}";
+
+            // for Linux add header for bash script
+            if (isLinux)
+            {
+                command = $"#!/bin/bash\n{command}";
+            }
+
+            return $"{command}";
         }
     }
 }

test/Microsoft.NET.Sdk.Publish.Tasks.Tests/WebJobsCommandGeneratorTests.cs

@@ -9,6 +9,7 @@ namespace Microsoft.Net.Sdk.Publish.Tasks.Tests
     public class WebJobsCommandGeneratorTests
     {
         [Theory]
+        // Windows
         [InlineData("c:/test/WebApplication1.dll", false, ".exe", "dotnet WebApplication1.dll %*")]
 
         [InlineData("c:/test/WebApplication1.dll", true, ".exe", "WebApplication1.exe %*")]
@@ -19,12 +20,19 @@ public class WebJobsCommandGeneratorTests
 
         [InlineData("/usr/test/WebApplication1.dll", true, ".sh", "WebApplication1.sh %*")]
         [InlineData("/usr/test/WebApplication1.dll", false, ".sh", "dotnet WebApplication1.dll %*")]
-        public void WebJobsCommandGenerator_Generates_Correct_RunCmd(string targetPath, bool useAppHost, string executableExtension, string expected)
+
+        //Linux
+        [InlineData("c:/test/WebApplication1.dll", false, "", "#!/bin/bash\ndotnet WebApplication1.dll \"$@\"", true)]
+        [InlineData("c:/test/WebApplication1.dll", true, "", "#!/bin/bash\n. WebApplication1 \"$@\"", true)]
+
+        [InlineData("/usr/test/WebApplication1.dll", false, ".sh", "#!/bin/bash\ndotnet WebApplication1.dll \"$@\"", true)]
+        [InlineData("/usr/test/WebApplication1.dll", true, ".sh", "#!/bin/bash\n. WebApplication1.sh \"$@\"", true)]
+        public void WebJobsCommandGenerator_Generates_Correct_RunCmd(string targetPath, bool useAppHost, string executableExtension, string expected, bool isLinux = false)
         {
             // Arrange
 
             // Test
-            string generatedRunCommand = WebJobsCommandGenerator.RunCommand(targetPath, useAppHost, executableExtension);
+            string generatedRunCommand = WebJobsCommandGenerator.RunCommand(targetPath, useAppHost, executableExtension, isLinux);
 
             // Assert
             Assert.Equal(expected, generatedRunCommand);