[xcode14] [CI] Make sure we do not have pkgs from other builds. (#15624)

Co-authored-by: Manuel de la Pena <mandel@microsoft.com>

tools/devops/automation/templates/build/build-pkgs.yml

@@ -102,6 +102,34 @@ steps:
           artifactName: WorkloadRollback
         continueOnError: true
 
+      - bash: |
+          var=$(make -C $(Build.SourcesDirectory)/xamarin-macios/tools/devops print-variable VARIABLE=IOS_PACKAGE_VERSION)
+          IOS_PACKAGE_VERSION=${var#*=}
+          IOS_PACKAGE_VERSION=$(echo $IOS_PACKAGE_VERSION | cut -d "+" -f1)
+
+          var=$(make -C $(Build.SourcesDirectory)/xamarin-macios/tools/devops print-variable VARIABLE=MAC_PACKAGE_VERSION)
+          MAC_PACKAGE_VERSION=${var#*=}
+          MAC_PACKAGE_VERSION=$(echo $MAC_PACKAGE_VERSION | cut -d "+" -f1)
+
+          PKG_DST="$(Build.SourcesDirectory)/PkgsVersions.json"
+
+          echo "{" > $PKG_DST
+          echo "\"iOS\": \"$IOS_PACKAGE_VERSION\"," >>  $PKG_DST
+          echo "\"macOS\": \"$MAC_PACKAGE_VERSION\"" >> $PKG_DST
+          echo "}" >>  $PKG_DST
+
+          echo "PkgVersions.json file contents:" 
+          echo "$(cat $PKG_DST)"
+        name: pkg_versions_file
+        displayName: 'Generate PkgsVersions.json'
+
+      - task: PublishPipelineArtifact@1
+        displayName: 'Publish PkgsVersions.json'
+        inputs:
+          targetPath: $(Build.SourcesDirectory)/PkgsVersions.json
+          artifactName: PkgsVersions
+        continueOnError: true
+
       # upload each of the pkgs into the pipeline artifacts
       - task: PublishPipelineArtifact@1
         displayName: 'Publish Build Artifacts'

tools/devops/automation/templates/common/teardown.yml

@@ -13,6 +13,9 @@ steps:
   displayName: 'Remove git creds store'
   condition: always()
 
+- bash: |
+    sudo rm -Rf $(Build.SourcesDirectory)/artifacts
+  displayName: "Remove artifacts"
 
 - template: uninstall-certificates/v1.yml@templates
   parameters:

tools/devops/automation/templates/tests/build.yml

@@ -116,29 +116,26 @@ steps:
     AUTH_TOKEN_VSENG_XAMARIN_MAC_DEVICES_P12: ${{ parameters.xqaCertPass }}
     AUTH_TOKEN_VSENG_XAMARIN_MAC_DEVICES_2_P12: ${{ parameters.xqaCertPass }}
 
-# download the not notarized pkgs since we do not need them to be signed
 - task: DownloadPipelineArtifact@2
-  displayName: Download not notaraized build
+  displayName: Download artifacts
   inputs:
-    artifact: 'not-signed-package'
     allowFailedBuilds: true
-    path: $(Build.SourcesDirectory)/package
+    path: $(Build.SourcesDirectory)/artifacts
 
 - pwsh: |
-    $dir = "$(Build.SourcesDirectory)/package"
-    Dir $dir
-    $items = Get-ChildItem $dir -Recurse
-    foreach ($i in $items) {
-      if ($i.Name -like "xamarin.ios-*.pkg") {
-        $path = $i.FullName
-        Write-Host "##vso[task.setvariable variable=XI_PACKAGE;]$path"
-      }
-      if ($i.Name -like "xamarin.mac-*.pkg") {
-        $path = $i.FullName
-        Write-Host "##vso[task.setvariable variable=XM_PACKAGE;]$path"
-      }
-    }
-  displayName: 'Set iOS pkgs url'
+    $dir = "$(Build.SourcesDirectory)/artifacts"
+    $versionsPath = "$dir/PkgsVersions/PkgsVersions.json"
+    $versionData = Get-Content $versionsPath | ConvertFrom-Json
+
+    $iOSVersion = $versionData | Select-Object -ExpandProperty "iOS"
+    $iOSPath = "$dir/not-signed-package/xamarin.ios-$iOSVersion.pkg"
+    Write-Host "##vso[task.setvariable variable=XI_PACKAGE;]$iOSPath"
+
+    $macOSVersion = $versionData | Select-Object -ExpandProperty "macOS"
+    $macOSPath = "$dir/not-signed-package/xamarin.mac-$macOSVersion.pkg"
+    Write-Host "##vso[task.setvariable variable=XM_PACKAGE;]$macOSPath"
+
+  displayName: 'Set pkgs url'
   timeoutInMinutes: 5
 
 - bash: |