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

Merge net7.0-xcode14.1 into main. (#16555) 

This merges .NET 7 + Xcode 14.1 support into main.
This commit is contained in:
Rolf Bjarne Kvinge 2022-11-04 08:36:25 +01:00 коммит произвёл GitHub
Родитель 4caae3f0e0 60bd7393b3
Коммит ceaa0171da
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
767 изменённых файлов: 92247 добавлений и 30204 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -14,25 +14,32 @@ CURL_RETRY = $(CURL) --retry 20 --retry-delay 2 --retry-all-errors
# calculate commit distance and store it in a file so that we don't have to re-calculate it every time make is executed.
# Support for hardcoding a commit distance start offset.
NUGET_VERSION_COMMIT_DISTANCE_START=0
NUGET_VERSION_STABLE_COMMIT_DISTANCE_START=0
-include $(TOP)/Make.config.inc
$(TOP)/Make.config.inc: $(TOP)/Make.config $(TOP)/mk/mono.mk
@rm -f $@
@printf "IOS_COMMIT_DISTANCE:=$(shell LANG=C; export LANG && git --git-dir $(TOP)/.git log `git --git-dir $(TOP)/.git blame -- ./Make.versions HEAD | grep IOS_PACKAGE_VERSION= | sed 's/ .*//' `..HEAD --oneline | wc -l | sed 's/ //g')\n" >> $@
@printf "MAC_COMMIT_DISTANCE:=$(shell LANG=C; export LANG && git --git-dir $(TOP)/.git log `git --git-dir $(TOP)/.git blame -- ./Make.versions HEAD | grep MAC_PACKAGE_VERSION= | sed 's/ .*//' `..HEAD --oneline | wc -l | sed 's/ //g')\n" >> $@
@printf "IOS_NUGET_COMMIT_DISTANCE:=$(shell LANG=C; export LANG; git --git-dir $(TOP)/.git log `git --git-dir $(TOP)/.git blame -- ./Make.versions HEAD | grep IOS_NUGET_OS_VERSION= | sed 's/ .*//' `..HEAD --oneline | wc -l | sed 's/ //g')\n" >> $@
@printf "TVOS_NUGET_COMMIT_DISTANCE:=$(shell LANG=C; export LANG; git --git-dir $(TOP)/.git log `git --git-dir $(TOP)/.git blame -- ./Make.versions HEAD | grep TVOS_NUGET_OS_VERSION= | sed 's/ .*//' `..HEAD --oneline | wc -l | sed 's/ //g')\n" >> $@
@printf "WATCHOS_NUGET_COMMIT_DISTANCE:=$(shell LANG=C; export LANG; git --git-dir $(TOP)/.git log `git --git-dir $(TOP)/.git blame -- ./Make.versions HEAD | grep WATCHOS_NUGET_OS_VERSION= | sed 's/ .*//' `..HEAD --oneline | wc -l | sed 's/ //g')\n" >> $@
@printf "MACOS_NUGET_COMMIT_DISTANCE:=$(shell LANG=C; export LANG; git --git-dir $(TOP)/.git log `git --git-dir $(TOP)/.git blame -- ./Make.versions HEAD | grep MACOS_NUGET_OS_VERSION= | sed 's/ .*//' `..HEAD --oneline | wc -l | sed 's/ //g')\n" >> $@
@printf "MACCATALYST_NUGET_COMMIT_DISTANCE:=$(shell LANG=C; export LANG; git --git-dir $(TOP)/.git log `git --git-dir $(TOP)/.git blame -- ./Make.versions HEAD | grep MACCATALYST_NUGET_OS_VERSION= | sed 's/ .*//' `..HEAD --oneline | wc -l | sed 's/ //g')\n" >> $@
@#
@printf "IOS_NUGET_COMMIT_DISTANCE:=$(shell LANG=C; export LANG; git --git-dir $(TOP)/.git log `git --git-dir $(TOP)/.git blame -- ./Make.versions HEAD | grep IOS_NUGET_OS_VERSION= | sed 's/ .*//' `..HEAD --oneline | wc -l | sed -e 's/ //g' -e "s/^/$(NUGET_VERSION_COMMIT_DISTANCE_START)+/" | bc)\\n" >> $@
@printf "TVOS_NUGET_COMMIT_DISTANCE:=$(shell LANG=C; export LANG; git --git-dir $(TOP)/.git log `git --git-dir $(TOP)/.git blame -- ./Make.versions HEAD | grep TVOS_NUGET_OS_VERSION= | sed 's/ .*//' `..HEAD --oneline | wc -l | sed -e 's/ //g' -e "s/^/$(NUGET_VERSION_COMMIT_DISTANCE_START)+/" | bc)\\n" >> $@
@printf "WATCHOS_NUGET_COMMIT_DISTANCE:=$(shell LANG=C; export LANG; git --git-dir $(TOP)/.git log `git --git-dir $(TOP)/.git blame -- ./Make.versions HEAD | grep WATCHOS_NUGET_OS_VERSION= | sed 's/ .*//' `..HEAD --oneline | wc -l | sed -e 's/ //g' -e "s/^/$(NUGET_VERSION_COMMIT_DISTANCE_START)+/" | bc)\\n" >> $@
@printf "MACOS_NUGET_COMMIT_DISTANCE:=$(shell LANG=C; export LANG; git --git-dir $(TOP)/.git log `git --git-dir $(TOP)/.git blame -- ./Make.versions HEAD | grep MACOS_NUGET_OS_VERSION= | sed 's/ .*//' `..HEAD --oneline | wc -l | sed -e 's/ //g' -e "s/^/$(NUGET_VERSION_COMMIT_DISTANCE_START)+/" | bc)\\n" >> $@
@printf "MACCATALYST_NUGET_COMMIT_DISTANCE:=$(shell LANG=C; export LANG; git --git-dir $(TOP)/.git log `git --git-dir $(TOP)/.git blame -- ./Make.versions HEAD | grep MACCATALYST_NUGET_OS_VERSION= | sed 's/ .*//' `..HEAD --oneline | wc -l | sed -e 's/ //g' -e "s/^/$(NUGET_VERSION_COMMIT_DISTANCE_START)+/" | bc)\\n" >> $@
@printf "NUGET_STABLE_COMMIT_DISTANCE:=$(shell LANG=C; export LANG; git --git-dir $(TOP)/.git log `git --git-dir $(TOP)/.git blame -L '/^[#[:blank:]]*NUGET_RELEASE_BRANCH=/,+1' -- ./Make.config HEAD | sed 's/ .*//' `..HEAD --oneline | wc -l | sed -e 's/ //g' -e "s/^/$(NUGET_VERSION_STABLE_COMMIT_DISTANCE_START)+/" | bc)\\n" >> $@
@#
@if which ccache > /dev/null 2>&1; then printf "ENABLE_CCACHE=1\nexport CCACHE_BASEDIR=$(abspath $(TOP)/..)\n" >> $@; echo "Found ccache on the system, enabling it"; fi
@if test -d $(TOP)/../maccore; then printf "ENABLE_XAMARIN=1\n" >> $@; echo "Detected the maccore repository, automatically enabled the Xamarin build"; fi
include $(TOP)/Make.versions
APIDIFF_REFERENCES_iOS=https://dl.internalx.com/wrench/d17-3/87f98a75edaa6757fd6ff5170d297615830fb41b/6466144/package/bundle.zip
APIDIFF_REFERENCES_iOS=https://dl.internalx.com/wrench/6.0.4xx-xcode14/6756a11462d8aa6e73d4a320712b276caba159c1/6718459/package/bundle.zip
APIDIFF_REFERENCES_Mac=https://dl.internalx.com/wrench/d17-3/87f98a75edaa6757fd6ff5170d297615830fb41b/6466144/package/bundle.zip
APIDIFF_REFERENCES_DOTNET_iOS=https://dl.internalx.com/wrench/6.0.4xx/4bd34d034c8c5a4e092c8bd3c8868153d94277b4/6656178/package/bundle.zip
APIDIFF_REFERENCES_DOTNET_tvOS=https://dl.internalx.com/wrench/6.0.4xx/4bd34d034c8c5a4e092c8bd3c8868153d94277b4/6656178/package/bundle.zip
APIDIFF_REFERENCES_DOTNET_iOS=https://dl.internalx.com/wrench/6.0.4xx-xcode14/6756a11462d8aa6e73d4a320712b276caba159c1/6718459/package/bundle.zip
APIDIFF_REFERENCES_DOTNET_tvOS=https://dl.internalx.com/wrench/6.0.4xx-xcode14/6756a11462d8aa6e73d4a320712b276caba159c1/6718459/package/bundle.zip
APIDIFF_REFERENCES_DOTNET_macOS=https://dl.internalx.com/wrench/6.0.4xx/4bd34d034c8c5a4e092c8bd3c8868153d94277b4/6656178/package/bundle.zip
APIDIFF_REFERENCES_DOTNET_MacCatalyst=https://dl.internalx.com/wrench/6.0.4xx/4bd34d034c8c5a4e092c8bd3c8868153d94277b4/6656178/package/bundle.zip
@ -111,8 +118,8 @@ endif
## change *first*, otherwise we'll produce builds with the same version from
## two different branches (which is very, very bad).
##
# NUGET_HARDCODED_PRERELEASE_IDENTIFIER=rc.3
# NUGET_HARDCODED_PRERELEASE_BRANCH=release/6.0.3xx
NUGET_HARDCODED_PRERELEASE_IDENTIFIER=net7.0-xcode14.1
NUGET_HARDCODED_PRERELEASE_BRANCH=net7.0-xcode14.1
# compute the alphanumeric version of branch names
NUGET_RELEASE_BRANCH_ALPHANUMERIC:=$(shell export LANG=C; printf "%s" "$(NUGET_RELEASE_BRANCH)" | tr -c '[a-zA-Z0-9-]' '-')
@ -186,9 +193,9 @@ MACCATALYST_NUGET_VERSION_NO_METADATA=$(MACCATALYST_NUGET_VERSION)$(NUGET_PREREL
MACCATALYST_NUGET_VERSION_FULL=$(MACCATALYST_NUGET_VERSION_NO_METADATA)+$(NUGET_BUILD_METADATA)
# Xcode version should have both a major and a minor version (even if the minor version is 0)
XCODE_VERSION=13.3
XCODE_URL=https://dl.internalx.com/internal-files/xcodes/Xcode_13.3.xip
XCODE_DEVELOPER_ROOT=/Applications/Xcode_13.3.0.app/Contents/Developer
XCODE_VERSION=14.1
XCODE_URL=https://dl.internalx.com/internal-files/xcodes/Xcode_14.1.xip
XCODE_DEVELOPER_ROOT=/Applications/Xcode_14.1.0.app/Contents/Developer
XCODE_PRODUCT_BUILD_VERSION:=$(shell /usr/libexec/PlistBuddy -c 'Print :ProductBuildVersion' $(XCODE_DEVELOPER_ROOT)/../version.plist 2>/dev/null || echo " $(shell tput setaf 1 2>/dev/null)The required Xcode ($(XCODE_VERSION)) is not installed in $(basename $(basename $(XCODE_DEVELOPER_ROOT)))$(shell tput sgr0 2>/dev/null)" >&2)
# Tell both Xcode and our build logic which Xcode we're using.
@ -218,12 +225,12 @@ MIN_CMAKE_URL=https://cmake.org/files/v3.6/cmake-3.6.2-Darwin-x86_64.dmg
MIN_CMAKE_VERSION=2.8.8
# ObjectiveSharpie min/max versions
MIN_SHARPIE_VERSION=3.5.50
MIN_SHARPIE_VERSION=3.5.61
MAX_SHARPIE_VERSION=3.5.99
MIN_SHARPIE_URL=https://download.visualstudio.microsoft.com/download/pr/401d21b7-58c2-4f86-9009-76c15bf9a804/fd5dc34d033d9949a378ca4b3332c02c/objectivesharpie-3.5.50.pkg
MIN_SHARPIE_URL=https://download.visualstudio.microsoft.com/download/pr/7336f72c-57aa-4e46-9936-cce4d1975ba9/b33be8b36a22c2cfbcbe5680f14e0901/objectivesharpie-3.5.61.pkg
# Minimum OSX versions for building XI/XM
MIN_OSX_BUILD_VERSION=12.0
MIN_OSX_BUILD_VERSION=12.5
# Minimum OSX version for executing XI/XM tooling.
MIN_OSX_VERSION_FOR_IOS=10.11
MIN_OSX_VERSION_FOR_MAC=10.11
@ -261,12 +268,12 @@ DOTNET_MIN_MACOS_SDK_VERSION=10.14
# The min simulator version available in the Xcode we're using
MIN_IOS_SIMULATOR_VERSION=12.4
MIN_WATCHOS_SIMULATOR_VERSION=6.0
MIN_WATCHOS_SIMULATOR_VERSION=7.0
# This is the iOS version that matches the watchOS version (i.e same Xcode)
MIN_WATCHOS_COMPANION_SIMULATOR_VERSION=12.4
MIN_WATCHOS_COMPANION_SIMULATOR_VERSION=14.5
MIN_TVOS_SIMULATOR_VERSION=12.4
# These are the simulator package ids for the versions above
EXTRA_SIMULATORS=com.apple.pkg.iPhoneSimulatorSDK12_4 com.apple.pkg.AppleTVSimulatorSDK12_4 com.apple.pkg.WatchSimulatorSDK6_0
EXTRA_SIMULATORS=com.apple.pkg.iPhoneSimulatorSDK12_4 com.apple.pkg.AppleTVSimulatorSDK12_4 com.apple.pkg.iPhoneSimulatorSDK14_5 com.apple.pkg.WatchSimulatorSDK7_0
INCLUDE_IOS=1
INCLUDE_MAC=1
@ -348,7 +355,11 @@ endif
SIMULATOR_SDK=$(XCODE_DEVELOPER_ROOT)/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator$(IOS_SDK_VERSION).sdk
OBJC_CFLAGS=-ObjC++ -std=c++14 -fno-exceptions -stdlib=libc++
# Clang will by default emit objc_msgSend stubs in Xcode 14, which ld from earlier Xcodes doesn't understand.
# We disable this by passing -fno-objc-msgsend-selector-stubs to clang.
# We can probably remove this flag once we require developers to use Xcode 14.
# Ref: https://github.com/xamarin/xamarin-macios/issues/16223
OBJC_CFLAGS=-ObjC++ -std=c++14 -fno-exceptions -stdlib=libc++ -fno-objc-msgsend-selector-stubs
COMMON_SIMULATOR_CFLAGS=-mios-simulator-version-min=$(MIN_IOS_SDK_VERSION) -isysroot $(SIMULATOR_SDK) $(CFLAGS) -g $(IOS_COMMON_DEFINES)
SIMULATOR86_CFLAGS=$(COMMON_SIMULATOR_CFLAGS) -arch i386
@ -578,7 +589,7 @@ endif
$(TOP)/dotnet.config: $(TOP)/eng/Versions.props
$(Q) grep MicrosoftDotnetSdkInternalPackageVersion $(TOP)/eng/Versions.props | sed -e 's/<*\/*MicrosoftDotnetSdkInternalPackageVersion>//g' -e 's/[ \t]*/DOTNET_VERSION=/' >> $@.tmp
$(Q) grep MicrosoftNETCoreAppRefPackageVersion $(TOP)/eng/Versions.props | sed -e 's/<*\/*MicrosoftNETCoreAppRefPackageVersion>//g' -e 's/[ \t]*/BUNDLED_NETCORE_PLATFORMS_PACKAGE_VERSION=/' >> $@.tmp
$(Q) grep MicrosoftNETWorkloadEmscriptenManifest60100PackageVersion $(TOP)/eng/Versions.props | sed -e 's/<*\/*MicrosoftNETWorkloadEmscriptenManifest60100PackageVersion>//g' -e 's/[ \t]*/EMSCRIPTEN_MANIFEST_PACKAGE_VERSION=/' >> $@.tmp
$(Q) grep MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion $(TOP)/eng/Versions.props | sed -e 's/<*\/*MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion>//g' -e 's/[ \t]*/EMSCRIPTEN_MANIFEST_PACKAGE_VERSION=/' >> $@.tmp
$(Q) mv $@.tmp $@
DOTNET_DESTDIR ?= $(TOP)/_build
@ -600,44 +611,41 @@ else
DOTNET_BCL_VERSION=$(BUNDLED_NETCORE_PLATFORMS_PACKAGE_VERSION)
endif
DOTNET_TFM=net6.0
DOTNET_TFM=net7.0
DOTNET_VERSION_BAND=$(firstword $(subst -, ,$(DOTNET_VERSION)))
DOTNET_VERSION_PRERELEASE_COMPONENT=$(subst $(DOTNET_VERSION_BAND),,$(DOTNET_VERSION))
DOTNET_INSTALL_NAME=dotnet-sdk-$(DOTNET_VERSION)
DOTNET_DIR=$(abspath $(TOP)/builds/downloads/$(DOTNET_INSTALL_NAME))
DOTNET=$(DOTNET_DIR)/dotnet
DOTNET_BCL_DIR:=$(abspath $(TOP)/packages/microsoft.netcore.app.ref/$(DOTNET_BCL_VERSION)/ref/$(DOTNET_TFM))
# Use the System.Runtime.InteropServices.NFloat.Internal package to get the System.Runtime.InteropServices.dll reference assembly for
# .NET 6. This is no longer needed for .NET 7, when we can switch back to the usual BCL reference assemblies.
ifeq ($(DOTNET_TFM),net6.0)
DOTNET_SYSTEM_RUNTIME_INTEROPSERVICES_REF_ASSEMBLY_DIR:=$(abspath $(TOP)/packages/system.runtime.interopservices.nfloat.internal/6.0.1/ref/net6.0)
else
DOTNET_SYSTEM_RUNTIME_INTEROPSERVICES_REF_ASSEMBLY_DIR:=$(DOTNET_BCL_DIR)
endif
# The sdk version band has the last two digits set to 0: https://github.com/dotnet/sdk/blob/22c4860dcb2cf6b123dd641cc4a87a50380759d5/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.cs#L52-L53
DOTNET_MANIFEST_VERSION_BAND=$(shell echo $(DOTNET_VERSION_BAND) | sed 's/..$$/00/')
ifeq ($(DOTNET_VERSION_PRERELEASE_COMPONENT),)
DOTNET_MANIFEST_VERSION_WITH_PRERELEASE_COMPONENT=$(DOTNET_VERSION_BAND)
else ifeq ($(word 1,$(subst ., ,$(DOTNET_VERSION_PRERELEASE_COMPONENT))),-rtm)
DOTNET_MANIFEST_VERSION_WITH_PRERELEASE_COMPONENT=$(DOTNET_VERSION_BAND)
else
DOTNET_MANIFEST_VERSION_WITH_PRERELEASE_COMPONENT=$(DOTNET_VERSION_BAND)$(word 1,$(subst ., ,$(DOTNET_VERSION_PRERELEASE_COMPONENT))).$(word 2,$(subst ., ,$(DOTNET_VERSION_PRERELEASE_COMPONENT)))
endif
# We must do the same for our version band: the last two digits must be set to 0.
MANIFEST_VERSION_BAND=6.0.400
MANIFEST_VERSION_BAND=7.0.100
# The toolchain can either be hardcoded to something like 6.0.200, or set to MANIFEST_VERSION_BAND.
# Typically it should be MANIFEST_VERSION_BAND, but it usually takes a while after MANIFEST_VERSION_BAND is bumped
# for this to follow suit, in which case we can keep things working by hardcoding the previous version band.
TOOLCHAIN_MANIFEST_VERSION_BAND=6.0.300
TOOLCHAIN_MANIFEST_VERSION_BAND=$(MANIFEST_VERSION_BAND)
# The location of csc changes depending on whether we're using a preview or a stable/service release :/
DOTNET_CSC_PATH_PREVIEW=$(DOTNET_DIR)/sdk/$(DOTNET_VERSION)/Roslyn/bincore/csc.dll
DOTNET_CSC_PATH_STABLE=$(DOTNET_DIR)/sdk/$(DOTNET_VERSION_BAND)/Roslyn/bincore/csc.dll
# Attempt to detect where csc is based on the .NET version. This may fail in the future: feel free to fix/hardcode whatever's necessary to find csc.dll.
ifeq (rtm,$(findstring rtm,$(DOTNET_VERSION)))
DOTNET_CSC=$(DOTNET) exec $(DOTNET_CSC_PATH_STABLE)
else
ifeq (servicing,$(findstring servicing,$(DOTNET_VERSION)))
# Attempt to detect where csc is based. This may fail in the future: feel free to fix/hardcode whatever's necessary to find csc.dll.
ifneq ("$(wildcard $(DOTNET_CSC_PATH_STABLE))","")
DOTNET_CSC=$(DOTNET) exec $(DOTNET_CSC_PATH_STABLE)
else
DOTNET_CSC=$(DOTNET) exec $(DOTNET_CSC_PATH_PREVIEW)
endif
endif
# How are our assemblies named?
DOTNET_IOS_ASSEMBLY_NAME=Microsoft.iOS

31
Make.versions
Просмотреть файл

@ -48,8 +48,8 @@
# line changed in git).
#
IOS_PACKAGE_VERSION=15.13.0.$(IOS_COMMIT_DISTANCE)
MAC_PACKAGE_VERSION=8.13.0.$(MAC_COMMIT_DISTANCE)
IOS_PACKAGE_VERSION=16.1.1.$(IOS_COMMIT_DISTANCE)
MAC_PACKAGE_VERSION=9.0.0.$(MAC_COMMIT_DISTANCE)
#
# ** NuGet package version numbers **
@ -65,11 +65,11 @@ MAC_PACKAGE_VERSION=8.13.0.$(MAC_COMMIT_DISTANCE)
# WARNING: Do **not** use versions higher than the available Xcode SDK or else we will have issues with mtouch (See https://github.com/xamarin/xamarin-macios/issues/7705)
IOS_NUGET_OS_VERSION=15.4
TVOS_NUGET_OS_VERSION=15.4
WATCHOS_NUGET_OS_VERSION=8.5
MACOS_NUGET_OS_VERSION=12.3
MACCATALYST_NUGET_OS_VERSION=15.4
IOS_NUGET_OS_VERSION=16.1
TVOS_NUGET_OS_VERSION=16.1
WATCHOS_NUGET_OS_VERSION=9.1
MACOS_NUGET_OS_VERSION=13.0
MACCATALYST_NUGET_OS_VERSION=16.1
# Defines the default platform version if it's not specified in the TFM. The default should not change for a given .NET version:
@ -79,8 +79,15 @@ MACCATALYST_NUGET_OS_VERSION=15.4
# Basically: this should be the last OS version of the platform in question when the current major .NET version is first released to stable.
# Ref: https://github.com/dotnet/designs/blob/8e6394406d44f75f30ea2259a425cb9e38d75b69/accepted/2020/net5/net5.md#os-versions
DEFAULT_TARGET_PLATFORM_VERSION_IOS=15.4
DEFAULT_TARGET_PLATFORM_VERSION_TVOS=15.4
DEFAULT_TARGET_PLATFORM_VERSION_WATCHOS=8.5
DEFAULT_TARGET_PLATFORM_VERSION_MACOS=12.3
DEFAULT_TARGET_PLATFORM_VERSION_MACCATALYST=15.4
DEFAULT_TARGET_PLATFORM_VERSION_IOS=16.1
DEFAULT_TARGET_PLATFORM_VERSION_TVOS=16.1
DEFAULT_TARGET_PLATFORM_VERSION_WATCHOS=9.1
DEFAULT_TARGET_PLATFORM_VERSION_MACOS=13.0
DEFAULT_TARGET_PLATFORM_VERSION_MACCATALYST=16.1
# These variables must be updated whenever we release a new stable version into .NET 6
NET6_IOS_NUGET_VERSION_NO_METADATA=16.0.527
NET6_TVOS_NUGET_VERSION_NO_METADATA=16.0.527
NET6_WATCHOS_NUGET_VERSION_NO_METADATA=8.5.447
NET6_MACOS_NUGET_VERSION_NO_METADATA=12.3.470
NET6_MACCATALYST_NUGET_VERSION_NO_METADATA=15.4.470

10
NuGet.config
Просмотреть файл

@ -10,11 +10,17 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-6b7d1f4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-6b7d1f47/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-6b7d1f4-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-6b7d1f47-5/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-6b7d1f4-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-6b7d1f47-4/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-6b7d1f4-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-6b7d1f47-3/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-6b7d1f4-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-6b7d1f47-2/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-6b7d1f4-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-6b7d1f47-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-pub-dotnet-runtime-c35dae2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-c35dae27/nuget/v3/index.json" />
<add key="darc-pub-dotnet-runtime-cd2d837" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-cd2d8379/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" protocolVersion="3" />
@ -30,6 +36,8 @@
<add key="darc-pub-dotnet-runtime-531f715" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-531f715f/nuget/v3/index.json" />
<!-- Need 6.0.10 feeds too -->
<add key="darc-pub-dotnet-runtime-8c6bcad" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-8c6bcad1/nuget/v3/index.json" />
<!-- And a 6.0.11 feed -->
<add key="darc-pub-dotnet-runtime-f2980ae" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-f2980ae1/nuget/v3/index.json" />
</packageSources>
<disabledPackageSources>
<clear />

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

@ -49,6 +49,8 @@
<string>15.0</string>
<string>15.2</string>
<string>15.4</string>
<string>16.0</string>
<string>16.1</string>
</array>
<key>tvOS</key>
<array>
@ -80,6 +82,8 @@
<string>15.0</string>
<string>15.2</string>
<string>15.4</string>
<string>16.0</string>
<string>16.1</string>
</array>
<key>watchOS</key>
<array>
@ -108,6 +112,8 @@
<string>8.0</string>
<string>8.3</string>
<string>8.5</string>
<string>9.0</string>
<string>9.1</string>
</array>
<key>MacCatalyst</key>
<array>
@ -123,6 +129,7 @@
<string>15.0</string>
<string>15.2</string>
<string>15.4</string>
<string>16.1</string>
</array>
</dict>
<key>MacCatalystVersionMap</key>
@ -151,6 +158,8 @@
<string>12.1</string>
<key>15.4</key>
<string>12.3</string>
<key>16.1</key>
<string>13.0</string>
</dict>
<key>RecommendedXcodeVersion</key>
<string>@XCODE_VERSION@</string>

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

@ -25,6 +25,7 @@
<string>12.0</string>
<string>12.1</string>
<string>12.3</string>
<string>13.0</string>
</array>
</dict>
<key>RecommendedXcodeVersion</key>

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

@ -131,6 +131,26 @@ DOWNLOAD_DOTNET_VERSION=$(BUNDLED_NETCORE_PLATFORMS_PACKAGE_VERSION)
endif
endif
.stamp-install-custom-dotnet-runtime-workloads:
@# mono toolchain
$(Q) $(CP) $(TOP)/packages/microsoft.net.workload.mono.toolchain.net7.manifest-$(TOOLCHAIN_MANIFEST_VERSION_BAND)/$(DOWNLOAD_DOTNET_VERSION)/data/WorkloadManifest.* ./downloads/$(DOTNET_INSTALL_NAME)/sdk-manifests/$(DOTNET_MANIFEST_VERSION_BAND)/microsoft.net.workload.mono.toolchain.net7/
$(Q) $(CP) $(TOP)/packages/microsoft.net.workload.mono.toolchain.net6.manifest-$(TOOLCHAIN_MANIFEST_VERSION_BAND)/$(DOWNLOAD_DOTNET_VERSION)/data/WorkloadManifest.* ./downloads/$(DOTNET_INSTALL_NAME)/sdk-manifests/$(DOTNET_MANIFEST_VERSION_BAND)/microsoft.net.workload.mono.toolchain.net6/
@# emscripten, which mono depens on
$(Q) $(CP) $(TOP)/packages/microsoft.net.workload.emscripten.net7.manifest-$(TOOLCHAIN_MANIFEST_VERSION_BAND)/$(EMSCRIPTEN_MANIFEST_PACKAGE_VERSION)/data/WorkloadManifest.* ./downloads/$(DOTNET_INSTALL_NAME)/sdk-manifests/$(DOTNET_MANIFEST_VERSION_BAND)/microsoft.net.workload.emscripten.net7/
$(Q) $(CP) $(TOP)/packages/microsoft.net.workload.emscripten.net6.manifest-$(TOOLCHAIN_MANIFEST_VERSION_BAND)/$(EMSCRIPTEN_MANIFEST_PACKAGE_VERSION)/data/WorkloadManifest.* ./downloads/$(DOTNET_INSTALL_NAME)/sdk-manifests/$(DOTNET_MANIFEST_VERSION_BAND)/microsoft.net.workload.emscripten.net6/
$(Q) make .stamp-copy-stuff-everywhere
$(Q) touch $@
.stamp-copy-stuff-everywhere:
ifeq ($(CUSTOM_DOTNET_RUNTIME_INSTALL),1)
$(Q) mkdir -p ./downloads/$(DOTNET_INSTALL_NAME)/sdk-manifests/$(DOTNET_MANIFEST_VERSION_BAND)-rc.2
$(Q) $(CP) -r ./downloads/$(DOTNET_INSTALL_NAME)/sdk-manifests/$(DOTNET_MANIFEST_VERSION_BAND)/microsoft.net.workload.mono.toolchain.net7 ./downloads/$(DOTNET_INSTALL_NAME)/sdk-manifests/$(DOTNET_MANIFEST_VERSION_BAND)-rc.2/microsoft.net.workload.mono.toolchain.net7
$(Q) $(CP) -r ./downloads/$(DOTNET_INSTALL_NAME)/sdk-manifests/$(DOTNET_MANIFEST_VERSION_BAND)/microsoft.net.workload.mono.toolchain.net6 ./downloads/$(DOTNET_INSTALL_NAME)/sdk-manifests/$(DOTNET_MANIFEST_VERSION_BAND)-rc.2/microsoft.net.workload.mono.toolchain.net6
$(Q) $(CP) -r ./downloads/$(DOTNET_INSTALL_NAME)/sdk-manifests/$(DOTNET_MANIFEST_VERSION_BAND)/microsoft.net.workload.emscripten.net7 ./downloads/$(DOTNET_INSTALL_NAME)/sdk-manifests/$(DOTNET_MANIFEST_VERSION_BAND)-rc.2/microsoft.net.workload.emscripten.net7
$(Q) $(CP) -r ./downloads/$(DOTNET_INSTALL_NAME)/sdk-manifests/$(DOTNET_MANIFEST_VERSION_BAND)/microsoft.net.workload.emscripten.net6 ./downloads/$(DOTNET_INSTALL_NAME)/sdk-manifests/$(DOTNET_MANIFEST_VERSION_BAND)-rc.2/microsoft.net.workload.emscripten.net6
endif
$(Q) touch $@
package-download/all-package-references.csproj: $(TOP)/.git/HEAD $(TOP)/.git/index ./create-csproj-for-all-packagereferences.sh
$(Q_GEN) ./create-csproj-for-all-packagereferences.sh --output "$(abspath $@.tmp)" $(if $(V),-v,)
$(Q) mv "$@.tmp" "$@"
@ -148,10 +168,7 @@ package-download/all-package-references.csproj: $(TOP)/.git/HEAD $(TOP)/.git/ind
/p:ToolChainManifestVersionBand="$(TOOLCHAIN_MANIFEST_VERSION_BAND)" \
/bl \
$(DOTNET_BUILD_VERBOSITY)
$(Q) mkdir -p ./downloads/$(DOTNET_INSTALL_NAME)/sdk-manifests/$(DOTNET_MANIFEST_VERSION_BAND)/microsoft.net.workload.mono.toolchain/
$(Q) $(CP) $(TOP)/packages/microsoft.net.workload.mono.toolchain.manifest-$(TOOLCHAIN_MANIFEST_VERSION_BAND)/$(DOWNLOAD_DOTNET_VERSION)/data/WorkloadManifest.* ./downloads/$(DOTNET_INSTALL_NAME)/sdk-manifests/$(DOTNET_MANIFEST_VERSION_BAND)/microsoft.net.workload.mono.toolchain/
$(Q) mkdir -p ./downloads/$(DOTNET_INSTALL_NAME)/sdk-manifests/$(DOTNET_MANIFEST_VERSION_BAND)/microsoft.net.workload.emscripten/
$(Q) $(CP) $(TOP)/packages/microsoft.net.workload.emscripten.manifest-$(TOOLCHAIN_MANIFEST_VERSION_BAND)/$(EMSCRIPTEN_MANIFEST_PACKAGE_VERSION)/data/WorkloadManifest.* ./downloads/$(DOTNET_INSTALL_NAME)/sdk-manifests/$(DOTNET_MANIFEST_VERSION_BAND)/microsoft.net.workload.emscripten/
$(MAKE) .stamp-install-custom-dotnet-runtime-workloads
$(Q) touch $@
.stamp-install-t4: $(TOP)/.config/dotnet-tools.json .stamp-download-dotnet-packages

9
builds/package-download/download-packages.csproj
Просмотреть файл

@ -20,14 +20,13 @@
<!-- download the reference assemblies -->
<PackageDownload Include="microsoft.netcore.app.ref" Version="[$(ActualPackageVersion)]" />
<!-- download the nfloat reference assembly for .NET 6 (but only for .NET 6, once we switch to .NET 7 this can be removed) -->
<PackageDownload Include="System.Runtime.InteropServices.NFloat.Internal" Version="[6.0.1]" Condition="'$(ActualPackageVersion.Substring(0,1))' == '6'" />
<!-- and get the mono workload as well -->
<PackageDownload Include="Microsoft.NET.Workload.Mono.ToolChain.Manifest-$(ToolChainManifestVersionBand)" Version="[$(ActualPackageVersion)]" />
<PackageDownload Include="Microsoft.NET.Workload.Mono.ToolChain.net7.Manifest-$(ToolChainManifestVersionBand)" Version="[$(ActualPackageVersion)]" />
<PackageDownload Include="Microsoft.NET.Workload.Mono.ToolChain.net6.Manifest-$(ToolChainManifestVersionBand)" Version="[$(ActualPackageVersion)]" />
<!-- and get the emscripten workload as well -->
<PackageDownload Include="Microsoft.NET.Workload.Emscripten.Manifest-$(ToolChainManifestVersionBand)" Version="[$(MicrosoftNETWorkloadEmscriptenManifest60100PackageVersion)]" />
<PackageDownload Include="Microsoft.NET.Workload.Emscripten.net7.Manifest-$(ToolChainManifestVersionBand)" Version="[$(MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion)]" />
<PackageDownload Include="Microsoft.NET.Workload.Emscripten.net6.Manifest-$(ToolChainManifestVersionBand)" Version="[$(MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion)]" />
</ItemGroup>
<Import Project="all-package-references.csproj" />

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

@ -1,11 +1,13 @@
tmpdir
Workloads/Microsoft.NET.Sdk.*/LICENSE
WorkloadManifest.json
WorkloadManifest.targets
nupkgs
Microsoft.*.Sdk/targets/Microsoft.*.Sdk.ImplicitNamespaceImports.props
Microsoft.*.Sdk/targets/Microsoft.*.Sdk.SupportedTargetPlatforms.props
Microsoft.*.Sdk/targets/Microsoft.*.Sdk.DefaultItems.props
Microsoft.*.Sdk/targets/Microsoft.*.Sdk.Versions.props
Microsoft.*.Sdk/targets/Xamarin.Shared.Sdk.MultiTarget.targets
Microsoft.*.Sdk/Sdk/AutoImport.props
_pkg
.stamp-*

87
dotnet/Makefile
Просмотреть файл

@ -3,7 +3,7 @@ TOP = ..
include $(TOP)/Make.config
include $(TOP)/mk/rules.mk
DOTNET_MANIFESTS_PATH=$(DOTNET_DIR)/sdk-manifests/$(DOTNET_MANIFEST_VERSION_BAND)
DOTNET_MANIFESTS_PATH=$(DOTNET_DIR)/sdk-manifests/$(DOTNET_MANIFEST_VERSION_WITH_PRERELEASE_COMPONENT)
DOTNET_PACKS_PATH=$(DOTNET_DIR)/packs
DOTNET_TEMPLATE_PACKS_PATH=$(DOTNET_DIR)/template-packs
TMP_PKG_DIR=_pkg
@ -12,6 +12,7 @@ DOTNET_PLATFORMS_UPPERCASE:=$(shell echo $(DOTNET_PLATFORMS) | tr a-z A-Z)
# Create variables prefixed with the correctly cased platform name from the upper-cased platform name. This makes some of the next sections somewhat simpler.
$(foreach platform,$(DOTNET_PLATFORMS),$(eval $(platform)_NUGET_VERSION_NO_METADATA:=$($(shell echo $(platform) | tr a-z A-Z)_NUGET_VERSION_NO_METADATA)))
$(foreach platform,$(DOTNET_PLATFORMS),$(eval NET6_$(platform)_NUGET_VERSION_NO_METADATA:=$(NET6_$(shell echo $(platform) | tr a-z A-Z)_NUGET_VERSION_NO_METADATA)))
DOTNET_iOS_GLOBAL_USINGS=CoreGraphics Foundation UIKit
DOTNET_tvOS_GLOBAL_USINGS=CoreGraphics Foundation UIKit
@ -30,6 +31,7 @@ $(1)_NUGET_TARGETS = \
$(DOTNET_DESTDIR)/Microsoft.$(1).Sdk/targets/Microsoft.$(1).Sdk.Versions.props \
$(DOTNET_DESTDIR)/Microsoft.$(1).Sdk/targets/Microsoft.$(1).Sdk.targets \
$(DOTNET_DESTDIR)/Microsoft.$(1).Sdk/targets/Xamarin.Shared.Sdk.DefaultItems.targets \
$(DOTNET_DESTDIR)/Microsoft.$(1).Sdk/targets/Xamarin.Shared.Sdk.MultiTarget.targets \
$(DOTNET_DESTDIR)/Microsoft.$(1).Sdk/targets/Xamarin.Shared.Sdk.Publish.targets \
$(DOTNET_DESTDIR)/Microsoft.$(1).Sdk/targets/Xamarin.Shared.Sdk.TargetFrameworkInference.props \
$(DOTNET_DESTDIR)/Microsoft.$(1).Sdk/targets/Xamarin.Shared.Sdk.props \
@ -76,6 +78,14 @@ DIRECTORIES += \
$(DIRECTORIES):
$(Q) mkdir -p $@
ifneq ($(DOTNET_MANIFEST_VERSION_WITH_PRERELEASE_COMPONENT),$(DOTNET_MANIFEST_VERSION_BAND))
.stamp-cp-mono-workload: $(TOP)/Make.config
mkdir -p $(DOTNET_MANIFESTS_PATH)
$(CP) -r $(DOTNET_MANIFESTS_PATH)/../$(DOTNET_MANIFEST_VERSION_BAND)/* $(DOTNET_MANIFESTS_PATH)/
$(Q) touch $@
TARGETS += .stamp-cp-mono-workload
endif
CURRENT_HASH_LONG:=$(shell git log -1 --pretty=%H)
$(DOTNET_DESTDIR)/Microsoft.%: Microsoft.% | $(foreach platform,$(DOTNET_PLATFORMS),$(DOTNET_DESTDIR)/Microsoft.$(platform).Sdk/data $(DOTNET_DESTDIR)/Microsoft.$(platform).Sdk/Sdk $(DOTNET_DESTDIR)/Microsoft.$(platform).Sdk/targets $(DOTNET_DESTDIR)/Microsoft.$(platform).Templates) \
@ -98,13 +108,15 @@ targets/Microsoft.$(1).Sdk.Versions.props: targets/Microsoft.Sdk.Versions.templa
-e "s/@CURRENT_BRANCH@/$$(CURRENT_BRANCH_SED_ESCAPED)/g" \
-e "s/@CURRENT_HASH_LONG@/$$(CURRENT_HASH_LONG)/g" \
-e 's*@VALID_RUNTIME_IDENTIFIERS@*$(foreach rid,$(3),\n\t\t<_XamarinValidRuntimeIdentifier Include="$(rid)" Platform="$(1)" />)*' \
-e 's/@DOTNET_TFM@/$(DOTNET_TFM)/g' \
-e 's/@RUNTIME_PACK_RUNTIME_IDENTIFIERS@/$(4)/g' \
$$< > $$@.tmp
$$(Q) mv $$@.tmp $$@
Microsoft.$1.Sdk/targets/Microsoft.$1.Sdk.Versions.props: targets/Microsoft.$1.Sdk.Versions.props
$$(Q) $$(CP) $$< $$@
endef
$(foreach platform,$(DOTNET_PLATFORMS),$(eval $(call VersionsTemplate,$(platform),$(shell echo $(platform) | tr a-z A-Z),$(DOTNET_$(shell echo $(platform) | tr a-z A-Z)_RUNTIME_IDENTIFIERS))))
$(foreach platform,$(DOTNET_PLATFORMS),$(eval $(call VersionsTemplate,$(platform),$(shell echo $(platform) | tr a-z A-Z),$(DOTNET_$(shell echo $(platform) | tr a-z A-Z)_RUNTIME_IDENTIFIERS),$(shell echo $(DOTNET_$(shell echo $(platform) | tr a-z A-Z)_RUNTIME_IDENTIFIERS) | tr ' ' ';'))))
version-props: $(foreach platform,$(DOTNET_PLATFORMS),targets/Microsoft.$(platform).Sdk.Versions.props)
@ -134,8 +146,6 @@ Microsoft.$1.Sdk/targets/Microsoft.$1.Sdk.ImplicitNamespaceImports.props: target
-e "s/@TARGET_FRAMEWORK_VERSION@/$(subst net,,$(DOTNET_TFM))/g" \
-e "s/@GLOBAL_USINGS@/$(2)/g" \
$$< > $$@
x:: Microsoft.$1.Sdk/targets/Microsoft.$1.Sdk.ImplicitNamespaceImports.props
cat Microsoft.$1.Sdk/targets/Microsoft.$1.Sdk.ImplicitNamespaceImports.props
endef
$(foreach platform,$(DOTNET_PLATFORMS),$(eval $(call ImplicitNamespaceImports,$(platform),$(foreach using,$(DOTNET_$(platform)_GLOBAL_USINGS),\n\t\t<Using Include=\"$(using)\" Platform=\"$(platform)\" \/>))))
@ -147,14 +157,25 @@ Microsoft.$(1).Sdk/targets/Microsoft.$(1).Sdk.SupportedTargetPlatforms.props: $(
endef
$(foreach platform,$(DOTNET_PLATFORMS),$(eval $(call SupportedTargetPlatforms,$(platform))))
define WorkloadTargets
Workloads/Microsoft.NET.Sdk.$(1)/WorkloadManifest.json: targets/WorkloadManifest.$(1).template.json Makefile $(TOP)/Make.config.inc $(TOP)/.git/HEAD $(TOP)/.git/index Makefile
$$(Q) rm -f $$@.tmp
define SharedAfterTargetsTemplate
Microsoft.$(1).Sdk/targets/Xamarin.Shared.Sdk.MultiTarget.targets: targets/Xamarin.Shared.Sdk.MultiTarget.template.targets Makefile $(TOP)/Make.config.inc $(TOP)/.git/HEAD $(TOP)/.git/index
$$(Q_GEN) sed \
-e "s/@VERSION@/$3/g" \
-e "s/@BUNDLED_NETCORE_PLATFORMS_PACKAGE_VERSION@/$(BUNDLED_NETCORE_PLATFORMS_PACKAGE_VERSION)/g" \
-e "s/@PLATFORM_LOWERCASE@/$2/g" \
-e "s/@PLATFORM@/$1/g" \
-e "s/@NET6_NUGET_VERSION_NO_METADATA@/$2/g" \
$$< > $$@.tmp
$$(Q) mv $$@.tmp $$@
endef
$(foreach platform,$(DOTNET_PLATFORMS),$(eval $(call SharedAfterTargetsTemplate,$(platform),$(NET6_$(platform)_NUGET_VERSION_NO_METADATA))))
define WorkloadTargets
Workloads/Microsoft.NET.Sdk.$(1)/WorkloadManifest.json: Makefile $(TOP)/Make.config.inc $(TOP)/.git/HEAD $(TOP)/.git/index Makefile generate-workloadmanifest-json.csharp
$$(Q) mkdir -p Workloads/Microsoft.NET.Sdk.$(1)/
$$(Q) rm -f $$@.tmp
$$(Q_GEN) ./generate-workloadmanifest-json.csharp "$(1)" "$(3)" "$(4)" "$$(DOTNET_$(5)_RUNTIME_IDENTIFIERS)" "$$@.tmp" "$$(DOTNET_WINDOWS_PLATFORMS)"
$$(Q) mv $$@.tmp $$@
Workloads/Microsoft.NET.Sdk.$(1)/WorkloadManifest.targets: Workloads/WorkloadManifest.$(1).template.targets Makefile $(TOP)/Make.config.inc $(TOP)/.git/HEAD $(TOP)/.git/index
$$(Q_GEN) sed \
-e "s/@NUGET_VERSION_NO_METADATA@/$3/g" \
$$< > $$@.tmp
$$(Q) mv $$@.tmp $$@
@ -162,19 +183,30 @@ Workloads/Microsoft.NET.Sdk.$(1)/LICENSE: $(TOP)/LICENSE
$$(Q) $(CP) $$< $$@
WORKLOAD_TARGETS += Workloads/Microsoft.NET.Sdk.$(1)/WorkloadManifest.json
WORKLOAD_TARGETS += Workloads/Microsoft.NET.Sdk.$(1)/WorkloadManifest.targets
WORKLOAD_TARGETS += Workloads/Microsoft.NET.Sdk.$(1)/LICENSE
LOCAL_WORKLOAD_TARGETS += Workloads/Microsoft.NET.Sdk.$(1)/WorkloadManifest.json
LOCAL_WORKLOAD_TARGETS += Workloads/Microsoft.NET.Sdk.$(1)/WorkloadManifest.targets
LOCAL_WORKLOAD_TARGETS += Workloads/Microsoft.NET.Sdk.$(1)/LICENSE
endef
$(foreach platform,$(DOTNET_PLATFORMS),$(eval $(call WorkloadTargets,$(platform),$(shell echo $(platform) | tr A-Z a-z),$($(platform)_NUGET_VERSION_NO_METADATA))))
$(foreach platform,$(DOTNET_PLATFORMS),$(eval $(call WorkloadTargets,$(platform),$(shell echo $(platform) | tr A-Z a-z),$($(platform)_NUGET_VERSION_NO_METADATA),$(NET6_$(platform)_NUGET_VERSION_NO_METADATA),$(shell echo $(platform) | tr a-z A-Z))))
# We use a different versioning for stable releases (which is determined by the NUGET_PRERELEASE_IDENTIFIER variable being empty):
# We reset the commit distance (to the commits since NUGET_PRERELEASE_IDENTIFIER changed - which must have changed for a branch to become a stable branch)
# We use the commit distance as the third number in the version, instead of the fourth.
ifeq ($(NUGET_PRERELEASE_IDENTIFIER),)
$(foreach platform,$(DOTNET_PLATFORMS),$(eval $(platform)_MSI_VERSION:=$($(shell echo $(platform) | tr '[:lower:]' '[:upper:]')_NUGET_OS_VERSION).$(NUGET_STABLE_COMMIT_DISTANCE)))
else
$(foreach platform,$(DOTNET_PLATFORMS),$(eval $(platform)_MSI_VERSION:=$($(shell echo $(platform) | tr '[:lower:]' '[:upper:]')_NUGET_OS_VERSION).0.$($(shell echo $(platform) | tr a-z A-Z)_NUGET_COMMIT_DISTANCE)))
endif
$(DOTNET_NUPKG_DIR)/vs-workload.props: Makefile generate-vs-workload.csharp
$(Q) rm -f $@.tmp
$(Q_GEN) ./generate-vs-workload.csharp \
$(foreach platform,$(DOTNET_PLATFORMS),--platform $(platform) $($(shell echo $(platform) | tr '[:lower:]' '[:upper:]')_NUGET_OS_VERSION).0.$($(shell echo $(platform) | tr '[:lower:]' '[:upper:]')_NUGET_COMMIT_DISTANCE)) \
$(foreach platform,$(DOTNET_PLATFORMS),--platform $(platform) $($(platform)_MSI_VERSION)) \
$(foreach platform,$(DOTNET_WINDOWS_PLATFORMS),--windows-platform $(platform)) \
$(foreach platform,$(DOTNET_PLATFORMS),--shorten $($(shell echo $(platform) | tr '[:lower:]' '[:upper:]')_NUGET_VERSION_NO_METADATA)=$($(shell echo $(platform) | tr '[:lower:]' '[:upper:]')_NUGET_OS_VERSION).0.$($(shell echo $(platform) | tr '[:lower:]' '[:upper:]')_NUGET_COMMIT_DISTANCE)) \
$(foreach platform,$(DOTNET_PLATFORMS),--shorten $($(shell echo $(platform) | tr '[:lower:]' '[:upper:]')_NUGET_VERSION_NO_METADATA)=$($(platform)_MSI_VERSION)) \
--shorten Microsoft.MacCatalyst.Runtime.maccatalyst=Microsoft.MacCatalyst.Runtime \
--shorten Microsoft.NET.Sdk.MacCatalyst.Manifest=Microsoft.MacCatalyst.Manifest \
--shorten Microsoft.tvOS.Runtime.tvossimulator=Microsoft.tvOS.Runtime \
@ -191,6 +223,7 @@ $(DOTNET_NUPKG_DIR)/SignList.targets: Workloads/SignList.targets
TEMPLATED_FILES = \
$(foreach platform,$(DOTNET_PLATFORMS),Microsoft.$(platform).Sdk/targets/Microsoft.$(platform).Sdk.Versions.props) \
$(foreach platform,$(DOTNET_PLATFORMS),Microsoft.$(platform).Sdk/targets/Microsoft.$(platform).Sdk.SupportedTargetPlatforms.props) \
$(foreach platform,$(DOTNET_PLATFORMS),Microsoft.$(platform).Sdk/targets/Xamarin.Shared.Sdk.MultiTarget.targets) \
nupkgs/$(IOS_WINDOWS_NUGET).%.nupkg: CURRENT_VERSION_NO_METADATA=$(IOS_WINDOWS_NUGET_VERSION_NO_METADATA)
nupkgs/$(IOS_WINDOWS_NUGET).%.nupkg: CURRENT_VERSION_FULL=$(IOS_WINDOWS_NUGET_VERSION_FULL)
@ -217,12 +250,12 @@ nupkgs/$(1).$(2).nupkg: $(3) $(WORKLOAD_TARGETS) package/$(1)/package.csproj $(w
endef
# Create the NuGet packaging targets. It's amazing what make allows you to do...
$(foreach platform,$(DOTNET_PLATFORMS),$(eval $(call CreateNuGetTemplate,Microsoft.$(platform).Sdk,$($(platform)_NUGET_VERSION_NO_METADATA),$($(platform)_NUGET_TARGETS),,$(DOTNET_MANIFEST_VERSION_BAND))))
$(foreach platform,$(DOTNET_WINDOWS_PLATFORMS),$(eval $(call CreateWindowsNuGetTemplate,Microsoft.$(platform).Windows.Sdk,$(IOS_WINDOWS_NUGET_VERSION_NO_METADATA),$($(platform)_WINDOWS_NUGET_TARGETS),,$(DOTNET_MANIFEST_VERSION_BAND))))
$(foreach platform,$(DOTNET_PLATFORMS),$(eval $(call CreateNuGetTemplate,Microsoft.$(platform).Ref,$($(platform)_NUGET_VERSION_NO_METADATA),,,$(DOTNET_MANIFEST_VERSION_BAND))))
$(foreach platform,$(DOTNET_PLATFORMS),$(eval $(call CreateNuGetTemplate,Microsoft.$(platform).Templates,$($(platform)_NUGET_VERSION_NO_METADATA),,,$(DOTNET_MANIFEST_VERSION_BAND))))
$(foreach platform,$(DOTNET_PLATFORMS),$(eval $(call CreateNuGetTemplate,Microsoft.NET.Sdk.$(platform),$($(platform)_NUGET_VERSION_NO_METADATA),,.Manifest-$(MANIFEST_VERSION_BAND),$(MANIFEST_VERSION_BAND))))
$(foreach platform,$(DOTNET_PLATFORMS),$(foreach rid,$(DOTNET_$(platform)_RUNTIME_IDENTIFIERS),$(eval $(call CreateNuGetTemplate,Microsoft.$(platform).Runtime.$(rid),$($(platform)_NUGET_VERSION_NO_METADATA),,,$(DOTNET_MANIFEST_VERSION_BAND)))))
$(foreach platform,$(DOTNET_PLATFORMS),$(eval $(call CreateNuGetTemplate,Microsoft.$(platform).Sdk,$($(platform)_NUGET_VERSION_NO_METADATA),$($(platform)_NUGET_TARGETS),,$(DOTNET_VERSION_BAND))))
$(foreach platform,$(DOTNET_WINDOWS_PLATFORMS),$(eval $(call CreateWindowsNuGetTemplate,Microsoft.$(platform).Windows.Sdk,$(IOS_WINDOWS_NUGET_VERSION_NO_METADATA),$($(platform)_WINDOWS_NUGET_TARGETS),,$(DOTNET_VERSION_BAND))))
$(foreach platform,$(DOTNET_PLATFORMS),$(eval $(call CreateNuGetTemplate,Microsoft.$(platform).Ref,$($(platform)_NUGET_VERSION_NO_METADATA),,,$(DOTNET_VERSION_BAND))))
$(foreach platform,$(DOTNET_PLATFORMS),$(eval $(call CreateNuGetTemplate,Microsoft.$(platform).Templates,$($(platform)_NUGET_VERSION_NO_METADATA),,,$(DOTNET_VERSION_BAND))))
$(foreach platform,$(DOTNET_PLATFORMS),$(eval $(call CreateNuGetTemplate,Microsoft.NET.Sdk.$(platform),$($(platform)_NUGET_VERSION_NO_METADATA),,.Manifest-$(DOTNET_MANIFEST_VERSION_WITH_PRERELEASE_COMPONENT),$(DOTNET_MANIFEST_VERSION_WITH_PRERELEASE_COMPONENT))))
$(foreach platform,$(DOTNET_PLATFORMS),$(foreach rid,$(DOTNET_$(platform)_RUNTIME_IDENTIFIERS),$(eval $(call CreateNuGetTemplate,Microsoft.$(platform).Runtime.$(rid),$($(platform)_NUGET_VERSION_NO_METADATA),,,$(DOTNET_VERSION_BAND)))))
# Copy the nuget from the temporary directory into the final directory
$(DOTNET_NUPKG_DIR)/%.nupkg: nupkgs/%.nupkg | $(DOTNET_NUPKG_DIR)
@ -244,7 +277,7 @@ SDK_PACKS_$(1) = $(DOTNET_NUPKG_DIR)/$($(1)_NUGET).Sdk.$($(1)_NUGET_VERSION_NO_M
SDK_PACKS += $$(SDK_PACKS_$(1))
TEMPLATE_PACKS_$(1) = $(DOTNET_NUPKG_DIR)/$($(1)_NUGET).Templates.$($(1)_NUGET_VERSION_NO_METADATA).nupkg
TEMPLATE_PACKS += $$(TEMPLATE_PACKS_$(1))
WORKLOAD_PACKS_$(1) = $(DOTNET_NUPKG_DIR)/$(subst Microsoft.,Microsoft.NET.Sdk.,$($(1)_NUGET)).Manifest-$(MANIFEST_VERSION_BAND).$($(1)_NUGET_VERSION_NO_METADATA).nupkg
WORKLOAD_PACKS_$(1) = $(DOTNET_NUPKG_DIR)/$(subst Microsoft.,Microsoft.NET.Sdk.,$($(1)_NUGET)).Manifest-$(DOTNET_MANIFEST_VERSION_WITH_PRERELEASE_COMPONENT).$($(1)_NUGET_VERSION_NO_METADATA).nupkg
WORKLOAD_PACKS += $$(WORKLOAD_PACKS_$(1))
pack-$(shell echo $(1) | tr A-Z a-z): $$(RUNTIME_PACKS_$(1)) $$(REF_PACKS_$(1)) $$(SDK_PACKS_$(1)) $$(TEMPLATE_PACKS_$(1)) $$(WORKLOAD_PACKS_$(1))
endef
@ -296,8 +329,8 @@ define CreatePackage
$(TMP_PKG_DIR)/Microsoft.$1.Workload.$2.pkg: $($(1)_NUGET_TARGETS) $(WORKLOAD_TARGETS) Makefile | $(TMP_PKG_DIR)
$$(Q) rm -f $$@
$$(Q) rm -rf tmpdir/Microsoft.NET.Sdk.$1.$2/
$$(Q) mkdir -p tmpdir/Microsoft.NET.Sdk.$1.$2/usr/local/share/dotnet/sdk-manifests/$(DOTNET_MANIFEST_VERSION_BAND)/
$$(Q) $$(CP) -r Workloads/Microsoft.NET.Sdk.$1 tmpdir/Microsoft.NET.Sdk.$1.$2/usr/local/share/dotnet/sdk-manifests/$(DOTNET_MANIFEST_VERSION_BAND)/
$$(Q) mkdir -p tmpdir/Microsoft.NET.Sdk.$1.$2/usr/local/share/dotnet/sdk-manifests/$(DOTNET_MANIFEST_VERSION_WITH_PRERELEASE_COMPONENT)/
$$(Q) $$(CP) -r Workloads/Microsoft.NET.Sdk.$1 tmpdir/Microsoft.NET.Sdk.$1.$2/usr/local/share/dotnet/sdk-manifests/$(DOTNET_MANIFEST_VERSION_WITH_PRERELEASE_COMPONENT)/microsoft.net.sdk.$3
$$(Q_GEN) pkgbuild --quiet --version '$2' --root tmpdir/Microsoft.NET.Sdk.$1.$2 --component-plist PackageInfo.plist --install-location / --identifier com.microsoft.net.$3.workload.pkg $$@.tmp
$$(Q) mv $$@.tmp $$@
@ -350,11 +383,11 @@ PACKAGE_TARGETS += $(DOTNET_PKG_DIR)/Microsoft.$1.Bundle.$2.pkg
$(TMP_PKG_DIR)/Microsoft.$1.Bundle.$2.zip: $($(1)_NUGET_TARGETS) $(WORKLOAD_TARGETS) Makefile $(REF_PACKS_$(4)) $(SDK_PACKs_$(4)) $(TEMPLATE_PACKS_$(4)) | $(TMP_PKG_DIR)
$$(Q) rm -rf $$@ $$@.tmpdir $$@.tmp
$$(Q) mkdir -p $$@.tmpdir/dotnet/sdk-manifests/$(DOTNET_MANIFEST_VERSION_BAND)/
$$(Q) mkdir -p $$@.tmpdir/dotnet/sdk-manifests/$(DOTNET_MANIFEST_VERSION_WITH_PRERELEASE_COMPONENT)/
$$(Q) mkdir -p $$@.tmpdir/dotnet/packs/Microsoft.$1.Sdk
$$(Q) mkdir -p $$@.tmpdir/dotnet/packs/Microsoft.$1.Ref
$$(Q) mkdir -p $$@.tmpdir/dotnet/template-packs
$$(Q) $(CP) -r Workloads/Microsoft.NET.Sdk.$1 $$@.tmpdir/dotnet/sdk-manifests/$(DOTNET_MANIFEST_VERSION_BAND)/
$$(Q) $(CP) -r Workloads/Microsoft.NET.Sdk.$1 $$@.tmpdir/dotnet/sdk-manifests/$(DOTNET_MANIFEST_VERSION_WITH_PRERELEASE_COMPONENT)/microsoft.net.sdk.$3
$$(Q) $(CP) -r $(DOTNET_DESTDIR)/Microsoft.$1.Sdk $$@.tmpdir/dotnet/packs/Microsoft.$1.Sdk/$2
$$(Q) $(CP) -r $(DOTNET_DESTDIR)/Microsoft.$1.Ref $$@.tmpdir/dotnet/packs/Microsoft.$1.Ref/$2
$$(Q) $(CP) $(TEMPLATE_PACKS_$(4)) $$@.tmpdir/dotnet/template-packs/$(subst +$(NUGET_BUILD_METADATA),,$(notdir $(TEMPLATE_PACKS_$(4))))
@ -378,12 +411,12 @@ $(foreach platform,$(DOTNET_PLATFORMS),$(eval $(call CreatePackage,$(platform),$
define CreateWindowsBundle
$(TMP_PKG_DIR)/Microsoft.$1.Windows.Bundle.$2.zip: $($(1)_NUGET_TARGETS) $($(1)_WINDOWS_NUGET_TARGETS) $(WORKLOAD_TARGETS) Makefile $(REF_PACKS_$(4)) $(SDK_PACKS_$(4)) $(SDK_PACKS_$(4)_WINDOWS) $(TEMPLATE_PACKS_$(4)) | $(TMP_PKG_DIR)
$$(Q) rm -rf $$@ $$@.tmpdir $$@.tmp
$$(Q) mkdir -p $$@.tmpdir/dotnet/sdk-manifests/$(DOTNET_MANIFEST_VERSION_BAND)/
$$(Q) mkdir -p $$@.tmpdir/dotnet/sdk-manifests/$(DOTNET_MANIFEST_VERSION_WITH_PRERELEASE_COMPONENT)/
$$(Q) mkdir -p $$@.tmpdir/dotnet/packs/Microsoft.$1.Sdk
$$(Q) mkdir -p $$@.tmpdir/dotnet/packs/Microsoft.$1.Windows.Sdk
$$(Q) mkdir -p $$@.tmpdir/dotnet/packs/Microsoft.$1.Ref
$$(Q) mkdir -p $$@.tmpdir/dotnet/template-packs
$$(Q) $(CP) -r Workloads/Microsoft.NET.Sdk.$1 $$@.tmpdir/dotnet/sdk-manifests/$(DOTNET_MANIFEST_VERSION_BAND)/
$$(Q) $(CP) -r Workloads/Microsoft.NET.Sdk.$1 $$@.tmpdir/dotnet/sdk-manifests/$(DOTNET_MANIFEST_VERSION_WITH_PRERELEASE_COMPONENT)/microsoft.net.sdk.$3
$$(Q) $(CP) -r $(DOTNET_DESTDIR)/Microsoft.$1.Sdk $$@.tmpdir/dotnet/packs/Microsoft.$1.Sdk/$2
$$(Q) $(CP) -r $(DOTNET_DESTDIR)/Microsoft.$1.Windows.Sdk $$@.tmpdir/dotnet/packs/Microsoft.$1.Windows.Sdk/$2
$$(Q) $(CP) -r $(DOTNET_DESTDIR)/Microsoft.$1.Ref $$@.tmpdir/dotnet/packs/Microsoft.$1.Ref/$2

2
dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/MacCatalystApp1.csproj
Просмотреть файл

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0-maccatalyst</TargetFramework>
<TargetFramework>net7.0-maccatalyst</TargetFramework>
<RuntimeIdentifier>maccatalyst-x64</RuntimeIdentifier>
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">MacCatalystApp1</RootNamespace>
<OutputType>Exe</OutputType>

2
dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalystbinding/MacCatalystBinding1.csproj
Просмотреть файл

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0-maccatalyst</TargetFramework>
<TargetFramework>net7.0-maccatalyst</TargetFramework>
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">MacCatalystBinding1</RootNamespace>
<Nullable>enable</Nullable>
<ImplicitUsings>true</ImplicitUsings>

2
dotnet/Templates/Microsoft.iOS.Templates/ios-tabbed/iOSTabbedApp1.csproj
Просмотреть файл

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0-ios</TargetFramework>
<TargetFramework>net7.0-ios</TargetFramework>
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">iOSTabbedApp1</RootNamespace>
<OutputType>Exe</OutputType>
<Nullable>enable</Nullable>

2
dotnet/Templates/Microsoft.iOS.Templates/ios/iOSApp1.csproj
Просмотреть файл

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0-ios</TargetFramework>
<TargetFramework>net7.0-ios</TargetFramework>
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">iOSApp1</RootNamespace>
<OutputType>Exe</OutputType>
<Nullable>enable</Nullable>

2
dotnet/Templates/Microsoft.iOS.Templates/iosbinding/iOSBinding1.csproj
Просмотреть файл

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0-ios</TargetFramework>
<TargetFramework>net7.0-ios</TargetFramework>
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">iOSBinding1</RootNamespace>
<Nullable>enable</Nullable>
<ImplicitUsings>true</ImplicitUsings>

2
dotnet/Templates/Microsoft.iOS.Templates/ioslib/iOSLib1.csproj
Просмотреть файл

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0-ios</TargetFramework>
<TargetFramework>net7.0-ios</TargetFramework>
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">iOSLib1</RootNamespace>
<Nullable>enable</Nullable>
<ImplicitUsings>true</ImplicitUsings>

4
dotnet/Templates/Microsoft.macOS.Templates/macos/macOSApp1.csproj
Просмотреть файл

@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0-macos</TargetFramework>
<TargetFramework>net7.0-macos</TargetFramework>
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">macOSApp1</RootNamespace>
<OutputType>Exe</OutputType>
<Nullable>enable</Nullable>
<ImplicitUsings>true</ImplicitUsings>
<SupportedOSPlatformVersion>minOSVersion</SupportedOSPlatformVersion>
</PropertyGroup>
</Project>
</Project>

2
dotnet/Templates/Microsoft.macOS.Templates/macosbinding/macOSBinding1.csproj
Просмотреть файл

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0-macos</TargetFramework>
<TargetFramework>net7.0-macos</TargetFramework>
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">macOSBinding1</RootNamespace>
<Nullable>enable</Nullable>
<ImplicitUsings>true</ImplicitUsings>

2
dotnet/Templates/Microsoft.tvOS.Templates/tvos/tvOSApp1.csproj
Просмотреть файл

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0-tvos</TargetFramework>
<TargetFramework>net7.0-tvos</TargetFramework>
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">tvOSApp1</RootNamespace>
<OutputType>Exe</OutputType>
<Nullable>enable</Nullable>

2
dotnet/Templates/Microsoft.tvOS.Templates/tvosbinding/tvOSBinding1.csproj
Просмотреть файл

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0-tvos</TargetFramework>
<TargetFramework>net7.0-tvos</TargetFramework>
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">tvOSBinding1</RootNamespace>
<Nullable>enable</Nullable>
<ImplicitUsings>true</ImplicitUsings>

7
dotnet/Workloads/Microsoft.NET.Sdk.MacCatalyst/WorkloadManifest.targets
Просмотреть файл

@ -1,7 +0,0 @@
<Project>
<Import Project="Sdk.props" Sdk="Microsoft.MacCatalyst.Sdk.net6" Condition="'$(TargetPlatformIdentifier)' == 'MacCatalyst'" />
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '6.0')) ">
<SdkSupportedTargetPlatformIdentifier Include="maccatalyst" DisplayName="Mac Catalyst" />
</ItemGroup>
</Project>

8
dotnet/Workloads/Microsoft.NET.Sdk.iOS/WorkloadManifest.targets
Просмотреть файл

@ -1,8 +0,0 @@
<Project>
<Import Project="Sdk.props" Sdk="Microsoft.iOS.Sdk.net6" Condition="'$(TargetPlatformIdentifier)' == 'iOS'" />
<Import Project="Sdk.props" Sdk="Microsoft.iOS.Windows.Sdk.Aliased.net6" Condition=" '$(TargetPlatformIdentifier)' == 'iOS' and $([MSBuild]::IsOSPlatform('windows'))" />
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '6.0')) ">
<SdkSupportedTargetPlatformIdentifier Include="ios" DisplayName="iOS" />
</ItemGroup>
</Project>

7
dotnet/Workloads/Microsoft.NET.Sdk.macOS/WorkloadManifest.targets
Просмотреть файл

@ -1,7 +0,0 @@
<Project>
<Import Project="Sdk.props" Sdk="Microsoft.macOS.Sdk.net6" Condition="'$(TargetPlatformIdentifier)' == 'macOS'" />
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '6.0')) ">
<SdkSupportedTargetPlatformIdentifier Include="macos" DisplayName="macOS" />
</ItemGroup>
</Project>

7
dotnet/Workloads/Microsoft.NET.Sdk.tvOS/WorkloadManifest.targets
Просмотреть файл

@ -1,7 +0,0 @@
<Project>
<Import Project="Sdk.props" Sdk="Microsoft.tvOS.Sdk.net6" Condition="'$(TargetPlatformIdentifier)' == 'tvOS'" />
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '6.0')) ">
<SdkSupportedTargetPlatformIdentifier Include="tvos" DisplayName="tvOS" />
</ItemGroup>
</Project>

14
dotnet/Workloads/WorkloadManifest.MacCatalyst.template.targets Normal file
Просмотреть файл

@ -0,0 +1,14 @@
<Project>
<ImportGroup Condition=" '$(TargetPlatformIdentifier)' == 'MacCatalyst' ">
<Import Project="Sdk.props" Sdk="Microsoft.$(TargetPlatformIdentifier).Sdk.net7" Condition=" $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '7.0')) " />
<Import Project="Sdk.props" Sdk="Microsoft.$(TargetPlatformIdentifier).Sdk.net6" Condition=" $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '6.0')) " />
</ImportGroup>
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '6.0')) ">
<SdkSupportedTargetPlatformIdentifier Include="maccatalyst" DisplayName="Mac Catalyst" />
</ItemGroup>
<PropertyGroup Condition=" '$(TargetPlatformIdentifier)' == 'MacCatalyst' and $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '6.0')) ">
<AfterMicrosoftNETSdkTargets>$(AfterMicrosoftNETSdkTargets);$(_XamarinSdkRootDirectory)..\@NUGET_VERSION_NO_METADATA@\targets\Xamarin.Shared.Sdk.MultiTarget.targets</AfterMicrosoftNETSdkTargets>
</PropertyGroup>
</Project>

16
dotnet/Workloads/WorkloadManifest.iOS.template.targets Normal file
Просмотреть файл

@ -0,0 +1,16 @@
<Project>
<ImportGroup Condition=" '$(TargetPlatformIdentifier)' == 'iOS' ">
<Import Project="Sdk.props" Sdk="Microsoft.$(TargetPlatformIdentifier).Sdk.net7" Condition=" $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '7.0')) " />
<Import Project="Sdk.props" Sdk="Microsoft.$(TargetPlatformIdentifier).Sdk.net6" Condition=" $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '6.0')) " />
<Import Project="Sdk.props" Sdk="Microsoft.$(TargetPlatformIdentifier).Windows.Sdk.Aliased.net7" Condition=" $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '7.0')) And $([MSBuild]::IsOSPlatform('windows'))" />
<Import Project="Sdk.props" Sdk="Microsoft.$(TargetPlatformIdentifier).Windows.Sdk.Aliased.net6" Condition=" $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '6.0')) And $([MSBuild]::IsOSPlatform('windows'))" />
</ImportGroup>
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '6.0')) ">
<SdkSupportedTargetPlatformIdentifier Include="ios" DisplayName="iOS" />
</ItemGroup>
<PropertyGroup Condition=" '$(TargetPlatformIdentifier)' == 'iOS' and $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '6.0')) ">
<AfterMicrosoftNETSdkTargets>$(AfterMicrosoftNETSdkTargets);$(_XamarinSdkRootDirectory)..\@NUGET_VERSION_NO_METADATA@\targets\Xamarin.Shared.Sdk.MultiTarget.targets</AfterMicrosoftNETSdkTargets>
</PropertyGroup>
</Project>

14
dotnet/Workloads/WorkloadManifest.macOS.template.targets Normal file
Просмотреть файл

@ -0,0 +1,14 @@
<Project>
<ImportGroup Condition=" '$(TargetPlatformIdentifier)' == 'macOS' ">
<Import Project="Sdk.props" Sdk="Microsoft.$(TargetPlatformIdentifier).Sdk.net7" Condition=" $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '7.0')) " />
<Import Project="Sdk.props" Sdk="Microsoft.$(TargetPlatformIdentifier).Sdk.net6" Condition=" $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '6.0')) " />
</ImportGroup>
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '6.0')) ">
<SdkSupportedTargetPlatformIdentifier Include="macos" DisplayName="macOS" />
</ItemGroup>
<PropertyGroup Condition=" '$(TargetPlatformIdentifier)' == 'macOS' and $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '6.0')) ">
<AfterMicrosoftNETSdkTargets>$(AfterMicrosoftNETSdkTargets);$(_XamarinSdkRootDirectory)..\@NUGET_VERSION_NO_METADATA@\targets\Xamarin.Shared.Sdk.MultiTarget.targets</AfterMicrosoftNETSdkTargets>
</PropertyGroup>
</Project>

14
dotnet/Workloads/WorkloadManifest.tvOS.template.targets Normal file
Просмотреть файл

@ -0,0 +1,14 @@
<Project>
<ImportGroup Condition=" '$(TargetPlatformIdentifier)' == 'tvOS' ">
<Import Project="Sdk.props" Sdk="Microsoft.$(TargetPlatformIdentifier).Sdk.net7" Condition=" $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '7.0')) " />
<Import Project="Sdk.props" Sdk="Microsoft.$(TargetPlatformIdentifier).Sdk.net6" Condition=" $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '6.0')) " />
</ImportGroup>
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '6.0')) ">
<SdkSupportedTargetPlatformIdentifier Include="tvos" DisplayName="tvOS" />
</ItemGroup>
<PropertyGroup Condition=" '$(TargetPlatformIdentifier)' == 'tvOS' and $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '6.0')) ">
<AfterMicrosoftNETSdkTargets>$(AfterMicrosoftNETSdkTargets);$(_XamarinSdkRootDirectory)..\@NUGET_VERSION_NO_METADATA@\targets\Xamarin.Shared.Sdk.MultiTarget.targets</AfterMicrosoftNETSdkTargets>
</PropertyGroup>
</Project>

116
dotnet/generate-workloadmanifest-json.csharp Executable file
Просмотреть файл

@ -0,0 +1,116 @@
#!/usr/bin/env /Library/Frameworks/Mono.framework/Commands/csharp
// arguments are: <platform> <outputPath>
using System.IO;
using System.Xml;
var args = Environment.GetCommandLineArgs ();
var expectedArgumentCount = 6;
if (args.Length != expectedArgumentCount + 2 /* 2 default arguments (executable + script) + 'expectedArgumentCount' arguments we're interested in */) {
// first arg is "/Library/Frameworks/Mono.framework/Versions/4.8.0/lib/mono/4.5/csharp.exe"
// second arg the script itself
// then comes the ones we care about
Console.WriteLine ($"Need {expectedArgumentCount} arguments, got {args.Length - 2}");
Environment.Exit (1);
return;
}
var argumentIndex = 2;
var platform = args [argumentIndex++];
var version = args [argumentIndex++];
var net6Version = args [argumentIndex++];
var runtimeIdentifiers = args [argumentIndex++].Split (' ');
var outputPath = args [argumentIndex++];
var windowsPlatforms = args [argumentIndex++].Split (' ');
var hasWindows = Array.IndexOf (windowsPlatforms, platform) >= 0;
var platformLowerCase = platform.ToLowerInvariant ();
using (TextWriter writer = new StreamWriter (outputPath)) {
writer.WriteLine ($"{{");
writer.WriteLine ($" \"version\": \"{version}\",");
writer.WriteLine ($" \"workloads\": {{");
writer.WriteLine ($" \"{platformLowerCase}\": {{");
writer.WriteLine ($" \"description\": \".NET SDK Workload for building {platform} applications.\",");
writer.WriteLine ($" \"packs\": [");
writer.WriteLine ($" \"Microsoft.{platform}.Sdk.net7\",");
writer.WriteLine ($" \"Microsoft.{platform}.Sdk.net6\",");
if (hasWindows) {
writer.WriteLine ($" \"Microsoft.{platform}.Windows.Sdk.Aliased.net7\",");
writer.WriteLine ($" \"Microsoft.{platform}.Windows.Sdk.Aliased.net6\",");
}
writer.WriteLine ($" \"Microsoft.{platform}.Ref\",");
foreach (var rid in runtimeIdentifiers) {
writer.WriteLine ($" \"Microsoft.{platform}.Runtime.{rid}\",");
}
writer.WriteLine ($" \"Microsoft.{platform}.Templates.net7\"");
writer.WriteLine ($" ],");
writer.WriteLine ($" \"extends\": [");
if (platform == "macOS") {
writer.WriteLine ($" \"microsoft-net-runtime-mono-tooling\",");
writer.WriteLine ($" \"microsoft-net-runtime-mono-tooling-net6\",");
} else {
writer.WriteLine ($" \"microsoft-net-runtime-{platformLowerCase}\",");
writer.WriteLine ($" \"microsoft-net-runtime-{platformLowerCase}-net6\",");
}
writer.WriteLine ($" ]");
writer.WriteLine ($" }},");
writer.WriteLine ($" }},");
writer.WriteLine ($" \"packs\": {{");
writer.WriteLine ($" \"Microsoft.{platform}.Sdk.net7\": {{");
writer.WriteLine ($" \"kind\": \"sdk\",");
writer.WriteLine ($" \"version\": \"{version}\",");
writer.WriteLine ($" \"alias-to\": {{");
writer.WriteLine ($" \"any\": \"Microsoft.{platform}.Sdk\"");
writer.WriteLine ($" }}");
writer.WriteLine ($" }},");
writer.WriteLine ($" \"Microsoft.{platform}.Sdk.net6\": {{");
writer.WriteLine ($" \"kind\": \"sdk\",");
writer.WriteLine ($" \"version\": \"{net6Version}\",");
writer.WriteLine ($" \"alias-to\": {{");
writer.WriteLine ($" \"any\": \"Microsoft.{platform}.Sdk\"");
writer.WriteLine ($" }}");
writer.WriteLine ($" }},");
if (hasWindows) {
writer.WriteLine ($" \"Microsoft.{platform}.Windows.Sdk.Aliased.net7\": {{");
writer.WriteLine ($" \"kind\": \"sdk\",");
writer.WriteLine ($" \"version\": \"{version}\",");
writer.WriteLine ($" \"alias-to\": {{");
writer.WriteLine ($" \"win-x64\": \"Microsoft.{platform}.Windows.Sdk\",");
writer.WriteLine ($" \"win-x86\": \"Microsoft.{platform}.Windows.Sdk\",");
writer.WriteLine ($" \"win-arm64\": \"Microsoft.{platform}.Windows.Sdk\",");
writer.WriteLine ($" }}");
writer.WriteLine ($" }},");
writer.WriteLine ($" \"Microsoft.{platform}.Windows.Sdk.Aliased.net6\": {{");
writer.WriteLine ($" \"kind\": \"sdk\",");
writer.WriteLine ($" \"version\": \"{net6Version}\",");
writer.WriteLine ($" \"alias-to\": {{");
writer.WriteLine ($" \"win-x64\": \"Microsoft.{platform}.Windows.Sdk\",");
writer.WriteLine ($" \"win-x86\": \"Microsoft.{platform}.Windows.Sdk\",");
writer.WriteLine ($" \"win-arm64\": \"Microsoft.{platform}.Windows.Sdk\",");
writer.WriteLine ($" }}");
writer.WriteLine ($" }},");
}
writer.WriteLine ($" \"Microsoft.{platform}.Ref\": {{");
writer.WriteLine ($" \"kind\": \"framework\",");
writer.WriteLine ($" \"version\": \"{version}\"");
writer.WriteLine ($" }},");
foreach (var rid in runtimeIdentifiers) {
writer.WriteLine ($" \"Microsoft.{platform}.Runtime.{rid}\": {{");
writer.WriteLine ($" \"kind\": \"framework\",");
writer.WriteLine ($" \"version\": \"{version}\"");
writer.WriteLine ($" }},");
}
writer.WriteLine ($" \"Microsoft.{platform}.Templates.net7\": {{");
writer.WriteLine ($" \"kind\": \"template\",");
writer.WriteLine ($" \"version\": \"{version}\",");
writer.WriteLine ($" \"alias-to\": {{");
writer.WriteLine ($" \"any\": \"Microsoft.{platform}.Templates\",");
writer.WriteLine ($" }}");
writer.WriteLine ($" }}");
writer.WriteLine ($" }}");
writer.WriteLine ($"}}");
}
Environment.Exit (0);

21
dotnet/targets/Microsoft.Sdk.ImplicitNamespaceImports.template.props
Просмотреть файл

@ -27,25 +27,4 @@
And ('$(ImplicitUsings)' == 'true' Or '$(ImplicitUsings)' == 'enable')
And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '@TARGET_FRAMEWORK_VERSION@'))">@GLOBAL_USINGS@
</ItemGroup>
<!--
Add a 'global using nfloat = System.Runtime.InteropServices.NFloat' to ease migration from Xamarin.
This is not grouped with the other usings, because those are not enabled by default (ImplicitUsings is empty by default, but set in our templates).
However, the main target for this using is upgraded projects, which won't have ImplicitUsings set to anything, so we
use a different condition (NoNFloatUsing) to disable if desired.
Note: we only add this if compiling using C# 10 or later.
-->
<ItemGroup Condition="'$(TargetPlatformIdentifier)' == '@PLATFORM@'
And '$(Language)' == 'C#'
And $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '@TARGET_FRAMEWORK_VERSION@'))
And '$(NoNFloatUsing)' != 'true'
And ('$(LangVersion)' == ''
Or '$(LangVersion)' == 'preview'
Or '$(LangVersion)' == 'latest'
Or '$(LangVersion)' == 'latestMajor'
Or '$(LangVersion)' == 'default'
Or $([MSBuild]::VersionGreaterThanOrEquals('$(LangVersion)','10.0'))
)">
<Using Include="System.Runtime.InteropServices.NFloat" Platform="@PLATFORM@" Alias="nfloat" />
</ItemGroup>
</Project>

16
dotnet/targets/Microsoft.Sdk.Versions.template.props
Просмотреть файл

@ -11,4 +11,20 @@
<ItemGroup>@VALID_RUNTIME_IDENTIFIERS@
</ItemGroup>
<!-- Declare the XI/XM framework bundled with this version of the SDK. See Microsoft.NETCoreSdk.BundledVersions.props -->
<ItemGroup>
<KnownFrameworkReference
Include="Microsoft.@PLATFORM@"
TargetFramework="@DOTNET_TFM@"
RuntimeFrameworkName="Microsoft.@PLATFORM@"
DefaultRuntimeFrameworkVersion="@NUGET_VERSION_NO_METADATA@"
LatestRuntimeFrameworkVersion="@NUGET_VERSION_NO_METADATA@"
TargetingPackName="Microsoft.@PLATFORM@.Ref"
TargetingPackVersion="@NUGET_VERSION_NO_METADATA@"
RuntimePackNamePatterns="Microsoft.@PLATFORM@.Runtime.**RID**"
RuntimePackRuntimeIdentifiers="@RUNTIME_PACK_RUNTIME_IDENTIFIERS@"
Profile="@PLATFORM@"
/>
</ItemGroup>
</Project>

43
dotnet/targets/WorkloadManifest.MacCatalyst.template.json
Просмотреть файл

