Skip to content

Commit

Permalink
Accept 'tools/buildinfo' as an alternative path to 'buildinfo' due to…
Browse files Browse the repository at this point in the history
… an nuget bug. (#70)

nuget doesn't like files that start with 'build*' in the root nuget directory
[1], so avoid it by putting 'buildinfo' in 'tools/buildinfo' instead.

[1]: NuGet/Home#8810
  • Loading branch information
rolfbjarne authored Feb 24, 2020
1 parent ce24236 commit e21e1aa
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion Xamarin.MacDev/MonoTouchSdk.cs
Original file line number Diff line number Diff line change
Expand Up @@ -285,8 +285,13 @@ public static bool ValidateSdkLocation (string sdkDir, out bool hasUsrSubdir)
ExtendedVersion extended_version;
public ExtendedVersion ExtendedVersion {
get {
if (extended_version == null)
if (extended_version == null) {
extended_version = ExtendedVersion.Read (Path.Combine (SdkDir, "buildinfo"));
if (extended_version == null) {
// 'buildinfo' doesn't work in a nuget package because of https://github.com/NuGet/Home/issues/8810, so use 'tools/buildinfo' instead.
extended_version = ExtendedVersion.Read (Path.Combine (SdkDir, "tools", "buildinfo"));
}
}
return extended_version;
}
}
Expand Down

0 comments on commit e21e1aa

Please sign in to comment.