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

Author: rolfbjarne

.github/workflows/maestro-changelog.yml

@@ -15,12 +15,17 @@ jobs:
     if: github.actor == 'dotnet-maestro[bot]'
 
     steps:
+    - uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: '9'
+
     - name: 'Compute changelog'
       run: |
         set -exo pipefail
         git clone https://github.com/spouliot/dotnet-tools
         cd dotnet-tools/changelog
-        dotnet run https://github.com/$GITHUB_REPOSITORY/pull/${GITHUB_REF_NAME/\/*/} > /tmp/changelog.txt 2>&1
+        dotnet build
+        ./bin/Debug/net9.0/changelog https://github.com/$GITHUB_REPOSITORY/pull/${GITHUB_REF_NAME/\/*/} > /tmp/changelog.txt 2>&1
 
     - name: 'Add changelog'
       uses: actions/github-script@v7.0.1

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,10 +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>
+		<MicrosoftBuildPackageVersion>15.9.20</MicrosoftBuildPackageVersion>
+		<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
+		<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
+		<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
 	</PropertyGroup>
 	<Import Project="Build.props" Condition="Exists('Build.props')" />
 </Project>

Make.config

@@ -44,10 +44,10 @@ include $(TOP)/Make.versions
 # The value is taken from the name + version of the Ref pack.
 # Example: given the Ref pack "Microsoft.iOS.Ref.net8.0_17.5" with the version "17.5.8030", the value
 # to write here would be the part after "Microsoft.iOS.Ref." + "/" + version: "net8.0_17.5/17.5.8030"
-STABLE_NUGET_VERSION_iOS=net8.0_18.0/18.0.8303
-STABLE_NUGET_VERSION_tvOS=net8.0_18.0/18.0.8303
-STABLE_NUGET_VERSION_MacCatalyst=net8.0_18.0/18.0.8303
-STABLE_NUGET_VERSION_macOS=net8.0_15.0/15.0.8303
+STABLE_NUGET_VERSION_iOS=net9.0_18.0/18.0.9617
+STABLE_NUGET_VERSION_tvOS=net9.0_18.0/18.0.9617
+STABLE_NUGET_VERSION_MacCatalyst=net9.0_18.0/18.0.9617
+STABLE_NUGET_VERSION_macOS=net9.0_15.0/15.0.9617
 
 PACKAGE_HEAD_REV=$(shell git rev-parse HEAD)
 
@@ -201,14 +201,6 @@ TVOS_NUGET_VERSION_PATCH=$(word 3, $(subst ., ,$(TVOS_NUGET_VERSION)))
 TVOS_NUGET_VERSION_NO_METADATA=$(TVOS_NUGET_VERSION)$(NUGET_PRERELEASE_IDENTIFIER)
 TVOS_NUGET_VERSION_FULL=$(TVOS_NUGET_VERSION_NO_METADATA)$(NUGET_BUILD_METADATA)
 
-WATCHOS_NUGET=Microsoft.watchOS
-WATCHOS_NUGET_VERSION=$(WATCHOS_NUGET_OS_VERSION).$(WATCHOS_NUGET_COMMIT_DISTANCE)
-WATCHOS_NUGET_VERSION_MAJOR=$(word 1, $(subst ., ,$(WATCHOS_NUGET_VERSION)))
-WATCHOS_NUGET_VERSION_MINOR=$(word 2, $(subst ., ,$(WATCHOS_NUGET_VERSION)))
-WATCHOS_NUGET_VERSION_PATCH=$(word 3, $(subst ., ,$(WATCHOS_NUGET_VERSION)))
-WATCHOS_NUGET_VERSION_NO_METADATA=$(WATCHOS_NUGET_VERSION)$(NUGET_PRERELEASE_IDENTIFIER)
-WATCHOS_NUGET_VERSION_FULL=$(WATCHOS_NUGET_VERSION_NO_METADATA)$(NUGET_BUILD_METADATA)
-
 MACCATALYST_NUGET=Microsoft.MacCatalyst
 MACCATALYST_NUGET_VERSION=$(MACCATALYST_NUGET_OS_VERSION).$(MACCATALYST_NUGET_COMMIT_DISTANCE)
 MACCATALYST_NUGET_VERSION_MAJOR=$(word 1, $(subst ., ,$(MACCATALYST_NUGET_VERSION)))
