Update CI to package linux arm64 (#4403)

Author: liliankasem

eng/ci/consolidate-artifacts.yml

@@ -49,7 +49,7 @@ resources:
 variables:
 - template: /ci/variables/cfs.yml@eng
 - name: archs
-  value: 'win-x64,win-x86,min.win-x64,osx-x64,linux-x64,osx-arm64,win-arm64,min.win-arm64,min.win-x86'
+  value: 'win-x64,win-x86,min.win-x64,osx-x64,linux-x64,linux-arm64,osx-arm64,win-arm64,min.win-arm64,min.win-x86'
 
 extends:
   template: v1/1ES.Official.PipelineTemplate.yml@1es

eng/scripts/ArtifactAssemblerHelpers/generateMetadataFile.ps1

@@ -8,10 +8,18 @@ $stagingCoreToolsCli = Join-Path $StagingDirectory "coretools-cli"
 $stagingCoreToolsVisualStudio = Join-Path $StagingDirectory "coretools-visualstudio"
 
 # Get OOP Artifact Version
-$oopVersion = (Get-ChildItem $stagingCoreToolsCli | Where-Object { $_.Name -match "^Azure\.Functions\.Cli\..*\.(\d+\.\d+\.\d+)$" } | Select-Object -First 1).Name -replace "^Azure\.Functions\.Cli\..*\.(\d+\.\d+\.\d+)$", '$1'
+$oopVersion = (
+    Get-ChildItem $stagingCoreToolsCli |
+    Where-Object { $_.Name -match "^Azure\.Functions\.Cli\..*\.(\d+\.\d+\.\d+)(-.+)?$" } |
+    Select-Object -First 1
+).Name -replace "^Azure\.Functions\.Cli\..*\.(\d+\.\d+\.\d+)(-.+)?$", '$1$2'
 
 # Get inProc Artifact Version
-$inProcVersion = (Get-ChildItem $stagingCoreToolsVisualStudio | Where-Object { $_.Name -match "^Azure\.Functions\.Cli\.min\.win.*\.(\d+\.\d+\.\d+)$" } | Select-Object -First 1).Name -replace "^Azure\.Functions\.Cli\.min\.win.*\.(\d+\.\d+\.\d+)$", '$1'
+$inProcVersion = (
+    Get-ChildItem $stagingCoreToolsVisualStudio |
+    Where-Object { $_.Name -match "^Azure\.Functions\.Cli\.min\.win.*\.(\d+\.\d+\.\d+)(-.+)?$" } |
+    Select-Object -First 1
+).Name -replace "^Azure\.Functions\.Cli\.min\.win.*\.(\d+\.\d+\.\d+)(-.+)?$", '$1$2'
 
 # Get the current release number from ADO
 $releaseNumberFull = $env:RELEASE_RELEASENAME

src/Cli/ArtifactAssembler/ArtifactAssembler.cs

@@ -31,15 +31,16 @@ internal sealed class ArtifactAssembler
         /// </summary>
         private readonly string[] _cliArtifacts =
         {
-            "Azure.Functions.Cli.min.win-arm64",
             "Azure.Functions.Cli.min.win-x86",
             "Azure.Functions.Cli.min.win-x64",
-            "Azure.Functions.Cli.linux-x64",
-            "Azure.Functions.Cli.osx-x64",
-            "Azure.Functions.Cli.osx-arm64",
+            "Azure.Functions.Cli.min.win-arm64",
             "Azure.Functions.Cli.win-x86",
             "Azure.Functions.Cli.win-x64",
-            "Azure.Functions.Cli.win-arm64"
+            "Azure.Functions.Cli.win-arm64",
+            "Azure.Functions.Cli.linux-x64",
+            "Azure.Functions.Cli.linux-arm64",
+            "Azure.Functions.Cli.osx-x64",
+            "Azure.Functions.Cli.osx-arm64"
         };
 
         private readonly string _inProcArtifactDirectoryName;
@@ -319,8 +320,8 @@ private async Task CreateCliCoreToolsAsync()
                 FileUtilities.CopyDirectory(outOfProcArtifactDirPath, consolidatedArtifactDirPath);
                 Directory.Delete(outOfProcArtifactDirPath, true);
 
-                // If we are currently on the minified version of the artifacts, we do not want the inproc6/inproc8 subfolders
-                if (artifactName.Contains("min.win"))
+                // If we are currently on the minified version of the artifacts (or if its linux arm64), we do not want the inproc6/inproc8 subfolders
+                if (artifactName.Contains("min.win") || artifactName.Contains("linux-arm64"))
                 {
                     Console.WriteLine($"Finished assembling {consolidatedArtifactDirPath}");
                     Console.WriteLine();