Skip to content

Commit f36668c

Browse files
grendellogrendello
committed
Merge branch 'main' into dev/grendel/clr-host
* main: [ci] Add template for setting JAVA_HOME vars (#9671) Bump com.android.tools.build:manifest-merger from 31.7.3 to 31.8.0 (#9678) Bump to dotnet/sdk@2dd591056f 10.0.100-alpha.1.25062.16 (#9679) Bump com.android.tools:r8 from 8.5.35 to 8.7.18 (#9677) Bump to dotnet/java-interop@4f06201 (#9676) Bump to dotnet/android-api-docs@492e524d (#9668) [build] Support JDK-21 (#9672)
2 parents c2e17d9 + 0475a60 commit f36668c

24 files changed

+125
-78
lines changed

‎build-tools/automation/azure-pipelines-apidocs.yaml

+3-4
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,9 @@ extends:
100100
- checkout: self
101101
submodules: recursive
102102

103-
- script: |
104-
echo "##vso[task.setvariable variable=JI_JAVA_HOME]$HOME/android-toolchain/jdk-17"
105-
echo "##vso[task.setvariable variable=JAVA_HOME]$HOME/android-toolchain/jdk-17"
106-
displayName: set JI_JAVA_HOME
103+
- template: /build-tools/automation/yaml-templates/setup-jdk-variables.yaml@self
104+
parameters:
105+
useAgentJdkPath: false
107106

108107
# Set MSBuild property overrides if parameters are set
109108
- ${{ if ne(parameters.apiLevel, 'default') }}:

‎build-tools/automation/azure-pipelines-nightly.yaml

+4-12
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ stages:
123123
- template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
124124
parameters:
125125
xaprepareScenario: EmulatorTestDependencies
126-
jdkTestFolder: $(JAVA_HOME_11_X64)
126+
jdkMajorVersion: 11
127127

128128
- template: /build-tools/automation/yaml-templates/run-dotnet-preview.yaml
129129
parameters:
@@ -138,6 +138,7 @@ stages:
138138
avdApiLevel: $(avdApiLevel)
139139
avdAbi: $(avdAbi)
140140
avdType: $(avdType)
141+
emulatorMSBuildArgs: -p:JavaSdkDirectory=$(JI_JAVA_HOME_DEFAULT)
141142

142143
- template: /build-tools/automation/yaml-templates/apk-instrumentation.yaml
143144
parameters:
@@ -162,7 +163,6 @@ stages:
162163
emulatorMSBuildArgs: -p:TestAvdExtraBootArgs=-writable-system
163164
jobName: SystemApplicationTests
164165
jobTimeout: 120
165-
jdkTestFolder: $HOME/android-toolchain/jdk-17
166166
use1ESTemplate: false
167167
testSteps:
168168
- template: run-nunit-tests.yaml
@@ -195,15 +195,11 @@ stages:
195195
steps:
196196
- template: agent-cleanser/v1.yml@yaml-templates
197197

198-
- script: |
199-
echo "##vso[task.setvariable variable=JAVA_HOME]$HOME/android-toolchain/jdk-17"
200-
displayName: set JAVA_HOME to $HOME/android-toolchain/jdk-17
201-
202198
- template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
203199
parameters:
204200
installTestSlicer: true
205201
xaprepareScenario: EmulatorTestDependencies
206-
jdkTestFolder: $HOME/android-toolchain/jdk-17
202+
useAgentJdkPath: false
207203

208204
- task: DownloadPipelineArtifact@2
209205
inputs:
@@ -251,15 +247,11 @@ stages:
251247
steps:
252248
- template: agent-cleanser/v1.yml@yaml-templates
253249

254-
- script: |
255-
echo "##vso[task.setvariable variable=JAVA_HOME]$HOME/android-toolchain/jdk-17"
256-
displayName: set JAVA_HOME to $HOME/android-toolchain/jdk-17
257-
258250
- template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
259251
parameters:
260252
installTestSlicer: true
261253
xaprepareScenario: EmulatorTestDependencies
262-
jdkTestFolder: $HOME/android-toolchain/jdk-17
254+
useAgentJdkPath: false
263255

264256
- task: DownloadPipelineArtifact@2
265257
inputs:

‎build-tools/automation/azure-pipelines.yaml

-5
Original file line numberDiff line numberDiff line change
@@ -152,11 +152,6 @@ extends:
152152
inputs:
153153
forceReinstallCredentialProvider: true
154154

155-
- script: |
156-
echo ##vso[task.setvariable variable=JI_JAVA_HOME]%JAVA_HOME_17_X64%
157-
echo ##vso[task.setvariable variable=JAVA_HOME]%JAVA_HOME_17_X64%
158-
displayName: set JI_JAVA_HOME, JAVA_HOME to $(JAVA_HOME_17_X64)
159-
160155
- script: echo "##vso[task.prependpath]C:\Windows\System32\WindowsPowerShell\v1.0\"
161156
displayName: add powershell to path
162157

‎build-tools/automation/yaml-templates/build-windows.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@ stages:
3939

4040
- template: /build-tools/automation/yaml-templates/clean.yaml
4141

42-
- script: |
43-
echo ##vso[task.setvariable variable=JI_JAVA_HOME]%JAVA_HOME_17_X64%
44-
displayName: set JI_JAVA_HOME to $(JAVA_HOME_17_X64)
42+
- template: /build-tools/automation/yaml-templates/setup-jdk-variables.yaml
4543

4644
- template: /build-tools/automation/yaml-templates/use-dot-net.yaml
4745
parameters:

‎build-tools/automation/yaml-templates/commercial-build.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ parameters:
88
use1ESTemplate: true
99

1010
steps:
11-
- script: echo "##vso[task.setvariable variable=JI_JAVA_HOME]$HOME/android-toolchain/jdk-17"
12-
displayName: set JI_JAVA_HOME
11+
- template: /build-tools/automation/yaml-templates/setup-jdk-variables.yaml
12+
parameters:
13+
useAgentJdkPath: false
1314

1415
- template: /build-tools/automation/yaml-templates/use-dot-net.yaml
1516
parameters:

‎build-tools/automation/yaml-templates/run-emulator-tests.yaml

+4-6
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ parameters:
44
emulatorMSBuildArgs: ''
55
jobName: CheckTimeZoneInfoIsCorrectNode1
66
jobTimeout: 360
7-
jdkTestFolder: $(JAVA_HOME_17_X64)
7+
jdkMajorVersion: $(DefaultJavaSdkMajorVersion)
8+
useAgentJdkPath: false
89
testSteps: []
910
use1ESTemplate: true
1011

@@ -22,14 +23,11 @@ jobs:
2223
steps:
2324
- template: agent-cleanser/v1.yml@yaml-templates
2425

25-
- script: |
26-
echo "##vso[task.setvariable variable=JAVA_HOME]${{ parameters.jdkTestFolder }}"
27-
displayName: set JAVA_HOME to ${{ parameters.jdkTestFolder }}
28-
2926
- template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
3027
parameters:
3128
xaprepareScenario: EmulatorTestDependencies
32-
jdkTestFolder: ${{ parameters.jdkTestFolder }}
29+
jdkMajorVersion: ${{ parameters.jdkMajorVersion }}
30+
useAgentJdkPath: ${{ parameters.useAgentJdkPath }}
3331

3432
- task: DownloadPipelineArtifact@2
3533
inputs:

‎build-tools/automation/yaml-templates/setup-jdk-variables.yaml

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
parameters:
2+
jdkMajorVersion: $(DefaultJavaSdkMajorVersion)
3+
useAgentJdkPath: true
4+
5+
steps:
6+
- pwsh: |
7+
$agentOS="$(Agent.OS)"
8+
$agentArch="$(Agent.OSArchitecture)"
9+
$jdkMajorVersion="${{ parameters.jdkMajorVersion }}"
10+
$xaPrepareJdkPath="$env:HOME/android-toolchain/jdk-$jdkMajorVersion"
11+
if ("$agentOS" -eq "Windows_NT") {
12+
$xaPrepareJdkPath="$env:USERPROFILE\android-toolchain\jdk-$jdkMajorVersion"
13+
}
14+
$jdkHomePath=$xaPrepareJdkPath
15+
if ("${{ parameters.useAgentJdkPath }}" -eq "true") {
16+
$defaultJdkHomeVarName="JAVA_HOME_$(DefaultJavaSdkMajorVersion)_${agentArch}"
17+
$defaultJdkHomePath=(Get-Item -Path "env:$defaultJdkHomeVarName").Value
18+
$jdkHomeVarName="JAVA_HOME_${jdkMajorVersion}_${agentArch}"
19+
$jdkHomePath=(Get-Item -Path "env:$jdkHomeVarName").Value
20+
}
21+
Write-Host "Setting variable 'JI_JAVA_HOME_DEFAULT' to '$defaultJdkHomePath'"
22+
Write-Host "##vso[task.setvariable variable=JI_JAVA_HOME_DEFAULT]$defaultJdkHomePath"
23+
Write-Host "Setting variable 'JAVA_HOME' and 'JI_JAVA_HOME' to '$jdkHomePath'"
24+
Write-Host "##vso[task.setvariable variable=JAVA_HOME]$jdkHomePath"
25+
Write-Host "##vso[task.setvariable variable=JI_JAVA_HOME]$jdkHomePath"
26+
displayName: set JAVA_HOME and JI_JAVA_HOME

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

+6-12
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
parameters:
22
configuration: $(XA.Build.Configuration)
33
xaSourcePath: $(System.DefaultWorkingDirectory)
4-
jdkTestFolder: $(JAVA_HOME_17_X64)
4+
jdkMajorVersion: $(DefaultJavaSdkMajorVersion)
5+
useAgentJdkPath: true
56
remove_dotnet: false
67
dotnetVersion: $(DotNetSdkVersion)
78
dotnetQuality: $(DotNetSdkQuality)
@@ -21,17 +22,10 @@ steps:
2122
clean: true
2223
submodules: recursive
2324

24-
- script: |
25-
echo "##vso[task.setvariable variable=JI_JAVA_HOME]${{ parameters.jdkTestFolder }}"
26-
echo "##vso[task.setvariable variable=DOTNET_TOOL_PATH]${{ parameters.xaSourcePath }}/bin/${{ parameters.configuration }}/dotnet/dotnet"
27-
displayName: set JI_JAVA_HOME to ${{ parameters.jdkTestFolder }}
28-
condition: and(succeeded(), ne(variables['agent.os'], 'Windows_NT'))
29-
30-
- script: |
31-
echo ##vso[task.setvariable variable=JI_JAVA_HOME]${{ parameters.jdkTestFolder }}
32-
echo ##vso[task.setvariable variable=DOTNET_TOOL_PATH]${{ parameters.xaSourcePath }}\bin\${{ parameters.configuration }}\dotnet\dotnet.exe
33-
displayName: set JI_JAVA_HOME to ${{ parameters.jdkTestFolder }}
34-
condition: and(succeeded(), eq(variables['agent.os'], 'Windows_NT'))
25+
- template: /build-tools/automation/yaml-templates/setup-jdk-variables.yaml
26+
parameters:
27+
jdkMajorVersion: ${{ parameters.jdkMajorVersion }}
28+
useAgentJdkPath: ${{ parameters.useAgentJdkPath }}
3529

3630
# Install latest .NET
3731
- template: /build-tools/automation/yaml-templates/use-dot-net.yaml

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

+2
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ variables:
5858
value: $[or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['System.PullRequest.TargetBranch'], 'release/'))]
5959
- name: DefaultTestSdkPlatforms # Comma-separated SDK Platform(s) to install on test agents (no spaces)
6060
value: 35,Baklava
61+
- name: DefaultJavaSdkMajorVersion
62+
value: 17
6163
- name: ExcludedNightlyNUnitCategories
6264
value: 'cat != SystemApplication & cat != TimeZoneInfo & cat != Localization'
6365
- name: RunMAUITestJob

‎build-tools/gradle/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎build-tools/scripts/TestApks.targets

+3
Original file line numberDiff line numberDiff line change
@@ -380,6 +380,7 @@
380380
<!-- SDK component installation can be frail, try a few times. -->
381381
<Exec
382382
Command="&quot;$(CommandLineToolsBinPath)\sdkmanager&quot; &quot;$(SdkManagerImageName)&quot;"
383+
EnvironmentVariables="JAVA_HOME=$(JavaSdkDirectory)"
383384
ContinueOnError="true">
384385
<Output TaskParameter="ExitCode" PropertyName="_SdkManagerExitCode" />
385386
</Exec>
@@ -389,6 +390,7 @@
389390
/>
390391
<Exec
391392
Command="&quot;$(CommandLineToolsBinPath)\sdkmanager&quot; &quot;$(SdkManagerImageName)&quot;"
393+
EnvironmentVariables="JAVA_HOME=$(JavaSdkDirectory)"
392394
ContinueOnError="true"
393395
Condition=" '$(_SdkManagerExitCode)' != '0' ">
394396
<Output TaskParameter="ExitCode" PropertyName="_SdkManagerExitCode" />
@@ -399,6 +401,7 @@
399401
/>
400402
<Exec
401403
Command="&quot;$(CommandLineToolsBinPath)\sdkmanager&quot; &quot;$(SdkManagerImageName)&quot;"
404+
EnvironmentVariables="JAVA_HOME=$(JavaSdkDirectory)"
402405
ContinueOnError="true"
403406
Condition=" '$(_SdkManagerExitCode)' != '0' ">
404407
<Output TaskParameter="ExitCode" PropertyName="_SdkManagerExitCode" />

