Skip to content

[build] provision OpenJDK before Java.Interop Prepare#11442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
simonrozsival merged 3 commits into from
May 22, 2026
Merged

[build] provision OpenJDK before Java.Interop Prepare #11442

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd008cd
[build] provision OpenJDK before Java.Interop Prepare
jonathanpeppers May 21, 2026
d4f8ef5
Use <MSBuild/> task instead of <Exec> for openjdk.csproj
jonathanpeppers May 21, 2026
abb3279
Restore openjdk.csproj before building it
jonathanpeppers May 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion build-tools/scripts/DotNet.targets
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,16 @@
/>
</Target>

<Target Name="PrepareJavaInterop">
<Target Name="PrepareOpenJDK">
<!-- Ensure the Microsoft OpenJDK is downloaded and extracted into $(JavaSdkDirectory)
before Java.Interop's Prepare target scans for a JDK. Otherwise its JdkInfo task
falls back to a system-installed JDK (e.g. the JDK 25 preinstalled on hosted
macOS images), which can be incompatible with our Gradle version. -->
<MSBuild Projects="$(_Root)src\openjdk\openjdk.csproj" Properties="Configuration=$(Configuration)" Targets="Restore;Build" />
</Target>

<Target Name="PrepareJavaInterop"
DependsOnTargets="PrepareOpenJDK">
<Exec
Command="&quot;$(DotNetPreviewTool)&quot; build -t:Prepare Java.Interop.sln -c $(Configuration) -p:JdksRoot=$(JavaSdkDirectory) -p:DotnetToolPath=$(DotNetPreviewTool) -bl:$(_BinlogPathPrefix)-prepare-java-interop.binlog"
WorkingDirectory="$(_Root)external\Java.Interop"
Expand Down