Skip to content

Commit

Permalink
[build] Import $(MSBuildProjectDirectory).override.props (dotnet#872)
Browse files Browse the repository at this point in the history
Commit b6431ac introduced support for `Configuration.Override.props`,
which eventually allowed overriding the `external/xamarin-android-tools`
path via the `$(XamarinAndroidToolsDirectory)` MSBuild property in
commit 32f0c9c.

A problem with this approach is that it requires that the host repo
create the `Java.Interop/Configuration.Override.props` file before
running `make -C …/Java.Interop prepare`.

This can be simplified: update `Directory.Build.props` so that it
will also `<Import/>` the file
`$(MSBuildProjectDirectory).override.props`.
[`$(MSBuildProjectDirectory)`][0] is:

> The absolute path of the directory where the project file is
> located, for example `C:\MyCompany\MyProduct`.
>
> Do not include the final backslash on this property.

The "Do not" is grammatically odd, as it's set by MSBuild.
It *does not* include a final backslash.

This means that we can place the `.override.props` file in the
directory containing the Java.Interop checkout, with a name that
matches the git submodule directory name:

	external/my-Java.Interop-checkout                   # git submodule to xamarin/Java.Interop
	external/my-Java.Interop-checkout.override.props    # now automatically imported

[0]: https://docs.microsoft.com/en-us/visualstudio/msbuild/msbuild-reserved-and-well-known-properties?view=vs-2019
  • Loading branch information
jonpryor authored Aug 24, 2021
1 parent d16b1e5 commit 8898bc1
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
Project="$(MSBuildThisFileDirectory)Configuration.Override.props"
Condition="Exists('$(MSBuildThisFileDirectory)Configuration.Override.props')"
/>
<Import
Project="$(MSBuildProjectDirectory).override.props"
Condition="Exists('$(MSBuildProjectDirectory).override.props')"
/>
<Import
Project="$(_OutputPath)JdkInfo.props"
Condition="Exists('$(_OutputPath)JdkInfo.props')"
Expand Down

0 comments on commit 8898bc1

Please sign in to comment.