Merge branch 'xcode14' into videosubscriberaccount-xcode14

xamarin · Jul 20, 2022 · b9dd5ad · b9dd5ad
2 parents 4a6000f + 5814da5
commit b9dd5ad
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 70 deletions.
diff --git a/src/vision.cs b/src/vision.cs
@@ -39,6 +39,7 @@ namespace Vision {
 	[TV (11,0), Mac (10,13), iOS (11,0)]
 	[Native]
 	enum VNErrorCode : long {
+		TuriCore = -1,
 		Ok = 0,
 		RequestCancelled,
 		InvalidFormat,
@@ -59,6 +60,7 @@ enum VNErrorCode : long {
 		DataUnavailable,
 		TimeStampNotFound,
 		UnsupportedRequest,
+		Timeout,
 	}
 
 	[TV (11,0), Mac (10,13), iOS (11,0)]
@@ -74,6 +76,10 @@ enum VNImageCropAndScaleOption : ulong {
 		CenterCrop = 0,
 		ScaleFit = 1,
 		ScaleFill = 2,
+		[TV (16,0), Mac (13,0), iOS (16,0), MacCatalyst (16,0)]
+		ScaleFitRotate90Ccw = 256 + ScaleFit,
+		[TV (16,0), Mac (13,0), iOS (16,0), MacCatalyst (16,0)]
+		ScaleFillRotate90Ccw = 256 + ScaleFill,
 	}
 
 	[TV (11,0), Mac (10,13), iOS (11,0)]
@@ -669,6 +675,15 @@ enum VSUserAccountQueryOption : ulong {
 		None = 0,
 		AllDevices,
 	}
+
+	[TV (16,0), Mac (13,0), iOS (16,0), MacCatalyst (16,0)]
+	[Native]
+	public enum VNPointsClassification : long
+	{
+		Disconnected = 0,
+		OpenPath,
+		ClosedPath,
+	}
 
 	[TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)]
 	[BaseType (typeof(VNDetectedObjectObservation))]
@@ -1088,6 +1103,10 @@ interface VNFaceLandmarkRegion2D {
 		[BindAs (typeof (nfloat []))]
 		[NullAllowed, Export ("precisionEstimatesPerPoint")]
 		NSNumber [] PrecisionEstimatesPerPoint { get; }
+
+		[TV (16,0), Mac (13,0), iOS (16,0), MacCatalyst (16,0)]
+		[Export ("pointsClassification")]
+		VNPointsClassification PointsClassification { get; }
 	}
 
 	[TV (11,0), Mac (10,13), iOS (11,0)]
@@ -1844,6 +1863,10 @@ interface VNHorizonObservation {
 
 		[Export ("angle")]
 		nfloat Angle { get; }
+
+		[TV (16,0), Mac (13,0), iOS (16,0), MacCatalyst (16,0)]
+		[Export ("transformForImageWidth:height:")]
+		CGAffineTransform CreateTransform (nuint width, nuint height);
 	}
 
 	[TV (11,0), Mac (10,13), iOS (11,0)]
@@ -2836,6 +2859,10 @@ interface VNRecognizeTextRequest : VNRequestProgressProviding {
 		[Static]
 		[Export ("currentRevision")]
 		VNRecognizeTextRequestRevision CurrentRevision { get; }
+
+		[TV (16,0), Mac (13,0), iOS (16,0), MacCatalyst (16,0)]
+		[Export ("automaticallyDetectsLanguage")]
+		bool AutomaticallyDetectsLanguage { get; set; }
 	}
 
 	[TV (13,0), Mac (10,15), iOS (13,0)]
@@ -3484,6 +3511,10 @@ interface VNGenerateOpticalFlowRequest {
 		[Static]
 		[Export ("currentRevision")]
 		VNGenerateOpticalFlowRequestRevision CurrentRevision { get; }
+
+		[TV (16,0), Mac (13,0), iOS (16,0), MacCatalyst (16,0)]
+		[Export ("keepNetworkOutput")]
+		bool KeepNetworkOutput { get; set; }
 	}
 
 	[TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)]

diff --git a/tests/xtro-sharpie/api-annotations-dotnet/iOS-Vision.todo b/tests/xtro-sharpie/api-annotations-dotnet/iOS-Vision.todo
diff --git a/tests/xtro-sharpie/api-annotations-dotnet/macOS-Vision.todo b/tests/xtro-sharpie/api-annotations-dotnet/macOS-Vision.todo
diff --git a/tests/xtro-sharpie/api-annotations-dotnet/tvOS-CoreText.ignore b/tests/xtro-sharpie/api-annotations-dotnet/tvOS-CoreText.ignore
@@ -1,3 +1 @@
 # bound in previous versions but removed in xcode 14
-!extra-enum-value! Managed value 1 for CTFontTableOptions.ExcludeSynthetic is available for the current platform while the value in the native header is not
-!extra-enum-value! Managed value 10 for CTParagraphStyleSpecifier.LineSpacing is available for the current platform while the value in the native header is not
diff --git a/tests/xtro-sharpie/api-annotations-dotnet/tvOS-Vision.todo b/tests/xtro-sharpie/api-annotations-dotnet/tvOS-Vision.todo
diff --git a/tests/xtro-sharpie/iOS-Vision.todo b/tests/xtro-sharpie/iOS-Vision.todo
diff --git a/tests/xtro-sharpie/macOS-Vision.todo b/tests/xtro-sharpie/macOS-Vision.todo
diff --git a/tests/xtro-sharpie/tvOS-Vision.todo b/tests/xtro-sharpie/tvOS-Vision.todo
diff --git a/tools/devops/automation/templates/build/api-diff-build-and-detect.yml b/tools/devops/automation/templates/build/api-diff-build-and-detect.yml
@@ -34,6 +34,7 @@ steps:
     gitHubToken: ${{ parameters.gitHubToken }}
     xqaCertPass: ${{ parameters.xqaCertPass }}
     enableDotnet: ${{ parameters.enableDotnet }}
+    makeParallelism: '4'
 
 # detect changes
 - bash:  $(Build.SourcesDirectory)/xamarin-macios/tools/devops/automation/scripts/bash/compare.sh

diff --git a/tools/devops/automation/templates/build/build.yml b/tools/devops/automation/templates/build/build.yml
@@ -27,6 +27,10 @@ parameters:
   type: stepList 
   default: []
 
+- name: makeParallelism
+  type: string
+  default: '8'
+
 steps:
 
 - template: ../common/checkout.yml
@@ -252,8 +256,12 @@ steps:
       MAKE_FLAGS="V=1 -w"
     fi
 
-    time make -C $(Build.SourcesDirectory)/xamarin-macios/ all -j8 $MAKE_FLAGS
-    time make -C $(Build.SourcesDirectory)/xamarin-macios/ install -j8 $MAKE_FLAGS
+    if test -z "$makeParallelism"; then
+      makeParallelism=8
+    fi
+
+    time make -C $(Build.SourcesDirectory)/xamarin-macios/ all -j$makeParallelism $MAKE_FLAGS
+    time make -C $(Build.SourcesDirectory)/xamarin-macios/ install -j$makeParallelism $MAKE_FLAGS
   name: build
   displayName: 'Build'
   timeoutInMinutes: 300