From 4956cf5406fc6817c41928a4713b7da3e4bd130d Mon Sep 17 00:00:00 2001
From: Cheick Keita <chkeita@microsoft.com>
Date: Fri, 17 Mar 2023 13:44:30 -0700
Subject: [PATCH] fix condition when generating the task config (#2925)

---
 .github/workflows/ci.yml                       |  5 ++++-
 src/ApiService/ApiService/onefuzzlib/Config.cs |  2 +-
 src/ci/get-version.sh                          | 12 ++++++------
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c16bc9016e..c37f7ce673 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -351,7 +351,10 @@ jobs:
       - uses: actions/checkout@v3
       - uses: azure/CLI@v1
         with:
-          inlineScript: az bicep build --file src/deployment/azuredeploy.bicep --stdout > /dev/null
+          inlineScript: |
+           az config set bicep.use_binary_from_path=false
+           az bicep install
+           az bicep build --file src/deployment/azuredeploy.bicep --stdout > /dev/null
   dotnet-fuzzing-tools-linux:
     runs-on: ubuntu-20.04
     steps:
diff --git a/src/ApiService/ApiService/onefuzzlib/Config.cs b/src/ApiService/ApiService/onefuzzlib/Config.cs
index eb6a03cee9..44f7790060 100644
--- a/src/ApiService/ApiService/onefuzzlib/Config.cs
+++ b/src/ApiService/ApiService/onefuzzlib/Config.cs
@@ -166,7 +166,7 @@ await _containers.GetContainerSasUrl(x.Item2.Name, StorageType.Corpus, ConvertPe
             config.TargetExe = task.Config.Task.TargetExe;
         }
 
-        if (definition.Features.Contains(TaskFeature.TargetExeOptional) && config.TargetExe != null) {
+        if (definition.Features.Contains(TaskFeature.TargetExeOptional) && task.Config.Task.TargetExe != null) {
             config.TargetExe = task.Config.Task.TargetExe;
         }
 
diff --git a/src/ci/get-version.sh b/src/ci/get-version.sh
index d03b5447aa..67b9910977 100755
--- a/src/ci/get-version.sh
+++ b/src/ci/get-version.sh
@@ -12,17 +12,17 @@ GIT_HASH=$(git rev-parse HEAD)
 
 if [ "${GITHUB_REF}" != "" ]; then
     TAG_VERSION=${GITHUB_REF#refs/tags/}
-    
+
     # this isn't a tag
     if [ ${TAG_VERSION} == ${GITHUB_REF} ]; then
-        echo ${BASE_VERSION}-${GIT_HASH}
+        echo ${BASE_VERSION}+${GIT_HASH}
     else
         echo ${BASE_VERSION}
-    fi    
+    fi
 else
     if $(git diff --quiet); then
-        echo ${BASE_VERSION}-${GIT_HASH}
+        echo ${BASE_VERSION}+${GIT_HASH}
     else
-        echo ${BASE_VERSION}-${GIT_HASH}localchanges
-    fi 
+        echo ${BASE_VERSION}+${GIT_HASH}localchanges
+    fi
 fi