[Main] Bring Xcode12.1 support.

This commit is contained in:
Manuel de la Pena 2020-10-20 17:55:31 -04:00
Родитель de032018aa e0ce496804
Коммит 00e25199ae
21 изменённых файлов: 271 добавлений и 9 удалений

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

@ -35,7 +35,7 @@ $(TOP)/Make.config.inc: $(TOP)/Make.config $(TOP)/mk/mono.mk
include $(TOP)/Make.versions
APIDIFF_REFERENCES=https://bosstoragemirror.blob.core.windows.net/wrench/jenkins/xcode12/7ec3751a1077e5d77d7375ef61182538d9d11f8d/234/package/bundle.zip
APIDIFF_REFERENCES=https://bosstoragemirror.blob.core.windows.net/wrench/jenkins/xcode12.1/e0ce496804e49056ab8eb41da55813083ab7f58b/15/package/bundle.zip
PACKAGE_HEAD_REV=$(shell git rev-parse HEAD)
@ -111,9 +111,9 @@ WATCHOS_NUGET_VERSION_NO_METADATA=$(WATCHOS_NUGET_VERSION)-$(NUGET_PRERELEASE_ID
WATCHOS_NUGET_VERSION_FULL=$(WATCHOS_NUGET_VERSION_NO_METADATA)+$(NUGET_BUILD_METADATA)
# Xcode version should have both a major and a minor version (even if the minor version is 0)
XCODE_VERSION=12.0
XCODE_URL=http://xamarin-storage/bot-provisioning/xcodes/Xcode_12.xip
XCODE_DEVELOPER_ROOT=/Applications/Xcode_12.0.0.app/Contents/Developer
XCODE_VERSION=12.1
XCODE_URL=http://xamarin-storage/bot-provisioning/xcodes/Xcode_12.1_GM_seed.xip
XCODE_DEVELOPER_ROOT=/Applications/Xcode_12.1.0-GM.app/Contents/Developer
XCODE_PRODUCT_BUILD_VERSION:=$(shell /usr/libexec/PlistBuddy -c 'Print :ProductBuildVersion' $(XCODE_DEVELOPER_ROOT)/../version.plist)
# Mono version embedded in XI/XM (NEEDED_MONO_VERSION/BRANCH) are specified in mk/mono.mk

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

@ -66,7 +66,7 @@ MAC_PACKAGE_VERSION=6.99.0.$(MAC_COMMIT_DISTANCE)
# WARNING: Do **not** use versions higher than the available Xcode SDK or else we will have issues with mtouch (See https://github.com/xamarin/xamarin-macios/issues/7705)
# When bumping the major macOS version in MACOS_NUGET_VERSION also update the macOS version where we execute on bots in jenkins/Jenkinsfile (in the 'node' element)
IOS_NUGET_VERSION=14.0.100
IOS_NUGET_VERSION=14.1.100
TVOS_NUGET_VERSION=14.0.100
WATCHOS_NUGET_VERSION=7.0.100
MACOS_NUGET_VERSION=10.15.100

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

@ -41,6 +41,7 @@
<string>13.5</string>
<string>13.6</string>
<string>14.0</string>
<string>14.1</string>
</array>
<key>tvOS</key>
<array>

7
jenkins/Jenkinsfile поставляемый
Просмотреть файл

@ -867,8 +867,13 @@ timestamps {
failedStages.add (currentStage)
} else {
def packaged_xm_tests = findFiles (glob: "tests/*.7z")
if (packaged_xm_tests.size () > 0)
if (packaged_xm_tests.size () > 0) {
uploadFiles ("tests/*.7z", "wrench", virtualPath)
} else {
// This may happen if the Xamarin.Mac build has been disabled
manager.addWarningBadge("Could not find any packaged Xamarin.Mac tests to upload")
hasXamarinMacTests = false
}
}
}
}

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