@ -1,43 +0,0 @@
{
"version": "@VERSION@",
"workloads": {
"@PLATFORM_LOWERCASE@": {
"description": ".NET SDK Workload for building macOS applications with @PLATFORM@.",
"packs": [
"Microsoft.@PLATFORM@.Sdk.net6",
"Microsoft.@PLATFORM@.Ref",
"Microsoft.@PLATFORM@.Runtime.maccatalyst-arm64",
"Microsoft.@PLATFORM@.Runtime.maccatalyst-x64",
"Microsoft.@PLATFORM@.Templates"
],
"extends": [
"microsoft-net-runtime-maccatalyst"
]
}
},
"packs": {
"Microsoft.@PLATFORM@.Sdk.net6": {
"kind": "sdk",
"version": "@VERSION@",
"alias-to": {
"any": "Microsoft.@PLATFORM@.Sdk"
}
},
"Microsoft.@PLATFORM@.Ref": {
"kind": "framework",
"version": "@VERSION@"
},
"Microsoft.@PLATFORM@.Runtime.maccatalyst-arm64": {
"kind": "framework",
"version": "@VERSION@"
},
"Microsoft.@PLATFORM@.Runtime.maccatalyst-x64": {
"kind": "framework",
"version": "@VERSION@"
},
"Microsoft.@PLATFORM@.Templates": {
"kind": "template",
"version": "@VERSION@"
}
}
}

