From 4e0bbafe7f59cb359c944a2123c4741e0d0c3b5f Mon Sep 17 00:00:00 2001
From: Kim Laine <kim.laine@microsoft.com>
Date: Wed, 31 Mar 2021 12:56:54 -0700
Subject: [PATCH] Updates to Windows pipeline

---
 pipelines/windows.yml | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/pipelines/windows.yml b/pipelines/windows.yml
index 052cf6d16..b4f67ebc2 100644
--- a/pipelines/windows.yml
+++ b/pipelines/windows.yml
@@ -106,7 +106,7 @@ steps:
 
 - ${{ if eq(parameters.configuration, 'Release') }}:
   - task: Semmle@0
-    displayName: 'Semmle'
+    displayName: 'Semmle SEAL'
     env:
       SYSTEM_ACCESSTOKEN: $(System.AccessToken)
     inputs:
@@ -116,6 +116,22 @@ steps:
       timeout: '1800'
       ram: '16384'
       addProjectDirToScanningExclusionList: true
+      buildCommands: '"%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsMSBuildCmd.bat" && msbuild $(Build.SourcesDirectory)/build/seal.sln'
+      cleanupBuildCommands: '"%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsMSBuildCmd.bat" && msbuild $(Build.SourcesDirectory)/build/seal.sln /t:Clean'
+
+  - task: Semmle@0
+    displayName: 'Semmle SEALNet'
+    env:
+      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+    inputs:
+      sourceCodeDirectory: '$(Build.SourcesDirectory)'
+      language: 'csharp'
+      querySuite: 'Recommended'
+      timeout: '1800'
+      ram: '16384'
+      addProjectDirToScanningExclusionList: true
+      buildCommands: '"%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsMSBuildCmd.bat" && msbuild $(Build.SourcesDirectory)/dotnet/SEALNet.sln'
+      cleanupBuildCommands: '"%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsMSBuildCmd.bat" && msbuild $(Build.SourcesDirectory)/dotnet/SEALNet.sln /t:Clean'
 
   - task: PublishSymbols@2
     displayName: 'Publish symbols path'
@@ -124,7 +140,6 @@ steps:
       PublishSymbols: false
     continueOnError: true
 
-- ${{ if eq(parameters.configuration, 'Release') }}:
   - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
     displayName: 'ESRP Add Strong Name'
     inputs:
@@ -175,7 +190,6 @@ steps:
           }
         ]
 
-- ${{ if eq(parameters.configuration, 'Release') }}:
   - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
     displayName: 'ESRP CodeSigning .NET Standard 2.0'
     inputs:
@@ -238,7 +252,6 @@ steps:
           }
         ]
 
-- ${{ if eq(parameters.configuration, 'Release') }}:
   - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
     displayName: 'ESRP CodeSigning native'
     inputs: