Another take for JAVA

Author: javiercn

.azure/pipelines/jobs/default-build.yml

@@ -122,6 +122,9 @@ jobs:
         versionSpec: 10.x
   - ${{ if and(eq(parameters.installJdk, 'true'), eq(parameters.agentOs, 'Windows')) }}:
     - powershell: ./eng/scripts/InstallJdk.ps1 '11.0.1'
+    - powershell: Write-Host "##vso[task.prependpath]$env:JAVA_HOME\bin"
+    - script: |
+        echo %PATH%
       displayName: Install JDK 11
   - ${{ if and(eq(variables['System.TeamProject'], 'internal'), eq(parameters.agentOs, 'Windows'), eq(parameters.codeSign, 'true')) }}:
     - task: MicroBuildSigningPlugin@1
@@ -139,7 +142,7 @@ jobs:
   - ${{ if eq(parameters.steps, '')}}:
     - ${{ if eq(parameters.buildScript, '') }}:
       - ${{ if eq(parameters.agentOs, 'Windows') }}:
-        - script: .\$(BuildDirectory)\build.cmd -ci /p:SignType=$(_SignType) /p:Configuration=$(BuildConfiguration) $(BuildScriptArgs)
+        - script: set PATH=$(JAVA_HOME)\bin;%PATH% & .\$(BuildDirectory)\build.cmd -ci /p:SignType=$(_SignType) /p:Configuration=$(BuildConfiguration) $(BuildScriptArgs)
           displayName: Run build.cmd
       - ${{ if ne(parameters.agentOs, 'Windows') }}:
         - script: ./$(BuildDirectory)/build.sh -ci -p:Configuration=$(BuildConfiguration) $(BuildScriptArgs)

eng/scripts/InstallJdk.ps1

@@ -27,10 +27,6 @@ Move-Item "$tempDir/jdk/jdk-${jdkVersion}" $env:JAVA_HOME
 Write-Host "Done installing JDK to $env:JAVA_HOME"
 
 if (-not $env:Path.Contains($env:JAVA_HOME)) {
-  Write-Host "Update PATH to include JAVA";
-  $path = "$env:JAVA_HOME\bin;$env:Path";
-  Get-ChildItem $env:JAVA_HOME
-  Get-ChildItem "$env:JAVA_HOME\bin"
-  [System.Environment]::SetEnvironmentVariable("PATH", $path, "User");
-  Write-Host "HOST = $env:Path"
+  Write-Host "##vso[task.prependpath]$env:JAVA_HOME\bin";
+  Write-Host "PATH = $env:Path"
 }