xamarin
/
xamarin-macios
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Revert "Merge xcode9 into master (#2707)" 

This reverts commit 67f4130753.
This commit is contained in:
Sebastien Pouliot 2017-09-16 10:54:51 -04:00 коммит произвёл GitHub
Родитель 67f4130753
Коммит 66e97279e6
495 изменённых файлов: 2598 добавлений и 35678 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

27
Make.config
Просмотреть файл

@ -18,7 +18,6 @@ PACKAGE_HEAD_REV=$(shell git rev-parse HEAD)
# PACKAGE_HEAD_BRANCH (set to the release branch name, this shows up in the IDE's version information, as well as mtouch/mmp --version)
# IOS_PACKAGE_VERSION (major/minor #)
# MAC_PACKAGE_VERSION (major/minor #)
# PACKAGE_VERSION_REV (set to 0 and increment for service releases or previews)
# (and updating the same on master as well, to next version)
#
@ -38,23 +37,21 @@ else
CURRENT_BRANCH:=$(PACKAGE_HEAD_BRANCH)
endif
# for service releases and previews
PACKAGE_VERSION_REV=0
IOS_PRODUCT=Xamarin.iOS
IOS_PACKAGE_NAME=Xamarin.iOS
IOS_PACKAGE_NAME_LOWER=$(shell echo $(IOS_PACKAGE_NAME) | tr "[:upper:]" "[:lower:]")
# NEVER customize IOS_PACKAGE_VERSION itself, other parts (mtouch, web updater) are using the IOS_PACKAGE_VERSION_* variables
IOS_PACKAGE_VERSION=11.3.$(PACKAGE_VERSION_REV).$(IOS_COMMIT_DISTANCE)
IOS_PACKAGE_VERSION=10.15.0.$(IOS_COMMIT_DISTANCE)
IOS_PACKAGE_VERSION_MAJOR=$(word 1, $(subst ., ,$(IOS_PACKAGE_VERSION)))
IOS_PACKAGE_VERSION_MINOR=$(word 2, $(subst ., ,$(IOS_PACKAGE_VERSION)))
IOS_PACKAGE_VERSION_REV=$(PACKAGE_VERSION_REV)
IOS_PACKAGE_VERSION_REV=$(word 3, $(subst ., ,$(IOS_PACKAGE_VERSION)))
IOS_PACKAGE_VERSION_BUILD=$(IOS_COMMIT_DISTANCE)
IOS_PACKAGE_UPDATE_ID=$(shell printf "2%02d%02d%02d%03d" $(IOS_PACKAGE_VERSION_MAJOR) $(IOS_PACKAGE_VERSION_MINOR) $(IOS_PACKAGE_VERSION_REV) $(IOS_PACKAGE_VERSION_BUILD))
XCODE_VERSION=9
XCODE_URL=http://xamarin-storage/bot-provisioning/Xcode_9_GM_seed.xip
XCODE_DEVELOPER_ROOT=/Applications/Xcode9-GM.app/Contents/Developer
# Xcode 8.3
XCODE_VERSION=8.3
XCODE_URL=http://xamarin-storage/bot-provisioning/Xcode_8.3.xip
XCODE_DEVELOPER_ROOT=/Applications/Xcode83.app/Contents/Developer
# Minimum Mono version
MIN_MONO_VERSION=5.4.0.60
@ -75,10 +72,10 @@ MIN_OSX_BUILD_VERSION=10.12
MIN_OSX_VERSION_FOR_IOS=10.11
MIN_OSX_VERSION_FOR_MAC=10.11
IOS_SDK_VERSION=11.0
OSX_SDK_VERSION=10.13
WATCH_SDK_VERSION=4.0
TVOS_SDK_VERSION=11.0
IOS_SDK_VERSION=10.3
OSX_SDK_VERSION=10.12
WATCH_SDK_VERSION=3.2
TVOS_SDK_VERSION=10.2
MIN_IOS_SDK_VERSION=6.0
MIN_OSX_SDK_VERSION=10.7
@ -252,10 +249,10 @@ MAC_PRODUCT=Xamarin.Mac
MAC_PACKAGE_NAME=xamarin.mac
MAC_PACKAGE_NAME_LOWER=$(shell echo $(MAC_PACKAGE_NAME) | tr "[:upper:]" "[:lower:]")
MAC_PACKAGE_VERSION=4.1.$(PACKAGE_VERSION_REV).$(MAC_COMMIT_DISTANCE)
MAC_PACKAGE_VERSION=3.9.0.$(MAC_COMMIT_DISTANCE)
MAC_PACKAGE_VERSION_MAJOR=$(word 1, $(subst ., ,$(MAC_PACKAGE_VERSION)))
MAC_PACKAGE_VERSION_MINOR=$(word 2, $(subst ., ,$(MAC_PACKAGE_VERSION)))
MAC_PACKAGE_VERSION_REV=$(PACKAGE_VERSION_REV)
MAC_PACKAGE_VERSION_REV=$(word 3, $(subst ., ,$(MAC_PACKAGE_VERSION)))
MAC_PACKAGE_VERSION_BUILD=$(word 4, $(subst ., ,$(MAC_PACKAGE_VERSION)))
MAC_PACKAGE_VERSION_MAJOR_MINOR=$(MAC_PACKAGE_VERSION_MAJOR).$(MAC_PACKAGE_VERSION_MINOR)
MAC_PACKAGE_UPDATE_ID=$(shell echo $(subst ., ,$(MAC_PACKAGE_VERSION).$(MAC_PACKAGE_VERSION_BUILD)) | awk '{printf "2%02d%02d%02d%03d",$$1,$$2,$$3,$$4}')

1
README.md
Просмотреть файл

@ -142,3 +142,4 @@ We use [Mono's Coding Guidelines](http://www.mono-project.com/community/contribu
### Reporting Bugs
We use [Bugzilla](https://bugzilla.xamarin.com/newbug) to track issues.

3
Versions-ios.plist.in
Просмотреть файл

@ -23,7 +23,6 @@
<string>10.1</string>
<string>10.2</string>
<string>10.3</string>
<string>11.0</string>
</array>
<key>tvOS</key>
<array>
@ -33,7 +32,6 @@
<string>10.0</string>
<string>10.1</string>
<string>10.2</string>
<string>11.0</string>
</array>
<key>watchOS</key>
<array>
@ -44,7 +42,6 @@
<string>3.0</string>
<string>3.1</string>
<string>3.2</string>
<string>4.0</string>
</array>
</dict>
<key>RecommendedXcodeVersion</key>

1
Versions-mac.plist.in
Просмотреть файл

@ -12,7 +12,6 @@
<string>10.10</string>
<string>10.11</string>
<string>10.12</string>
<string>10.13</string>
</array>
</dict>
<key>RecommendedXcodeVersion</key>

4
builds/Makefile
Просмотреть файл

@ -805,7 +805,6 @@ SIM_ACVARS = \
$(COMMON_ACVARS) \
ac_cv_func_clock_nanosleep=no \
mono_cv_uscore=yes \
ac_cv_func_system=no \
define SimulatorBuildTemplate
@ -1857,7 +1856,6 @@ endif
LLVM_BASE_CONFIGURE_FLAGS=--enable-libcpp --enable-optimized --enable-assertions=no --disable-jit --disable-docs --disable-doxygen
LLVM_CXXFLAGS=$(CCACHE_CXXFLAGS)
LLVM_BASE_CONFIGURE_ENVIRONMENT=$(COMMON_ACVARS)
# This is used just for linking with the 32 bit cross compiler
# FIXME: Avoid building the libs not needed by mono
@ -1865,7 +1863,6 @@ LLVM_BASE_CONFIGURE_ENVIRONMENT=$(COMMON_ACVARS)
@mkdir -p llvm/
@echo "Configuring llvm"
@cd llvm && \
$(LLVM_BASE_CONFIGURE_ENVIRONMENT) \
$(abspath $(LLVM_PATH)/configure) --prefix=$$PWD/usr --build=i386-apple-darwin10.7 --enable-targets="arm" $(LLVM_BASE_CONFIGURE_FLAGS) --cache-file=../llvm.config.cache CC="$(CCACHE)clang" CXX="$(CCACHE)clang++" CXXFLAGS="$(LLVM_CXXFLAGS)" > $@.log 2>&1 || (echo "Configuring llvm failed:" && cat $@.log | sed "s/^/ /" && exit 1)
$(Q) @touch $@
@echo Configured llvm
@ -1874,7 +1871,6 @@ LLVM_BASE_CONFIGURE_ENVIRONMENT=$(COMMON_ACVARS)
@mkdir -p llvm64/
@echo "Configuring llvm64"
@cd llvm64 && \
$(LLVM_BASE_CONFIGURE_ENVIRONMENT) \
$(abspath $(LLVM_PATH)/configure) --prefix=$$PWD/usr --enable-targets="arm arm64" $(LLVM_BASE_CONFIGURE_FLAGS) --cache-file=../llvm64.config.cache CC="$(CCACHE)clang" CXX="$(CCACHE)clang++" CXXFLAGS="-Qunused-arguments" > $@.log 2>&1 || (echo "Configuring llvm64 failed:" && cat $@.log | sed "s/^/ /" && exit 1)
$(Q) @touch $@
@echo "Configured llvm64"

16
docs/website/mtouch-errors.md
Просмотреть файл

@ -560,21 +560,9 @@ linker. This will most likely result in native linker errors.
The solution is to remove the `--dynamic-symbol-mode=linker` argument from the additional mtouch arguments in the project's Build options.
### <a name="MT0116"/>MT0116: Invalid architecture: {arch}. 32-bit architectures are not supported when deployment target is 11 or later. Make sure the project does not build for a 32-bit architecture.
### <a name="MT0116"/>MT0116: Aot files could not be found at the expected directory '{msymdir}'.
iOS 11 does not contain support for 32-bit applications, so it's not supported
to build for a 32-bit application when the deployment target is iOS 11 or
later.
Either change the target architecture in the project's iOS build options to
arm64, or change the deployment target in the project's Info.plist to an
earlier iOS version.
### <a name="MT0117"/>MT0117: Can't launch a 32-bit app on a simulator that only supports 64-bit.
### <a name="MT0118"/>MT0116: Aot files could not be found at the expected directory '{msymdir}'.
<!-- 0119 - 0122: free to use -->
<!-- 0117 - 0122: free to use -->
### <a name="MT0123"/>MT0123: The current language was set to '{language}' according to the LANG environment variable (LANG={LANG}).

2
external/Touch.Unit поставляемый

@ -1 +1 @@
Subproject commit 8f1e19d731c7490993e5b25aaa2fc340498079b5
Subproject commit 055659f10af409c7e369ee3372bd3f4b1a99fd2c

2
external/Xamarin.MacDev поставляемый

@ -1 +1 @@
Subproject commit 59023905966b465cc92bb46535cf66a59a38d39f
Subproject commit da6aeb0f49243a497a921c0cef24264b1ca1279c

2
external/llvm поставляемый

@ -1 +1 @@
Subproject commit 975e3a6903003d7dba1b01f8a3c4a42a55049842
Subproject commit 6aa74ae5723b13433adce76e94adcc090f2768ee

2
external/mono поставляемый

@ -1 +1 @@
Subproject commit 7d7887780057e40f3921ceedca6c1579a928655d
Subproject commit b2acee0ade0c53b0e70a322f3adb15071517add0

2
external/opentk поставляемый

@ -1 +1 @@
Subproject commit 396bc90c7ac2e7ce442840a5e8bd91e5e79b381e
Subproject commit 2335bde3612c0cfcc1f0057d494c2ce681b54df4

52
jenkins/nunit-summary.xslt Normal file
Просмотреть файл

@ -0,0 +1,52 @@
<?xml version="1.0" encoding="UTF-8" ?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:output indent="no" method='text'/>
<xsl:strip-space elements="*"/>
<xsl:template match="/">
<xsl:apply-templates/>
</xsl:template>
<xsl:template match="//test-suite[@type='TestFixture']">
<xsl:text>&#10;</xsl:text>
<xsl:value-of select="@name"/>
<xsl:text>&#10;</xsl:text>
<xsl:for-each select="current()/results/test-case">
<xsl:choose>
<xsl:when test="@result='Success'">
<xsl:text> [PASS] </xsl:text>
</xsl:when>
<xsl:when test="@result='Failure' or @result='Error'">
<xsl:text> [FAIL] </xsl:text>
</xsl:when>
<xsl:when test="@result='Ignored'">
<xsl:text> [IGNORED] </xsl:text>
</xsl:when>
<xsl:when test="@result='Inconclusive'">
<xsl:text> [INCONCLUSIVE] </xsl:text>
</xsl:when>
<xsl:otherwise>
<xsl:text> [INFO] </xsl:text>
</xsl:otherwise>
</xsl:choose>
<xsl:value-of select="../../@name"/><xsl:text>.</xsl:text><xsl:value-of select="@name"/><xsl:if test="failure/message != ''"> : </xsl:if><xsl:value-of select="failure/message"/><xsl:text>&#10;</xsl:text>
<xsl:if test="failure/stack-trace != ''">
<xsl:value-of select="failure/stack-trace"/>
<xsl:text>&#10;</xsl:text>
</xsl:if>
</xsl:for-each>
<xsl:choose>
<xsl:when test="@time">
<xsl:value-of select="concat(@name,' : ', @time)"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="@name"/>
</xsl:otherwise>
</xsl:choose>
<xsl:text>&#10;</xsl:text>
</xsl:template>
<xsl:template match="//test-suite[@type!='TestFixture']/failure/message">
</xsl:template>
</xsl:stylesheet>

2
mk/xamarin.mk
Просмотреть файл

@ -1,5 +1,5 @@
ifdef ENABLE_XAMARIN
NEEDED_MACCORE_VERSION := e2905474b133977db654cf4036e78616ed92c3bf
NEEDED_MACCORE_VERSION := 93175c63568e00cf7cf7ac4be5a5cbd4d51bb0b9
NEEDED_MACCORE_BRANCH := master
MACCORE_DIRECTORY := maccore

2
msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.Common.targets
Просмотреть файл

@ -1856,7 +1856,7 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
</ItemGroup>
</Target>
<Target Name="_CodesignAppBundle" Condition="('$(_CanOutputAppBundle)' == 'true' And '$(_CodeSigningKey)' != '') And ('$(IsAppExtension)' == 'false' Or '@(_ResolvedAppExtensionReferences)' != '')" DependsOnTargets="$(_CodesignAppBundleDependsOn)"
<Target Name="_CodesignAppBundle" Condition="'$(_RequireCodeSigning)' == 'true' And ('$(IsAppExtension)' == 'false' Or '@(_ResolvedAppExtensionReferences)' != '')" DependsOnTargets="$(_CodesignAppBundleDependsOn)"
Inputs="@(_CodesignAppBundleInputs)" Outputs="$(_AppBundlePath)_CodeSignature\CodeResources">
<PropertyGroup>

2
msbuild/tests/MyPhotoEditingExtension/Info.plist
Просмотреть файл

@ -18,8 +18,6 @@
<string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>MinimumOSVersion</key>
<string>8.0</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>NSExtension</key>

2
msbuild/tests/MyShareExtension/Info.plist
Просмотреть файл

@ -18,8 +18,6 @@
<string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>MinimumOSVersion</key>
<string>8.0</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>NSExtension</key>

2
msbuild/tests/MySingleView/Info.plist
Просмотреть файл

@ -15,7 +15,7 @@
<key>UIMainStoryboardFile</key>
<string>MainStoryboard</string>
<key>MinimumOSVersion</key>
<string>7.0</string>
<string>6.1</string>
<key>CFBundleDisplayName</key>
<string>ApplicationName</string>
<key>CFBundleIdentifier</key>

2
msbuild/tests/MyTodayExtension/Info.plist
Просмотреть файл

@ -18,8 +18,6 @@
<string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>MinimumOSVersion</key>
<string>8.0</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>NSExtension</key>

5
msbuild/tests/Xamarin.iOS.Tasks.Tests/TargetTests/TargetTests.cs
Просмотреть файл

@ -36,7 +36,6 @@ namespace Xamarin.iOS.Tasks
"LaunchImage-568h@2x.png",
"LaunchImage.png",
"LaunchImage@2x.png",
"Assets.car",
};
return files.Select (s => Path.Combine (AppBundlePath, s)).ToArray ();
}
@ -436,7 +435,7 @@ namespace Xamarin.iOS.Tasks
var path = Path.Combine (MonoTouchProjectPath, "Info.plist");
var plist = PDictionary.FromFile (path);
plist.SetMinimumOSVersion ("7.0");
plist.SetMinimumOSVersion ("6.1");
plist.Save (path, true);
RunTarget (MonoTouchProject, TargetName.CollectBundleResources);
@ -481,7 +480,7 @@ namespace Xamarin.iOS.Tasks
// Start without app icon.
plist.Remove("XSAppIconAssets");
plist.SetMinimumOSVersion ("7.0");
plist.SetMinimumOSVersion ("6.1");
plist.Save (path, true);
RunTarget (project, TargetName.CompileImageAssets);

2
runtime/Makefile
Просмотреть файл

@ -41,7 +41,7 @@ Delegates.generated.cs: Delegates.cs.t4 delegates.t4
$(Q_GEN) $(TT) $< -o $@
bindings-generator.exe: bindings-generator.cs
$(Q) $(SYSTEM_MCS) $< -o:$@ -debug:full
$(Q) $(SYSTEM_MCS) $< -o:$@
bindings-generated.m: bindings-generator.exe
$(Q_GEN) $(SYSTEM_MONO) --debug $< $@

920
runtime/bindings-generator.cs
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

7
runtime/bindings-generator.csproj
Просмотреть файл

