Merge remote-tracking branch 'origin/net9.0' into merge-net9.0-rc2

dotnet · Sep 27, 2024 · f7469a8 · f7469a8
2 parents 8652f32 + 60a7ae1
commit f7469a8
Show file tree

Hide file tree

Showing 69 changed files with 560 additions and 3,658 deletions.
diff --git a/Make.config b/Make.config
@@ -650,21 +650,13 @@ XCODE_IOS_ARCHIVE_VERSION=xcode-12D4e
 XCODE_MACOS_ARCHIVE_VERSION=xcode-12D4e
 MONO_IOS_FILENAME:=ios-release-Darwin-$(MONO_HASH).7z
 MONO_IOS_URL:=https://download.mono-project.com/mono-sdks/$(XCODE_IOS_ARCHIVE_VERSION)/$(MONO_IOS_FILENAME)
-MONO_MAC_FILENAME:=mac-release-Darwin-$(MONO_HASH).7z
-MONO_MAC_URL:=https://download.mono-project.com/mono-sdks/$(XCODE_MACOS_ARCHIVE_VERSION)/$(MONO_MAC_FILENAME)
-MONO_MACCATALYST_FILENAME:=maccat-release-Darwin-$(MONO_HASH).7z
-MONO_MACCATALYST_URL:=https://download.mono-project.com/mono-sdks/$(XCODE_MACOS_ARCHIVE_VERSION)/$(MONO_MACCATALYST_FILENAME)
 
 # Setup various variables depending on whether mono is downloaded or built from source
 ifeq ($(MONO_BUILD_FROM_SOURCE),)
 MONO_IOS_SDK_DESTDIR:=$(abspath $(TOP)/builds/downloads/$(basename $(MONO_IOS_FILENAME)))
-MONO_MAC_SDK_DESTDIR:=$(abspath $(TOP)/builds/downloads/$(basename $(MONO_MAC_FILENAME)))
-MONO_MACCATALYST_SDK_DESTDIR:=$(abspath $(TOP)/builds/downloads/$(basename $(MONO_MACCATALYST_FILENAME)))
 MONO_BUILD_MODE=download-mono
 else
 MONO_IOS_SDK_DESTDIR:=$(abspath $(MONO_PATH)/sdks/out)
-MONO_MAC_SDK_DESTDIR:=$(abspath $(MONO_PATH)/sdks/out)
-MONO_MACCATALYST_SDK_DESTDIR:=$(abspath $(MONO_PATH)/sdks/out)
 MONO_BUILD_MODE=compile-mono
 endif