Skip to content

Commit acf9f50

Browse files
jonpryorjpobst
authored andcommitted
[build] Import $(MSBuildProjectDirectory).override.props (#872)
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
1 parent 20b9f23 commit acf9f50

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

Directory.Build.props

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
Project="$(MSBuildThisFileDirectory)Configuration.Override.props"
1717
Condition="Exists('$(MSBuildThisFileDirectory)Configuration.Override.props')"
1818
/>
19+
<Import
20+
Project="$(MSBuildProjectDirectory).override.props"
21+
Condition="Exists('$(MSBuildProjectDirectory).override.props')"
22+
/>
1923
<Import
2024
Project="$(_OutputPath)JdkInfo.props"
2125
Condition="Exists('$(_OutputPath)JdkInfo.props')"

0 commit comments

Comments
 (0)