Merge branch 'dev' into normj/v4-sdk

Author: normj

.github/workflows/change-file-in-pr.yml

@@ -4,6 +4,9 @@ on:
   pull_request:
     types: [opened, synchronize, reopened, labeled]
 
+permissions:
+  contents: read
+
 jobs:
   check-files-in-directory:
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'Release Not Needed') && !contains(github.event.pull_request.labels.*.name, 'Release PR') }}
@@ -12,11 +15,11 @@ jobs:
 
     steps:
       - name: Checkout PR code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Get List of Changed Files
         id: changed-files
-        uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c #v45
+        uses: tj-actions/changed-files@24d32ffd492484c1d75e0c0b894501ddb9d30d62 #v45
 
       - name: Check for Change File(s) in .autover/changes/
         run: |

.github/workflows/closed-issue-message.yml

@@ -2,6 +2,9 @@ name: Closed Issue Message
 on:
     issues:
        types: [closed]
+permissions:
+  issues: write
+
 jobs:
     auto_comment:
         runs-on: ubuntu-latest

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

@@ -38,13 +38,13 @@ jobs:
           parse-json-secrets: true
       # Checkout a full clone of the repo
       - name: Checkout
-        uses: actions/checkout@09d2acae674a48949e3602304ab46fd20ae0c42f #v4.2.2
+        uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 #v4.2.2
         with:
           fetch-depth: '0'
           token: ${{ env.AWS_SECRET_TOKEN }}
       # Install .NET8 which is needed for AutoVer
       - name: Setup .NET 8.0
-        uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 #v4.3.1
+        uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d #v5.0.0
         with:
           dotnet-version: 8.0.x
       # Install AutoVer to automate versioning and changelog creation

.github/workflows/semgrep-analysis.yml

@@ -25,7 +25,7 @@ jobs:
     if: (github.actor != 'dependabot[bot]')
     steps:
       # Fetch project source
-      - uses: actions/checkout@09d2acae674a48949e3602304ab46fd20ae0c42f #v4.2.2
+      - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 #v4.2.2
 
       - run: semgrep ci --sarif > semgrep.sarif
         env:

.github/workflows/stale_issues.yml

@@ -5,6 +5,10 @@ on:
   schedule:
   - cron: "0 0 * * *"
 
+permissions:
+  issues: write
+  pull-requests: write
+
 jobs:
   cleanup:
     runs-on: ubuntu-latest

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

@@ -39,14 +39,14 @@ jobs:
           parse-json-secrets: true
       # Checkout a full clone of the repo
       - name: Checkout code
-        uses: actions/checkout@09d2acae674a48949e3602304ab46fd20ae0c42f #v4.2.2
+        uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 #v4.2.2
         with:
           ref: dev
           fetch-depth: 0
           token: ${{ env.AWS_SECRET_TOKEN }}
       # Install .NET9 which is needed for AutoVer
       - name: Setup .NET 9.0
-        uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 #v4.3.1
+        uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d #v5.0.0
         with:
           dotnet-version: 9.0.x
       # Install AutoVer which is needed to retrieve information about the current release.
@@ -111,13 +111,13 @@ jobs:
     steps:
       # Checkout a full clone of the repo
       - name: Checkout code
-        uses: actions/checkout@09d2acae674a48949e3602304ab46fd20ae0c42f #v4.2.2
+        uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 #v4.2.2
         with:
           ref: releases/next-release
           fetch-depth: 0
       # Install .NET9 which is needed for AutoVer
       - name: Setup .NET 9.0
-        uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 #v4.3.1
+        uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d #v5.0.0
         with:
           dotnet-version: 9.0.x
       # Install AutoVer which is needed to retrieve information about the current release.

CHANGELOG.md

@@ -1,3 +1,13 @@
+## Release 2025-11-18
+
+### Amazon.Lambda.Tools (5.13.2)
+* Fix: Use function architecture to determine artifact path instead of hardcoded 'x64'.
+
+## Release 2025-11-10
+
+### Amazon.Lambda.Tools (5.13.1)
+* Add support for solutions migrated to slnx
+
 ## Release 2025-07-30
 
 ### Amazon.ElasticBeanstalk.Tools (4.4.1)

src/Amazon.Common.DotNetCli.Tools/Commands/BasePushDockerImageCommand.cs

@@ -413,7 +413,7 @@ public static DockerDetails InspectDockerFile(IToolLogger logger, string project
                     {
                         var noSpaceLine = line.Replace(" ", "");
 
-                        if (noSpaceLine.StartsWith("COPY") && (noSpaceLine.EndsWith(".sln./") || (projectFilename != null && noSpaceLine.Contains("/" + projectFilename))))
+                        if (noSpaceLine.StartsWith("COPY") && (noSpaceLine.EndsWith(".sln./") || noSpaceLine.EndsWith(".slnx./") || (projectFilename != null && noSpaceLine.Contains("/" + projectFilename))))
                         {
                             details.BuildFromSolutionDirectory = true;
                             logger?.WriteLine("... Determined that docker build needs to be run from solution folder.");
@@ -441,6 +441,9 @@ public static string DetermineSolutionDirectory(string projectLocation)
         {
             if (Directory.GetFiles(projectLocation, "*.sln", SearchOption.TopDirectoryOnly).Length != 0)
                 return projectLocation;
+            
+            if (Directory.GetFiles(projectLocation, "*.slnx", SearchOption.TopDirectoryOnly).Length != 0)
+                return projectLocation;
 
             var parent = Directory.GetParent(projectLocation)?.FullName;
             if (parent == null)

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

@@ -175,6 +175,11 @@ public static string GetSolutionDirectoryFullPath(string workingDirectory, strin
                     return currentDirectory.TrimEnd('\\', '/');
                 }
 
+                if (Directory.EnumerateFiles(currentDirectory).Any(x => x.EndsWith(".slnx", StringComparison.OrdinalIgnoreCase)))
+                {
+                    return currentDirectory.TrimEnd('\\', '/');
+                }
+                
                 DirectoryInfo dirInfo = Directory.GetParent(currentDirectory);
                 if ((dirInfo == null) || !dirInfo.Exists) 
                 {

src/Amazon.Lambda.Tools/Amazon.Lambda.Tools.csproj

@@ -15,12 +15,12 @@
     <Copyright>Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.</Copyright>
     <Product>AWS Lambda Tools for .NET CLI</Product>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <Version>5.13.0</Version>
     <!-- 
         This is explicitly set to 7.3 to match what the AWS VS Toolkit uses. This is required because
         the source code here is also copied into the AWS VS Toolkit.
     -->
-    <LangVersion>7.3</LangVersion>
+    <LangVersion>7.3</LangVersion>   
+    <Version>5.13.2</Version>
   </PropertyGroup>
   <ItemGroup>
     <Content Include="Resources\build-lambda-zip.exe">