‎build-tools/xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks/GitBranch.cs

+7-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace Xamarin.Android.BuildTools.PrepTasks
1515
public sealed class GitBranch : Git
1616
{
1717
[Output]
18-
public string Branch { get; set; }
18+
public string Branch { get; set; } = string.Empty;
1919

2020
protected override bool LogTaskMessages {
2121
get { return false; }
@@ -48,6 +48,12 @@ public override bool Execute ()
4848
base.Execute ();
4949
}
5050

51+
// Trim generated dependabot branch names that are too long to produce useful package names
52+
var lastSlashIndex = Branch.LastIndexOf ('/');
53+
if (Branch.StartsWith ("dependabot") && lastSlashIndex != -1 && Branch.Length > 60) {
54+
Branch = Branch.Substring (lastSlashIndex + 1);
55+
}
56+
5157
Log.LogMessage (MessageImportance.Low, $" [Output] {nameof (Branch)}: {Branch}");
5258

5359
return !Log.HasLoggedErrors;

‎build-tools/xaprepare/xaprepare/Steps/Step_InstallAdoptOpenJDK.cs

+9-12
Original file line numberDiff line numberDiff line change
@@ -59,19 +59,11 @@ protected override async Task<bool> Execute (Context context)
5959
return true;
6060
}
6161

