From dff88e407b7160a98fecf9d1974bd1658b020357 Mon Sep 17 00:00:00 2001
From: PowerShell Team Bot <69177312+pwshBot@users.noreply.github.com>
Date: Mon, 28 Apr 2025 12:00:34 -0700
Subject: [PATCH] [release/v7.4] Fix MSIX artifact upload, vPack template,
 changelog hashes, git tag command (#25476)

Co-authored-by: Justin Chung <124807742+jshigetomi@users.noreply.github.com>
---
 .pipelines/PowerShell-Release-Official.yml   | 13 +------------
 .pipelines/PowerShell-vPack-Official.yml     |  2 +-
 .pipelines/templates/release-create-msix.yml |  8 +++++++-
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/.pipelines/PowerShell-Release-Official.yml b/.pipelines/PowerShell-Release-Official.yml
index 3a224adfa1..f7a69e4407 100644
--- a/.pipelines/PowerShell-Release-Official.yml
+++ b/.pipelines/PowerShell-Release-Official.yml
@@ -333,17 +333,6 @@ extends:
           instructions: |
             Run PowerShell-Release-Official-Azure.yml pipeline to publish to PMC
 
-    - stage: ReleaseDocker
-      dependsOn: PushGitTagAndMakeDraftPublic
-      displayName: 'Docker Release'
-      jobs:
-      - template: /.pipelines/templates/approvalJob.yml@self
-        parameters:
-          displayName: Start Docker Release
-          jobName: StartDockerRelease
-          instructions: |
-            Kickoff docker release
-
     - stage: UpdateDotnetDocker
       dependsOn: PushGitTagAndMakeDraftPublic
       displayName: Update DotNet SDK Docker images
@@ -356,7 +345,7 @@ extends:
             Create PR for updating dotnet-docker images to use latest PowerShell version.
             1. Fork and clone https://github.com/dotnet/dotnet-docker.git
             2. git checkout upstream/nightly -b updatePS
-            3. dotnet run --project .\eng\update-dependencies\ -- <dotnetversion> --product-version powershell=<powershellversion> --compute-shas
+            3. dotnet run --project .\eng\update-dependencies\ specific <dotnetversion> --product-version powershell=<powershellversion> --compute-shas
             4. create PR targeting nightly branch
 
     - stage: UpdateWinGet
diff --git a/.pipelines/PowerShell-vPack-Official.yml b/.pipelines/PowerShell-vPack-Official.yml
index 9745a98e7b..36b6505dd0 100644
--- a/.pipelines/PowerShell-vPack-Official.yml
+++ b/.pipelines/PowerShell-vPack-Official.yml
@@ -118,7 +118,7 @@ extends:
           ob_createvpack_verbose: true
 
         steps:
-          - template: ./templates/SetVersionVariables.yml
+          - template: .pipelines/templates/SetVersionVariables.yml@self
             parameters:
               ReleaseTagVar: $(ReleaseTagVar)
               CreateJson: yes
diff --git a/.pipelines/templates/release-create-msix.yml b/.pipelines/templates/release-create-msix.yml
index 751ce1ec5e..ac82fc05de 100644
--- a/.pipelines/templates/release-create-msix.yml
+++ b/.pipelines/templates/release-create-msix.yml
@@ -87,7 +87,13 @@ jobs:
         $signedBundle = Get-ChildItem -Path $(BundleDir) -Filter "*.msixbundle" -File
         Write-Verbose -Verbose "Signed bundle: $signedBundle"
 
-        Copy-Item -Path $signedBundle -Destination $(ob_outputDirectory) -Verbose
+        # Ensure the destination directory exists
+        if (-not (Test-Path -Path "$(ob_outputDirectory)")) {
+            Write-Verbose -Verbose "Creating destination directory: $(ob_outputDirectory)"
+            New-Item -Path "$(ob_outputDirectory)" -ItemType Directory -Force | Out-Null
+        }
+
+        Copy-Item -Path $signedBundle.FullName -Destination "$(ob_outputDirectory)\$($signedBundle.Name)" -Verbose
 
         Write-Verbose -Verbose "Uploaded Bundle:"
         Get-ChildItem -Path $(ob_outputDirectory) | Write-Verbose -Verbose