Merge branch 'dev' into add-native-auth-content

Author: negoe

azure-pipelines/pull-request-validation/pr-msal.yml

@@ -14,6 +14,8 @@ variables:
   value: JDKVersion
 - name: robolectricSdkVersion
   value: 33
+- group: MSIDLABVARS
+- group: devex-ciam-test
 
 trigger:
   branches:
@@ -37,6 +39,8 @@ jobs:
 - job: build_test
   displayName: Build & Test
   cancelTimeoutInMinutes: 1
+  variables:
+    Codeql.Enabled: true
   steps:
   - checkout: self
     clean: true
@@ -49,6 +53,7 @@ jobs:
       versionSpec: '11'
       jdkArchitectureOption: x64
       jdkSourceOption: PreInstalled
+  - task: CodeQL3000Init@0
   - task: Gradle@2
     name: Gradle1
     displayName: Assemble Local
@@ -59,10 +64,11 @@ jobs:
       jdkVersion: $(BuildParameters.jdkVersion)
       jdkArchitecture: $(BuildParameters.jdkArchitecture)
       sqGradlePluginVersion: 2.0.1
+  - task: CodeQL3000Finalize@0
   - task: Gradle@2
     displayName: Run Unit tests
     inputs:
-      tasks: msal:testLocalDebugUnitTest -Plabtest -ProbolectricSdkVersion=${{variables.robolectricSdkVersion}}
+      tasks: msal:testLocalDebugUnitTest -Plabtest -PlabSecret=$(LabVaultAppCert) -ProbolectricSdkVersion=${{variables.robolectricSdkVersion}} -PmockApiUrl=$(MOCK_API_URL)
       javaHomeSelection: $(BuildParameters.javaHomeSelection)
       jdkVersion: 1.11
 - job: spotbugs
@@ -95,40 +101,5 @@ jobs:
       tasks: clean msal:lintLocalDebug
       publishJUnitResults: false
       jdkVersion: 1.11
-- job: codeql
-  displayName: CodeQL
-  cancelTimeoutInMinutes: 1
-  steps:
-  - checkout: self
-    clean: true
-    submodules: recursive
-    persistCredentials: True
-  - task: JavaToolInstaller@0
-    displayName: Use Java 11
-    inputs:
-      versionSpec: '11'
-      jdkArchitectureOption: x64
-      jdkSourceOption: PreInstalled
-  - task: CmdLine@1
-    displayName: Set Office MVN Access Token in Environment
-    inputs:
-      filename: echo
-      arguments: '##vso[task.setvariable variable=ENV_VSTS_MVN_ANDROID_MSAL_ACCESSTOKEN]$(System.AccessToken)'
-  # https://semmleportal.azurewebsites.net/codeql/guardian
-  - task: Semmle@1
-    env:
-      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
-    inputs:
-      sourceCodeDirectory: '$(Build.SourcesDirectory)'
-      language: 'java'
-      buildCommandsString: 'gradlew.bat clean msal:assembleLocal'
-      querySuite: 'Recommended'
-      timeout: '1800'
-  - task: PublishPipelineArtifact@1
-    displayName: 'Publish code analysis artifacts'
-    inputs:
-      targetPath: '$(Build.SourcesDirectory)\build\outputs\'
-      ArtifactName: 'outputs'
-    condition: failed()
 
 ...