Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitcafbec1

Browse files
authored
[gamekit] Update for Xcode 11 beta 1 to 5 (#6773)
`gamePlayerID` and `teamPlayerID` are decorated as `[iOS (12,4)]...` sincethe headers mention so in both Xcode 11 betas and the recent 10.3 (stable)https://github.com/xamarin/xamarin-macios/wiki/GameKit-iOS-xcode103-finalThe `enum GKError` has been unified (at some point) so it was simplified.
1 parent45d90b6 commitcafbec1

File tree

7 files changed

+55
-44
lines changed

7 files changed

+55
-44
lines changed

‎src/GameKit/GameKit.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,8 @@ public enum GKError : long {
109109
InvalidPlayer,
110110
ScoreNotSet,
111111
ParentalControlsBlocked,
112-
#if!MONOMAC
113112
PlayerStatusExceedsMaximumLength,
114113
PlayerStatusInvalid,
115-
#endif
116114
MatchRequestInvalid=13,
117115
Underage,
118116
GameUnrecognized,
@@ -125,15 +123,17 @@ public enum GKError : long {
125123
TurnBasedInvalidParticipant,
126124
TurnBasedInvalidTurn,
127125
TurnBasedInvalidState,
128-
#ifMONOMAC
126+
#ifMONOMAC&&!XAMCORE_4_0
127+
[Obsolete("This value was re-used on macOS only and removed later.")]
129128
Offline=25,
130-
#else
129+
#endif
131130
InvitationsDisabled=25,// iOS 7.0
132131
PlayerPhotoFailure=26,// iOS 8.0
133132
UbiquityContainerUnavailable=27,// iOS 8.0
134-
#endif
135133
MatchNotConnected=28,
136134
GameSessionRequestInvalid=29,
135+
RestrictedToAutomatch=30,
136+
ApiNotAvailable=31,
137137
}
138138

139139
[Native]

‎src/gamekit.cs‎

Lines changed: 48 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -449,6 +449,10 @@ interface GKCloudPlayer
449449
[BaseType(typeof(GKBasePlayer))]
450450
// note: NSSecureCoding conformity is undocumented - but since it's a runtime check (on ObjC) we still need it
451451
interfaceGKPlayer:NSSecureCoding{
452+
453+
[Deprecated(PlatformName.iOS,13,0,message:"Use 'TeamPlayerId' instead.")]
454+
[Deprecated(PlatformName.TvOS,13,0,message:"Use 'TeamPlayerId' instead.")]
455+
[Deprecated(PlatformName.MacOSX,10,15,message:"Use 'TeamPlayerId' instead.")]
452456
[Export("playerID",ArgumentSemantic.Retain)]
453457
stringPlayerID{get;}
454458

@@ -492,6 +496,21 @@ interface GKPlayer : NSSecureCoding {
492496
[Mac(10,11)]
493497
[Export("guestIdentifier")]
494498
stringGuestIdentifier{get;}
499+
500+
[NoWatch]
501+
[TV(12,4)][Mac(10,14,6)][iOS(12,4)]
502+
[Export("gamePlayerID",ArgumentSemantic.Retain)]
503+
stringGamePlayerId{get;}
504+
505+
[NoWatch]
506+
[TV(12,4)][Mac(10,14,6)][iOS(12,4)]
507+
[Export("teamPlayerID",ArgumentSemantic.Retain)]
508+
stringTeamPlayerId{get;}
509+
510+
[NoWatch]
511+
[TV(13,0)][Mac(10,15)][iOS(13,0)]
512+
[Export("scopedIDsArePersistent")]
513+
boolScopedIdsArePersistent{get;}
495514
}
496515

497516
[Watch(3,0)]
@@ -653,7 +672,7 @@ interface GKLeaderboardViewController
653672
interfaceGKLeaderboardViewController:UIAppearance
654673
#endif
655674
{
656-
[Export("leaderboardDelegate",ArgumentSemantic.Assign),NullAllowed]
675+
[Export("leaderboardDelegate",ArgumentSemantic.Weak),NullAllowed]
657676
NSObjectWeakDelegate{get;set;}
658677

659678
[Wrap("WeakDelegate")]
@@ -819,6 +838,22 @@ interface GKLocalPlayer
819838
[Mac(10,10)]
820839
[Export("resolveConflictingSavedGames:withData:completionHandler:")]
821840
voidResolveConflictingSavedGames(GKSavedGame[]conflictingSavedGames,NSDatadata,[NullAllowed]Action<GKSavedGame[],NSError>handler);
841+
842+
[NoWatch]
843+
[TV(13,0)][Mac(10,15)][iOS(13,0)]
844+
[Export("multiplayerGamingRestricted")]
845+
boolMultiplayerGamingRestricted{[Bind("isMultiplayerGamingRestricted")]get;}
846+
847+
[TV(13,0)][Mac(10,15)][iOS(13,0)][Watch(6,0)]
848+
[Export("loadChallengableFriendsWithCompletionHandler:")]
849+
[Async]
850+
voidLoadChallengableFriends([NullAllowed]Action<GKPlayer[],NSError>completionHandler);
851+
852+
[NoWatch]
853+
[TV(13,0)][Mac(10,15)][iOS(13,0)]
854+
[Static]
855+
[Export("local")]
856+
GKLocalPlayerLocal{get;}
822857
}
823858

824859
[NoWatch]
@@ -1090,6 +1125,11 @@ interface GKMatchRequest {
10901125
[NullAllowed]// by default this property is null
10911126
[Export("recipients",ArgumentSemantic.Retain)]
10921127
GKPlayer[]Recipients{get;set;}
1128+
1129+
[NoWatch]
1130+
[TV(13,0)][Mac(10,15)][iOS(13,0)]
1131+
[Export("restrictToAutomatch")]
1132+
boolRestrictToAutomatch{get;set;}
10931133
}
10941134

10951135
[NoWatch]
@@ -1228,7 +1268,7 @@ interface GKMatchmakerViewController
12281268
[Protocolize]
12291269
GKMatchmakerViewControllerDelegateMatchmakerDelegate{get;set;}
12301270

1231-
[Export("matchRequest",ArgumentSemantic.Retain)]
1271+
[Export("matchRequest",ArgumentSemantic.Strong)]
12321272
GKMatchRequestMatchRequest{get;}
12331273

12341274
[Export("hosted",ArgumentSemantic.Assign)]
@@ -1562,7 +1602,7 @@ interface GKAchievementViewController
15621602
interfaceGKAchievementViewController:UIAppearance
15631603
#endif
15641604
{
1565-
[Export("achievementDelegate",ArgumentSemantic.Assign),NullAllowed]
1605+
[Export("achievementDelegate",ArgumentSemantic.Weak),NullAllowed]
15661606
#if!MONOMAC
15671607
[Override]
15681608
#endif
@@ -1576,7 +1616,7 @@ interface GKAchievementViewController : UIAppearance
15761616
#ifMONOMAC
15771617
[BaseType(typeof(NSResponder))]
15781618
interfaceGKDialogController{
1579-
[Export("parentWindow",ArgumentSemantic.Assign)]
1619+
[Export("parentWindow",ArgumentSemantic.Weak)]
15801620
NSWindowParentWindow{get;set;}
15811621

15821622
[Export("presentViewController:")]
@@ -1959,7 +1999,7 @@ interface GKTurnBasedMatchmakerViewController : UIAppearance
19591999
[Export("initWithMatchRequest:")]
19602000
IntPtrConstructor(GKMatchRequestrequest);
19612001

1962-
[Export("turnBasedMatchmakerDelegate",ArgumentSemantic.Assign),NullAllowed]
2002+
[Export("turnBasedMatchmakerDelegate",ArgumentSemantic.Weak),NullAllowed]
19632003
NSObjectWeakDelegate{get;set;}
19642004

19652005
[Wrap("WeakDelegate")]
@@ -2081,7 +2121,7 @@ interface GKGameCenterViewController
20812121
[Export("initWithNibName:bundle:")]
20822122
IntPtrConstructor([NullAllowed]stringnibNameOrNull,[NullAllowed]NSBundlenibBundleOrNull);
20832123

2084-
[Export("gameCenterDelegate",ArgumentSemantic.Assign),NullAllowed]
2124+
[Export("gameCenterDelegate",ArgumentSemantic.Weak),NullAllowed]
20852125
NSObjectWeakDelegate{get;set;}
20862126

20872127
[Wrap("WeakDelegate")]
@@ -2100,15 +2140,15 @@ interface GKGameCenterViewController
21002140

21012141
[NoTV]
21022142
[NullAllowed]// by default this property is null
2103-
[Export("leaderboardCategory",ArgumentSemantic.Retain)]
2143+
[Export("leaderboardCategory",ArgumentSemantic.Strong)]
21042144
[Deprecated(PlatformName.iOS,7,0,message:"Use 'LeaderboardIdentifier' instead.")]
21052145
[Deprecated(PlatformName.MacOSX,10,10,message:"Use 'LeaderboardIdentifier' instead.")]
21062146
stringLeaderboardCategory{get;set;}
21072147

21082148
[NoTV]
21092149
[iOS(7,0)][Mac(10,10)]// Marked 10.9 in header, apple 17612948
21102150
[NullAllowed]// by default this property is null
2111-
[Export("leaderboardIdentifier")]
2151+
[Export("leaderboardIdentifier",ArgumentSemantic.Strong)]
21122152
stringLeaderboardIdentifier{get;set;}
21132153
}
21142154

‎tests/xtro-sharpie/iOS-GameKit.todo‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎tests/xtro-sharpie/macOS-GameKit.todo‎

Lines changed: 0 additions & 10 deletions
This file was deleted.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
## XAMCORE_4_0 - not exposed in any API (and now excluded in Xcode11)
2+
!unknown-native-enum! GKPeerPickerConnectionType bound

‎tests/xtro-sharpie/tvOS-GameKit.todo‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎tests/xtro-sharpie/watchOS-GameKit.todo‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp