[mtouch] Fix formatting for MT0079 and update the MT4134 test to take into account the warning. Fixes maccore#1116. (#5089)

Fixes https://github.com/xamarin/maccore/issues/1116.
This commit is contained in:
Rolf Bjarne Kvinge 2018-11-06 15:06:10 +01:00 коммит произвёл GitHub
Родитель 1ca7da537d
Коммит 012a0650b6
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
2 изменённых файлов: 3 добавлений и 2 удалений

Просмотреть файл

@ -299,7 +299,8 @@ class MyObjectErr : NSObject, IFoo1, IFoo2
foreach (var framework in invalidFrameworks)
mtouch.AssertError (4134, $"Your application is using the '{framework.Framework}' framework, which isn't included in the iOS SDK you're using to build your app (this framework was introduced in iOS {framework.Version}, while you're building with the iOS {mtouch.Sdk} SDK.) Please select a newer SDK in your app's iOS Build options.");
mtouch.AssertErrorCount (invalidFrameworks.Length);
mtouch.AssertWarningCount (0);
mtouch.AssertWarningPattern (79, $"The recommended Xcode version for Xamarin.iOS .* is Xcode .* or later. The current Xcode version .found in /Applications/Xcode83.app/Contents/Developer. is .*.");
mtouch.AssertWarningCount (1);
mtouch.AssertExecute (MTouchAction.BuildSim);
}

Просмотреть файл

@ -592,7 +592,7 @@ namespace Xamarin.Bundler {
throw ErrorHelper.CreateError (51, "{3} {0} requires Xcode {4} or later. The current Xcode version (found in {2}) is {1}.", Constants.Version, XcodeVersion.ToString (), sdk_root, PRODUCT, min_xcode_version);
if (XcodeVersion < SdkVersions.XcodeVersion)
ErrorHelper.Warning (79, "The recommended Xcode version for {3} {0} is Xcode {3} or later. The current Xcode version (found in {2}) is {1}.", Constants.Version, XcodeVersion.ToString (), sdk_root, SdkVersions.Xcode, PRODUCT);
ErrorHelper.Warning (79, "The recommended Xcode version for {4} {0} is Xcode {3} or later. The current Xcode version (found in {2}) is {1}.", Constants.Version, XcodeVersion.ToString (), sdk_root, SdkVersions.Xcode, PRODUCT);
}
Driver.Log (1, "Using Xcode {0} ({2}) found in {1}", XcodeVersion, sdk_root, XcodeProductVersion);