Skip to content

Commit

Permalink
Merge branch 'main' into darc-main-38ef8300-a7b5-4ebc-9dd4-75e9ac8721ed
Browse files Browse the repository at this point in the history
  • Loading branch information
spouliot committed Apr 14, 2021
2 parents bf96270 + 737a191 commit 29b10a5
Show file tree
Hide file tree
Showing 129 changed files with 1,314 additions and 395 deletions.
4 changes: 2 additions & 2 deletions Make.versions
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
# line changed in git).
#

IOS_PACKAGE_VERSION=14.17.1.$(IOS_COMMIT_DISTANCE)
MAC_PACKAGE_VERSION=7.11.1.$(MAC_COMMIT_DISTANCE)
IOS_PACKAGE_VERSION=14.17.3.$(IOS_COMMIT_DISTANCE)
MAC_PACKAGE_VERSION=7.11.3.$(MAC_COMMIT_DISTANCE)

#
# ** NuGet package version numbers **
Expand Down
2 changes: 1 addition & 1 deletion dotnet/targets/Xamarin.Shared.Sdk.targets
Original file line number Diff line number Diff line change
Expand Up @@ -696,7 +696,7 @@
<ResolvedFileToPublish
Update="@(ResolvedFileToPublish)"
RelativePath="$([MSBuild]::MakeRelative($(MSBuildProjectDirectory)$(PublishDir),$(_DylibPublishDir)))\%(Filename)%(Extension)"
Condition="'%(Extension)' == '.dylib'" />
Condition="'$(_SdkIsSimulator)' != 'false' And '%(Extension)' == '.dylib'" />
<ResolvedFileToPublish
Update="@(ResolvedFileToPublish)"
RelativePath="$([MSBuild]::MakeRelative($(MSBuildProjectDirectory)$(PublishDir),$(_AssemblyPublishDir)))\%(Filename)%(Extension)"
Expand Down
2 changes: 1 addition & 1 deletion msbuild/Xamarin.Shared/Xamarin.Shared.targets
Original file line number Diff line number Diff line change
Expand Up @@ -1442,7 +1442,7 @@ Copyright (C) 2018 Microsoft. All rights reserved.
Condition="'$(IsMacEnabled)' == 'true' And '$(_NoSymbolStrip)' == 'false' And '$(IsAppExtension)' == 'false'"
Executable="$(_NativeExecutable)"
IsFramework="false"
SymbolFile=""
SymbolFile="$(_MtouchSymbolsList)"
>
</SymbolStrip>

Expand Down
18 changes: 18 additions & 0 deletions src/AVFoundation/AVCompat.cs
Original file line number Diff line number Diff line change
Expand Up @@ -517,4 +517,22 @@ public AVAssetDownloadTask GetAssetDownloadTask (AVUrlAsset urlAsset, string tit
#endif // TVOS
#endif // !XAMCORE_4_0
#endif // !WATCH

#if !XAMCORE_4_0 && IOS // includes __MACCATALYST__
public partial class AVCaptureManualExposureBracketedStillImageSettings {
[Obsolete ("Use the static 'Create' method to create a working instance of this type.")]
public AVCaptureManualExposureBracketedStillImageSettings () : base (NSObjectFlag.Empty)
{
throw new NotImplementedException ();
}
}

public partial class AVCaptureAutoExposureBracketedStillImageSettings {
[Obsolete ("Use the static 'Create' method to create a working instance of this type.")]
public AVCaptureAutoExposureBracketedStillImageSettings () : base (NSObjectFlag.Empty)
{
throw new NotImplementedException ();
}
}
#endif
}
9 changes: 9 additions & 0 deletions src/AddressBook/ABAddressBook.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@

