[build] fix MAUI Integration job

build-tools/automation/azure-pipelines.yaml

@@ -137,8 +137,8 @@ extends:
           parameters:
             xaSourcePath: $(Build.SourcesDirectory)/android
             androidSdkPlatforms: $(DefaultTestSdkPlatforms)
-            dotnetVersion: 9.0
-            dotnetQuality: preview
+            dotnetVersion: $(DotNetPreviewSdkVersion)
+            dotnetQuality: $(DotNetPreviewSdkQuality)
 
         - task: NuGetAuthenticate@1
           displayName: authenticate with azure artifacts
@@ -230,6 +230,7 @@ extends:
           condition: always()
           inputs:
             Contents: |
+              $(Build.SourcesDirectory)/android/bin/*$(XA.Build.Configuration)/*.*log
               $(Build.SourcesDirectory)/maui/artifacts/logs/**
             TargetFolder: $(Build.StagingDirectory)/logs
             flattenFolders: true
@@ -346,11 +347,10 @@ extends:
           clean: true
           submodules: recursive
 
-        - task: UseDotNet@2
-          displayName: Install .NET 10.x
-          inputs:
-            version: 10.x
-            includePreviewVersions: true
+        - template: /build-tools/automation/yaml-templates/use-dot-net.yaml@self
+          parameters:
+            version: $(DotNetPreviewSdkVersion)
+            quality: $(DotNetPreviewSdkQuality)
 
         # Download symbols to be published to the symbols artifact drop declared above
         - task: DownloadPipelineArtifact@2

build-tools/automation/yaml-templates/setup-test-environment.yaml

@@ -75,6 +75,7 @@ steps:
 - template: /build-tools/automation/yaml-templates/run-dotnet-preview.yaml
   parameters:
     displayName: extract workload packs
+    xaSourcePath: ${{ parameters.xaSourcePath }}
     project: ${{ parameters.xaSourcePath }}/build-tools/create-packs/Microsoft.Android.Sdk.proj
     arguments: -t:ExtractWorkloadPacks -c ${{ parameters.configuration }} -v:n -bl:${{ parameters.xaSourcePath }}/bin/Test${{ parameters.configuration }}/extract-workloads.binlog
 

build-tools/automation/yaml-templates/variables.yaml

@@ -27,6 +27,10 @@ variables:
   value: 9.0
 - name: DotNetSdkQuality
   value: GA
+- name: DotNetPreviewSdkVersion
+  value: 10.0
+- name: DotNetPreviewSdkQuality
+  value: preview
 - name: GitHub.Token
   value: $(github--pat--vs-mobiletools-engineering-service2)
 - name: HostedMacImage

build-tools/xaprepare/xaprepare/OperatingSystems/OS.cs

@@ -134,7 +134,10 @@ abstract class OS : AppObject
 		/// </summary>
 		protected virtual bool InitOS ()
 		{
-			JavaHome = Context.Instance.Properties.GetValue (KnownProperties.JavaSdkDirectory)?.Trim () ?? String.Empty;
+			JavaHome = Environment.GetEnvironmentVariable ("JI_JAVA_HOME") ?? String.Empty;
+			if (string.IsNullOrEmpty (JavaHome)) {
+				JavaHome = Context.Instance.Properties.GetValue (KnownProperties.JavaSdkDirectory)?.Trim () ?? String.Empty;
+			}
 			if (String.IsNullOrEmpty (JavaHome)) {
 				var androidToolchainDirectory = Context.Instance.Properties.GetValue (KnownProperties.AndroidToolchainDirectory)?.Trim () ?? String.Empty;
 				JavaHome = Path.Combine (androidToolchainDirectory, Configurables.Defaults.JdkFolder);