Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CoreMedia] Add support for xcode13 #12770

Merged
merged 13 commits into from
Sep 24, 2021

Conversation

mandel-macaque
Copy link
Member

No description provided.

@mandel-macaque mandel-macaque added the note-highlight Worth calling out specifically in release notes label Sep 17, 2021
@vs-mobiletools-engineering-service2
Copy link
Collaborator

❌ [PR Build] Tests failed on Build ❌

Tests failed on Build.

API diff

✅ API Diff from stable

View API diff

API & Generator diff

ℹ️ API Diff (from PR only) (please review changes)
Generator Diff (only version changes)

GitHub pages

Results can be found in the following github pages (it might take some time to publish):

Test results

11 tests failed, 91 tests passed.

Failed tests

  • introspection/Mac [dotnet]/Debug [dotnet]: Failed (Test run failed.
    Tests run: 37 Passed: 33 Inconclusive: 0 Failed: 1 Ignored: 3)
  • introspection/Mac Catalyst [dotnet]/Debug [dotnet]: Failed (Tests run: 44 Passed: 40 Inconclusive: 0 Failed: 1 Ignored: 3)
  • introspection/Mac Modern/Debug: Failed (Test run failed.
    Tests run: 37 Passed: 33 Inconclusive: 0 Failed: 3 Ignored: 1)
  • introspection/iOS Unified 64-bits - simulator/Debug: Failed
  • introspection/tvOS - simulator/Debug: Failed
  • introspection/watchOS 32-bits - simulator/Debug: Failed
  • introspection/iOS Unified 64-bits - simulator/Debug (iOS 11.4): Failed
  • introspection/tvOS - simulator/Debug (tvOS 11.4): Failed
  • introspection/watchOS 32-bits - simulator/Debug (watchOS 6.0): Failed
  • monotouch-test/Mac Catalyst [dotnet]/Debug [dotnet]: Failed (Tests run: 2657 Passed: 2490 Inconclusive: 35 Failed: 2 Ignored: 165)
  • dont link/Mac Catalyst [dotnet]/Debug [dotnet]: TimedOut (Execution timed out after 1200 seconds.
    No test log file was produced)

Pipeline on Agent XAMBOT-1096.BigSur'
Merge a9eda1b into d94a0f5

src/CoreMedia/CMSync.cs Outdated Show resolved Hide resolved
src/CoreMedia/CMSync.cs Outdated Show resolved Hide resolved
src/CoreMedia/CMSync.cs Outdated Show resolved Hide resolved
src/CoreMedia/CMSync.cs Outdated Show resolved Hide resolved
src/CoreMedia/CMSync.cs Outdated Show resolved Hide resolved
src/CoreMedia/CMSync.cs Outdated Show resolved Hide resolved
@@ -411,20 +468,30 @@ public CMTimebaseError SetTimerToFireImmediately (NSTimer timer)

#if !NET
[TV (13,0), Mac (10,15), iOS (13,0)]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this line be removed as well?

Copy link
Member Author

@mandel-macaque mandel-macaque Sep 20, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What do you want me to remove? The deprecation is needed for classic. The unsupported is needed as well, else it will use the default, since the minimum versions are 10 for iOS/tvOS, 10.4 for mac OS x and no watch. Without the Unsupported it will be assumed that they are present in those platforms. If anything we could remove the os version number.

[UnsupportedOSPlatform ("ios8.0")]
[UnsupportedOSPlatform ("tvos9.0")]
[UnsupportedOSPlatform ("maccatalyst")]
[UnsupportedOSPlatform ("macos10.10")]
#endif
[DllImport(Constants.CoreMediaLibrary)]
extern static CMTimebaseError CMTimebaseSetMasterTimebase (/* CMTimebaseRef* */ IntPtr timebase, /* CMTimebaseRef* */ IntPtr newMasterTimebase);

#if !NET
[TV (13,0), Mac (10,15), iOS (13,0)]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe same with this one

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same.

@@ -436,20 +503,30 @@ public CMTimebaseError SetMasterTimebase (CMTimebase newMasterTimebase)

#if !NET
[TV (13,0), Mac (10,15), iOS (13,0)]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same

[UnsupportedOSPlatform ("ios8.0")]
[UnsupportedOSPlatform ("tvos9.0")]
[UnsupportedOSPlatform ("maccatalyst")]
[UnsupportedOSPlatform ("macos10.10")]
#endif
[DllImport(Constants.CoreMediaLibrary)]
extern static CMTimebaseError CMTimebaseSetMasterClock (/* CMTimebaseRef* */ IntPtr timebase, /* CMClockRef* */ IntPtr newMasterClock);

