From 5cac237b84cb130109d94f22291838dae95ab2b6 Mon Sep 17 00:00:00 2001
From: Manuel de la Pena <mandel@microsoft.com>
Date: Mon, 11 Dec 2023 22:16:43 -0500
Subject: [PATCH] [CI] Ensure that the new dependencies are correcly managed.
 (#19621)

---
 tools/devops/automation/templates/main-stage.yml          | 1 +
 .../automation/templates/release/vs-insertion-prep.yml    | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tools/devops/automation/templates/main-stage.yml b/tools/devops/automation/templates/main-stage.yml
index 45dff49f72..6c6ba017b3 100644
--- a/tools/devops/automation/templates/main-stage.yml
+++ b/tools/devops/automation/templates/main-stage.yml
@@ -286,6 +286,7 @@ stages:
     }}
   : - template: ./release/vs-insertion-prep.yml
       parameters:
+        buildStage: build_packages
         dependsOn: [ build_packages, configure_build ]
         stageDisplayNamePrefix: ${{ parameters.stageDisplayNamePrefix }}
         isPR: ${{ parameters.isPR }}
diff --git a/tools/devops/automation/templates/release/vs-insertion-prep.yml b/tools/devops/automation/templates/release/vs-insertion-prep.yml
index 33d57cf360..126fab1dda 100644
--- a/tools/devops/automation/templates/release/vs-insertion-prep.yml
+++ b/tools/devops/automation/templates/release/vs-insertion-prep.yml
@@ -1,4 +1,7 @@
 parameters:
+- name: buildStage
+  type: string
+
 - name: dependsOn
   type: object
   default: null
@@ -33,8 +36,8 @@ stages:
     dependsOn: ${{ parameters.dependsOn }}
     condition: and(
         or(
-          eq(dependencies.${{ parameters.dependsOn }}.result, 'Succeeded'),
-          eq(dependencies.${{ parameters.dependsOn }}.result, 'SucceededWithIssues')
+          eq(dependencies.${{ parameters.buildStage }}.result, 'Succeeded'),
+          eq(dependencies.${{ parameters.buildStage }}.result, 'SucceededWithIssues')
         ),
         eq(${{ parameters.isPR }}, false)
       )
@@ -50,7 +53,6 @@ stages:
       signType: Real
       usePipelineArtifactTasks: true
       condition: "ne(stageDependencies.configure_build.configure.outputs['configure_platforms.ENABLE_DOTNET'],'')"
-      dependsOn: configure
 
   # Check - "xamarin-macios (Prepare Release Convert NuGet to MSI)"
   - template: nuget-msi-convert/job/v3.yml@yaml-templates