62-
// Check for a JDK installed on CI with a matching major version to use for test jobs
62+
// Check for a JDK installed on CI to use for test jobs
6363
var jiJavaHomeVarValue = Environment.GetEnvironmentVariable ("JI_JAVA_HOME");
64-
if (AllowJIJavaHomeMatch && Directory.Exists (jiJavaHomeVarValue)) {
65-
jdkInstallDir = jiJavaHomeVarValue;
66-
OpenJDKExistsAndIsValid (jdkInstallDir, out installedVersion);
67-
if (Version.TryParse (installedVersion, out Version? cversion) && cversion != null) {
68-
if (cversion.Major == JdkVersion.Major) {
69-
Log.Status ($"{ProductName} with version ");
70-
Log.Status (installedVersion ?? "Unknown", ConsoleColor.Yellow);
71-
Log.StatusLine (" already installed in: ", jdkInstallDir, tailColor: ConsoleColor.Cyan);
72-
return true;
73-
}
74-
}
64+
if (AllowJIJavaHomeMatch && Directory.Exists (jiJavaHomeVarValue) && JdkFilesExist (jiJavaHomeVarValue)) {
65+
Log.StatusLine ("Skipping JDK install for test job, JDK exists at: ", jdkInstallDir, tailColor: ConsoleColor.Cyan);
66+
return true;
7567
}
7668

7769
Log.StatusLine ($"{ProductName} {JdkVersion} r{JdkRelease} will be installed to {jdkInstallDir}");
@@ -254,6 +246,11 @@ bool OpenJDKExistsAndIsValid (string installDir, out string? installedVersion)
254246
return false;
255247
}
256248

