[msbuild] Fixed spelling of MacOSX to Mac OS X (#538)
* [msbuild] Fixed spelling of MacOSX to Mac OS X * [msbuild] Use the name 'macOS' instead of 'Mac OS X' :)
This commit is contained in:
Родитель
bc72c950b7
Коммит
235a4ab226
|
@ -60,7 +60,7 @@ MIN_MONO_URL=http://download.mono-project.com/archive/4.4.0/macos-10-universal/M
|
||||||
# Minimum Xamarin Studio version
|
# Minimum Xamarin Studio version
|
||||||
MIN_XAMARIN_STUDIO_URL=https://files.xamarin.com/~rolf/XamarinStudio-6.1.0.4373.dmg
|
MIN_XAMARIN_STUDIO_URL=https://files.xamarin.com/~rolf/XamarinStudio-6.1.0.4373.dmg
|
||||||
MIN_XAMARIN_STUDIO_VERSION=6.1.0.4373
|
MIN_XAMARIN_STUDIO_VERSION=6.1.0.4373
|
||||||
MAX_XAMARIN_STUDIO_VERSION=6.1.0.9999
|
MAX_XAMARIN_STUDIO_VERSION=6.2.0.9999
|
||||||
|
|
||||||
# Minimum OSX versions
|
# Minimum OSX versions
|
||||||
MIN_OSX_BUILD_VERSION=10.11
|
MIN_OSX_BUILD_VERSION=10.11
|
||||||
|
|
|
@ -67,7 +67,7 @@ namespace Xamarin.Mac.Tasks
|
||||||
{
|
{
|
||||||
var sdkVersion = MacOSXSdkVersion.GetDefault (MacOSXSdks.Native);
|
var sdkVersion = MacOSXSdkVersion.GetDefault (MacOSXSdks.Native);
|
||||||
if (!MacOSXSdks.Native.SdkIsInstalled (sdkVersion)) {
|
if (!MacOSXSdks.Native.SdkIsInstalled (sdkVersion)) {
|
||||||
Log.LogError ("The Apple MacOSX SDK is not installed.");
|
Log.LogError ("The Apple macOS SDK is not installed.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -75,11 +75,11 @@ namespace Xamarin.Mac.Tasks
|
||||||
|
|
||||||
SdkRoot = MacOSXSdks.Native.GetSdkPath (sdkVersion);
|
SdkRoot = MacOSXSdks.Native.GetSdkPath (sdkVersion);
|
||||||
if (string.IsNullOrEmpty (SdkRoot))
|
if (string.IsNullOrEmpty (SdkRoot))
|
||||||
Log.LogError ("Could not locate the MacOSX '{0}' SDK at path '{1}'", SdkVersion, SdkRoot);
|
Log.LogError ("Could not locate the macOS '{0}' SDK at path '{1}'", SdkVersion, SdkRoot);
|
||||||
|
|
||||||
SdkUsrPath = DirExists ("SDK usr directory", Path.Combine (MacOSXSdks.Native.DeveloperRoot, "usr"));
|
SdkUsrPath = DirExists ("SDK usr directory", Path.Combine (MacOSXSdks.Native.DeveloperRoot, "usr"));
|
||||||
if (string.IsNullOrEmpty (SdkUsrPath))
|
if (string.IsNullOrEmpty (SdkUsrPath))
|
||||||
Log.LogError ("Could not locate the MacOSX '{0}' SDK usr path at '{1}'", SdkVersion, SdkRoot);
|
Log.LogError ("Could not locate the macOS '{0}' SDK usr path at '{1}'", SdkVersion, SdkRoot);
|
||||||
|
|
||||||
SdkBinPath = DirExists ("SDK bin directory", Path.Combine (SdkUsrPath, "bin"));
|
SdkBinPath = DirExists ("SDK bin directory", Path.Combine (SdkUsrPath, "bin"));
|
||||||
if (string.IsNullOrEmpty (SdkBinPath))
|
if (string.IsNullOrEmpty (SdkBinPath))
|
||||||
|
|
Загрузка…
Ссылка в новой задаче