Merge pull request #780 from microsoftgraph/dev

Merge dev to main

Author: andrueastman

pipelines/previewBuild.yml

@@ -43,6 +43,14 @@ steps:
   inputs:
     version: 6.x
 
+- task: PowerShell@2
+  displayName: 'Set Java Home to use Java 11'
+  inputs:
+    targetType: 'inline'
+    script: |
+      echo "##vso[task.setvariable variable=JAVA_HOME]$(JAVA_HOME_11_X64)"
+      echo "##vso[task.setvariable variable=PATH]$(JAVA_HOME_11_X64)\bin;$(PATH)"
+
 - task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@3
   displayName: 'Run CredScan'
   inputs:

pipelines/productionBuild.yml

@@ -42,6 +42,14 @@ steps:
   inputs:
     version: 6.x
 
+- task: PowerShell@2
+  displayName: 'Set Java Home to use Java 11'
+  inputs:
+    targetType: 'inline'
+    script: |
+      echo "##vso[task.setvariable variable=JAVA_HOME]$(JAVA_HOME_11_X64)"
+      echo "##vso[task.setvariable variable=PATH]$(JAVA_HOME_11_X64)\bin;$(PATH)"
+
 - task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@3
   displayName: 'Run CredScan'
   inputs: