Make testSolution a local variable, and build it during Execute

Author: lbussell

tests/Microsoft.DotNet.Docker.Tests/AspnetImageTests.cs

@@ -32,7 +32,7 @@ public async Task VerifyFxDependentAppScenario(ProductImageData imageData)
                 return;
             }
 
-            using WebScenario scenario = new WebScenario.FxDependent(imageData, DockerHelper, OutputHelper);
+            WebScenario scenario = new WebScenario.FxDependent(imageData, DockerHelper, OutputHelper);
             await scenario.ExecuteAsync();
         }
 

tests/Microsoft.DotNet.Docker.Tests/RuntimeDepsImageTests.cs

@@ -38,7 +38,7 @@ public async Task VerifySelfContainedConsoleScenario(ProductImageData imageData)
                 return;
             }
 
-            using ConsoleAppScenario testScenario =
+            ConsoleAppScenario testScenario =
                 new ConsoleAppScenario.SelfContained(imageData, DockerHelper, OutputHelper);
             await testScenario.ExecuteAsync();
         }
@@ -54,8 +54,7 @@ public async Task VerifySelfContainedWebScenario(ProductImageData imageData)
                 return;
             }
 
-            using WebScenario testScenario =
-                new WebScenario.SelfContained(imageData, DockerHelper, OutputHelper);
+            WebScenario testScenario = new WebScenario.SelfContained(imageData, DockerHelper, OutputHelper);
             await testScenario.ExecuteAsync();
         }
 
@@ -71,7 +70,7 @@ public async Task VerifyAotWebScenario(ProductImageData imageData)
                 return;
             }
 
-            using WebScenario scenario = new WebScenario.Aot(imageData, DockerHelper, OutputHelper);
+            WebScenario scenario = new WebScenario.Aot(imageData, DockerHelper, OutputHelper);
             await scenario.ExecuteAsync();
         }
 

tests/Microsoft.DotNet.Docker.Tests/RuntimeImageTests.cs

@@ -28,17 +28,15 @@ public RuntimeImageTests(ITestOutputHelper outputHelper)
         [MemberData(nameof(GetImageData))]
         public async Task VerifyFxDependentAppScenario(ProductImageData imageData)
         {
-            using ConsoleAppScenario testScenario =
-                new ConsoleAppScenario.FxDependent(imageData, DockerHelper, OutputHelper);
+            ConsoleAppScenario testScenario = new ConsoleAppScenario.FxDependent(imageData, DockerHelper, OutputHelper);
             await testScenario.ExecuteAsync();
         }
 
         [DotNetTheory]
         [MemberData(nameof(GetImageData))]
         public async Task VerifyTestProjectScenario(ProductImageData imageData)
         {
-            using ConsoleAppScenario testScenario =
-                new ConsoleAppScenario.TestProject(imageData, DockerHelper, OutputHelper);
+            ConsoleAppScenario testScenario = new ConsoleAppScenario.TestProject(imageData, DockerHelper, OutputHelper);
             await testScenario.ExecuteAsync();
         }
 

tests/Microsoft.DotNet.Docker.Tests/SdkImageTests.cs

@@ -82,7 +82,7 @@ public async void VerifyBlazorWasmScenario(ProductImageData imageData)
                 useWasmTools = false;
             }
 
-            using BlazorWasmScenario testScenario = new(imageData, DockerHelper, OutputHelper, useWasmTools);
+            BlazorWasmScenario testScenario = new(imageData, DockerHelper, OutputHelper, useWasmTools);
             await testScenario.ExecuteAsync();
         }
 

tests/Microsoft.DotNet.Docker.Tests/TestScenarios/ProjectTemplateTestScenario.cs

@@ -12,18 +12,15 @@
 
 namespace Microsoft.DotNet.Docker.Tests;
 
-public abstract class ProjectTemplateTestScenario : ITestScenario, IDisposable
+public abstract class ProjectTemplateTestScenario : ITestScenario
 {
-    private bool _disposed;
-
     protected static string OSDockerfileSuffix { get; } = DockerHelper.IsLinuxContainerModeEnabled ? "linux" : "windows";
     protected static string? AdminUser { get; } = DockerHelper.IsLinuxContainerModeEnabled ? "root" : null;
     protected static string? NonRootUser { get; } = DockerHelper.IsLinuxContainerModeEnabled ? "app" : "ContainerUser";
 
     protected DockerHelper DockerHelper { get; }
     protected ProductImageData ImageData { get; }
     protected ITestOutputHelper OutputHelper { get; }
-    protected TestSolution TestSolution { get; }
 
     protected virtual bool NonRootUserSupported => DockerHelper.IsLinuxContainerModeEnabled;
 
@@ -44,11 +41,9 @@ public ProjectTemplateTestScenario(
         DockerHelper = dockerHelper;
         ImageData = imageData;
         OutputHelper = outputHelper;
-
-        TestSolution = new(imageData, SampleName, dockerHelper, injectCustomTestCode: InjectCustomTestCode);
     }
 
-    protected string Build(string stageTarget, string[]? customBuildArgs)
+    private string Build(TestSolution testSolution, string stageTarget, string[]? customBuildArgs)
     {
         const string DockerfileName = "Dockerfile";
         string dockerfilePath = Path.Combine(DockerHelper.TestArtifactsDir, DockerfileName);
@@ -100,7 +95,7 @@ protected string Build(string stageTarget, string[]? customBuildArgs)
                 tag: tag,
                 dockerfile: dockerfilePath,
                 target: stageTarget,
-                contextDir: TestSolution.SolutionDir,
+                contextDir: testSolution.SolutionDir,
                 platform: ImageData.Platform,
                 buildArgs: buildArgs.ToArray());
         }
@@ -125,9 +120,12 @@ public async Task ExecuteAsync()
         }
 
         List<string> tags = [];
+        TestSolution? testSolution = null;
 
         try
         {
+            testSolution = new TestSolution(ImageData, SampleName, DockerHelper, InjectCustomTestCode);
+
             OutputHelper.WriteLine(
                 $"""
 
@@ -144,12 +142,12 @@ public async Task ExecuteAsync()
             string[] customBuildArgs = [ ..CustomDockerBuildArgs, $"rid={ImageData.Rid}" ];
 
             // Build and run app on SDK image
-            string buildTag = Build(TestDockerfile.BuildStageName, customBuildArgs);
+            string buildTag = Build(testSolution, TestDockerfile.BuildStageName, customBuildArgs);
             tags.Add(buildTag);
             await RunAsync(buildTag, command: "dotnet run --no-restore");
 
             // Build and run app stage
-            string tag = Build(TestDockerfile.AppStageName, customBuildArgs);
+            string tag = Build(testSolution, TestDockerfile.AppStageName, customBuildArgs);
             tags.Add(tag);
 
             // Don't run the app if the build output is not executable
@@ -165,27 +163,9 @@ public async Task ExecuteAsync()
         finally
         {
             tags.ForEach(DockerHelper.DeleteImage);
+            testSolution?.Dispose();
         }
     }
 
     protected abstract Task RunAsync(string image, string? user = null, string? command = null);
-
-    protected virtual void Dispose(bool disposing)
-    {
-        if (!_disposed)
-        {
-            if (disposing)
-            {
-                TestSolution.Dispose();
-            }
-
-            _disposed = true;
-        }
-    }
-
-    public void Dispose()
-    {
-        Dispose(disposing: true);
-        GC.SuppressFinalize(this);
-    }
 }

tests/Microsoft.DotNet.Docker.Tests/TestSolution.cs

@@ -45,13 +45,6 @@ public TestSolution(ProductImageData imageData, string sampleName, DockerHelper
 
     private string CreateTestSolutionWithSdkImage(string solutionDir, string appType)
     {
-        if (_imageData.Version.Major == 11)
-        {
-            // Project templates are not yet updated for .NET 11.
-            // Re-enable when https://github.com/dotnet/sdk/issues/50295 is resolved.
-            return "";
-        }
-
         Directory.CreateDirectory(solutionDir);
         string appProjectContainerName = _imageData.GetIdentifier($"create-{appType}");
         string testProjectContainerName = _imageData.GetIdentifier("create-test");