update to use dotnet publish

Author: GarrettBeatty

Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Amazon.Lambda.TestTool.csproj

@@ -21,20 +21,20 @@
     <PackageReference Include="BlazorMonaco" Version="3.2.0" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Libraries\src\Amazon.Lambda.RuntimeSupport\Amazon.Lambda.RuntimeSupport.csproj" />
-  </ItemGroup>
+  <Target Name="CopyRuntimeSupportFiles" BeforeTargets="_GetPackageFiles">
+    <Message Importance="high" Text="Publishing Amazon.Lambda.RuntimeSupport project..." />
+    
+    <ItemGroup>
+      <TargetFrameworks Include="netstandard2.0;net5.0;net6.0;net8.0" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <RuntimeSupportFramework Include="net5.0;net6.0;net8.0;netstandard2.0" />
-  </ItemGroup>
+    <Exec Command="dotnet publish &quot;$(MSBuildThisFileDirectory)..\..\..\..\Libraries\src\Amazon.Lambda.RuntimeSupport\Amazon.Lambda.RuntimeSupport.csproj&quot; -c $(Configuration) -f %(TargetFrameworks.Identity) -v n" />
 
-  <Target Name="ListRuntimeSupportDlls" BeforeTargets="PrepareForBuild">
     <ItemGroup>
-      <Content Include="$(MSBuildThisFileDirectory)..\..\..\..\Libraries\src\Amazon.Lambda.RuntimeSupport\bin\$(Configuration)\%(RuntimeSupportFramework.Identity)\Amazon.Lambda.RuntimeSupport.dll">
+      <None Include="$(MSBuildThisFileDirectory)..\..\..\..\Libraries\src\Amazon.Lambda.RuntimeSupport\bin\$(Configuration)\%(TargetFrameworks.Identity)\publish\**\*.*">
         <Pack>true</Pack>
-        <PackagePath>content\%(RuntimeSupportFramework.Identity)</PackagePath>
-      </Content>
+        <PackagePath>content\%(TargetFrameworks.Identity)</PackagePath>
+      </None>
     </ItemGroup>
   </Target>
 

Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.UnitTests/PackagingTests.cs

@@ -98,45 +98,48 @@ public void VerifyPackageContentsHasRuntimeSupport()
         var packageFiles = Directory.GetFiles(packageDir, "*.nupkg", SearchOption.AllDirectories);
         Assert.True(packageFiles.Length > 0, $"No .nupkg files found in {packageDir}");
 
-        // Rest of the verification code remains the same...
         string packagePath = packageFiles[0];
         _output.WriteLine($"Found package: {packagePath}");
 
         using (var archive = ZipFile.OpenRead(packagePath))
         {
-            var missingFiles = new List<string>();
-
+            // Verify each framework has its required files
             foreach (var framework in ExpectedFrameworks)
             {
-                var expectedPath = $"content/{framework}/Amazon.Lambda.RuntimeSupport.dll";
-                var entry = archive.GetEntry(expectedPath);
+                _output.WriteLine($"\nChecking framework: {framework}");
+
+                // Get all files for this framework
+                var frameworkFiles = archive.Entries
+                    .Where(e => e.FullName.StartsWith($"content/{framework}/"))
+                    .Select(e => e.FullName)
+                    .ToList();
 
-                if (entry == null)
+                // Verify essential files exist
+                var essentialFiles = new[]
                 {
-                    missingFiles.Add(expectedPath);
-                }
-            }
+                $"content/{framework}/Amazon.Lambda.RuntimeSupport.dll",
+                $"content/{framework}/Amazon.Lambda.RuntimeSupport.deps.json",
+                $"content/{framework}/bootstrap.sh",
+                $"content/{framework}/bootstrap-al2023.sh"
+            };
 
-            if (missingFiles.Any())
-            {
-                Assert.Fail($"The following RuntimeSupport DLLs are missing from the package:\n" +
-                           string.Join("\n", missingFiles));
-            }
+                var missingFiles = essentialFiles.Where(f => !frameworkFiles.Contains(f)).ToList();
 
-            var actualFrameworkDlls = archive.Entries
-                .Where(e => e.FullName.Contains("Amazon.Lambda.RuntimeSupport.dll"))
-                .Select(e => e.FullName)
-                .ToList();
+                if (missingFiles.Any())
+                {
+                    Assert.Fail($"The following essential files are missing for {framework}:\n" +
+                               string.Join("\n", missingFiles));
+                }
 
-            _output.WriteLine("\nFound DLLs in package:");
-            foreach (var dll in actualFrameworkDlls)
-            {
-                _output.WriteLine(dll);
+                _output.WriteLine($"Files found for {framework}:");
+                foreach (var file in frameworkFiles)
+                {
+                    _output.WriteLine($"  {file}");
+                }
             }
         }
     }
 
-
     private string FindSolutionRoot()
     {
         string currentDirectory = Directory.GetCurrentDirectory();