[net10.0] Merge main into net10.0. (#21580)

Author: rolfbjarne

.gitmodules

@@ -1,7 +1,3 @@
-[submodule "external/macios-binaries"]
-    path = external/macios-binaries
-    url = ../../xamarin/macios-binaries
-    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.config

@@ -218,11 +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=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_VERSION=16.1
+XCODE_URL=https://dl.internalx.com/internal-files/xcodes/Xcode_16.1.xip
+XCODE_IOS_SIMULATOR_FILENAME=iOS_18.1_Simulator_Runtime.dmg
+XCODE_IOS_SIMULATOR_VERSION=22B81
+XCODE_DEVELOPER_ROOT=/Applications/Xcode_16.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)
 
 # We define stable Xcode as the Xcode app being named like "Xcode_#.#[.#].app"
@@ -262,9 +262,9 @@ MIN_MONO_URL=https://download.mono-project.com/archive/6.12.0/macos-10-universal
 MIN_XM_MONO_VERSION=6.4.0.94
 
 # ObjectiveSharpie min/max versions
-MIN_SHARPIE_VERSION=3.5.115
+MIN_SHARPIE_VERSION=3.5.116
 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
+MIN_SHARPIE_URL=https://download.visualstudio.microsoft.com/download/pr/3a748cc2-780d-403c-88ba-700aa9a2d299/88cbfd86e85f56b4c61e092d0f0b9ad9/objectivesharpie-3.5.116.pkg
 
 # Minimum OSX versions for building XI/XM
 MIN_OSX_BUILD_VERSION=13.0
@@ -566,7 +566,6 @@ MONO_PATH=$(TOP)/external/mono
 TOUCH_UNIT_PATH=$(TOP)/external/Touch.Unit
 XAMARIN_MACDEV_PATH=$(TOP)/external/Xamarin.MacDev
 MACCORE_PATH=$(TOP)/../maccore
-MACIOS_BINARIES_PATH=$(TOP)/external/macios-binaries
 MONOTOUCH_DIALOG_PATH=$(TOP)/external/MonoTouch.Dialog
 API_TOOLS_PATH=$(TOP)/external/api-tools
 
@@ -580,9 +579,6 @@ SYSTEM_XBUILD=$(MONO_PREFIX)/bin/msbuild /p:Features=strict /m
 SYSTEM_MSBUILD=unset MSBuildExtensionsPath && $(MONO_PREFIX)/bin/msbuild /p:Features=strict /m
 SYSTEM_RESGEN=$(MONO_PREFIX)/bin/resgen
 
-XIBUILD_EXE_PATH=$(abspath $(TOP)/tools/xibuild/bin/Debug/xibuild.exe)
-SYSTEM_XIBUILD=$(SYSTEM_MONO) $(XIBUILD_EXE_PATH) $(XIBUILD_VERBOSITY)
-
 PKG_CONFIG=$(MONO_PREFIX)/bin/pkg-config
 
 MAC_PRODUCT=Xamarin.Mac
@@ -676,6 +672,7 @@ $(TOP)/dotnet.config: $(TOP)/eng/Versions.props $(TOP)/Build.props
 	$(Q) grep MicrosoftNETCoreAppRefPackageVersion $(TOP)/eng/Versions.props | sed -e 's/<*\/*MicrosoftNETCoreAppRefPackageVersion>//g' -e 's/[ \t]*/BUNDLED_NETCORE_PLATFORMS_PACKAGE_VERSION=/' >> $@.tmp
 	$(Q) grep "<$$(grep EmscriptenWorkloadVersion $(TOP)/eng/Versions.props | sed -e 's_.*>$$[\(]\(.*\)[\)]<.*_\1_')>" $(TOP)/eng/Versions.props | sed -e 's/.*>\(.*\)<.*/EMSCRIPTEN_MANIFEST_PACKAGE_VERSION=\1/' >> $@.tmp
 	$(Q) $(foreach platform,$(ALL_DOTNET_PLATFORMS),grep '<Microsoft$(platform)SdkPackageVersion>' $(TOP)/eng/Versions.props | sed -e 's/<*\/*Microsoft$(platform)SdkPackageVersion>//g' -e 's/[ \t]*/NET8_$(shell echo $(platform) | tr '[:lower:]' '[:upper:]')_NUGET_VERSION_NO_METADATA=/' >> $@.tmp &&) true
