[Xcode13.2] Bump to Xcode 13.2 RC

Make.config

@@ -145,9 +145,9 @@ MACCATALYST_NUGET_VERSION_NO_METADATA=$(MACCATALYST_NUGET_VERSION)-$(NUGET_PRERE
 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.1
-XCODE_URL=https://dl.internalx.com/internal-files/xcodes/Xcode_13.1_Release_Candidate.xip
-XCODE_DEVELOPER_ROOT=/Applications/Xcode_13.1.0-rc.app/Contents/Developer
+XCODE_VERSION=13.2
+XCODE_URL=https://dl.internalx.com/internal-files/xcodes/Xcode_13.2_Release_Candidate.xip
+XCODE_DEVELOPER_ROOT=/Applications/Xcode_13.2.0-rc.app/Contents/Developer
 XCODE_PRODUCT_BUILD_VERSION:=$(shell /usr/libexec/PlistBuddy -c 'Print :ProductBuildVersion' $(XCODE_DEVELOPER_ROOT)/../version.plist)
 
 # Mono version embedded in XI/XM (NEEDED_MONO_VERSION/BRANCH) are specified in mk/mono.mk

Make.versions

@@ -48,8 +48,8 @@
 #   line changed in git).
 #
 
-IOS_PACKAGE_VERSION=15.3.0.$(IOS_COMMIT_DISTANCE)
-MAC_PACKAGE_VERSION=8.3.0.$(MAC_COMMIT_DISTANCE)
+IOS_PACKAGE_VERSION=15.4.0.$(IOS_COMMIT_DISTANCE)
+MAC_PACKAGE_VERSION=8.4.0.$(MAC_COMMIT_DISTANCE)
 
 #
 # ** NuGet package version numbers **
@@ -66,11 +66,11 @@ MAC_PACKAGE_VERSION=8.3.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)
 # When bumping the major macOS version in MACOS_NUGET_VERSION also update the macOS version where we execute on bots in jenkins/Jenkinsfile (in the 'node' element)
 
-IOS_NUGET_VERSION=15.0.101
-TVOS_NUGET_VERSION=15.0.101
-WATCHOS_NUGET_VERSION=8.0.101
-MACOS_NUGET_VERSION=12.0.101
-MACCATALYST_NUGET_VERSION=15.0.101
+IOS_NUGET_VERSION=15.2.100
+TVOS_NUGET_VERSION=15.2.100
+WATCHOS_NUGET_VERSION=8.3.100
+MACOS_NUGET_VERSION=12.1.100
+MACCATALYST_NUGET_VERSION=15.2.100
 
 
 # Defines the default platform version if it's not specified in the TFM. The default should not change for a given .NET version:
@@ -80,8 +80,8 @@ MACCATALYST_NUGET_VERSION=15.0.101
 # 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.0
-DEFAULT_TARGET_PLATFORM_VERSION_TVOS=15.0
-DEFAULT_TARGET_PLATFORM_VERSION_WATCHOS=8.0
-DEFAULT_TARGET_PLATFORM_VERSION_MACOS=12.0
-DEFAULT_TARGET_PLATFORM_VERSION_MACCATALYST=15.0
+DEFAULT_TARGET_PLATFORM_VERSION_IOS=15.2
+DEFAULT_TARGET_PLATFORM_VERSION_TVOS=15.2
+DEFAULT_TARGET_PLATFORM_VERSION_WATCHOS=8.3
+DEFAULT_TARGET_PLATFORM_VERSION_MACOS=12.1
+DEFAULT_TARGET_PLATFORM_VERSION_MACCATALYST=15.2

Versions-ios.plist.in

@@ -47,6 +47,7 @@
 			<string>14.4</string>
 			<string>14.5</string>
 			<string>15.0</string>
+			<string>15.2</string>
 		</array>
 		<key>tvOS</key>
 		<array>
@@ -76,6 +77,7 @@
 			<string>14.4</string>
 			<string>14.5</string>
 			<string>15.0</string>
+			<string>15.2</string>
 		</array>
 		<key>watchOS</key>
 		<array>
@@ -102,6 +104,7 @@
 			<string>7.3</string>
 			<string>7.4</string>
 			<string>8.0</string>
+			<string>8.3</string>
 		</array>
 		<key>MacCatalyst</key>
 		<array>
@@ -115,6 +118,7 @@
 			<string>14.4</string>
 			<string>14.5</string>
 			<string>15.0</string>
+			<string>15.2</string>
 		</array>
 	</dict>
 	<key>MacCatalystVersionMap</key>
@@ -139,6 +143,8 @@
 		<string>11.3</string>
 		<key>15.0</key>
 		<string>12.0</string>
+		<key>15.2</key>
+		<string>12.1</string>
 	</dict>
 	<key>RecommendedXcodeVersion</key>
 	<string>@XCODE_VERSION@</string>

Versions-mac.plist.in

@@ -23,6 +23,7 @@
 			<string>11.2</string>
 			<string>11.3</string>
 			<string>12.0</string>
+			<string>12.1</string>
 		</array>
 	</dict>
 	<key>RecommendedXcodeVersion</key>

src/AVFoundation/Enums.cs

@@ -923,6 +923,10 @@ public enum AVOutputSettingsPreset {
 		[TV (13,0), NoWatch, Mac (10,15), iOS (13,0)]
 		[Field ("AVOutputSettingsPresetHEVC3840x2160WithAlpha")]
 		PresetHevc3840x2160WithAlpha = 14,
+
+		[NoTV, NoWatch, Mac (12,1), NoiOS]
+		[Field ("AVOutputSettingsPresetHEVC7680x4320")]
+		PresetHevc7680x4320 = 15,
 	}
 
 	[Introduced (PlatformName.MacCatalyst, 14, 0)]

src/AppKit/Compat.cs

@@ -1,4 +1,4 @@
-#if !__MACCATALYST__
+#if !NET
 using System;
 using System.ComponentModel;
 
@@ -7,7 +7,7 @@
 
 namespace AppKit {
 	partial class NSMutableParagraphStyle {
-#if !XAMCORE_4_0
+
 		[Obsolete ("Use the 'TextBlocks' property instead.", false)]
 		[EditorBrowsable (EditorBrowsableState.Never)]
 		[BindingImpl (BindingImplOptions.GeneratedCode | BindingImplOptions.Optimizable)]
@@ -39,16 +39,13 @@ public virtual void SetTextLists (NSTextList[] array)
 			}
 			nsa_array.Dispose ();
 		}
-#endif
 	}
 
-#if !XAMCORE_4_0
 	public static class NSFileTypeForHFSTypeCode
 	{
 		public static readonly string ComputerIcon = "root";
 		public static readonly string DesktopIcon = "desk";
 		public static readonly string FinderIcon = "FNDR";
 	}
-#endif
 }
-#endif // !__MACCATALYST__
+#endif // !NET