Skip to content

Commit

Permalink
Merge branch 'main' into xcode13.0-coreimage-b1-b3
Browse files Browse the repository at this point in the history
  • Loading branch information
rachelkang committed Aug 31, 2021
2 parents 5827299 + 066d5b5 commit 47e5e4a
Show file tree
Hide file tree
Showing 99 changed files with 1,872 additions and 86 deletions.
2 changes: 1 addition & 1 deletion dotnet/Workloads/SignList.xml
@@ -1,7 +1,6 @@
<Project>
<!-- Do not sign files that already have a signature -->
<ItemGroup>
<Skip Include="Mono.Options.dll" />
<Skip Include="System.Reflection.MetadataLoadContext.dll" />
<!-- Microsoft.iOS.Windows.Sdk content -->
<Skip Include="tools\msbuild\iOS\Microsoft.Win32.Registry.dll" />
Expand Down Expand Up @@ -49,6 +48,7 @@
<ItemGroup>
<FirstParty Include="bgen.dll" />
<FirstParty Include="dotnet-linker.dll" />
<FirstParty Include="Mono.Options.dll" />
<FirstParty Include="Xamarin.*.dll" />
<!-- mlaunch.app MonoBundle content-->
<FirstParty Include="mlaunch.exe" />
Expand Down
Expand Up @@ -713,6 +713,9 @@
<data name="E0187" xml:space="preserve">
<value>Nepovedlo se namapovat verzi macOS {0} na odpovídající verzi iOS.</value>
</data>
<data name="E0188" xml:space="preserve">
<value>Could not map the iOS version {0} to a corresponding macOS version</value>
</data>
<data name="E7001" xml:space="preserve">
<value>Nepovedlo se přeložit IP adresy hostitele pro nastavení ladicího programu Wi-Fi.
</value>
Expand Down
Expand Up @@ -713,6 +713,9 @@
<data name="E0187" xml:space="preserve">
<value>Die macOS-Version {0} konnte keiner entsprechenden macOS-Version zugeordnet werden.</value>
</data>
<data name="E0188" xml:space="preserve">
<value>Could not map the iOS version {0} to a corresponding macOS version</value>
</data>
<data name="E7001" xml:space="preserve">
<value>Die Host-IP-Adressen für die WLAN-Debuggereinstellungen konnten nicht aufgelöst werden.
</value>
Expand Down
Expand Up @@ -713,6 +713,9 @@
<data name="E0187" xml:space="preserve">
<value>No se pudo asignar la versión de macOS {0} a una versión de iOS correspondiente</value>
</data>
<data name="E0188" xml:space="preserve">
<value>Could not map the iOS version {0} to a corresponding macOS version</value>
</data>
<data name="E7001" xml:space="preserve">
<value>No se pudieron resolver las direcciones IP del host para la configuración del depurador Wi-Fi.
</value>
Expand Down
Expand Up @@ -713,6 +713,9 @@
<data name="E0187" xml:space="preserve">
<value>Impossible de mapper la version iOS {0} à une version correspondante</value>
</data>
<data name="E0188" xml:space="preserve">
<value>Could not map the iOS version {0} to a corresponding macOS version</value>
</data>
<data name="E7001" xml:space="preserve">
<value>Impossible de résoudre les adresses IP des hôtes pour les paramètres du débogueur Wi-Fi.
</value>
Expand Down
Expand Up @@ -713,6 +713,9 @@
<data name="E0187" xml:space="preserve">
<value>Non è stato possibile eseguire il mapping della versione macOS {0} a una versione di iOS corrispondente</value>
</data>
<data name="E0188" xml:space="preserve">
<value>Could not map the iOS version {0} to a corresponding macOS version</value>
</data>
<data name="E7001" xml:space="preserve">
<value>Non è stato possibile risolvere gli indirizzi IP host per le impostazioni del debugger Wi-Fi.
</value>
Expand Down
Expand Up @@ -713,6 +713,9 @@
<data name="E0187" xml:space="preserve">
<value>macOS バージョン {0} を対応する iOS バージョンにマップできません</value>
</data>
<data name="E0188" xml:space="preserve">
<value>Could not map the iOS version {0} to a corresponding macOS version</value>
</data>
<data name="E7001" xml:space="preserve">
<value>WiFi デバッガー設定のホスト IP を解決できませんでした。
</value>
Expand Down
Expand Up @@ -713,6 +713,9 @@
<data name="E0187" xml:space="preserve">
<value>macOS 버전 {0}을(를) 해당 iOS 버전에 매핑할 수 없습니다.</value>
</data>
<data name="E0188" xml:space="preserve">
<value>Could not map the iOS version {0} to a corresponding macOS version</value>
</data>
<data name="E7001" xml:space="preserve">
<value>WiFi 디버거 설정의 호스트 IP를 확인할 수 없습니다.
</value>
Expand Down
Expand Up @@ -713,6 +713,9 @@
<data name="E0187" xml:space="preserve">
<value>Nie można zmapować wersji systemu MacOS {0} na odpowiadającą jej wersję systemu iOS</value>
</data>
<data name="E0188" xml:space="preserve">
<value>Could not map the iOS version {0} to a corresponding macOS version</value>
</data>
<data name="E7001" xml:space="preserve">
<value>Nie można rozpoznać adresów IP hosta dla ustawień debugera WiFi.
</value>
Expand Down
Expand Up @@ -713,6 +713,9 @@
<data name="E0187" xml:space="preserve">
<value>Não foi possível mapear a versão {0} do macOS para uma versão correspondente do iOS</value>
</data>
<data name="E0188" xml:space="preserve">
<value>Could not map the iOS version {0} to a corresponding macOS version</value>
</data>
<data name="E7001" xml:space="preserve">
<value>Não foi possível resolver os IPs do host para as configurações do depurador de WiFi.
</value>
Expand Down
Expand Up @@ -713,6 +713,9 @@
<data name="E0187" xml:space="preserve">
<value>Не удалось сопоставить версию macOS {0} с соответствующей версией iOS</value>
</data>
<data name="E0188" xml:space="preserve">
<value>Could not map the iOS version {0} to a corresponding macOS version</value>
</data>
<data name="E7001" xml:space="preserve">
<value>Не удалось разрешить IP-адреса узлов для параметров отладчика Wi-Fi.
</value>
Expand Down
Expand Up @@ -713,6 +713,9 @@
<data name="E0187" xml:space="preserve">
<value>{0} macOS sürümü karşılık gelen bir iOS sürümüne eşlenemedi</value>
</data>
<data name="E0188" xml:space="preserve">
<value>Could not map the iOS version {0} to a corresponding macOS version</value>
</data>
<data name="E7001" xml:space="preserve">
<value>Wi-Fi hata ayıklayıcısı ayarları için konak IP'leri çözümlenemedi.
</value>
Expand Down
Expand Up @@ -713,6 +713,9 @@
<data name="E0187" xml:space="preserve">
<value>无法将 macOS 版本 {0} 映射到相应 iOS 版本</value>
</data>
<data name="E0188" xml:space="preserve">
<value>Could not map the iOS version {0} to a corresponding macOS version</value>
</data>
<data name="E7001" xml:space="preserve">
<value>无法解析 WiFi 调试程序设置的主机 IP。
</value>
Expand Down
Expand Up @@ -713,6 +713,9 @@
<data name="E0187" xml:space="preserve">
<value>無法將 macOS 版本 {0} 對應至相應的 iOS 版本</value>
</data>
<data name="E0188" xml:space="preserve">
<value>Could not map the iOS version {0} to a corresponding macOS version</value>
</data>
<data name="E7001" xml:space="preserve">
<value>無法解析 WiFi 偵錯工具設定的主機 IP。
</value>
Expand Down
30 changes: 30 additions & 0 deletions src/AddressBook/ABAddressBook.cs
Expand Up @@ -33,15 +33,27 @@
using System.Collections;
using System.Collections.Generic;
using System.Runtime.InteropServices;
using System.Runtime.Versioning;

