Skip to content

[build] fix make prepare on clean agents: empty $(PkgMono_Unix) #12231

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
jonathanpeppers merged 1 commit into from
Jul 27, 2026
Merged

[build] fix make prepare on clean agents: empty $(PkgMono_Unix) #12231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion build-tools/scripts/DotNet.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@
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" />
<!-- Build out of process so NuGet-generated props are evaluated after restore. -->
<Exec
Command="&quot;$(DotNetPreviewTool)&quot; build &quot;$(_Root)src\openjdk\openjdk.csproj&quot; -p:Configuration=$(Configuration) -bl:$(_BinlogPathPrefix)-openjdk.binlog"
WorkingDirectory="$(_Root)"
/>
</Target>

<Target Name="PrepareJavaInterop"
Expand Down
10 changes: 10 additions & 0 deletions build-tools/scripts/MonoUnixNative.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,16 @@
<_MonoUnixOutputDylib>$(OutputPath)\libMono.Unix.dylib</_MonoUnixOutputDylib>
</PropertyGroup>

<!-- `$(PkgMono_Unix)` comes from `obj\*.nuget.g.props`, so it is only set if the project was
evaluated after restore. Fail clearly instead of copying `/runtimes/...` paths. -->
<Target Name="_ValidateMonoUnixPackagePath"
BeforeTargets="PrepareForBuild;_MakeMonoUnixFatBinariesOSX">
<Error
Text="`%24(PkgMono_Unix)` is not set. Build this project with `dotnet build` so NuGet-generated props are evaluated after restore."
Condition=" '$(PkgMono_Unix)' == '' "
/>
</Target>

<Target Name="_MakeMonoUnixFatBinariesOSX"
Inputs="@(_MonoUnixDylib)"
Outputs="$(_MonoUnixOutputDylib)">
Expand Down
15 changes: 7 additions & 8 deletions build-tools/scripts/Prepare.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,14 @@
Text="The specified `%24(AndroidToolchainDirectory)` '$(AndroidToolchainDirectory)' contains a space. Android NDK commands do not support this. Please create a Configuration.Override.props file that sets the AndroidToolchainDirectory property to a different path."
Condition=" '$(HostOS)' == 'Windows' And $(AndroidToolchainDirectory.Contains (' '))"
/>
<MSBuild
Projects="$(_TopDir)\build-tools\Xamarin.Android.Tools.BootstrapTasks\Xamarin.Android.Tools.BootstrapTasks.csproj"
Targets="Restore;Build"
Properties="Configuration=$(Configuration)"
<!-- Build out of process so NuGet-generated props are evaluated after restore. -->
<Exec
Command="&quot;$(DotNetPreviewTool)&quot; build &quot;$(_TopDir)\build-tools\Xamarin.Android.Tools.BootstrapTasks\Xamarin.Android.Tools.BootstrapTasks.csproj&quot; -p:Configuration=$(Configuration) -bl:$(_BinlogPathPrefix)-bootstrap-tasks.binlog"
WorkingDirectory="$(_TopDir)"
/>
<MSBuild
Projects="$(_TopDir)\src\workloads\workloads.csproj"
Targets="Restore;Build"
Properties="Configuration=$(Configuration)"
<Exec
Command="&quot;$(DotNetPreviewTool)&quot; build &quot;$(_TopDir)\src\workloads\workloads.csproj&quot; -p:Configuration=$(Configuration) -bl:$(_BinlogPathPrefix)-workloads.binlog"
WorkingDirectory="$(_TopDir)"
/>
<CallTarget Targets="PrepareJavaInterop" />
<MSBuild
Expand Down