Skip to content

Fix #9996 and #15622 #15642

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.

Sign up for GitHub

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

Merged
rolfbjarne merged 18 commits into from
Aug 22, 2022
Merged

Fix #9996 and #15622 #15642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
024d688
Fix #9996 by using ICPListTemplateItem[] in every constructor of CPLi…
janwiebe-jump Aug 5, 2022
5760a34
Try to provide upgrade path.
janwiebe-jump Aug 5, 2022
8ef1194
Wrap old api in #if XAMCORE_5_0
janwiebe-jump Aug 5, 2022
8a91318
Wrap old api in #if XAMCORE_5_0
janwiebe-jump Aug 5, 2022
644347e
Wrap old api in #if XAMCORE_5_0
janwiebe-jump Aug 5, 2022
6717861
Merge branch 'main' into fix-9996
janwiebe-jump Aug 5, 2022
71c1aa9
Apply proposed fix vor CPListSection.Items[]
janwiebe-jump Aug 5, 2022
535f2ac
Update src/carplay.cs
janwiebe-jump Aug 5, 2022
1231f05
Update src/carplay.cs
janwiebe-jump Aug 5, 2022
93f9fb8
Update src/carplay.cs
janwiebe-jump Aug 5, 2022
0890cd7
Merge branch 'main' into fix-9996
janwiebe-jump Aug 8, 2022
ba73e1f
Update broken ctors to throw and fix build
chamons Aug 8, 2022
4ae2609
Merge branch 'main' into fix-9996
janwiebe-jump Aug 9, 2022
153ace9
Merge branch 'main' into fix-9996
janwiebe-jump Aug 12, 2022
8e48b2d
Remove breaking change
dalexsoto Aug 12, 2022
d7adeb5
Merge branch 'main' into fix-9996
rolfbjarne Aug 18, 2022
1f12270
Merge branch 'main' into fix-9996
dalexsoto Aug 19, 2022
1fcaeca
[CarPlay] Fix build
dalexsoto Aug 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/ObjCRuntime/ObsoleteConstants.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,7 @@ partial class Constants {

internal const string RemovedFromChip = "This API has been removed from the 'CHIP' framework.";

internal const string BrokenBinding = "This API was incorrectly bound and does not work correctly. Use the new version indicated in the associated Obsolete attribute.";

}
}
28 changes: 25 additions & 3 deletions src/carplay.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,11 +572,23 @@ interface CPListItem : CPSelectableListItem, NSSecureCoding {
[DisableDefaultCtor]
interface CPListSection : NSSecureCoding {

[Export ("initWithItems:header:sectionIndexTitle:")]
#if !XAMCORE_5_0
[Wrap ("base (true ? throw new InvalidOperationException (Constants.BrokenBinding) : NSObjectFlag.Empty)")]
[Obsolete ("Use '.ctor (ICPListTemplateItem [], string, string)' constructor instead. Warning: this will throw InvalidOperationException at runtime.")]
NativeHandle Constructor (CPListItem [] items, [NullAllowed] string header, [NullAllowed] string sectionIndexTitle);
#endif

[Export ("initWithItems:")]
#if !XAMCORE_5_0
[Wrap ("base (true ? throw new InvalidOperationException (Constants.BrokenBinding) : NSObjectFlag.Empty)")]
[Obsolete ("Use '.ctor (ICPListTemplateItem [], string, string)' constructor instead. Warning: this will throw InvalidOperationException at runtime.")]
NativeHandle Constructor (CPListItem [] items);
#endif

[Export ("initWithItems:header:sectionIndexTitle:")]
NativeHandle Constructor (ICPListTemplateItem [] items, [NullAllowed] string header, [NullAllowed] string sectionIndexTitle);
Comment thread
janwiebe-jump marked this conversation as resolved.

[Export ("initWithItems:")]
NativeHandle Constructor (ICPListTemplateItem [] items);
Comment thread
janwiebe-jump marked this conversation as resolved.

[iOS (15,0), MacCatalyst (15,0)]
[Export ("initWithItems:header:headerSubtitle:headerImage:headerButton:sectionIndexTitle:")]
Expand All @@ -588,8 +600,18 @@ interface CPListSection : NSSecureCoding {
[NullAllowed, Export ("sectionIndexTitle")]
string SectionIndexTitle { get; }

[Export ("items", ArgumentSemantic.Copy)]
#if !XAMCORE_5_0
[Wrap ("true ? throw new InvalidOperationException (Constants.BrokenBinding) : new NSArray ()", IsVirtual = true)]
[Obsolete ("Use 'Items2 : ICPListTemplateItem []' instead.")]
CPListItem [] Items { get; }
#endif

[Export ("items", ArgumentSemantic.Copy)]
#if !XAMCORE_5_0
ICPListTemplateItem [] Items2 { get; }
#else
ICPListTemplateItem [] Items { get; }
#endif

[iOS (14,0)]
[Export ("indexOfItem:")]
Expand Down