namespace AddressBook {
[Deprecated (PlatformName.iOS, 9, 0, message : "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[Deprecated (PlatformName.MacCatalyst, 14, 0, message : "Use the 'Contacts' API instead.")]
public class ExternalChangeEventArgs : EventArgs {
public ExternalChangeEventArgs (ABAddressBook addressBook, NSDictionary info)
{
Expand Down Expand Up @@ -68,6 +70,11 @@ public static void Init () {}

static InitConstants ()
{
#if __MACCATALYST__
// avoid TypeLoadException if used before macOS 11.x
if (!UIKit.UIDevice.CurrentDevice.CheckSystemVersion (14,0))
return;
#endif
// ensure we can init. This is needed before iOS6 (as per doc).
IntPtr p = ABAddressBook.ABAddressBookCreate ();

Expand All @@ -92,6 +99,8 @@ static InitConstants ()
}

[Deprecated (PlatformName.iOS, 9, 0, message : "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[Deprecated (PlatformName.MacCatalyst, 14, 0, message : "Use the 'Contacts' API instead.")]
public class ABAddressBook : INativeObject, IDisposable, IEnumerable<ABRecord> {

public static readonly NSString ErrorDomain;
Expand Down
4 changes: 4 additions & 0 deletions src/AddressBook/ABEnums.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@

namespace AddressBook {
[Deprecated (PlatformName.iOS, 9, 0, message : "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[Deprecated (PlatformName.MacCatalyst, 14, 0, message : "Use the 'Contacts' API instead.")]
[Native]
[ErrorDomain ("ABAddressBookErrorDomain")]
public enum ABAddressBookError : long {
Expand All @@ -43,6 +45,8 @@ public enum ABAddressBookError : long {
}

[Deprecated (PlatformName.iOS, 9, 0, message : "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[Deprecated (PlatformName.MacCatalyst, 14, 0, message : "Use the 'Contacts' API instead.")]
[Native]
public enum ABAuthorizationStatus : long {
NotDetermined = 0,
Expand Down
2 changes: 2 additions & 0 deletions src/AddressBook/ABGroup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ internal static void Init ()
}

[Deprecated (PlatformName.iOS, 9, 0, message : "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[Deprecated (PlatformName.MacCatalyst, 14, 0, message : "Use the 'Contacts' API instead.")]
public class ABGroup : ABRecord, IEnumerable<ABRecord> {

[DllImport (Constants.AddressBookLibrary)]
Expand Down
14 changes: 14 additions & 0 deletions src/AddressBook/ABMultiValue.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@
namespace AddressBook {

[Deprecated (PlatformName.iOS, 9,0)]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[Deprecated (PlatformName.MacCatalyst, 14, 0, message : "Use the 'Contacts' API instead.")]
static class ABMultiValue {
public const uint Mask = (1 << 8);

Expand Down Expand Up @@ -101,6 +103,8 @@ public static IntPtr ToIntPtr (NSObject value)
}

[Deprecated (PlatformName.iOS, 9, 0, message : "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[Deprecated (PlatformName.MacCatalyst, 14, 0, message : "Use the 'Contacts' API instead.")]
public struct ABMultiValueEntry<T>
{
ABMultiValue<T> self;
Expand Down Expand Up @@ -173,6 +177,8 @@ public int Identifier {
}

[Deprecated (PlatformName.iOS, 9, 0, message : "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[Deprecated (PlatformName.MacCatalyst, 14, 0, message : "Use the 'Contacts' API instead.")]
public class ABMultiValue<T> : INativeObject, IDisposable, IEnumerable<ABMultiValueEntry<T>>
{
IntPtr handle;
Expand Down Expand Up @@ -293,6 +299,8 @@ public ABMutableMultiValue<T> ToMutableMultiValue ()
}

[Deprecated (PlatformName.iOS, 9, 0, message : "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[Deprecated (PlatformName.MacCatalyst, 14, 0, message : "Use the 'Contacts' API instead.")]
public class ABMutableMultiValue<T> : ABMultiValue<T>
{
internal ABMutableMultiValue (IntPtr handle)
Expand Down Expand Up @@ -338,6 +346,8 @@ public bool RemoveAt (nint index)
}

[Deprecated (PlatformName.iOS, 9, 0, message : "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[Deprecated (PlatformName.MacCatalyst, 14, 0, message : "Use the 'Contacts' API instead.")]
public class ABMutableDateMultiValue : ABMutableMultiValue<NSDate> {
public ABMutableDateMultiValue ()
: base (ABMultiValue.CreateMutable (ABPropertyType.MultiDateTime))
Expand All @@ -346,6 +356,8 @@ public ABMutableDateMultiValue ()
}

[Deprecated (PlatformName.iOS, 9, 0, message : "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[Deprecated (PlatformName.MacCatalyst, 14, 0, message : "Use the 'Contacts' API instead.")]
public class ABMutableDictionaryMultiValue : ABMutableMultiValue<NSDictionary> {
public ABMutableDictionaryMultiValue ()
: base (ABMultiValue.CreateMutable (ABPropertyType.MultiDictionary))
Expand All @@ -354,6 +366,8 @@ public ABMutableDictionaryMultiValue ()
}

[Deprecated (PlatformName.iOS, 9, 0, message : "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[Deprecated (PlatformName.MacCatalyst, 14, 0, message : "Use the 'Contacts' API instead.")]
public class ABMutableStringMultiValue : ABMutableMultiValue<string> {
public ABMutableStringMultiValue ()
: base (ABMultiValue.CreateMutable (ABPropertyType.MultiString),
Expand Down
30 changes: 30 additions & 0 deletions src/AddressBook/ABPerson.cs
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,8 @@ public static ABPersonProperty ToPersonProperty (int id)
}

[Deprecated (PlatformName.iOS, 9, 0, message : "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[Deprecated (PlatformName.MacCatalyst, 14, 0, message : "Use the 'Contacts' API instead.")]
public static class ABPersonAddressKey {

public static NSString City {get; private set;}
Expand Down Expand Up @@ -196,6 +198,8 @@ internal static void Init ()
}

[Deprecated (PlatformName.iOS, 9, 0, message : "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[Deprecated (PlatformName.MacCatalyst, 14, 0, message : "Use the 'Contacts' API instead.")]
public static class ABPersonDateLabel {
public static NSString Anniversary {get; private set;}

Expand Down Expand Up @@ -247,6 +251,8 @@ public static NSNumber FromPersonKind (ABPersonKind value)
}

[Deprecated (PlatformName.iOS, 9, 0, message : "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[Deprecated (PlatformName.MacCatalyst, 14, 0, message : "Use the 'Contacts' API instead.")]
static class ABPersonSocialProfile {
public static readonly NSString URLKey;
public static readonly NSString ServiceKey;
Expand All @@ -264,6 +270,8 @@ static ABPersonSocialProfile ()
}

[Deprecated (PlatformName.iOS, 9, 0, message : "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[Deprecated (PlatformName.MacCatalyst, 14, 0, message : "Use the 'Contacts' API instead.")]
public static class ABPersonSocialProfileService
{
public static readonly NSString Twitter;
Expand All @@ -289,6 +297,8 @@ static ABPersonSocialProfileService ()
}

[Deprecated (PlatformName.iOS, 9, 0, message : "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[Deprecated (PlatformName.MacCatalyst, 14, 0, message : "Use the 'Contacts' API instead.")]
public static class ABPersonPhoneLabel {
public static NSString HomeFax {get; private set;}
public static NSString iPhone {get; private set;}
Expand Down Expand Up @@ -319,6 +329,8 @@ internal static void Init ()
}

[Deprecated (PlatformName.iOS, 9, 0, message : "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[Deprecated (PlatformName.MacCatalyst, 14, 0, message : "Use the 'Contacts' API instead.")]
public static class ABPersonInstantMessageService {
public static NSString Aim {get; private set;}
public static NSString Icq {get; private set;}
Expand Down Expand Up @@ -354,6 +366,8 @@ internal static void Init ()
}

[Deprecated (PlatformName.iOS, 9, 0, message : "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[Deprecated (PlatformName.MacCatalyst, 14, 0, message : "Use the 'Contacts' API instead.")]
public static class ABPersonInstantMessageKey {
public static NSString Service {get; private set;}
public static NSString Username {get; private set;}
Expand All @@ -372,6 +386,8 @@ internal static void Init ()
}

[Deprecated (PlatformName.iOS, 9, 0, message : "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[Deprecated (PlatformName.MacCatalyst, 14, 0, message : "Use the 'Contacts' API instead.")]
public static class ABPersonUrlLabel {
public static NSString HomePage {get; private set;}

Expand All @@ -387,6 +403,8 @@ internal static void Init ()
}

[Deprecated (PlatformName.iOS, 9, 0, message : "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[Deprecated (PlatformName.MacCatalyst, 14, 0, message : "Use the 'Contacts' API instead.")]
public static class ABPersonRelatedNamesLabel {
public static NSString Assistant {get; private set;}
public static NSString Brother {get; private set;}
Expand Down Expand Up @@ -423,6 +441,8 @@ internal static void Init ()
}

[Deprecated (PlatformName.iOS, 9, 0, message : "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[Deprecated (PlatformName.MacCatalyst, 14, 0, message : "Use the 'Contacts' API instead.")]
public static class ABLabel {
public static NSString Home {get; private set;}
public static NSString Other {get; private set;}
Expand All @@ -443,6 +463,8 @@ internal static void Init ()
}

[Deprecated (PlatformName.iOS, 9, 0, message : "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[Deprecated (PlatformName.MacCatalyst, 14, 0, message : "Use the 'Contacts' API instead.")]
public class ABPerson : ABRecord, IComparable, IComparable<ABPerson> {
[DllImport (Constants.AddressBookLibrary)]
extern static IntPtr ABPersonCreate ();
Expand Down Expand Up @@ -934,6 +956,10 @@ public static ABPerson[] CreateFromVCard (ABRecord source, NSData vCardData)
}

[Deprecated (PlatformName.iOS, 9, 0, message : "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[Deprecated (PlatformName.MacCatalyst, 14, 0, message : "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[Deprecated (PlatformName.MacCatalyst, 14, 0, message : "Use the 'Contacts' API instead.")]
public class SocialProfile : DictionaryContainer
{
public SocialProfile ()
Expand Down Expand Up @@ -983,6 +1009,8 @@ public string Url {
}

[Deprecated (PlatformName.iOS, 9, 0, message : "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[Deprecated (PlatformName.MacCatalyst, 14, 0, message : "Use the 'Contacts' API instead.")]
public class InstantMessageService : DictionaryContainer
{
public InstantMessageService ()
Expand Down Expand Up @@ -1017,6 +1045,8 @@ public string Username {
}

[Deprecated (PlatformName.iOS, 9, 0, message : "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[Deprecated (PlatformName.MacCatalyst, 14, 0, message : "Use the 'Contacts' API instead.")]
public class PersonAddress : DictionaryContainer
{
public PersonAddress ()
Expand Down
2 changes: 2 additions & 0 deletions src/AddressBook/ABRecord.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@
namespace AddressBook {

[Deprecated (PlatformName.iOS, 9, 0, message : "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[Deprecated (PlatformName.MacCatalyst, 14, 0, message : "Use the 'Contacts' API instead.")]
public class ABRecord : INativeObject, IDisposable {

public const int InvalidRecordId = -1;
Expand Down
2 changes: 2 additions & 0 deletions src/AddressBook/ABSource.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@
namespace AddressBook {

[Deprecated (PlatformName.iOS, 9, 0, message : "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[Deprecated (PlatformName.MacCatalyst, 14, 0, message : "Use the 'Contacts' API instead.")]
public class ABSource : ABRecord {
internal ABSource (IntPtr handle, bool owns)
: base (handle, owns)
Expand Down
5 changes: 0 additions & 5 deletions src/AudioToolbox/AudioFile.cs
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ public enum AudioFileType { // UInt32 AudioFileTypeID
AMR = 0x616d7266, // amrf
[NoWatch, iOS (11,0), Mac(10,13), TV (11,0)]
FLAC = 0x666c6163, // flac
[Introduced (PlatformName.MacCatalyst, 13,0)]
[NoWatch, iOS (13,0), Mac(10,15), TV (13,0)]
LatmInLoas = 0x6c6f6173, // loas
}
Expand Down Expand Up @@ -215,7 +214,6 @@ public string Name {
}
}

[Introduced (PlatformName.MacCatalyst, 13,0)]
[NoWatch, iOS (13,0), Mac (10,15), TV (13,0)]
[StructLayout (LayoutKind.Sequential)]
public struct AudioPacketRangeByteCountTranslation {
Expand All @@ -224,23 +222,20 @@ public struct AudioPacketRangeByteCountTranslation {
public long ByteCountUpperBound;
}

[Introduced (PlatformName.MacCatalyst, 13,0)]
[NoWatch, iOS (13,0), Mac (10,15), TV (13,0)]
[StructLayout (LayoutKind.Sequential)]
public struct AudioPacketRollDistanceTranslation {
public long Packet;
public long RollDistance;
}

[Introduced (PlatformName.MacCatalyst, 13,0)]
[NoWatch, iOS (13,0), Mac (10,15), TV (13,0)]
[StructLayout (LayoutKind.Sequential)]
public struct AudioIndependentPacketTranslation {
public long Packet;
public long IndependentlyDecodablePacket;
}

[Introduced (PlatformName.MacCatalyst, 13,0)]
[NoWatch, iOS (13,0), Mac (10,15), TV (13,0)]
[StructLayout (LayoutKind.Sequential)]
public struct AudioPacketDependencyInfoTranslation {
Expand Down
1 change: 0 additions & 1 deletion src/AudioToolbox/AudioType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ public enum AudioFormatType : uint { // UInt32 in AudioStreamBasicDescription --
AES3 = 0x61657333, // 'aes3'
EnhancedAES3 = 0x65632d33, // 'ec-3'
Flac = 0x666c6163, // 'flac'
[Introduced (PlatformName.MacCatalyst, 13,0)]
[NoWatch, iOS (13,0), Mac(10,15), TV (13,0)]
LatmInLoas = 0x6c6f6173, // 'loas'
Opus = 0x6f707573, // 'opus'
Expand Down
1 change: 0 additions & 1 deletion src/AudioToolbox/Enums.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

namespace AudioToolbox {
[Flags]
[Introduced (PlatformName.MacCatalyst, 13,0)]
[NoWatch, TV (10, 0), Mac (10, 12), iOS (10, 0)]
public enum AudioSettingsFlags : uint
{
Expand Down
Loading

4 comments on commit 29b10a5

@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.

❌ Tests failed on Build ❌

Tests failed on Build.

API diff

✅ API Diff from stable

View API diff

Packages generated

View packages

Test results

13 tests failed, 169 tests passed.

Failed tests

  • monotouch-test/Mac [dotnet]/Debug [dotnet]: Failed (Test run crashed (exit code: 134).
    No test log file was produced)
  • monotouch-test/iOS Unified 64-bits - simulator/Debug [dotnet]: TimedOut
  • monotouch-test/iOS Unified 64-bits - simulator/Debug (LinkSdk): TimedOut
  • monotouch-test/iOS Unified 64-bits - simulator/Debug (static registrar): TimedOut
  • monotouch-test/iOS Unified 64-bits - simulator/Release (all optimizations): TimedOut
  • monotouch-test/iOS Unified 64-bits - simulator/Debug (all optimizations): TimedOut
  • monotouch-test/iOS Unified 64-bits - simulator/Debug (LinkSdk) [dotnet]: TimedOut
  • monotouch-test/iOS Unified 64-bits - simulator/Debug (static registrar) [dotnet]: TimedOut
  • monotouch-test/iOS Unified 64-bits - simulator/Release (all optimizations) [dotnet]: TimedOut
  • monotouch-test/iOS Unified 64-bits - simulator/Debug (all optimizations) [dotnet]: TimedOut
  • link sdk/iOS Unified 64-bits - simulator/Debug [dotnet]: Failed
  • link sdk/iOS Unified 64-bits - simulator/Release [dotnet]: Failed
  • introspection/watchOS 32-bits - simulator/Debug (watchOS 5.0): LaunchFailure

Pipeline on Agent XAMBOT-1033

@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.

⚠️ Tests were not ran (VSTS: device tests iOS32b). ⚠️

Results were skipped for this run due to provisioning problems Azure Devops. Please contact the bot administrator.

Pipeline on Agent

@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.

⚠️ Tests were not ran (VSTS: device tests iOS). ⚠️

Results were skipped for this run due to provisioning problems Azure Devops. Please contact the bot administrator.

Pipeline on Agent

@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.

⚠️ Tests were not ran (VSTS: device tests tvOS). ⚠️

Results were skipped for this run due to provisioning problems Azure Devops. Please contact the bot administrator.

Pipeline on Agent

Please sign in to comment.