[release/9.0.1xx] Merge main into release/9.0.1xx to get Xcode 16.1 Support

.github/ISSUE_TEMPLATE/01-building-an-application.yml

@@ -25,6 +25,7 @@ body:
       options:
       - net8.0-*
       - net9.0-*
+      - net10.0-*
       - Other
     validations:
       required: true

.github/ISSUE_TEMPLATE/02-running-an-application.yml

@@ -25,6 +25,7 @@ body:
       options:
       - net8.0-*
       - net9.0-*
+      - net10.0-*
       - Other
     validations:
       required: true

.github/ISSUE_TEMPLATE/03-api.yml

@@ -35,6 +35,7 @@ body:
       options:
       - net8.0-*
       - net9.0-*
+      - net10.0-*
       - Other
     validations:
       required: true

.github/ISSUE_TEMPLATE/04-bindings.yml

@@ -26,6 +26,7 @@ body:
       options:
       - net8.0-*
       - net9.0-*
+      - net10.0-*
       - Other
     validations:
       required: true

.github/ISSUE_TEMPLATE/05-other.yml

@@ -25,6 +25,7 @@ body:
       options:
       - net8.0-*
       - net9.0-*
+      - net10.0-*
       - Other
     validations:
       required: true

.github/workflows/update-single-platform-branches.yml

@@ -28,7 +28,7 @@ jobs:
           set -ex
           git config user.email "github-actions-single-platform-branch-updater@xamarin.com"
           git config user.name "GitHub Actions Single Platform Branch Updater"
-          for platform in dotnet-iOS dotnet-tvOS dotnet-MacCatalyst dotnet-macOS dotnet; do
+          for platform in dotnet-iOS dotnet-tvOS dotnet-MacCatalyst dotnet-macOS; do
             git checkout -b release-test/only-$platform origin/release-test/only-$platform
             git merge origin/main
             git push

.gitignore

@@ -34,9 +34,7 @@ tests/bcl-test/SystemCoreXunit*.csproj
 tests/bcl-test/SystemXunit.csproj
 global.json
 .idea
-device-tests-provisioning.csx
-build-provisioning.csx
-provision-xcode.csx
+provision-shared.csx
 mono_crash.*.json
 *.binlog
 .vscode

.gitmodules

@@ -1,11 +1,3 @@
-[submodule "external/macios-binaries"]
-    path = external/macios-binaries
-    url = ../../xamarin/macios-binaries
-    branch = main
-[submodule "external/opentk"]
-    path = external/opentk
-    url = ../../mono/opentk.git
-    branch = main
 [submodule "external/Touch.Unit"]
     path = external/Touch.Unit
     url = ../../xamarin/Touch.Unit.git

Directory.Build.props

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

Make.versions

@@ -6,8 +6,8 @@
 #
 # IOS_NUGET_VERSION (major/minor/patch #)
 # TVOS_NUGET_VERSION (major/minor/patch #)
-# WATCHOS_NUGET_VERSION (major/minor/patch #)
 # MACOS_NUGET_VERSION (major/minor/patch #)
+# MACCATALYST_NUGET_VERSION (major/minor/patch #)
 #
 # Update version numbers on main as well, to the next version
 #
@@ -65,12 +65,17 @@ 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.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
+IOS_NUGET_OS_VERSION=18.1
+TVOS_NUGET_OS_VERSION=18.1
+MACOS_NUGET_OS_VERSION=15.1
+MACCATALYST_NUGET_OS_VERSION=18.1
 
+# 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.
+IOS_TARGET_PLATFORM_VERSION_LIBRARY=18.0
+TVOS_TARGET_PLATFORM_VERSION_LIBRARY=18.0
+MACOS_TARGET_PLATFORM_VERSION_LIBRARY=15.0
+MACCATALYST_TARGET_PLATFORM_VERSION_LIBRARY=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:
 # * We release support for iOS 14.5 with .NET 6
@@ -100,6 +105,13 @@ MACCATALYST_NUGET_OS_VERSION=18.0
 # So we've made the decision that the default target platform version is
 # always the latest target platform version.
 
+# However, this turns out to be somewhat of a complication for library developers,
+# because they typically don't need Xcode to build their projects, and if we auto-
+# update their TargetPlatformVersion to the latest, then all their customers
+# have to also update their workloads, which for some people end up being a rather
+# nasty surprise (because with the above algorithm it happens without developer
+# action). Thus we follow .NET's default platform version scheme for library projects:
+# it won't change in minor .NET releases.
 
 #
 # Here we list all the releases we support for each platform.
@@ -151,3 +163,8 @@ SUPPORTED_API_VERSIONS_IOS+=net8.0-18.0
 SUPPORTED_API_VERSIONS_TVOS+=net8.0-18.0
 SUPPORTED_API_VERSIONS_MACOS+=net8.0-15.0
 SUPPORTED_API_VERSIONS_MACCATALYST+=net8.0-18.0