249+
return JdkFilesExist (installDir);
250+
}
251+
252+
bool JdkFilesExist (string installDir)
253+
{
257254
foreach (string f in jdkFiles) {
258255
string file = Path.Combine (installDir, f);
259256
if (!File.Exists (file)) {

‎eng/Version.Details.xml

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-alpha.1.25060.8">
3+
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-alpha.1.25062.16">
44
<Uri>https://github.com/dotnet/sdk</Uri>
5-
<Sha>2d6bc4f67df6fdfe8fe299a37c8e4894d480759e</Sha>
5+
<Sha>2dd591056f4d46bd529da61f7f210858ab6cc0e9</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.0-alpha.1.25058.25" CoherentParentDependency="Microsoft.NET.Sdk">
7+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.0-alpha.1.25061.3" CoherentParentDependency="Microsoft.NET.Sdk">
88
<Uri>https://github.com/dotnet/runtime</Uri>
9-
<Sha>45155059d0b070e8ac0f6ad8f4909448e7eadd42</Sha>
9+
<Sha>82ab89241b90ca3d64b22971f3a1e248da72828a</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-alpha.1.25058.25" CoherentParentDependency="Microsoft.NET.Sdk">
11+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-alpha.1.25061.3" CoherentParentDependency="Microsoft.NET.Sdk">
1212
<Uri>https://github.com/dotnet/runtime</Uri>
13-
<Sha>45155059d0b070e8ac0f6ad8f4909448e7eadd42</Sha>
13+
<Sha>82ab89241b90ca3d64b22971f3a1e248da72828a</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport" Version="10.0.0-alpha.1.25058.3" CoherentParentDependency="Microsoft.NETCore.App.Ref">
15+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport" Version="10.0.0-alpha.1.25059.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
1616
<Uri>https://github.com/dotnet/emsdk</Uri>
17-
<Sha>6ee0290df7381d7b9c4887b440e1a2815dc72407</Sha>
17+
<Sha>0de3165cb0d56323b6caaf8e9916d4d9e72da32d</Sha>
1818
</Dependency>
1919
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.24627.1" CoherentParentDependency="Microsoft.NET.ILLink.Tasks">
2020
<Uri>https://github.com/dotnet/cecil</Uri>

‎eng/Versions.props

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project>
22
<!--Package versions-->
33
<PropertyGroup>
4-
<MicrosoftNETSdkPackageVersion>10.0.100-alpha.1.25060.8</MicrosoftNETSdkPackageVersion>
4+
<MicrosoftNETSdkPackageVersion>10.0.100-alpha.1.25062.16</MicrosoftNETSdkPackageVersion>
55
<MicrosoftDotnetSdkInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetSdkInternalPackageVersion>
6-
<MicrosoftNETILLinkTasksPackageVersion>10.0.0-alpha.1.25058.25</MicrosoftNETILLinkTasksPackageVersion>
7-
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-alpha.1.25058.25</MicrosoftNETCoreAppRefPackageVersion>
6+
<MicrosoftNETILLinkTasksPackageVersion>10.0.0-alpha.1.25061.3</MicrosoftNETILLinkTasksPackageVersion>
7+
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-alpha.1.25061.3</MicrosoftNETCoreAppRefPackageVersion>
88
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
99
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.24476.2</MicrosoftDotNetBuildTasksFeedPackageVersion>
10-
<MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion>10.0.0-alpha.1.25058.3</MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion>
10+
<MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion>10.0.0-alpha.1.25059.1</MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion>
1111
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
1212
<MicrosoftTemplateEngineTasksPackageVersion>7.0.100-rc.1.22410.7</MicrosoftTemplateEngineTasksPackageVersion>
1313
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.24627.1</MicrosoftDotNetCecilPackageVersion>

‎external/Java.Interop

Submodule Java.Interop updated 13 files

‎external/android-api-docs

Submodule android-api-docs updated 6593 files

‎src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Javac.targets

+2
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ It is shared between "legacy" binding projects and .NET 7+ projects.
121121
Jars="@(_BindingJavaLibrariesToCompile);@(_ReferenceJavaLibs)"
122122
JavacTargetVersion="$(JavacTargetVersion)"
123123
JavacSourceVersion="$(JavacSourceVersion)"
124+
JdkVersion="$(_JdkVersion)"
124125
IntermediateOutputPath="$(IntermediateOutputPath)"
125126
AssemblyIdentityMapFile="$(_AndroidLibrayProjectAssemblyMapFile)"
126127
/>
@@ -168,6 +169,7 @@ It is shared between "legacy" binding projects and .NET 7+ projects.
168169
Jars="@(_JavaLibrariesToCompile);@(_ReferenceJavaLibs)"
169170
JavacTargetVersion="$(JavacTargetVersion)"
170171
JavacSourceVersion="$(JavacSourceVersion)"
172+
JdkVersion="$(_JdkVersion)"
171173
IntermediateOutputPath="$(IntermediateOutputPath)"
172174
AssemblyIdentityMapFile="$(_AndroidLibrayProjectAssemblyMapFile)"
173175
/>

0 commit comments

Comments
 (0)