From a01d8bc9b81f0d66037457e3792bd01dc5cc54ab Mon Sep 17 00:00:00 2001
From: Sowmya Malayanur <69237821+somalaya@users.noreply.github.com>
Date: Thu, 9 May 2024 08:57:10 -0700
Subject: [PATCH 1/4] Update pr-msal.yml for Azure Pipelines

---
 azure-pipelines/pull-request-validation/pr-msal.yml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/azure-pipelines/pull-request-validation/pr-msal.yml b/azure-pipelines/pull-request-validation/pr-msal.yml
index 226a599ba..a3316d26e 100644
--- a/azure-pipelines/pull-request-validation/pr-msal.yml
+++ b/azure-pipelines/pull-request-validation/pr-msal.yml
@@ -63,10 +63,19 @@ jobs:
       jdkArchitecture: $(BuildParameters.jdkArchitecture)
       sqGradlePluginVersion: 2.0.1
   - task: CodeQL3000Finalize@0
+  - task: PowerShell@2
+    name: setvarStep
+    displayName: Set cert path
+    inputs:
+      targetType: inline
+      script: |
+        $pfxCertPath = '$(Build.SourcesDirectory)' + "\LabVaultAccessCert.pfx"
+        $certPathVar = $pfxCertPath -replace "\\", "\\\\"
+        Write-Host "##vso[task.setvariable variable=LabVaultAppCert]$($certPathVar)"  
   - task: Gradle@2
     displayName: Run Unit tests
     inputs:
-      tasks: msal:testLocalDebugUnitTest -Plabtest -PlabSecret=$(LabVaultAppSecret) -ProbolectricSdkVersion=${{variables.robolectricSdkVersion}}
+      tasks: msal:testLocalDebugUnitTest -Plabtest -PlabSecret=${{variables.LabVaultAppCert}} -ProbolectricSdkVersion=${{variables.robolectricSdkVersion}}
       javaHomeSelection: $(BuildParameters.javaHomeSelection)
       jdkVersion: 1.11
 - job: spotbugs

From 3253af28016184836793daa70eeca44995dd5a7f Mon Sep 17 00:00:00 2001
From: Sowmya Malayanur <69237821+somalaya@users.noreply.github.com>
Date: Thu, 9 May 2024 10:26:23 -0700
Subject: [PATCH 2/4] Update pr-msal.yml for Azure Pipelines

---
 azure-pipelines/pull-request-validation/pr-msal.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/azure-pipelines/pull-request-validation/pr-msal.yml b/azure-pipelines/pull-request-validation/pr-msal.yml
index a3316d26e..9dc308f2a 100644
--- a/azure-pipelines/pull-request-validation/pr-msal.yml
+++ b/azure-pipelines/pull-request-validation/pr-msal.yml
@@ -45,6 +45,7 @@ jobs:
     clean: true
     submodules: recursive
     persistCredentials: True
+  - template: azure-pipelines/templates/steps/automation-cert.yml@common
   - task: JavaToolInstaller@0
     displayName: Use Java 11
     inputs:

From 20ab4b3c79a8dac7c85f0bbdd2d69fb1e76aa353 Mon Sep 17 00:00:00 2001
From: Sowmya Malayanur <69237821+somalaya@users.noreply.github.com>
Date: Thu, 9 May 2024 10:43:50 -0700
Subject: [PATCH 3/4] Update pr-msal.yml for Azure Pipelines

---
 azure-pipelines/pull-request-validation/pr-msal.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines/pull-request-validation/pr-msal.yml b/azure-pipelines/pull-request-validation/pr-msal.yml
index 9dc308f2a..05ebb4826 100644
--- a/azure-pipelines/pull-request-validation/pr-msal.yml
+++ b/azure-pipelines/pull-request-validation/pr-msal.yml
@@ -76,7 +76,7 @@ jobs:
   - task: Gradle@2
     displayName: Run Unit tests
     inputs:
-      tasks: msal:testLocalDebugUnitTest -Plabtest -PlabSecret=${{variables.LabVaultAppCert}} -ProbolectricSdkVersion=${{variables.robolectricSdkVersion}}
+      tasks: msal:testLocalDebugUnitTest -Plabtest -PlabSecret=$(LabVaultAppCert) -ProbolectricSdkVersion=${{variables.robolectricSdkVersion}}
       javaHomeSelection: $(BuildParameters.javaHomeSelection)
       jdkVersion: 1.11
 - job: spotbugs

From 38b5c2e5cf39c621096b50b3ede24da151969fc2 Mon Sep 17 00:00:00 2001
From: Sowmya Malayanur <69237821+somalaya@users.noreply.github.com>
Date: Thu, 9 May 2024 23:03:49 -0700
Subject: [PATCH 4/4] Update pr-msal.yml for Azure Pipelines

---
 azure-pipelines/pull-request-validation/pr-msal.yml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/azure-pipelines/pull-request-validation/pr-msal.yml b/azure-pipelines/pull-request-validation/pr-msal.yml
index 05ebb4826..f45b6cc78 100644
--- a/azure-pipelines/pull-request-validation/pr-msal.yml
+++ b/azure-pipelines/pull-request-validation/pr-msal.yml
@@ -64,15 +64,6 @@ jobs:
       jdkArchitecture: $(BuildParameters.jdkArchitecture)
       sqGradlePluginVersion: 2.0.1
   - task: CodeQL3000Finalize@0
-  - task: PowerShell@2
-    name: setvarStep
-    displayName: Set cert path
-    inputs:
-      targetType: inline
-      script: |
-        $pfxCertPath = '$(Build.SourcesDirectory)' + "\LabVaultAccessCert.pfx"
-        $certPathVar = $pfxCertPath -replace "\\", "\\\\"
-        Write-Host "##vso[task.setvariable variable=LabVaultAppCert]$($certPathVar)"  
   - task: Gradle@2
     displayName: Run Unit tests
     inputs: