Skip to content

Commit

Permalink
[GameController] Add support for xcode 13 beta5. (#12445)
Browse files Browse the repository at this point in the history
Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
  • Loading branch information
mandel-macaque and rolfbjarne authored Aug 16, 2021
1 parent 3af0e34 commit c499a62
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 24 deletions.
23 changes: 23 additions & 0 deletions src/gamecontroller.cs
Original file line number Diff line number Diff line change
Expand Up @@ -973,6 +973,18 @@ interface GCPhysicalInputProfile
[TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)]
[Export ("touchpads", ArgumentSemantic.Strong)]
NSDictionary<NSString, GCControllerTouchpad> Touchpads { get; }

[TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)]
[Export ("hasRemappedElements")]
bool HasRemappedElements { get; }

[TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)]
[Export ("mappedElementAliasForPhysicalInputName:")]
string GetMappedElementAlias (string physicalInputName);

[TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)]
[Export ("mappedPhysicalInputNamesForElementAlias:")]
NSSet<NSString> GetMappedPhysicalInputNames (string elementAlias);
}

[TV (14, 0), Mac (11, 0), iOS (14, 0)]
Expand Down Expand Up @@ -1054,6 +1066,10 @@ interface GCInput {

[Field ("GCInputDualShockTouchpadButton")]
NSString DualShockTouchpadButton { get; }

[TV (15, 0), Mac (12, 0), iOS (15, 0), MacCatalyst (15,0)]
[Field ("GCInputButtonShare")]
NSString ButtonShare { get; }
}

[TV (14,0), Mac (11,0), iOS (14,0)]
Expand All @@ -1072,6 +1088,10 @@ interface GCXboxGamepad: NSSecureCoding, NSCoding

[NullAllowed, Export ("paddleButton4")]
GCControllerButtonInput PaddleButton4 { get; }

[TV (15, 0), Mac (12, 0), iOS (15, 0), MacCatalyst (15,0)]
[NullAllowed, Export ("buttonShare")]
GCControllerButtonInput ButtonShare { get; }
}

[Static]
Expand Down Expand Up @@ -2015,6 +2035,9 @@ enum GCInputMicroGamepad {

[Field ("GCInputMicroGamepadButtonX")]
ButtonX,

[Field ("GCInputMicroGamepadButtonMenu")]
ButtonMenu,
}

delegate GCVirtualControllerElementConfiguration GCVirtualControllerElementUpdateBlock (GCVirtualControllerElementConfiguration configuration);
Expand Down
6 changes: 0 additions & 6 deletions tests/xtro-sharpie/MacCatalyst-GameController.todo

This file was deleted.

6 changes: 0 additions & 6 deletions tests/xtro-sharpie/iOS-GameController.todo

This file was deleted.

6 changes: 0 additions & 6 deletions tests/xtro-sharpie/macOS-GameController.todo

This file was deleted.

6 changes: 0 additions & 6 deletions tests/xtro-sharpie/tvOS-GameController.todo

This file was deleted.

1 comment on commit c499a62

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

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

❌ [CI 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 (please review changes)

Packages generated

View packages

Test results

4 tests failed, 240 tests passed.

Failed tests

  • monotouch-test/Mac Catalyst/Debug [dotnet]: Failed (Tests run: 2638 Passed: 2488 Inconclusive: 35 Failed: 2 Ignored: 148)
  • monotouch-test/iOS Unified 64-bits - simulator/Debug: Failed
  • monotouch-test/iOS Unified 64-bits - simulator/Debug [dotnet]: Failed
  • Documentation/All: Failed

Pipeline on Agent XAMBOT-1036.BigSur'
[GameController] Add support for xcode 13 beta5. (#12445)

Please sign in to comment.