@ -6,7 +6,7 @@
<ProjectGuid>{6B616492-49F0-43EF-8390-F9D1B4CCC632}</ProjectGuid>
<OutputType>Exe</OutputType>
<RootNamespace>zzg</RootNamespace>
<AssemblyName>bindings-generator</AssemblyName>
<AssemblyName>zzg</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
@ -21,6 +21,7 @@
<WarningLevel>4</WarningLevel>
<PlatformTarget>x86</PlatformTarget>
<ConsolePause>false</ConsolePause>
<Commandlineparameters>/work/maccore/xcode7/maccore/bindings-generated.m</Commandlineparameters>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<DebugType>full</DebugType>
@ -31,10 +32,6 @@
<Externalconsole>true</Externalconsole>
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(RunConfiguration)' == 'Default' ">
<StartAction>Project</StartAction>
<StartArguments>${ProjectDir}/bindings-generated.m</StartArguments>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
</ItemGroup>

73
runtime/bindings.h
Просмотреть файл

@ -2,7 +2,6 @@
#define __BINDINGS_H__
#import <Foundation/Foundation.h>
#import <CoreGraphics/CoreGraphics.h>
#include <objc/objc.h>
#include <objc/runtime.h>
#include <objc/message.h>
@ -83,11 +82,6 @@ typedef __attribute__((__ext_vector_type__(4))) float vector_float4;
typedef struct { vector_float2 columns[2]; } matrix_float2x2;
typedef struct { vector_float3 columns[3]; } matrix_float3x3;
typedef struct { vector_float4 columns[4]; } matrix_float4x4;
typedef struct { vector_float3 columns[4]; } matrix_float4x3;
typedef struct { vector_double4 columns[4]; } matrix_double4x4;
typedef struct { vector_float4 vector; } simd_quatf;
typedef struct {
vector_float3 maxBounds;
@ -108,20 +102,6 @@ typedef struct {
vector_float3 points[3];
} GKTriangle;
typedef struct
{
NSUInteger numberOfHistogramEntries;
BOOL histogramForAlpha;
vector_float4 minPixelValue;
vector_float4 maxPixelValue;
} MPSImageHistogramInfo;
typedef vector_int4 MDLVoxelIndex;
typedef struct {
MDLVoxelIndex minimumExtent;
MDLVoxelIndex maximumExtent;
} MDLVoxelIndexExtent;
/*
* iOS has a vector type (vector_float3) which can't be expressed
* in P/Invoke signatures, so we need custom wrappers.
@ -161,39 +141,14 @@ struct Matrix2f {
Vector2f columns [2];
};
struct NMatrix2 {
Vector2f columns [2];
};
struct Matrix3f {
Vector3f columns [3];
};
struct NMatrix3 {
Vector4f columns [3];
};
struct Matrix4f {
Vector4f columns [4];
};
struct NMatrix4 {
Vector4f columns [4];
};
struct NMatrix4d {
Vector4d columns [4];
};
struct NMatrix4x3 {
// Use Vector4f here, since the managed version has padding to match accordingly.
Vector4f columns [4];
};
struct QuatF {
Vector4f vector;
};
struct MDLAxisAlignedBoundingBoxWrapper {
Vector3f maxBounds;
Vector3f minBounds;
@ -213,32 +168,6 @@ struct GKTriangleWrapper {
Vector3f points [3];
};
struct MPSImageHistogramInfoWrapper {
NSUInteger numberOfHistogramEntries;
BOOL histogramForAlpha;
// The minPixelValue field starts at offset 16, but we can't use
// __attribute__ ((aligned (16))), because that will make clang align the
// entire struct on a 16-byte boundary, which doesn't match how we've
// defined it in managed code (explicit layout, but no specific alignment).
// So we need to manually pad the struct to match the managed definition.
#if defined (__x86_64__) || defined (__arm64__)
uint8_t dummy[7];
#else
uint8_t dummy[11];
#endif
Vector4f minPixelValue;
Vector4f maxPixelValue;
};
typedef Vector4i MDLVoxelIndexWrapper;
struct MDLVoxelIndexExtentWrapper {
MDLVoxelIndexWrapper minimumExtent;
MDLVoxelIndexWrapper maximumExtent;
};
static_assert (sizeof (MPSImageHistogramInfoWrapper) == sizeof (MPSImageHistogramInfo), "Sizes aren't equal");
struct Vector4f xamarin_vector_float3__Vector4_objc_msgSend (id self, SEL sel);
void xamarin_vector_float3__Vector4_objc_msgSend_stret (struct Vector4f *v4, id self, SEL sel);
void xamarin_vector_float3__void_objc_msgSend_Vector4 (id self, SEL sel, struct Vector4f p0);
@ -256,8 +185,6 @@ void xamarin_vector_float3__Vector3_objc_msgSendSuper_stret (struct
void xamarin_vector_float3__void_objc_msgSendSuper_Vector3 (struct objc_super *super, SEL sel, struct Vector3f p0);
void xamarin_vector_float3__Vector3_objc_msgSendSuper_stret_Vector3 (struct Vector3f *v3, struct objc_super *super, SEL sel, struct Vector3f p0);
struct Vector3f xamarin_vector_float3__Vector3_objc_msgSendSuper_Vector3 (struct objc_super *super, SEL sel, struct Vector3f p0);
CGPoint xamarin_CGPoint__VNNormalizedFaceBoundingBoxPointForLandmarkPoint_Vector2_CGRect_nuint_nuint_string (struct Vector2f faceLandmarkPoint, CGRect faceBoundingBox, xm_nuint_t imageWidth, xm_nuint_t imageHeight, const char **error_msg);
CGPoint xamarin_CGPoint__VNImagePointForFaceLandmarkPoint_Vector2_CGRect_nuint_nuint_string (struct Vector2f faceLandmarkPoint, CGRect faceBoundingBox, xm_nuint_t imageWidth, xm_nuint_t imageHeight, const char **error_msg);
#ifndef XAMCORE_2_0
#ifdef MONOMAC

65
runtime/bindings.m
Просмотреть файл

@ -11,7 +11,6 @@
*/
#include "bindings.h"
#include <dlfcn.h>
/*
* Hand-written bindings to support ObjectiveC exceptions.
@ -89,67 +88,3 @@ void * monotouch_IntPtr_objc_msgSendSuper_IntPtr (struct objc_super *super, SEL
#endif
#endif
/*
* Vector c bindings
*
* The following code uses dlsym to not have a linking dependency on Xcode 9,
* the code can be simplified once we require to remove dlsym or xcode 9 becomes the minimum supported version
*/
typedef CGPoint (*vision_func) (vector_float2 faceLandmarkPoint, CGRect faceBoundingBox, size_t imageWidth, size_t imageHeight);
CGPoint
xamarin_CGPoint__VNNormalizedFaceBoundingBoxPointForLandmarkPoint_Vector2_CGRect_nuint_nuint_string (struct Vector2f faceLandmarkPoint, CGRect faceBoundingBox, xm_nuint_t imageWidth, xm_nuint_t imageHeight, const char **error_msg) {
static vision_func func = NULL;
*error_msg = NULL;
if (func == NULL) {
void *vision_handle = dlopen ("/System/Library/Frameworks/Vision.framework/Vision", RTLD_LAZY);
if (vision_handle == NULL) {
*error_msg = "Could not open Vision Framework";
return CGPointMake (0, 0);
}
func = (vision_func) dlsym (vision_handle, "VNNormalizedFaceBoundingBoxPointForLandmarkPoint");
if (func == NULL) {
*error_msg = "Could not obtain the address for VNNormalizedFaceBoundingBoxPointForLandmarkPoint";
return CGPointMake (0, 0);
}
}
vector_float2 flp;
flp [0] = faceLandmarkPoint.a;
flp [1] = faceLandmarkPoint.b;
return func (flp, faceBoundingBox, imageWidth, imageHeight);
}
CGPoint
xamarin_CGPoint__VNImagePointForFaceLandmarkPoint_Vector2_CGRect_nuint_nuint_string (struct Vector2f faceLandmarkPoint, CGRect faceBoundingBox, xm_nuint_t imageWidth, xm_nuint_t imageHeight, const char **error_msg) {
static vision_func func = NULL;
*error_msg = NULL;
if (func == NULL) {
void *vision_handle = dlopen ("/System/Library/Frameworks/Vision.framework/Vision", RTLD_LAZY);
if (vision_handle == NULL) {
*error_msg = "Could not open Vision Framework";
return CGPointMake (0, 0);
}
func = (vision_func) dlsym (vision_handle, "VNImagePointForFaceLandmarkPoint");
if (func == NULL) {
*error_msg = "Could not obtain the address for VNImagePointForFaceLandmarkPoint";
return CGPointMake (0, 0);
}
}
vector_float2 flp;
flp [0] = faceLandmarkPoint.a;
flp [1] = faceLandmarkPoint.b;
return func (flp, faceBoundingBox, imageWidth, imageHeight);
}

4
runtime/delegates.t4
Просмотреть файл

@ -71,8 +71,7 @@
new XDelegate ("MethodDescription", "UnmanagedMethodDescription", "xamarin_get_method_for_selector",
"Class", "IntPtr", "cls",
"SEL", "IntPtr", "sel",
"bool", "bool", "is_static"
"SEL", "IntPtr", "sel"
) { WrappedManagedFunction = "GetMethodForSelector" },
new XDelegate ("MonoObject *", "IntPtr", "xamarin_get_nsobject",
@ -141,7 +140,6 @@
new XDelegate ("MethodDescription", "UnmanagedMethodDescription", "xamarin_get_method_and_object_for_selector",
"Class", "IntPtr", "cls",
"SEL", "IntPtr", "sel",
"bool", "bool", "is_static",
"id", "IntPtr", "obj",
"MonoObject **", "ref IntPtr", "mthis"
) { WrappedManagedFunction = "GetMethodAndObjectForSelector" },

2
runtime/runtime.m
Просмотреть файл

@ -1119,7 +1119,7 @@ xamarin_initialize_embedded ()
Dl_info info;
if (dladdr ((void *) xamarin_initialize_embedded, &info) != 0) {
const char *last_sep = strrchr (info.dli_fname, '/');
char *last_sep = strrchr (info.dli_fname, '/');
if (last_sep == NULL) {
libname = strdup (info.dli_fname);
} else {

4
runtime/trampolines-invoke.m
Просмотреть файл

@ -88,9 +88,9 @@ xamarin_invoke_trampoline (enum TrampolineType type, id self, SEL sel, iterator_
int mofs = 0;
if (is_ctor || is_static) {
desc = xamarin_get_method_for_selector ([self class], sel, is_static, &exception_gchandle);
desc = xamarin_get_method_for_selector ([self class], sel, &exception_gchandle);
} else {
desc = xamarin_get_method_and_object_for_selector ([self class], sel, is_static, self, &mthis, &exception_gchandle);
desc = xamarin_get_method_and_object_for_selector ([self class], sel, self, &mthis, &exception_gchandle);
}
if (exception_gchandle != 0)
goto exception_handling;

4
runtime/xamarin/runtime.h
Просмотреть файл

@ -225,7 +225,7 @@ MonoObject* xamarin_get_class (Class ptr, guint32 *exception_gchandle)
MonoObject* xamarin_get_selector (SEL ptr, guint32 *exception_gchandle);
Class xamarin_get_class_handle (MonoObject *obj, guint32 *exception_gchandle);
SEL xamarin_get_selector_handle (MonoObject *obj, guint32 *exception_gchandle);
MethodDescription xamarin_get_method_for_selector (Class cls, SEL sel, bool is_static, guint32 *exception_gchandle);
MethodDescription xamarin_get_method_for_selector (Class cls, SEL sel, guint32 *exception_gchandle);
bool xamarin_has_nsobject (id obj, guint32 *exception_gchandle);
MonoObject* xamarin_get_nsobject (id obj, guint32 *exception_gchandle);
id xamarin_get_handle_for_inativeobject (MonoObject *obj, guint32 *exception_gchandle);
@ -239,7 +239,7 @@ MonoObject* xamarin_get_nsobject_with_type (id obj, void *type, int32_t *
void xamarin_dispose (MonoObject *mobj, guint32 *exception_gchandle);
bool xamarin_is_parameter_transient (MonoReflectionMethod *method, int parameter /* 0-based */, guint32 *exception_gchandle);
bool xamarin_is_parameter_out (MonoReflectionMethod *method, int parameter /* 0-based */, guint32 *exception_gchandle);
MethodDescription xamarin_get_method_and_object_for_selector (Class cls, SEL sel, bool is_static, id self, MonoObject **mthis, guint32 *exception_gchandle);
MethodDescription xamarin_get_method_and_object_for_selector (Class cls, SEL sel, id self, MonoObject **mthis, guint32 *exception_gchandle);
guint32 xamarin_create_product_exception_for_error (int code, const char *message, guint32 *exception_gchandle);
#ifdef __cplusplus

2
src/.gitignore поставляемый
Просмотреть файл

@ -11,5 +11,3 @@ xammac.csproj
xamtvos.csproj
xamwatch.csproj
generator-ikvm.csproj
~.pmcs-*
*~

43
src/ARKit/ARPointCloud.cs
Просмотреть файл

@ -1,43 +0,0 @@
//
// ARPointCloud.cs: Nicer code for ARPointCloud
//
// Authors:
// Vincent Dondain <vidondai@microsoft.com>
//
// Copyright 2017 Microsoft Inc. All rights reserved.
//
#if XAMCORE_2_0
using System;
using System.Runtime.InteropServices;
using Vector3 = global::OpenTK.NVector3;
namespace XamCore.ARKit {
public partial class ARPointCloud {
public unsafe Vector3 [] Points {
get {
var count = (int)Count;
var rv = new Vector3 [count];
var ptr = (Vector3 *) GetRawPoints ();
for (int i = 0; i < count; i++)
rv [i] = *ptr++;
return rv;
}
}
public unsafe ulong [] Identifiers {
get {
var count = (int)Count;
var rv = new ulong [count];
var ptr = (ulong*)GetRawIdentifiers ();
for (int i = 0; i < count; i++)
rv [i] = *ptr++;
return rv;
}
}
}
}
#endif

2
src/AVFoundation/AVAssetDownloadUrlSession.cs
Просмотреть файл

@ -27,7 +27,7 @@ namespace XamCore.AVFoundation {
}
#if !XAMCORE_4_0
[Obsolete ("Use the overload with a 'INSUrlSessionDelegate' parameter.")]
[Obsolete ("Use the overload with a `INSUrlSessionDelegate` parameter.")]
public new static NSUrlSession FromConfiguration (NSUrlSessionConfiguration configuration, NSUrlSessionDelegate sessionDelegate, NSOperationQueue delegateQueue)
{
throw new NotSupportedException ("NS_UNAVAILABLE");

144
src/AVFoundation/AVCompat.cs
Просмотреть файл

@ -14,7 +14,7 @@ namespace XamCore.AVFoundation {
#if !XAMCORE_2_0
partial class AVAssetResourceLoadingDataRequest {
[Obsolete ("Type is not meant to be created by user code.")]
[Obsolete ("Type is not meant to be created by user code")]
public AVAssetResourceLoadingDataRequest ()
{
}
@ -24,7 +24,7 @@ namespace XamCore.AVFoundation {
#if !XAMCORE_3_0
partial class AVAsset {
[Obsolete ("Use 'GetChapterMetadataGroups'.")]
[Obsolete ("Use GetChapterMetadataGroups")]
public virtual AVMetadataItem[] ChapterMetadataGroups (NSLocale forLocale, AVMetadataItem[] commonKeys)
{
return null;
@ -33,7 +33,7 @@ namespace XamCore.AVFoundation {
partial class AVAssetTrack {
[Obsolete ("Use 'GetAssociatedTracks'.")]
[Obsolete ("Use GetAssociatedTracks")]
public virtual NSString GetAssociatedTracksOfType (NSString avAssetTrackTrackAssociationType)
{
return null;
@ -42,7 +42,7 @@ namespace XamCore.AVFoundation {
partial class AVMutableCompositionTrack {
[Obsolete ("Use 'InsertTimeRanges' overload accepting an 'NSValue' array.")]
[Obsolete ("Use InsertTimeRanges overload accepting an NSValue array")]
public virtual bool InsertTimeRanges (NSValue cmTimeRanges, AVAssetTrack[] tracks, CMTime startTime, out NSError error)
{
return InsertTimeRanges (new NSValue [] { cmTimeRanges }, tracks, startTime, out error);
@ -52,7 +52,7 @@ namespace XamCore.AVFoundation {
partial class AVCaptureAudioDataOutputSampleBufferDelegate {
[Obsolete ("This member only exists for 'AVCaptureVideoDataOutputSampleBufferDelegate'.")]
[Obsolete ("This member only exists for AVCaptureVideoDataOutputSampleBufferDelegate")]
public virtual void DidDropSampleBuffer (AVCaptureOutput captureOutput, CMSampleBuffer sampleBuffer, AVCaptureConnection connection)
{
}
@ -60,7 +60,7 @@ namespace XamCore.AVFoundation {
static partial class AVCaptureAudioDataOutputSampleBufferDelegate_Extensions {
[Obsolete ("This member only exists for 'AVCaptureVideoDataOutputSampleBufferDelegate'.")]
[Obsolete ("This member only exists for AVCaptureVideoDataOutputSampleBufferDelegate")]
public static void DidDropSampleBuffer (IAVCaptureAudioDataOutputSampleBufferDelegate This, AVCaptureOutput captureOutput, CMSampleBuffer sampleBuffer, AVCaptureConnection connection)
{
}
@ -68,17 +68,9 @@ namespace XamCore.AVFoundation {
#endif
#if !XAMCORE_4_0
partial class AVCaptureInputPort {
[Obsolete ("Valid instance of this type cannot be directly created.")]
public AVCaptureInputPort ()
{
}
}
partial class AVAudioChannelLayout {
[Obsolete ("Valid instance of this type cannot be directly created.")]
[Obsolete ("Valid instance of this type cannot be directly created")]
public AVAudioChannelLayout ()
{
}
@ -86,7 +78,7 @@ namespace XamCore.AVFoundation {
partial class AVAudioConnectionPoint {
[Obsolete ("Valid instance of this type cannot be directly created.")]
[Obsolete ("Valid instance of this type cannot be directly created")]
public AVAudioConnectionPoint ()
{
}
@ -94,8 +86,8 @@ namespace XamCore.AVFoundation {
#if TVOS
// tvOS removed some types - we need to keep stubs of them for binary compatibility
[Obsolete ("Removed in tvOS 10.")]
[Deprecated (PlatformName.TvOS, 10, 0, PlatformArchitecture.None)]
[Obsolete ("Removed in tvOS 10")]
[Deprecated (PlatformName.TvOS, 10, 0, PlatformArchitecture.None, "Removed in tvOS 10")]
public class AVAssetDownloadDelegate : NSObject, IAVAssetDownloadDelegate {
public AVAssetDownloadDelegate ()
{
@ -160,13 +152,13 @@ namespace XamCore.AVFoundation {
}
}
[Obsolete ("Removed in tvOS 10.")]
[Deprecated (PlatformName.TvOS, 10, 0, PlatformArchitecture.None)]
[Obsolete ("Removed in tvOS 10")]
[Deprecated (PlatformName.TvOS, 10, 0, PlatformArchitecture.None, "Removed in tvOS 10")]
public interface IAVAssetDownloadDelegate : INativeObject, IDisposable, INSUrlSessionTaskDelegate, INSUrlSessionDelegate {
}
[Obsolete ("Removed in tvOS 10.")]
[Deprecated (PlatformName.TvOS, 10, 0, PlatformArchitecture.None)]
[Obsolete ("Removed in tvOS 10")]
[Deprecated (PlatformName.TvOS, 10, 0, PlatformArchitecture.None, "Removed in tvOS 10")]
public static class AVAssetDownloadDelegate_Extensions {
public static void DidFinishDownloadingToUrl (this IAVAssetDownloadDelegate This, NSUrlSession session, AVAssetDownloadTask assetDownloadTask, NSUrl location)
@ -185,8 +177,8 @@ namespace XamCore.AVFoundation {
}
}
[Obsolete ("Removed in tvOS 10.")]
[Deprecated (PlatformName.TvOS, 10, 0, PlatformArchitecture.None)]
[Obsolete ("Removed in tvOS 10")]
[Deprecated (PlatformName.TvOS, 10, 0, PlatformArchitecture.None, "Removed in tvOS 10")]
public class AVAssetDownloadTask : NSUrlSessionTask {
public override IntPtr ClassHandle {
@ -250,8 +242,8 @@ namespace XamCore.AVFoundation {
}
}
[Obsolete ("Removed in tvOS 10.")]
[Deprecated (PlatformName.TvOS, 10, 0, PlatformArchitecture.None)]
[Obsolete ("Removed in tvOS 10")]
[Deprecated (PlatformName.TvOS, 10, 0, PlatformArchitecture.None, "Removed in tvOS 10")]
public class AVAssetDownloadUrlSession : NSUrlSession {
public new static NSUrlSession SharedSession {
@ -288,7 +280,7 @@ namespace XamCore.AVFoundation {
throw new NotImplementedException ();
}
[Obsolete ("Use the overload with a 'INSUrlSessionDelegate' parameter.")]
[Obsolete ("Use the overload with a `INSUrlSessionDelegate` parameter.")]
public new static NSUrlSession FromConfiguration (NSUrlSessionConfiguration configuration, NSUrlSessionDelegate sessionDelegate, NSOperationQueue delegateQueue)
{
throw new NotImplementedException ();
@ -395,6 +387,104 @@ namespace XamCore.AVFoundation {
}
}
[Obsolete ("Removed in tvOS 10")]
[Deprecated (PlatformName.TvOS, 10, 0, PlatformArchitecture.None, "Removed in tvOS 10")]
public class AVAudioInputNode : AVAudioIONode, IAVAudio3DMixing, IAVAudioMixing, IAVAudioStereoMixing {
public override IntPtr ClassHandle {
get {
throw new NotImplementedException ();
}
}
public virtual float Obstruction {
get {
throw new NotImplementedException ();
}
set {
throw new NotImplementedException ();
}
}
public virtual float Occlusion {
get {
throw new NotImplementedException ();
}
set {
throw new NotImplementedException ();
}
}
public virtual float Pan {
get {
throw new NotImplementedException ();
}
set {
throw new NotImplementedException ();
}
}
public virtual Vector3 Position {
get {
throw new NotImplementedException ();
}
set {
throw new NotImplementedException ();
}
}
public virtual float Rate {
get {
throw new NotImplementedException ();
}
set {
throw new NotImplementedException ();
}
}
public virtual AVAudio3DMixingRenderingAlgorithm RenderingAlgorithm {
get {
throw new NotImplementedException ();
}
set {
throw new NotImplementedException ();
}
}
public virtual float ReverbBlend {
get {
throw new NotImplementedException ();
}
set {
throw new NotImplementedException ();
}
}
public virtual float Volume {
get {
throw new NotImplementedException ();
}
set {
throw new NotImplementedException ();
}
}
[EditorBrowsable (EditorBrowsableState.Advanced)]
protected AVAudioInputNode (NSObjectFlag t) : base (t)
{
throw new NotImplementedException ();
}
[EditorBrowsable (EditorBrowsableState.Advanced)]
protected internal AVAudioInputNode (IntPtr handle) : base (handle)
{
}
public virtual AVAudioMixingDestination DestinationForMixer (AVAudioNode mixer, nuint bus)
{
throw new NotImplementedException ();
}
}
#endif // TVOS
#endif // !XAMCORE_4_0
}

41
src/AVFoundation/AVDepthData.cs
Просмотреть файл

@ -1,41 +0,0 @@
//
// AVDepthData.cs
//
// Authors:
// Alex Soto (alexsoto@microsoft.com)
//
// Copyright 2017 Xamarin Inc.
//
#if !WATCH
using System;
using XamCore.Foundation;
using XamCore.ObjCRuntime;
using XamCore.CoreVideo;
using XamCore.ImageIO;
namespace XamCore.AVFoundation {
public partial class AVDepthData {
public static AVDepthData Create (CGImageAuxiliaryDataInfo dataInfo, out NSError error)
{
return Create (dataInfo.Dictionary, out error);
}
public CVPixelFormatType [] AvailableDepthDataTypes {
get {
var values = WeakAvailableDepthDataTypes;
if (values == null)
return null;
var count = values.Length;
var arr = new CVPixelFormatType [count];
for (int i = 0; i < count; i++)
arr [i] = (CVPixelFormatType) values [i].UInt32Value; // CVPixelFormatType is uint.
return arr;
}
}
}
}
#endif

13
src/AVFoundation/AVOutputSettingsAssistant.cs
Просмотреть файл

@ -43,19 +43,6 @@ namespace XamCore.AVFoundation {
return FromPreset (_Preset3840x2160);
}
}
public AVOutputSettingsAssistant PresetHevc1920x1080 {
get {
return FromPreset (_PresetHevc1920x1080);
}
}
public AVOutputSettingsAssistant PresetHevc3840x2160 {
get {
return FromPreset (_PresetHevc3840x2160);
}
}
}
}

46
src/AVFoundation/AVPlayerLooper.cs
Просмотреть файл

@ -1,46 +0,0 @@
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if !WATCH
using XamCore.Foundation;
using XamCore.CoreFoundation;
using XamCore.AudioToolbox;
using XamCore.ObjCRuntime;
using System;
namespace XamCore.AVFoundation {
public partial class AVPlayerLooper {
#if !XAMCORE_4_0 // This API got introduced in Xcode 8.0 binding but is not currently present nor in Xcode 8.3 or Xcode 9.0 needs research
bool loopingEnabled = true;
[Obsolete ("This selector does not exist in the header and was wrongly added.")]
public virtual bool LoopingEnabled {
get {
return loopingEnabled;
}
}
#endif
}
}
#endif // !WATCH

142
src/AVFoundation/Enums.cs
Просмотреть файл

@ -803,11 +803,7 @@ namespace XamCore.AVFoundation {
[TV (10, 2), Mac (10, 12, 4), iOS (10, 3), NoWatch]
public enum AVContentKeySystem {
[Field ("AVContentKeySystemFairPlayStreaming")]
FairPlayStreaming = 0,
[TV (11, 0), NoWatch, Mac (10, 13), iOS (11, 0)]
[Field ("AVContentKeySystemClearKey")]
AVContentKeySystemClearKey = 1,
FairPlayStreaming,
}
// Convience enum for native string values
@ -840,141 +836,5 @@ namespace XamCore.AVFoundation {
AppleM4A = 8, // AVAssetExportPresetAppleM4A
[Field ("AVAssetExportPresetPassthrough")]
Passthrough = 9, // AVAssetExportPresetPassthrough
[iOS (11, 0), Mac (10, 13)]
[Field ("AVOutputSettingsPresetHEVC1920x1080")]
PresetHevc1920x1080 = 11,
[iOS (11, 0), Mac (10, 13)]
[Field ("AVOutputSettingsPresetHEVC3840x2160")]
PresetHevc3840x2160 = 12,
}
[TV (11,0), NoWatch, iOS (11,0)]
[Native]
public enum AVDepthDataAccuracy : nint {
Relative = 0,
Absolute = 1,
}
[Watch (4,0), TV (11,0), Mac (10,13), iOS (11,0)]
[Native]
public enum AVAudioEngineManualRenderingMode : nint {
Offline = 0,
Realtime = 1
}
[Watch (4,0), TV (11,0), Mac (10,13), iOS (11,0)]
[Native]
public enum AVAudioEngineManualRenderingStatus : nint {
Error = -1,
Success = 0,
InsufficientDataFromInputNode = 1,
CannotDoInCurrentContext = 2
}
[TV (11,0), NoWatch, Mac (10,13), iOS (11,0)]
[Native]
public enum AVAudioSessionRouteSharingPolicy : nuint {
Default = 0,
LongForm = 1,
Independent = 2
}
[Watch (4,0), TV (11,0), Mac (10,13), iOS (11,0)]
[Native]
public enum AVAudioPlayerNodeCompletionCallbackType : nint {
Consumed = 0,
Rendered = 1,
PlayedBack = 2
}
[Watch (4,0), TV (11,0), Mac (10,13), iOS (11,0)]
public enum AVAudioEngineManualRenderingError
{
InvalidMode = -80800,
Initialized = -80801,
NotRunning = -80802,
}
[NoTV, iOS (11,0)]
[NoWatch]
[Native]
public enum AVCaptureLensStabilizationStatus : nint
{
Unsupported = 0,
Off = 1,
Active = 2,
OutOfRange = 3,
Unavailable = 4
}
[NoWatch, NoTV, iOS (11,0)]
[Native]
public enum AVCaptureOutputDataDroppedReason : nint
{
None = 0,
LateData = 1,
OutOfBuffers = 2,
Discontinuity = 3,
}
[TV (11, 0), NoWatch, Mac (10, 13), iOS (11, 0)]
public enum AVVideoApertureMode {
[Field ("AVVideoApertureModeCleanAperture")]
CleanAperture = 0,
[Field ("AVVideoApertureModeProductionAperture")]
ProductionAperture = 1,
[Field ("AVVideoApertureModeEncodedPixels")]
EncodedPixels = 2,
}
/*
// Enum values are present in header but missing rdar filed at: https://bugreport.apple.com/web/?problemID=34184435
[NoWatch, NoTV, NoMac, iOS (11, 0)]
public enum AVAssetDownloadedAssetEvictionPriority {
[Field ("AVAssetDownloadedAssetEvictionPriorityDefault")]
Default = 0,
[Field ("AVAssetDownloadedAssetEvictionPriorityImportant")]
Important = 1,
}
*/
[NoWatch, iOS (11, 0), TV (11,0), Mac (10,13)]
public enum AVAssetWriterInputMediaDataLocation {
[Field ("AVAssetWriterInputMediaDataLocationInterleavedWithMainMediaData")]
InterleavedWithMainMediaData = 0,
[Field ("AVAssetWriterInputMediaDataLocationBeforeMainMediaDataNotInterleaved")]
BeforeMainMediaDataNotInterleaved = 1,
}
[TV (11, 0), NoWatch, Mac (10, 13), iOS (11, 0)]
public enum AVVideoCodecType {
[Field ("AVVideoCodecTypeH264")]
H264 = 0,
[Field ("AVVideoCodecTypeJPEG")]
Jpeg = 1,
[Field ("AVVideoCodecTypeAppleProRes422")]
AppleProRes422 = 3,
[Field ("AVVideoCodecTypeAppleProRes4444")]
AppleProRes4444 = 4,
[Field ("AVVideoCodecTypeHEVC")]
Hevc = 5,
}
[TV (11,0), NoWatch, iOS (11,0)]
[Native]
public enum AVDepthDataQuality : nint {
Low = 0,
High = 1
}
}

2
src/Accounts/Enums.cs
Просмотреть файл

@ -29,7 +29,7 @@ namespace XamCore.Accounts {
#if XAMCORE_3_0
MissingTransportMessageId,
#else
[Obsolete ("Use 'MissingTransportMessageId'.")]
[Obsolete ("Use MissingTransportMessageId")]
MissingMessageID,
#pragma warning disable 618 // MissingMessageID is obsolete
MissingTransportMessageId = MissingMessageID,

4
src/AddressBook/ABAddressBook.cs
Просмотреть файл

@ -39,7 +39,7 @@ using XamCore.CoreFoundation;
using XamCore.ObjCRuntime;
namespace XamCore.AddressBook {
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
public class ExternalChangeEventArgs : EventArgs {
public ExternalChangeEventArgs (ABAddressBook addressBook, NSDictionary info)
{
@ -91,7 +91,7 @@ namespace XamCore.AddressBook {
}
}
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
public class ABAddressBook : INativeObject, IDisposable, IEnumerable<ABRecord> {
public static readonly NSString ErrorDomain;

4
src/AddressBook/ABEnums.cs
Просмотреть файл

@ -34,7 +34,7 @@ using XamCore.CoreFoundation;
using XamCore.ObjCRuntime;
namespace XamCore.AddressBook {
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
[Native]
[ErrorDomain ("ABAddressBookErrorDomain")]
public enum ABAddressBookError : nint {
@ -42,7 +42,7 @@ namespace XamCore.AddressBook {
OperationNotPermittedByUserError
}
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
[Native]
public enum ABAuthorizationStatus : nint {
NotDetermined = 0,

2
src/AddressBook/ABGroup.cs
Просмотреть файл

@ -63,7 +63,7 @@ namespace XamCore.AddressBook {
}
}
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
public class ABGroup : ABRecord, IEnumerable<ABRecord> {
[DllImport (Constants.AddressBookLibrary)]

12
src/AddressBook/ABMultiValue.cs
Просмотреть файл

@ -94,7 +94,7 @@ namespace XamCore.AddressBook {
}
}
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
public struct ABMultiValueEntry<T>
{
ABMultiValue<T> self;
@ -166,7 +166,7 @@ namespace XamCore.AddressBook {
}
}
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
public class ABMultiValue<T> : INativeObject, IDisposable, IEnumerable<ABMultiValueEntry<T>>
{
IntPtr handle;
@ -286,7 +286,7 @@ namespace XamCore.AddressBook {
}
}
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
public class ABMutableMultiValue<T> : ABMultiValue<T>
{
internal ABMutableMultiValue (IntPtr handle)
@ -331,7 +331,7 @@ namespace XamCore.AddressBook {
}
}
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
public class ABMutableDateMultiValue : ABMutableMultiValue<NSDate> {
public ABMutableDateMultiValue ()
: base (ABMultiValue.CreateMutable (ABPropertyType.MultiDateTime))
@ -339,7 +339,7 @@ namespace XamCore.AddressBook {
}
}
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
public class ABMutableDictionaryMultiValue : ABMutableMultiValue<NSDictionary> {
public ABMutableDictionaryMultiValue ()
: base (ABMultiValue.CreateMutable (ABPropertyType.MultiDictionary))
@ -347,7 +347,7 @@ namespace XamCore.AddressBook {
}
}
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
public class ABMutableStringMultiValue : ABMutableMultiValue<string> {
public ABMutableStringMultiValue ()
: base (ABMultiValue.CreateMutable (ABPropertyType.MultiString),

42
src/AddressBook/ABPerson.cs
Просмотреть файл

@ -39,19 +39,19 @@ using XamCore.Foundation;
using XamCore.ObjCRuntime;
namespace XamCore.AddressBook {
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
public enum ABPersonSortBy : uint /* uint32_t */ {
FirstName = 0,
LastName = 1,
}
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
public enum ABPersonCompositeNameFormat : uint /* uint32_t */ {
FirstNameFirst = 0,
LastNameFirst = 1,
}
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
public enum ABPersonProperty {
Address,
Birthday,
@ -80,7 +80,7 @@ namespace XamCore.AddressBook {
SocialProfile
}
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
[Native]
[iOS (4,1)]
public enum ABPersonImageFormat : nint_compat_int {
@ -88,7 +88,7 @@ namespace XamCore.AddressBook {
OriginalSize = 2
}
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
static class ABPersonPropertyId {
public static int Address {get; private set;}
@ -223,7 +223,7 @@ namespace XamCore.AddressBook {
}
}
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
public static class ABPersonAddressKey {
public static NSString City {get; private set;}
@ -257,7 +257,7 @@ namespace XamCore.AddressBook {
}
}
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
public static class ABPersonDateLabel {
public static NSString Anniversary {get; private set;}
@ -280,14 +280,14 @@ namespace XamCore.AddressBook {
}
}
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
public enum ABPersonKind {
None,
Organization,
Person,
}
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
static class ABPersonKindId {
public static NSNumber Organization {get; private set;}
public static NSNumber Person {get; private set;}
@ -330,7 +330,7 @@ namespace XamCore.AddressBook {
}
}
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
static class ABPersonSocialProfile {
public static readonly NSString URLKey;
public static readonly NSString ServiceKey;
@ -353,7 +353,7 @@ namespace XamCore.AddressBook {
}
}
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
public static class ABPersonSocialProfileService
{
public static readonly NSString Twitter;
@ -384,7 +384,7 @@ namespace XamCore.AddressBook {
}
}
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
public static class ABPersonPhoneLabel {
public static NSString HomeFax {get; private set;}
public static NSString iPhone {get; private set;}
@ -421,7 +421,7 @@ namespace XamCore.AddressBook {
}
}
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
public static class ABPersonInstantMessageService {
public static NSString Aim {get; private set;}
public static NSString Icq {get; private set;}
@ -463,7 +463,7 @@ namespace XamCore.AddressBook {
}
}
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
public static class ABPersonInstantMessageKey {
public static NSString Service {get; private set;}
public static NSString Username {get; private set;}
@ -488,7 +488,7 @@ namespace XamCore.AddressBook {
}
}
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
public static class ABPersonUrlLabel {
public static NSString HomePage {get; private set;}
@ -511,7 +511,7 @@ namespace XamCore.AddressBook {
}
}
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
public static class ABPersonRelatedNamesLabel {
public static NSString Assistant {get; private set;}
public static NSString Brother {get; private set;}
@ -554,7 +554,7 @@ namespace XamCore.AddressBook {
}
}
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
public static class ABLabel {
public static NSString Home {get; private set;}
public static NSString Other {get; private set;}
@ -581,7 +581,7 @@ namespace XamCore.AddressBook {
}
}
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
public class ABPerson : ABRecord, IComparable, IComparable<ABPerson> {
[DllImport (Constants.AddressBookLibrary)]
extern static IntPtr ABPersonCreate ();
@ -1089,7 +1089,7 @@ namespace XamCore.AddressBook {
}
}
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
public class SocialProfile : DictionaryContainer
{
public SocialProfile ()
@ -1147,7 +1147,7 @@ namespace XamCore.AddressBook {
}
}
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
public class InstantMessageService : DictionaryContainer
{
public InstantMessageService ()
@ -1190,7 +1190,7 @@ namespace XamCore.AddressBook {
}
}
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
public class PersonAddress : DictionaryContainer
{
public PersonAddress ()

6
src/AddressBook/ABRecord.cs
Просмотреть файл

@ -37,14 +37,14 @@ using XamCore.Foundation;
using XamCore.ObjCRuntime;
namespace XamCore.AddressBook {
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
public enum ABRecordType : uint /* uint32_t */ {
Person = 0,
Group = 1,
Source = 2
}
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
public enum ABPropertyType : uint /* uint32_t */ {
Invalid = 0,
String = 0x1,
@ -59,7 +59,7 @@ namespace XamCore.AddressBook {
MultiDictionary = ABMultiValue.Mask | Dictionary,
}
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
public abstract class ABRecord : INativeObject, IDisposable {
public const int InvalidRecordId = -1;

8
src/AddressBook/ABSource.cs
Просмотреть файл

@ -39,7 +39,7 @@ using XamCore.ObjCRuntime;
namespace XamCore.AddressBook {
// note: not a true flag
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
public enum ABSourceType : int /* typedef int */ {
Local = 0x0,
Exchange = 0x1,
@ -52,7 +52,7 @@ namespace XamCore.AddressBook {
SearchableMask = 0x01000000
};
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
public class ABSource : ABRecord {
#if !XAMCORE_2_0
[Advice ("Use ABSourceType.SearchableMask")]
@ -82,13 +82,13 @@ namespace XamCore.AddressBook {
}
}
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
public enum ABSourceProperty {
Name,
Type,
}
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
static class ABSourcePropertyId {
public static int Name { get; private set;}

2
src/AddressBookUI/ABAddressFormatting.cs
Просмотреть файл

@ -16,7 +16,7 @@ using XamCore.ObjCRuntime;
namespace XamCore.AddressBookUI {
// http://developer.apple.com/library/ios/#DOCUMENTATION/AddressBookUI/Reference/AddressBookUI_Functions/Reference/reference.html#//apple_ref/c/func/ABCreateStringWithAddressDictionary
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
static public class ABAddressFormatting {
[DllImport (Constants.AddressBookUILibrary)]

4
src/AddressBookUI/ABNewPersonViewController.cs
Просмотреть файл

@ -14,7 +14,7 @@ using XamCore.ObjCRuntime;
namespace XamCore.AddressBookUI {
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
public class ABNewPersonCompleteEventArgs : EventArgs {
public ABNewPersonCompleteEventArgs (ABPerson person)
@ -53,7 +53,7 @@ namespace XamCore.AddressBookUI {
#endif
}
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
partial class ABNewPersonViewController {
ABPerson displayedPerson;

10
src/AddressBookUI/ABPeoplePickerNavigationController.cs
Просмотреть файл

@ -14,7 +14,7 @@ using XamCore.UIKit;
using XamCore.ObjCRuntime;
namespace XamCore.AddressBookUI {
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
public class ABPeoplePickerSelectPersonEventArgs : EventArgs {
public ABPeoplePickerSelectPersonEventArgs (ABPerson person)
@ -27,7 +27,7 @@ namespace XamCore.AddressBookUI {
public bool Continue {get; set;}
}
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
public class ABPeoplePickerPerformActionEventArgs : ABPeoplePickerSelectPersonEventArgs {
public ABPeoplePickerPerformActionEventArgs (ABPerson person, ABPersonProperty property, int? identifier)
@ -41,7 +41,7 @@ namespace XamCore.AddressBookUI {
public int? Identifier {get; private set;}
}
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
public class ABPeoplePickerSelectPerson2EventArgs : EventArgs {
public ABPeoplePickerSelectPerson2EventArgs (ABPerson person)
@ -52,7 +52,7 @@ namespace XamCore.AddressBookUI {
public ABPerson Person {get; private set;}
}
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
public class ABPeoplePickerPerformAction2EventArgs : ABPeoplePickerSelectPerson2EventArgs {
public ABPeoplePickerPerformAction2EventArgs (ABPerson person, ABPersonProperty property, int? identifier)
@ -170,7 +170,7 @@ namespace XamCore.AddressBookUI {
}
}
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
partial class ABPeoplePickerNavigationController {
DisplayedPropertiesCollection displayedProperties;

4
src/AddressBookUI/ABPersonViewController.cs
Просмотреть файл

@ -13,7 +13,7 @@ using XamCore.Foundation;
using XamCore.ObjCRuntime;
namespace XamCore.AddressBookUI {
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
public class ABPersonViewPerformDefaultActionEventArgs : EventArgs {
public ABPersonViewPerformDefaultActionEventArgs (ABPerson person, ABPersonProperty property, int? identifier)
{
@ -56,7 +56,7 @@ namespace XamCore.AddressBookUI {
}
}
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
partial class ABPersonViewController {
ABPerson displayedPerson;

4
src/AddressBookUI/ABUnknownPersonViewController.cs
Просмотреть файл

@ -13,7 +13,7 @@ using XamCore.Foundation;
using XamCore.ObjCRuntime;
namespace XamCore.AddressBookUI {
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
public class ABUnknownPersonCreatedEventArgs : EventArgs {
public ABUnknownPersonCreatedEventArgs (ABPerson person)
@ -65,7 +65,7 @@ namespace XamCore.AddressBookUI {
}
}
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
partial class ABUnknownPersonViewController {
ABPerson displayedPerson;

2
src/AddressBookUI/DisplayedPropertiesCollection.cs
Просмотреть файл

@ -18,7 +18,7 @@ namespace XamCore.AddressBookUI {
delegate T ABFunc<T> ();
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Contacts' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Contacts API instead")]
public class DisplayedPropertiesCollection : ICollection<ABPersonProperty> {
ABFunc<NSNumber[]> g;

124
src/AppKit/Enums.cs
Просмотреть файл

@ -116,7 +116,7 @@ namespace XamCore.AppKit {
DestinationAtop,
XOR,
PlusDarker,
[Availability (Introduced = Platform.Mac_10_0, Deprecated = Platform.Mac_10_10, Message = "Use NSCompositeSourceOver instead.")]
[Availability (Introduced = Platform.Mac_10_0, Deprecated = Platform.Mac_10_10, Message = "Use NSCompositeSourceOver instead")]
Highlight,
PlusLighter,
[Mac (10,10)] Multiply,
@ -138,11 +138,7 @@ namespace XamCore.AppKit {
[Native]
public enum NSBackingStore : nuint_compat_int {
[Availability (Introduced = Platform.Mac_10_0, Deprecated = Platform.Mac_10_13, Message = "Use 'Buffered' instead.")]
Retained,
[Availability (Introduced = Platform.Mac_10_0, Deprecated = Platform.Mac_10_13, Message = "Use 'Buffered' instead.")]
Nonretained,
Buffered,
Retained, Nonretained, Buffered
}
[Native]
@ -198,7 +194,7 @@ namespace XamCore.AppKit {
#if !XAMCORE_3_0
[Flags]
[Native]
[Obsolete ("Use NSFileWrapperReadingOptions in Foundation instead.")]
[Obsolete ("Use NSFileWrapperReadingOptions in Foundation instead")]
public enum NSFileWrapperReadingOptions : nuint_compat_int {
Immediate = 1, WithoutMapping = 2
}
@ -227,7 +223,7 @@ namespace XamCore.AppKit {
#if !XAMCORE_4_0
[Native]
[Availability (Introduced = Platform.Mac_10_0, Deprecated = Platform.Mac_10_10, Message = "Use formatters instead.")]
[Availability (Introduced = Platform.Mac_10_0, Deprecated = Platform.Mac_10_10, Message = "Use formatters instead")]
public enum NSType : nuint_compat_int {
Any = 0,
Int = 1,
@ -933,7 +929,7 @@ namespace XamCore.AppKit {
[Native]
public enum NSWindowButton : nuint_compat_int {
CloseButton, MiniaturizeButton, ZoomButton, ToolbarButton, DocumentIconButton, DocumentVersionsButton = 6,
[Availability (Deprecated = Platform.Mac_10_12, Message = "The standard window button for FullScreenButton is always null; use ZoomButton instead.")]
[Availability (Deprecated = Platform.Mac_10_12, Message = "The standard window button for FullScreenButton is always null; use ZoomButton instead")]
FullScreenButton
}
@ -1448,7 +1444,6 @@ namespace XamCore.AppKit {
[Flags]
#if !XAMCORE_4_0
[Native]
[Availability (Deprecated = Platform.Mac_10_11, Message = "Use 'NSGlyphProperty' instead.")]
public enum NSGlyphStorageOptions : nuint_compat_int {
#else
public enum NSGlyphStorageOptions : int
@ -1459,7 +1454,7 @@ namespace XamCore.AppKit {
}
#if !XAMCORE_4_0
[Availability (Deprecated = Platform.Mac_10_11, Message = "Use NSTextStorageEditActions instead.")]
[Availability (Deprecated = Platform.Mac_10_11, Message = "Use NSTextStorageEditActions instead")]
[Flags]
[Native]
public enum NSTextStorageEditedFlags : nuint_compat_int {
@ -1563,10 +1558,7 @@ namespace XamCore.AppKit {
MonoSpaceTrait = (1 << 10),
VerticalTrait = (1 << 11),
UIOptimizedTrait = (1 << 12),
[Mac (10,13)]
TraitTightLeading = 1 << 15,
[Mac (10,13)]
TraitLooseLeading = 1 << 16,
UnknownClass = 0 << 28,
OldStyleSerifsClass = 1 << 28,
TransitionalSerifsClass = 2 << 28,
@ -1616,7 +1608,7 @@ namespace XamCore.AppKit {
Default, Regular, Small
}
[Availability (Introduced = Platform.Mac_10_0, Deprecated = Platform.Mac_10_10, Message = "Use NSAlertButtonReturn instead.")]
[Availability (Introduced = Platform.Mac_10_0, Deprecated = Platform.Mac_10_10, Message = "Use NSAlertButtonReturn instead")]
#if !XAMCORE_4_0
[Native]
public enum NSAlertType : nint {
@ -1630,7 +1622,7 @@ namespace XamCore.AppKit {
}
#if !XAMCORE_4_0
[Availability (Introduced = Platform.Mac_10_0, Deprecated = Platform.Mac_10_10, Message = "Use NSModalResponse instead.")]
[Availability (Introduced = Platform.Mac_10_0, Deprecated = Platform.Mac_10_10, Message = "Use NSModalResponse instead")]
[Native]
public enum NSPanelButtonType : nint {
Cancel, Ok
@ -2120,7 +2112,6 @@ namespace XamCore.AppKit {
// These constants specify the possible states of a drawer.
[Native]
[Deprecated (PlatformName.MacOSX, 10, 13, message: "Use 'NSSplitViewController' instead.")]
public enum NSDrawerState : nuint_compat_int {
Closed = 0,
Opening = 1,
@ -2157,7 +2148,6 @@ namespace XamCore.AppKit {
}
[Native]
[Availability (Deprecated = Platform.Mac_10_11, Message = "Use 'NSGlyphProperty' instead.")]
public enum NSGlyphInscription : nuint_compat_int {
Base, Below, Above, Overstrike, OverBelow
}
@ -2745,100 +2735,4 @@ namespace XamCore.AppKit {
Center
}
[Mac (10,13)]
public enum NSFontError : int {
AssetDownloadError = 66304,
ErrorMinimum = 66304,
ErrorMaximum = 66335,
}
[Mac (10,13)]
[Native]
public enum NSAccessibilityAnnotationPosition : nint {
FullRange,
Start,
End,
}
[Mac (10,13)]
[Native]
public enum NSAccessibilityCustomRotorSearchDirection : nint {
Previous,
Next,
}
[Mac (10,13)]
[Native]
public enum NSAccessibilityCustomRotorType : nint {
Custom = 0,
Any = 1,
Annotation,
BoldText,
Heading,
HeadingLevel1,
HeadingLevel2,
HeadingLevel3,
HeadingLevel4,
HeadingLevel5,
HeadingLevel6,
Image,
ItalicText,
Landmark,
Link,
List,
MisspelledWord,
Table,
TextField,
UnderlinedText,
VisitedLink,
}
[Mac (10, 13)]
[Native]
public enum NSColorType : nint {
ComponentBased,
Pattern,
Catalog,
}
[Mac (10,13)]
[Native]
[Flags]
public enum NSFontAssetRequestOptions : nuint {
UsesStandardUI = 1 << 0,
}
[Mac (10,13)]
[Native]
[Flags]
public enum NSFontPanelModeMask : nuint {
Face = 1 << 0,
Size = 1 << 1,
Collection = 1 << 2,
UnderlineEffect = 1 << 8,
StrikethroughEffect = 1 << 9,
TextColorEffect = 1 << 10,
DocumentColorEffect = 1 << 11,
ShadowEffect = 1 << 12,
AllEffects = (nuint)0XFFF00,
StandardModes = (nuint)0XFFFF,
AllModes = (nuint)0XFFFFFFFF,
}
[Mac (10,13)]
[Native]
public enum NSLevelIndicatorPlaceholderVisibility : nint {
Automatic = 0,
Always = 1,
WhileEditing = 2,
}
[Mac (10,13)]
[Native]
public enum NSSegmentDistribution : nint {
Fit = 0,
Fill,
FillEqually,
FillProportionally,
}
}

2
src/AppKit/NSApplication.cs
Просмотреть файл

@ -132,7 +132,7 @@ namespace XamCore.AppKit {
DiscardEvents ((nuint)(ulong) mask, lastEvent);
}
[Obsolete ("This method does nothing.")]
[Obsolete ("This method does nothing")]
public static void RestoreWindow (string identifier, Foundation.NSCoder state, NSWindowCompletionHandler onCompletion)
{
}

22
src/AppKit/NSBezierPath.cs
Просмотреть файл

@ -88,7 +88,7 @@ namespace XamCore.AppKit {
_SetAssociatedPointsAtIndex ((IntPtr)ptr, index);
}
public unsafe void Append (CGPoint[] points)
public unsafe void AppendPathWithPoints (CGPoint[] points)
{
if (points == null)
throw new ArgumentNullException ("points");
@ -99,14 +99,6 @@ namespace XamCore.AppKit {
_AppendPathWithPoints ((IntPtr)ptr, points.Length);
}
#if !XAMCORE_4_0
[Obsolete ("Use 'Append (CGPoint[])' instead.")]
public unsafe void AppendPathWithPoints (CGPoint[] points)
{
Append (points);
}
[Obsolete ("Use 'Append (uint[], NSFont)' instead.")]
public unsafe void AppendPathWithGlyphs (uint[] glyphs, NSFont font)
{
if (glyphs == null)
@ -117,18 +109,6 @@ namespace XamCore.AppKit {
fixed (uint* ptr = &glyphs [0])
_AppendPathWithGlyphs ((IntPtr)ptr, glyphs.Length, font);
}
#endif
[Mac (10,13)]
public unsafe void Append (uint[] glyphs, NSFont font)
{
if (glyphs == null)
throw new ArgumentNullException ("glyphs");
if (glyphs.Length < 1)
throw new ArgumentException ("glyphs array is empty");
fixed (uint* ptr = &glyphs [0])
_AppendBezierPathWithCGGlyphs ((IntPtr)ptr, glyphs.Length, font);
}
}
}

2
src/AppKit/NSComboBox.cs
Просмотреть файл

@ -5,7 +5,7 @@ using XamCore.CoreGraphics;
namespace XamCore.AppKit {
public partial class NSComboBox {
[Obsolete ("Use GetItemObject instead.")]
[Obsolete ("Use GetItemObject instead")]
public virtual NSComboBox GetItem (nint index)
{
return (NSComboBox) GetItemObject (index);

56
src/AppKit/NSFont.cs
Просмотреть файл

@ -1,56 +0,0 @@
using System;
using System.Runtime.InteropServices;
using XamCore.CoreFoundation;
using XamCore.Foundation;
using XamCore.ObjCRuntime;
using XamCore.CoreGraphics;
using XamCore.CoreAnimation;
using XamCore.CoreText;
using CGGlyph = System.UInt16;
namespace XamCore.AppKit {
public partial class NSFont
{
public static NSFont FromCTFont (CTFont font)
{
if (font == null)
return null;
return new NSFont (font.Handle);
}
[Mac (10,13)]
public unsafe CGRect [] GetBoundingRects (CGGlyph [] glyphs)
{
if (glyphs == null)
throw new ArgumentNullException ("glyphs");
if (glyphs.Length < 1)
throw new ArgumentException ("glyphs array is empty");
CGRect [] bounds = new CGRect [glyphs.Length];
fixed (CGRect* boundsPtr = &bounds [0]) {
fixed (CGGlyph* glyphsPtr = &glyphs [0]) {
_GetBoundingRects ((IntPtr)boundsPtr, (IntPtr)glyphsPtr, (nuint)glyphs.Length);
}
}
return bounds;
}
[Mac (10,13)]
public unsafe CGSize [] GetAdvancements (CGGlyph [] glyphs)
{
if (glyphs == null)
throw new ArgumentNullException ("glyphs");
if (glyphs.Length < 1)
throw new ArgumentException ("glyphs array is empty");
CGSize [] advancements = new CGSize [glyphs.Length];
fixed (CGSize* advancementsPtr = &advancements [0]) {
fixed (CGGlyph* glyphsPtr = &glyphs [0]) {
_GetAdvancements ((IntPtr)advancementsPtr, (IntPtr)glyphsPtr, (nuint)glyphs.Length);
}
}
return advancements;
}
}
}

4
src/AppKit/NSTextContainer.cs
Просмотреть файл

@ -6,7 +6,7 @@ namespace XamCore.AppKit
{
public partial class NSTextContainer
{
[Availability (Obsoleted = Platform.Mac_10_11, Message = "Use NSTextContainer.FromSize instead.")]
[Availability (Obsoleted = Platform.Mac_10_11, Message = "Use NSTextContainer.FromSize instead")]
public NSTextContainer (CGSize size)
{
Handle = InitWithContainerSize (size);
@ -26,7 +26,7 @@ namespace XamCore.AppKit
return new NSTextContainer (size, false);
}
[Availability (Deprecated = Platform.Mac_10_11, Message = "Use NSTextContainer.FromSize instead.")]
[Availability (Deprecated = Platform.Mac_10_11, Message = "Use NSTextContainer.FromSize instead")]
public static NSTextContainer FromContainerSize (CGSize containerSize)
{
return new NSTextContainer (containerSize, true);

4
src/AssetsLibrary/ALAsset.cs
Просмотреть файл

@ -17,12 +17,12 @@ using XamCore.MediaPlayer;
namespace XamCore.AssetsLibrary {
// internally used (not exposed by ObjC)
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Photos' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Photos API instead")]
public enum ALAssetType {
Video, Photo, Unknown
}
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Photos' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Photos API instead")]
public partial class ALAsset {
public ALAssetType AssetType {
get {

2
src/AssetsLibrary/ALAssetsGroup.cs
Просмотреть файл

@ -16,7 +16,7 @@ using XamCore.MediaPlayer;
namespace XamCore.AssetsLibrary {
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Photos' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Photos API instead")]
public partial class ALAssetsGroup {
public NSString Name {
get {

2
src/AssetsLibrary/ALAssetsLibrary.cs
Просмотреть файл

@ -20,7 +20,7 @@ using XamCore.MediaPlayer;
namespace XamCore.AssetsLibrary
{
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Photos' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Photos API instead")]
public partial class ALAssetsLibrary
{
[Obsolete ("Use the overload that takes a CGImage instead")]

8
src/AssetsLibrary/Enums.cs
Просмотреть файл

@ -4,7 +4,7 @@ using XamCore.ObjCRuntime;
namespace XamCore.AssetsLibrary {
// NSInteger -> ALAssetsLibrary.h
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Photos' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Photos API instead")]
[Native]
public enum ALAssetOrientation : nint {
Up,
@ -18,7 +18,7 @@ namespace XamCore.AssetsLibrary {
}
// NSUInteger -> ALAssetsLibrary.h
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Photos' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Photos API instead")]
[Native]
[Flags]
public enum ALAssetsGroupType : nuint {
@ -32,7 +32,7 @@ namespace XamCore.AssetsLibrary {
}
// untyped enum -> ALAssetsLibrary.h
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Photos' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Photos API instead")]
[ErrorDomain ("ALAssetsLibraryErrorDomain")]
public enum ALAssetsError {
UnknownError = -1,
@ -48,7 +48,7 @@ namespace XamCore.AssetsLibrary {
}
// NSInteger -> ALAssetsLibrary.h
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use the 'Photos' API instead.")]
[Availability (Deprecated = Platform.iOS_9_0, Message = "Use Photos API instead")]
[Native]
public enum ALAuthorizationStatus : nint {
NotDetermined,

4
src/AudioToolbox/AudioFile.cs
Просмотреть файл

@ -46,8 +46,6 @@ namespace XamCore.AudioToolbox {
AIFF = 0x41494646, // AIFF
AIFC = 0x41494643, // AIFC
WAVE = 0x57415645, // WAVE
[NoWatch, iOS (11,0), Mac(10,13), TV (11,0)]
RF64 = 0x52463634, // RF64
SoundDesigner2 = 0x53643266, // Sd2f
Next = 0x4e655854, // NeXT
MP3 = 0x4d504733, // MPG3
@ -62,8 +60,6 @@ namespace XamCore.AudioToolbox {
ThreeGP = 0x33677070, // 3gpp
ThreeGP2 = 0x33677032, // 3gp2
AMR = 0x616d7266, // amrf
[NoWatch, iOS (11,0), Mac(10,13), TV (11,0)]
FLAC = 0x666c6163, // flac
}
public enum AudioFileError {// Implictly cast to OSType in AudioFile.h

2
src/AudioToolbox/AudioQueue.cs
Просмотреть файл

@ -262,7 +262,7 @@ namespace XamCore.AudioToolbox {
[StructLayout(LayoutKind.Explicit)]
public struct AudioQueueParameterEvent {
[FieldOffset(0)]
[Advice ("Use Parameter.")]
[Advice ("Use Parameter")]
public uint ID;
[FieldOffset(0)]

2
src/AudioToolbox/AudioSession.cs
Просмотреть файл

@ -194,7 +194,7 @@ namespace XamCore.AudioToolbox {
}
}
[Availability (Deprecated = Platform.iOS_7_0, Message = "Use 'AVAudioSession' instead.")]
[Availability (Deprecated = Platform.iOS_7_0, Message = "Use AVAudioSession instead")]
public static class AudioSession {
static bool initialized;
public static event EventHandler Interrupted;

37
src/AudioToolbox/AudioType.cs
Просмотреть файл

@ -78,8 +78,6 @@ namespace XamCore.AudioToolbox {
MicrosoftGSM = 0x6d730031,
AES3 = 0x61657333, // 'aes3'
EnhancedAES3 = 0x65632d33, // 'ec-3'
Flac = 0x666c6163, // 'flac'
Opus = 0x6f707573, // 'opus'
}
[Flags]
@ -144,7 +142,7 @@ namespace XamCore.AudioToolbox {
const int AudioUnitSampleFractionBits = 24;
const AudioFormatFlags AudioFormatFlagIsBigEndian = 0;
[Availability (Deprecated = Platform.iOS_8_0 | Platform.Mac_10_10, Message = "Canonical is no longer encouraged, since fixed-point no longer provides a performance advantage over floating point. 'AudioFormatFlagsNativeFloatPacked' is preffered instead.")]
[Availability (Deprecated = Platform.iOS_8_0 | Platform.Mac_10_10, Message = "Canonical is no longer encouraged, since fixed-point no longer provides a performance advantage over floating point. AudioFormatFlagsNativeFloatPacked is preffered instead")]
public static readonly AudioFormatFlags AudioFormatFlagsAudioUnitCanonical = AudioFormatFlags.IsSignedInteger | (BitConverter.IsLittleEndian ? 0 : AudioFormatFlags.IsBigEndian) |
AudioFormatFlags.IsPacked | AudioFormatFlags.IsNonInterleaved | (AudioFormatFlags) (AudioUnitSampleFractionBits << (int)AudioFormatFlags.LinearPCMSampleFractionShift);
@ -426,31 +424,7 @@ namespace XamCore.AudioToolbox {
Discrete_13 = (1<<16) | 13,
Discrete_14 = (1<<16) | 14,
Discrete_15 = (1<<16) | 15,
Discrete_65535 = (1<<16) | 65535,
// HOA ACN channels
// generic
HoaAcn = 500,
// numbered
HoaAcn0 = (2 << 16) | 0,
HoaAcn1 = (2 << 16) | 1,
HoaAcn2 = (2 << 16) | 2,
HoaAcn3 = (2 << 16) | 3,
HoaAcn4 = (2 << 16) | 4,
HoaAcn5 = (2 << 16) | 5,
HoaAcn6 = (2 << 16) | 6,
HoaAcn7 = (2 << 16) | 7,
HoaAcn8 = (2 << 16) | 8,
HoaAcn9 = (2 << 16) | 9,
HoaAcn10 = (2 << 16) | 10,
HoaAcn11 = (2 << 16) | 11,
HoaAcn12 = (2 << 16) | 12,
HoaAcn13 = (2 << 16) | 13,
HoaAcn14 = (2 << 16) | 14,
HoaAcn15 = (2 << 16) | 15,
HoaAcn65024 = (2 << 16) | 65024
Discrete_65535 = (1<<16) | 65535
}
[Flags]
@ -689,10 +663,7 @@ namespace XamCore.AudioToolbox {
DTS_8_0_B = (179<<16) | 8,
DTS_8_1_A = (180<<16) | 9,
DTS_8_1_B = (181<<16) | 9,
DTS_6_1_D = (182<<16) | 7,
HOA_ACN_SN3D = (190U<<16),
HOA_ACN_N3D = (191U<<16),
DTS_6_1_D = (182<<16) | 7,
DiscreteInOrder = (147<<16) | 0, // needs to be ORed with the actual number of channels
Unknown = 0xFFFF0000 // needs to be ORed with the actual number of channels
@ -1140,6 +1111,7 @@ namespace XamCore.AudioToolbox {
}
}
#if !WATCH
[StructLayout(LayoutKind.Sequential)]
public struct AudioBuffer {
public int NumberChannels;
@ -1164,4 +1136,5 @@ namespace XamCore.AudioToolbox {
public /* UInt16 */ ushort Reserved;
}
#endif
#endif // !WATCH
}

226
src/AudioUnit/AudioComponent.cs
Просмотреть файл

@ -38,177 +38,6 @@ using XamCore.Foundation;
namespace XamCore.AudioUnit
{
#if !COREBUILD
// keys are not constants and had to be found in AudioToolbox.framework/Headers/AudioComponent.h
[NoWatch, NoTV, Mac (10,13), iOS (11,0)]
public partial class ResourceUsageInfo : DictionaryContainer {
static NSString userClientK = new NSString ("iokit.user-client");
static NSString globalNameK = new NSString ("mach-lookup.global-name");
static NSString networkClientK = new NSString ("network.client");
static NSString exceptionK = new NSString ("temporary-exception.files.all.read-write");
public ResourceUsageInfo () : base () {}
public ResourceUsageInfo (NSDictionary dic) : base (dic) {}
public string[] IOKitUserClient {
get {
var array = GetNativeValue<NSArray> (userClientK);
if (array == null )
return null;
return NSArray.StringArrayFromHandle (array.Handle);
}
set {
if (value == null)
RemoveValue (userClientK);
else
SetArrayValue (userClientK, value);
}
}
public string[] MachLookUpGlobalName {
get {
var array = GetNativeValue<NSArray> (globalNameK);
if (array == null)
return null;
return NSArray.StringArrayFromHandle (array.Handle);
}
set {
if (value == null)
RemoveValue (globalNameK);
else
SetArrayValue (globalNameK, value);
}
}
public bool? NetworkClient {
get {
return GetBoolValue (networkClientK);
}
set {
SetBooleanValue (networkClientK, value);
}
}
public bool? TemporaryExceptionReadWrite {
get {
return GetBoolValue (exceptionK);
}
set {
SetBooleanValue (exceptionK, value);
}
}
}
// keys are not constants and had to be found in AudioToolbox.framework/Headers/AudioComponent.h
[NoWatch, NoTV, Mac (10,13), iOS (11,0)]
public partial class AudioComponentInfo : DictionaryContainer {
static NSString typeK = new NSString ("type");
static NSString subtypeK = new NSString ("subtype");
static NSString manufacturerK = new NSString ("manufacturer");
static NSString nameK = new NSString ("name");
static NSString versionK = new NSString ("version");
static NSString factoryFunctionK = new NSString ("factoryFunction");
static NSString sandboxSafeK = new NSString ("sandboxSafe");
static NSString resourceUsageK = new NSString ("resourceUsage");
static NSString tagsK = new NSString ("tags");
public AudioComponentInfo () : base () {}
public AudioComponentInfo (NSDictionary dic) : base (dic) {}
public string Type {
get {
return GetStringValue (typeK);
}
set {
SetStringValue (typeK, value);
}
}
public string Subtype {
get {
return GetStringValue (subtypeK);
}
set {
SetStringValue (subtypeK, value);
}
}
public string Manufacturer {
get {
return GetStringValue (manufacturerK);
}
set {
SetStringValue (manufacturerK, value);
}
}
public string Name {
get {
return GetStringValue (nameK);
}
set {
SetStringValue (nameK, value);
}
}
public nuint? Version {
get {
return GetNUIntValue (versionK);
}
set {
SetNumberValue (versionK, value);
}
}
public string FactoryFunction {
get {
return GetStringValue (factoryFunctionK);
}
set {
SetStringValue (factoryFunctionK, value);
}
}
public bool? SandboxSafe {
get {
return GetBoolValue (sandboxSafeK);
}
set {
SetBooleanValue (sandboxSafeK, value);
}
}
public ResourceUsageInfo ResourceUsage {
get {
return GetStrongDictionary<ResourceUsageInfo> (resourceUsageK);
}
set {
SetNativeValue (resourceUsageK, value?.Dictionary, true);
}
}
public string[] Tags {
get {
var array = GetNativeValue<NSArray> (tagsK);
if (array == null)
return null;
return NSArray.StringArrayFromHandle (array.Handle);
}
set {
if (value == null)
RemoveValue (tagsK);
else
SetArrayValue (tagsK, value);
}
}
}
#endif
public class AudioComponent : INativeObject {
#if !COREBUILD
internal IntPtr handle;
@ -395,59 +224,6 @@ namespace XamCore.AudioUnit
return new XamCore.AppKit.NSImage (AudioComponentGetIcon (handle));
}
#endif
#if IOS || MONOMAC
[NoWatch, NoTV, Mac (10,13), iOS (11,0)]
[DllImport (Constants.AudioUnitLibrary)]
static extern int /* OSStatus */ AudioUnitExtensionSetComponentList (IntPtr /* CFString */ extensionIdentifier, /* CFArrayRef */ IntPtr audioComponentInfo);
[NoWatch, NoTV, Mac (10,13), iOS (11,0)]
[DllImport (Constants.AudioUnitLibrary)]
static extern /* CFArrayRef */ IntPtr AudioUnitExtensionCopyComponentList (IntPtr /* CFString */ extensionIdentifier);
[NoWatch, NoTV, Mac (10,13), iOS (11,0)]
public AudioComponentInfo[] ComponentList {
get {
using (var cfString = new CFString (Name)) {
var cHandle = AudioUnitExtensionCopyComponentList (cfString.Handle);
if (cHandle == IntPtr.Zero)
return null;
using (var nsArray = Runtime.GetNSObject<NSArray> (cHandle, owns: true)) {
if (nsArray == null)
return null;
// make things easier for developers since we do not know how to have an implicit conversion from NSObject to AudioComponentInfo
var dics = NSArray.FromArray <NSDictionary> (nsArray);
var result = new AudioComponentInfo [dics.Length];
for (var i = 0; i < result.Length; i++) {
result [i] = new AudioComponentInfo (dics[i]);
}
return result;
}
}
}
set {
if (value == null)
throw new ArgumentNullException (nameof (value));
using (var cfString = new CFString (Name)) {
var dics = new NSDictionary [value.Length];
for (var i = 0; i < value.Length; i++) {
dics [i] = value [i].Dictionary;
}
using (var array = NSArray.FromNSObjects (dics)) {
var result = (AudioConverterError) AudioUnitExtensionSetComponentList (cfString.Handle, array.Handle);
switch (result) {
case AudioConverterError.None:
return;
default:
throw new InvalidOperationException ($"ComponentList could not be set, error {result.ToString ()}");
}
}
}
}
}
#endif
#endif // !COREBUILD
}
@ -465,4 +241,4 @@ namespace XamCore.AudioUnit
public static NSString ValidationResult = new NSString ("ValidationResult");
}
#endif
}
}

4
src/AudioUnit/AudioComponentDescription.cs
Просмотреть файл

@ -142,10 +142,10 @@ namespace XamCore.AudioUnit
Spacial=0x3364656d, // Same as Embedded3D
#if MONOMAC
Stereo=0x736d7872, // 'smxr'
[Availability (Deprecated = Platform.Mac_10_10, Message = "Use 'Spacial' instead.")]
[Availability (Deprecated = Platform.Mac_10_10, Message = "Use Spacial instead")]
ThreeD=0x33646d78, // '3dmx'
#else
[Availability (Deprecated = Platform.iOS_8_0, Message = "Use 'Spacial' instead.")]
[Availability (Deprecated = Platform.iOS_8_0, Message = "Use Spacial instead")]
Embedded3D=0x3364656d, // '3dem'
#endif
}

65
src/AudioUnit/AudioUnit.cs
Просмотреть файл

@ -63,10 +63,6 @@ namespace XamCore.AudioUnit
Initialized = -10849,
InvalidOfflineRender = -10848,
Unauthorized = -10847,
[iOS (11,0), Mac (10,13, onlyOn64: true), TV (11,0), NoWatch]
MidiOutputBufferFull = -66753,
[iOS (11,0), Mac (10,13, onlyOn64: true), TV (11,0), NoWatch]
ExtensionNotFound = -66744,
}
public enum AudioComponentStatus { // Implictly cast to OSType
@ -356,50 +352,6 @@ namespace XamCore.AudioUnit
System = 0
}
public enum AUParameterEventType : uint
{
Immediate = 1,
Ramped = 2,
}
[StructLayout (LayoutKind.Sequential)]
public struct AudioUnitParameterEvent
{
public uint Scope;
public uint Element;
public uint Parameter;
public AUParameterEventType EventType;
[StructLayout (LayoutKind.Explicit)]
public struct EventValuesStruct
{
[StructLayout (LayoutKind.Sequential)]
public struct RampStruct
{
public int StartBufferOffset;
public uint DurationInFrames;
public float StartValue;
public float EndValue;
}
[FieldOffset (0)]
public RampStruct Ramp;
[StructLayout (LayoutKind.Sequential)]
public struct ImmediateStruct
{
public uint BufferOffset;
public float Value;
}
[FieldOffset (0)]
public ImmediateStruct Immediate;
}
public EventValuesStruct EventValues;
}
public class AudioUnit : IDisposable, XamCore.ObjCRuntime.INativeObject
{
internal IntPtr handle;
@ -508,7 +460,7 @@ namespace XamCore.AudioUnit
#endif
#if !XAMCORE_3_0
[Obsolete ("Use 'SetFormat' instead as it has the ability of returning a status code.")]
[Obsolete ("Use SetFormat instead as it has the ability of returning a status code")]
public void SetAudioFormat(XamCore.AudioToolbox.AudioStreamBasicDescription audioFormat, AudioUnitScopeType scope, uint audioUnitElement = 0)
{
var err = AudioUnitSetProperty(handle,
@ -549,7 +501,7 @@ namespace XamCore.AudioUnit
#if !XAMCORE_3_0 || MONOMAC
#if !MONOMAC
[Obsolete ("This API is not available on iOS.")]
[Obsolete ("This API is not available on iOS")]
#endif
public static uint GetCurrentInputDevice ()
{
@ -921,11 +873,6 @@ namespace XamCore.AudioUnit
return AudioUnitSetParameter (handle, type, scope, audioUnitElement, value, 0);
}
public AudioUnitStatus ScheduleParameter (AudioUnitParameterEvent inParameterEvent, uint inNumParamEvents)
{
return AudioUnitScheduleParameters (handle, inParameterEvent, inNumParamEvents);
}
public void Dispose()
{
Dispose (true);
@ -1085,9 +1032,6 @@ namespace XamCore.AudioUnit
static extern AudioUnitStatus AudioUnitSetParameter (IntPtr inUnit, AudioUnitParameterType inID, AudioUnitScopeType inScope,
uint inElement, float inValue, uint inBufferOffsetInFrames);
[DllImport (Constants.AudioUnitLibrary)]
static extern AudioUnitStatus AudioUnitScheduleParameters (IntPtr inUnit, AudioUnitParameterEvent inParameterEvent, uint inNumParamEvents);
#if MONOMAC
[DllImport (Constants.AudioUnitLibrary)]
static extern int AudioObjectGetPropertyData (
@ -2015,8 +1959,7 @@ namespace XamCore.AudioUnit
Hrtf = 2,
SoundField = 3,
VectorBasedPanning = 4,
StereoPassThrough = 5,
HrtfHQ = 6,
StereoPassThrough = 5
}
public enum AU3DMixerAttenuationCurve : uint
@ -2130,7 +2073,7 @@ namespace XamCore.AudioUnit
}
#if !XAMCORE_4_0 && !COREBUILD
#if XAMCORE_2_0 || !MONOMAC
[Obsolete ("Use 'AUImplementorStringFromValueCallback' instead.")]
[Obsolete ("Use AUImplementorStringFromValueCallback instead")]
public delegate NSString _AUImplementorStringFromValueCallback (AUParameter param, IntPtr value);
#endif
#endif

2
src/CFNetwork/CFHTTPStream.cs
Просмотреть файл

@ -20,7 +20,7 @@ namespace XamCore.CoreServices {
#endif
// all fields constants that this is using are deprecated in Xcode 7
[Availability (Deprecated = Platform.iOS_9_0 | Platform.Mac_10_11, Message = "Use 'NSUrlSession'.")]
[Availability (Deprecated = Platform.iOS_9_0 | Platform.Mac_10_11, Message = "Use NSUrlSession")]
public partial class CFHTTPStream : CFReadStream {
internal CFHTTPStream (IntPtr handle)

4
src/CloudKit/CKCompat.cs
Просмотреть файл

@ -12,7 +12,7 @@ namespace XamCore.CloudKit {
#if !XAMCORE_4_0 && !WATCH
public partial class CKOperation {
[Obsoleted (PlatformName.iOS, 9,3, message: "Do not use; this API was removed and will always return 0.")]
[Obsoleted (PlatformName.iOS, 9,3, message: "Do not use; this API was removed in iOS 9.3 and will always return 0")]
public virtual ulong ActivityStart ()
{
return 0;
@ -21,7 +21,7 @@ namespace XamCore.CloudKit {
public partial class CKNotificationID {
[Obsolete ("This type is not meant to be created by user code.")]
[Obsolete ("This type is not meant to be created by user code")]
public CKNotificationID ()
{
}

19
src/CloudKit/Enums.cs
Просмотреть файл

@ -80,7 +80,6 @@ namespace XamCore.CloudKit
[iOS (10,0), TV (10,0), Mac (10,12)] ReferenceViolation = 31,
[iOS (10,0), TV (10,0), Mac (10,12)] ManagedAccountRestricted = 32,
[iOS (10,0), TV (10,0), Mac (10,12)] ParticipantMayNeedVerification = 33,
[iOS (11,0), TV (11,0), Mac (10,13), Watch (4,0)] ResponseLost = 34,
}
// NSInteger -> CKModifyRecordsOperation.h
@ -103,7 +102,7 @@ namespace XamCore.CloudKit
Query = 1,
RecordZone = 2,
ReadNotification = 3,
[iOS (10,0), TV (10,0), Mac (10,12), Watch (3,0)] Database = 4,
[iOS (10,0), TV (10,0), Mac (10,12)] Database = 4,
}
// NSInteger -> CKNotification.h
@ -153,7 +152,7 @@ namespace XamCore.CloudKit
// NSInteger -> CKSubscription.h
[NoWatch]
[Availability (Introduced = Platform.iOS_8_0 | Platform.Mac_10_10 , Deprecated = Platform.iOS_10_0 | Platform.Mac_10_12, Message = "Use 'CKQuerySubscriptionOptions' instead.")]
[Availability (Introduced = Platform.iOS_8_0 | Platform.Mac_10_10 , Deprecated = Platform.iOS_10_0 | Platform.Mac_10_12, Message = "Use CKQuerySubscriptionOptions instead")]
[Flags]
[Native]
public enum CKSubscriptionOptions : nuint {
@ -216,18 +215,4 @@ namespace XamCore.CloudKit
RecordDeletion = 1 << 2,
FiresOnce = 1 << 3,
}
[Watch (4,0), TV (11,0), Mac (10,13), iOS (11,0)]
[Native]
public enum CKOperationGroupTransferSize : nint
{
Unknown,
Kilobytes,
Megabytes,
TensOfMegabytes,
HundredsOfMegabytes,
Gigabytes,
TensOfGigabytes,
HundredsOfGigabytes,
}
}

12
src/Constants.iOS.cs.in
Просмотреть файл

@ -37,7 +37,6 @@ namespace MonoTouch {
public const string MapKitLibrary = "/System/Library/Frameworks/MapKit.framework/MapKit";
public const string GameKitLibrary = "/System/Library/Frameworks/GameKit.framework/GameKit";
public const string EventKitLibrary = "/System/Library/Frameworks/EventKit.framework/EventKit";
public const string EventKitUILibrary = "/System/Library/Frameworks/EventKitUI.framework/EventKitUI";
public const string ImageIOLibrary = "/System/Library/Frameworks/ImageIO.framework/ImageIO";
public const string AssetsLibraryLibrary = "/System/Library/Frameworks/AssetsLibrary.framework/AssetsLibrary";
public const string CoreVideoLibrary = "/System/Library/Frameworks/CoreVideo.framework/CoreVideo";
@ -106,16 +105,5 @@ namespace MonoTouch {
public const string UserNotificationsUILibrary = "/System/Library/Frameworks/UserNotificationsUI.framework/UserNotificationsUI";
public const string IntentsLibrary = "/System/Library/Frameworks/Intents.framework/Intents";
public const string IntentsUILibrary = "/System/Library/Frameworks/IntentsUI.framework/IntentsUI";
// iOS 11.0
public const string ARKitLibrary = "/System/Library/Frameworks/ARKit.framework/ARKit";
public const string CoreNFCLibrary = "/System/Library/Frameworks/CoreNFC.framework/CoreNFC";
public const string DeviceCheckLibrary = "/System/Library/Frameworks/DeviceCheck.framework/DeviceCheck";
public const string IdentityLookupLibrary = "/System/Library/Frameworks/IdentityLookup.framework/IdentityLookup";
public const string CoreMLLibrary = "/System/Library/Frameworks/CoreML.framework/CoreML";
public const string VisionLibrary = "/System/Library/Frameworks/Vision.framework/Vision";
public const string FileProviderLibrary = "/System/Library/Frameworks/FileProvider.framework/FileProvider";
public const string FileProviderUILibrary = "/System/Library/Frameworks/FileProviderUI.framework/FileProviderUI";
public const string IOSurfaceLibrary = "/System/Library/Frameworks/IOSurface.framework/IOSurface";
public const string PdfKitLibrary = "/System/Library/Frameworks/PDFKit.framework/PDFKit";
}
}

7
src/Constants.mac.cs.in
Просмотреть файл

@ -125,12 +125,5 @@ namespace MonoMac {
public const string PhotosLibrary = "/System/Library/Frameworks/Photos.framework/Photos";
public const string IntentsLibrary = "/System/Library/Frameworks/Intents.framework/Intents";
public const string MediaPlayerLibrary = "/System/Library/Frameworks/MediaPlayer.framework/MediaPlayer";
// macOS 10.13
public const string CoreMLLibrary = "/System/Library/Frameworks/CoreML.framework/CoreML";
public const string VisionLibrary = "/System/Library/Frameworks/Vision.framework/Vision";
public const string IOSurfaceLibrary = "/System/Library/Frameworks/IOSurface.framework/IOSurface";
public const string PhotosUILibrary = "/System/Library/Frameworks/Photos.framework/PhotosUI";
public const string ExternalAccessoryLibrary = "/System/Library/Frameworks/ExternalAccessory.framework/ExternalAccessory";
}
}

5
src/Constants.tvos.cs.in
Просмотреть файл

@ -69,10 +69,5 @@ namespace ObjCRuntime {
// tvOS 10.2
public const string VideoToolboxLibrary = "/System/Library/Frameworks/VideoToolbox.framework/VideoToolbox";
// tvOS 11.0
public const string DeviceCheckLibrary = "/System/Library/Frameworks/DeviceCheck.framework/DeviceCheck";
public const string CoreMLLibrary = "/System/Library/Frameworks/CoreML.framework/CoreML";
public const string VisionLibrary = "/System/Library/Frameworks/Vision.framework/Vision";
public const string IOSurfaceLibrary = "/System/Library/Frameworks/IOSurface.framework/IOSurface";
}
}

7
src/Constants.watch.cs.in
Просмотреть файл

@ -42,11 +42,6 @@ namespace ObjCRuntime {
// WatchOS 3.2
public const string IntentsLibrary = "/System/Library/Frameworks/Intents.framework/Intents";
// WatchOS 4.0
public const string CoreBluetoothLibrary = "/System/Library/Frameworks/CoreBluetooth.framework/CoreBluetooth";
public const string CoreMLLibrary = "/System/Library/Frameworks/CoreML.framework/CoreML";
public const string CoreVideoLibrary = "/System/Library/Frameworks/CoreVideo.framework/CoreVideo";
public const string VisionLibrary = "/System/Library/Frameworks/Vision.framework/Vision";
}
}

8
src/Contacts/CNEnums.cs
Просмотреть файл

@ -94,13 +94,7 @@ namespace XamCore.Contacts {
ValidationTypeMismatch = 301,
ValidationConfigurationError = 302,
PredicateInvalid = 400,
PolicyViolation = 500,
[iOS (11,0), Mac (10,13)]
ClientIdentifierInvalid = 600,
[iOS (11,0), Mac (10,13)]
ClientIdentifierDoesNotExist = 601,
[iOS (11,0), Mac (10,13)]
VCardMalformed = 700,
PolicyViolation = 500
}
// NSInteger -> CNPostalAddressFormatter.h

2
src/Contacts/CNObsolete.cs
Просмотреть файл

@ -13,7 +13,7 @@ namespace XamCore.Contacts {
public static partial class CNGroup_PredicatesExtension {
#if !MONOMAC
[Obsolete ("This API is only available on macOS 10.11+.")]
[Obsolete ("This API is only available on OSX 10.11+")]
public static Foundation.NSPredicate GetPredicateForSubgroupsInGroup (CNGroup This, string parentGroupIdentifier)
{
return null;

55
src/Contacts/CNPostalAddress.cs Normal file
Просмотреть файл

@ -0,0 +1,55 @@
//
// CNPostalAddress.cs: Implements some nicer methods for CNPostalAddress
//
// Authors:
// Alex Soto <alex.soto@xamarin.com>
//
// Copyright 2015 Xamarin Inc. All rights reserved.
//
using System;
using XamCore.Foundation;
namespace XamCore.Contacts {
#if XAMCORE_2_0 // The Contacts framework uses generics heavily, which is only supported in Unified (for now at least)
// Strong typed Keys to enum
public enum CNPostalAddressKeyOption {
Street,
City,
State,
PostalCode,
Country,
IsoCountryCode
}
public partial class CNPostalAddress {
public static string LocalizeProperty (CNPostalAddressKeyOption option)
{
var srvc = LocalizeOptionsToNSString (option);
return LocalizeProperty (srvc);
}
static NSString LocalizeOptionsToNSString (CNPostalAddressKeyOption option)
{
switch (option) {
case CNPostalAddressKeyOption.Street:
return CNPostalAddressKey.Street;
case CNPostalAddressKeyOption.City:
return CNPostalAddressKey.City;
case CNPostalAddressKeyOption.State:
return CNPostalAddressKey.State;
case CNPostalAddressKeyOption.PostalCode:
return CNPostalAddressKey.PostalCode;
case CNPostalAddressKeyOption.Country:
return CNPostalAddressKey.Country;
case CNPostalAddressKeyOption.IsoCountryCode:
return CNPostalAddressKey.IsoCountryCode;
default:
throw new ArgumentOutOfRangeException ("option");
}
}
}
#endif // XAMCORE_2_0
}

11
src/CoreAnimation/CAEnums.cs
Просмотреть файл

@ -31,7 +31,6 @@ using System;
using XamCore.Foundation;
using System.Runtime.InteropServices;
using XamCore.CoreGraphics;
using XamCore.ObjCRuntime;
namespace XamCore.CoreAnimation {
@ -48,16 +47,6 @@ namespace XamCore.CoreAnimation {
TopBottomEdges = TopEdge | BottomEdge
}
[NoWatch] // headers not updated
[iOS (11,0)][TV (11,0)][Mac (10,13)]
[Native][Flags]
public enum CACornerMask : nuint {
MinXMinYCorner = 1 << 0,
MaxXMinYCorner = 1 << 1,
MinXMaxYCorner = 1 << 2,
MaxXMaxYCorner = 1 << 3,
}
#if MONOMAC
// untyped enum -> CALayer.h (only on OSX headers)
// note: autoresizingMask is an `unsigned int` @property

1
src/CoreBluetooth/AdvertisementDataOptions.cs
Просмотреть файл

@ -37,7 +37,6 @@ namespace XamCore.CoreBluetooth {
// It's intentionally not called AdvertisementDataOptions because different options
// are valid in different contexts
//
[Watch (4,0)]
[iOS (6,0)]
public class StartAdvertisingOptions : DictionaryContainer
{

10
src/CoreBluetooth/CBUUID.cs
Просмотреть файл

@ -205,15 +205,5 @@ namespace XamCore.CoreBluetooth {
return sb.ToString ();
}
#if MONOMAC
// workaround for 27160443 – Trello: https://trello.com/c/oqB27JA6
// try new constant (10.13+) and fallback to the old/misnamed one
public static NSString CharacteristicValidRangeString {
get {
return CBUUIDCharacteristicValidRangeString ?? CBUUIDValidRangeString;
}
}
#endif
}
}

4
src/CoreBluetooth/CoreBluetooth.cs
Просмотреть файл

@ -113,10 +113,10 @@ namespace XamCore.CoreBluetooth {
}
}
#endif
#if !WATCH && !XAMCORE_4_0
#if !MONOMAC && !XAMCORE_4_0
public partial class CBCentralManager {
public new virtual CBCentralManagerState State {
public virtual CBCentralManagerState State {
get {
return (CBCentralManagerState)base.State;
}

34
src/CoreBluetooth/Enums.cs
Просмотреть файл

@ -13,11 +13,13 @@ using XamCore.ObjCRuntime;
namespace XamCore.CoreBluetooth {
[Mac (10,13)]
[Watch (4,0)]
#if !MONOMAC
[iOS (10,0)]
[Native]
public enum CBManagerState : nint {
#else
internal enum CBManagerState {
#endif
Unknown = 0,
Resetting,
Unsupported,
@ -28,8 +30,7 @@ namespace XamCore.CoreBluetooth {
// NSInteger -> CBCentralManager.h
[Introduced (PlatformName.iOS, 5, 0)]
[Deprecated (PlatformName.iOS, 10, 0, message: "Use 'CBManagerState' instead.")]
[NoWatch]
[Deprecated (PlatformName.iOS, 10, 0, message: "Use CBManagerState instead")]
[Native]
public enum CBCentralManagerState : nint {
Unknown = CBManagerState.Unknown,
@ -42,8 +43,7 @@ namespace XamCore.CoreBluetooth {
// NSInteger -> CBPeripheralManager.h
[Introduced (PlatformName.iOS, 6, 0)]
[Deprecated (PlatformName.iOS, 10, 0, message: "Use 'CBManagerState' instead.")]
[NoWatch]
[Deprecated (PlatformName.iOS, 10, 0, message: "Use CBManagerState instead")]
[Native]
public enum CBPeripheralManagerState : nint {
Unknown = CBManagerState.Unknown,
@ -55,19 +55,16 @@ namespace XamCore.CoreBluetooth {
}
// NSInteger -> CBPeripheralManager.h
[Watch (4,0)]
[Native]
public enum CBPeripheralState : nint {
Disconnected,
Connecting,
Connected,
[iOS (9,0)][Mac (10,13)]
Disconnecting,
Disconnecting
}
#if !XAMCORE_4_0
// NSInteger -> CBPeripheralManager.h
[Watch (4,0)]
[Native]
public enum CBPeripheralManagerAuthorizationStatus : nint {
NotDetermined,
@ -78,7 +75,6 @@ namespace XamCore.CoreBluetooth {
#endif
// NSUInteger -> CBCharacteristic.h
[Watch (4,0)]
[Flags]
[Native]
public enum CBCharacteristicProperties : nuint_compat_int {
@ -90,13 +86,10 @@ namespace XamCore.CoreBluetooth {
Indicate = 32,
AuthenticatedSignedWrites = 64,
ExtendedProperties = 128,
[Mac (10,9)]
NotifyEncryptionRequired = 0x100,
[Mac (10,9)]
IndicateEncryptionRequired = 0x200
}
[Watch (4,0)]
[ErrorDomain ("CBErrorDomain")]
[Native] // NSInteger -> CBError.h
public enum CBError : nint {
@ -111,15 +104,12 @@ namespace XamCore.CoreBluetooth {
PeripheralDisconnected,
UUIDNotAllowed,
AlreadyAdvertising,
[iOS (7,1)][Mac (10,13)]
// iOS7.1
ConnectionFailed,
[iOS (9,0)][Mac (10,13)]
ConnectionLimitReached,
[iOS (11,0)][TV (11,0)][Mac (10,13)]
UnknownDevice,
// iOS 9
ConnectionLimitReached
}
[Watch (4,0)]
[ErrorDomain ("CBATTErrorDomain")]
[Native] // NSInteger -> CBError.h
public enum CBATTError : nint {
@ -144,7 +134,6 @@ namespace XamCore.CoreBluetooth {
}
// NSInteger -> CBPeripheral.h
[Watch (4,0)]
[Native]
public enum CBCharacteristicWriteType : nint {
WithResponse,
@ -152,8 +141,6 @@ namespace XamCore.CoreBluetooth {
}
// NSUInteger -> CBCharacteristic.h
[Mac (10,9)]
[Watch (4,0)]
[Flags]
[Native]
public enum CBAttributePermissions : nuint_compat_int {
@ -164,7 +151,6 @@ namespace XamCore.CoreBluetooth {
}
// NSInteger -> CBPeripheralManager.h
[Watch (4,0)]
[Native]
public enum CBPeripheralManagerConnectionLatency : nint {
Low = 0,

18
src/CoreBluetooth/GuidWrapper.cs
Просмотреть файл

@ -58,8 +58,8 @@ namespace XamCore.CoreBluetooth {
ConnectPeripheral (peripheral, options == null ? null : options.Dictionary);
}
#if !TVOS && !WATCH
[Availability (Introduced = Platform.iOS_5_0, Deprecated = Platform.iOS_7_0, Obsoleted = Platform.iOS_9_0, Message = "Use 'RetrievePeripheralsWithIdentifiers' instead.")]
#if !TVOS
[Availability (Introduced = Platform.iOS_5_0, Deprecated = Platform.iOS_7_0, Obsoleted = Platform.iOS_9_0, Message = "Use RetrievePeripheralsWithIdentifiers instead")]
public void RetrievePeripherals (CBUUID [] peripheralUuids)
{
if (peripheralUuids == null)
@ -83,19 +83,19 @@ namespace XamCore.CoreBluetooth {
#endif
#if !XAMCORE_2_0
[Obsolete ("Use the 'CBUUID' overload since Guid internal memory representation is different.")]
[Obsolete ("Use the CBUUID overload since Guid internal memory representation is different")]
public void RetrievePeripherals (Guid [] peripheralUuids)
{
CFUUID.WithArray (peripheralUuids, "peripheralUuids", x => RetrievePeripherals (x));
}
[Obsolete ("Use the 'CBUUID' overload since Guid internal memory representation is different.")]
[Obsolete ("Use the CBUUID overload since Guid internal memory representation is different")]
public void RetrievePeripherals (Guid peripheralUuid)
{
RetrievePeripherals (new [] { peripheralUuid });
}
[Obsolete ("Use the 'CBUUID' overload since Guid internal memory representation is different.")]
[Obsolete ("Use the CBUUID overload since Guid internal memory representation is different")]
public void ScanForPeripherals (Guid [] serviceUuids, NSDictionary options)
{
if (serviceUuids == null)
@ -104,25 +104,25 @@ namespace XamCore.CoreBluetooth {
CFUUID.WithArray (serviceUuids, "serviceUuids", x => ScanForPeripherals (x, options));
}
[Obsolete ("Use the 'CBUUID' overload since Guid internal memory representation is different.")]
[Obsolete ("Use the CBUUID overload since Guid internal memory representation is different")]
public void ScanForPeripherals (Guid[] serviceUuids, PeripheralScanningOptions options = null)
{
ScanForPeripherals (serviceUuids, options == null ? null : options.Dictionary);
}
[Obsolete ("Use the 'CBUUID' overload since Guid internal memory representation is different.")]
[Obsolete ("Use the CBUUID overload since Guid internal memory representation is different")]
public void ScanForPeripherals (Guid [] serviceUuids)
{
ScanForPeripherals (serviceUuids, null as NSDictionary);
}
[Obsolete ("Use the 'CBUUID' overload since Guid internal memory representation is different.")]
[Obsolete ("Use the CBUUID overload since Guid internal memory representation is different")]
public void ScanForPeripherals (Guid serviceUuid, NSDictionary options)
{
ScanForPeripherals (new [] { serviceUuid }, options);
}
[Obsolete ("Use the 'CBUUID' overload since Guid internal memory representation is different.")]
[Obsolete ("Use the CBUUID overload since Guid internal memory representation is different")]
public void ScanForPeripherals (Guid serviceUuid)
{
ScanForPeripherals (new [] { serviceUuid }, null as NSDictionary);

1
src/CoreBluetooth/PeripheralConnectionOptions.cs
Просмотреть файл

@ -33,7 +33,6 @@ using XamCore.ObjCRuntime;
namespace XamCore.CoreBluetooth {
[Watch (4,0)]
public class PeripheralConnectionOptions : DictionaryContainer
{
#if !COREBUILD

41
src/CoreData/Enums.cs
Просмотреть файл

@ -51,10 +51,6 @@ namespace XamCore.CoreData {
Boolean = 800,
Date = 900,
Binary = 1000,
[iOS (11,0), TV (11,0), Mac (10,13), Watch (4,0)]
Uuid = 1100,
[iOS (11,0), TV (11,0), Mac (10,13), Watch (4,0)]
Uri = 1200,
Transformable = 1800,
ObjectID = 2000
}
@ -151,9 +147,7 @@ namespace XamCore.CoreData {
InvalidDate = 1650,
StringTooLong = 1660,
StringTooShort = 1670,
StringPatternMatching = 1680,
[iOS (11,0), TV (11,0), Mac (10,13), Watch (4,0)]
InvalidUri = 1690,
StringPatternMatching = 1680
}
[Native]
@ -189,37 +183,6 @@ namespace XamCore.CoreData {
MigrationManagerDestinationStore = 134160,
EntityMigrationPolicy = 134170,
InferredMappingModel = 134190,
ExternalRecordImport = 134200,
[iOS (11,0), TV (11,0), Mac (10,3), Watch (4,0)]
HistoryTokenExpired = 134301,
}
[Watch (4,0), TV (11,0), Mac (10,13), iOS (11,0)]
[Native]
public enum NSFetchIndexElementType : nuint
{
Binary,
RTree
}
[Watch (4,0), TV (11,0), Mac (10,13), iOS (11,0)]
[Native]
public enum NSPersistentHistoryChangeType : nint
{
Insert,
Update,
Delete
}
[Watch (4,0), TV (11,0), Mac (10,13), iOS (11,0)]
[Native]
public enum NSPersistentHistoryResultType : nint
{
StatusOnly = 0,
ObjectIds = 1,
Count = 2,
TransactionsOnly = 3,
ChangesOnly = 4,
TransactionsAndChanges = 5
ExternalRecordImport = 134200
}
}

2
src/CoreFoundation/CFStream.cs
Просмотреть файл

@ -244,7 +244,7 @@ namespace XamCore.CoreFoundation {
internal extern static /* CFReadStreamRef __nonnull */ IntPtr CFReadStreamCreateForHTTPRequest (
/* CFAllocatorRef __nullable */ IntPtr alloc, /* CFHTTPMessageRef __nonnull */ IntPtr request);
[Availability (Deprecated = Platform.iOS_9_0 | Platform.Mac_10_11, Message = "Use 'NSUrlSession'.")]
[Availability (Deprecated = Platform.iOS_9_0 | Platform.Mac_10_11, Message = "Use NSUrlSession")]
public static CFHTTPStream CreateForHTTPRequest (CFHTTPMessage request)
{
if (request == null)

14
src/CoreGraphics/CGColorConverter.cs
Просмотреть файл

@ -21,17 +21,17 @@ using XamCore.Foundation;
namespace XamCore.CoreGraphics {
// uint32_t enum -> CGColorConverter.h
[TV (9,2)][Obsoleted (PlatformName.TvOS, 10,0, message: "Replaced by 'CGColorConversionInfoTransformType'.")]
[iOS (9,3)][Obsoleted (PlatformName.iOS, 10,0, message: "Replaced by 'CGColorConversionInfoTransformType'.")]
[Obsolete ("Use 'CGColorConversionInfoTransformType'.")]
[TV (9,2)][Obsoleted (PlatformName.TvOS, 10,0, message: "Replaced by CGColorConversionInfoTransformType. This code does not work on tvOS 10+")]
[iOS (9,3)][Obsoleted (PlatformName.iOS, 10,0, message: "Replaced by CGColorConversionInfoTransformType. This code does not work on iOS 10+")]
[Obsolete ("Use CGColorConversionInfoTransformType")]
public enum CGColorConverterTransformType : uint {
FromSpace,
ToSpace,
ApplySpace
}
[TV (9,2)][Obsoleted (PlatformName.TvOS, 10,0, message: "Replaced by 'GColorConversionInfoTriple'.")]
[iOS (9,3)][Obsoleted (PlatformName.iOS, 10,0, message: "Replaced by 'GColorConversionInfoTriple'.")]
[TV (9,2)][Obsoleted (PlatformName.TvOS, 10,0, message: "Replaced by GColorConversionInfoTriple. This code does not work on tvOS 10+")]
[iOS (9,3)][Obsoleted (PlatformName.iOS, 10,0, message: "Replaced by GColorConversionInfoTriple. This code does not work on iOS 10+")]
[StructLayout (LayoutKind.Sequential)]
public struct CGColorConverterTriple {
public CGColorSpace Space;
@ -40,8 +40,8 @@ namespace XamCore.CoreGraphics {
}
// CGColorConverter.h
[TV (9,2)][Obsoleted (PlatformName.TvOS, 10,0, message: "Replaced by 'CGColorConversionInfo'.")]
[iOS (9,3)][Obsoleted (PlatformName.iOS, 10,0, message: "Replaced by 'CGColorConversionInfo'.")]
[TV (9,2)][Obsoleted (PlatformName.TvOS, 10,0, message: "Replaced by CGColorConversionInfo. This code does not work on tvOS 10+")]
[iOS (9,3)][Obsoleted (PlatformName.iOS, 10,0, message: "Replaced by CGColorConversionInfo. This code does not work on iOS 10+")]
public class CGColorConverter : INativeObject, IDisposable
{
/* invoked by marshallers */

4
src/CoreGraphics/CGColorSpace.cs
Просмотреть файл

@ -66,7 +66,7 @@ namespace XamCore.CoreGraphics {
internal IntPtr handle;
#if !XAMCORE_3_0
[Obsolete ("Use a real 'null' value instead of this managed wrapper over a null native instance.")]
[Obsolete ("Use a real `null` value instead of this managed wrapper over a null native instance")]
#if XAMCORE_2_0
readonly
#endif
@ -143,7 +143,7 @@ namespace XamCore.CoreGraphics {
}
#if !XAMCORE_3_0
[Obsolete ("This method has been renamed 'CreateDeviceCmyk'.")]
[Obsolete ("This method has been renamed CreateDeviceCmyk()")]
[EditorBrowsable (EditorBrowsableState.Never)]
public static /* CGColorSpaceRef */ CGColorSpace CreateDeviceCMYK ()
{

24
src/CoreGraphics/CGContext.cs
Просмотреть файл

@ -970,7 +970,7 @@ namespace XamCore.CoreGraphics {
extern static void CGContextSelectFont (/* CGContextRef */ IntPtr c,
/* const char* __nullable */ string name, /* CGFloat */ nfloat size, CGTextEncoding textEncoding);
[Availability (Deprecated = Platform.iOS_7_0 | Platform.Mac_10_9, Message = "Use the 'CoreText' API instead.")]
[Availability (Deprecated = Platform.iOS_7_0 | Platform.Mac_10_9, Message = "Use the CoreText API instead")]
public void SelectFont (string name, nfloat size, CGTextEncoding textEncoding)
{
CGContextSelectFont (handle, name, size, textEncoding);
@ -1002,7 +1002,7 @@ namespace XamCore.CoreGraphics {
[DllImport (Constants.CoreGraphicsLibrary)]
extern static void CGContextShowText (/* CGContextRef */ IntPtr c, /* const char* __nullable */ string s, /* size_t */ nint length);
[Availability (Deprecated = Platform.iOS_7_0 | Platform.Mac_10_9, Message = "Use the 'CoreText' API instead.")]
[Availability (Deprecated = Platform.iOS_7_0 | Platform.Mac_10_9, Message = "Use the CoreText API instead")]
public void ShowText (string str, int count)
{
if (str == null)
@ -1012,7 +1012,7 @@ namespace XamCore.CoreGraphics {
CGContextShowText (handle, str, count);
}
[Availability (Deprecated = Platform.iOS_7_0 | Platform.Mac_10_9, Message = "Use the 'CoreText' API instead.")]
[Availability (Deprecated = Platform.iOS_7_0 | Platform.Mac_10_9, Message = "Use the CoreText API instead")]
public void ShowText (string str)
{
CGContextShowText (handle, str, str == null ? 0 : str.Length);
@ -1021,7 +1021,7 @@ namespace XamCore.CoreGraphics {
[DllImport (Constants.CoreGraphicsLibrary)]
extern static void CGContextShowText (/* CGContextRef */ IntPtr c, /* const char* __nullable */ byte[] bytes, /* size_t */ nint length);
[Availability (Deprecated = Platform.iOS_7_0 | Platform.Mac_10_9, Message = "Use the 'CoreText' API instead.")]
[Availability (Deprecated = Platform.iOS_7_0 | Platform.Mac_10_9, Message = "Use the CoreText API instead")]
public void ShowText (byte[] bytes, int count)
{
if (bytes == null)
@ -1031,7 +1031,7 @@ namespace XamCore.CoreGraphics {
CGContextShowText (handle, bytes, count);
}
[Availability (Deprecated = Platform.iOS_7_0 | Platform.Mac_10_9, Message = "Use the 'CoreText' API instead.")]
[Availability (Deprecated = Platform.iOS_7_0 | Platform.Mac_10_9, Message = "Use the CoreText API instead")]
public void ShowText (byte[] bytes)
{
CGContextShowText (handle, bytes, bytes == null ? 0 : bytes.Length);
@ -1041,13 +1041,13 @@ namespace XamCore.CoreGraphics {
extern static void CGContextShowTextAtPoint (/* CGContextRef __nullable */ IntPtr c, /* CGFloat */ nfloat x,
/* CGFloat */ nfloat y, /* const char* __nullable */ string str, /* size_t */ nint length);
[Availability (Deprecated = Platform.iOS_7_0 | Platform.Mac_10_9, Message = "Use the 'CoreText' API instead.")]
[Availability (Deprecated = Platform.iOS_7_0 | Platform.Mac_10_9, Message = "Use the CoreText API instead")]
public void ShowTextAtPoint (nfloat x, nfloat y, string str, int length)
{
CGContextShowTextAtPoint (handle, x, y, str, length);
}
[Availability (Deprecated = Platform.iOS_7_0 | Platform.Mac_10_9, Message = "Use the 'CoreText' API instead.")]
[Availability (Deprecated = Platform.iOS_7_0 | Platform.Mac_10_9, Message = "Use the CoreText API instead")]
public void ShowTextAtPoint (nfloat x, nfloat y, string str)
{
CGContextShowTextAtPoint (handle, x, y, str, str == null ? 0 : str.Length);
@ -1070,13 +1070,13 @@ namespace XamCore.CoreGraphics {
extern static void CGContextShowGlyphs (/* CGContextRef __nullable */ IntPtr c,
/* const CGGlyph * __nullable */ ushort [] glyphs, /* size_t */ nint count);
[Availability (Deprecated = Platform.iOS_7_0 | Platform.Mac_10_9, Message = "Use the 'CoreText' API instead.")]
[Availability (Deprecated = Platform.iOS_7_0 | Platform.Mac_10_9, Message = "Use the CoreText API instead")]
public void ShowGlyphs (ushort [] glyphs)
{
CGContextShowGlyphs (handle, glyphs, glyphs == null ? 0 : glyphs.Length);
}
[Availability (Deprecated = Platform.iOS_7_0 | Platform.Mac_10_9, Message = "Use the 'CoreText' API instead.")]
[Availability (Deprecated = Platform.iOS_7_0 | Platform.Mac_10_9, Message = "Use the CoreText API instead")]
public void ShowGlyphs (ushort [] glyphs, int count)
{
if (glyphs == null)
@ -1090,7 +1090,7 @@ namespace XamCore.CoreGraphics {
extern static void CGContextShowGlyphsAtPoint (/* CGContextRef */ IntPtr context, /* CGFloat */ nfloat x,
/* CGFloat */ nfloat y, /* const CGGlyph * __nullable */ ushort [] glyphs, /* size_t */ nint count);
[Availability (Deprecated = Platform.iOS_7_0 | Platform.Mac_10_9, Message = "Use the 'CoreText' API instead.")]
[Availability (Deprecated = Platform.iOS_7_0 | Platform.Mac_10_9, Message = "Use the CoreText API instead")]
public void ShowGlyphsAtPoint (nfloat x, nfloat y, ushort [] glyphs, int count)
{
if (glyphs == null)
@ -1100,7 +1100,7 @@ namespace XamCore.CoreGraphics {
CGContextShowGlyphsAtPoint (handle, x, y, glyphs, count);
}
[Availability (Deprecated = Platform.iOS_7_0 | Platform.Mac_10_9, Message = "Use the 'CoreText' API instead.")]
[Availability (Deprecated = Platform.iOS_7_0 | Platform.Mac_10_9, Message = "Use the CoreText API instead")]
public void ShowGlyphsAtPoint (nfloat x, nfloat y, ushort [] glyphs)
{
CGContextShowGlyphsAtPoint (handle, x, y, glyphs, glyphs == null ? 0 : glyphs.Length);
@ -1111,7 +1111,7 @@ namespace XamCore.CoreGraphics {
/* const CGGlyph * __nullable */ ushort [] glyphs,
/* const CGSize * __nullable */ CGSize [] advances, /* size_t */ nint count);
[Availability (Deprecated = Platform.iOS_7_0 | Platform.Mac_10_9, Message = "Use the 'CoreText' API instead.")]
[Availability (Deprecated = Platform.iOS_7_0 | Platform.Mac_10_9, Message = "Use the CoreText API instead")]
public void ShowGlyphsWithAdvances (ushort [] glyphs, CGSize [] advances, int count)
{
if (glyphs == null)

2
src/CoreGraphics/CGPDFOperatorTable.cs
Просмотреть файл

@ -92,7 +92,7 @@ namespace XamCore.CoreGraphics {
}));
}
[Advice ("Use the nicer SetCallback(string,Action<CGPDFScanner,object>) API when possible.")]
[Advice ("Use the nicer SetCallback(string,Action<CGPDFScanner,object>) API when possible (OSX)")]
#endif
// this API is ugly - but I do not see a better way with the AOT limitation
public void SetCallback (string name, Action<IntPtr,IntPtr> callback)

2
src/CoreImage/CIFilter.cs
Просмотреть файл

@ -643,7 +643,7 @@ namespace XamCore.CoreImage {
}
#if MONOMAC && !XAMCORE_3_0
[Obsolete ("This type has been renamed to CICmykHalftone.")]
[Obsolete ("This type has been renamed to CICmykHalftone")]
public class CICMYKHalftone : CICmykHalftone {
public CICMYKHalftone () {}
public CICMYKHalftone (IntPtr handle) : base (handle) {}

41
src/CoreImage/Enums.cs
Просмотреть файл

@ -22,7 +22,6 @@
//
using System;
using XamCore.ObjCRuntime;
namespace XamCore.CoreImage {
@ -45,14 +44,14 @@ namespace XamCore.CoreImage {
RGBAh = 1,
#if MONOMAC
RGBA16 = 2,
[Obsolete ("This value can not be shared across Mac/iOS binaries, future proof with kRGBAf instead.")]
[Obsolete ("This value can not be shared across Mac/iOS binaries, future proof with kRGBAf instead")]
RGBAf = 3,
// Please, do not add values into MonoMac/iOS without adding an explicit value
#elif !XAMCORE_3_0
[Obsolete ("This value can not be shared across Mac/iOS binaries, future proof with kBGRA8 instead.")]
[Obsolete ("This value can not be shared across Mac/iOS binaries, future proof with kBGRA8 instead")]
BGRA8 = 2 ,
[Obsolete ("This value can not be shared across Mac/iOS binaries, future proof with kRGBA8 instead.")]
[Obsolete ("This value can not be shared across Mac/iOS binaries, future proof with kRGBA8 instead")]
RGBA8 = 3,
// Please, do not add values into MonoMac/iOS without adding an explicit value
#endif
@ -73,38 +72,4 @@ namespace XamCore.CoreImage {
RGh = 21,
RGf = 22
}
[iOS (11,0)]
[Mac (10,13)]
[TV (11,0)]
[Native]
public enum CIQRCodeErrorCorrectionLevel : nint {
L = 76,
M = 77,
Q = 81,
H = 72,
}
[iOS (11,0)]
[Mac (10,13)]
[TV (11,0)]
[Native]
public enum CIDataMatrixCodeEccVersion : nint {
V000 = 0,
V050 = 50,
V080 = 80,
V100 = 100,
V140 = 140,
V200 = 200,
}
[iOS (11,0)]
[Mac (10,13)]
[TV (11,0)]
[Native]
public enum CIRenderDestinationAlphaMode : nuint {
None = 0,
Premultiplied = 1,
Unpremultiplied = 2,
}
}

6
src/CoreLocation/CLCompat.cs
Просмотреть файл

@ -8,7 +8,7 @@ namespace XamCore.CoreLocation {
#if !XAMCORE_2_0
public partial class CLBeaconRegion {
[Obsolete ("Does not return a valid instance on iOS 8.")]
[Obsolete ("Does not return a valid instance on iOS8")]
public CLBeaconRegion ()
{
}
@ -20,7 +20,7 @@ namespace XamCore.CoreLocation {
#if !TVOS
public partial class CLHeading {
[Obsolete ("Use the 'Description' property from 'NSObject'.")]
[Obsolete ("Use the Description property from NSObject")]
public new virtual string Description ()
{
return base.Description;
@ -30,7 +30,7 @@ namespace XamCore.CoreLocation {
public partial class CLLocation {
[Obsolete ("Use the 'Description' property from 'NSObject'.")]
[Obsolete ("Use the Description property from NSObject")]
public new virtual string Description ()
{
return base.Description;

2
src/CoreLocation/CLEnums.cs
Просмотреть файл

@ -87,7 +87,7 @@ namespace XamCore.CoreLocation {
Restricted,
Denied,
[Availability (Deprecated = Platform.iOS_8_0, Message = "Use 'AuthorizedAlways' instead.")]
[Availability (Deprecated = Platform.iOS_8_0, Message = "Use AuthorizedAlways instead")]
Authorized,
AuthorizedAlways = Authorized,
AuthorizedWhenInUse

25
src/CoreML/MLDictionaryFeatureProvider.cs
Просмотреть файл

@ -1,25 +0,0 @@
//
// MLDictionaryFeatureProvider.cs
//
// Authors:
// Alex Soto <alexsoto@microsoft.com>
//
// Copyright 2017 Xamarin Inc. All rights reserved.
//
#if XAMCORE_2_0
using System;
using XamCore.Foundation;
using XamCore.ObjCRuntime;
namespace XamCore.CoreML {
public partial class MLDictionaryFeatureProvider {
[Watch (4,0), TV (11,0), Mac (10,13, onlyOn64: true), iOS (11,0)]
public MLFeatureValue this [string featureName] {
get { return GetFeatureValue (featureName); }
}
}
}
#endif

91
src/CoreML/MLMultiArray.cs
Просмотреть файл

@ -1,91 +0,0 @@
//
// MLMultiArray.cs
//
// Authors:
// Alex Soto <alexsoto@microsoft.com>
//
// Copyright 2017 Xamarin Inc. All rights reserved.
//
#if XAMCORE_2_0
using System;
using XamCore.Foundation;
using XamCore.ObjCRuntime;
namespace XamCore.CoreML {
public partial class MLMultiArray {
static NSNumber[] ConvertArray (nint[] value)
{
if (value == null)
return null;
return Array.ConvertAll<nint, NSNumber> (value, NSNumber.FromNInt);
}
// NSArray<NSNumber> => nint[]
internal static nint[] ConvertArray (IntPtr handle)
{
return NSArray.ArrayFromHandle<nint> (handle, (v) => Messaging.nint_objc_msgSend (v, Selector.GetHandle ("integerValue")));
}
[Watch (4,0), TV (11,0), Mac (10,13, onlyOn64: true), iOS (11,0)]
public MLMultiArray (nint [] shape, MLMultiArrayDataType dataType, out NSError error)
: this (ConvertArray (shape), dataType, out error)
{
}
[Watch (4,0), TV (11,0), Mac (10,13, onlyOn64: true), iOS (11,0)]
public MLMultiArray (IntPtr dataPointer, nint [] shape, MLMultiArrayDataType dataType, nint [] strides, Action<IntPtr> deallocator, out NSError error)
: this (dataPointer, ConvertArray (shape), dataType, ConvertArray (strides), deallocator, out error)
{
}
[Watch (4,0), TV (11,0), Mac (10,13, onlyOn64: true), iOS (11,0)]
public NSNumber this [nint idx] {
get { return GetObject (idx); }
set { SetObject (value, idx); }
}
[Watch (4,0), TV (11,0), Mac (10,13, onlyOn64: true), iOS (11,0)]
public NSNumber this [params nint[] indices] {
get { return GetObject (indices); }
set { SetObject (value, indices); }
}
[Watch (4,0), TV (11,0), Mac (10,13, onlyOn64: true), iOS (11,0)]
public NSNumber this [NSNumber [] key] {
get { return GetObject (key); }
set { SetObject (value, key); }
}
[Watch (4,0), TV (11,0), Mac (10,13, onlyOn64: true), iOS (11,0)]
public NSNumber GetObject (params nint[] indices)
{
using (var arr = NSArray.FromNSObjects<nint> (NSNumber.FromNInt, indices))
return GetObject (arr.GetHandle ());
}
[Watch (4,0), TV (11,0), Mac (10,13, onlyOn64: true), iOS (11,0)]
public void SetObject (NSNumber obj, params nint[] indices)
{
using (var arr = NSArray.FromNSObjects<nint> (NSNumber.FromNInt, indices))
SetObject (obj, arr.GetHandle ());
}
[Watch (4,0), TV (11,0), Mac (10,13, onlyOn64: true), iOS (11,0)]
public nint[] Shape {
get {
return ConvertArray (_Shape);
}
}
[Watch (4,0), TV (11,0), Mac (10,13, onlyOn64: true), iOS (11,0)]
public nint[] Strides {
get {
return ConvertArray (_Strides);
}
}
}
}
#endif

25
src/CoreML/MLMultiArrayConstraint.cs
Просмотреть файл

@ -1,25 +0,0 @@
//
// MLMultiArrayConstraint.cs
//
// Authors:
// Rolf Bjarne Kvinge <rolf@xamarin.com>
//
// Copyright 2017 Microsoft Inc. All rights reserved.
//
#if XAMCORE_2_0
using System;
using XamCore.Foundation;
using XamCore.ObjCRuntime;
namespace XamCore.CoreML {
public partial class MLMultiArrayConstraint {
public nint[] Shape {
get {
return MLMultiArray.ConvertArray (_Shape);
}
}
}
}
#endif

17
src/CoreMedia/CMAttachmentBearer.cs
Просмотреть файл

@ -28,23 +28,6 @@ namespace XamCore.CoreMedia {
return Runtime.GetNSObject<NSDictionary> (attachments, true);
}
#if XAMCORE_2_0
// There is some API that needs a more strongly typed version of a NSDictionary
// and there is no easy way to downcast from NSDictionary to NSDictionary<TKey, TValue>
public static NSDictionary<TKey, TValue> GetAttachments<TKey, TValue> (this ICMAttachmentBearer target, CMAttachmentMode attachmentMode)
where TKey : class, INativeObject
where TValue : class, INativeObject
{
if (target == null)
throw new ArgumentNullException (nameof (target));
var attachments = CMCopyDictionaryOfAttachments (IntPtr.Zero, target.Handle, attachmentMode);
if (attachments == IntPtr.Zero)
return null;
return Runtime.GetNSObject<NSDictionary<TKey, TValue>> (attachments, true);
}
#endif
[DllImport(Constants.CoreMediaLibrary)]
extern static /* CFTypeRef */ IntPtr CMGetAttachment (/* CMAttachmentBearerRef */ IntPtr target, /* CFStringRef */ IntPtr key,
/* CMAttachmentMode */ out CMAttachmentMode attachmentModeOut);

8
src/CoreMedia/CMSync.cs
Просмотреть файл

@ -212,7 +212,7 @@ namespace XamCore.CoreMedia {
[DllImport(Constants.CoreMediaLibrary)]
extern static /* CMTimebaseRef */ IntPtr CMTimebaseGetMasterTimebase (/* CMTimebaseRef */ IntPtr timebase);
[Availability (Introduced = Platform.iOS_6_0 | Platform.Mac_10_8, Deprecated = Platform.iOS_9_0 | Platform.Mac_10_11, Message="Use 'CopyMasterTimebase' instead.")]
[Availability (Introduced = Platform.iOS_6_0 | Platform.Mac_10_8, Deprecated = Platform.iOS_9_0 | Platform.Mac_10_11, Message="Please use CopyMasterTimebase")]
public CMTimebase GetMasterTimebase ()
{
var ptr = CMTimebaseGetMasterTimebase (Handle);
@ -225,7 +225,7 @@ namespace XamCore.CoreMedia {
[DllImport(Constants.CoreMediaLibrary)]
extern static /* CMClockRef */ IntPtr CMTimebaseGetMasterClock (/* CMTimebaseRef */ IntPtr timebase);
[Availability (Introduced = Platform.iOS_6_0 | Platform.Mac_10_8, Deprecated = Platform.iOS_9_0 | Platform.Mac_10_11, Message="Use 'CopyMasterClock' instead.")]
[Availability (Introduced = Platform.iOS_6_0 | Platform.Mac_10_8, Deprecated = Platform.iOS_9_0 | Platform.Mac_10_11, Message="Please use CopyMasterClock")]
public CMClock GetMasterClock ()
{
var ptr = CMTimebaseGetMasterClock (Handle);
@ -238,7 +238,7 @@ namespace XamCore.CoreMedia {
[DllImport(Constants.CoreMediaLibrary)]
extern static /* CMClockOrTimebaseRef */ IntPtr CMTimebaseGetMaster (/* CMTimebaseRef */ IntPtr timebase);
[Availability (Introduced = Platform.iOS_6_0 | Platform.Mac_10_8, Deprecated = Platform.iOS_9_0 | Platform.Mac_10_11, Message="Use 'CopyMaster' instead.")]
[Availability (Introduced = Platform.iOS_6_0 | Platform.Mac_10_8, Deprecated = Platform.iOS_9_0 | Platform.Mac_10_11, Message="Please use CopyMaster")]
public CMClockOrTimebase GetMaster ()
{
var ptr = CMTimebaseGetMaster (Handle);
@ -251,7 +251,7 @@ namespace XamCore.CoreMedia {
[DllImport(Constants.CoreMediaLibrary)]
extern static /* CMClockRef */ IntPtr CMTimebaseGetUltimateMasterClock (/* CMTimebaseRef */ IntPtr timebase);
[Availability (Introduced = Platform.iOS_6_0 | Platform.Mac_10_8, Deprecated = Platform.iOS_9_0 | Platform.Mac_10_11, Message="Use 'CopyUltimateMasterClock' instead.")]
[Availability (Introduced = Platform.iOS_6_0 | Platform.Mac_10_8, Deprecated = Platform.iOS_9_0 | Platform.Mac_10_11, Message="Please use CopyUltimateMasterClock")]
public CMClock GetUltimateMasterClock ()
{
var ptr = CMTimebaseGetUltimateMasterClock (Handle);

2
src/CoreMedia/CoreMedia.cs
Просмотреть файл

@ -104,7 +104,7 @@ namespace XamCore.CoreMedia {
public static readonly CMTimeRange Zero;
#if !XAMCORE_3_0
[Obsolete ("Use 'InvalidRange'.")]
[Obsolete ("Use InvalidRange")]
public static readonly CMTimeRange Invalid;
#endif
public static readonly CMTimeRange InvalidRange;

Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше