[release/9.0.1xx] Merge 'main' into release/9.0.1xx (#21816)

This brings Xcode 16.2 support to .NET 9.

.gitmodules

@@ -10,7 +10,3 @@
     path = external/MonoTouch.Dialog
     url = ../../xamarin/MonoTouch.Dialog
     branch = dotnet
-[submodule "api-tools"]
-    path = external/api-tools
-    url = ../../xamarin/api-tools
-    branch = main

DOWNLOADS.md

@@ -1,3 +1,10 @@
+> [!NOTE]
+> This page lists Xamarin.iOS and Xamarin.Mac downloads, which are both discontinued.
+> 
+> If you're looking for how to install a specific version of the iOS, tvOS, Mac Catalyst or macOS workloads (for .NET),
+> please [file an issue](https://github.com/xamarin/xamarin-macios/issues/new/choose) explaining what you need
+> (they're shipped as .NET workloads, and not installable from packages).
+
 # Xamarin.iOS
 
 | Date | Version | Package | Release Notes |

Directory.Build.props

@@ -4,6 +4,10 @@
 		<DisableTransitiveFrameworkReferenceDownloads>true</DisableTransitiveFrameworkReferenceDownloads>
 		<MonoCecilPackageVersion>0.11.5</MonoCecilPackageVersion>
 		<MSBuildStructuredLoggerPackageVersion>2.2.158</MSBuildStructuredLoggerPackageVersion>
+		<MicrosoftBuildPackageVersion>16.10.0</MicrosoftBuildPackageVersion>
+		<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
+		<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
+		<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
 	</PropertyGroup>
 	<Import Project="Build.props" Condition="Exists('Build.props')" />
 </Project>

Make.versions

@@ -65,10 +65,10 @@ MAC_PACKAGE_VERSION=9.99.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=18.1
-TVOS_NUGET_OS_VERSION=18.1
-MACOS_NUGET_OS_VERSION=15.1
-MACCATALYST_NUGET_OS_VERSION=18.1
+IOS_NUGET_OS_VERSION=18.2
+TVOS_NUGET_OS_VERSION=18.2
+MACOS_NUGET_OS_VERSION=15.2
+MACCATALYST_NUGET_OS_VERSION=18.2
 
 # The following are the OS versions we first supported with the current .NET version.
 # These versions must *not* change with minor .NET updates, only major .NET releases.

Makefile

@@ -43,16 +43,6 @@ show-versions:
 	@echo "    The .NET NuGet(s):"
 	@$(foreach platform,$(DOTNET_PLATFORMS),echo "        Microsoft.$(platform) $($(shell echo $(platform) | tr 'a-z' 'A-Z')_NUGET_VERSION_FULL)";)
 
-check-permissions:
-ifdef INCLUDE_MAC
-	@UNREADABLE=`find $(MAC_DESTDIR) ! -perm -0644`; if ! test -z "$$UNREADABLE"; then echo "There are files with invalid permissions (all installed files at least be readable by everybody, and writable by owner: 0644): "; find $(MAC_DESTDIR) ! -perm -0644 | xargs ls -la; exit 1; fi
-	@echo Validated file permissions for Xamarin.Mac.
-endif
-ifdef INCLUDE_IOS
-	@UNREADABLE=`find $(IOS_DESTDIR) ! -perm -0644`; if ! test -z "$$UNREADABLE"; then echo "There are files with invalid permissions (all installed files at least be readable by everybody, and writable by owner: 0644): "; find $(IOS_DESTDIR) ! -perm -0644 | xargs ls -la; exit 1; fi
-	@echo Validated file permissions for Xamarin.iOS.
-endif
-
 all-local:: global.json
 
 # This tells NuGet to use the exact same dotnet version we've configured in Make.config
@@ -71,34 +61,6 @@ install-hook::
 	fi
 
 install-hook::
-	@$(MAKE) check-permissions
-ifdef INCLUDE_IOS
-ifneq ($(findstring $(IOS_DESTDIR)$(MONOTOUCH_PREFIX),$(shell ls -l /Library/Frameworks/Xamarin.iOS.framework/Versions/Current 2>&1)),)
-	@echo
-	@echo "	This build of Xamarin.iOS is the now default version on your system. "
-	@echo
-else
-	@echo
-	@echo "	Xamarin.iOS has not been installed into your system by 'make install'"
-	@echo "	In order to set the currently built Xamarin.iOS as your system version,"
-	@echo "	execute 'make install-system'".
-	@echo
-endif
-endif
-ifdef INCLUDE_MAC
-ifndef INCLUDE_IOS
-	@echo
-endif
-ifneq ($(findstring $(abspath $(MAC_DESTDIR)$(MAC_FRAMEWORK_DIR)/Versions),$(shell ls -l $(MAC_FRAMEWORK_DIR)/Versions/Current 2>&1)),)
-	@echo "	This build of Xamarin.Mac is the now default version on your system. "
-	@echo
-else
-	@echo "	Xamarin.Mac has not been installed into your system by 'make install'"
-	@echo "	In order to set the currently built Xamarin.Mac as your system version,"
-	@echo "	execute 'make install-system'".
-	@echo
-endif
-endif
 	$(Q) $(MAKE) -C dotnet shutdown-build-server
 
 .PHONY: package release
@@ -117,41 +79,6 @@ package release:
 dotnet-install-system:
 	$(Q) $(MAKE) -C dotnet install-system
 
-install-system: install-system-ios install-system-mac
-	@# Clean up some old files
-	$(Q) rm -Rf /Library/Frameworks/Mono.framework/External/xbuild/Xamarin/iOS
-	$(Q) rm -Rf /Library/Frameworks/Mono.framework/External/xbuild/Xamarin/Xamarin.ObjcBinding.CSharp.targets
-	$(Q) rm -Rf /Library/Frameworks/Mono.framework/External/xbuild/Xamarin/Xamarin.Common.CSharp.targets
-	$(Q) rm -Rf /Library/Frameworks/Mono.framework/External/xbuild/Xamarin/Xamarin.ObjcBinding.Tasks.dll
-	$(Q) rm -Rf /Library/Frameworks/Mono.framework/External/xbuild/Xamarin/Mac
-	$(Q) $(MAKE) install-symlinks MAC_DESTDIR=/ MAC_INSTALL_VERSION=Current IOS_DESTDIR=/ IOS_INSTALL_VERSION=Current -C msbuild V=$(V)
-
-install-system-ios:
-ifdef INCLUDE_IOS
-	@if ! test -s "$(IOS_DESTDIR)/$(MONOTOUCH_PREFIX)/buildinfo"; then echo "The Xamarin.iOS build seems incomplete. Did you run \"make install\"?"; exit 1; fi
-	$(Q) rm -f /Library/Frameworks/Xamarin.iOS.framework/Versions/Current
-	$(Q) mkdir -p /Library/Frameworks/Xamarin.iOS.framework/Versions
-	$(Q) ln -s $(IOS_DESTDIR)$(MONOTOUCH_PREFIX) /Library/Frameworks/Xamarin.iOS.framework/Versions/Current
-	$(Q) echo Installed Xamarin.iOS into /Library/Frameworks/Xamarin.iOS.framework/Versions/Current
-endif
-
-install-system-mac:
-ifdef INCLUDE_MAC
-	@if ! test -s "$(MAC_DESTDIR)/$(MAC_FRAMEWORK_CURRENT_DIR)/buildinfo" ; then echo "The Xamarin.Mac build seems incomplete. Did you run \"make install\"?"; exit 1; fi
-	$(Q) rm -f $(MAC_FRAMEWORK_DIR)/Versions/Current
-	$(Q) mkdir -p $(MAC_FRAMEWORK_DIR)/Versions
-	$(Q) ln -s $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR) $(MAC_FRAMEWORK_DIR)/Versions/Current
-	$(Q) echo Installed Xamarin.Mac into $(MAC_FRAMEWORK_DIR)/Versions/Current
-endif
-
-fix-install-permissions:
-	sudo mkdir -p /Library/Frameworks/Mono.framework/External/
-	sudo mkdir -p /Library/Frameworks/Xamarin.iOS.framework
-	sudo mkdir -p /Library/Frameworks/Xamarin.Mac.framework
-	sudo chown -R $(USER) /Library/Frameworks/Mono.framework/External/
-	sudo chown -R $(USER) /Library/Frameworks/Xamarin.iOS.framework
-	sudo chown -R $(USER) /Library/Frameworks/Xamarin.Mac.framework
-
 fix-xcode-select:
 	sudo xcode-select -s $(XCODE_DEVELOPER_ROOT)
 

builds/Versions-MacCatalyst.plist.in

@@ -20,6 +20,7 @@
 			<string>17.5</string>
 			<string>18.0</string>
 			<string>18.1</string>
+			<string>18.2</string>
 		</array>
 	</dict>
 	<key>SupportedTargetPlatformVersions</key>
@@ -50,6 +51,7 @@
 			<string>17.5</string>
 			<string>18.0</string>
 			<string>18.1</string>
+			<string>18.2</string>
 		</array>
 	</dict>
 	<key>MacCatalystVersionMap</key>
@@ -96,6 +98,8 @@
 		<string>15.0</string>
 		<key>18.1</key>
 		<string>15.1</string>
+		<key>18.2</key>
+		<string>15.2</string>
 	</dict>
 	<key>RecommendedXcodeVersion</key>
 	<string>@XCODE_VERSION@</string>

builds/Versions-iOS.plist.in

@@ -37,6 +37,7 @@
 			<string>17.5</string>
 			<string>18.0</string>
 			<string>18.1</string>
+			<string>18.2</string>
 		</array>
 	</dict>
 	<key>SupportedTargetPlatformVersions</key>
@@ -86,6 +87,7 @@
 			<string>17.5</string>
 			<string>18.0</string>
 			<string>18.1</string>
+			<string>18.2</string>
 		</array>
 	</dict>
 	<key>RecommendedXcodeVersion</key>

builds/Versions-macOS.plist.in

@@ -22,6 +22,7 @@
 			<string>14.5</string>
 			<string>15.0</string>
 			<string>15.1</string>
+			<string>15.2</string>
 		</array>
 	</dict>
 	<key>SupportedTargetPlatformVersions</key>
@@ -50,6 +51,7 @@
 			<string>14.5</string>
 			<string>15.0</string>
 			<string>15.1</string>
+			<string>15.2</string>
 		</array>
 	</dict>
 	<key>RecommendedXcodeVersion</key>

builds/Versions-tvOS.plist.in

@@ -32,6 +32,7 @@
 			<string>17.5</string>
 			<string>18.0</string>
 			<string>18.1</string>
+			<string>18.2</string>
 		</array>
 	</dict>
 	<key>SupportedTargetPlatformVersions</key>
@@ -76,6 +77,7 @@
 			<string>17.5</string>
 			<string>18.0</string>
 			<string>18.1</string>
+			<string>18.2</string>
 		</array>
 	</dict>
 	<key>RecommendedXcodeVersion</key>

docs/api/CoreLocation/CLLocationManager.xml

@@ -204,7 +204,7 @@ locationManager.StartRangingBeacons(beaconRegion)
             <term>The <see cref="P:CoreLocation.CLLocationManager.Delegate" /> property must be assigned to an object whose class implements the <see cref="M:CoreLocation.CLLocationManagerDelegate.LocationsUpdated(CoreLocation.CLLocationManager,CoreLocation.CLLocation[])" /> method.</term>
           </item>
           <item>
-            <term>The <see cref="P:CoreLocation.CLLocationManager.DesiredAccuracy" /> property must be set to <see cref="P:CoreLocation.CLLocation.AccuracyBest" /> or <see cref="P:CoreLocation.CLLocation.AccurracyBestForNavigation" />.</term>
+            <term>The <see cref="P:CoreLocation.CLLocationManager.DesiredAccuracy" /> property must be set to <see cref="P:CoreLocation.CLLocation.AccuracyBest" /> or <see cref="P:CoreLocation.CLLocation.AccuracyBestForNavigation" />.</term>
           </item>
         </list>
         <para>If those conditions are satisfied, the application can request deferred delivery when backgrounded by calling the <see cref="M:CoreLocation.CLLocationManager.AllowDeferredLocationUpdatesUntil(System.Double,System.Double)" /> method.</para>