@@ -275,25 +267,19 @@ MIN_OSX_VERSION_FOR_MAC=10.15
 # Bump the *_NUGET_VERSION variables in Make.versions instead, because that makes sure the computed commit distance for the version is correct.
 IOS_SDK_VERSION=$(word 1, $(subst ., ,$(IOS_NUGET_VERSION))).$(word 2, $(subst ., ,$(IOS_NUGET_VERSION)))
 MACOS_SDK_VERSION=$(word 1, $(subst ., ,$(MACOS_NUGET_VERSION))).$(word 2, $(subst ., ,$(MACOS_NUGET_VERSION)))
-WATCH_SDK_VERSION=$(word 1, $(subst ., ,$(WATCHOS_NUGET_VERSION))).$(word 2, $(subst ., ,$(WATCHOS_NUGET_VERSION)))
 TVOS_SDK_VERSION=$(word 1, $(subst ., ,$(TVOS_NUGET_VERSION))).$(word 2, $(subst ., ,$(TVOS_NUGET_VERSION)))
 MACCATALYST_SDK_VERSION=$(word 1, $(subst ., ,$(MACCATALYST_NUGET_VERSION))).$(word 2, $(subst ., ,$(MACCATALYST_NUGET_VERSION)))
 MACCATALYST_MAC_SDK_VERSION=$(MACOS_SDK_VERSION)
 
 MAX_IOS_DEPLOYMENT_TARGET=$(IOS_SDK_VERSION)
-MAX_WATCH_DEPLOYMENT_TARGET=$(WATCH_SDK_VERSION)
 MAX_TVOS_DEPLOYMENT_TARGET=$(TVOS_SDK_VERSION)
 
 MAX_IOS_SIMULATOR_VERSION=$(IOS_SDK_VERSION)
 MAX_TVOS_SIMULATOR_VERSION=$(TVOS_SDK_VERSION)
-MAX_WATCH_SIMULATOR_VERSION=$(WATCH_SDK_VERSION)
 
 # Minimum OS versions for running XI/XM apps.
 MIN_IOS_SDK_VERSION=12.2
 MIN_MACOS_SDK_VERSION=12.0
-MIN_WATCHOS_SDK_VERSION=4.0
-MIN_WATCHOS64_32_SDK_VERSION=5.1
-MIN_WATCH_OS_VERSION=4.0
 MIN_TVOS_SDK_VERSION=12.2
 MIN_MACCATALYST_SDK_VERSION=15.0
 
@@ -305,40 +291,17 @@ DOTNET_MIN_MACOS_SDK_VERSION=12.0
 
 # The min simulator version available in the Xcode we're using
 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=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
+EXTRA_SIMULATORS=com.apple.pkg.iPhoneSimulatorSDK15_0 com.apple.pkg.AppleTVSimulatorSDK15_0
 
 INCLUDE_IOS=1
 INCLUDE_MAC=1
 INCLUDE_TVOS=1
 INCLUDE_MACCATALYST=1
 INCLUDE_DEVICE=1
-INCLUDE_XAMARIN_LEGACY=
 INCLUDE_HOTRESTART=1
 
-ENABLE_DOTNET=1
-
-ifeq ($(shell test $(shell echo $(MIN_IOS_SDK_VERSION) | sed 's/[.].*//') -ge 11; echo $$?),0)
-IOS_SUPPORTS_32BIT_ARCHITECTURES=
-else
-IOS_SUPPORTS_32BIT_ARCHITECTURES=1
-endif
-
-ifeq ($(shell test $(shell echo $(MIN_WATCHOS_SDK_VERSION) | sed 's/[.].*//') -ge 9; echo $$?),0)
-WATCHOS_SUPPORTS_32BIT_DEVICE_ARCHITECTURES=
-else
-WATCHOS_SUPPORTS_32BIT_DEVICE_ARCHITECTURES=1
-endif
-ifeq ($(shell test $(shell echo $(MIN_WATCHOS_SDK_VERSION) | sed 's/[.].*//') -ge 4; echo $$?),0)
-WATCHOS_SUPPORTS_32BIT_SIMULATOR_ARCHITECTURES=
-else
-WATCHOS_SUPPORTS_32BIT_SIMULATOR_ARCHITECTURES=1
-endif
-
 -include $(TOP)/Make.config.local
 -include $(TOP)/configure.inc
 
