From 7cc8aea591f61a065e877cb3fdd25fe1806d6e35 Mon Sep 17 00:00:00 2001
From: Cheick Keita <chkeita@microsoft.com>
Date: Thu, 16 Mar 2023 16:30:29 -0700
Subject: [PATCH 1/3] fix condition when generating the task config

---
 src/ApiService/ApiService/onefuzzlib/Config.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
         }
 

From 6077d09e3706a207f002e73d731f0b4dd193a4c8 Mon Sep 17 00:00:00 2001
From: Cheick Keita <chkeita@microsoft.com>
Date: Fri, 17 Mar 2023 11:41:43 -0700
Subject: [PATCH 2/3] build fix attempt

---
 .github/workflows/ci.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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:

From 05326d643fa7dacab67be3952d5849f85f8984a6 Mon Sep 17 00:00:00 2001
From: Cheick Keita <chkeita@microsoft.com>
Date: Fri, 17 Mar 2023 13:35:07 -0700
Subject: [PATCH 3/3] make the version pep 440 compliant

---
 src/ci/get-version.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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