#if !NET
[TV (13,0), Mac (10,15), iOS (13,0)]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same

mandel-macaque and others added 3 commits September 20, 2021 11:34
Co-authored-by: TJ Lambert <50846373+tj-devel709@users.noreply.github.com>
Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
@vs-mobiletools-engineering-service2
Copy link
Collaborator

❌ [PR Build] Tests failed on Build ❌

Tests failed on Build.

API diff

✅ API Diff from stable

View API diff

API & Generator diff

ℹ️ API Diff (from PR only) (please review changes)
Generator Diff (only version changes)

GitHub pages

Results can be found in the following github pages (it might take some time to publish):

Test results

9 tests failed, 93 tests passed.

Failed tests

  • introspection/Mac [dotnet]/Debug [dotnet]: Failed (Test run failed.
    Tests run: 37 Passed: 33 Inconclusive: 0 Failed: 1 Ignored: 3)
  • introspection/Mac Catalyst [dotnet]/Debug [dotnet]: Failed (Tests run: 44 Passed: 40 Inconclusive: 0 Failed: 1 Ignored: 3)
  • introspection/Mac Modern/Debug: Failed (Test run failed.
    Tests run: 37 Passed: 33 Inconclusive: 0 Failed: 3 Ignored: 1)
  • introspection/iOS Unified 64-bits - simulator/Debug: Failed
  • introspection/tvOS - simulator/Debug: Failed
  • introspection/watchOS 32-bits - simulator/Debug: Failed
  • introspection/iOS Unified 64-bits - simulator/Debug (iOS 11.4): Failed
  • introspection/tvOS - simulator/Debug (tvOS 11.4): Failed
  • introspection/watchOS 32-bits - simulator/Debug (watchOS 6.0): Failed

Pipeline on Agent XAMBOT-1099.BigSur'
Merge 5040693 into a6eb528

@vs-mobiletools-engineering-service2
Copy link
Collaborator

❌ [PR Build] Tests failed on Build ❌

Tests failed on Build.

API diff

✅ API Diff from stable

View API diff

API & Generator diff

ℹ️ API Diff (from PR only) (please review changes)
Generator Diff (only version changes)

GitHub pages

Results can be found in the following github pages (it might take some time to publish):

Test results

1 tests failed, 101 tests passed.

Failed tests

  • introspection/Mac Catalyst [dotnet]/Debug [dotnet]: Failed (Tests run: 44 Passed: 41 Inconclusive: 0 Failed: 1 Ignored: 2)

Pipeline on Agent XAMBOT-1101.BigSur'
Merge a952f2a into 8ba7ff3

if (error != CMTimebaseError.None)
throw new ArgumentException (error.ToString ());

CFObject.CFRetain (Handle);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't necessary, the handle parameter is marked as CM_RETURNS_RETAINED_PARAMETER in the header.

src/CoreMedia/CMSync.cs Outdated Show resolved Hide resolved
src/CoreMedia/CMSync.cs Outdated Show resolved Hide resolved
src/CoreMedia/CMSync.cs Outdated Show resolved Hide resolved
src/CoreMedia/CMSync.cs Outdated Show resolved Hide resolved
src/CoreMedia/CMSync.cs Outdated Show resolved Hide resolved
src/CoreMedia/CMSync.cs Outdated Show resolved Hide resolved
mandel-macaque and others added 2 commits September 24, 2021 12:25
Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
@vs-mobiletools-engineering-service2
Copy link
Collaborator

❌ [PR Build] Tests failed on Build ❌

Tests failed on Build.

API diff

✅ API Diff from stable

View API diff

API & Generator diff

ℹ️ API Diff (from PR only) (please review changes)
Generator Diff (only version changes)

GitHub pages

Results can be found in the following github pages (it might take some time to publish):

Test results

1 tests failed, 101 tests passed.

Failed tests

  • link sdk/Mac Catalyst [dotnet]/Debug [dotnet]: TimedOut (Execution timed out after 1200 seconds.
    No test log file was produced)

Pipeline on Agent XAMBOT-1101.BigSur'
Merge d43c6db into 9a299ae

@mandel-macaque mandel-macaque merged commit ad673ae into xamarin:main Sep 24, 2021
@mandel-macaque mandel-macaque deleted the coremedia-xcode13-beta5 branch September 24, 2021 22:19
@mandel-macaque
Copy link
Member Author

/sudo backport xcode13-ios

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Backport Job to branch xcode13-ios Created! The magic is happening here

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Oh no! Backport failed! Please see https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=5250820 for more details.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
note-highlight Worth calling out specifically in release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants