[xabuild.exe] handle AndroidSdkDirectory like the script #988
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Context: https://github.com/xamarin/xamarin-android/blob/master/tools/scripts/xabuild#L105 `xabuild`, the shell script, has some logic to set MSBuild properties for `AndroidSdkDirectory` and `AndroidNdkDirectory`. The issue here is on Windows, `xabuild.exe` is not invoked from this shell script. So we need to replicate the logic in C# in `xabuild.exe`, but not break what was fixed in dotnet#977. Changes: - check for `ANDROID_SDK_PATH` or `ANDROID_NDK_PATH` environment variables - Run `Paths.targets` via a new MSBuild process, the same way as `xabuild`, the script - Set the `AndroidSdkDirectory` and `AndroidNdkDirectory` values in the config file if they are not blank - `AndroidSdkDirectory` and `AndroidNdkDirectory` can still be overridden by a user, because incoming values supersede what is found in the config file
|
@jonathanpeppers, |
Redth
pushed a commit
to Redth/xamarin-android
that referenced
this pull request
Oct 30, 2017
Context: https://github.com/xamarin/xamarin-android/blob/master/tools/scripts/xabuild#L105 `xabuild`, the shell script, has some logic to set MSBuild properties for `AndroidSdkDirectory` and `AndroidNdkDirectory`. The issue here is on Windows, `xabuild.exe` is not invoked from this shell script. So we need to replicate the logic in C# in `xabuild.exe`, but not break what was fixed in dotnet#977. Changes: * Check for `ANDROID_SDK_PATH` or `ANDROID_NDK_PATH` environment variables * Run `Paths.targets` via a new MSBuild process, the same way as `tools/scripts/xabuild` * Set the `AndroidSdkDirectory` and `AndroidNdkDirectory` properties in the config file if they are not blank * `AndroidSdkDirectory` and `AndroidNdkDirectory` can still be overridden by a user, because incoming values supersede what is found in the config file
jonpryor
pushed a commit
that referenced
this pull request
Jun 2, 2022
Changes: dotnet/java-interop@1f27ab5...1bab47d * dotnet/java-interop@1bab47d6: [build] Target `net7.0` (#988) Java.Interop now targets `net7.0`. The `Configuration.Java.Interop.Override.props` file is now partially generated by `xaprepare`, to avoid having to hard code duplicate version and path values in it. The Java.Interop `Prepare` step has been moved out of `xaprepare` and into a new MSBuild target that will be ran with the .NET 7 preview SDK that is installed by `xaprepare`. Extra Java.Interop tests have been removed from the "Windows Build and Smoke Test" job, as these should already be running as part of Java Interop CI. The `dotnet --list-sdks` command was failing on macOS when installing the latest .NET 7 Preview SDK, and it has been replaced by a step that runs `dotnet --info`. Co-authored-by: Peter Collins <[email protected]>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Context:
https://github.com/xamarin/xamarin-android/blob/master/tools/scripts/xabuild#L105
xabuild, the shell script, has some logic to set MSBuild propertiesfor
AndroidSdkDirectoryandAndroidNdkDirectory. The issue here ison Windows,
xabuild.exeis not invoked from this shell script. So weneed to replicate the logic in C# in
xabuild.exe, but not break whatwas fixed in #977.
Changes:
ANDROID_SDK_PATHorANDROID_NDK_PATHenvironmentvariables
Paths.targetsvia a new MSBuild process, the same way asxabuild, the scriptAndroidSdkDirectoryandAndroidNdkDirectoryvalues in theconfig file if they are not blank
AndroidSdkDirectoryandAndroidNdkDirectorycan still beoverridden by a user, because incoming values supersede what is found
in the config file