Merge branch 'net9.0' into dev/rolf/migrate-build-agent-to-dotnet-8

xamarin · Sep 20, 2024 · 8d486fa · 8d486fa
2 parents a19bf35 + 003ef56
commit 8d486fa
Show file tree

Hide file tree

Showing 525 changed files with 29,572 additions and 35,132 deletions.
diff --git a/Make.config b/Make.config
@@ -218,9 +218,11 @@ 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=15.4
-XCODE_URL=https://dl.internalx.com/internal-files/xcodes/Xcode_15.4.xip
-XCODE_DEVELOPER_ROOT=/Applications/Xcode_15.4.0.app/Contents/Developer
+XCODE_VERSION=16.0
+XCODE_URL=https://dl.internalx.com/internal-files/xcodes/Xcode_16.xip
+XCODE_IOS_SIMULATOR_FILENAME=iOS_18_Simulator_Runtime.dmg
+XCODE_IOS_SIMULATOR_VERSION=22A3351
+XCODE_DEVELOPER_ROOT=/Applications/Xcode_16.0.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)
 
 # We define stable Xcode as the Xcode app being named like "Xcode_#.#[.#].app"
@@ -264,9 +266,9 @@ 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.76
-MAX_SHARPIE_VERSION=3.5.99
-MIN_SHARPIE_URL=https://download.visualstudio.microsoft.com/download/pr/87c92e02-3d02-45de-bdd5-41721ed5bfc9/60cd0050e247aa99da79a52ef3228f32/objectivesharpie-3.5.76.pkg
+MIN_SHARPIE_VERSION=3.5.115
+MAX_SHARPIE_VERSION=3.5.999
+MIN_SHARPIE_URL=https://download.visualstudio.microsoft.com/download/pr/8445c488-35b2-44d5-a80f-15954ca1fcf8/bb2946f34caefe1ba3bc5cedfda31879/objectivesharpie-3.5.115.pkg
 
 # Minimum OSX versions for building XI/XM
 MIN_OSX_BUILD_VERSION=13.0
@@ -306,11 +308,11 @@ DOTNET_MIN_MACCATALYST_SDK_VERSION=15.0
 DOTNET_MIN_MACOS_SDK_VERSION=12.0
 
 # The min simulator version available in the Xcode we're using
-MIN_IOS_SIMULATOR_VERSION=14.3
-MIN_WATCHOS_SIMULATOR_VERSION=7.1
+MIN_IOS_SIMULATOR_VERSION=15.0
+MIN_WATCHOS_SIMULATOR_VERSION=8.0
 # This is the iOS version that matches the watchOS version (i.e same Xcode)
-MIN_WATCHOS_COMPANION_SIMULATOR_VERSION=14.5
-MIN_TVOS_SIMULATOR_VERSION=14.0
+MIN_WATCHOS_COMPANION_SIMULATOR_VERSION=15.0
+MIN_TVOS_SIMULATOR_VERSION=15.0
 # These are the simulator package ids for the versions above
 EXTRA_SIMULATORS=com.apple.pkg.iPhoneSimulatorSDK15_0 com.apple.pkg.AppleTVSimulatorSDK15_0 com.apple.pkg.WatchSimulatorSDK8_0
 
