Fix default build and push steps on ProjectResource

Author: captainsafia

src/Aspire.Hosting/ApplicationModel/ProjectResource.cs

@@ -28,12 +28,14 @@ public class ProjectResource : Resource, IResourceWithEnvironment, IResourceWith
     /// <param name="name">The name of the resource.</param>
     public ProjectResource(string name) : base(name)
     {
-        // Add pipeline step annotation to create a build step for this project
+        // Add pipeline step annotation to create build and push steps for this project
         Annotations.Add(new PipelineStepAnnotation((factoryContext) =>
         {
+            var steps = new List<PipelineStep>();
+
             if (factoryContext.Resource.IsExcludedFromPublish())
             {
-                return [];
+                return steps;
             }
 
             var buildStep = new PipelineStep
@@ -46,28 +48,22 @@ public ProjectResource(string name) : base(name)
                 DependsOnSteps = [WellKnownPipelineSteps.BuildPrereq],
                 Resource = this
             };
+            steps.Add(buildStep);
 
-            return [buildStep];
-        }));
-
-        // Add pipeline step annotation to create a push step for this project
-        Annotations.Add(new PipelineStepAnnotation((factoryContext) =>
-        {
-            if (!this.RequiresImageBuildAndPush() || factoryContext.Resource.IsExcludedFromPublish())
+            if (this.RequiresImageBuildAndPush())
             {
-                return [];
+                var pushStep = new PipelineStep
+                {
+                    Name = $"push-{name}",
+                    Action = ctx => PipelineStepHelpers.PushImageToRegistryAsync(this, ctx),
+                    Tags = [WellKnownPipelineTags.PushContainerImage],
+                    RequiredBySteps = [WellKnownPipelineSteps.Push],
+                    Resource = this
+                };
+                steps.Add(pushStep);
             }
 
-            var pushStep = new PipelineStep
-            {
-                Name = $"push-{name}",
-                Action = ctx => PipelineStepHelpers.PushImageToRegistryAsync(this, ctx),
-                Tags = [WellKnownPipelineTags.PushContainerImage],
-                RequiredBySteps = [WellKnownPipelineSteps.Push],
-                Resource = this
-            };
-
-            return [pushStep];
+            return steps;
         }));
 
         // Add default container build options annotation