Merge branch 'main' into dev/rolf/tests-pack-tests-remotely

.editorconfig

@@ -1,3 +1,8 @@
+# EditorConfig is awesome: https://editorconfig.org
+
+# top-most EditorConfig file
+root = true
+
 [*.{props,targets}]
 indent_style = tab
 indent_size = 4

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

@@ -4,7 +4,7 @@ body:
   - type: markdown
     attributes:
       value: |
-        Thanks for taking the time to fill out this report! Please make sure to add as much detail as you can, preferably with a reproduction if possible. This will help us diagnose the issue faster and thus resolve it quicker. For more information on how to write a good isse see https://github.com/xamarin/xamarin-macios/wiki/Submitting-Bugs-&-Suggestions.
+        Thanks for taking the time to fill out this report! Please make sure to add as much detail as you can, preferably with a reproduction if possible. This will help us diagnose the issue faster and thus resolve it quicker. For more information on how to write a good issue see https://github.com/dotnet/macios/wiki/Submitting-Bugs-&-Suggestions.
   - type: dropdown
     id: platform
     attributes:
@@ -65,7 +65,7 @@ body:
     id: logs
     attributes:
       label: Build logs
-      description: Please get an [MSBuild binlogs](https://github.com/xamarin/xamarin-macios/wiki/Diagnosis#build-logs) and attach it here (zipped, since GitHub doesn't allow attachment of .binlog files)
+      description: Please get an [MSBuild binlogs](https://github.com/dotnet/macios/wiki/Diagnosis#build-logs) and attach it here (zipped, since GitHub doesn't allow attachment of .binlog files)
   - type: markdown
     attributes:
       value: |

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

@@ -4,7 +4,7 @@ body:
   - type: markdown
     attributes:
       value: |
-        Thanks for taking the time to fill out this report! Please make sure to add as much detail as you can, preferably with a reproduction if possible. This will help us diagnose the issue faster and thus resolve it quicker. For more information on how to write a good isse see https://github.com/xamarin/xamarin-macios/wiki/Submitting-Bugs-&-Suggestions.
+        Thanks for taking the time to fill out this report! Please make sure to add as much detail as you can, preferably with a reproduction if possible. This will help us diagnose the issue faster and thus resolve it quicker. For more information on how to write a good issue see https://github.com/dotnet/macios/wiki/Submitting-Bugs-&-Suggestions.
   - type: dropdown
     id: platform
     attributes:
@@ -65,7 +65,7 @@ body:
     id: logs
     attributes:
       label: Relevant logs
-      description: Please copy and paste any (short!) relevant logs. Longer logs can be attached as .txt or .zip files. This is likely either the Application Output from the IDE, a [crash report](https://github.com/xamarin/xamarin-macios/wiki/Diagnosis#crash-reports) or the [device log](https://support.apple.com/en-in/guide/console/cnsl1012/mac) (or all of these).
+      description: Please copy and paste any (short!) relevant logs. Longer logs can be attached as .txt or .zip files. This is likely either the Application Output from the IDE, a [crash report](https://github.com/dotnet/macios/wiki/Diagnosis#crash-reports) or the [device log](https://support.apple.com/en-in/guide/console/cnsl1012/mac) (or all of these).
   - type: markdown
     attributes:
       value: |

.github/ISSUE_TEMPLATE/03-api.yml

@@ -9,7 +9,7 @@ body:
 
         Issues with missing Apple APIs or the API not working as documented are tracked here.
 
-        Please make sure to add as much detail as you can, preferably with a reproduction if possible. This will help us diagnose the issue faster and thus resolve it quicker. For more information on how to write a good isse see https://github.com/xamarin/xamarin-macios/wiki/Submitting-Bugs-&-Suggestions.
+        Please make sure to add as much detail as you can, preferably with a reproduction if possible. This will help us diagnose the issue faster and thus resolve it quicker. For more information on how to write a good issue see https://github.com/dotnet/macios/wiki/Submitting-Bugs-&-Suggestions.
 
         If you are not sure how to use an API or how to accomplish your task, better support is available from the community of application writers, available in several forms:
 

.github/ISSUE_TEMPLATE/04-bindings.yml

@@ -5,7 +5,7 @@ body:
   - type: markdown
     attributes:
       value: |
-        Thanks for taking the time to fill out this report! Please make sure to add as much detail as you can, preferably with a reproduction if possible. This will help us diagnose the issue faster and thus resolve it quicker. For more information on how to write a good isse see https://github.com/xamarin/xamarin-macios/wiki/Submitting-Bugs-&-Suggestions.
+        Thanks for taking the time to fill out this report! Please make sure to add as much detail as you can, preferably with a reproduction if possible. This will help us diagnose the issue faster and thus resolve it quicker. For more information on how to write a good issue see https://github.com/dotnet/macios/wiki/Submitting-Bugs-&-Suggestions.
   - type: dropdown
     id: platform
     attributes:
@@ -66,7 +66,7 @@ body:
     id: logs
     attributes:
       label: Build logs
-      description: Please get an [MSBuild binlogs](https://github.com/xamarin/xamarin-macios/wiki/Diagnosis#build-logs) and attach it here (zipped, since GitHub doesn't allow attachment of .binlog files)
+      description: Please get an [MSBuild binlogs](https://github.com/dotnet/macios/wiki/Diagnosis#build-logs) and attach it here (zipped, since GitHub doesn't allow attachment of .binlog files)
   - type: markdown
     attributes:
       value: |

.github/ISSUE_TEMPLATE/05-other.yml

@@ -4,7 +4,7 @@ body:
   - type: markdown
     attributes:
       value: |
-        Thanks for taking the time to fill out this report! Please make sure to add as much detail as you can, preferably with a reproduction if possible. This will help us diagnose the issue faster and thus resolve it quicker. For more information on how to write a good isse see https://github.com/xamarin/xamarin-macios/wiki/Submitting-Bugs-&-Suggestions.
+        Thanks for taking the time to fill out this report! Please make sure to add as much detail as you can, preferably with a reproduction if possible. This will help us diagnose the issue faster and thus resolve it quicker. For more information on how to write a good isse see https://github.com/dotnet/macios/wiki/Submitting-Bugs-&-Suggestions.
   - type: dropdown
     id: platform
     attributes:
@@ -65,7 +65,7 @@ body:
     id: logs
     attributes:
       label: Relevant log output
-      description: Please copy and paste any (short!) relevant log output. Longer logs can be attached as .txt or .zip files. For build logs please provide an [MSBuild binlog](https://github.com/xamarin/xamarin-macios/wiki/Diagnosis#build-logs).
+      description: Please copy and paste any (short!) relevant log output. Longer logs can be attached as .txt or .zip files. For build logs please provide an [MSBuild binlog](https://github.com/dotnet/macios/wiki/Diagnosis#build-logs).
   - type: markdown
     attributes:
       value: |

.github/policies/resourceManagement.yml

@@ -143,7 +143,7 @@ configuration:
         then:
         - addReply:
             reply: >-
-              Hi @${issueAuthor}. We have added the "need-repro" label to this issue, which indicates that we require steps and sample code to reproduce the issue before we can take further action. Please try to create a minimal sample project/solution or code samples which reproduce the issue, ideally as a GitHub repo that we can clone. See more details about creating repros here: https://github.com/xamarin/xamarin-macios/blob/main/docs/bug-repro.md
+              Hi @${issueAuthor}. We have added the "need-repro" label to this issue, which indicates that we require steps and sample code to reproduce the issue before we can take further action. Please try to create a minimal sample project/solution or code samples which reproduce the issue, ideally as a GitHub repo that we can clone. See more details about creating repros here: https://github.com/dotnet/macios/blob/main/docs/bug-repro.md
 
               This issue will be closed automatically in 7 days if we do not hear back from you by then - please feel free to re-open it if you come back to this issue after that time.
       - if:

.gitmodules

@@ -1,12 +1,5 @@
-[submodule "external/Touch.Unit"]
-    path = external/Touch.Unit
-    url = ../../xamarin/Touch.Unit.git
-    branch = main
 [submodule "external/Xamarin.MacDev"]
     path = external/Xamarin.MacDev
-    url = ../../xamarin/Xamarin.MacDev
+    url = ../../dotnet/macios-devtools 
     branch = main
-[submodule "external/MonoTouch.Dialog"]
-    path = external/MonoTouch.Dialog
-    url = ../../xamarin/MonoTouch.Dialog
-    branch = dotnet
+

CODEOWNERS

@@ -95,7 +95,6 @@
 /src/HomeKit
 /src/homekit.cs
 /src/iad.cs
-/src/iAd.framework
 /src/identitylookup.cs @dalexsoto
 /src/identitylookupui.cs @dalexsoto
 /src/ituneslibrary.cs @mandel-macaque
@@ -184,8 +183,6 @@
 /src/vision.cs @dalexsoto
 /src/WatchConnectivity @rolfbjarne
 /src/watchconnectivity.cs @rolfbjarne
-/src/WatchKit @rolfbjarne
-/src/watchkit.cs @rolfbjarne
 /src/WebKit
 /src/webkit.cs
 

Directory.Build.props

@@ -8,6 +8,11 @@
 		<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
 		<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
 		<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
+		<NUnitXmlTestLoggerPackageVersion>3.1.15</NUnitXmlTestLoggerPackageVersion>
+		<!-- Fix transient dependency issue found by component governance 4.7.0 -> 4.7.2 brought by Microsoft.Build package -->
+		<SystemDrawingCommonPackageVersion>4.7.2</SystemDrawingCommonPackageVersion>
+		<!-- Fix transient dependency issue found by component governance 4.7.0 -> 4.7.1 brought by Microsoft.Build.Tasks.Core package -->
+		<SystemSecurityCryptographyXmlPackageVersion>4.7.1</SystemSecurityCryptographyXmlPackageVersion>
 	</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=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
+STABLE_NUGET_VERSION_iOS=net9.0_18.2/18.2.9170
+STABLE_NUGET_VERSION_tvOS=net9.0_18.2/18.2.9170
+STABLE_NUGET_VERSION_MacCatalyst=net9.0_18.2/18.2.9170
+STABLE_NUGET_VERSION_macOS=net9.0_15.2/15.2.9170
 
 PACKAGE_HEAD_REV=$(shell git rev-parse HEAD)
 
@@ -169,15 +169,6 @@ endif
 
 NUGET_BUILD_METADATA=
 
-IOS_PRODUCT=Xamarin.iOS
-IOS_PACKAGE_NAME=Xamarin.iOS
-IOS_PACKAGE_NAME_LOWER=$(shell echo $(IOS_PACKAGE_NAME) | tr "[:upper:]" "[:lower:]")
-IOS_PACKAGE_VERSION_MAJOR=$(word 1, $(subst ., ,$(IOS_PACKAGE_VERSION)))
-IOS_PACKAGE_VERSION_MINOR=$(word 2, $(subst ., ,$(IOS_PACKAGE_VERSION)))
-IOS_PACKAGE_VERSION_REV:=$(word 3, $(subst ., ,$(IOS_PACKAGE_VERSION)))
-IOS_PACKAGE_VERSION_BUILD=$(IOS_COMMIT_DISTANCE)
-IOS_PACKAGE_UPDATE_ID=$(shell printf "2%02d%02d%02d%03d" $(IOS_PACKAGE_VERSION_MAJOR) $(IOS_PACKAGE_VERSION_MINOR) $(IOS_PACKAGE_VERSION_REV) $(IOS_PACKAGE_VERSION_BUILD))
-
 IOS_NUGET=Microsoft.iOS
 IOS_NUGET_VERSION=$(IOS_NUGET_OS_VERSION).$(IOS_NUGET_COMMIT_DISTANCE)
 IOS_NUGET_VERSION_MAJOR=$(word 1, $(subst ., ,$(IOS_NUGET_VERSION)))
@@ -312,31 +303,17 @@ RANLIB=$(XCODE_DEVELOPER_ROOT)/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranli
 # paths to the modules we depend on, as variables, so people can put
 # things in other places if they absolutely must.
 MONO_PATH=$(TOP)/external/mono
-TOUCH_UNIT_PATH=$(TOP)/external/Touch.Unit
 XAMARIN_MACDEV_PATH=$(TOP)/external/Xamarin.MacDev
 MONOTOUCH_DIALOG_PATH=$(TOP)/external/MonoTouch.Dialog
 API_TOOLS_PATH=$(TOP)/external/api-tools
-MACCORE_PATH=$(TOP)/../maccore
-ADR_PATH=$(TOP)/../macios-adr
+ADR_PATH:=$(abspath $(TOP)/../macios-adr)
 
 MONO_PREFIX ?= /Library/Frameworks/Mono.framework/Versions/Current
 SYSTEM_MONO=$(MONO_PREFIX)/bin/mono
 SYSTEM_MSBUILD=unset MSBuildExtensionsPath && $(MONO_PREFIX)/bin/msbuild /p:Features=strict /m
 
 PKG_CONFIG=$(MONO_PREFIX)/bin/pkg-config
 
-MAC_PRODUCT=Xamarin.Mac
-MAC_PACKAGE_NAME=xamarin.mac
-MAC_PACKAGE_NAME_LOWER=$(shell echo $(MAC_PACKAGE_NAME) | tr "[:upper:]" "[:lower:]")
-
-MAC_PACKAGE_VERSION_MAJOR=$(word 1, $(subst ., ,$(MAC_PACKAGE_VERSION)))
-MAC_PACKAGE_VERSION_MINOR=$(word 2, $(subst ., ,$(MAC_PACKAGE_VERSION)))
-MAC_PACKAGE_VERSION_REV=$(word 3, $(subst ., ,$(MAC_PACKAGE_VERSION)))
-MAC_PACKAGE_VERSION_BUILD=$(word 4, $(subst ., ,$(MAC_PACKAGE_VERSION)))
-MAC_PACKAGE_VERSION_MAJOR_MINOR=$(MAC_PACKAGE_VERSION_MAJOR).$(MAC_PACKAGE_VERSION_MINOR)
-MAC_PACKAGE_UPDATE_ID=$(shell echo $(subst ., ,$(MAC_PACKAGE_VERSION).$(MAC_PACKAGE_VERSION_BUILD)) | awk '{printf "2%02d%02d%02d%03d",$$1,$$2,$$3,$$4}')
-MAC_PACKAGE_TITLE=Xamarin $(MAC_PACKAGE_NAME) $(MAC_PACKAGE_VERSION)
-
 MACOS_NUGET=Microsoft.macOS
 MACOS_NUGET_VERSION=$(MACOS_NUGET_OS_VERSION).$(MACOS_NUGET_COMMIT_DISTANCE)
 MACOS_NUGET_VERSION_MAJOR=$(word 1, $(subst ., ,$(MACOS_NUGET_VERSION)))
@@ -345,21 +322,12 @@ MACOS_NUGET_VERSION_PATCH=$(word 3, $(subst ., ,$(MACOS_NUGET_VERSION)))
 MACOS_NUGET_VERSION_NO_METADATA=$(MACOS_NUGET_VERSION)$(NUGET_PRERELEASE_IDENTIFIER)
 MACOS_NUGET_VERSION_FULL=$(MACOS_NUGET_VERSION_NO_METADATA)$(NUGET_BUILD_METADATA)
 
-MAC_PACKAGE_FILENAME=$(MAC_PACKAGE_NAME_LOWER)-$(MAC_PACKAGE_VERSION).pkg
-MAC_PACKAGE_DMG_FILENAME=$(MAC_PACKAGE_NAME_LOWER)-$(MAC_PACKAGE_VERSION).dmg
-MAC_PACKAGE_DMG_DIRNAME="$(MAC_PACKAGE_TITLE)"
-MAC_PACKAGE_UTI=com.$(MAC_PACKAGE_NAME_LOWER).pkg
-
 TT = $(DOTNET) tool restore && $(DOTNET) t4
 
 PRODUCT_KEY_PATH?=$(TOP)/product.snk
 
 include $(TOP)/mk/quiet.mk
 
-ifdef ENABLE_XAMARIN
--include $(MACCORE_PATH)/Make.config
-endif
-
 JENKINS_RESULTS_DIRECTORY ?= $(abspath $(TOP)/jenkins-results)
 
 # Clone files instead of copying them on APFS file systems. Much faster.
@@ -433,6 +401,7 @@ DOTNET_BCL_DIR:=$(abspath $(TOP)/packages/microsoft.netcore.app.ref/$(DOTNET_BCL
 ifneq ($(DOTNET_BCL_DIR),$(shell ls -1d $(DOTNET_BCL_DIR) 2>/dev/null))
 DOTNET_BCL_DIR:=$(abspath $(TOP)/packages/microsoft.netcore.app.ref/$(DOTNET_BCL_VERSION)/ref/net8.0)
 endif
+DOTNET_ANALYZERS_DIR?=$(DOTNET_DIR)/sdk/$(DOTNET_VERSION_BAND)/Sdks/Microsoft.NET.Sdk/analyzers
 
 # The sdk version band has the last two digits set to 0: https://github.com/dotnet/sdk/blob/22c4860dcb2cf6b123dd641cc4a87a50380759d5/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.cs#L52-L53
 DOTNET_MANIFEST_VERSION_BAND=$(shell echo $(DOTNET_VERSION_BAND) | sed 's/..$$/00/')
@@ -600,28 +569,28 @@ DOTNET_maccatalyst_PLATFORM=maccatalyst
 DOTNET_macos_PLATFORM=macos
 
 # XCFRAMEWORK -> clang argument for min OS version
-CLANG_iossimulator-x64_VERSION_MIN=-mios-simulator-version-min=$(MIN_IOS_SDK_VERSION)
-CLANG_iossimulator-arm64_VERSION_MIN=-mios-simulator-version-min=$(MIN_IOS_SDK_VERSION)
-CLANG_ios-arm64_VERSION_MIN=-miphoneos-version-min=$(MIN_IOS_SDK_VERSION)
-CLANG_tvossimulator-x64_VERSION_MIN=-mtvos-simulator-version-min=$(MIN_TVOS_SDK_VERSION)
-CLANG_tvossimulator-arm64_VERSION_MIN=-mtvos-simulator-version-min=$(MIN_TVOS_SDK_VERSION)
-CLANG_tvos-arm64_VERSION_MIN=-mtvos-version-min=$(MIN_TVOS_SDK_VERSION)
-CLANG_maccatalyst-x64_VERSION_MIN=-target x86_64-apple-ios$(MIN_MACCATALYST_SDK_VERSION)-macabi -arch x86_64
-CLANG_maccatalyst-arm64_VERSION_MIN=-target arm64-apple-ios$(MIN_MACCATALYST_SDK_VERSION)-macabi -arch arm64
-CLANG_osx-x64_VERSION_MIN=-mmacosx-version-min=$(MIN_MACOS_SDK_VERSION)
-CLANG_osx-arm64_VERSION_MIN=-mmacosx-version-min=$(MIN_MACOS_SDK_VERSION)
+CLANG_iossimulator-x64_VERSION_MIN=-mios-simulator-version-min=$(DOTNET_MIN_IOS_SDK_VERSION)
+CLANG_iossimulator-arm64_VERSION_MIN=-mios-simulator-version-min=$(DOTNET_MIN_IOS_SDK_VERSION)
+CLANG_ios-arm64_VERSION_MIN=-miphoneos-version-min=$(DOTNET_MIN_IOS_SDK_VERSION)
+CLANG_tvossimulator-x64_VERSION_MIN=-mtvos-simulator-version-min=$(DOTNET_MIN_TVOS_SDK_VERSION)
+CLANG_tvossimulator-arm64_VERSION_MIN=-mtvos-simulator-version-min=$(DOTNET_MIN_TVOS_SDK_VERSION)
+CLANG_tvos-arm64_VERSION_MIN=-mtvos-version-min=$(DOTNET_MIN_TVOS_SDK_VERSION)
+CLANG_maccatalyst-x64_VERSION_MIN=-target x86_64-apple-ios$(DOTNET_MIN_MACCATALYST_SDK_VERSION)-macabi -arch x86_64
+CLANG_maccatalyst-arm64_VERSION_MIN=-target arm64-apple-ios$(DOTNET_MIN_MACCATALYST_SDK_VERSION)-macabi -arch arm64
+CLANG_osx-x64_VERSION_MIN=-mmacosx-version-min=$(DOTNET_MIN_MACOS_SDK_VERSION)
+CLANG_osx-arm64_VERSION_MIN=-mmacosx-version-min=$(DOTNET_MIN_MACOS_SDK_VERSION)
 
 # RUNTIMEIDENTIFIER -> swiftc argument(s) for min OS version
-SWIFTC_iossimulator-arm64_VERSION_MIN=-target arm64-apple-ios$(MIN_IOS_SDK_VERSION)-simulator
-SWIFTC_iossimulator-x64_VERSION_MIN=-target x86_64-apple-ios$(MIN_IOS_SDK_VERSION)-simulator
-SWIFTC_ios-arm64_VERSION_MIN=-target arm64-apple-ios$(MIN_IOS_SDK_VERSION)
-SWIFTC_tvossimulator-x64_VERSION_MIN=-target x86_64-apple-tvos$(MIN_TVOS_SDK_VERSION)-simulator
-SWIFTC_tvossimulator-arm64_VERSION_MIN=-target arm64-apple-tvos$(MIN_TVOS_SDK_VERSION)-simulator
-SWIFTC_tvos-arm64_VERSION_MIN=-target arm64-apple-tvos$(MIN_TVOS_SDK_VERSION)
-SWIFTC_maccatalyst-x64_VERSION_MIN=-target x86_64-apple-ios$(MIN_MACCATALYST_SDK_VERSION)-macabi
-SWIFTC_maccatalyst-arm64_VERSION_MIN=-target arm64-apple-ios$(MIN_MACCATALYST_SDK_VERSION)-macabi
-SWIFTC_osx-x64_VERSION_MIN=-target x86_64-apple-macos$(MIN_MACOS_SDK_VERSION)
-SWIFTC_osx-arm64_VERSION_MIN=-target arm64-apple-macos$(MIN_MACOS_SDK_VERSION)
+SWIFTC_iossimulator-arm64_VERSION_MIN=-target arm64-apple-ios$(DOTNET_MIN_IOS_SDK_VERSION)-simulator
+SWIFTC_iossimulator-x64_VERSION_MIN=-target x86_64-apple-ios$(DOTNET_MIN_IOS_SDK_VERSION)-simulator
+SWIFTC_ios-arm64_VERSION_MIN=-target arm64-apple-ios$(DOTNET_MIN_IOS_SDK_VERSION)
+SWIFTC_tvossimulator-x64_VERSION_MIN=-target x86_64-apple-tvos$(DOTNET_MIN_TVOS_SDK_VERSION)-simulator
+SWIFTC_tvossimulator-arm64_VERSION_MIN=-target arm64-apple-tvos$(DOTNET_MIN_TVOS_SDK_VERSION)-simulator
+SWIFTC_tvos-arm64_VERSION_MIN=-target arm64-apple-tvos$(DOTNET_MIN_TVOS_SDK_VERSION)
+SWIFTC_maccatalyst-x64_VERSION_MIN=-target x86_64-apple-ios$(DOTNET_MIN_MACCATALYST_SDK_VERSION)-macabi
+SWIFTC_maccatalyst-arm64_VERSION_MIN=-target arm64-apple-ios$(DOTNET_MIN_MACCATALYST_SDK_VERSION)-macabi
+SWIFTC_osx-x64_VERSION_MIN=-target x86_64-apple-macos$(DOTNET_MIN_MACOS_SDK_VERSION)
+SWIFTC_osx-arm64_VERSION_MIN=-target arm64-apple-macos$(DOTNET_MIN_MACOS_SDK_VERSION)
 
 
 # Misc other computed variables