diff --git a/Xamarin.MacDev/AppleSdk.cs b/Xamarin.MacDev/AppleSdk.cs index 2a94297..3da66ad 100644 --- a/Xamarin.MacDev/AppleSdk.cs +++ b/Xamarin.MacDev/AppleSdk.cs @@ -172,13 +172,12 @@ public AppleDTSettings GetDTSettings () var dict = PDictionary.FromFile (Path.Combine (DevicePlatform, "Info.plist")); var infos = dict.Get ("AdditionalInfo"); - var systemVersionPlist = Path.Combine (DeveloperRoot, SYSTEM_VERSION_PLIST); return (dtSettings = new AppleDTSettings { DTPlatformVersion = infos.Get ("DTPlatformVersion").Value, DTPlatformBuild = GrabRootString (Path.Combine (DevicePlatform, "version.plist"), "ProductBuildVersion"), DTXcodeBuild = GrabRootString (VersionPlist, "ProductBuildVersion"), - BuildMachineOSBuild = GrabRootString (systemVersionPlist, "ProductBuildVersion"), + BuildMachineOSBuild = GrabRootString (SYSTEM_VERSION_PLIST, "ProductBuildVersion"), }); } diff --git a/Xamarin.MacDev/MacOSXSdk.cs b/Xamarin.MacDev/MacOSXSdk.cs index 7dd5630..11e0db6 100644 --- a/Xamarin.MacDev/MacOSXSdk.cs +++ b/Xamarin.MacDev/MacOSXSdk.cs @@ -260,7 +260,10 @@ AppleDTSdkSettings LoadSdkSettings (IAppleSdkVersion sdk) else settings.DTCompiler = gcc.Value; - settings.DTSDKBuild = GrabRootString (Path.Combine (DeveloperRoot, SYSTEM_VERSION_PLIST), "ProductBuildVersion"); + var sdkPath = GetSdkPath (sdk.ToString ()); + // Do not do 'Path.Combine (sdkPath, SYSTEM_VERSION_PLIST)', because SYSTEM_VERSION_PLIST starts with a slash, + // and thus Path.Combine wouldn't combine, just return SYSTEM_VERSION_PLIST. + settings.DTSDKBuild = GrabRootString (sdkPath + SYSTEM_VERSION_PLIST, "ProductBuildVersion"); return settings; } @@ -278,13 +281,12 @@ DTSettings GetSettings () var dict = PDictionary.FromFile (Path.Combine (DesktopPlatform, "Info.plist")); var infos = dict.Get ("AdditionalInfo"); - var systemVersionPlist = Path.Combine (DeveloperRoot, SYSTEM_VERSION_PLIST); return (dtSettings = new DTSettings { DTPlatformVersion = infos.Get ("DTPlatformVersion").Value, DTPlatformBuild = GrabRootString (Path.Combine (DesktopPlatform, "version.plist"), "ProductBuildVersion") ?? GrabRootString (VersionPlist, "ProductBuildVersion"), DTXcodeBuild = GrabRootString (VersionPlist, "ProductBuildVersion"), - BuildMachineOSBuild = GrabRootString (systemVersionPlist, "ProductBuildVersion"), + BuildMachineOSBuild = GrabRootString (SYSTEM_VERSION_PLIST, "ProductBuildVersion"), }); }