From c4f9b89a5eb3a942ab86f4e79c54d5c5d50d08f1 Mon Sep 17 00:00:00 2001
From: Adeel <3840695+am11@users.noreply.github.com>
Date: Sat, 30 Oct 2021 03:39:20 +0300
Subject: [PATCH] Fix common workflow issues

---
 eng/native/build-commons.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/eng/native/build-commons.sh b/eng/native/build-commons.sh
index 93afd4afec4dfb..608d06e81eda7a 100755
--- a/eng/native/build-commons.sh
+++ b/eng/native/build-commons.sh
@@ -48,7 +48,9 @@ check_prereqs()
 
 build_native()
 {
-    eval "$__RepoRootDir/eng/native/version/copy_version_files.sh"
+    if [[ ! -e "$__RepoRootDir/artifacts/obj/_version.c" ]]; then
+        eval "$__RepoRootDir/eng/native/version/copy_version_files.sh"
+    fi
 
     targetOS="$1"
     platformArch="$2"
@@ -257,7 +259,7 @@ while :; do
         break
     fi
 
-    lowerI="$(echo "$1" | tr "[:upper:]" "[:lower:]")"
+    lowerI="$(echo "${1/--/-}" | tr "[:upper:]" "[:lower:]")"
     case "$lowerI" in
         -\?|-h|--help)
             usage