+
+SUPPORTED_API_VERSIONS_IOS+=net9.0-18.0
+SUPPORTED_API_VERSIONS_TVOS+=net9.0-18.0
+SUPPORTED_API_VERSIONS_MACOS+=net9.0-15.0
+SUPPORTED_API_VERSIONS_MACCATALYST+=net9.0-18.0

Makefile

@@ -1,11 +1,9 @@
 TOP=.
-SUBDIRS=builds runtime fsharp src msbuild tools
+SUBDIRS=builds runtime src msbuild tools
 include $(TOP)/Make.config
 include $(TOP)/mk/versions.mk
 
-ifdef ENABLE_DOTNET
 SUBDIRS += dotnet
-endif
 
 #
 # Common
@@ -42,19 +40,8 @@ endif
 
 show-versions:
 	@echo "Building:"
-ifdef INCLUDE_XAMARIN_LEGACY
-	@echo "    The legacy package(s):"
-ifdef INCLUDE_IOS
-	@echo "        Xamarin.iOS $(IOS_PACKAGE_VERSION)"
-endif
-ifdef INCLUDE_MAC
-	@echo "        Xamarin.Mac $(MAC_PACKAGE_VERSION)"
-endif
-endif
-ifdef ENABLE_DOTNET
 	@echo "    The .NET NuGet(s):"
 	@$(foreach platform,$(DOTNET_PLATFORMS),echo "        Microsoft.$(platform) $($(shell echo $(platform) | tr 'a-z' 'A-Z')_NUGET_VERSION_FULL)";)
-endif
 
 check-permissions:
 ifdef INCLUDE_MAC
@@ -72,7 +59,9 @@ all-local:: global.json
 global.json: $(TOP)/dotnet.config Makefile $(GIT_DIRECTORY)/HEAD $(GIT_DIRECTORY)/index
 	$(Q_GEN) \
 		printf "{\n" > $@; \
-		printf "  \"sdk\": {\n    \"version\": \"$(DOTNET_VERSION)\"\n  }\n" >> $@; \
+		printf "  \"sdk\": {\n    \"version\": \"$(DOTNET_VERSION)\"\n  },\n" >> $@; \
+		printf "  \"tools\": {\n    \"dotnet\": \"$(DOTNET_VERSION)\"\n  },\n" >> $@; \
+		printf "  \"msbuild-sdks\": {\n    \"Microsoft.DotNet.Arcade.Sdk\": \"$(ARCADE_VERSION)\"\n  }\n" >> $@; \
 		printf "}\n" >> $@
 
 install-hook::
@@ -110,6 +99,7 @@ else
 	@echo
 endif
 endif
+	$(Q) $(MAKE) -C dotnet shutdown-build-server
 
 .PHONY: package release
 package release:
@@ -186,16 +176,12 @@ git-clean-all:
 	@git submodule foreach -q --recursive 'git clean -xffdq && git reset --hard -q'
 	@for dir in $(DEPENDENCY_DIRECTORIES); do if test -d $(CURDIR)/$$dir; then echo "Cleaning $$dir" && cd $(CURDIR)/$$dir && git clean -xffdq && git reset --hard -q && git submodule foreach -q --recursive 'git clean -xffdq'; else echo "Skipped  $$dir (does not exist)"; fi; done
 
-	@if [ -n "$(ENABLE_XAMARIN)" ] || [ -n "$(ENABLE_DOTNET)" ]; then \
+	@if [ -n "$(ENABLE_XAMARIN)" ]; then \
 		CONFIGURE_FLAGS=""; \
 		if [ -n "$(ENABLE_XAMARIN)" ]; then \
 			echo "Xamarin-specific build has been re-enabled"; \
 			CONFIGURE_FLAGS="$$CONFIGURE_FLAGS --enable-xamarin"; \
 		fi; \
-		if [ -n "$(ENABLE_DOTNET)" ]; then \
-			echo "Dotnet-specific build has been re-enabled"; \
-			CONFIGURE_FLAGS="$$CONFIGURE_FLAGS --enable-dotnet"; \
-		fi; \
 		./configure "$$CONFIGURE_FLAGS"; \
 		$(MAKE) reset; \
 		echo "Done"; \

NuGet.config

@@ -10,6 +10,7 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from xamarin-xamarin-macios -->
+    <add key="darc-pub-xamarin-xamarin-macios-797d3072" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-xamarin-xamarin-macios-797d3072/nuget/v3/index.json" />
     <add key="darc-pub-xamarin-xamarin-macios-8354d6d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-xamarin-xamarin-macios-8354d6d9/nuget/v3/index.json" />
     <!--  End: Package sources from xamarin-xamarin-macios -->
     <!--  Begin: Package sources from dotnet-emsdk -->