+	$(Q) grep '<MicrosoftDotNetArcadeSdkPackageVersion>' $(TOP)/eng/Versions.props | sed -e 's/<*\/*MicrosoftDotNetArcadeSdkPackageVersion>//g' -e 's/[ \t]*/ARCADE_VERSION=/' >> $@.tmp
 	$(Q) mv $@.tmp $@
 
 $(TOP)/Build.props: Make.config
@@ -771,6 +768,7 @@ DOTNET_PLATFORMS=
 ifdef INCLUDE_IOS
 ifdef ENABLE_DOTNET
 DOTNET_PLATFORMS+=iOS
+DOTNET_MONOVM_PLATFORMS+=iOS
 DOTNET_IOS_BITNESSES+=64
 DOTNET_NATIVEAOT_PLATFORMS+=iOS
 
@@ -797,6 +795,7 @@ endif # INCLUDE_IOS
 ifdef INCLUDE_TVOS
 ifdef ENABLE_DOTNET
 DOTNET_PLATFORMS+=tvOS
+DOTNET_MONOVM_PLATFORMS+=tvOS
 DOTNET_TVOS_BITNESSES+=64
 DOTNET_NATIVEAOT_PLATFORMS+=tvOS
 ifdef INCLUDE_DEVICE
@@ -811,6 +810,7 @@ endif
 ifdef INCLUDE_MACCATALYST
 ifdef ENABLE_DOTNET
 DOTNET_PLATFORMS+=MacCatalyst
+DOTNET_MONOVM_PLATFORMS+=MacCatalyst
 DOTNET_MACCATALYST_BITNESSES+=64
 DOTNET_NATIVEAOT_PLATFORMS+=MacCatalyst
 DOTNET_MACCATALYST_RUNTIME_IDENTIFIERS=maccatalyst-x64 maccatalyst-arm64