68
dotnet/targets/WorkloadManifest.iOS.template.json
Просмотреть файл

@ -1,68 +0,0 @@
{
"version": "@VERSION@",
"workloads": {
"@PLATFORM_LOWERCASE@": {
"description": ".NET SDK Workload for building @PLATFORM@ applications.",
"packs": [
"Microsoft.@PLATFORM@.Sdk.net6",
"Microsoft.@PLATFORM@.Windows.Sdk.Aliased.net6",
"Microsoft.@PLATFORM@.Ref",
"Microsoft.@PLATFORM@.Runtime.ios-arm",
"Microsoft.@PLATFORM@.Runtime.ios-arm64",
"Microsoft.@PLATFORM@.Runtime.iossimulator-x86",
"Microsoft.@PLATFORM@.Runtime.iossimulator-x64",
"Microsoft.@PLATFORM@.Runtime.iossimulator-arm64",
"Microsoft.@PLATFORM@.Templates"
],
"extends": [
"microsoft-net-runtime-ios"
]
}
},
"packs": {
"Microsoft.@PLATFORM@.Sdk.net6": {
"kind": "sdk",
"version": "@VERSION@",
"alias-to": {
"any": "Microsoft.@PLATFORM@.Sdk"
}
},
"Microsoft.@PLATFORM@.Windows.Sdk.Aliased.net6": {
"kind": "sdk",
"version": "@VERSION@",
"alias-to": {
"win-x64": "Microsoft.@PLATFORM@.Windows.Sdk",
"win-x86": "Microsoft.@PLATFORM@.Windows.Sdk",
"win-arm64": "Microsoft.@PLATFORM@.Windows.Sdk",
}
},
"Microsoft.@PLATFORM@.Ref": {
"kind": "framework",
"version": "@VERSION@"
},
"Microsoft.@PLATFORM@.Runtime.ios-arm": {
"kind": "framework",
"version": "@VERSION@"
},
"Microsoft.@PLATFORM@.Runtime.ios-arm64": {
"kind": "framework",
"version": "@VERSION@"
},
"Microsoft.@PLATFORM@.Runtime.iossimulator-x86": {
"kind": "framework",
"version": "@VERSION@"
},
"Microsoft.@PLATFORM@.Runtime.iossimulator-x64": {
"kind": "framework",
"version": "@VERSION@"
},
"Microsoft.@PLATFORM@.Runtime.iossimulator-arm64": {
"kind": "framework",
"version": "@VERSION@"
},
"Microsoft.@PLATFORM@.Templates": {
"kind": "template",
"version": "@VERSION@"
}
}
}

43
dotnet/targets/WorkloadManifest.macOS.template.json
Просмотреть файл

@ -1,43 +0,0 @@
{
"version": "@VERSION@",
"workloads": {
"@PLATFORM_LOWERCASE@": {
"description": ".NET SDK Workload for building @PLATFORM@ applications.",
"packs": [
"Microsoft.@PLATFORM@.Sdk.net6",
"Microsoft.@PLATFORM@.Ref",
"Microsoft.@PLATFORM@.Runtime.osx-arm64",
"Microsoft.@PLATFORM@.Runtime.osx-x64",
"Microsoft.@PLATFORM@.Templates"
],
"extends": [
"microsoft-net-runtime-mono-tooling"
]
}
},
"packs": {
"Microsoft.@PLATFORM@.Sdk.net6": {
"kind": "sdk",
"version": "@VERSION@",
"alias-to": {
"any": "Microsoft.@PLATFORM@.Sdk"
}
},
"Microsoft.@PLATFORM@.Ref": {
"kind": "framework",
"version": "@VERSION@"
},
"Microsoft.@PLATFORM@.Runtime.osx-arm64": {
"kind": "framework",
"version": "@VERSION@"
},
"Microsoft.@PLATFORM@.Runtime.osx-x64": {
"kind": "framework",
"version": "@VERSION@"
},
"Microsoft.@PLATFORM@.Templates": {
"kind": "template",
"version": "@VERSION@"
}
}
}

48
dotnet/targets/WorkloadManifest.tvOS.template.json
Просмотреть файл

@ -1,48 +0,0 @@
{
"version": "@VERSION@",
"workloads": {
"@PLATFORM_LOWERCASE@": {
"description": ".NET SDK Workload for building @PLATFORM@ applications.",
"packs": [
"Microsoft.@PLATFORM@.Sdk.net6",
"Microsoft.@PLATFORM@.Ref",
"Microsoft.@PLATFORM@.Runtime.tvos-arm64",
"Microsoft.@PLATFORM@.Runtime.tvossimulator-x64",
"Microsoft.@PLATFORM@.Runtime.tvossimulator-arm64",
"Microsoft.@PLATFORM@.Templates"
],
"extends": [
"microsoft-net-runtime-tvos"
]
}
},
"packs": {
"Microsoft.@PLATFORM@.Sdk.net6": {
"kind": "sdk",
"version": "@VERSION@",
"alias-to": {
"any": "Microsoft.@PLATFORM@.Sdk"
}
},
"Microsoft.@PLATFORM@.Ref": {
"kind": "framework",
"version": "@VERSION@"
},
"Microsoft.@PLATFORM@.Runtime.tvos-arm64": {
"kind": "framework",
"version": "@VERSION@"
},
"Microsoft.@PLATFORM@.Runtime.tvossimulator-x64": {
"kind": "framework",
"version": "@VERSION@"
},
"Microsoft.@PLATFORM@.Runtime.tvossimulator-arm64": {
"kind": "framework",
"version": "@VERSION@"
},
"Microsoft.@PLATFORM@.Templates": {
"kind": "template",
"version": "@VERSION@"
}
}
}

24
dotnet/targets/Xamarin.Shared.Sdk.DefaultItems.targets
Просмотреть файл

@ -77,35 +77,11 @@
<ComputedPlatform Condition="'$(ComputedPlatform)' == ''">iPhone</ComputedPlatform>
</PropertyGroup>
<!-- Declare the XI/XM framework bundled with this version of the SDK. See Microsoft.NETCoreSdk.BundledVersions.props -->
<PropertyGroup>
<!-- Runtime pack identifiers -->
<_RuntimePackRuntimeIdentifiers Condition=" '$(_PlatformName)' == 'iOS' ">iossimulator-x64;ios-arm64;ios-arm;iossimulator-x86;iossimulator-arm64</_RuntimePackRuntimeIdentifiers>
<_RuntimePackRuntimeIdentifiers Condition=" '$(_PlatformName)' == 'tvOS' ">tvossimulator-x64;tvos-arm64;tvossimulator-arm64</_RuntimePackRuntimeIdentifiers>
<_RuntimePackRuntimeIdentifiers Condition=" '$(_PlatformName)' == 'watchOS' ">watchos-x86;watchos-x64;watchos-arm</_RuntimePackRuntimeIdentifiers>
<_RuntimePackRuntimeIdentifiers Condition=" '$(_PlatformName)' == 'macOS' ">osx-x64;osx-arm64</_RuntimePackRuntimeIdentifiers>
<_RuntimePackRuntimeIdentifiers Condition=" '$(_PlatformName)' == 'MacCatalyst' ">maccatalyst-x64;maccatalyst-arm64</_RuntimePackRuntimeIdentifiers>
</PropertyGroup>
<PropertyGroup>
<_RuntimeFrameworkVersion>$(BundledNETCorePlatformsPackageVersion)</_RuntimeFrameworkVersion>
<_RuntimeFrameworkVersion Condition="'$(CUSTOM_DOTNET_VERSION)' != ''">$(CUSTOM_DOTNET_VERSION)</_RuntimeFrameworkVersion>
</PropertyGroup>
<ItemGroup>
<KnownFrameworkReference Include="Microsoft.$(_PlatformName)"
TargetFramework="net6.0"
RuntimeFrameworkName="Microsoft.$(_PlatformName)"
DefaultRuntimeFrameworkVersion="**FromWorkload**"
LatestRuntimeFrameworkVersion="**FromWorkload**"
TargetingPackName="Microsoft.$(_PlatformName).Ref"
TargetingPackVersion="**FromWorkload**"
RuntimePackNamePatterns="Microsoft.$(_PlatformName).Runtime.**RID**"
RuntimePackRuntimeIdentifiers="$(_RuntimePackRuntimeIdentifiers)"
Profile="$(_PlatformName)"
/>
</ItemGroup>
<ItemGroup Condition="'$(DisableImplicitFrameworkReferences)' != 'true'">
<FrameworkReference Include="Microsoft.$(_PlatformName)" IsImplicitlyDefined="true" Pack="false" PrivateAssets="All" />
</ItemGroup>

11
dotnet/targets/Xamarin.Shared.Sdk.MultiTarget.template.targets Normal file
Просмотреть файл

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<ItemGroup Condition=" '$(TargetPlatformIdentifier)' == '$(_PlatformName)' and $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '6.0')) ">
<KnownFrameworkReference
Update="Microsoft.$(_PlatformName)"
DefaultRuntimeFrameworkVersion="@NET6_NUGET_VERSION_NO_METADATA@"
LatestRuntimeFrameworkVersion="@NET6_NUGET_VERSION_NO_METADATA@"
TargetingPackVersion="@NET6_NUGET_VERSION_NO_METADATA@"
/>
</ItemGroup>
</Project>

21
dotnet/targets/Xamarin.Shared.Sdk.props
Просмотреть файл

@ -43,6 +43,7 @@
<!-- Set the default RuntimeIdentifier if not already specified. -->
<PropertyGroup Condition="'$(_RuntimeIdentifierIsRequired)' == 'true' And '$(RuntimeIdentifier)' == '' And '$(RuntimeIdentifiers)' == '' ">
<!-- The _<platform>RuntimeIdentifier values are set from the IDE -->
<RuntimeIdentifier Condition="'$(_PlatformName)' == 'iOS'">$(_iOSRuntimeIdentifier)</RuntimeIdentifier>
<RuntimeIdentifier Condition="'$(_PlatformName)' == 'tvOS'">$(_tvOSRuntimeIdentifier)</RuntimeIdentifier>
<RuntimeIdentifier Condition="'$(_PlatformName)' == 'macOS'">$(_macOSRuntimeIdentifier)</RuntimeIdentifier>
@ -52,21 +53,13 @@
<RuntimeIdentifier Condition="'$(RuntimeIdentifier)' == '' And '$(_PlatformName)' == 'iOS'">iossimulator-x64</RuntimeIdentifier>
<RuntimeIdentifier Condition="'$(RuntimeIdentifier)' == '' And '$(_PlatformName)' == 'tvOS'">tvossimulator-x64</RuntimeIdentifier>
<RuntimeIdentifier Condition="'$(RuntimeIdentifier)' == '' And '$(_PlatformName)' == 'macOS'">osx-x64</RuntimeIdentifier>
<RuntimeIdentifier Condition="'$(RuntimeIdentifier)' == '' And '$(_PlatformName)' == 'MacCatalyst'">maccatalyst-x64</RuntimeIdentifier>
<!--
Workaround/hack:
The Microsoft.NET.RuntimeIdentifierInference.targets file is loaded
before this file, and executes some logic depending on whether the
RuntimeIdentifier is set or not. Since RuntimeIdentifier isn't set at
that point (we're setting it here), we need to replicate the logic in
the Microsoft.NET.RuntimeIdentifierInference.targets file to make sure
things work as expected.
<!-- For release desktop builds we default to universal apps in .NET 7+ -->
<RuntimeIdentifier Condition="'$(RuntimeIdentifier)' == '' And '$(Configuration)' != 'Release' And '$(_PlatformName)' == 'macOS'">osx-x64</RuntimeIdentifier>
<RuntimeIdentifier Condition="'$(RuntimeIdentifier)' == '' And '$(Configuration)' != 'Release' And '$(_PlatformName)' == 'MacCatalyst'">maccatalyst-x64</RuntimeIdentifier>
<RuntimeIdentifiers Condition="'$(RuntimeIdentifier)' == '' And '$(Configuration)' == 'Release' And '$(_PlatformName)' == 'macOS'">osx-x64;osx-arm64</RuntimeIdentifiers>
<RuntimeIdentifiers Condition="'$(RuntimeIdentifier)' == '' And '$(Configuration)' == 'Release' And '$(_PlatformName)' == 'MacCatalyst'">maccatalyst-x64;maccatalyst-arm64</RuntimeIdentifiers>
Ref: https://github.com/dotnet/runtime/issues/54406
-->
<SelfContained>true</SelfContained>
</PropertyGroup>
<!-- We're never using any app hosts -->
@ -76,7 +69,7 @@
</PropertyGroup>
<!-- App extensions are self-contained, even though their OutputType=Library. This must be done here and not targets as it is checked before targets are invoked. -->
<PropertyGroup Condition="'$(IsAppExtension)' == 'true'">
<PropertyGroup Condition="'$(IsAppExtension)' == 'true' And '$(RuntimeIdentifier)' != ''">
<SelfContained>true</SelfContained>
</PropertyGroup>

95
dotnet/targets/Xamarin.Shared.Sdk.targets
Просмотреть файл

@ -451,9 +451,10 @@
<!-- TrimMode specifies what the linker will do with framework assemblies -->
<TrimMode Condition="'$(_LinkMode)' == 'TrimMode'">$(TrimMode)</TrimMode>
<TrimMode Condition="'$(_LinkMode)' == 'None'">copy</TrimMode> <!-- Don't use 'copyused', because that might still end up saving some assemblies, and if that's the platform assembly, it may break the partial static registrar -->
<TrimMode Condition="'$(_LinkMode)' == 'SdkOnly' Or '$(_LinkMode)' == 'Full'">link</TrimMode>
<!-- For Full link mode we also need to set TrimMode for all non-framework assemblies. This is done further below -->
<TrimMode Condition="'$(_LinkMode)' == 'None'">copy</TrimMode>
<TrimMode Condition="'$(_LinkMode)' == 'SdkOnly'">partial</TrimMode>
<TrimMode Condition="'$(_LinkMode)' == 'Full'">full</TrimMode>
<!-- For None link mode we also need to set TrimMode for all assemblies. This is done further below -->
<!-- Determine if any assemblies are actually trimmed, or if we're in a "Don't link" scenario -->
<!-- We're in a "Don't link" scenario if both of the following are true:
@ -553,6 +554,9 @@
<_ExtraTrimmerArgs Condition="('$(_PlatformName)' == 'iOS' Or '$(_PlatformName)' == 'tvOS') And '$(_SdkIsSimulator)' == 'true'">$(_ExtraTrimmerArgs) --feature ObjCRuntime.Runtime.Arch.IsSimulator true</_ExtraTrimmerArgs>
<_ExtraTrimmerArgs Condition="('$(_PlatformName)' == 'iOS' Or '$(_PlatformName)' == 'tvOS') And '$(_SdkIsSimulator)' != 'true'">$(_ExtraTrimmerArgs) --feature ObjCRuntime.Runtime.Arch.IsSimulator false</_ExtraTrimmerArgs>
<!-- Enable serialization discovery. Ref: https://github.com/xamarin/xamarin-macios/issues/15676 -->
<_ExtraTrimmerArgs>$(_ExtraTrimmerArgs) --enable-serialization-discovery</_ExtraTrimmerArgs>
<!-- We always want the linker to process debug symbols, even when building in Release mode, because the AOT compiler uses the managed debug symbols to output DWARF debugging symbols -->
<TrimmerRemoveSymbols Condition="'$(TrimmerRemoveSymbols)' == ''">false</TrimmerRemoveSymbols>
@ -562,12 +566,12 @@
</PropertyGroup>
<ItemGroup>
<!-- Mark all assemblies to be linked if we're linking all assemblies -->
<!-- Mark all assemblies to be copied if we're not linking any assemblies -->
<ResolvedFileToPublish
Update="@(ResolvedFileToPublish)"
Condition="'$(_LinkMode)' == 'Full' And '%(ResolvedFileToPublish.Extension)' == '.dll' And '%(ResolvedFileToPublish.AssetType)' != 'native'"
Condition="'$(_LinkMode)' == 'None' And '%(ResolvedFileToPublish.Extension)' == '.dll' And '%(ResolvedFileToPublish.AssetType)' != 'native'"
>
<TrimMode>link</TrimMode>
<TrimMode>copy</TrimMode> <!-- Don't use 'copyused', because that might still end up saving some assemblies, and if that's the platform assembly, it may break the partial static registrar -->
</ResolvedFileToPublish>
<!-- Mark our entry assembly as a root assembly. -->
@ -839,7 +843,7 @@
<_XamarinRefPackageDirectory>%(_XamarinFrameworkReference.TargetingPackPath)</_XamarinRefPackageDirectory>
<_XamarinNativeLibraryDirectory>$(_XamarinSdkRuntimePackDirectory)/runtimes/$(RuntimeIdentifier)/native</_XamarinNativeLibraryDirectory>
<_XamarinIncludeDirectory>$(_XamarinSdkRuntimePackDirectory)/runtimes/$(RuntimeIdentifier)/native</_XamarinIncludeDirectory>
<_XamarinRefAssemblyDirectory>$(_XamarinRefPackageDirectory)/ref/net6.0/</_XamarinRefAssemblyDirectory>
<_XamarinRefAssemblyDirectory>$(_XamarinRefPackageDirectory)/ref/net7.0/</_XamarinRefAssemblyDirectory>
<_XamarinRefAssemblyPath>$(_XamarinRefAssemblyDirectory)$(_PlatformAssemblyName).dll</_XamarinRefAssemblyPath>
<_LibPartialStaticRegistrar Condition="'$(UseMonoRuntime)' == 'true'">$(_XamarinNativeLibraryDirectory)/Microsoft.$(_PlatformName).registrar.a</_LibPartialStaticRegistrar>
@ -1130,8 +1134,8 @@
</_LinkNativeExecutableDependsOn>
</PropertyGroup>
<Target Name="_ComputeLinkNativeExecutableInputs">
<ItemGroup Condition="'$(IsMacEnabled)' == 'true'">
<Target Name="_ComputeLinkNativeExecutableInputs" Condition="'$(IsMacEnabled)' == 'true'">
<ItemGroup>
<_XamarinMainLibraries Include="$(_XamarinNativeLibraryDirectory)/$(_LibXamarinName)" />
<!-- Link with the libraries shipped with the mono runtime pack -->
<_XamarinMainLibraries Include="@(_MonoLibrary)" />
@ -1152,6 +1156,11 @@
<_LinkNativeExecutableInputs Include="@(_XamarinMainLibraries)" />
<_LinkNativeExecutableInputs Include="@(_FileNativeReference)" />
</ItemGroup>
<ItemGroup Condition="'$(_XamarinRuntime)' == 'MonoVM' And $([MSBuild]::VersionGreaterThanOrEquals('$(_XcodeVersion)','14.0'))">
<_MainLinkerFlags Include="-Wl,-no_compact_unwind" />
<_MainLinkerFlags Include="-Wl,-keep_dwarf_unwind" />
</ItemGroup>
</Target>
<!-- Any .dylibs we link with might have an incorrect identity (see https://github.com/xamarin/xamarin-macios/issues/13999),
@ -1814,6 +1823,74 @@
<Target Name="_PrepareRun" DependsOnTargets="$(_PrepareRunDependsOn)" BeforeTargets="Run" />
<!--
Add a 'global using nfloat = System.Runtime.InteropServices.NFloat' to ease migration from Xamarin.
We're not using a the Usings item group, because this code shows a warning in .NET 7:
The type name 'nfloat' only contains lower-cased ascii characters. Such names may become reserved for the language.
and we want to hide this warning.
Note: we only add this if compiling using C# 10 or later.
This code is a slightly modified version of this:
https://github.com/dotnet/sdk/blob/1eee82034899436f8ddb0e379612a32ce0dfb9e4/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.GenerateGlobalUsings.targets#L26-L55
-->
<!--
Note that this must run before every invocation of CoreCompile to ensure that all compiler
runs see the generated global usings. There is at least one scenario involving Xaml
where CoreCompile is invoked without other potential hooks such as Compile or CoreBuild,
etc., so we hook directly on to CoreCompile. Furthermore, we must run *after*
PrepareForBuild to ensure that the intermediate directory has been created.
Targets that generate Compile items are also expected to run before
BeforeCompile targets (common targets convention).
-->
<Target Name="GenerateGlobalnfloatUsing"
BeforeTargets="BeforeCompile;CoreCompile"
AfterTargets="PrepareForBuild"
Condition="'$(Language)' == 'C#'
And '$(NoNFloatUsing)' != 'true'
And ('$(LangVersion)' == ''
Or '$(LangVersion)' == 'preview'
Or '$(LangVersion)' == 'latest'
Or '$(LangVersion)' == 'latestMajor'
Or '$(LangVersion)' == 'default'
Or $([MSBuild]::VersionGreaterThanOrEquals('$(LangVersion)','10.0'))
)">
<PropertyGroup>
<GeneratedNFloatGlobalUsingFile Condition="'$(GeneratedNFloatGlobalUsingsFile)' ==''">$(IntermediateOutputPath)$(MSBuildProjectName).nfloat.g$(DefaultLanguageSourceExtension)</GeneratedNFloatGlobalUsingFile>
<GeneratedNFloatGlobalUsing>
#pragma warning disable CS8981
global using nfloat = global::System.Runtime.InteropServices.NFloat%3B
#pragma warning restore CS8981
</GeneratedNFloatGlobalUsing>
</PropertyGroup>
<WriteLinesToFile
File="$(GeneratedNFloatGlobalUsingFile)"
Lines="$(GeneratedNFloatGlobalUsing)"
Overwrite="true"
WriteOnlyWhenDifferent="true" />
<ItemGroup>
<Compile Include="$(GeneratedNFloatGlobalUsingFile)" />
<!-- Performing a clean and waiting without a build results in build warnings in VS due to all the missing namespaces, so we'll avoid recording it in FileWrites -->
</ItemGroup>
</Target>
<!--
The .NET 6 sdk pack will add a global using directive by adding to the
'Using' item group, but we don't want that anymore in .NET 7 (we
manually generate the global using to avoid a C# warning), so remove
any global using that may have been added by the .NET sdk pack. The
.NET 6 sdk pack will one day condition the inclusion on the current
target framework version, and at that point we can remove this
workaround (https://github.com/xamarin/xamarin-macios/pull/15385).
-->
<Target Name="RemoveGlobalnfloatUsingItemGroup" BeforeTargets="PrepareForBuild">
<ItemGroup>
<Using Remove="System.Runtime.InteropServices.NFloat" />
</ItemGroup>
</Target>
<!-- Import existing targets -->
<PropertyGroup>

22
eng/Version.Details.xml
Просмотреть файл

@ -1,25 +1,25 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.404-servicing.22552.3">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-rtm.22531.3">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>b1cf6608534b33e6c5fa21f651209147e5428458</Sha>
<Sha>3079e52002f185db88b0c6a8e8c4c623a5287d19</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.200-1.22219.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22471.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/linker</Uri>
<Sha>28db36b95cf83c8e2ad11e67a2ad0de301b4cad6</Sha>
<Sha>219e84c88def8276179f66282b2f7cb5f1d0d126</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.11">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c35dae276d7b684200166dfab58fefaebf55b9a7</Sha>
<Sha>cd2d83798383716204eb580eb5c89ef5b73b8ec2</Sha>
</Dependency>
<!-- This is required for our test apps to build; in some cases Microsoft.AspNetCore.App is pulled in, and when building test apps the build needs to be able to resolve that -->
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.10" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173</Sha>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.0-rtm.22512.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>c6865355c01e1fb170b65427846d939559ab3789</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.10" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.0" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>c3fc739ca5a38641fe021f94c3986465296c71e0</Sha>
<Sha>6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>

8
eng/Versions.props
Просмотреть файл

@ -1,12 +1,12 @@
<Project>
<!--Package versions-->
<PropertyGroup>
<MicrosoftDotnetSdkInternalPackageVersion>6.0.404-servicing.22552.3</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>6.0.200-1.22219.3</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>7.0.100-rtm.22531.3</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>7.0.100-1.22471.3</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftNETILStripTasksPackageVersion>6.0.0-rc.2.21468.3</MicrosoftNETILStripTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>6.0.11</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETWorkloadEmscriptenManifest60100PackageVersion>6.0.10</MicrosoftNETWorkloadEmscriptenManifest60100PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>7.0.0</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion>7.0.0</MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion>
<MicrosoftTemplateEngineTasksVersion>7.0.100-alpha.1.21601.1</MicrosoftTemplateEngineTasksVersion>
</PropertyGroup>
</Project>

2
external/api-tools поставляемый

@ -1 +1 @@
Subproject commit 9b9a5bb668f64d0b4fc3d6face67384566346d06
Subproject commit 373fc1b50a23bf933aaeea7485ed7fb82c2cc268

2
global.json
Просмотреть файл

@ -1,5 +1,5 @@
{
"sdk": {
"version": "6.0.404-servicing.22552.3"
"version": "7.0.100-rtm.22531.3"
}
}

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

@ -7,8 +7,8 @@ MONO_BRANCH := $(shell cd $(MONO_PATH) 2> /dev/null && git symbolic-ref --sho
endif
ifdef ENABLE_XAMARIN
NEEDED_MACCORE_VERSION := 9a347bd708eb0ef975cf52cefdb23cb3a83d2690
NEEDED_MACCORE_BRANCH := main
NEEDED_MACCORE_VERSION := 0837e7caffb2e42efcd183cb1d71998fb6022e2c
NEEDED_MACCORE_BRANCH := xcode14
MACCORE_DIRECTORY := maccore
MACCORE_MODULE := git@github.com:xamarin/maccore.git
@ -18,7 +18,7 @@ endif
# Available versions can be seen here:
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.Tools.Mlaunch/versions
MLAUNCH_NUGET_VERSION=1.0.1
MLAUNCH_NUGET_VERSION=1.0.0-ci.xcode14.0
define CheckVersionTemplate
check-$(1)::

2
msbuild/Xamarin.HotRestart.PreBuilt/Xamarin.PreBuilt.iOS/Xamarin.PreBuilt.iOS.csproj
Просмотреть файл

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0-ios</TargetFramework>
<TargetFramework>net7.0-ios</TargetFramework>
<RuntimeIdentifier>ios-arm64</RuntimeIdentifier>
<OutputType>Exe</OutputType>
<SupportedOSPlatformVersion>10.0</SupportedOSPlatformVersion>

2
msbuild/Xamarin.Localization.MSBuild/.gitignore поставляемый Normal file
Просмотреть файл

@ -0,0 +1,2 @@
MSBStrings.Designer.cs

2738
msbuild/Xamarin.Localization.MSBuild/MSBStrings.Designer.cs сгенерированный
Просмотреть файл

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

7
msbuild/Xamarin.MacDev.Tasks/Tasks/DetectSdkLocationCoreTaskBase.cs
Просмотреть файл

@ -65,6 +65,11 @@ namespace Xamarin.MacDev.Tasks {
get; set;
}
[Output]
public string XcodeVersion {
get; set;
}
#endregion Outputs
protected IAppleSdk CurrentSdk {
@ -188,6 +193,8 @@ namespace Xamarin.MacDev.Tasks {
EnsureSdkPath ();
EnsureXamarinSdkRoot ();
XcodeVersion = AppleSdkSettings.XcodeVersion.ToString ();
return !Log.HasLoggedErrors;
}

4
msbuild/Xamarin.MacDev.Tasks/Tasks/FindAotCompilerTaskBase.cs
Просмотреть файл

@ -21,7 +21,7 @@ namespace Xamarin.MacDev.Tasks {
public override bool Execute ()
{
if (MonoAotCrossCompiler?.Length > 0) {
if (MonoAotCrossCompiler?.Length > 0 && string.IsNullOrEmpty (Environment.GetEnvironmentVariable ("XAMARIN_FORCE_AOT_COMPILER_PATH_COMPUTATION"))) {
var aotCompilerItem = MonoAotCrossCompiler.SingleOrDefault (v => v.GetMetadata ("RuntimeIdentifier") == RuntimeIdentifier);
if (aotCompilerItem == null) {
@ -52,7 +52,7 @@ namespace Xamarin.MacDev.Tasks {
var csproj = $@"<?xml version=""1.0"" encoding=""utf-8""?>
<Project Sdk=""Microsoft.NET.Sdk"">
<PropertyGroup>
<TargetFramework>net6.0-{PlatformName}</TargetFramework>
<TargetFramework>net{TargetFramework.Version}-{PlatformName}</TargetFramework>
</PropertyGroup>
<Target Name=""ComputeAotCompilerPath"">
<PropertyGroup>

1
msbuild/Xamarin.Shared/Xamarin.Shared.targets
Просмотреть файл

@ -1753,6 +1753,7 @@ Copyright (C) 2018 Microsoft. All rights reserved.
<Output TaskParameter="SdkPlatform" PropertyName="_SdkPlatform" />
<Output TaskParameter="SdkIsSimulator" PropertyName="_SdkIsSimulator" />
<Output TaskParameter="XamarinSdkRoot" PropertyName="_XamarinSdkRoot" />
<Output TaskParameter="XcodeVersion" PropertyName="_XcodeVersion" />
</DetectSdkLocations>
</Target>

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

@ -335,7 +335,7 @@ Copyright (C) 2011-2013 Xamarin. All rights reserved.
ReferenceAssemblyPaths="@(ReferencePath)"
RootAssemblyNames="@(TrimmerRootAssembly)"
TrimMode="$(TrimMode)"
DefaultAction="$(TrimmerDefaultAction)"
DefaultAction="$(_TrimmerDefaultAction)"
RemoveSymbols="$(TrimmerRemoveSymbols)"
FeatureSettings="@(_TrimmerFeatureSettings)"
CustomData="@(_TrimmerCustomData)"

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

@ -71,9 +71,16 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
<Target Name="_CompileToNative" DependsOnTargets="$(_CompileToNativeDependsOn)"
Inputs="$(_NativeWatchApp)"
Outputs="$(_NativeExecutable);$(_AppBundlePath)_WatchKitStub\WK">
<PropertyGroup Condition="'$(_SdkIsSimulator)' != 'true'">
<!-- Remove any arm64e slices when building for device -->
<WKDittoArchitectures Condition="'$(WKDittoArchitectures)' == ''">--arch arm64_32 --arch arm64 --arch armv7k</WKDittoArchitectures>
</PropertyGroup>
<Ditto
SessionId="$(BuildSessionId)"
Condition="'$(IsMacEnabled)'"
AdditionalArguments="$(WKDittoArchitectures)"
ToolExe="$(DittoExe)"
ToolPath="$(DittoPath)"
Source="$(_NativeWatchApp)"
@ -85,6 +92,7 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
<Ditto
SessionId="$(BuildSessionId)"
Condition="'$(IsMacEnabled)'"
AdditionalArguments="$(WKDittoArchitectures)"
ToolExe="$(DittoExe)"
ToolPath="$(DittoPath)"
Source="$(_NativeWatchApp)"

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

@ -201,7 +201,15 @@ xamarin_marshal_return_value_impl (MonoType *mtype, const char *type, MonoObject
}
}
} else {
xamarin_assertion_message ("Don't know how to marshal a return value of type '%s.%s'. Please file a bug with a test case at https://github.com/xamarin/xamarin-macios/issues/new\n", mono_class_get_namespace (r_klass), mono_class_get_name (r_klass));
#if DOTNET
if (xamarin_is_class_intptr (r_klass) || xamarin_is_class_nativehandle (r_klass)) {
#else
if (xamarin_is_class_intptr (r_klass)) {
#endif
returnValue = *(void **) mono_object_unbox (retval);
} else {
xamarin_assertion_message ("Don't know how to marshal a return value of type '%s.%s'. Please file a bug with a test case at https://github.com/xamarin/xamarin-macios/issues/new\n", mono_class_get_namespace (r_klass), mono_class_get_name (r_klass));
}
}
xamarin_mono_object_release (&r_klass);

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

@ -13,6 +13,7 @@ namespace ARKit {
#if NET
[SupportedOSPlatform ("ios14.0")]
[UnsupportedOSPlatform ("maccatalyst")]
[UnsupportedOSPlatform ("tvos")]
#else
[iOS (14, 0)]
#endif
@ -22,6 +23,7 @@ namespace ARKit {
#if NET
[SupportedOSPlatform ("ios14.0")]
[UnsupportedOSPlatform ("maccatalyst")]
[UnsupportedOSPlatform ("tvos")]
#else
[iOS (14, 0)]
#endif

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

@ -366,9 +366,7 @@ namespace AVFoundation {
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("ios6.0")]
#if IOS
[Obsolete ("Starting with ios6.0 use 'AVAudioSession.Notification.ObserveInterruption' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("ios6.0", "Use 'AVAudioSession.Notification.ObserveInterruption' instead.")]
#else
[Deprecated (PlatformName.iOS, 6, 0, message: "Use 'AVAudioSession.Notification.ObserveInterruption' instead.")]
#endif
@ -388,9 +386,7 @@ namespace AVFoundation {
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("ios6.0")]
#if IOS
[Obsolete ("Starting with ios6.0 use 'AVAudioSession.Notification.ObserveInterruption' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("ios6.0", "Use 'AVAudioSession.Notification.ObserveInterruption' instead.")]
#else
[Deprecated (PlatformName.iOS, 6, 0, message: "Use 'AVAudioSession.Notification.ObserveInterruption' instead.")]
#endif
@ -410,9 +406,7 @@ namespace AVFoundation {
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("ios6.0")]
#if IOS
[Obsolete ("Starting with ios6.0 use 'AVAudioSession.Notification.ObserveAudioRouteChange' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("ios6.0", "Use 'AVAudioSession.Notification.ObserveAudioRouteChange' instead.")]
#else
[Deprecated (PlatformName.iOS, 6, 0, message: "Use 'AVAudioSession.Notification.ObserveAudioRouteChange' instead.")]
#endif
@ -432,9 +426,7 @@ namespace AVFoundation {
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("ios6.0")]
#if IOS
[Obsolete ("Starting with ios6.0 use 'AVAudioSession.Notification.ObserveAudioRouteChange' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("ios6.0", "Use 'AVAudioSession.Notification.ObserveAudioRouteChange' instead.")]
#else
[Deprecated (PlatformName.iOS, 6, 0, message: "Use 'AVAudioSession.Notification.ObserveAudioRouteChange' instead.")]
#endif
@ -454,9 +446,7 @@ namespace AVFoundation {
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("ios6.0")]
#if IOS
[Obsolete ("Starting with ios6.0 use 'AVAudioSession.Notification.ObserveAudioRouteChange' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("ios6.0", "Use 'AVAudioSession.Notification.ObserveAudioRouteChange' instead.")]
#else
[Deprecated (PlatformName.iOS, 6, 0, message: "Use 'AVAudioSession.Notification.ObserveAudioRouteChange' instead.")]
#endif
@ -477,9 +467,7 @@ namespace AVFoundation {
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("ios6.0")]
#if IOS
[Obsolete ("Starting with ios6.0 use 'AVAudioSession.Notification.ObserveAudioRouteChange' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("ios6.0", "Use 'AVAudioSession.Notification.ObserveAudioRouteChange' instead.")]
#else
[Deprecated (PlatformName.iOS, 6, 0, message: "Use 'AVAudioSession.Notification.ObserveAudioRouteChange' instead.")]
#endif
@ -500,9 +488,7 @@ namespace AVFoundation {
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("ios6.0")]
#if IOS
[Obsolete ("Starting with ios6.0 use 'AVAudioSession.Notification.ObserveAudioRouteChange' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("ios6.0", "Use 'AVAudioSession.Notification.ObserveAudioRouteChange' instead.")]
#else
[Deprecated (PlatformName.iOS, 6, 0, message: "Use 'AVAudioSession.Notification.ObserveAudioRouteChange' instead.")]
#endif

21
src/AVRouting/AVCustomDeviceRoute.cs Normal file
Просмотреть файл

@ -0,0 +1,21 @@
#if IOS
//
// AVCustomDeviceRoute.cs: AVCustomDeviceRoute Complementing methods
//
// Author:
// Manuel de la Pena <mandel@microsoft.com>
//
using System;
using Network;
#nullable enable
namespace AVRouting {
partial class AVCustomDeviceRoute {
public NWEndpoint NetworkEndpoint => new NWEndpoint (_NetworkEndpoint, owns: false);
}
}
#endif

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

@ -49,11 +49,8 @@ namespace AddressBook {
[SupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("ios9.0")]
#if __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("maccatalyst14.0", "Use the 'Contacts' API instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use the 'Contacts' API instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message: "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
@ -119,11 +116,8 @@ namespace AddressBook {
[SupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("ios9.0")]
#if __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("maccatalyst14.0", "Use the 'Contacts' API instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use the 'Contacts' API instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message: "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
@ -142,11 +136,8 @@ namespace AddressBook {
[SupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("ios6.0")]
#if __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios6.0 use the static Create method instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("maccatalyst14.0", "Use the 'Contacts' API instead.")]
[ObsoletedOSPlatform ("ios6.0", "Use the static Create method instead.")]
#else
[Deprecated (PlatformName.iOS, 6, 0, message: "Use the static Create method instead")]
#endif

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

@ -65,11 +65,8 @@ namespace AddressBook {
[SupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("ios9.0")]
#if __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("maccatalyst14.0", "Use the 'Contacts' API instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use the 'Contacts' API instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message: "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]

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

@ -50,11 +50,8 @@ namespace AddressBook {
[SupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("ios9.0")]
#if __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("maccatalyst14.0", "Use the 'Contacts' API instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use the 'Contacts' API instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0)]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
@ -118,11 +115,8 @@ namespace AddressBook {
[SupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("ios9.0")]
#if __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("maccatalyst14.0", "Use the 'Contacts' API instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use the 'Contacts' API instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message: "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
@ -202,11 +196,8 @@ namespace AddressBook {
[SupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("ios9.0")]
#if __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("maccatalyst14.0", "Use the 'Contacts' API instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use the 'Contacts' API instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message: "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
@ -301,11 +292,8 @@ namespace AddressBook {
[SupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("ios9.0")]
#if __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("maccatalyst14.0", "Use the 'Contacts' API instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use the 'Contacts' API instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message: "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
@ -357,11 +345,8 @@ namespace AddressBook {
[SupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("ios9.0")]
#if __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("maccatalyst14.0", "Use the 'Contacts' API instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use the 'Contacts' API instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message: "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
@ -378,11 +363,8 @@ namespace AddressBook {
[SupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("ios9.0")]
#if __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("maccatalyst14.0", "Use the 'Contacts' API instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use the 'Contacts' API instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message: "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
@ -399,11 +381,8 @@ namespace AddressBook {
[SupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("ios9.0")]
#if __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("maccatalyst14.0", "Use the 'Contacts' API instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use the 'Contacts' API instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message: "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]

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

@ -49,9 +49,7 @@ namespace AddressBook {
#if NET
[UnsupportedOSPlatform ("ios9.0")]
[UnsupportedOSPlatform ("maccatalyst")]
#if IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("ios9.0", "Use the 'Contacts' API instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message: "Use the 'Contacts' API instead.")]
#endif
@ -185,11 +183,8 @@ namespace AddressBook {
[SupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("ios9.0")]
#if __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("maccatalyst14.0", "Use the 'Contacts' API instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use the 'Contacts' API instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message: "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
@ -225,11 +220,8 @@ namespace AddressBook {
[SupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("ios9.0")]
#if __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("maccatalyst14.0", "Use the 'Contacts' API instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use the 'Contacts' API instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message: "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
@ -252,9 +244,7 @@ namespace AddressBook {
#if NET
[UnsupportedOSPlatform ("ios9.0")]
[UnsupportedOSPlatform ("maccatalyst")]
#if IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("ios9.0", "Use the 'Contacts' API instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message: "Use the 'Contacts' API instead.")]
#endif
@ -297,11 +287,8 @@ namespace AddressBook {
[SupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("ios9.0")]
#if __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("maccatalyst14.0", "Use the 'Contacts' API instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use the 'Contacts' API instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message: "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
@ -327,11 +314,8 @@ namespace AddressBook {
[SupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("ios9.0")]
#if __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("maccatalyst14.0", "Use the 'Contacts' API instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use the 'Contacts' API instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message: "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
@ -363,11 +347,8 @@ namespace AddressBook {
[SupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("ios9.0")]
#if __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("maccatalyst14.0", "Use the 'Contacts' API instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use the 'Contacts' API instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message: "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
@ -404,11 +385,8 @@ namespace AddressBook {
[SupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("ios9.0")]
#if __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("maccatalyst14.0", "Use the 'Contacts' API instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use the 'Contacts' API instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message: "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
@ -451,11 +429,8 @@ namespace AddressBook {
[SupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("ios9.0")]
#if __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("maccatalyst14.0", "Use the 'Contacts' API instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use the 'Contacts' API instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message: "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
@ -482,11 +457,8 @@ namespace AddressBook {
[SupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("ios9.0")]
#if __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("maccatalyst14.0", "Use the 'Contacts' API instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use the 'Contacts' API instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message: "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
@ -510,11 +482,8 @@ namespace AddressBook {
[SupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("ios9.0")]
#if __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("maccatalyst14.0", "Use the 'Contacts' API instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use the 'Contacts' API instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message: "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
@ -559,11 +528,8 @@ namespace AddressBook {
[SupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("ios9.0")]
#if __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("maccatalyst14.0", "Use the 'Contacts' API instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use the 'Contacts' API instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message: "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
@ -592,11 +558,8 @@ namespace AddressBook {
[SupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("ios9.0")]
#if __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("maccatalyst14.0", "Use the 'Contacts' API instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use the 'Contacts' API instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message: "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
@ -717,11 +680,8 @@ namespace AddressBook {
[SupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("ios7.0")]
#if __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios7.0 use 'GetCompositeNameFormat (null)' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("maccatalyst14.0", "Use the 'Contacts' API instead.")]
[ObsoletedOSPlatform ("ios7.0", "Use 'GetCompositeNameFormat (null)' instead.")]
#else
[Deprecated (PlatformName.iOS, 7, 0, message: "Use 'GetCompositeNameFormat (null)' instead.")]
#endif
@ -734,11 +694,8 @@ namespace AddressBook {
[SupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("ios9.0")]
#if __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("maccatalyst14.0", "Use the 'Contacts' API instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use the 'Contacts' API instead.")]
#else
[iOS (7, 0)]
#endif
@ -750,11 +707,8 @@ namespace AddressBook {
[SupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("ios9.0")]
#if __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("maccatalyst14.0", "Use the 'Contacts' API instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use the 'Contacts' API instead.")]
#else
[iOS (7, 0)]
#endif
@ -768,11 +722,8 @@ namespace AddressBook {
[SupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("ios9.0")]
#if __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("maccatalyst14.0", "Use the 'Contacts' API instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use the 'Contacts' API instead.")]
#else
[iOS (7, 0)]
#endif
@ -784,11 +735,8 @@ namespace AddressBook {
[SupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("ios9.0")]
#if __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("maccatalyst14.0", "Use the 'Contacts' API instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use the 'Contacts' API instead.")]
#else
[iOS (7, 0)]
#endif
@ -1139,11 +1087,8 @@ namespace AddressBook {
[SupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("ios9.0")]
#if __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("maccatalyst14.0", "Use the 'Contacts' API instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use the 'Contacts' API instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message: "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
@ -1200,11 +1145,8 @@ namespace AddressBook {
[SupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("ios9.0")]
#if __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("maccatalyst14.0", "Use the 'Contacts' API instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use the 'Contacts' API instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message: "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
@ -1246,11 +1188,8 @@ namespace AddressBook {
[SupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("ios9.0")]
#if __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("maccatalyst14.0", "Use the 'Contacts' API instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use the 'Contacts' API instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message: "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]

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

@ -48,11 +48,8 @@ namespace AddressBook {
[SupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("ios9.0")]
#if __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("maccatalyst14.0", "Use the 'Contacts' API instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use the 'Contacts' API instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message: "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]

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

@ -48,11 +48,8 @@ namespace AddressBook {
[SupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("ios9.0")]
#if __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("maccatalyst14.0", "Use the 'Contacts' API instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use the 'Contacts' API instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message: "Use the 'Contacts' API instead.")]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
@ -86,9 +83,7 @@ namespace AddressBook {
#if NET
[UnsupportedOSPlatform ("ios9.0")]
[UnsupportedOSPlatform ("maccatalyst")]
#if IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("ios9.0", "Use the 'Contacts' API instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message: "Use the 'Contacts' API instead.")]
#endif

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

@ -20,9 +20,7 @@ namespace AddressBookUI {
// http://developer.apple.com/library/ios/#DOCUMENTATION/AddressBookUI/Reference/AddressBookUI_Functions/Reference/reference.html#//apple_ref/c/func/ABCreateStringWithAddressDictionary
#if NET
[UnsupportedOSPlatform ("ios9.0")]
#if IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("ios9.0", "Use the 'Contacts' API instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message: "Use the 'Contacts' API instead.")]
#endif

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

@ -18,9 +18,7 @@ namespace AddressBookUI {
#if NET
[UnsupportedOSPlatform ("ios9.0")]
#if IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("ios9.0", "Use the 'Contacts' API instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message: "Use the 'Contacts' API instead.")]
#endif

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

@ -18,9 +18,7 @@ using ObjCRuntime;
namespace AddressBookUI {
#if NET
[UnsupportedOSPlatform ("ios9.0")]
#if IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("ios9.0", "Use the 'Contacts' API instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message: "Use the 'Contacts' API instead.")]
#endif
@ -38,9 +36,7 @@ namespace AddressBookUI {
#if NET
[UnsupportedOSPlatform ("ios9.0")]
#if IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("ios9.0", "Use the 'Contacts' API instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message: "Use the 'Contacts' API instead.")]
#endif
@ -59,9 +55,7 @@ namespace AddressBookUI {
#if NET
[UnsupportedOSPlatform ("ios9.0")]
#if IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("ios9.0", "Use the 'Contacts' API instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message: "Use the 'Contacts' API instead.")]
#endif
@ -77,9 +71,7 @@ namespace AddressBookUI {
#if NET
[UnsupportedOSPlatform ("ios9.0")]
#if IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("ios9.0", "Use the 'Contacts' API instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message: "Use the 'Contacts' API instead.")]
#endif

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

@ -17,9 +17,7 @@ using ObjCRuntime;
namespace AddressBookUI {
#if NET
[UnsupportedOSPlatform ("ios9.0")]
#if IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("ios9.0", "Use the 'Contacts' API instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message: "Use the 'Contacts' API instead.")]
#endif

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

@ -17,9 +17,7 @@ using ObjCRuntime;
namespace AddressBookUI {
#if NET
[UnsupportedOSPlatform ("ios9.0")]
#if IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("ios9.0", "Use the 'Contacts' API instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message: "Use the 'Contacts' API instead.")]
#endif

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

@ -22,9 +22,7 @@ namespace AddressBookUI {
#if NET
[UnsupportedOSPlatform ("ios9.0")]
#if IOS
[Obsolete ("Starting with ios9.0 use the 'Contacts' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("ios9.0", "Use the 'Contacts' API instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message: "Use the 'Contacts' API instead.")]
#endif

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

@ -920,7 +920,10 @@ namespace AppKit {
FullScreenAuxiliary = 1 << 8,
FullScreenNone = 1 << 9,
[Mac (10, 11)] FullScreenAllowsTiling = 1 << 11,
[Mac (10, 11)] FullScreenDisallowsTiling = 1 << 12
[Mac (10, 11)] FullScreenDisallowsTiling = 1 << 12,
[Mac (10, 13)] Primary = 1 << 16,
[Mac (10, 13)] Auxiliary = 1 << 17,
[Mac (10, 13)] CanJoinAllApplications = 1 << 18,
}
[NoMacCatalyst]
@ -1636,13 +1639,6 @@ namespace AppKit {
Automatic, Fixed
}
[NoMacCatalyst]
[Flags]
[Native]
public enum NSTextListOptions : ulong {
PrependEnclosingMarker = 1
}
[NoMacCatalyst]
[Flags]
public enum NSFontSymbolicTraits : int { // uint32_t NSFontSymbolicTraits
@ -3217,4 +3213,19 @@ namespace AppKit {
Medium = 2,
Large = 3,
}
[NoMacCatalyst, Mac (13, 0)]
[Native]
public enum NSColorWellStyle : long {
Default = 0,
Minimal,
Expanded,
}
[NoMacCatalyst, Mac (13, 0)]
[Native]
public enum NSComboButtonStyle : long {
Split = 0,
Unified = 1,
}
}

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

@ -156,9 +156,7 @@ namespace AppKit {
#if NET
[SupportedOSPlatform ("macos")]
[UnsupportedOSPlatform ("macos10.13")]
#if MONOMAC
[Obsolete ("Starting with macos10.13.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos10.13")]
[UnsupportedOSPlatform ("maccatalyst")]
#else
[Deprecated (PlatformName.MacOSX, 10, 13)]
@ -173,9 +171,7 @@ namespace AppKit {
#if NET
[SupportedOSPlatform ("macos")]
[UnsupportedOSPlatform ("macos10.13")]
#if MONOMAC
[Obsolete ("Starting with macos10.13.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos10.13")]
[UnsupportedOSPlatform ("maccatalyst")]
#else
[Deprecated (PlatformName.MacOSX, 10, 13)]
@ -190,9 +186,7 @@ namespace AppKit {
#if NET
[SupportedOSPlatform ("macos")]
[UnsupportedOSPlatform ("macos10.13")]
#if MONOMAC
[Obsolete ("Starting with macos10.13.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos10.13")]
[UnsupportedOSPlatform ("maccatalyst")]
#else
[Deprecated (PlatformName.MacOSX, 10, 13)]
@ -221,6 +215,18 @@ namespace AppKit {
return ptr == IntPtr.Zero ? null : new NSFont (ptr);
}
#if NET
[SupportedOSPlatform ("macos13.0")]
[UnsupportedOSPlatform ("maccatalyst")]
#else
[Mac (13, 0)]
#endif
public static NSFont SystemFontOfSize (nfloat fontSize, nfloat weight, nfloat width)
{
var ptr = _SystemFontOfSize (fontSize, weight, width);
return ptr == IntPtr.Zero ? null : new NSFont (ptr);
}
#if NET
[SupportedOSPlatform ("macos10.11")]
[UnsupportedOSPlatform ("maccatalyst")]

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

@ -211,9 +211,7 @@ namespace AppKit {
#if NET
[SupportedOSPlatform ("macos")]
[UnsupportedOSPlatform ("macos10.11")]
#if MONOMAC
[Obsolete ("Starting with macos10.11 not usually necessary, 'NSAnimationContext.RunAnimation' can be used instead and not suffer from performance issues.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos10.11", "Not usually necessary, 'NSAnimationContext.RunAnimation' can be used instead and not suffer from performance issues.")]
#else
[Deprecated (PlatformName.MacOSX, 10, 11, message: "Not usually necessary, 'NSAnimationContext.RunAnimation' can be used instead and not suffer from performance issues.")]
#endif
@ -223,9 +221,7 @@ namespace AppKit {
#if NET
[SupportedOSPlatform ("macos")]
[UnsupportedOSPlatform ("macos10.11")]
#if MONOMAC
[Obsolete ("Starting with macos10.11 not usually necessary, 'NSAnimationContext.RunAnimation' can be used instead and not suffer from performance issues.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos10.11", "Not usually necessary, 'NSAnimationContext.RunAnimation' can be used instead and not suffer from performance issues.")]
#else
[Deprecated (PlatformName.MacOSX, 10, 11, message: "Not usually necessary, 'NSAnimationContext.RunAnimation' can be used instead and not suffer from performance issues.")]
#endif

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

@ -40,9 +40,7 @@ namespace AppKit {
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.11")]
#if MONOMAC
[Obsolete ("Starting with macos10.11 use NSTextContainer.FromSize instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos10.11", "Use NSTextContainer.FromSize instead.")]
#else
[Deprecated (PlatformName.MacOSX, 10, 11, message: "Use NSTextContainer.FromSize instead.")]
#endif

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

@ -13,9 +13,7 @@ namespace AppKit {
#if NET
[SupportedOSPlatform ("macos")]
[UnsupportedOSPlatform ("macos11.0")]
#if MONOMAC
[Obsolete ("Starting with macos11.0 use 'NSWorkspace.OpenUrls' with completion handler.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos11.0", "Use 'NSWorkspace.OpenUrls' with completion handler.")]
[UnsupportedOSPlatform ("maccatalyst")]
#else
[Deprecated (PlatformName.MacOSX, 11, 0, message: "Use 'NSWorkspace.OpenUrls' with completion handler.")]
@ -29,9 +27,7 @@ namespace AppKit {
#if NET
[SupportedOSPlatform ("macos")]
[UnsupportedOSPlatform ("macos11.0")]
#if MONOMAC
[Obsolete ("Starting with macos11.0 use 'NSWorkspace.OpenUrls' with completion handler.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos11.0", "Use 'NSWorkspace.OpenUrls' with completion handler.")]
[UnsupportedOSPlatform ("maccatalyst")]
#else
[Deprecated (PlatformName.MacOSX, 11, 0, message: "Use 'NSWorkspace.OpenUrls' with completion handler.")]

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

@ -36,5 +36,5 @@ using System.Runtime.CompilerServices;
// - Assembly B should build just fine, because those two versions of Microsoft.*.dll have the exact same API.
// To avoid scenarios where everybody would have to update to the latest patch version of Microsoft.*.dll
// in order to compile stuff, we erase the third and fourth number and only use 0 for both.
[assembly: AssemblyVersion ("@NUGET_VERSION_MAJOR@.@NUGET_VERSION_MINOR@.@NUGET_VERSION_THIRD_DIGIT_WORKAROUND@.0")]
[assembly: AssemblyVersion ("@NUGET_VERSION_MAJOR@.@NUGET_VERSION_MINOR@.0.0")]
#endif

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

@ -415,9 +415,7 @@ namespace AudioToolbox {
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("ios8.0")]
#if IOS
[Obsolete ("Starting with ios8.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("ios8.0")]
#else
[Deprecated (PlatformName.iOS, 8, 0)]
#endif

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

@ -141,9 +141,7 @@ namespace AudioToolbox {
[SupportedOSPlatform ("ios")]
[SupportedOSPlatform ("maccatalyst")]
[UnsupportedOSPlatform ("ios7.0")]
#if IOS
[Obsolete ("Starting with ios7.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("ios7.0")]
#else
[Deprecated (PlatformName.iOS, 7, 0)]
#endif
@ -176,9 +174,7 @@ namespace AudioToolbox {
[SupportedOSPlatform ("ios")]
[SupportedOSPlatform ("maccatalyst")]
[UnsupportedOSPlatform ("ios7.0")]
#if IOS
[Obsolete ("Starting with ios7.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("ios7.0")]
#else
[Deprecated (PlatformName.iOS, 7, 0)]
#endif
@ -193,9 +189,7 @@ namespace AudioToolbox {
[SupportedOSPlatform ("ios")]
[SupportedOSPlatform ("maccatalyst")]
[UnsupportedOSPlatform ("ios7.0")]
#if IOS
[Obsolete ("Starting with ios7.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("ios7.0")]
#else
[Deprecated (PlatformName.iOS, 7, 0)]
#endif
@ -210,9 +204,7 @@ namespace AudioToolbox {
[SupportedOSPlatform ("ios")]
[SupportedOSPlatform ("maccatalyst")]
[UnsupportedOSPlatform ("ios7.0")]
#if IOS
[Obsolete ("Starting with ios7.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("ios7.0")]
#else
[Deprecated (PlatformName.iOS, 7, 0)]
#endif
@ -227,9 +219,7 @@ namespace AudioToolbox {
[SupportedOSPlatform ("ios")]
[SupportedOSPlatform ("maccatalyst")]
[UnsupportedOSPlatform ("ios7.0")]
#if IOS
[Obsolete ("Starting with ios7.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("ios7.0")]
#else
[Deprecated (PlatformName.iOS, 7, 0)]
#endif
@ -243,9 +233,7 @@ namespace AudioToolbox {
#if NET
[UnsupportedOSPlatform ("ios7.0")]
#if IOS
[Obsolete ("Starting with ios7.0 use 'AVAudioSession' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("ios7.0", "Use 'AVAudioSession' instead.")]
#else
[Deprecated (PlatformName.iOS, 7, 0, message: "Use 'AVAudioSession' instead.")]
#endif
@ -499,9 +487,7 @@ namespace AudioToolbox {
[SupportedOSPlatform ("ios")]
[SupportedOSPlatform ("maccatalyst")]
[UnsupportedOSPlatform ("ios5.0")]
#if IOS
[Obsolete ("Starting with ios5.0 use 'InputRoute' or 'OutputRoute' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("ios5.0", "Use 'InputRoute' or 'OutputRoute' instead.")]
#else
[Deprecated (PlatformName.iOS, 5, 0, message: "Use 'InputRoute' or 'OutputRoute' instead.")]
#endif

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

@ -171,11 +171,8 @@ namespace AudioToolbox {
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.10")]
[UnsupportedOSPlatform ("ios8.0")]
#if MONOMAC
[Obsolete ("Starting with macos10.10 canonical is no longer encouraged, since fixed-point no longer provides a performance advantage over floating point. 'AudioFormatFlagsNativeFloatPacked' is preffered instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios8.0 canonical is no longer encouraged, since fixed-point no longer provides a performance advantage over floating point. 'AudioFormatFlagsNativeFloatPacked' is preffered instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos10.10", "Canonical is no longer encouraged, since fixed-point no longer provides a performance advantage over floating point. 'AudioFormatFlagsNativeFloatPacked' is preffered instead.")]
[ObsoletedOSPlatform ("ios8.0", "Canonical is no longer encouraged, since fixed-point no longer provides a performance advantage over floating point. 'AudioFormatFlagsNativeFloatPacked' is preffered instead.")]
#else
[Deprecated (PlatformName.iOS, 8, 0, message: "Canonical is no longer encouraged, since fixed-point no longer provides a performance advantage over floating point. 'AudioFormatFlagsNativeFloatPacked' is preffered instead.")]
[Deprecated (PlatformName.MacOSX, 10, 10, message: "Canonical is no longer encouraged, since fixed-point no longer provides a performance advantage over floating point. 'AudioFormatFlagsNativeFloatPacked' is preffered instead.")]

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

@ -45,4 +45,17 @@ namespace AudioToolbox {
AmbienceBed = 3,
}
[NoWatch]
[TV (16, 0)]
[Mac (13, 0)]
[iOS (16, 0)]
public enum AUSpatialMixerPersonalizedHrtfMode : uint {
[NoiOS, NoTV]
Off = 0,
[NoiOS, NoTV]
On = 1,
[NoiOS, NoTV]
Auto = 2,
}
}

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

@ -876,6 +876,15 @@ namespace AudioUnit {
Ended = 1,
}
[iOS (16, 0), TV (16, 0), Mac (13, 0), MacCatalyst (16, 0)]
public enum AudioUnitEventType : uint {
ParameterValueChange = 0,
BeginParameterChangeGesture = 1,
EndParameterChangeGesture = 2,
PropertyChange = 3,
}
public enum AudioUnitSubType : uint {
AUConverter = 0x636F6E76, // 'conv'
Varispeed = 0x76617269, // 'vari'

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

@ -69,13 +69,9 @@ namespace AudioUnit {
[UnsupportedOSPlatform ("tvos14.0")]
[UnsupportedOSPlatform ("macos11.0")]
[UnsupportedOSPlatform ("ios14.0")]
#if TVOS
[Obsolete ("Starting with tvos14.0 use 'AVAudioEngine' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif MONOMAC
[Obsolete ("Starting with macos11.0 use 'AVAudioEngine' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios14.0 use 'AVAudioEngine' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("tvos14.0", "Use 'AVAudioEngine' instead.")]
[ObsoletedOSPlatform ("macos11.0", "Use 'AVAudioEngine' instead.")]
[ObsoletedOSPlatform ("ios14.0", "Use 'AVAudioEngine' instead.")]
#else
[Deprecated (PlatformName.iOS, 14, 0, message: "Use 'AVAudioEngine' instead.")]
[Deprecated (PlatformName.TvOS, 14, 0, message: "Use 'AVAudioEngine' instead.")]

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

@ -396,11 +396,8 @@ namespace AudioUnit {
[UnsupportedOSPlatform ("macos")]
[UnsupportedOSPlatform ("tvos14.0")]
[UnsupportedOSPlatform ("ios14.0")]
#if TVOS
[Obsolete ("Starting with tvos14.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios14.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("tvos14.0")]
[ObsoletedOSPlatform ("ios14.0")]
#else
[iOS (7, 0)]
[Deprecated (PlatformName.iOS, 14, 0)]
@ -416,11 +413,8 @@ namespace AudioUnit {
[UnsupportedOSPlatform ("macos")]
[UnsupportedOSPlatform ("tvos14.0")]
[UnsupportedOSPlatform ("ios14.0")]
#if TVOS
[Obsolete ("Starting with tvos14.0 use 'CopyIcon' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios14.0 use 'CopyIcon' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("tvos14.0", "Use 'CopyIcon' instead.")]
[ObsoletedOSPlatform ("ios14.0", "Use 'CopyIcon' instead.")]
#else
[iOS (7, 0)]
[Deprecated (PlatformName.iOS, 14, 0, message: "Use 'CopyIcon' instead.")]
@ -440,13 +434,9 @@ namespace AudioUnit {
[UnsupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("ios13.0")]
[UnsupportedOSPlatform ("macos")]
#if TVOS
[Obsolete ("Starting with tvos13.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios13.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("tvos13.0")]
[ObsoletedOSPlatform ("maccatalyst14.0")]
[ObsoletedOSPlatform ("ios13.0")]
#else
[iOS (7, 0)]
[Deprecated (PlatformName.iOS, 13, 0)]
@ -465,13 +455,9 @@ namespace AudioUnit {
[UnsupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("ios13.0")]
[UnsupportedOSPlatform ("macos")]
#if TVOS
[Obsolete ("Starting with tvos13.0 use 'AudioUnit' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0 use 'AudioUnit' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios13.0 use 'AudioUnit' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("tvos13.0", "Use 'AudioUnit' instead.")]
[ObsoletedOSPlatform ("maccatalyst14.0", "Use 'AudioUnit' instead.")]
[ObsoletedOSPlatform ("ios13.0", "Use 'AudioUnit' instead.")]
#else
[iOS (7, 0)]
[Deprecated (PlatformName.iOS, 13, 0, message: "Use 'AudioUnit' instead.")]
@ -492,9 +478,7 @@ namespace AudioUnit {
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos11.0")]
#if MONOMAC
[Obsolete ("Starting with macos11.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos11.0")]
#else
[Mac (10,11)]
[Deprecated (PlatformName.MacOSX, 11, 0)]
@ -508,9 +492,7 @@ namespace AudioUnit {
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos11.0")]
#if MONOMAC
[Obsolete ("Starting with macos11.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos11.0")]
#else
[Mac (10,11)]
[Deprecated (PlatformName.MacOSX, 11, 0)]
@ -522,6 +504,181 @@ namespace AudioUnit {
#endif
#if IOS || MONOMAC
#if NET
[SupportedOSPlatform ("macos13.0")]
[SupportedOSPlatform ("ios16.0")]
[SupportedOSPlatform ("maccatalyst16.0")]
[UnsupportedOSPlatform ("tvos")]
#else
[NoWatch]
[NoTV]
[Mac (13,0)]
[iOS (16,0)]
#endif
[DllImport (Constants.AudioUnitLibrary)]
static extern int AudioComponentCopyConfigurationInfo (IntPtr /* AudioComponent */ inComponent, out /* CFDictionaryRef** */ IntPtr outConfigurationInfo);
#if NET
[SupportedOSPlatform ("macos13.0")]
[SupportedOSPlatform ("ios16.0")]
[SupportedOSPlatform ("maccatalyst16.0")]
[UnsupportedOSPlatform ("tvos")]
#else
[NoWatch]
[NoTV]
[Mac (13,0)]
[iOS (16,0)]
#endif
public NSDictionary? GetConfigurationInfo (out int resultCode) {
resultCode = AudioComponentCopyConfigurationInfo (GetCheckedHandle (), out var dictPtr);
if (resultCode == 0) {
return Runtime.GetNSObject<NSDictionary> (dictPtr, owns: true);
}
return null;
}
#if NET
[SupportedOSPlatform ("macos13.0")]
[SupportedOSPlatform ("ios16.0")]
[SupportedOSPlatform ("maccatalyst16.0")]
[UnsupportedOSPlatform ("tvos")]
#else
[NoWatch]
[NoTV]
[Mac (13,0)]
[iOS (16,0)]
#endif
public NSDictionary? GetConfigurationInfo () => GetConfigurationInfo (out var _);
#if NET
[SupportedOSPlatform ("macos13.0")]
[SupportedOSPlatform ("ios16.0")]
[SupportedOSPlatform ("maccatalyst16.0")]
[UnsupportedOSPlatform ("tvos")]
#else
[NoWatch]
[NoTV]
[Mac (13,0)]
[iOS (16,0)]
[MacCatalyst (16,0)]
#endif
[DllImport (Constants.AudioUnitLibrary)]
static extern int AudioComponentValidate (IntPtr /* AudioComponent* */ inComponent, IntPtr /* CFDictionaryRef* */ inValidationParameters,
out AudioComponentValidationResult outValidationResult);
#if NET
[SupportedOSPlatform ("macos13.0")]
[SupportedOSPlatform ("ios16.0")]
[SupportedOSPlatform ("maccatalyst16.0")]
[UnsupportedOSPlatform ("tvos")]
#else
[NoWatch]
[NoTV]
[Mac (13,0)]
[iOS (16,0)]
[MacCatalyst (16,0)]
#endif
public AudioComponentValidationResult Validate (NSDictionary? validationParameters, out int resultCode) {
resultCode = AudioComponentValidate (GetCheckedHandle (), validationParameters.GetHandle (), out var result);
if (resultCode == 0)
return result;
return AudioComponentValidationResult.Unknown;
}
#if NET
[SupportedOSPlatform ("macos13.0")]
[SupportedOSPlatform ("ios16.0")]
[SupportedOSPlatform ("maccatalyst16.0")]
[UnsupportedOSPlatform ("tvos")]
#else
[NoWatch]
[NoTV]
[Mac (13,0)]
[iOS (16,0)]
[MacCatalyst (16,0)]
#endif
public AudioComponentValidationResult Validate (NSDictionary? validationParameters = null) => Validate (validationParameters, out var _);
delegate void TrampolineCallback (IntPtr blockPtr, AudioComponentValidationResult result, IntPtr dictionary);
static unsafe readonly TrampolineCallback static_action = TrampolineAction;
[MonoPInvokeCallback (typeof (TrampolineCallback))]
static void TrampolineAction (IntPtr blockPtr, AudioComponentValidationResult result, IntPtr dictionary)
{
var del = BlockLiteral.GetTarget<Action<AudioComponentValidationResult, NSDictionary?>> (blockPtr);
if (del is not null)
del (result, Runtime.GetNSObject<NSDictionary>(dictionary));
}
#if NET
[SupportedOSPlatform ("macos13.0")]
[SupportedOSPlatform ("ios16.0")]
[SupportedOSPlatform ("maccatalyst16.0")]
[UnsupportedOSPlatform ("tvos")]
#else
[NoWatch]
[NoTV]
[Mac (13,0)]
[iOS (16,0)]
#endif
[DllImport (Constants.AudioUnitLibrary)]
static extern int AudioComponentValidateWithResults (IntPtr /* AudioComponent* */ inComponent, IntPtr /* CFDictionaryRef* */ inValidationParameters, ref BlockLiteral inCompletionHandler);
#if NET
[SupportedOSPlatform ("macos13.0")]
[SupportedOSPlatform ("ios16.0")]
[SupportedOSPlatform ("maccatalyst16.0")]
[UnsupportedOSPlatform ("tvos")]
#else
[NoWatch]
[NoTV]
[Mac (13,0)]
[iOS (16,0)]
#endif
[BindingImpl (BindingImplOptions.Optimizable)]
public void ValidateAsync (NSDictionary? validationParameters,
Action<AudioComponentValidationResult, NSDictionary?> onCompletion, out int resultCode) {
if (onCompletion is null)
ObjCRuntime.ThrowHelper.ThrowArgumentNullException (nameof (onCompletion));
var block_handler= new BlockLiteral ();
block_handler.SetupBlockUnsafe (static_action, onCompletion);
try {
resultCode = AudioComponentValidateWithResults (GetCheckedHandle (), validationParameters.GetHandle (), ref block_handler);
} finally {
block_handler.CleanupBlock ();
}
}
#if NET
[SupportedOSPlatform ("macos13.0")]
[SupportedOSPlatform ("ios16.0")]
[SupportedOSPlatform ("maccatalyst16.0")]
[UnsupportedOSPlatform ("tvos")]
#else
[NoWatch]
[NoTV]
[Mac (13,0)]
[iOS (16,0)]
#endif
public void ValidateAsync (NSDictionary? validationParameters,
Action<AudioComponentValidationResult, NSDictionary?> onCompletion) => ValidateAsync (validationParameters, onCompletion, out var _);
#if NET
[SupportedOSPlatform ("macos13.0")]
[SupportedOSPlatform ("ios16.0")]
[SupportedOSPlatform ("maccatalyst16.0")]
[UnsupportedOSPlatform ("tvos")]
#else
[NoWatch]
[NoTV]
[Mac (13,0)]
[iOS (16,0)]
#endif
public void ValidateAsync (Action<AudioComponentValidationResult, NSDictionary?> onCompletion) => ValidateAsync (null, onCompletion, out var _);
#if NET
[SupportedOSPlatform ("macos10.13")]
[SupportedOSPlatform ("ios11.0")]
@ -607,7 +764,8 @@ namespace AudioUnit {
}
}
}
#endif
#endif // IOS || MONOMAC
#endif // !COREBUILD
}

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

@ -58,6 +58,15 @@ namespace AudioUnit {
[iOS (7, 0)]
#endif
MIDIProcessor = 0x61756d69, // 'aumi'
#if NET
[SupportedOSPlatform ("ios16.0")]
[SupportedOSPlatform ("maccatalyst16.0")]
[SupportedOSPlatform ("macos13.0")]
[SupportedOSPlatform ("tvos16.0")]
#else
[iOS (16, 0), Mac (13, 0), TV (16, 0), MacCatalyst (16, 0)]
#endif
SpeechSynthesize = 0x61757370, // ausp
#if !MONOMAC
#if NET
@ -151,11 +160,8 @@ namespace AudioUnit {
[UnsupportedOSPlatform ("macos")]
[UnsupportedOSPlatform ("tvos13.0")]
[UnsupportedOSPlatform ("ios13.0")]
#if TVOS
[Obsolete ("Starting with tvos13.0 use 'AudioTypeConverter.NewTimePitch' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios13.0 use 'AudioTypeConverter.NewTimePitch' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("tvos13.0", "Use 'AudioTypeConverter.NewTimePitch' instead.")]
[ObsoletedOSPlatform ("ios13.0", "Use 'AudioTypeConverter.NewTimePitch' instead.")]
#else
[Deprecated (PlatformName.iOS, 13, 0, message: "Use 'AudioTypeConverter.NewTimePitch' instead.")]
[Deprecated (PlatformName.TvOS, 13, 0, message: "Use 'AudioTypeConverter.NewTimePitch' instead.")]
@ -177,9 +183,7 @@ namespace AudioUnit {
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
#if IOS
[Obsolete ("Starting with ios7.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("ios7.0")]
#else
[Obsoleted (PlatformName.iOS, 7, 0)]
#endif
@ -213,11 +217,8 @@ namespace AudioUnit {
[UnsupportedOSPlatform ("tvos13.0")]
[UnsupportedOSPlatform ("ios13.0")]
[UnsupportedOSPlatform ("macos")]
#if TVOS
[Obsolete ("Starting with tvos13.0 use 'AudioTypeEffect.GraphicEQ' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios13.0 use 'AudioTypeEffect.GraphicEQ' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("tvos13.0", "Use 'AudioTypeEffect.GraphicEQ' instead.")]
[ObsoletedOSPlatform ("ios13.0", "Use 'AudioTypeEffect.GraphicEQ' instead.")]
[UnsupportedOSPlatform ("maccatalyst")]
#else
[Unavailable (PlatformName.MacCatalyst)]
@ -252,9 +253,7 @@ namespace AudioUnit {
[UnsupportedOSPlatform ("tvos")]
[SupportedOSPlatform ("macos")]
[UnsupportedOSPlatform ("macos10.10")]
#if MONOMAC
[Obsolete ("Starting with macos10.10 use 'Spacial' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos10.10", "Use 'Spacial' instead.")]
#else
[Deprecated (PlatformName.MacOSX, 10, 10, message : "Use 'Spacial' instead.")]
#endif
@ -266,9 +265,7 @@ namespace AudioUnit {
[UnsupportedOSPlatform ("maccatalyst")]
[UnsupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos")]
#if IOS
[Obsolete ("Starting with ios8.0 use 'Spacial' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("ios8.0", "Use 'Spacial' instead.")]
#endif
Embedded3D = 0x3364656d, // '3dem'
#endif

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

@ -761,13 +761,9 @@ namespace AudioUnit {
[UnsupportedOSPlatform ("tvos13.0")]
[UnsupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("ios13.0")]
#if TVOS
[Obsolete ("Starting with tvos13.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios13.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("tvos13.0")]
[ObsoletedOSPlatform ("maccatalyst14.0")]
[ObsoletedOSPlatform ("ios13.0")]
#else
[iOS (7, 0)]
[Deprecated (PlatformName.iOS, 13, 0)]
@ -786,13 +782,9 @@ namespace AudioUnit {
[UnsupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("ios13.0")]
[UnsupportedOSPlatform ("macos")]
#if TVOS
[Obsolete ("Starting with tvos13.0 use 'AudioUnit' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0 use 'AudioUnit' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios13.0 use 'AudioUnit' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("tvos13.0", "Use 'AudioUnit' instead.")]
[ObsoletedOSPlatform ("maccatalyst14.0", "Use 'AudioUnit' instead.")]
[ObsoletedOSPlatform ("ios13.0", "Use 'AudioUnit' instead.")]
#else
[iOS (7, 0)]
[Deprecated (PlatformName.iOS, 13, 0, message: "Use 'AudioUnit' instead.")]
@ -822,13 +814,9 @@ namespace AudioUnit {
[UnsupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("ios13.0")]
[UnsupportedOSPlatform ("macos")]
#if TVOS
[Obsolete ("Starting with tvos13.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios13.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("tvos13.0")]
[ObsoletedOSPlatform ("maccatalyst14.0")]
[ObsoletedOSPlatform ("ios13.0")]
#else
[iOS (7, 0)]
[MacCatalyst (14, 0)]
@ -847,13 +835,9 @@ namespace AudioUnit {
[UnsupportedOSPlatform ("maccatalyst14.0")]
[UnsupportedOSPlatform ("ios13.0")]
[UnsupportedOSPlatform ("macos")]
#if TVOS
[Obsolete ("Starting with tvos13.0 use 'AudioUnit' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif __MACCATALYST__
[Obsolete ("Starting with maccatalyst14.0 use 'AudioUnit' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios13.0 use 'AudioUnit' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("tvos13.0", "Use 'AudioUnit' instead.")]
[ObsoletedOSPlatform ("maccatalyst14.0", "Use 'AudioUnit' instead.")]
[ObsoletedOSPlatform ("ios13.0", "Use 'AudioUnit' instead.")]
#else
[iOS (7, 0)]
[Deprecated (PlatformName.iOS, 13, 0, message: "Use 'AudioUnit' instead.")]

83
src/BackgroundAssets/BACompat.cs Normal file
Просмотреть файл

@ -0,0 +1,83 @@
//
// BACompar.cs: Compatibility functions
//
// Copyright 2022 Microsoft Inc. All rights reserved.
using System;
using System.Runtime.Versioning;
using Foundation;
#nullable enable
namespace BackgroundAssets {
public partial class BAAppExtensionInfo {
#if !NET
[Obsolete ("This property has been removed. It will always return string.Empty.")]
#else
[UnsupportedOSPlatform ("ios16.1")]
[UnsupportedOSPlatform ("tvos16.1")]
[UnsupportedOSPlatform ("maccatalyst16.1")]
[UnsupportedOSPlatform ("macos13.0")]
#endif
public virtual string ApplicationIdentifier => string.Empty;
#if !NET
[Obsolete ("This property has been removed. It will always return false.")]
#else
[UnsupportedOSPlatform ("ios16.1")]
[UnsupportedOSPlatform ("tvos16.1")]
[UnsupportedOSPlatform ("maccatalyst16.1")]
[UnsupportedOSPlatform ("macos13.0")]
#endif
bool DownloadSizeRestricted => false;
#if !NET
[Obsolete ("This property has been removed. It will always return NSDate.Now.")]
#else
[UnsupportedOSPlatform ("ios16.1")]
[UnsupportedOSPlatform ("tvos16.1")]
[UnsupportedOSPlatform ("maccatalyst16.1")]
[UnsupportedOSPlatform ("macos13.0")]
#endif
public virtual NSDate LastPeriodicCheckTime => NSDate.Now;
#if !NET
[Obsolete ("This property has been removed. It will always return NSDate.Now.")]
#else
[UnsupportedOSPlatform ("ios16.1")]
[UnsupportedOSPlatform ("tvos16.1")]
[UnsupportedOSPlatform ("maccatalyst16.1")]
[UnsupportedOSPlatform ("macos13.0")]
#endif
public virtual NSDate LastApplicationLaunchTime => NSDate.Now;
}
public partial class BADownloadManager {
#if !NET
[Obsolete ("This method has been removed. It will always execution the handler with false. Use PerformWithExclusiveControl (Action<bool, NSError>) instead.")]
#else
[UnsupportedOSPlatform ("ios16.1")]
[UnsupportedOSPlatform ("tvos16.1")]
[UnsupportedOSPlatform ("maccatalyst16.1")]
[UnsupportedOSPlatform ("macos13.0")]
#endif
public virtual void PerformWithExclusiveControl (NSDate date, Action<bool, NSError?> performHandler) => performHandler?.Invoke (false, null);
}
public partial class BADownload {
#if !NET
[Obsolete ("This property has been removed. It will always return null.")]
#else
[UnsupportedOSPlatform ("ios16.1")]
[UnsupportedOSPlatform ("tvos16.1")]
[UnsupportedOSPlatform ("maccatalyst16.1")]
[UnsupportedOSPlatform ("macos13.0")]
#endif
public virtual NSError? Error => null;
}
}

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

@ -295,13 +295,9 @@ namespace CoreServices {
[UnsupportedOSPlatform ("macos10.14")]
[UnsupportedOSPlatform ("ios12.0")]
[UnsupportedOSPlatform ("maccatalyst")]
#if TVOS
[Obsolete ("Starting with tvos12.0 not available anymore.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif MONOMAC
[Obsolete ("Starting with macos10.14 not available anymore.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios12.0 not available anymore.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("tvos12.0", "Not available anymore.")]
[ObsoletedOSPlatform ("macos10.14", "Not available anymore.")]
[ObsoletedOSPlatform ("ios12.0", "Not available anymore.")]
#else
[Mac (10, 9)]
[iOS (7, 0)]

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

@ -33,11 +33,8 @@ namespace CoreServices {
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.11")]
[UnsupportedOSPlatform ("ios9.0")]
#if MONOMAC
[Obsolete ("Starting with macos10.11 use 'NSUrlSession'.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use 'NSUrlSession'.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos10.11", "Use 'NSUrlSession'.")]
[ObsoletedOSPlatform ("ios9.0", "Use 'NSUrlSession'.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message: "Use 'NSUrlSession'.")]
[Deprecated (PlatformName.MacOSX, 10, 11, message: "Use 'NSUrlSession'.")]

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

@ -14,6 +14,7 @@ using ObjCRuntime;
namespace ClockKit {
[Deprecated (PlatformName.WatchOS, 9, 0, message: "Use WidgetKit instead.")]
[Native]
public enum CLKComplicationFamily : long {
ModularSmall,

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

@ -247,4 +247,20 @@ namespace CloudKit {
PrivateUser = 3,
PublicUser = 4,
}
[NoTV, NoWatch, Mac (13, 0), iOS (16, 0), MacCatalyst (16, 0)]
[Native, Flags]
public enum CKSharingParticipantAccessOption : ulong {
AnyoneWithLink = 1uL << 0,
SpecifiedRecipientsOnly = 1uL << 1,
Any = AnyoneWithLink | SpecifiedRecipientsOnly,
}
[NoTV, NoWatch, Mac (13, 0), iOS (16, 0), MacCatalyst (16, 0)]
[Native, Flags]
public enum CKSharingParticipantPermissionOption : ulong {
ReadOnly = 1uL << 0,
ReadWrite = 1uL << 1,
Any = ReadOnly | ReadWrite,
}
}

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

@ -118,6 +118,8 @@ namespace CoreBluetooth {
PeerRemovedPairingInformation,
EncryptionTimedOut,
TooManyLEPairedDevices = 16,
LEGattExceededBackgroundNotificationLimit = 17,
LEGattNearBackgroundNotificationLimit = 18,
}
[Watch (4,0)]

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

@ -462,13 +462,10 @@ namespace CoreFoundation {
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.11")]
[UnsupportedOSPlatform ("ios9.0")]
#if MONOMAC
[Obsolete ("Starting with macos10.11.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos10.11")]
[ObsoletedOSPlatform ("ios9.0")]
[ObsoletedOSPlatform ("maccatalyst13.0")]
[ObsoletedOSPlatform ("tvos9.0")]
#else
[Deprecated (PlatformName.iOS, 9, 0)]
[Deprecated (PlatformName.MacOSX, 10, 11)]
@ -482,13 +479,10 @@ namespace CoreFoundation {
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.11")]
[UnsupportedOSPlatform ("ios9.0")]
#if MONOMAC
[Obsolete ("Starting with macos10.11 use 'NSUrlSession' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use 'NSUrlSession' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos10.11", "Use 'NSUrlSession' instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use 'NSUrlSession' instead.")]
[ObsoletedOSPlatform ("maccatalyst13.0", "Use 'NSUrlSession' instead.")]
[ObsoletedOSPlatform ("tvos9.0", "Use 'NSUrlSession' instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message : "Use 'NSUrlSession' instead.")]
[Deprecated (PlatformName.MacOSX, 10, 11, message : "Use 'NSUrlSession' instead.")]
@ -508,13 +502,10 @@ namespace CoreFoundation {
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.11")]
[UnsupportedOSPlatform ("ios9.0")]
#if MONOMAC
[Obsolete ("Starting with macos10.11.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos10.11")]
[ObsoletedOSPlatform ("ios9.0")]
[ObsoletedOSPlatform ("maccatalyst13.0")]
[ObsoletedOSPlatform ("tvos9.0")]
#else
[Deprecated (PlatformName.iOS, 9,0)]
[Deprecated (PlatformName.MacOSX, 10,11)]
@ -529,13 +520,10 @@ namespace CoreFoundation {
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.11")]
[UnsupportedOSPlatform ("ios9.0")]
#if MONOMAC
[Obsolete ("Starting with macos10.11 use 'NSUrlSession' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use 'NSUrlSession' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos10.11", "Use 'NSUrlSession' instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use 'NSUrlSession' instead.")]
[ObsoletedOSPlatform ("maccatalyst13.0", "Use 'NSUrlSession' instead.")]
[ObsoletedOSPlatform ("tvos9.0", "Use 'NSUrlSession' instead.")]
#else
[Deprecated (PlatformName.iOS, 9,0, message : "Use 'NSUrlSession' instead.")]
[Deprecated (PlatformName.MacOSX, 10,11, message : "Use 'NSUrlSession' instead.")]

31
src/CoreFoundation/CGAffineTransformComponents.cs Normal file
Просмотреть файл

@ -0,0 +1,31 @@
// Copyright 2022 Microsoft Corporation.
#nullable enable
using System;
using System.Runtime.InteropServices;
using System.Runtime.Versioning;
using CoreGraphics;
namespace CoreFoundation {
#if NET
[SupportedOSPlatform ("ios")]
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
#endif
[StructLayout (LayoutKind.Sequential)]
// The name prefix suggests CoreGraphics and based on CF_DEFINES_CGAFFINETRANSFORMCOMPONENTS
// it could be defined in CoreGraphics but documented as CoreFoundation type
public struct CGAffineTransformComponents
{
public CGSize Scale;
public nfloat HorizontalShear;
public nfloat Rotation;
public CGVector Translation;
}
}

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

@ -314,11 +314,8 @@ namespace CoreFoundation {
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.9")]
[UnsupportedOSPlatform ("ios6.0")]
#if MONOMAC
[Obsolete ("Starting with macos10.9.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios6.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos10.9")]
[ObsoletedOSPlatform ("ios6.0")]
#else
[Deprecated (PlatformName.iOS, 6, 0)]
[Deprecated (PlatformName.MacOSX, 10, 9)]
@ -621,11 +618,8 @@ namespace CoreFoundation {
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.9")]
[UnsupportedOSPlatform ("ios6.0")]
#if MONOMAC
[Obsolete ("Starting with macos10.9.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios6.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos10.9")]
[ObsoletedOSPlatform ("ios6.0")]
#else
[Deprecated (PlatformName.iOS, 6,0)]
[Deprecated (PlatformName.MacOSX, 10,9)]

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

@ -456,6 +456,38 @@ namespace CoreGraphics {
{
return CGAffineTransformInvert (this);
}
#if NET
[SupportedOSPlatform ("ios16.0")]
[SupportedOSPlatform ("maccatalyst16.0")]
[SupportedOSPlatform ("macos13.0")]
[SupportedOSPlatform ("tvos16.0")]
#else
[Mac (13,0), iOS (16,0), TV (16,0), MacCatalyst (16,0), Watch (9,0)]
#endif
[DllImport (Constants.CoreGraphicsLibrary)]
static extern CGAffineTransformComponents CGAffineTransformDecompose (CGAffineTransform transform);
public CGAffineTransformComponents Decompose ()
{
return CGAffineTransformDecompose (this);
}
#if NET
[SupportedOSPlatform ("ios16.0")]
[SupportedOSPlatform ("maccatalyst16.0")]
[SupportedOSPlatform ("macos13.0")]
[SupportedOSPlatform ("tvos16.0")]
#else
[Mac (13,0), iOS (16,0), TV (16,0), MacCatalyst (16,0), Watch (9,0)]
#endif
[DllImport (Constants.CoreGraphicsLibrary)]
static extern CGAffineTransform CGAffineTransformMakeWithComponents (CGAffineTransformComponents components);
public static CGAffineTransform MakeWithComponents (CGAffineTransformComponents components)
{
return CGAffineTransformMakeWithComponents (components);
}
#endif // !COREBUILD
}
}

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

@ -490,13 +490,9 @@ namespace CoreGraphics {
[UnsupportedOSPlatform ("macos10.13")]
[UnsupportedOSPlatform ("tvos11.0")]
[UnsupportedOSPlatform ("ios11.0")]
#if MONOMAC
[Obsolete ("Starting with macos10.13 use 'CreateIDCCData' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif TVOS
[Obsolete ("Starting with tvos11.0 use 'CreateIDCCData' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios11.0 use 'CreateIDCCData' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos10.13", "Use 'CreateIDCCData' instead.")]
[ObsoletedOSPlatform ("tvos11.0", "Use 'CreateIDCCData' instead.")]
[ObsoletedOSPlatform ("ios11.0", "Use 'CreateIDCCData' instead.")]
#else
[Deprecated (PlatformName.iOS, 11, 0, message: "Use 'CreateIDCCData' instead.")]
[Deprecated (PlatformName.MacOSX, 10, 13, message: "Use 'CreateIDCCData' instead.")]
@ -528,13 +524,9 @@ namespace CoreGraphics {
[UnsupportedOSPlatform ("macos10.13")]
[UnsupportedOSPlatform ("tvos11.0")]
[UnsupportedOSPlatform ("ios11.0")]
#if MONOMAC
[Obsolete ("Starting with macos10.13 use 'CreateIDCCData' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif TVOS
[Obsolete ("Starting with tvos11.0 use 'CreateIDCCData' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios11.0 use 'CreateIDCCData' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos10.13", "Use 'CreateIDCCData' instead.")]
[ObsoletedOSPlatform ("tvos11.0", "Use 'CreateIDCCData' instead.")]
[ObsoletedOSPlatform ("ios11.0", "Use 'CreateIDCCData' instead.")]
#else
[Deprecated (PlatformName.iOS, 11, 0, message: "Use 'CreateIDCCData' instead.")]
[Deprecated (PlatformName.MacOSX, 10, 13, message: "Use 'CreateIDCCData' instead.")]
@ -612,13 +604,9 @@ namespace CoreGraphics {
[UnsupportedOSPlatform ("macos10.13")]
[UnsupportedOSPlatform ("tvos11.0")]
[UnsupportedOSPlatform ("ios11.0")]
#if MONOMAC
[Obsolete ("Starting with macos10.13 use 'GetICCData' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif TVOS
[Obsolete ("Starting with tvos11.0 use 'GetICCData' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios11.0 use 'GetICCData' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos10.13", "Use 'GetICCData' instead.")]
[ObsoletedOSPlatform ("tvos11.0", "Use 'GetICCData' instead.")]
[ObsoletedOSPlatform ("ios11.0", "Use 'GetICCData' instead.")]
#else
[Deprecated (PlatformName.MacOSX, 10, 13, message: "Use 'GetICCData' instead." )]
[Deprecated (PlatformName.iOS, 11, 0, message: "Use 'GetICCData' instead." )]
@ -636,13 +624,9 @@ namespace CoreGraphics {
[UnsupportedOSPlatform ("macos10.13")]
[UnsupportedOSPlatform ("tvos11.0")]
[UnsupportedOSPlatform ("ios11.0")]
#if MONOMAC
[Obsolete ("Starting with macos10.13 use 'GetICCData' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif TVOS
[Obsolete ("Starting with tvos11.0 use 'GetICCData' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios11.0 use 'GetICCData' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos10.13", "Use 'GetICCData' instead.")]
[ObsoletedOSPlatform ("tvos11.0", "Use 'GetICCData' instead.")]
[ObsoletedOSPlatform ("ios11.0", "Use 'GetICCData' instead.")]
#else
[iOS (7,0)] // note: pre-release docs/headers says iOS6 and later, available on OSX since 10.5
[Deprecated (PlatformName.MacOSX, 10, 13, message: "Use 'GetICCData' instead." )]
@ -835,13 +819,9 @@ namespace CoreGraphics {
[UnsupportedOSPlatform ("macos10.15.4")]
[UnsupportedOSPlatform ("tvos13.4")]
[UnsupportedOSPlatform ("ios13.4")]
#if MONOMAC
[Obsolete ("Starting with macos10.15.4.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif TVOS
[Obsolete ("Starting with tvos13.4.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios13.4.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos10.15.4")]
[ObsoletedOSPlatform ("tvos13.4")]
[ObsoletedOSPlatform ("ios13.4")]
#else
[Mac (10,15)]
[iOS (13,0)]
@ -864,13 +844,9 @@ namespace CoreGraphics {
[UnsupportedOSPlatform ("macos10.15.4")]
[UnsupportedOSPlatform ("tvos13.4")]
[UnsupportedOSPlatform ("ios13.4")]
#if MONOMAC
[Obsolete ("Starting with macos10.15.4.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif TVOS
[Obsolete ("Starting with tvos13.4.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios13.4.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos10.15.4")]
[ObsoletedOSPlatform ("tvos13.4")]
[ObsoletedOSPlatform ("ios13.4")]
#else
[Mac (10,15)]
[iOS (13,0)]
@ -1038,6 +1014,35 @@ namespace CoreGraphics {
#endif
public CGColorSpace? CreateExtendedLinearized () => Runtime.GetINativeObject<CGColorSpace> (CGColorSpaceCreateExtendedLinearized (Handle), owns: true);
#if NET
[SupportedOSPlatform ("ios16.0")]
[SupportedOSPlatform ("tvos16.0")]
[SupportedOSPlatform ("macos13.0")]
[SupportedOSPlatform ("maccatalyst16.0")]
#else
[iOS (16,0)]
[TV (16,0)]
[Mac (13,0)]
[MacCatalyst (16,0)]
[Watch (9,0)]
#endif
[DllImport (Constants.CoreGraphicsLibrary)]
static extern IntPtr CGColorSpaceCreateCopyWithStandardRange (/* CGColorSpaceRef */ IntPtr s);
#if NET
[SupportedOSPlatform ("ios16.0")]
[SupportedOSPlatform ("tvos16.0")]
[SupportedOSPlatform ("macos13.0")]
[SupportedOSPlatform ("maccatalyst16.0")]
#else
[iOS (16,0)]
[TV (16,0)]
[Mac (13,0)]
[MacCatalyst (16,0)]
[Watch (9,0)]
#endif
public CGColorSpace? CreateCopyWithStandardRange () => Runtime.GetINativeObject<CGColorSpace> (CGColorSpaceCreateCopyWithStandardRange (Handle), owns: true);
#if NET
[SupportedOSPlatform ("macos12.0")]
[SupportedOSPlatform ("ios15.0")]

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

@ -831,11 +831,8 @@ namespace CoreGraphics {
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.9")]
[UnsupportedOSPlatform ("ios7.0")]
#if MONOMAC
[Obsolete ("Starting with macos10.9.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios7.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos10.9")]
[ObsoletedOSPlatform ("ios7.0")]
#else
[Deprecated (PlatformName.iOS, 7,0)]
[Deprecated (PlatformName.MacOSX, 10,9)]
@ -851,11 +848,8 @@ namespace CoreGraphics {
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.9")]
[UnsupportedOSPlatform ("ios7.0")]
#if MONOMAC
[Obsolete ("Starting with macos10.9 use the 'CoreText' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios7.0 use the 'CoreText' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos10.9", "Use the 'CoreText' API instead.")]
[ObsoletedOSPlatform ("ios7.0", "Use the 'CoreText' API instead.")]
#else
[Deprecated (PlatformName.iOS, 7, 0, message : "Use the 'CoreText' API instead.")]
[Deprecated (PlatformName.MacOSX, 10, 9, message : "Use the 'CoreText' API instead.")]
@ -886,11 +880,8 @@ namespace CoreGraphics {
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.9")]
[UnsupportedOSPlatform ("ios7.0")]
#if MONOMAC
[Obsolete ("Starting with macos10.9.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios7.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos10.9")]
[ObsoletedOSPlatform ("ios7.0")]
#else
[Deprecated (PlatformName.iOS, 7,0)]
[Deprecated (PlatformName.MacOSX, 10,9)]
@ -905,11 +896,8 @@ namespace CoreGraphics {
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.9")]
[UnsupportedOSPlatform ("ios7.0")]
#if MONOMAC
[Obsolete ("Starting with macos10.9 use the 'CoreText' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios7.0 use the 'CoreText' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos10.9", "Use the 'CoreText' API instead.")]
[ObsoletedOSPlatform ("ios7.0", "Use the 'CoreText' API instead.")]
#else
[Deprecated (PlatformName.iOS, 7, 0, message : "Use the 'CoreText' API instead.")]
[Deprecated (PlatformName.MacOSX, 10, 9, message : "Use the 'CoreText' API instead.")]
@ -930,11 +918,8 @@ namespace CoreGraphics {
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.9")]
[UnsupportedOSPlatform ("ios7.0")]
#if MONOMAC
[Obsolete ("Starting with macos10.9 use the 'CoreText' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios7.0 use the 'CoreText' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos10.9", "Use the 'CoreText' API instead.")]
[ObsoletedOSPlatform ("ios7.0", "Use the 'CoreText' API instead.")]
#else
[Deprecated (PlatformName.iOS, 7, 0, message : "Use the 'CoreText' API instead.")]
[Deprecated (PlatformName.MacOSX, 10, 9, message : "Use the 'CoreText' API instead.")]
@ -951,11 +936,8 @@ namespace CoreGraphics {
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.9")]
[UnsupportedOSPlatform ("ios7.0")]
#if MONOMAC
[Obsolete ("Starting with macos10.9.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios7.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos10.9")]
[ObsoletedOSPlatform ("ios7.0")]
#else
[Deprecated (PlatformName.iOS, 7,0)]
[Deprecated (PlatformName.MacOSX, 10,9)]
@ -970,11 +952,8 @@ namespace CoreGraphics {
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.9")]
[UnsupportedOSPlatform ("ios7.0")]
#if MONOMAC
[Obsolete ("Starting with macos10.9 use the 'CoreText' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios7.0 use the 'CoreText' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos10.9", "Use the 'CoreText' API instead.")]
[ObsoletedOSPlatform ("ios7.0", "Use the 'CoreText' API instead.")]
#else
[Deprecated (PlatformName.iOS, 7, 0, message : "Use the 'CoreText' API instead.")]
[Deprecated (PlatformName.MacOSX, 10, 9, message : "Use the 'CoreText' API instead.")]
@ -995,11 +974,8 @@ namespace CoreGraphics {
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.9")]
[UnsupportedOSPlatform ("ios7.0")]
#if MONOMAC
[Obsolete ("Starting with macos10.9 use the 'CoreText' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios7.0 use the 'CoreText' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos10.9", "Use the 'CoreText' API instead.")]
[ObsoletedOSPlatform ("ios7.0", "Use the 'CoreText' API instead.")]
#else
[Deprecated (PlatformName.iOS, 7, 0, message : "Use the 'CoreText' API instead.")]
[Deprecated (PlatformName.MacOSX, 10, 9, message : "Use the 'CoreText' API instead.")]
@ -1016,11 +992,8 @@ namespace CoreGraphics {
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.9")]
[UnsupportedOSPlatform ("ios7.0")]
#if MONOMAC
[Obsolete ("Starting with macos10.9.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios7.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos10.9")]
[ObsoletedOSPlatform ("ios7.0")]
#else
[Deprecated (PlatformName.iOS, 7,0)]
[Deprecated (PlatformName.MacOSX, 10,9)]
@ -1036,11 +1009,8 @@ namespace CoreGraphics {
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.9")]
[UnsupportedOSPlatform ("ios7.0")]
#if MONOMAC
[Obsolete ("Starting with macos10.9 use the 'CoreText' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios7.0 use the 'CoreText' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos10.9", "Use the 'CoreText' API instead.")]
[ObsoletedOSPlatform ("ios7.0", "Use the 'CoreText' API instead.")]
#else
[Deprecated (PlatformName.iOS, 7, 0, message : "Use the 'CoreText' API instead.")]
[Deprecated (PlatformName.MacOSX, 10, 9, message : "Use the 'CoreText' API instead.")]
@ -1057,11 +1027,8 @@ namespace CoreGraphics {
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.9")]
[UnsupportedOSPlatform ("ios7.0")]
#if MONOMAC
[Obsolete ("Starting with macos10.9 use the 'CoreText' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios7.0 use the 'CoreText' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos10.9", "Use the 'CoreText' API instead.")]
[ObsoletedOSPlatform ("ios7.0", "Use the 'CoreText' API instead.")]
#else
[Deprecated (PlatformName.iOS, 7, 0, message : "Use the 'CoreText' API instead.")]
[Deprecated (PlatformName.MacOSX, 10, 9, message : "Use the 'CoreText' API instead.")]
@ -1078,11 +1045,8 @@ namespace CoreGraphics {
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.9")]
[UnsupportedOSPlatform ("ios7.0")]
#if MONOMAC
[Obsolete ("Starting with macos10.9.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios7.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos10.9")]
[ObsoletedOSPlatform ("ios7.0")]
#else
[Deprecated (PlatformName.iOS, 7,0)]
[Deprecated (PlatformName.MacOSX, 10,9)]
@ -1107,11 +1071,8 @@ namespace CoreGraphics {
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.9")]
[UnsupportedOSPlatform ("ios7.0")]
#if MONOMAC
[Obsolete ("Starting with macos10.9.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios7.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos10.9")]
[ObsoletedOSPlatform ("ios7.0")]
#else
[Deprecated (PlatformName.iOS, 7,0)]
[Deprecated (PlatformName.MacOSX, 10,9)]
@ -1127,11 +1088,8 @@ namespace CoreGraphics {
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.9")]
[UnsupportedOSPlatform ("ios7.0")]
#if MONOMAC
[Obsolete ("Starting with macos10.9 use the 'CoreText' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios7.0 use the 'CoreText' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos10.9", "Use the 'CoreText' API instead.")]
[ObsoletedOSPlatform ("ios7.0", "Use the 'CoreText' API instead.")]
#else
[Deprecated (PlatformName.iOS, 7, 0, message : "Use the 'CoreText' API instead.")]
[Deprecated (PlatformName.MacOSX, 10, 9, message : "Use the 'CoreText' API instead.")]
@ -1148,11 +1106,8 @@ namespace CoreGraphics {
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.9")]
[UnsupportedOSPlatform ("ios7.0")]
#if MONOMAC
[Obsolete ("Starting with macos10.9 use the 'CoreText' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios7.0 use the 'CoreText' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos10.9", "Use the 'CoreText' API instead.")]
[ObsoletedOSPlatform ("ios7.0", "Use the 'CoreText' API instead.")]
#else
[Deprecated (PlatformName.iOS, 7, 0, message : "Use the 'CoreText' API instead.")]
[Deprecated (PlatformName.MacOSX, 10, 9, message : "Use the 'CoreText' API instead.")]
@ -1173,11 +1128,8 @@ namespace CoreGraphics {
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.9")]
[UnsupportedOSPlatform ("ios7.0")]
#if MONOMAC
[Obsolete ("Starting with macos10.9.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios7.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos10.9")]
[ObsoletedOSPlatform ("ios7.0")]
#else
[Deprecated (PlatformName.iOS, 7,0)]
[Deprecated (PlatformName.MacOSX, 10,9)]
@ -1193,11 +1145,8 @@ namespace CoreGraphics {
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.9")]
[UnsupportedOSPlatform ("ios7.0")]
#if MONOMAC
[Obsolete ("Starting with macos10.9 use the 'CoreText' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios7.0 use the 'CoreText' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos10.9", "Use the 'CoreText' API instead.")]
[ObsoletedOSPlatform ("ios7.0", "Use the 'CoreText' API instead.")]
#else
[Deprecated (PlatformName.iOS, 7, 0, message : "Use the 'CoreText' API instead.")]
[Deprecated (PlatformName.MacOSX, 10, 9, message : "Use the 'CoreText' API instead.")]
@ -1218,11 +1167,8 @@ namespace CoreGraphics {
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.9")]
[UnsupportedOSPlatform ("ios7.0")]
#if MONOMAC
[Obsolete ("Starting with macos10.9 use the 'CoreText' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios7.0 use the 'CoreText' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos10.9", "Use the 'CoreText' API instead.")]
[ObsoletedOSPlatform ("ios7.0", "Use the 'CoreText' API instead.")]
#else
[Deprecated (PlatformName.iOS, 7, 0, message : "Use the 'CoreText' API instead.")]
[Deprecated (PlatformName.MacOSX, 10, 9, message : "Use the 'CoreText' API instead.")]
@ -1239,11 +1185,8 @@ namespace CoreGraphics {
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.9")]
[UnsupportedOSPlatform ("ios7.0")]
#if MONOMAC
[Obsolete ("Starting with macos10.9.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios7.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos10.9")]
[ObsoletedOSPlatform ("ios7.0")]
#else
[Deprecated (PlatformName.iOS, 7,0)]
[Deprecated (PlatformName.MacOSX, 10,9)]
@ -1260,11 +1203,8 @@ namespace CoreGraphics {
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.9")]
[UnsupportedOSPlatform ("ios7.0")]
#if MONOMAC
[Obsolete ("Starting with macos10.9 use the 'CoreText' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios7.0 use the 'CoreText' API instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos10.9", "Use the 'CoreText' API instead.")]
[ObsoletedOSPlatform ("ios7.0", "Use the 'CoreText' API instead.")]
#else
[Deprecated (PlatformName.iOS, 7, 0, message : "Use the 'CoreText' API instead.")]
[Deprecated (PlatformName.MacOSX, 10, 9, message : "Use the 'CoreText' API instead.")]

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

@ -89,9 +89,7 @@ namespace CoreGraphics
[SupportedOSPlatform ("maccatalyst15.0")]
[SupportedOSPlatform ("macos")]
[UnsupportedOSPlatform ("macos10.9")]
#if MONOMAC
[Obsolete ("Starting with macos10.9.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos10.9")]
#else
[Deprecated (PlatformName.MacOSX, 10, 9)]
#endif

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

@ -230,5 +230,29 @@ namespace CoreGraphics {
return false;
}
}
#if NET
[SupportedOSPlatform ("ios16.0")]
[SupportedOSPlatform ("maccatalyst16.0")]
[SupportedOSPlatform ("macos13.0")]
[SupportedOSPlatform ("tvos16.0")]
#else
[Mac (13,0), iOS (16,0), TV (16,0), MacCatalyst (16,0), Watch (9,0)]
#endif
[DllImport (Constants.CoreGraphicsLibrary)]
extern static void CGPDFScannerStop (/* CGPDFScannerRef */ IntPtr scanner);
#if NET
[SupportedOSPlatform ("ios16.0")]
[SupportedOSPlatform ("maccatalyst16.0")]
[SupportedOSPlatform ("macos13.0")]
[SupportedOSPlatform ("tvos16.0")]
#else
[Mac (13,0), iOS (16,0), TV (16,0), MacCatalyst (16,0), Watch (9,0)]
#endif
public void Stop ()
{
CGPDFScannerStop (Handle);
}
}
}

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

@ -29,6 +29,9 @@
#nullable enable
using System;
using System.ComponentModel;
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
using System.Runtime.InteropServices;
using CoreFoundation;
@ -542,6 +545,170 @@ namespace CoreGraphics {
gch.Free ();
}
#if NET
[SupportedOSPlatform ("ios16.0")]
[SupportedOSPlatform ("maccatalyst16.0")]
[SupportedOSPlatform ("macos13.0")]
[SupportedOSPlatform ("tvos16.0")]
#else
[Mac (13,0), iOS (16,0), TV (16,0), MacCatalyst (16,0), Watch (9,0)]
#endif
[DllImport (Constants.CoreGraphicsLibrary)]
static extern IntPtr CGPathCreateCopyByNormalizing (IntPtr path, [MarshalAs (UnmanagedType.I1)] bool evenOddFillRule);
public CGPath? CreateByNormalizing (bool evenOddFillRule)
{
return Runtime.GetINativeObject<CGPath>(CGPathCreateCopyByNormalizing (Handle, evenOddFillRule), owns: true);
}
#if NET
[SupportedOSPlatform ("ios16.0")]
[SupportedOSPlatform ("maccatalyst16.0")]
[SupportedOSPlatform ("macos13.0")]
[SupportedOSPlatform ("tvos16.0")]
#else
[Mac (13,0), iOS (16,0), TV (16,0), MacCatalyst (16,0), Watch (9,0)]
#endif
[DllImport (Constants.CoreGraphicsLibrary)]
static extern IntPtr CGPathCreateCopyByUnioningPath (IntPtr path, IntPtr maskPath, [MarshalAs (UnmanagedType.I1)] bool evenOddFillRule);
public CGPath? CreateByUnioningPath (CGPath? maskPath, bool evenOddFillRule)
{
return Runtime.GetINativeObject<CGPath>(CGPathCreateCopyByUnioningPath (Handle, maskPath.GetHandle (), evenOddFillRule), owns: true);
}
#if NET
[SupportedOSPlatform ("ios16.0")]
[SupportedOSPlatform ("maccatalyst16.0")]
[SupportedOSPlatform ("macos13.0")]
[SupportedOSPlatform ("tvos16.0")]
#else
[Mac (13,0), iOS (16,0), TV (16,0), MacCatalyst (16,0), Watch (9,0)]
#endif
[DllImport (Constants.CoreGraphicsLibrary)]
static extern IntPtr CGPathCreateCopyByIntersectingPath (IntPtr path, IntPtr maskPath, [MarshalAs (UnmanagedType.I1)] bool evenOddFillRule);
public CGPath? CreateByIntersectingPath (CGPath? maskPath, bool evenOddFillRule)
{
return Runtime.GetINativeObject<CGPath>(CGPathCreateCopyByIntersectingPath (Handle, maskPath.GetHandle (), evenOddFillRule), owns: true);
}
#if NET
[SupportedOSPlatform ("ios16.0")]
[SupportedOSPlatform ("maccatalyst16.0")]
[SupportedOSPlatform ("macos13.0")]
[SupportedOSPlatform ("tvos16.0")]
#else
[Mac (13,0), iOS (16,0), TV (16,0), MacCatalyst (16,0), Watch (9,0)]
#endif
[DllImport (Constants.CoreGraphicsLibrary)]
static extern IntPtr CGPathCreateCopyBySubtractingPath (IntPtr path, IntPtr maskPath, [MarshalAs (UnmanagedType.I1)] bool evenOddFillRule);
public CGPath? CreateBySubtractingPath (CGPath? maskPath, bool evenOddFillRule)
{
return Runtime.GetINativeObject<CGPath>(CGPathCreateCopyBySubtractingPath (Handle, maskPath.GetHandle (), evenOddFillRule), owns: true);
}
#if NET
[SupportedOSPlatform ("ios16.0")]
[SupportedOSPlatform ("maccatalyst16.0")]
[SupportedOSPlatform ("macos13.0")]
[SupportedOSPlatform ("tvos16.0")]
#else
[Mac (13,0), iOS (16,0), TV (16,0), MacCatalyst (16,0), Watch (9,0)]
#endif
[DllImport (Constants.CoreGraphicsLibrary)]
static extern IntPtr CGPathCreateCopyBySymmetricDifferenceOfPath (IntPtr path, IntPtr maskPath, [MarshalAs (UnmanagedType.I1)] bool evenOddFillRule);
public CGPath? CreateBySymmetricDifferenceOfPath (CGPath? maskPath, bool evenOddFillRule)
{
return Runtime.GetINativeObject<CGPath>(CGPathCreateCopyBySymmetricDifferenceOfPath (Handle, maskPath.GetHandle (), evenOddFillRule), owns: true);
}
#if NET
[SupportedOSPlatform ("ios16.0")]
[SupportedOSPlatform ("maccatalyst16.0")]
[SupportedOSPlatform ("macos13.0")]
[SupportedOSPlatform ("tvos16.0")]
#else
[Mac (13,0), iOS (16,0), TV (16,0), MacCatalyst (16,0), Watch (9,0)]
#endif
[DllImport (Constants.CoreGraphicsLibrary)]
static extern IntPtr CGPathCreateCopyOfLineBySubtractingPath (IntPtr path, IntPtr maskPath, [MarshalAs (UnmanagedType.I1)] bool evenOddFillRule);
public CGPath? CreateLineBySubtractingPath (CGPath? maskPath, bool evenOddFillRule)
{
return Runtime.GetINativeObject<CGPath>(CGPathCreateCopyOfLineBySubtractingPath (Handle, maskPath.GetHandle (), evenOddFillRule), owns: true);
}
#if NET
[SupportedOSPlatform ("ios16.0")]
[SupportedOSPlatform ("maccatalyst16.0")]
[SupportedOSPlatform ("macos13.0")]
[SupportedOSPlatform ("tvos16.0")]
#else
[Mac (13,0), iOS (16,0), TV (16,0), MacCatalyst (16,0), Watch (9,0)]
#endif
[DllImport (Constants.CoreGraphicsLibrary)]
static extern IntPtr CGPathCreateCopyOfLineByIntersectingPath (IntPtr path, IntPtr maskPath, [MarshalAs (UnmanagedType.I1)] bool evenOddFillRule);
public CGPath? CreateLineByIntersectingPath (CGPath? maskPath, bool evenOddFillRule)
{
return Runtime.GetINativeObject<CGPath>(CGPathCreateCopyOfLineByIntersectingPath (Handle, maskPath.GetHandle (), evenOddFillRule), owns: true);
}
#if NET
[SupportedOSPlatform ("ios16.0")]
[SupportedOSPlatform ("maccatalyst16.0")]
[SupportedOSPlatform ("macos13.0")]
[SupportedOSPlatform ("tvos16.0")]
#else
[Mac (13,0), iOS (16,0), TV (16,0), MacCatalyst (16,0), Watch (9,0)]
#endif
[DllImport (Constants.CoreGraphicsLibrary)]
static extern unsafe /* CFArrayRef __nullable */ IntPtr CGPathCreateSeparateComponents (IntPtr path, [MarshalAs (UnmanagedType.I1)] bool evenOddFillRule);
public CGPath[] GetSeparateComponents (bool evenOddFillRule)
{
var cfArrayRef = CGPathCreateSeparateComponents (Handle, evenOddFillRule);
if (cfArrayRef == IntPtr.Zero)
return Array.Empty<CGPath> ();
return NSArray.ArrayFromHandle<CGPath> (cfArrayRef);
}
#if NET
[SupportedOSPlatform ("ios16.0")]
[SupportedOSPlatform ("maccatalyst16.0")]
[SupportedOSPlatform ("macos13.0")]
[SupportedOSPlatform ("tvos16.0")]
#else
[Mac (13,0), iOS (16,0), TV (16,0), MacCatalyst (16,0), Watch (9,0)]
#endif
[DllImport (Constants.CoreGraphicsLibrary)]
static extern IntPtr CGPathCreateCopyByFlattening (IntPtr path, nfloat flatteningThreshold);
public CGPath? CreateByFlattening (nfloat flatteningThreshold)
{
return Runtime.GetINativeObject<CGPath>(CGPathCreateCopyByFlattening (Handle, flatteningThreshold), owns: true);
}
#if NET
[SupportedOSPlatform ("ios16.0")]
[SupportedOSPlatform ("maccatalyst16.0")]
[SupportedOSPlatform ("macos13.0")]
[SupportedOSPlatform ("tvos16.0")]
#else
[Mac (13,0), iOS (16,0), TV (16,0), MacCatalyst (16,0), Watch (9,0)]
#endif
[DllImport (Constants.CoreGraphicsLibrary)]
[return: MarshalAs (UnmanagedType.I1)]
static extern bool CGPathIntersectsPath (IntPtr path1, IntPtr path2, [MarshalAs (UnmanagedType.I1)] bool evenOddFillRule);
public bool DoesIntersect (CGPath? maskPath, bool evenOddFillRule)
{
return CGPathIntersectsPath (Handle, maskPath.GetHandle (), evenOddFillRule);
}
static CGPath MakeMutable (IntPtr source, bool owns)
{
var mutable = CGPathCreateMutableCopy (source);

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

@ -242,9 +242,7 @@ namespace CoreImage {
[UnsupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[UnsupportedOSPlatform ("macos10.11")]
#if MONOMAC
[Obsolete ("Starting with macos10.11.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos10.11")]
#else
[Deprecated (PlatformName.MacOSX, 10, 11)]
#endif

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

@ -67,6 +67,10 @@ namespace CoreLocation {
// ios14
PromptDeclined = 18,
// ios16
[NoMac, iOS (16,1), MacCatalyst (16,1), Watch (9,1), TV (16,1)]
HistoricalLocationError,
}
// untyped enum -> CLLocationManager.h
@ -89,7 +93,8 @@ namespace CoreLocation {
[Deprecated (PlatformName.iOS, 8, 0, message : "Use 'AuthorizedAlways' instead.")]
Authorized,
AuthorizedAlways = Authorized,
AuthorizedWhenInUse
[Deprecated (PlatformName.MacOSX, 13, 0)]
AuthorizedWhenInUse,
}
// NSInteger -> CLLocationManager.h

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

@ -149,16 +149,10 @@ namespace CoreMedia {
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("tvos9.0")]
[UnsupportedOSPlatform ("macos10.10")]
[UnsupportedOSPlatform ("ios8.0")]
#if TVOS
[Obsolete ("Starting with tvos9.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif MONOMAC
[Obsolete ("Starting with macos10.10.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios8.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("maccatalyst13.0")]
[ObsoletedOSPlatform ("tvos9.0")]
[ObsoletedOSPlatform ("macos10.10")]
[ObsoletedOSPlatform ("ios9.0")]
#else
[Deprecated (PlatformName.iOS, 8, 0)]
[Deprecated (PlatformName.TvOS, 9, 0)]
@ -189,16 +183,10 @@ namespace CoreMedia {
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("tvos9.0")]
[UnsupportedOSPlatform ("macos10.10")]
[UnsupportedOSPlatform ("ios8.0")]
#if TVOS
[Obsolete ("Starting with tvos9.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif MONOMAC
[Obsolete ("Starting with macos10.10.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios8.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("tvos9.0")]
[ObsoletedOSPlatform ("macos10.10")]
[ObsoletedOSPlatform ("ios8.0")]
[ObsoletedOSPlatform ("maccatalyst13.0")]
#else
[Deprecated (PlatformName.iOS, 8, 0)]
[Deprecated (PlatformName.TvOS, 9, 0)]
@ -359,16 +347,14 @@ namespace CoreMedia {
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.11")]
[UnsupportedOSPlatform ("ios9.0")]
#if MONOMAC
[Obsolete ("Starting with macos10.11.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("maccatalyst13.0")]
[ObsoletedOSPlatform ("tvos9.0")]
[ObsoletedOSPlatform ("macos10.10")]
[ObsoletedOSPlatform ("ios9.0")]
#else
[Deprecated (PlatformName.iOS, 9,0)]
[Deprecated (PlatformName.MacOSX, 10,11)]
[Deprecated (PlatformName.TvOS, 9,0)]
#endif
[DllImport (Constants.CoreMediaLibrary)]
extern static /* CMTimebaseRef */ IntPtr CMTimebaseGetMasterTimebase (/* CMTimebaseRef */ IntPtr timebase);
@ -378,13 +364,10 @@ namespace CoreMedia {
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.11")]
[UnsupportedOSPlatform ("ios9.0")]
#if MONOMAC
[Obsolete ("Starting with macos10.11 use 'CopyMasterTimebase' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use 'CopyMasterTimebase' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos10.11", "Use 'CopyMasterTimebase' instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use 'CopyMasterTimebase' instead.")]
[ObsoletedOSPlatform ("tvos9.0", "Use 'CopyMasterTimebase' instead.")]
[ObsoletedOSPlatform ("maccatalyst13.0", "Use 'CopyMasterTimebase' instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message : "Use 'CopyMasterTimebase' instead.")]
[Deprecated (PlatformName.MacOSX, 10, 11, message : "Use 'CopyMasterTimebase' instead.")]
@ -403,16 +386,14 @@ namespace CoreMedia {
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.11")]
[UnsupportedOSPlatform ("ios9.0")]
#if MONOMAC
[Obsolete ("Starting with macos10.11.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("maccatalyst13.0")]
[ObsoletedOSPlatform ("tvos9.0")]
[ObsoletedOSPlatform ("macos10.10")]
[ObsoletedOSPlatform ("ios9.0")]
#else
[Deprecated (PlatformName.iOS, 9,0)]
[Deprecated (PlatformName.MacOSX, 10,11)]
[Deprecated (PlatformName.TvOS, 9,0)]
#endif
[DllImport (Constants.CoreMediaLibrary)]
extern static /* CMClockRef */ IntPtr CMTimebaseGetMasterClock (/* CMTimebaseRef */ IntPtr timebase);
@ -422,13 +403,10 @@ namespace CoreMedia {
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.11")]
[UnsupportedOSPlatform ("ios9.0")]
#if MONOMAC
[Obsolete ("Starting with macos10.11 use 'CopyMasterClock' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use 'CopyMasterClock' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos10.11", "Use 'CopyMasterClock' instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use 'CopyMasterClock' instead.")]
[ObsoletedOSPlatform ("tvos9.0", "Use 'CopyMasterClock' instead.")]
[ObsoletedOSPlatform ("maccatalyst13.0", "Use 'CopyMasterClock' instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message : "Use 'CopyMasterClock' instead.")]
[Deprecated (PlatformName.MacOSX, 10, 11, message : "Use 'CopyMasterClock' instead.")]
@ -447,16 +425,14 @@ namespace CoreMedia {
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.11")]
[UnsupportedOSPlatform ("ios9.0")]
#if MONOMAC
[Obsolete ("Starting with macos10.11.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("maccatalyst13.0")]
[ObsoletedOSPlatform ("tvos9.0")]
[ObsoletedOSPlatform ("macos10.11")]
[ObsoletedOSPlatform ("ios9.0")]
#else
[Deprecated (PlatformName.iOS, 9,0)]
[Deprecated (PlatformName.MacOSX, 10,11)]
[Deprecated (PlatformName.TvOS, 9,0)]
#endif
[DllImport (Constants.CoreMediaLibrary)]
extern static /* CMClockOrTimebaseRef */ IntPtr CMTimebaseGetMaster (/* CMTimebaseRef */ IntPtr timebase);
@ -466,13 +442,10 @@ namespace CoreMedia {
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.11")]
[UnsupportedOSPlatform ("ios9.0")]
#if MONOMAC
[Obsolete ("Starting with macos10.11 use 'CopyMaster' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use 'CopyMaster' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos10.11", "Use 'CopyMaster' instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use 'CopyMaster' instead.")]
[ObsoletedOSPlatform ("tvos9.0", "Use 'CopyMaster' instead.")]
[ObsoletedOSPlatform ("maccatalyst13.0", "Use 'CopyMaster' instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message : "Use 'CopyMaster' instead.")]
[Deprecated (PlatformName.MacOSX, 10, 11, message : "Use 'CopyMaster' instead.")]
@ -491,16 +464,14 @@ namespace CoreMedia {
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.11")]
[UnsupportedOSPlatform ("ios9.0")]
#if MONOMAC
[Obsolete ("Starting with macos10.11.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("maccatalyst13.0")]
[ObsoletedOSPlatform ("tvos9.0")]
[ObsoletedOSPlatform ("macos10.11")]
[ObsoletedOSPlatform ("ios9.0")]
#else
[Deprecated (PlatformName.iOS, 9,0)]
[Deprecated (PlatformName.MacOSX, 10,11)]
[Deprecated (PlatformName.TvOS, 9, 0)]
#endif
[DllImport (Constants.CoreMediaLibrary)]
extern static /* CMClockRef */ IntPtr CMTimebaseGetUltimateMasterClock (/* CMTimebaseRef */ IntPtr timebase);
@ -510,13 +481,10 @@ namespace CoreMedia {
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.11")]
[UnsupportedOSPlatform ("ios9.0")]
#if MONOMAC
[Obsolete ("Starting with macos10.11 use 'CopyUltimateMasterClock' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use 'CopyUltimateMasterClock' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("macos10.11", "Use 'CopyUltimateMasterClock' instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use 'CopyUltimateMasterClock' instead.")]
[ObsoletedOSPlatform ("tvos9.0", "Use 'CopyUltimateMasterClock' instead.")]
[ObsoletedOSPlatform ("maccatalyst13.0", "Use 'CopyUltimateMasterClock' instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message : "Use 'CopyUltimateMasterClock' instead.")]
[Deprecated (PlatformName.MacOSX, 10, 11, message : "Use 'CopyUltimateMasterClock' instead.")]
@ -630,13 +598,9 @@ namespace CoreMedia {
[UnsupportedOSPlatform ("tvos9.0")]
[UnsupportedOSPlatform ("macos10.10")]
[UnsupportedOSPlatform ("ios8.0")]
#if TVOS
[Obsolete ("Starting with tvos9.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif MONOMAC
[Obsolete ("Starting with macos10.10.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios8.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("tvos9.0")]
[ObsoletedOSPlatform ("macos10.10")]
[ObsoletedOSPlatform ("ios8.0")]
#else
[TV (9,0)]
[Deprecated (PlatformName.iOS, 8, 0)]
@ -652,16 +616,10 @@ namespace CoreMedia {
[SupportedOSPlatform ("ios")]
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[UnsupportedOSPlatform ("tvos9.0")]
[UnsupportedOSPlatform ("macos10.10")]
[UnsupportedOSPlatform ("ios8.0")]
#if TVOS
[Obsolete ("Starting with tvos9.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif MONOMAC
[Obsolete ("Starting with macos10.10.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios8.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("maccatalyst13.0")]
[ObsoletedOSPlatform ("tvos9.0")]
[ObsoletedOSPlatform ("macos10.10")]
[ObsoletedOSPlatform ("ios8.0")]
#else
[TV (9,0)]
[Deprecated (PlatformName.iOS, 8, 0)]
@ -682,16 +640,10 @@ namespace CoreMedia {
[SupportedOSPlatform ("ios")]
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[UnsupportedOSPlatform ("tvos9.0")]
[UnsupportedOSPlatform ("macos10.10")]
[UnsupportedOSPlatform ("ios8.0")]
#if TVOS
[Obsolete ("Starting with tvos9.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif MONOMAC
[Obsolete ("Starting with macos10.10.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios8.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("maccatalyst13.0")]
[ObsoletedOSPlatform ("tvos9.0")]
[ObsoletedOSPlatform ("macos10.10")]
[ObsoletedOSPlatform ("ios8.0")]
#else
[TV (9,0)]
[Deprecated (PlatformName.iOS, 8, 0)]
@ -707,16 +659,10 @@ namespace CoreMedia {
[SupportedOSPlatform ("ios")]
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[UnsupportedOSPlatform ("tvos9.0")]
[UnsupportedOSPlatform ("macos10.10")]
[UnsupportedOSPlatform ("ios8.0")]
#if TVOS
[Obsolete ("Starting with tvos9.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif MONOMAC
[Obsolete ("Starting with macos10.10.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios8.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("maccatalyst13.0")]
[ObsoletedOSPlatform ("tvos9.0")]
[ObsoletedOSPlatform ("macos10.10")]
[ObsoletedOSPlatform ("ios8.0")]
#else
[TV (9,0)]
[Deprecated (PlatformName.iOS, 8, 0)]
@ -819,16 +765,9 @@ namespace CoreMedia {
[SupportedOSPlatform ("ios9.0")]
[SupportedOSPlatform ("macos10.11")]
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("tvos9.0")]
[UnsupportedOSPlatform ("macos10.11")]
[UnsupportedOSPlatform ("ios9.0")]
#if TVOS
[Obsolete ("Starting with tvos9.0 use 'CMTimebaseGetMasterTimebase' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif MONOMAC
[Obsolete ("Starting with macos10.11 use 'CMTimebaseGetMasterTimebase' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use 'CMTimebaseGetMasterTimebase' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("tvos9.0", "Use 'CMTimebaseGetMasterTimebase' instead.")]
[ObsoletedOSPlatform ("macos10.11", "Use 'CMTimebaseGetMasterTimebase' instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use 'CMTimebaseGetMasterTimebase' instead.")]
[UnsupportedOSPlatform ("maccatalyst")]
#else
[iOS (9,0)]
@ -847,16 +786,10 @@ namespace CoreMedia {
[SupportedOSPlatform ("macos10.11")]
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("tvos9.0")]
[UnsupportedOSPlatform ("macos10.11")]
[UnsupportedOSPlatform ("ios9.0")]
#if TVOS
[Obsolete ("Starting with tvos9.0 use 'CMTimebaseGetMasterClock' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif MONOMAC
[Obsolete ("Starting with macos10.11 use 'CMTimebaseGetMasterClock' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use 'CMTimebaseGetMasterClock' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("maccatalyst13.0", "Use 'CMTimebaseGetMasterClock' instead.")]
[ObsoletedOSPlatform ("tvos9.0", "Use 'CMTimebaseGetMasterClock' instead.")]
[ObsoletedOSPlatform ("macos10.11", "Use 'CMTimebaseGetMasterClock' instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use 'CMTimebaseGetMasterClock' instead.")]
#else
[iOS (9,0)]
[Mac (10,11)]
@ -872,16 +805,9 @@ namespace CoreMedia {
[SupportedOSPlatform ("ios9.0")]
[SupportedOSPlatform ("macos10.11")]
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("tvos9.0")]
[UnsupportedOSPlatform ("macos10.11")]
[UnsupportedOSPlatform ("ios9.0")]
#if TVOS
[Obsolete ("Starting with tvos9.0 use 'CMTimebaseGetMaster' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif MONOMAC
[Obsolete ("Starting with macos10.11 use 'CMTimebaseGetMaster' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use 'CMTimebaseGetMaster' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("tvos9.0", "Use 'CMTimebaseGetMaster' instead.")]
[ObsoletedOSPlatform ("macos10.11", "Use 'CMTimebaseGetMaster' instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use 'CMTimebaseGetMaster' instead.")]
[UnsupportedOSPlatform ("maccatalyst")]
#else
[iOS (9,0)]
@ -899,16 +825,9 @@ namespace CoreMedia {
[SupportedOSPlatform ("ios9.0")]
[SupportedOSPlatform ("macos10.11")]
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("tvos9.0")]
[UnsupportedOSPlatform ("macos10.11")]
[UnsupportedOSPlatform ("ios9.0")]
#if TVOS
[Obsolete ("Starting with tvos9.0 use 'CMTimebaseGetUltimateMasterClock' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif MONOMAC
[Obsolete ("Starting with macos10.11 use 'CMTimebaseGetUltimateMasterClock' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios9.0 use 'CMTimebaseGetUltimateMasterClock' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
[ObsoletedOSPlatform ("tvos9.0", "Use 'CMTimebaseGetUltimateMasterClock' instead.")]
[ObsoletedOSPlatform ("macos10.11", "Use 'CMTimebaseGetUltimateMasterClock' instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use 'CMTimebaseGetUltimateMasterClock' instead.")]
[UnsupportedOSPlatform ("maccatalyst")]
#else
[iOS (9,0)]

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