@@ -381,7 +344,6 @@ MONOTOUCH_PREFIX := $(abspath $(MONOTOUCH_PREFIX))
 
 MONOTOUCH_MONO_PATH?=$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS
 MONOTOUCH_TV_MONO_PATH?=$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.TVOS
-MONOTOUCH_WATCH_MONO_PATH?=$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.WatchOS
 MONOTOUCH_MACCATALYST_MONO_PATH?=$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.MacCatalyst
 
 IOS_PACKAGE_FILENAME=$(IOS_PACKAGE_NAME_LOWER)-$(IOS_PACKAGE_VERSION).pkg
@@ -449,7 +411,6 @@ DEVICE_CXX=$(IOS_CXX)
 
 IOS_CSC=$(SYSTEM_CSC) -features:strict -nostdlib -noconfig -r:$(MONOTOUCH_MONO_PATH)/System.dll -r:$(MONOTOUCH_MONO_PATH)/System.Core.dll -r:$(MONOTOUCH_MONO_PATH)/System.Xml.dll -r:$(MONOTOUCH_MONO_PATH)/mscorlib.dll -r:$(MONOTOUCH_MONO_PATH)/System.Net.Http.dll -r:$(MONOTOUCH_MONO_PATH)/Facades/System.Drawing.Common.dll -deterministic
 TV_CSC=$(SYSTEM_CSC) -features:strict -nostdlib -noconfig -r:$(MONOTOUCH_TV_MONO_PATH)/System.dll -r:$(MONOTOUCH_TV_MONO_PATH)/System.Core.dll -r:$(MONOTOUCH_TV_MONO_PATH)/System.Xml.dll -r:$(MONOTOUCH_TV_MONO_PATH)/mscorlib.dll -r:$(MONOTOUCH_TV_MONO_PATH)/System.Net.Http.dll -r:$(MONOTOUCH_TV_MONO_PATH)/Facades/System.Drawing.Common.dll -deterministic
-WATCH_CSC=$(SYSTEM_CSC) -features:strict -nostdlib -noconfig -r:$(MONOTOUCH_WATCH_MONO_PATH)/System.dll -r:$(MONOTOUCH_WATCH_MONO_PATH)/System.Core.dll -r:$(MONOTOUCH_WATCH_MONO_PATH)/System.Xml.dll -r:$(MONOTOUCH_WATCH_MONO_PATH)/mscorlib.dll -r:$(MONOTOUCH_WATCH_MONO_PATH)/System.Net.Http.dll -r:$(MONOTOUCH_WATCH_MONO_PATH)/Facades/System.Drawing.Common.dll -deterministic
 MACCATALYST_CSC=$(SYSTEM_CSC) -features:strict -nostdlib -noconfig -r:$(MONOTOUCH_MACCATALYST_MONO_PATH)/System.dll -r:$(MONOTOUCH_MACCATALYST_MONO_PATH)/System.Core.dll -r:$(MONOTOUCH_MACCATALYST_MONO_PATH)/System.Xml.dll -r:$(MONOTOUCH_MACCATALYST_MONO_PATH)/mscorlib.dll -r:$(MONOTOUCH_MACCATALYST_MONO_PATH)/System.Net.Http.dll -r:$(MONOTOUCH_MACCATALYST_MONO_PATH)/Facades/System.Drawing.Common.dll -deterministic
 
 DEVICE_OBJC_CFLAGS=$(OBJC_CFLAGS)
@@ -476,23 +437,6 @@ XAMARIN_IPHONEOS_SDK     = $(MONOTOUCH_DEVICE_SDK)
 
 XAMARIN_MACCATALYST_SDK    = $(MONOTOUCH_PREFIX)/SDKs/Xamarin.MacCatalyst.sdk
 