@ -710,7 +710,9 @@ namespace AVFoundation {
public enum AVCaptureColorSpace : long
{
Srgb = 0,
P3D65 = 1
P3D65 = 1,
[iOS (14,1)][NoMac]
HlgBT2020 = 2,
}
[iOS (8,0)]

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

@ -559,6 +559,37 @@ namespace CoreGraphics {
return CGColorSpaceUsesExtendedRange (handle);
}
}
#if __IOS__
[iOS (14,1)][NoTV][NoWatch][NoMac]
[DllImport (Constants.CoreGraphicsLibrary)]
static extern bool CGColorSpaceUsesITUR_2100TF (/* CGColorSpaceRef */ IntPtr space);
[iOS (14,1)][NoTV][NoWatch][NoMac]
public bool UsesItur2100TF => CGColorSpaceUsesITUR_2100TF (handle);
[iOS (14,1)][NoTV][NoWatch][NoMac]
[DllImport (Constants.CoreGraphicsLibrary)]
static extern IntPtr CGColorSpaceCreateLinearized (/* CGColorSpaceRef */ IntPtr space);
[iOS (14,1)][NoTV][NoWatch][NoMac]
public CGColorSpace CreateLinearized () => Runtime.GetINativeObject<CGColorSpace> (CGColorSpaceCreateLinearized (handle), owns: true);
[iOS (14,1)][NoTV][NoWatch][NoMac]
[DllImport (Constants.CoreGraphicsLibrary)]
static extern IntPtr CGColorSpaceCreateExtended (/* CGColorSpaceRef */ IntPtr space);
[iOS (14,1)][NoTV][NoWatch][NoMac]
public CGColorSpace CreateExtended () => Runtime.GetINativeObject<CGColorSpace> (CGColorSpaceCreateExtended (handle), owns: true);
[iOS (14,1)][NoTV][NoWatch][NoMac]
[DllImport (Constants.CoreGraphicsLibrary)]
static extern IntPtr CGColorSpaceCreateExtendedLinearized (/* CGColorSpaceRef */ IntPtr space);
[iOS (14,1)][NoTV][NoWatch][NoMac]
public CGColorSpace CreateExtendedLinearized () => Runtime.GetINativeObject<CGColorSpace> (CGColorSpaceCreateExtendedLinearized (handle), owns: true);
#endif
#endif // !COREBUILD
}
}

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

@ -72,4 +72,12 @@ namespace ImageIO {
IncompleteInputImage = -22143,
AllocationFailure = -22144,
}
// Yes, no [Native] here
[iOS (14,1)]
[NoTV][NoWatch][NoMac]
public enum CGImagePropertyTgaCompression : uint {
None = 0,
Rle,
}
}

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

