From 7083ad8ed42e980c2f45f23e9b24951d181cc6d3 Mon Sep 17 00:00:00 2001
From: Andrew Omondi <anomondi@microsoft.com>
Date: Mon, 8 Jul 2024 11:18:31 +0300
Subject: [PATCH] Fix path matching

---
 .azure-pipelines/ci-build.yml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/.azure-pipelines/ci-build.yml b/.azure-pipelines/ci-build.yml
index 92ac8087..42a0941b 100644
--- a/.azure-pipelines/ci-build.yml
+++ b/.azure-pipelines/ci-build.yml
@@ -15,7 +15,6 @@ pr:
 variables:
   buildPlatform: 'Any CPU'
   buildConfiguration: 'Release'
-  ProductBinPath: '$(Build.SourcesDirectory)\src\bin\$(BuildConfiguration)'
 
 resources:
   repositories:
@@ -78,11 +77,11 @@ extends:
               projects: '$(Build.SourcesDirectory)\Microsoft.Kiota.sln'
               arguments: '--configuration $(BuildConfiguration) --no-build --framework net8.0'
 
-          - task: EsrpCodeSigning@2
+          - task: EsrpCodeSigning@3
             displayName: 'ESRP DLL Strong Name'
             inputs:
               ConnectedServiceName: 'microsoftgraph ESRP CodeSign DLL and NuGet (AKV)'
-              FolderPath: $(ProductBinPath)
+              FolderPath: src  # This path should already omit test dlls as they exist in the `tests` folder
               Pattern: '**\*Microsoft.Kiota.*.dll'
               signConfigType: inlineSignParams
               UseMinimatch: true
@@ -105,11 +104,11 @@ extends:
                 ]
               SessionTimeout: 20
           
-          - task: EsrpCodeSigning@2
+          - task: EsrpCodeSigning@3
             displayName: 'ESRP DLL CodeSigning'
             inputs:
               ConnectedServiceName: 'microsoftgraph ESRP CodeSign DLL and NuGet (AKV)'
-              FolderPath: src
+              FolderPath: src  # This path should already omit test dlls as they exist in the `tests` folder
               signConfigType: inlineSignParams
               UseMinimatch: true
               Pattern: '**\*Microsoft.Kiota.*.dll'
@@ -168,7 +167,7 @@ extends:
               arguments: '-projectPath "$(Build.SourcesDirectory)/Directory.Build.props" -packageName "Microsoft.Kiota.Abstractions"'
               pwsh: true
 
-          - task: EsrpCodeSigning@2
+          - task: EsrpCodeSigning@3
             displayName: 'ESRP CodeSigning Nuget Packages'
             inputs:
               ConnectedServiceName: 'microsoftgraph ESRP CodeSign DLL and NuGet (AKV)'