-# WatchOS 
-
-XAMARIN_WATCHSIMULATOR_SDK = $(MONOTOUCH_PREFIX)/SDKs/Xamarin.WatchSimulator.sdk
-XAMARIN_WATCHOS_SDK        = $(MONOTOUCH_PREFIX)/SDKs/Xamarin.WatchOS.sdk
-
-SIMULATORWATCH_SDK           = $(XCODE_DEVELOPER_ROOT)/Platforms/WatchSimulator.platform/Developer/SDKs/WatchSimulator$(WATCH_SDK_VERSION).sdk
-SIMULATORWATCH_CFLAGS        = -arch i386 -mwatchos-simulator-version-min=$(MIN_WATCHOS_SDK_VERSION) -isysroot $(SIMULATORWATCH_SDK) $(CFLAGS) -g $(IOS_COMMON_DEFINES)
-SIMULATORWATCH64_CFLAGS      = -arch x86_64 -mwatchos-simulator-version-min=$(MIN_WATCHOS_SDK_VERSION) -isysroot $(SIMULATORWATCH_SDK) $(CFLAGS) -g $(IOS_COMMON_DEFINES)
-SIMULATORWATCH_OBJC_CFLAGS   = $(SIMULATORWATCH_CFLAGS) $(COMMON_SIMULATOR_OBJC_CFLAGS) 
-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) $(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)
-
 # TVOS
 
 XAMARIN_TVSIMULATOR_SDK    = $(MONOTOUCH_PREFIX)/SDKs/Xamarin.AppleTVSimulator.sdk
@@ -544,14 +488,6 @@ TVOS_SIMULATOR_X64_SWIFTFLAGS=$(TVOS_SIMULATOR_COMMON_SWIFTFLAGS) -target x86_64
 TVOS_DEVICE_COMMON_SWIFTFLAGS=$(COMMON_SWIFTFLAGS) -sdk $(DEVICETV_SDK)
 TVOS_DEVICE_ARM64_SWIFTFLAGS=$(TVOS_DEVICE_COMMON_SWIFTFLAGS) -target arm64-apple-tvos$(MIN_TVOS_SDK_VERSION)
 
-WATCHOS_SIMULATOR_COMMON_SWIFTFLAGS=$(COMMON_SWIFTFLAGS) -sdk $(SIMULATORWATCH_SDK)
-WATCHOS_SIMULATOR_ARM64_SWIFTFLAGS=$(WATCHOS_SIMULATOR_COMMON_SWIFTFLAGS) -target arm64-apple-watchos$(MIN_WATCHOS_SDK_VERSION)-simulator
-WATCHOS_SIMULATOR_X64_SWIFTFLAGS=$(WATCHOS_SIMULATOR_COMMON_SWIFTFLAGS) -target x86_64-apple-watchos$(MIN_WATCHOS_SDK_VERSION)-simulator
-WATCHOS_SIMULATOR_X86_SWIFTFLAGS=$(WATCHOS_SIMULATOR_COMMON_SWIFTFLAGS) -target x86-apple-watchos$(MIN_WATCHOS_SDK_VERSION)-simulator
-WATCHOS_DEVICE_COMMON_SWIFTFLAGS=$(COMMON_SWIFTFLAGS) -sdk $(DEVICEWATCH_SDK)
-WATCHOS_DEVICE_ARM64_32_SWIFTFLAGS=$(WATCHOS_DEVICE_COMMON_SWIFTFLAGS) -target arm64_32-apple-watchos$(MIN_WATCHOS_SDK_VERSION)
-WATCHOS_DEVICE_ARMV7K_SWIFTFLAGS=$(WATCHOS_DEVICE_COMMON_SWIFTFLAGS) -target armv7k-apple-watchos$(MIN_WATCHOS_SDK_VERSION)
-
 MACCATALYST_COMMON_SWIFTFLAGS=$(COMMON_SWIFTFLAGS) -sdk $(XCODE_MAC_SDKROOT) -Fsystem $(XCODE_MAC_SDKROOT)/System/iOSSupport/System/Library/Frameworks
 MACCATALYST_ARM64_SWIFTFLAGS=$(MACCATALYST_COMMON_SWIFTFLAGS) -target arm64-apple-ios$(MIN_MACCATALYST_SDK_VERSION)-macabi
 MACCATALYST_X64_SWIFTFLAGS=$(MACCATALYST_COMMON_SWIFTFLAGS) -target x86_64-apple-ios$(MIN_MACCATALYST_SDK_VERSION)-macabi
