Add support for slnx (#403)

Author: oskarj

.autover/changes/c102f28c-59f6-412c-b0e4-f4acd840367c.json

@@ -0,0 +1,11 @@
+{
+  "Projects": [
+    {
+      "Name": "Amazon.Lambda.Tools",
+      "Type": "Patch",
+      "ChangelogMessages": [
+        "Add support for solutions migrated to slnx"
+      ]
+    }
+  ]
+}

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

@@ -409,7 +409,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.");
@@ -437,6 +437,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) 
                 {