@@ -479,8 +481,8 @@ SIMULATORWATCH_OBJC_CFLAGS   = $(SIMULATORWATCH_CFLAGS) $(COMMON_SIMULATOR_OBJC_
 SIMULATORWATCH64_OBJC_CFLAGS = $(SIMULATORWATCH64_CFLAGS) $(COMMON_SIMULATOR_OBJC_CFLAGS) 
 
 DEVICEWATCH_SDK         = $(XCODE_DEVELOPER_ROOT)/Platforms/WatchOS.platform/Developer/SDKs/WatchOS$(WATCH_SDK_VERSION).sdk
-DEVICEWATCH_CFLAGS      = -arch armv7k -mwatchos-version-min=$(MIN_WATCHOS_SDK_VERSION) -isysroot $(DEVICEWATCH_SDK) $(CFLAGS) -fembed-bitcode $(IOS_COMMON_DEFINES)
-DEVICEWATCH64_32_CFLAGS = -arch arm64_32 -mwatchos-version-min=$(MIN_WATCHOS64_32_SDK_VERSION) -isysroot $(DEVICEWATCH_SDK) $(CFLAGS) -fembed-bitcode $(IOS_COMMON_DEFINES)
+DEVICEWATCH_CFLAGS      = -arch armv7k -mwatchos-version-min=$(MIN_WATCHOS_SDK_VERSION) -isysroot $(DEVICEWATCH_SDK) $(CFLAGS) $(IOS_COMMON_DEFINES)
+DEVICEWATCH64_32_CFLAGS = -arch arm64_32 -mwatchos-version-min=$(MIN_WATCHOS64_32_SDK_VERSION) -isysroot $(DEVICEWATCH_SDK) $(CFLAGS) $(IOS_COMMON_DEFINES)
 DEVICEWATCH_OBJC_CFLAGS = $(DEVICEWATCH_CFLAGS) $(DEVICE_OBJC_CFLAGS)
 DEVICEWATCH64_32_OBJC_CFLAGS = $(DEVICEWATCH64_32_CFLAGS) $(DEVICE_OBJC_CFLAGS)
 
@@ -689,7 +691,7 @@ $(TOP)/Build.props: Make.config
 ifeq ($(XCODE_IS_STABLE),true)
 	# do nothing
 else ifeq ($(XCODE_IS_STABLE),false)
-	$(Q) printf "\t\t<EnablePreviewFeatures>true</EnablePreviewFeatures>\n" >> $@.tmp
+	$(Q) printf '\t\t<NoWarn>$$(NoWarn);XCODE_$(subst .,_,$(XCODE_VERSION))_PREVIEW</NoWarn>\n' >> $@.tmp
 else
 	$(error "The variable XCODE_IS_STABLE is not set!")
 endif

diff --git a/Make.versions b/Make.versions
@@ -48,8 +48,8 @@
 #   line changed in git).
 #
 
-IOS_PACKAGE_VERSION=17.5.0.$(IOS_COMMIT_DISTANCE)
-MAC_PACKAGE_VERSION=9.5.0.$(MAC_COMMIT_DISTANCE)
+IOS_PACKAGE_VERSION=17.99.0.$(IOS_COMMIT_DISTANCE)
+MAC_PACKAGE_VERSION=9.99.0.$(MAC_COMMIT_DISTANCE)
 
 #
 # ** NuGet package version numbers **
@@ -65,11 +65,11 @@ MAC_PACKAGE_VERSION=9.5.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=17.5
-TVOS_NUGET_OS_VERSION=17.5
-WATCHOS_NUGET_OS_VERSION=10.5
-MACOS_NUGET_OS_VERSION=14.5
-MACCATALYST_NUGET_OS_VERSION=17.5
+IOS_NUGET_OS_VERSION=18.0
+TVOS_NUGET_OS_VERSION=18.0
+WATCHOS_NUGET_OS_VERSION=11.0
+MACOS_NUGET_OS_VERSION=15.0
+MACCATALYST_NUGET_OS_VERSION=18.0
 
 
 # In theory we should define the default platform version if it's not specified in the TFM. The default should not change for a given .NET version:
@@ -127,7 +127,7 @@ MACCATALYST_NUGET_OS_VERSION=17.5
 # would add support for trying the preview release by doing:
 #
 #     <TargetFramework>net9.0-18.0</TargetFramework>
-#     <EnablePreviewFeatures>true</EnablePreviewFeatures>
+#     <NoWarn>XCODE_16_0_PREVIEW;$(NoWarn)</NoWarn>
 #
 # Note that any SUPPORTED_API_VERSIONS entry below for older OS versions need a corresponding entry in
 # the eng/Version.Details.xml and eng/Versions.props files.

diff --git a/Versions-ios.plist.in b/Versions-ios.plist.in
@@ -42,6 +42,7 @@
 			<string>17.2</string>
 			<string>17.4</string>
 			<string>17.5</string>
+			<string>18.0</string>
 		</array>
 		<key>tvOS</key>
 		<array>
@@ -74,6 +75,7 @@
 			<string>17.2</string>
 			<string>17.4</string>
 			<string>17.5</string>
+			<string>18.0</string>
 		</array>
 		<key>watchOS</key>
 		<array>
@@ -102,6 +104,7 @@
 			<string>10.2</string>
 			<string>10.4</string>
 			<string>10.5</string>
+			<string>11.0</string>
 		</array>
 		<key>MacCatalyst</key>
 		<array>
@@ -115,6 +118,7 @@
 			<string>17.2</string>
 			<string>17.4</string>
 			<string>17.5</string>
+			<string>18.0</string>
 		</array>
 	</dict>
 	<key>MacCatalystVersionMap</key>
@@ -157,6 +161,8 @@
 		<string>14.4</string>
 		<key>17.5</key>
 		<string>14.5</string>
+		<key>18.0</key>
+		<string>15.0</string>
 	</dict>
 	<key>RecommendedXcodeVersion</key>
 	<string>@XCODE_VERSION@</string>

diff --git a/Versions-mac.plist.in b/Versions-mac.plist.in
@@ -20,6 +20,7 @@
 			<string>14.2</string>
 			<string>14.4</string>
 			<string>14.5</string>
+			<string>15.0</string>
 		</array>
 	</dict>
 	<key>RecommendedXcodeVersion</key>

diff --git a/builds/Makefile b/builds/Makefile
@@ -161,6 +161,7 @@ package-download/all-package-references.csproj: $(GIT_DIRECTORY)/HEAD $(GIT_DIRE
 .stamp-install-t4: $(TOP)/.config/dotnet-tools.json .stamp-download-dotnet-packages
 	@# https://github.com/dotnet/sdk/issues/16165
 	$(Q) rm -f ~/.dotnet/toolResolverCache/*/dotnet-t4
+	$(Q) rm -f ~/.dotnet/toolResolverCache/*/dotnet-ilrepack
 	$(DOTNET) tool restore
 	$(Q) touch $@
 

diff --git a/builds/Versions-MacCatalyst.plist.in b/builds/Versions-MacCatalyst.plist.in
@@ -18,6 +18,7 @@
 			<string>17.2</string>
 			<string>17.4</string>
 			<string>17.5</string>
+			<string>18.0</string>
 		</array>
 	</dict>
 	<key>SupportedTargetPlatformVersions</key>
@@ -46,6 +47,7 @@
 			<string>17.2</string>
 			<string>17.4</string>
 			<string>17.5</string>
+			<string>18.0</string>
 		</array>
 	</dict>
 	<key>MacCatalystVersionMap</key>
@@ -88,6 +90,8 @@
 		<string>14.4</string>
 		<key>17.5</key>
 		<string>14.5</string>
+		<key>18.0</key>
+		<string>15.0</string>
 	</dict>
 	<key>RecommendedXcodeVersion</key>
 	<string>@XCODE_VERSION@</string>

diff --git a/builds/Versions-iOS.plist.in b/builds/Versions-iOS.plist.in
@@ -35,6 +35,7 @@
 			<string>17.2</string>
 			<string>17.4</string>
 			<string>17.5</string>
+			<string>18.0</string>
 		</array>
 	</dict>
 	<key>SupportedTargetPlatformVersions</key>
@@ -82,6 +83,7 @@
 			<string>17.2</string>
 			<string>17.4</string>
 			<string>17.5</string>
+			<string>18.0</string>
 		</array>
 	</dict>
 	<key>RecommendedXcodeVersion</key>

diff --git a/builds/Versions-macOS.plist.in b/builds/Versions-macOS.plist.in
@@ -20,6 +20,7 @@
 			<string>14.2</string>
 			<string>14.4</string>
 			<string>14.5</string>
+			<string>15.0</string>
 		</array>
 	</dict>
 	<key>SupportedTargetPlatformVersions</key>
@@ -46,6 +47,7 @@
 			<string>14.2</string>
 			<string>14.4</string>
 			<string>14.5</string>
+			<string>15.0</string>
 		</array>
 	</dict>
 	<key>RecommendedXcodeVersion</key>

diff --git a/builds/Versions-tvOS.plist.in b/builds/Versions-tvOS.plist.in
@@ -30,6 +30,7 @@
 			<string>17.2</string>
 			<string>17.4</string>
 			<string>17.5</string>
+			<string>18.0</string>
 		</array>
 	</dict>
 	<key>SupportedTargetPlatformVersions</key>
@@ -72,6 +73,7 @@
 			<string>17.2</string>
 			<string>17.4</string>
 			<string>17.5</string>
+			<string>18.0</string>
 		</array>
 	</dict>
 	<key>RecommendedXcodeVersion</key>

diff --git a/docs/multi-target-framework.md b/docs/multi-target-framework.md
@@ -64,7 +64,7 @@ following property in their project file to make their intention clear:
 
 ```xml
 <PropertyGroup>
-    <EnablePreviewFeatures>true</EnablePreviewFeatures>
+    <NoWarn>XCODE_16_0;$(NoWarn)</NoWarn>
 </PropertyGroup>
 ```
 
@@ -89,7 +89,7 @@ We'll release a single workload (per platform), with bindings for every OS
 version we currently support or plan to support. This means our stable
 releases may point to preview packages (but these preview packages have to be
 opted in by doing two things: appending the OS version to their target
-framework + setting EnablePreviewFeatures=true)
+framework + adding the specific experimental warning to NoWarn)
 
 We'll rename our packages. Currently we ship these packages:
 
@@ -162,14 +162,7 @@ Note 2: One complication here is that TargetPlatformVersion might not be set
 condition that accepts an empty TargetPlatformVersion. This corresponds with
 the default target platform version.
 
-Note 3: we load the preview sdk (Microsoft.iOS.Sdk.net8.0_18.0) even if
-`EnablePreviewFeatures!=true` - we show the error requesting
-`EnablePreviewFeatures` to be set from the preview sdk instead (this is to get
-an actionable error message). Without this, the user would get this rather
-unhelpful error message: `error NETSDK1139: The target platform identifier ios
-was not recognized.`
-
-Note 4: we load a special error-handling version of the sdk if we don't
+Note 3: we load a special error-handling version of the sdk if we don't
 support a TargetPlatformVersion for given TargetFrameworkVersion, and show an
 error about unsupported TargetPlatformVersion. Without this, the user would
 get this rather unhelpful error message: `error NETSDK1139: The target

diff --git a/docs/preview-apis.md b/docs/preview-apis.md
@@ -65,6 +65,15 @@ References:
 * https://learn.microsoft.com/en-us/dotnet/api/system.diagnostics.codeanalysis.experimentalattribute?view=net-8.0
 * https://learn.microsoft.com/en-us/dotnet/fundamentals/apicompat/preview-apis#experimentalattribute
 
+## Previws of new API bindings (XCODE_x_y_PREVIEW)
+
+We sometimes release previews of new API bindings, and until these are deemed
+stable (by both Apple and us), we mark all our API bindings as preview of the
+new Xcode version.
+
+The diagnostic id is `XCODE_x_y_PREVIEW`, where `x` and `y` are Xcode's major and
+minor versions.
+
 ## CryptoTokenKit (APL0001)
 
 CryptoTokenKit requires special hardware to test, so it's not trivial for us to do so.
@@ -75,4 +84,16 @@ We've tentatively set .NET 10 as the release when we'll stop marking CryptoToken
 
 The diagnostic id for CryptoTokenKit is APL0001.
 
+## FSKit (APL0002)
+
+FSKit is a new framework in macOS 15.0 to implement a file system in user space.
+
+At the moment implementing a file system is out of our reach, so we haven't
+been able to validate the API, and as such we mark every type in this
+framework as preview API for a while.
+
+We've tentatively set .NET 11 as the release when we'll stop marking FSKit as preview API.
+
+The diagnostic id for FSKit is APL0002.
+
 [1]: https://learn.microsoft.com/en-us/dotnet/api/system.diagnostics.codeanalysis.experimentalattribute?view=net-8.0
diff --git a/dotnet/Templates/Microsoft.tvOS.Templates/tvos-storyboard/Storyboard1.storyboard b/dotnet/Templates/Microsoft.tvOS.Templates/tvos-storyboard/Storyboard1.storyboard
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6211" systemVersion="14A298i" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder.AppleTV.Storyboard" version="3.0" toolsVersion="9046" systemVersion="14F27" targetRuntime="AppleTV" propertyAccessControl="none" useAutolayout="YES" initialViewController="BYZ-38-t0r">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6204"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9035" />
     </dependencies>
     <scenes/>
 </document>
diff --git a/dotnet/targets/Xamarin.Shared.Sdk.targets b/dotnet/targets/Xamarin.Shared.Sdk.targets
@@ -1021,13 +1021,6 @@
 		<Error Text="Only CoreCLR is supported on macOS. Set 'UseMonoRuntime=false' to use CoreCLR." Condition="'$(_PlatformName)' == 'macOS' And '$(UseMonoRuntime)' != 'false'" />
 	</Target>
 
-	<Target Name="_VerifyPreviewFeaturesIfUnstableXcode">
-		<Error
-			Text="These are preview bindings for an unstable version of Xcode. Opt into preview features by adding &lt;EnablePreviewFeatures&gt;True&lt;/EnablePreviewFeatures&gt; to your project file."
-			Condition="'$(_XamarinIsPreviewRelease)' == 'true' And '$(EnablePreviewFeatures)' != 'true'"
-			/>
-	</Target>
-
 	<Target Name="_VerifyValidProperties">
 		<Error
 			Text="The property 'MtouchArch' is deprecated, please remove it from the project file. Use 'RuntimeIdentifier' or 'RuntimeIdentifiers' instead to specify the target architecture."
@@ -1041,7 +1034,6 @@
 
 	<PropertyGroup>
 		<_ComputeVariablesDependsOn>
-			_VerifyPreviewFeaturesIfUnstableXcode;
 			_VerifyValidRuntime;
 			_GenerateBundleName;
 			_ComputeFrameworkVariables;
@@ -1628,13 +1620,19 @@
 
 		<WriteLinesToFile SessionId="$(BuildSessionId)" File="$(_MtouchSymbolsList)" Lines="@(_ProcessedReferenceNativeSymbol)" Overwrite="true" />
 
+		<PropertyGroup>
+			<!-- There are known bugs in the classic linker with Xcode 15, so keep use the classic linker in that case -->
+			<!-- In Xcode 16 we don't know of any problems for now, so enable the new linker by default -->
+			<_UseClassicLinker Condition="'$(_UseClassicLinker)' == '' And $([MSBuild]::VersionGreaterThanOrEquals('$(_XcodeVersion)', '16.0'))">false</_UseClassicLinker>
+			<_UseClassicLinker Condition="'$(_UseClassicLinker)' == '' And $([MSBuild]::VersionGreaterThanOrEquals('$(_XcodeVersion)', '15.0'))">true</_UseClassicLinker>
+		</PropertyGroup>
+
 		<ItemGroup>
 			<_AllLinkerFlags Include="@(_AssemblyLinkerFlags);@(_MainLinkerFlags);@(_CustomLinkFlags)" />
 			<_AllLinkerFlags Condition="'$(_ExportSymbolsExplicitly)' != 'true'" Include="@(_ProcessedReferenceNativeSymbol->'-u%(Identity)')" />
 
-			<!-- check if needs to be removed: https://github.com/xamarin/xamarin-macios/issues/18693 -->
-			<_AllLinkerFlags Condition="$([MSBuild]::VersionGreaterThanOrEquals('$(_XcodeVersion)', '15.0')) And '$(_UseClassicLinker)' != 'false'" Include="-Xlinker" />
-			<_AllLinkerFlags Condition="$([MSBuild]::VersionGreaterThanOrEquals('$(_XcodeVersion)', '15.0')) And '$(_UseClassicLinker)' != 'false'" Include="-ld_classic" />
+			<_AllLinkerFlags Condition="'$(_UseClassicLinker)' == 'true'" Include="-Xlinker" />
+			<_AllLinkerFlags Condition="'$(_UseClassicLinker)' == 'true'" Include="-ld_classic" />
 		</ItemGroup>
 
 		<LinkNativeCode

diff --git a/external/Xamarin.MacDev b/external/Xamarin.MacDev
diff --git a/mk/rules.mk b/mk/rules.mk
@@ -339,14 +339,17 @@ define NativeCompilationTemplate
 
 endef
 
+DEBUG_FLAGS=-DDEBUG -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_DEBUG
+RELEASE_FLAGS=-O2 -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_FAST
+
 $(eval $(call NativeCompilationTemplate,,-O2))
-$(eval $(call NativeCompilationTemplate,-debug,-DDEBUG))
-$(eval $(call NativeCompilationTemplate,-dotnet,-O2 -DDOTNET))
-$(eval $(call NativeCompilationTemplate,-dotnet-debug,-DDEBUG -DDOTNET))
-$(eval $(call NativeCompilationTemplate,-dotnet-coreclr,-O2 -DCORECLR_RUNTIME -DDOTNET))
-$(eval $(call NativeCompilationTemplate,-dotnet-coreclr-debug,-DDEBUG -DCORECLR_RUNTIME -DDOTNET))
-$(eval $(call NativeCompilationTemplate,-dotnet-nativeaot,-O2 -DCORECLR_RUNTIME -DDOTNET -DNATIVEAOT))
-$(eval $(call NativeCompilationTemplate,-dotnet-nativeaot-debug,-DDEBUG -DCORECLR_RUNTIME -DDOTNET -DNATIVEAOT))
+$(eval $(call NativeCompilationTemplate,-debug,$(DEBUG_FLAGS)))
+$(eval $(call NativeCompilationTemplate,-dotnet,$(RELEASE_FLAGS) -DDOTNET))
+$(eval $(call NativeCompilationTemplate,-dotnet-debug,$(DEBUG_FLAGS) -DDOTNET))
+$(eval $(call NativeCompilationTemplate,-dotnet-coreclr,$(RELEASE_FLAGS) -DCORECLR_RUNTIME -DDOTNET))
+$(eval $(call NativeCompilationTemplate,-dotnet-coreclr-debug,$(DEBUG_FLAGS) -DCORECLR_RUNTIME -DDOTNET))
+$(eval $(call NativeCompilationTemplate,-dotnet-nativeaot,$(RELEASE_FLAGS) -DCORECLR_RUNTIME -DDOTNET -DNATIVEAOT))
+$(eval $(call NativeCompilationTemplate,-dotnet-nativeaot-debug,$(DEBUG_FLAGS) -DCORECLR_RUNTIME -DDOTNET -DNATIVEAOT))
 
 .libs/iphoneos .libs/iphonesimulator .libs/watchos .libs/watchsimulator .libs/tvos .libs/tvsimulator .libs/maccatalyst .libs/mac:
 	$(Q) mkdir -p $@

diff --git a/msbuild/Xamarin.MacDev.Tasks/Tasks/XcodeCompilerToolTask.cs b/msbuild/Xamarin.MacDev.Tasks/Tasks/XcodeCompilerToolTask.cs
@@ -165,6 +165,9 @@ IEnumerable<string> GetTargetDevices (IPhoneDeviceType devices, bool watch, bool
 			if (watch)
 				yield return "watch";
 
+			if ((devices & IPhoneDeviceType.TV) != 0)
+				yield return "tv";
+
 			yield break;
 		}
 

diff --git a/msbuild/Xamarin.Shared/Xamarin.Shared.targets b/msbuild/Xamarin.Shared/Xamarin.Shared.targets
@@ -1673,6 +1673,7 @@ Copyright (C) 2018 Microsoft. All rights reserved.
 
 		<PropertyGroup>
 			<_CompiledApiDefinitionAssembly>$(DeviceSpecificIntermediateOutputPath)compiled-api-definitions.dll</_CompiledApiDefinitionAssembly>
+			<_CompiledApiDefinitionNoWarn>$(_CompiledApiDefinitionNoWarn);$(NoWarn)</_CompiledApiDefinitionNoWarn>
 			<_CompiledApiDefinitionNoWarn>$(_CompiledApiDefinitionNoWarn);436</_CompiledApiDefinitionNoWarn>
 			<_CompiledApiDefinitionDocumentationFile>$(DeviceSpecificIntermediateOutputPath)compiled-api-definitions.xml</_CompiledApiDefinitionDocumentationFile>
 			<_CompiledApiDefinitionNoWarn>$(_CompiledApiDefinitionNoWarn);1591</_CompiledApiDefinitionNoWarn> <!-- Don't expect every public API to have documentation -->