@ -62,10 +62,14 @@ namespace MetalPerformanceShaders {
Int8 = SignedBit | 8,
Int16 = SignedBit | 16,
Int32 = SignedBit | 32,
[iOS (14,1)][NoTV][NoMac]
Int64 = SignedBit | 64,
UInt8 = 8,
UInt16 = 16,
UInt32 = 32,
[iOS (14,1)][NoTV][NoMac]
UInt64 = 64,
[iOS (11,0), TV (11,0)]
NormalizedBit = 0x40000000,

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

@ -9585,6 +9585,11 @@ namespace AVFoundation {
[NoWatch, NoTV, NoMac, iOS (13, 0)]
[Export ("autoVirtualDeviceFusionEnabled")]
bool AutoVirtualDeviceFusionEnabled { [Bind ("isAutoVirtualDeviceFusionEnabled")] get; set; }
[iOS (14,1)]
[NoMac]
[Export ("autoContentAwareDistortionCorrectionEnabled")]
bool AutoContentAwareDistortionCorrectionEnabled { [Bind ("isAutoContentAwareDistortionCorrectionEnabled")] get; set; }
}
#if !MONOMAC
@ -9676,6 +9681,11 @@ namespace AVFoundation {
[NoWatch, NoTV, NoMac, iOS (13,0)]
[Export ("virtualDeviceFusionEnabled")]
bool VirtualDeviceFusionEnabled { [Bind ("isVirtualDeviceFusionEnabled")] get; }
[iOS (14,1)]
[NoMac]
[Export ("contentAwareDistortionCorrectionEnabled")]
bool ContentAwareDistortionCorrectionEnabled { [Bind ("isContentAwareDistortionCorrectionEnabled")] get; }
}
@ -9921,6 +9931,16 @@ namespace AVFoundation {
[NoWatch, NoTV, NoMac, iOS (13, 0)]
[Export ("virtualDeviceConstituentPhotoDeliveryEnabled")]
bool VirtualDeviceConstituentPhotoDeliveryEnabled { [Bind ("isVirtualDeviceConstituentPhotoDeliveryEnabled")] get; set; }
[iOS (14,1)]
[NoMac]
[Export ("contentAwareDistortionCorrectionSupported")]
bool ContentAwareDistortionCorrectionSupported { [Bind ("isContentAwareDistortionCorrectionSupported")] get; }
[iOS (14,1)]
[NoMac]
[Export ("contentAwareDistortionCorrectionEnabled")]
bool ContentAwareDistortionCorrectionEnabled { [Bind ("isContentAwareDistortionCorrectionEnabled")] get; set; }
}
[BaseType (typeof (AVCaptureFileOutput))]
@ -11512,6 +11532,11 @@ namespace AVFoundation {
[Watch (7, 0), TV (14, 0), Mac (11, 0), iOS (14, 0)]
[Export ("startsOnFirstEligibleVariant")]
bool StartsOnFirstEligibleVariant { get; set; }
[iOS (14,1)]
[NoWatch][NoTV][NoMac]
[Export ("appliesPerFrameHDRDisplayMetadata")]
bool AppliesPerFrameHdrDisplayMetadata { get; set; }
}
[NoiOS][NoTV][NoWatch]
@ -13697,6 +13722,10 @@ namespace AVFoundation {
Hair,
[Field ("AVSemanticSegmentationMatteTypeTeeth")]
Teeth,
[iOS (14,1)]
[NoWatch][NoTV][NoMac]
[Field ("AVSemanticSegmentationMatteTypeGlasses")]
Glasses,
}
[Watch (6,0), TV (13,0), Mac (10,15), iOS (13,0)]

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

@ -208,11 +208,19 @@ namespace CoreGraphics {
[Field ("kCGColorSpaceExtendedLinearITUR_2020")]
NSString ExtendedLinearItur_2020 { get; }
[iOS (14,1)][NoTV][NoWatch][NoMac]
[Field ("kCGColorSpaceExtendedITUR_2020")]
NSString ExtendedItur_2020 { get; }
[Mac (10,14,3)][iOS (12,3)]
[TV (12,3)][Watch (5,3)]
[Field ("kCGColorSpaceExtendedLinearDisplayP3")]
NSString ExtendedLinearDisplayP3 { get; }
[iOS (14,1)][NoTV][NoWatch][NoMac]
[Field ("kCGColorSpaceExtendedDisplayP3")]
NSString ExtendedDisplayP3 { get; }
[Mac (10,14)][iOS (12,0)]
[TV (12,0)][Watch (5,0)]
[Deprecated (PlatformName.MacOSX, 10,15,4, message: "Use 'Itur_2100_PQ' instead.")]

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

@ -506,6 +506,12 @@ namespace CoreImage {
[Export ("depthBlurEffectFilterForImage:disparityImage:portraitEffectsMatte:hairSemanticSegmentation:orientation:options:")]
[return: NullAllowed]
CIFilter GetDepthBlurEffectFilter (CIImage image, CIImage disparityImage, [NullAllowed] CIImage portraitEffectsMatte, [NullAllowed] CIImage hairSemanticSegmentation, CGImagePropertyOrientation orientation, [NullAllowed] NSDictionary options);
[iOS (14,1)]
[NoTV][NoMac]
[Export ("depthBlurEffectFilterForImage:disparityImage:portraitEffectsMatte:hairSemanticSegmentation:glassesMatte:gainMap:orientation:options:")]
[return: NullAllowed]
CIFilter GetDepthBlurEffectFilter (CIImage image, CIImage disparityImage, [NullAllowed] CIImage portraitEffectsMatte, [NullAllowed] CIImage hairSemanticSegmentation, [NullAllowed] CIImage glassesMatte, [NullAllowed] CIImage gainMap, CGImagePropertyOrientation orientation, [NullAllowed] NSDictionary options);
}
[BaseType (typeof (NSObject))]
@ -1327,6 +1333,14 @@ namespace CoreImage {
[iOS (13,0)][TV (13,0)][Mac (10,15)]
bool AuxiliarySemanticSegmentationTeethMatte { get; set; }
[iOS (14,1)]
[NoTV][NoMac]
bool AuxiliarySemanticSegmentationGlassesMatte { get; set; }
[iOS (14,1)]
[NoTV][NoMac]
bool ToneMapHdrToSdr { get; set; }
}
[Internal]
@ -1369,6 +1383,17 @@ namespace CoreImage {
[iOS (13,0)][TV (13,0)][Mac (10,15)]
[Field ("kCIImageAuxiliarySemanticSegmentationTeethMatte")]
NSString AuxiliarySemanticSegmentationTeethMatteKey { get; }
[iOS (14, 1)]
[NoTV][NoMac]
[Field ("kCIImageAuxiliarySemanticSegmentationGlassesMatte")]
NSString AuxiliarySemanticSegmentationGlassesMatteKey { get; }
[iOS (14,1)]
[NoTV][NoMac]
[Field ("kCIImageToneMapHDRtoSDR")]
NSString ToneMapHdrToSdrKey { get; }
}
[BaseType (typeof (NSObject))]
@ -5165,6 +5190,16 @@ namespace CoreImage {
[CoreImageFilterProperty ("inputAuxDataMetadata")]
CGImageMetadata AuxDataMetadata { get; set; }
[iOS (14,1)]
[NoTV][NoMac]
[CoreImageFilterProperty ("inputGainMap")]
CIImage GainMap { get; set; }
[iOS (14,1)]
[NoTV][NoMac]
[CoreImageFilterProperty ("inputGlassesImage")]
CIImage GlassesImage { get; set; }
}
[CoreImageFilter]
@ -5717,6 +5752,11 @@ namespace CoreImage {
[iOS (13,0)][TV (13,0)][Mac (10,15)]
[Field ("kCIImageRepresentationSemanticSegmentationTeethMatteImage")]
NSString SemanticSegmentationTeethMatteImageKey { get; }
[iOS (14,1)]
[NoTV][NoMac]
[Field ("kCIImageRepresentationSemanticSegmentationGlassesMatteImage")]
NSString SemanticSegmentationGlassesMatteImage { get; }
}
[iOS (11,0)]

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

@ -63,6 +63,14 @@ namespace CoreTelephony {
[Field ("CTRadioAccessTechnologyLTE")]
NSString LTE { get; }
[iOS (14,1)]
[Field ("CTRadioAccessTechnologyNRNSA")]
NSString NRNsa { get; }
[iOS (14,1)]
[Field ("CTRadioAccessTechnologyNR")]
NSString NR { get; }
}
interface ICTTelephonyNetworkInfoDelegate {}

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

@ -71,6 +71,11 @@ namespace ImageIO {
[Field ("kCGImagePropertyWebPDictionary")]
NSString WebPDictionary { get; }
[iOS (14,1)]
[NoTV][NoWatch][NoMac]
[Field ("kCGImagePropertyTGADictionary")]
NSString TgaDictionary { get; }
// Camera-Maker Dictionaries
[Field ("kCGImagePropertyMakerCanonDictionary")]
NSString MakerCanonDictionary { get; }
@ -2030,6 +2035,13 @@ namespace ImageIO {
[Mac (11,0)][iOS (14,0)][TV (14,0)][Watch (7,0)]
[Field ("kCGImagePropertyWebPCanvasPixelHeight")]
NSString WebPCanvasPixelHeight { get; }
// TGA Dictionary Keys
[iOS (14,1)]
[NoTV][NoWatch][NoMac]
[Field ("kCGImagePropertyTGACompression")]
NSString TgaCompression { get; }
}
[iOS (7,0)]
@ -2204,6 +2216,15 @@ namespace ImageIO {
[Mac (11,0), iOS (14,0), TV (14,0), Watch (7,0)]
[Export ("WebPDictionary")]
NSDictionary WebPDictionary { get; set; }
[iOS (14,1)]
[NoTV][NoWatch][NoMac]
[Export ("TgaDictionary")]
NSDictionary TgaDictionary { get; set; }
[iOS (14,1)]
[NoTV][NoWatch][NoMac]
bool PreserveGainMap { get; set; }
}
[Static]
@ -2280,6 +2301,16 @@ namespace ImageIO {
[Mac (11,0), iOS (14,0), TV (14,0), Watch (7,0)]
[Static][Wrap ("CGImageProperties.WebPDictionary")]
NSString WebPDictionary { get; }
[iOS (14,1)]
[NoTV][NoWatch][NoMac]
[Static][Wrap ("CGImageProperties.TgaDictionary")]
NSString TgaDictionary { get; }
[iOS (14,1)]
[NoTV][NoWatch][NoMac]
[Field ("kCGImageDestinationPreserveGainMap")]
NSString PreserveGainMapKey { get; }
}
[Partial]
@ -2333,6 +2364,16 @@ namespace ImageIO {
[iOS (13,0)][TV (13,0)][Watch (6,0)][Mac (10,15)]
[Field ("kCGImageAuxiliaryDataTypeSemanticSegmentationTeethMatte")]
SemanticSegmentationTeethMatte,
[iOS (14,1)]
[NoTV][NoWatch][NoMac]
[Field ("kCGImageAuxiliaryDataTypeSemanticSegmentationGlassesMatte")]
SemanticSegmentationGlassesMatte,
[iOS (14,1)]
[NoTV][NoWatch][NoMac]
[Field ("kCGImageAuxiliaryDataTypeHDRGainMap")]
TypeHdrGainMap,
}
[Mac (10,13), iOS (11,0), TV (11,0), Watch (4,0)]

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

@ -196,6 +196,11 @@ namespace VideoToolbox {
[TV (14, 0), Mac (11, 0), iOS (14, 0)]
[Field ("kVTCompressionPropertyKey_PrioritizeEncodingSpeedOverQuality")]
NSString PrioritizeEncodingSpeedOverQuality { get; }
[iOS (14,1)]
[NoTV][NoMac]
[Field ("kVTCompressionPropertyKey_PreserveDynamicHDRMetadata")]
NSString PreserveDynamicHdrMetadata { get; }
}
[Mac (10,15), iOS (13,0), TV (13,0)]
@ -325,6 +330,11 @@ namespace VideoToolbox {
[Mac (10,15), iOS (13,0), TV (13,0)]
[Export ("UsingGpuRegistryId")]
uint UsingGpuRegistryId { get; }
[iOS (14,1)]
[NoTV][NoMac]
[Export ("PreserveDynamicHdrMetadata")]
bool PreserveDynamicHdrMetadata { get; set; }
}
[iOS (8,0), TV (10,2)]
@ -712,6 +722,11 @@ namespace VideoToolbox {
[Field ("kVTDecompressionPropertyKey_PixelTransferProperties")]
NSString PixelTransferProperties { get; }
[iOS (14,1)]
[NoTV][NoMac]
[Field ("kVTDecompressionPropertyKey_PropagatePerFrameHDRDisplayMetadata")]
NSString PropagatePerFrameHdrDisplayMetadata { get; }
}
[iOS (8,0), TV (10,2)]
@ -793,6 +808,11 @@ namespace VideoToolbox {
[Mac (10,15), iOS (13,0), TV (13,0)]
[Export ("UsingGpuRegistryId")]
uint UsingGpuRegistryId { get; }
[iOS (14,1)]
[NoTV][NoMac]
[Export ("PropagatePerFrameHdrDisplayMetadata")]
bool PropagatePerFrameHhrDisplayMetadata { get; set; }
}
[Mac (10,9), iOS (8,0), TV (10,2)]

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

@ -218,7 +218,19 @@ partial class TestRuntime
#elif __IOS__
return CheckiOSSystemVersion (14, 0);
#elif MONOMAC
return CheckMacSystemVersion (11, 0, 0);
return CheckMacSystemVersion (10, 15, 6);
#else
throw new NotImplementedException ();
#endif
case 1:
#if __WATCHOS__
return CheckWatchOSSystemVersion (7, 0);
#elif __TVOS__
return ChecktvOSSystemVersion (14, 0);
#elif __IOS__
return CheckiOSSystemVersion (14, 1);
#elif MONOMAC
return CheckMacSystemVersion (10, 15, 6);
#else
throw new NotImplementedException ();
#endif

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

@ -75,6 +75,7 @@ namespace Introspection {
// this test checks that all native filters have a managed peer, i.e. against missing filters
public void CheckNativeFilters ()
{
Errors = 0;
List<string> filters = new List<string> ();
int n = 0;
string qname = CIFilterType.AssemblyQualifiedName;
@ -97,6 +98,7 @@ namespace Introspection {
// this test checks that all managed filters have a native peer, i.e. against extra filters
public void CheckManagedFilters ()
{
Errors = 0;
ContinueOnFailure = true;
List<string> filters = new List<string> (CIFilter.FilterNamesInCategories (null));
var superFilters = new List<string> ();
@ -210,6 +212,7 @@ namespace Introspection {
[Test]
public void Protocols ()
{
Errors = 0;
var to_confirm_manually = new StringBuilder ();
ContinueOnFailure = true;
var nspace = CIFilterType.Namespace;
@ -363,6 +366,7 @@ namespace Introspection {
[Test]
public void Keys ()
{
Errors = 0;
ContinueOnFailure = true;
var nspace = CIFilterType.Namespace;
var types = CIFilterType.Assembly.GetTypes ();

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

@ -398,5 +398,50 @@ namespace MonoTouchFixtures.CoreGraphics {
using (var cs = CGColorSpace.CreateWithName (CGColorSpaceNames.DisplayP3_Hlg))
Assert.True (cs.IsHdr, "DisplayP3_Hlg");
}
#if __IOS__
[Test]
public void CGColorSpaceUsesITUR_2100TFTest ()
{
TestRuntime.AssertXcodeVersion (12, 1);
using (var cs = CGColorSpace.CreateWithName (CGColorSpaceNames.DisplayP3_Hlg))
Assert.True (cs.UsesItur2100TF, "DisplayP3_Hlg");
using (var cs = CGColorSpace.CreateWithName (CGColorSpaceNames.GenericRgb))
Assert.False (cs.UsesItur2100TF, "GenericRgb");
}
[Test]
public void CreateLinearizedTest ()
{
TestRuntime.AssertXcodeVersion (12, 1);
using (var cs = CGColorSpace.CreateWithName (CGColorSpaceNames.GenericRgb)) {
var csl = cs.CreateLinearized ();
Assert.NotNull (csl, "not null");
Assert.That ((nint) TestRuntime.CFGetRetainCount (csl.Handle), Is.EqualTo ((nint) 1));
}
}
[Test]
public void CreateExtendedTest ()
{
TestRuntime.AssertXcodeVersion (12, 1);
using (var cs = CGColorSpace.CreateWithName (CGColorSpaceNames.GenericRgb)) {
var csl = cs.CreateExtended ();
Assert.NotNull (csl, "not null");
Assert.That ((nint) TestRuntime.CFGetRetainCount (csl.Handle), Is.EqualTo ((nint) 1));
}
}
[Test]
public void CreateExtendedLinearizedTest ()
{
TestRuntime.AssertXcodeVersion (12, 1);
using (var cs = CGColorSpace.CreateWithName (CGColorSpaceNames.GenericRgb)) {
var csl = cs.CreateExtendedLinearized ();
Assert.NotNull (csl, "not null");
Assert.That ((nint) TestRuntime.CFGetRetainCount (csl.Handle), Is.EqualTo ((nint) 1));
}
}
#endif
}
}

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

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

@ -10,6 +10,8 @@
!unknown-field! CTRadioAccessTechnologyHSUPA bound
!unknown-field! CTRadioAccessTechnologyLTE bound
!unknown-field! CTRadioAccessTechnologyWCDMA bound
!unknown-field! CTRadioAccessTechnologyNR bound
!unknown-field! CTRadioAccessTechnologyNRNSA bound
!unknown-field! CTServiceRadioAccessTechnologyDidChangeNotification bound
!unknown-native-enum! CTCellularDataRestrictedState bound
!unknown-native-enum! CTCellularPlanProvisioningAddPlanResult bound

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

@ -274,3 +274,5 @@
!missing-type! MPSGraphTensor not bound
!missing-type! MPSGraphTensorData not bound
!missing-type! MPSGraphVariableOp not bound
## appended from unclassified file
!missing-selector! MPSGraph::constantWithScalar:dataType: not bound