From e00aa83191116fa35b99740d21f082859f934746 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Fri, 14 Feb 2020 08:07:33 +0100 Subject: [PATCH] Accept 'tools/buildinfo' as an alternative path to 'buildinfo' due to an nuget bug. 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]: https://github.com/NuGet/Home/issues/8810 --- Xamarin.MacDev/MonoTouchSdk.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Xamarin.MacDev/MonoTouchSdk.cs b/Xamarin.MacDev/MonoTouchSdk.cs index 0267eb5..339e72b 100644 --- a/Xamarin.MacDev/MonoTouchSdk.cs +++ b/Xamarin.MacDev/MonoTouchSdk.cs @@ -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; } }