Merge pull request #31656 from dotnet-maestro-bot/merge/release/3.1-to-main

[automated] Merge branch 'release/3.1' => 'main'

Author: sebastienros

.azure/pipelines/ci.yml

@@ -772,6 +772,9 @@ stages:
     pool:
       vmImage: 'ubuntu-18.04'
     variables:
+      LC_ALL: 'en_US.UTF-8'
+      LANG: 'en_US.UTF-8'
+      LANGUAGE: 'en_US.UTF-8'
       DotNetCoreSdkDir: $(Agent.ToolsDirectory)/dotnet
       # This isn't needed in the path because build does not need to _use_ global tools.
       DOTNET_CLI_HOME: $(System.DefaultWorkingDirectory)

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

@@ -138,6 +138,12 @@ jobs:
     - DOTNET_CLI_HOME: $(System.DefaultWorkingDirectory)
     - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
     - TeamName: AspNetCore
+    - ${{ if eq(parameters.agentOs, 'Linux') }}:
+      - LC_ALL: 'en_US.UTF-8'
+      - LANG: 'en_US.UTF-8'
+      - LANGUAGE: 'en_US.UTF-8'
+    - ${{ if and(eq(parameters.installJdk, 'true'), eq(parameters.agentOs, 'Windows')) }}:
+      - JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk\win-x64
     - ${{ if or(ne(parameters.codeSign, true), ne(variables['System.TeamProject'], 'internal')) }}:
       - _SignType: ''
     - ${{ if and(eq(parameters.codeSign, true), eq(variables['System.TeamProject'], 'internal')) }}: