From 4125f50c17b524ae8ee15ef1a45f3f901d29168e Mon Sep 17 00:00:00 2001
From: Denis Rumyantsev <mr.denis.rumyantsev@gmail.com>
Date: Mon, 20 Nov 2023 13:43:39 +0100
Subject: [PATCH] Fix OSArchitecture for osx-arm64 (#4528)

* fix OSArchitecture for osx-arm64

* Update release assets to include MacOS ARM64 links

---------

Co-authored-by: Jaap Manenschijn <jaap.manenschijn@teamrockstars.nl>
---
 assets.json                   | 18 ++++++++++++------
 releaseNote.md                |  2 +-
 src/Common.props              |  5 ++++-
 src/Misc/Publish.template.ps1 |  2 +-
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/assets.json b/assets.json
index 1048f8e564..c09cd710b1 100644
--- a/assets.json
+++ b/assets.json
@@ -35,6 +35,18 @@
         "version": "<AGENT_VERSION>",
         "downloadUrl": "https://vstsagentpackage.azureedge.net/agent/<AGENT_VERSION>/pipelines-agent-osx-x64-<AGENT_VERSION>.tar.gz"
     },
+    {
+        "name": "vsts-agent-osx-arm64-<AGENT_VERSION>.tar.gz",
+        "platform": "osx-arm64",
+        "version": "<AGENT_VERSION>",
+        "downloadUrl": "https://vstsagentpackage.azureedge.net/agent/<AGENT_VERSION>/vsts-agent-osx-arm64-<AGENT_VERSION>.tar.gz"
+    },
+    {
+        "name": "pipelines-agent-osx-arm64-<AGENT_VERSION>.tar.gz",
+        "platform": "osx-arm64",
+        "version": "<AGENT_VERSION>",
+        "downloadUrl": "https://vstsagentpackage.azureedge.net/agent/<AGENT_VERSION>/pipelines-agent-osx-arm64-<AGENT_VERSION>.tar.gz"
+    },
     {
         "name": "vsts-agent-linux-x64-<AGENT_VERSION>.tar.gz",
         "platform": "linux-x64",
@@ -76,11 +88,5 @@
         "platform": "linux-musl-x64",
         "version": "<AGENT_VERSION>",
         "downloadUrl": "https://vstsagentpackage.azureedge.net/agent/<AGENT_VERSION>/vsts-agent-linux-musl-x64-<AGENT_VERSION>.tar.gz"
-    },
-    {
-        "name": "pipelines-agent-linux-musl-x64-<AGENT_VERSION>.tar.gz",
-        "platform": "linux-musl-x64",
-        "version": "<AGENT_VERSION>",
-        "downloadUrl": "https://vstsagentpackage.azureedge.net/agent/<AGENT_VERSION>/pipelines-agent-linux-musl-x64-<AGENT_VERSION>.tar.gz"
     }
 ]
diff --git a/releaseNote.md b/releaseNote.md
index a95e7c30c6..b094608827 100644
--- a/releaseNote.md
+++ b/releaseNote.md
@@ -82,7 +82,7 @@ See [notes](docs/node6.md) on Node version support for more details.
 | Windows x64 | [pipelines-agent-win-x64-<AGENT_VERSION>.zip](https://vstsagentpackage.azureedge.net/agent/<AGENT_VERSION>/pipelines-agent-win-x64-<AGENT_VERSION>.zip) | <HASH> |
 | Windows x86 | [pipelines-agent-win-x86-<AGENT_VERSION>.zip](https://vstsagentpackage.azureedge.net/agent/<AGENT_VERSION>/pipelines-agent-win-x86-<AGENT_VERSION>.zip) | <HASH> |
 | macOS x64   | [pipelines-agent-osx-x64-<AGENT_VERSION>.tar.gz](https://vstsagentpackage.azureedge.net/agent/<AGENT_VERSION>/pipelines-agent-osx-x64-<AGENT_VERSION>.tar.gz) | <HASH> |
-| macOS ARM64 | [pipelines-agent-osx-arm64-<AGENT_VERSION>.tar.gz](https://vstsagentpackage.azureedge.net/agent/<AGENT_VERSION>/pipelines-agent-osx-x64-<AGENT_VERSION>.tar.gz) | <HASH> |
+| macOS ARM64 | [pipelines-agent-osx-arm64-<AGENT_VERSION>.tar.gz](https://vstsagentpackage.azureedge.net/agent/<AGENT_VERSION>/pipelines-agent-osx-arm64-<AGENT_VERSION>.tar.gz) | <HASH> |
 | Linux x64   | [pipelines-agent-linux-x64-<AGENT_VERSION>.tar.gz](https://vstsagentpackage.azureedge.net/agent/<AGENT_VERSION>/pipelines-agent-linux-x64-<AGENT_VERSION>.tar.gz) | <HASH> |
 | Linux ARM   | [pipelines-agent-linux-arm-<AGENT_VERSION>.tar.gz](https://vstsagentpackage.azureedge.net/agent/<AGENT_VERSION>/pipelines-agent-linux-arm-<AGENT_VERSION>.tar.gz) | <HASH> |
 | Linux ARM64 | [pipelines-agent-linux-arm64-<AGENT_VERSION>.tar.gz](https://vstsagentpackage.azureedge.net/agent/<AGENT_VERSION>/pipelines-agent-linux-arm64-<AGENT_VERSION>.tar.gz) | <HASH> |
diff --git a/src/Common.props b/src/Common.props
index edb0e67ed3..ea281c6875 100644
--- a/src/Common.props
+++ b/src/Common.props
@@ -37,9 +37,12 @@
     <OSArchitecture>X86</OSArchitecture>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(OSPlatform)' == 'OS_OSX'">
+  <PropertyGroup Condition="'$(OSPlatform)' == 'OS_OSX' AND '$(PackageRuntime)' == 'osx-x64'">
     <OSArchitecture>X64</OSArchitecture>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(OSPlatform)' == 'OS_OSX' AND '$(PackageRuntime)' == 'osx-arm64'">
+    <OSArchitecture>ARM64</OSArchitecture>
+  </PropertyGroup>
 
   <PropertyGroup Condition="'$(OSPlatform)' == 'OS_LINUX' AND '$(PackageRuntime)' == 'linux-x64'">
     <OSArchitecture>X64</OSArchitecture>
diff --git a/src/Misc/Publish.template.ps1 b/src/Misc/Publish.template.ps1
index 45f554bdd6..8d0f3695e5 100644
--- a/src/Misc/Publish.template.ps1
+++ b/src/Misc/Publish.template.ps1
@@ -1,6 +1,6 @@
 $ErrorActionPreference = 'Stop'
 
-if ($pwd -notlike '*tfsgheus20' ) {
+if ($pwd -notlike '*tfsgheus20') {
 
     # primary packages