@@ -659,7 +595,6 @@ CP:=$(shell df -t apfs / >/dev/null 2>&1 && echo "cp -c" || echo "cp")
 MONO_IOS_SDK_DESTDIR:=$(abspath $(TOP)/builds/downloads/mono-ios-sdk-destdir)
 
 # This variable includes all the platforms we support, even those that might be disabled in this build.
-ALL_PLATFORMS=iOS tvOS watchOS macOS
 ALL_DOTNET_PLATFORMS=iOS macOS tvOS MacCatalyst
 
 # Set this to 1 if the Microsoft.NETCore.App.Ref dependency in eng/Version.Details.xml does *not* specify a CoherentParentDependency on Microsoft.Dotnet.Sdk.Internal.
@@ -766,21 +701,11 @@ DOTNET_MACOS_ASSEMBLY_NAME=Microsoft.macOS
 
 DOTNET_PLATFORMS=
 ifdef INCLUDE_IOS
-ifdef ENABLE_DOTNET
 DOTNET_PLATFORMS+=iOS
 DOTNET_MONOVM_PLATFORMS+=iOS
 DOTNET_IOS_BITNESSES+=64
 DOTNET_NATIVEAOT_PLATFORMS+=iOS
 
-# 32-bit architectures
-ifdef IOS_SUPPORTS_32BIT_ARCHITECTURES
-DOTNET_IOS_BITNESSES+=32
-ifdef INCLUDE_DEVICE
-DOTNET_IOS_RUNTIME_IDENTIFIERS_32=ios-arm
-endif # INCLUDE_DEVICE
-DOTNET_IOS_RUNTIME_IDENTIFIERS_32+=iossimulator-x86
-endif # IOS_SUPPORTS_32BIT_ARCHITECTURES
-
 # 64-bit architectures
 ifdef INCLUDE_DEVICE
 DOTNET_IOS_RUNTIME_IDENTIFIERS_64=ios-arm64
@@ -789,11 +714,9 @@ DOTNET_IOS_RUNTIME_IDENTIFIERS_64+=iossimulator-x64 iossimulator-arm64
 
 # All of them
 DOTNET_IOS_RUNTIME_IDENTIFIERS=$(DOTNET_IOS_RUNTIME_IDENTIFIERS_32) $(DOTNET_IOS_RUNTIME_IDENTIFIERS_64)
-endif # ENABLE_DOTNET
 endif # INCLUDE_IOS
 
 ifdef INCLUDE_TVOS
-ifdef ENABLE_DOTNET
 DOTNET_PLATFORMS+=tvOS
 DOTNET_MONOVM_PLATFORMS+=tvOS
 DOTNET_TVOS_BITNESSES+=64
@@ -804,29 +727,24 @@ else
 DOTNET_TVOS_RUNTIME_IDENTIFIERS=tvossimulator-x64 tvossimulator-arm64
 endif
 DOTNET_TVOS_RUNTIME_IDENTIFIERS_64+=$(DOTNET_TVOS_RUNTIME_IDENTIFIERS)
-endif # ENABLE_DOTNET
 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
 DOTNET_MACCATALYST_RUNTIME_IDENTIFIERS_64+=$(DOTNET_MACCATALYST_RUNTIME_IDENTIFIERS)
-endif # ENABLE_DOTNET
 endif
 
 ifdef INCLUDE_MAC
-ifdef ENABLE_DOTNET
 DOTNET_PLATFORMS+=macOS
 DOTNET_CORECLR_PLATFORMS+=macOS
 DOTNET_MACOS_BITNESSES+=64
 DOTNET_NATIVEAOT_PLATFORMS+=macOS
 DOTNET_MACOS_RUNTIME_IDENTIFIERS=osx-x64 osx-arm64
 DOTNET_MACOS_RUNTIME_IDENTIFIERS_64=$(DOTNET_MACOS_RUNTIME_IDENTIFIERS)
-endif # ENABLE_DOTNET
 endif
 
 ifdef INCLUDE_IOS

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
 #
@@ -67,7 +67,6 @@ MAC_PACKAGE_VERSION=9.99.0.$(MAC_COMMIT_DISTANCE)
 
 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
 

Makefile

@@ -3,9 +3,7 @@ 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
@@ -189,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"; \