@@ -840,6 +840,9 @@ $(foreach platform,$(DOTNET_PLATFORMS),$(eval $(platform)_NUGET_OS_VERSION:=$($(
 # Create a variable with all the runtime identifiers
 DOTNET_RUNTIME_IDENTIFIERS=$(foreach platform,$(DOTNET_PLATFORMS),$(DOTNET_$(platform)_RUNTIME_IDENTIFIERS))
 
+# Create a variable with all the MonoVM runtime identifiers
+DOTNET_MONOVM_RUNTIME_IDENTIFIERS=$(foreach platform,$(DOTNET_MONOVM_PLATFORMS),$(DOTNET_$(platform)_RUNTIME_IDENTIFIERS))
+
 # Create a variable with all the CoreCLR runtime identifiers
 DOTNET_CORECLR_RUNTIME_IDENTIFIERS=$(foreach platform,$(DOTNET_CORECLR_PLATFORMS),$(DOTNET_$(platform)_RUNTIME_IDENTIFIERS))
 

Make.versions

@@ -65,12 +65,18 @@ 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
+WATCHOS_NUGET_OS_VERSION=11.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.1
+TVOS_TARGET_PLATFORM_VERSION_LIBRARY=18.1
+MACOS_TARGET_PLATFORM_VERSION_LIBRARY=15.1
+MACCATALYST_TARGET_PLATFORM_VERSION_LIBRARY=18.1
 
 # 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 +106,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.

Makefile

@@ -72,7 +72,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::

NuGet.config

@@ -15,8 +15,10 @@
     <!--  Begin: Package sources from dotnet-emsdk -->
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
+    <add key="darc-pub-dotnet-aspnetcore-1e7a7af" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-1e7a7af6/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-pub-dotnet-runtime-d398172" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-d3981726/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" />
@@ -64,6 +66,9 @@
     <!-- Add a 8.0.10 feed -->
     <add key="darc-pub-dotnet-emsdk-91b783e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-91b783ed/nuget/v3/index.json" />
     <add key="darc-pub-dotnet-runtime-ca415e9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-ca415e95/nuget/v3/index.json" />
+    <!-- Add a 8.0.11 feed -->
+    <add key="darc-pub-dotnet-emsdk-f623714" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-f6237140/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-runtime-ef07c4f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-ef07c4f2/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <clear />

Versions-ios.plist.in

@@ -43,6 +43,7 @@
 			<string>17.4</string>
 			<string>17.5</string>
 			<string>18.0</string>
+			<string>18.1</string>
 		</array>
 		<key>tvOS</key>
 		<array>
@@ -76,6 +77,7 @@
 			<string>17.4</string>
 			<string>17.5</string>
 			<string>18.0</string>
+			<string>18.1</string>
 		</array>
 		<key>watchOS</key>
 		<array>
@@ -105,6 +107,7 @@
 			<string>10.4</string>
 			<string>10.5</string>
 			<string>11.0</string>
+			<string>11.1</string>
 		</array>
 		<key>MacCatalyst</key>
 		<array>
@@ -119,6 +122,7 @@
 			<string>17.4</string>
 			<string>17.5</string>
 			<string>18.0</string>
+			<string>18.1</string>
 		</array>
 	</dict>
 	<key>MacCatalystVersionMap</key>
@@ -163,6 +167,8 @@
 		<string>14.5</string>
 		<key>18.0</key>
 		<string>15.0</string>
+		<key>18.1</key>
+		<string>15.1</string>
 	</dict>
 	<key>RecommendedXcodeVersion</key>
 	<string>@XCODE_VERSION@</string>

builds/Makefile

@@ -95,7 +95,7 @@ package-download/all-package-references.csproj: $(GIT_DIRECTORY)/HEAD $(GIT_DIRE
 		download-packages.csproj \
 		/t:WriteBundledNETCorePlatformsPackageVersion \
 		/p:WriteFilePath=$(CURDIR)/BundledNETCorePlatformsPackageVersion.txt \
-		/p:PackageRuntimeIdentifiers="$(DOTNET_RUNTIME_IDENTIFIERS)" \
+		/p:PackageRuntimeIdentifiersMonoVM="$(DOTNET_MONOVM_RUNTIME_IDENTIFIERS)" \
 		/p:PackageRuntimeIdentifiersCoreCLR="$(DOTNET_CORECLR_RUNTIME_IDENTIFIERS)" \
 		/p:CustomDotNetVersion="$(DOWNLOAD_DOTNET_VERSION)" \
 		/p:MonoToolChainManifestVersionBand="$(MONO_TOOLCHAIN_MANIFEST_VERSION_BAND)" \
@@ -134,10 +134,12 @@ DOTNET_COMMON_TARGETS = \
 	$(foreach platform,$(DOTNET_PLATFORMS_UPPERCASE),$(DOTNET_DESTDIR)/$($(platform)_NUGET_SDK_NAME)/Versions.plist) \
 	$(foreach platform,$(DOTNET_PLATFORMS_UPPERCASE),$(DOTNET_DESTDIR)/$($(platform)_NUGET_SDK_NAME)/tools/buildinfo) \
 
+include $(TOP)/scripts/versions-check/fragment.mk
+$(VERSIONS_CHECK): downloads/$(DOTNET_INSTALL_NAME)
 define VersionInfo
-$(DOTNET_DESTDIR)/$($(1)_NUGET_SDK_NAME)/Versions.plist: $(TOP)/builds/Versions-$(1).plist.in Makefile $(TOP)/Make.config $(TOP)/versions-check.csharp | $(DOTNET_DESTDIR)/$($(1)_NUGET_SDK_NAME)
-	$$(Q) $(TOP)/versions-check.csharp $$< "$(DOTNET_MIN_IOS_SDK_VERSION)" "$(MAX_IOS_DEPLOYMENT_TARGET)" "$(DOTNET_MIN_TVOS_SDK_VERSION)" "$(MAX_TVOS_DEPLOYMENT_TARGET)" "$(MIN_WATCH_OS_VERSION)" "$(MAX_WATCH_DEPLOYMENT_TARGET)" "$(DOTNET_MIN_MACOS_SDK_VERSION)" "$(MACOS_SDK_VERSION)" "$(DOTNET_MIN_MACCATALYST_SDK_VERSION)" "$(MACCATALYST_SDK_VERSION)"
-	$$(Q_GEN) sed -e 's/@XCODE_VERSION@/$(XCODE_VERSION)/g' -e "s/@MONO_VERSION@/$(DOTNET_VERSION)/g" $$< > $$@.tmp
+$(DOTNET_DESTDIR)/$($(1)_NUGET_SDK_NAME)/Versions.plist: $(TOP)/builds/Versions-$(1).plist.in Makefile $(TOP)/Make.config $(VERSIONS_CHECK) | $(DOTNET_DESTDIR)/$($(1)_NUGET_SDK_NAME)
+	$$(Q) $(VERSIONS_CHECK_EXEC) $$< "$(DOTNET_MIN_IOS_SDK_VERSION)" "$(MAX_IOS_DEPLOYMENT_TARGET)" "$(DOTNET_MIN_TVOS_SDK_VERSION)" "$(MAX_TVOS_DEPLOYMENT_TARGET)" "$(MIN_WATCH_OS_VERSION)" "$(MAX_WATCH_DEPLOYMENT_TARGET)" "$(DOTNET_MIN_MACOS_SDK_VERSION)" "$(MACOS_SDK_VERSION)" "$(DOTNET_MIN_MACCATALYST_SDK_VERSION)" "$(MACCATALYST_SDK_VERSION)"
+	$$(QF_GEN) sed -e 's/@XCODE_VERSION@/$(XCODE_VERSION)/g' -e "s/@MONO_VERSION@/$(DOTNET_VERSION)/g" $$< > $$@.tmp
 	$$(Q) mv $$@.tmp $$@
 endef
 $(foreach platform,$(DOTNET_PLATFORMS),$(eval $(call VersionInfo,$(platform))))

builds/Versions-MacCatalyst.plist.in

@@ -19,6 +19,7 @@
 			<string>17.4</string>
 			<string>17.5</string>
 			<string>18.0</string>
+			<string>18.1</string>
 		</array>
 	</dict>
 	<key>SupportedTargetPlatformVersions</key>
@@ -48,6 +49,7 @@
 			<string>17.4</string>
 			<string>17.5</string>
 			<string>18.0</string>
+			<string>18.1</string>
 		</array>
 	</dict>
 	<key>MacCatalystVersionMap</key>
@@ -92,6 +94,8 @@
 		<string>14.5</string>
 		<key>18.0</key>
 		<string>15.0</string>
+		<key>18.1</key>
+		<string>15.1</string>
 	</dict>
 	<key>RecommendedXcodeVersion</key>
 	<string>@XCODE_VERSION@</string>

builds/Versions-iOS.plist.in

@@ -36,6 +36,7 @@
 			<string>17.4</string>
 			<string>17.5</string>
 			<string>18.0</string>
+			<string>18.1</string>
 		</array>
 	</dict>
 	<key>SupportedTargetPlatformVersions</key>
@@ -84,6 +85,7 @@
 			<string>17.4</string>
 			<string>17.5</string>
 			<string>18.0</string>
+			<string>18.1</string>
 		</array>
 	</dict>
 	<key>RecommendedXcodeVersion</key>