From 316da9b8570406c481e14c855d45256a5be64f0b Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Fri, 4 Nov 2022 11:57:21 -0700
Subject: [PATCH] Use AzFileCopy task instead of AzCopy.exe

---
 .../templates/release-MsixBundle.yml          | 24 ++++++++-----------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/tools/releaseBuild/azureDevOps/templates/release-MsixBundle.yml b/tools/releaseBuild/azureDevOps/templates/release-MsixBundle.yml
index 11d996e9ef..6f3957d081 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-MsixBundle.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-MsixBundle.yml
@@ -65,17 +65,13 @@ jobs:
         Write-Host "##$vstsCommandString"
       displayName: Create MsixBundle
 
-    # Removing install as AzCopy is expected to be on the image
-    #- pwsh: |
-    #    Import-module '$(BUILD.SOURCESDIRECTORY)/build.psm1'
-    #    Install-AzCopy
-    #  displayName: Install AzCopy
-
-    - pwsh: |
-        ## We use AzCopy v8.1 in our release pipeline, see the documentation at:
-        ## https://docs.microsoft.com/en-us/previous-versions/azure/storage/storage-use-azcopy
-
-        Import-module '$(BUILD.SOURCESDIRECTORY)/build.psm1'
-        $azcopy = Find-AzCopy
-        & $azcopy /Source:$(BundleDir) /Dest:https://$(StorageAccount).blob.core.windows.net/$(AzureVersion)-private /DestKey:$(StorageAccountKey) /Pattern:*.msixbundle /Y
-      displayName: Upload MSIX Bundle package to Az Blob
+    - task: AzureFileCopy@4
+      displayName: 'Upload MSIX Bundle package to Az Blob'
+      inputs:
+        SourcePath: '$(BundleDir)/*.msixbundle'
+        azureSubscription: '$(AzureFileCopySubscription)'
+        Destination: AzureBlob
+        storage: '$(StorageAccount)'
+        ContainerName: '$(AzureVersion)-private'
+        resourceGroup: '$(StorageResourceGroup)'
+      condition: succeeded()