using Foundation;
using CoreFoundation;
using ObjCRuntime;

namespace AddressBook {
#if !NET
[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.")]
#else
[UnsupportedOSPlatform ("ios9.0")]
[UnsupportedOSPlatform ("maccatalyst14.0")]
[SupportedOSPlatform ("maccatalyst14.0")]
#if IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
#endif
public class ExternalChangeEventArgs : EventArgs {
public ExternalChangeEventArgs (ABAddressBook addressBook, NSDictionary info)
{
Expand Down Expand Up @@ -98,9 +110,20 @@ static InitConstants ()
}
}

#if !NET
[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.")]
#else
[UnsupportedOSPlatform ("ios9.0")]
[UnsupportedOSPlatform ("maccatalyst14.0")]
[SupportedOSPlatform ("maccatalyst14.0")]
#if IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
#endif
public class ABAddressBook : INativeObject, IDisposable, IEnumerable<ABRecord> {

public static readonly NSString ErrorDomain;
Expand All @@ -111,7 +134,14 @@ public class ABAddressBook : INativeObject, IDisposable, IEnumerable<ABRecord> {
[DllImport (Constants.AddressBookLibrary)]
internal extern static IntPtr ABAddressBookCreate ();

#if !NET
[Deprecated (PlatformName.iOS, 6, 0, message : "Use the static Create method instead")]
#else
[UnsupportedOSPlatform ("ios6.0")]
#if IOS
[Obsolete ("Starting with ios6.0 use the static Create method instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
#endif
public ABAddressBook ()
{
this.handle = ABAddressBookCreate ();
Expand Down
12 changes: 12 additions & 0 deletions src/AddressBook/ABGroup.cs
Expand Up @@ -34,6 +34,7 @@
using System.Collections;
using System.Collections.Generic;
using System.Runtime.InteropServices;
using System.Runtime.Versioning;

using CoreFoundation;
using Foundation;
Expand All @@ -55,9 +56,20 @@ internal static void Init ()
}
}

#if !NET
[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.")]
#else
[UnsupportedOSPlatform ("ios9.0")]
[UnsupportedOSPlatform ("maccatalyst14.0")]
[SupportedOSPlatform ("maccatalyst14.0")]
#if __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
#endif
public class ABGroup : ABRecord, IEnumerable<ABRecord> {

[DllImport (Constants.AddressBookLibrary)]
Expand Down
78 changes: 78 additions & 0 deletions src/AddressBook/ABMultiValue.cs
Expand Up @@ -33,16 +33,28 @@
using System.Collections;
using System.Collections.Generic;
using System.Runtime.InteropServices;
using System.Runtime.Versioning;

using CoreFoundation;
using Foundation;
using ObjCRuntime;

namespace AddressBook {

#if !NET
[Deprecated (PlatformName.iOS, 9,0)]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[Deprecated (PlatformName.MacCatalyst, 14, 0, message : "Use the 'Contacts' API instead.")]
#else
[UnsupportedOSPlatform ("ios9.0")]
[UnsupportedOSPlatform ("maccatalyst14.0")]
[SupportedOSPlatform ("maccatalyst14.0")]
#if __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
#endif
static class ABMultiValue {
public const uint Mask = (1 << 8);

Expand Down Expand Up @@ -102,9 +114,20 @@ public static IntPtr ToIntPtr (NSObject value)
}
}

#if !NET
[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.")]
#else
[UnsupportedOSPlatform ("ios9.0")]
[UnsupportedOSPlatform ("maccatalyst14.0")]
[SupportedOSPlatform ("maccatalyst14.0")]
#if __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
#endif
public struct ABMultiValueEntry<T>
{
ABMultiValue<T> self;
Expand Down Expand Up @@ -176,9 +199,20 @@ static Exception CreateNotSupportedException ()
}
}

#if !NET
[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.")]
#else
[UnsupportedOSPlatform ("ios9.0")]
[UnsupportedOSPlatform ("maccatalyst14.0")]
[SupportedOSPlatform ("maccatalyst14.0")]
#if __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
#endif
public class ABMultiValue<T> : INativeObject, IDisposable, IEnumerable<ABMultiValueEntry<T>>
{
IntPtr handle;
Expand Down Expand Up @@ -298,9 +332,20 @@ public ABMutableMultiValue<T> ToMutableMultiValue ()
}
}

#if !NET
[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.")]
#else
[UnsupportedOSPlatform ("ios9.0")]
[UnsupportedOSPlatform ("maccatalyst14.0")]
[SupportedOSPlatform ("maccatalyst14.0")]
#if __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
#endif
public class ABMutableMultiValue<T> : ABMultiValue<T>
{
internal ABMutableMultiValue (IntPtr handle)
Expand Down Expand Up @@ -345,29 +390,62 @@ public bool RemoveAt (nint index)
}
}

#if !NET
[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.")]
#else
[UnsupportedOSPlatform ("ios9.0")]
[UnsupportedOSPlatform ("maccatalyst14.0")]
[SupportedOSPlatform ("maccatalyst14.0")]
#if __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
#endif
public class ABMutableDateMultiValue : ABMutableMultiValue<NSDate> {
public ABMutableDateMultiValue ()
: base (ABMultiValue.CreateMutable (ABPropertyType.MultiDateTime))
{
}
}

#if !NET
[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.")]
#else
[UnsupportedOSPlatform ("ios9.0")]
[UnsupportedOSPlatform ("maccatalyst14.0")]
[SupportedOSPlatform ("maccatalyst14.0")]
#if __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
#endif
public class ABMutableDictionaryMultiValue : ABMutableMultiValue<NSDictionary> {
public ABMutableDictionaryMultiValue ()
: base (ABMultiValue.CreateMutable (ABPropertyType.MultiDictionary))
{
}
}

#if !NET
[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.")]
#else
[UnsupportedOSPlatform ("ios9.0")]
[UnsupportedOSPlatform ("maccatalyst14.0")]
[SupportedOSPlatform ("maccatalyst14.0")]
#if __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
#endif
public class ABMutableStringMultiValue : ABMutableMultiValue<string> {
public ABMutableStringMultiValue ()
: base (ABMultiValue.CreateMutable (ABPropertyType.MultiString),
Expand Down

0 comments on commit 47e5e4a

Please sign in to comment.