[xabuild.exe] fixes for paths/settings on macOS #1685
Merged
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
When looking at my Mono 5.12 installation, I noticed a few files we should be using with `xabuild.exe`: - `/Library/Frameworks/Mono.framework/Versions/5.12.0/lib/mono/msbuild/15.0/bin/NuGet.targets` - `/Library/Frameworks/Mono.framework/Versions/5.12.0/lib/mono/msbuild/15.0/bin/Sdks` directory `NuGet.targets` is needed for `XABuildPaths.NuGetRestoreTargets`, and the `Sdks` directory can be used for `MSBuildSdksPath`. Both of these values can still fall back to .NET Core, if they are not found. After these changes, it more closely matches the Windows code. We should be able to build a wider range of .NET standard projects with `xabuild.exe` now.
jonpryor
reviewed
May 16, 2018
| if (!string.IsNullOrEmpty (DotNetSdkPath)) { | ||
| NuGetRestoreTargets = Path.Combine (MSBuildBin, "NuGet.targets"); | ||
| if (!File.Exists (NuGetRestoreTargets) && !string.IsNullOrEmpty (DotNetSdkPath)) { | ||
| NuGetRestoreTargets = Path.Combine (DotNetSdkPath, "..", "NuGet.targets"); |
Contributor
There was a problem hiding this comment.
Shouldn't we verify that this path also exists? Or would that not matter?
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 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.
When looking at my Mono 5.12 installation, I noticed a few files we
should be using with
xabuild.exe:/Library/Frameworks/Mono.framework/Versions/5.12.0/lib/mono/msbuild/15.0/bin/NuGet.targets/Library/Frameworks/Mono.framework/Versions/5.12.0/lib/mono/msbuild/15.0/bin/SdksdirectoryNuGet.targetsis needed forXABuildPaths.NuGetRestoreTargets, andthe
Sdksdirectory can be used forMSBuildSdksPath.Both of these values can still fall back to .NET Core, if they are not
found.
After these changes, it more closely matches the Windows code. We
should be able to build a wider range of .NET standard projects with
xabuild.exenow on macOS.