From 287c891e23bc6155b686409bdf0490f8ee9a983f Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Mon, 23 Nov 2020 07:54:54 -0800
Subject: [PATCH 1/2] Fix the condition for APIScan task selection

---
 template-compliance/apiscan.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/template-compliance/apiscan.yml b/template-compliance/apiscan.yml
index 601d4d3..debc520 100644
--- a/template-compliance/apiscan.yml
+++ b/template-compliance/apiscan.yml
@@ -5,13 +5,13 @@ parameters:
   APIScanEnable: ''
 
 steps:
-- task: securedevelopmentteam.vss-secure-development-tools.build-task-apiscan.APIScan@2
-  displayName: 'Run APIScan'
-  inputs:
-    softwareFolder: ${{ parameters.softwareFolder }}
-    softwareName: ${{ parameters.softwareName }}
-    softwareVersionNum: ${{ parameters.softwareVersion }}
-    isLargeApp: false
-    preserveTempFiles: true
-  continueOnError: true
-  condition: eq(variables['APIScanEnable'], true)
+- ${{ if eq(parameters.APIScanEnable, 'true') }}:
+  - task: securedevelopmentteam.vss-secure-development-tools.build-task-apiscan.APIScan@2
+    displayName: 'Run APIScan'
+    inputs:
+      softwareFolder: ${{ parameters.softwareFolder }}
+      softwareName: ${{ parameters.softwareName }}
+      softwareVersionNum: ${{ parameters.softwareVersion }}
+      isLargeApp: false
+      preserveTempFiles: true
+    continueOnError: true

From 0905db21de30ee27841fd91b0b37ab8be380165b Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Mon, 23 Nov 2020 08:01:10 -0800
Subject: [PATCH 2/2] Update CredScan version to v2

---
 template-compliance/credscan.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/template-compliance/credscan.yml b/template-compliance/credscan.yml
index a876ed1..1ced986 100644
--- a/template-compliance/credscan.yml
+++ b/template-compliance/credscan.yml
@@ -7,4 +7,5 @@ steps:
   inputs:
     suppressionsFile: ${{ parameters.suppressionsFile }}
     debugMode: false
+    toolMajorVersion: V2
   continueOnError: true