Merge branch 'dev'

Author: aws-sdk-dotnet-automation

.github/workflows/create-release-pr.yml

@@ -31,7 +31,7 @@ jobs:
           aws-region: us-west-2
       # Retrieve the Access Token from Secrets Manager
       - name: Retrieve secret from AWS Secrets Manager
-        uses: aws-actions/aws-secretsmanager-get-secrets@fbd65ea98e018858715f591f03b251f02b2316cb #v2.0.8
+        uses: aws-actions/aws-secretsmanager-get-secrets@a9a7eb4e2f2871d30dc5b892576fde60a2ecc802 #v2.0.10
         with:
           secret-ids: |
             AWS_SECRET, ${{ secrets.RELEASE_WORKFLOW_ACCESS_TOKEN_NAME }}

.github/workflows/semgrep-analysis.yml

@@ -35,7 +35,7 @@ jobs:
             p/owasp-top-ten
 
       - name: Upload SARIF file for GitHub Advanced Security Dashboard
-        uses: github/codeql-action/upload-sarif@28deaeda66b76a05916b6923827895f2b14ab387 #v3.28.16 
+        uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b #v3.29.2
         with:
           sarif_file: semgrep.sarif
         if: always()

.github/workflows/sync-master-dev.yml

@@ -32,7 +32,7 @@ jobs:
           aws-region: us-west-2
       # Retrieve the Access Token from Secrets Manager
       - name: Retrieve secret from AWS Secrets Manager
-        uses: aws-actions/aws-secretsmanager-get-secrets@fbd65ea98e018858715f591f03b251f02b2316cb #v2.0.8
+        uses: aws-actions/aws-secretsmanager-get-secrets@a9a7eb4e2f2871d30dc5b892576fde60a2ecc802 #v2.0.10
         with:
           secret-ids: |
             AWS_SECRET, ${{ secrets.RELEASE_WORKFLOW_ACCESS_TOKEN_NAME }}

CHANGELOG.md

@@ -1,3 +1,8 @@
+## Release 2025-07-30
+
+### Amazon.ElasticBeanstalk.Tools (4.4.1)
+* Fixed an ElasticBeanstalk deployment issue for Linux platform where Procfile was sometimes being generated with incorrect entrypoint when multiple runtimeconfig.json files were present.
+
 ## Release 2025-06-13
 
 ### Amazon.Lambda.Tools (5.13.0)

src/Amazon.Common.DotNetCli.Tools/Utilities.cs

@@ -334,6 +334,18 @@ public static string LookupTargetFrameworkFromProjectFile(string projectLocation
             return null;
         }
 
+        /// <summary>
+        /// Looks up the assembly name from a project file.
+        /// </summary>
+        /// <param name="projectLocation">The location of the project file.</param>
+        /// <param name="msBuildParameters">Additional MSBuild parameters passed by the user from the commandline</param>
+        /// <returns>The assembly name of the project.</returns>
+        public static string LookupAssemblyNameFromProjectFile(string projectLocation, string msBuildParameters)
+        {
+            var properties = LookupProjectProperties(projectLocation, msBuildParameters, "AssemblyName");
+            return properties.TryGetValue("AssemblyName", out var assemblyName) ? assemblyName : null;
+        }
+
         /// <summary>
         /// Retrieve the `OutputType` property of a given project
         /// </summary>

src/Amazon.ElasticBeanstalk.Tools/Amazon.ElasticBeanstalk.Tools.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\..\buildtools\common.props" />
 
@@ -10,7 +10,7 @@
     <PackAsTool>true</PackAsTool>
     <ToolCommandName>dotnet-eb</ToolCommandName>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>4.4.0</Version>
+    <Version>4.4.1</Version>
     <AssemblyName>dotnet-eb</AssemblyName>
     <Authors>Amazon Web Services</Authors>
     <Copyright>Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.</Copyright>

src/Amazon.ElasticBeanstalk.Tools/Commands/DeployEnvironmentCommand.cs

@@ -183,7 +183,7 @@ protected override async Task<bool> PerformActionAsync()
                     }
 
                     this.Logger?.WriteLine("Configuring application bundle for a Linux deployment");
-                    EBUtilities.SetupPackageForLinux(this.Logger, this, this.DeployEnvironmentOptions, publishLocation, proxyServer, applicationPort);
+                    EBUtilities.SetupPackageForLinux(this.Logger, this, this.DeployEnvironmentOptions, publishLocation, proxyServer, applicationPort, projectLocation);
                 }
 
                 zipArchivePath = Path.Combine(Directory.GetParent(publishLocation).FullName, new DirectoryInfo(projectLocation).Name + "-" + DateTime.Now.Ticks + ".zip");

src/Amazon.ElasticBeanstalk.Tools/EBUtilities.cs

@@ -5,6 +5,7 @@
 using System.Linq;
 using System.Runtime.CompilerServices;
 using Amazon.Common.DotNetCli.Tools;
+using Amazon.Common.DotNetCli.Tools.Options;
 using Amazon.ElasticBeanstalk.Model;
 using Amazon.ElasticBeanstalk.Tools.Commands;
 using ThirdParty.Json.LitJson;
@@ -109,25 +110,23 @@ public static bool IsLoadBalancedEnvironmentType(string environmentType)
         }
 
 
-        public static void SetupPackageForLinux(IToolLogger logger, EBBaseCommand command, DeployEnvironmentProperties options, string publishLocation, string reverseProxy, int? applicationPort)
+        public static void SetupPackageForLinux(IToolLogger logger, EBBaseCommand command, DeployEnvironmentProperties options, string publishLocation, string reverseProxy, int? applicationPort, string projectLocation)
         {
             // Setup Procfile
             var procfilePath = Path.Combine(publishLocation, "Procfile");
 
-            if(File.Exists(procfilePath))
+            if (File.Exists(procfilePath))
             {
                 logger?.WriteLine("Found existing Procfile file found and using that for deployment");
                 return;
             }
 
             logger?.WriteLine("Writing Procfile for deployment bundle");
-
-            var runtimeConfigFilePath = Directory.GetFiles(publishLocation, "*.runtimeconfig.json").FirstOrDefault();
-            var runtimeConfigFileName = Path.GetFileName(runtimeConfigFilePath);
-            var executingAssembly = runtimeConfigFileName.Substring(0, runtimeConfigFileName.Length - "runtimeconfig.json".Length - 1);
+            var executingAssembly = Utilities.LookupAssemblyNameFromProjectFile(projectLocation, null);
+            var runtimeConfigFilePath = Directory.GetFiles(publishLocation, $"{executingAssembly}.runtimeconfig.json").FirstOrDefault();
 
             string webCommandLine;
-            if(IsSelfContainedPublish(runtimeConfigFilePath))
+            if (IsSelfContainedPublish(runtimeConfigFilePath))
             {
                 webCommandLine = $"./{executingAssembly}";
             }
@@ -136,7 +135,7 @@ public static void SetupPackageForLinux(IToolLogger logger, EBBaseCommand comman
                 webCommandLine = $"dotnet exec ./{executingAssembly}.dll";
             }
 
-            if(string.Equals(reverseProxy, EBConstants.PROXY_SERVER_NONE, StringComparison.InvariantCulture))
+            if (string.Equals(reverseProxy, EBConstants.PROXY_SERVER_NONE, StringComparison.InvariantCulture))
             {
                 logger?.WriteLine("... Proxy server disabled, configuring Kestrel to listen to traffic from all hosts");
                 var port = applicationPort.HasValue ? applicationPort.Value : EBConstants.DEFAULT_APPLICATION_PORT;