dotnet · directhex · Feb 8, 2021 · Feb 1, 2021 · Feb 1, 2021 · Feb 2, 2021
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -17,7 +17,7 @@
  <TargetOS Condition="'$(TargetOS)' == '' and $([MSBuild]::IsOSPlatform('SOLARIS'))">Solaris</TargetOS>
  <TargetOS Condition="'$(TargetOS)' == '' and $([MSBuild]::IsOSUnixLike())">Linux</TargetOS>
  <TargetOS Condition="'$(TargetOS)' == '' and $([MSBuild]::IsOSPlatform('WINDOWS'))">windows</TargetOS>
- <TargetsMobile Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'Android' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'Browser'">true</TargetsMobile>
+ <TargetsMobile Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'Android' or '$(TargetOS)' == 'MacCatalyst' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'Browser'">true</TargetsMobile>
  </PropertyGroup>
 
  <!-- Platform property is required by RepoLayout.props in Arcade SDK. -->
@@ -117,6 +117,7 @@
  <_portableOS Condition="'$(_runtimeOSFamily)' == 'illumos'">illumos</_portableOS>
  <_portableOS Condition="'$(_runtimeOSFamily)' == 'Solaris'">solaris</_portableOS>
  <_portableOS Condition="'$(_runtimeOS)' == 'Browser'">browser</_portableOS>
+ <_portableOS Condition="'$(_runtimeOS)' == 'maccatalyst'">maccatalyst</_portableOS>
  <_portableOS Condition="'$(_runtimeOS)' == 'ios'">ios</_portableOS>
  <_portableOS Condition="'$(_runtimeOS)' == 'tvos'">tvos</_portableOS>
  <_portableOS Condition="'$(_runtimeOS)' == 'android'">android</_portableOS>
@@ -145,7 +146,7 @@
  <_toolRuntimeRID Condition="'$(_runtimeOS)' == 'android' and $([MSBuild]::IsOSPlatform('OSX'))">osx-x64</_toolRuntimeRID>
 
  <!-- There are no iOS or tvOS tools and it can be built on OSX only, so use that -->
- <_toolRuntimeRID Condition="'$(_runtimeOS)' == 'ios' or '$(_runtimeOS)' == 'tvos'">osx-x64</_toolRuntimeRID>
+ <_toolRuntimeRID Condition="'$(_runtimeOS)' == 'maccatalyst' or '$(_runtimeOS)' == 'ios' or '$(_runtimeOS)' == 'tvos'">osx-x64</_toolRuntimeRID>
 
  <MicrosoftNetCoreIlasmPackageRuntimeId>$(_toolRuntimeRID)</MicrosoftNetCoreIlasmPackageRuntimeId>
 
@@ -160,6 +161,7 @@
  <_outputRID Condition="'$(TargetOS)' == 'NetBSD'">netbsd-$(TargetArchitecture)</_outputRID>
  <_outputRID Condition="'$(TargetOS)' == 'illumos'">illumos-$(TargetArchitecture)</_outputRID>
  <_outputRID Condition="'$(TargetOS)' == 'Solaris'">solaris-$(TargetArchitecture)</_outputRID>
+ <_outputRID Condition="'$(TargetOS)' == 'MacCatalyst'">maccatalyst-$(TargetArchitecture)</_outputRID>
  <_outputRID Condition="'$(TargetOS)' == 'iOS'">ios-$(TargetArchitecture)</_outputRID>
  <_outputRID Condition="'$(TargetOS)' == 'tvOS'">tvos-$(TargetArchitecture)</_outputRID>
  <_outputRID Condition="'$(TargetOS)' == 'Android'">android-$(TargetArchitecture)</_outputRID>
@@ -176,14 +178,15 @@
  <TargetsLinux Condition="'$(TargetOS)' == 'Linux' or '$(TargetOS)' == 'Android'">true</TargetsLinux>
  <TargetsNetBSD Condition="'$(TargetOS)' == 'NetBSD'">true</TargetsNetBSD>
  <TargetsOSX Condition="'$(TargetOS)' == 'OSX'">true</TargetsOSX>
+ <TargetsMacCatalyst Condition="'$(TargetOS)' == 'MacCatalyst'">true</TargetsMacCatalyst>
  <TargetsiOS Condition="'$(TargetOS)' == 'iOS'">true</TargetsiOS>
  <TargetstvOS Condition="'$(TargetOS)' == 'tvOS'">true</TargetstvOS>
  <TargetsiOSSimulator Condition="'$(TargetsiOS)' == 'true' and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'x86')">true</TargetsiOSSimulator>
  <TargetstvOSSimulator Condition="'$(TargetstvOS)' == 'true' and '$(TargetArchitecture)' == 'x64'">true</TargetstvOSSimulator>
  <TargetsAndroid Condition="'$(TargetOS)' == 'Android'">true</TargetsAndroid>
  <TargetsBrowser Condition="'$(TargetOS)' == 'Browser'">true</TargetsBrowser>
  <TargetsWindows Condition="'$(TargetOS)' == 'windows'">true</TargetsWindows>
- <TargetsUnix Condition="'$(TargetsFreeBSD)' == 'true' or '$(Targetsillumos)' == 'true' or '$(TargetsSolaris)' == 'true' or '$(TargetsLinux)' == 'true' or '$(TargetsNetBSD)' == 'true' or '$(TargetsOSX)' == 'true' or '$(TargetstvOS)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetsAndroid)' == 'true'">true</TargetsUnix>
+ <TargetsUnix Condition="'$(TargetsFreeBSD)' == 'true' or '$(Targetsillumos)' == 'true' or '$(TargetsSolaris)' == 'true' or '$(TargetsLinux)' == 'true' or '$(TargetsNetBSD)' == 'true' or '$(TargetsOSX)' == 'true' or '$(TargetsMacCatalyst)' == 'true' or '$(TargetstvOS)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetsAndroid)' == 'true'">true</TargetsUnix>
  </PropertyGroup>
 
  <!--Feature switches -->

diff --git a/eng/build.sh b/eng/build.sh
@@ -28,7 +28,7 @@ usage()
  echo " --help (-h) Print help and exit."
  echo " --librariesConfiguration (-lc) Libraries build configuration: Debug or Release."
  echo " [Default: Debug]"
- echo " --os Target operating system: windows, Linux, FreeBSD, OSX, tvOS, iOS, Android,"
+ echo " --os Target operating system: windows, Linux, FreeBSD, OSX, MacCatalyst, tvOS, iOS, Android,"
  echo " Browser, NetBSD, illumos or Solaris."
  echo " [Default: Your machine's OS.]"
  echo " --projects <value> Project or solution file(s) to build."
@@ -262,6 +262,8 @@ while [[ $# > 0 ]]; do
  os="FreeBSD" ;;
  osx)
  os="OSX" ;;
+ maccatalyst)
+ os="MacCatalyst" ;;
  tvos)
  os="tvOS" ;;
  ios)
@@ -276,7 +278,7 @@ while [[ $# > 0 ]]; do
  os="Solaris" ;;
  *)
  echo "Unsupported target OS '$2'."
- echo "The allowed values are windows, Linux, FreeBSD, OSX, tvOS, iOS, Android, Browser, illumos and Solaris."
+ echo "The allowed values are windows, Linux, FreeBSD, OSX, MacCatalyst, tvOS, iOS, Android, Browser, illumos and Solaris."
  exit 1
  ;;
  esac

diff --git a/eng/native/build-commons.sh b/eng/native/build-commons.sh
@@ -78,7 +78,7 @@ build_native()
  # All set to commence the build
  echo "Commencing build of \"$message\" for $__TargetOS.$__BuildArch.$__BuildType in $intermediatesDir"
 
- if [[ "$targetOS" == OSX ]]; then
+ if [[ "$targetOS" == OSX || "$targetOS" == MacCatalyst ]]; then
  if [[ "$platformArch" == x64 ]]; then
  cmakeArgs="-DCMAKE_OSX_ARCHITECTURES=\"x86_64\" $cmakeArgs"
  elif [[ "$platformArch" == arm64 ]]; then
@@ -89,6 +89,10 @@ build_native()
  fi
  fi
 
+ if [[ "$targetOS" == MacCatalyst ]]; then
+ cmakeArgs="-DCLR_CMAKE_TARGET_MACCATALYST=1 $cmakeArgs"
+ fi
+
  if [[ "$__UseNinja" == 1 ]]; then
  generator="ninja"
  buildTool="$(command -v ninja || command -v ninja-build)"

diff --git a/eng/native/configurecompiler.cmake b/eng/native/configurecompiler.cmake
@@ -390,19 +390,39 @@ if (CLR_CMAKE_HOST_UNIX)
 
  # Specify the minimum supported version of macOS
  if(CLR_CMAKE_HOST_OSX)
- if(CLR_CMAKE_HOST_ARCH_ARM64)
- # 'pthread_jit_write_protect_np' is only available on macOS 11.0 or newer
- set(MACOS_VERSION_MIN_FLAGS -mmacosx-version-min=11.0)
- add_compile_options(-arch arm64)
- elseif(CLR_CMAKE_HOST_ARCH_AMD64)
- set(MACOS_VERSION_MIN_FLAGS -mmacosx-version-min=10.13)
- add_compile_options(-arch x86_64)
+ # Mac Catalyst needs a special CFLAG, exclusive with mmacosx-version-min
+ if(CLR_CMAKE_TARGET_MACCATALYST)
+ # Somewhere between CMake 3.17 and 3.19.4, it became impossible to not pass
+ # a value for mmacosx-version-min (blank CMAKE_OSX_DEPLOYMENT_TARGET gets
+ # replaced with a default value, and always gets expanded to an OS version.
+ # We need to disable the warning that -tagret replaces -mmacosx-version-min
+ add_compile_options(-Wno-overriding-t-option)
+ add_link_options(-Wno-overriding-t-option)
+ if(CLR_CMAKE_HOST_ARCH_ARM64)
+ add_compile_options(-target arm64-apple-ios14.2-macabi)
+ add_link_options(-target arm64-apple-ios14.2-macabi)
+ elseif(CLR_CMAKE_HOST_ARCH_AMD64)
+ add_compile_options(-target x86_64-apple-ios13.5-macabi)
+ add_link_options(-target x86_64-apple-ios13.5-macabi)
+ else()
+ clr_unknown_arch()
+ endif()
  else()
- clr_unknown_arch()
- endif()
- add_compile_options(${MACOS_VERSION_MIN_FLAGS})
- add_linker_flag(${MACOS_VERSION_MIN_FLAGS})
+ if(CLR_CMAKE_HOST_ARCH_ARM64)
+ # 'pthread_jit_write_protect_np' is only available on macOS 11.0 or newer
+ set(MACOS_VERSION_MIN_FLAGS -mmacosx-version-min=11.0)
+ add_compile_options(-arch arm64)
+ elseif(CLR_CMAKE_HOST_ARCH_AMD64)
+ set(MACOS_VERSION_MIN_FLAGS -mmacosx-version-min=10.13)
+ add_compile_options(-arch x86_64)
+ else()
+ clr_unknown_arch()
+ endif()
+ add_compile_options(${MACOS_VERSION_MIN_FLAGS})
+ add_linker_flag(${MACOS_VERSION_MIN_FLAGS})
+ endif(CLR_CMAKE_TARGET_MACCATALYST)
  endif(CLR_CMAKE_HOST_OSX)
+
 endif(CLR_CMAKE_HOST_UNIX)
 
 if(CLR_CMAKE_TARGET_UNIX)

diff --git a/eng/native/configureplatform.cmake b/eng/native/configureplatform.cmake
@@ -305,6 +305,11 @@ if(CLR_CMAKE_TARGET_OS STREQUAL iOS)
  set(CLR_CMAKE_TARGET_IOS 1)
 endif(CLR_CMAKE_TARGET_OS STREQUAL iOS)
 
+if(CLR_CMAKE_TARGET_OS STREQUAL MacCatalyst)
+ set(CLR_CMAKE_TARGET_UNIX 1)
+ set(CLR_CMAKE_TARGET_MACCATALYST 1)
+endif(CLR_CMAKE_TARGET_OS STREQUAL MacCatalyst)
+
 if(CLR_CMAKE_TARGET_OS STREQUAL tvOS)
  set(CLR_CMAKE_TARGET_UNIX 1)
  set(CLR_CMAKE_TARGET_TVOS 1)

diff --git a/eng/native/configuretools.cmake b/eng/native/configuretools.cmake
@@ -47,7 +47,7 @@ if(NOT WIN32 AND NOT CLR_CMAKE_TARGET_BROWSER)
  locate_toolchain_exec(link CMAKE_LINKER)
  endif()
 
- if(NOT CLR_CMAKE_TARGET_OSX AND NOT CLR_CMAKE_TARGET_IOS AND NOT CLR_CMAKE_TARGET_TVOS AND (NOT CLR_CMAKE_TARGET_ANDROID OR CROSS_ROOTFS))
+ if(NOT CLR_CMAKE_TARGET_OSX AND NOT CLR_CMAKE_TARGET_MACCATALYST AND NOT CLR_CMAKE_TARGET_IOS AND NOT CLR_CMAKE_TARGET_TVOS AND (NOT CLR_CMAKE_TARGET_ANDROID OR CROSS_ROOTFS))
  locate_toolchain_exec(objdump CMAKE_OBJDUMP)
 
  if(CLR_CMAKE_TARGET_ANDROID)

diff --git a/eng/native/functions.cmake b/eng/native/functions.cmake
@@ -211,7 +211,7 @@ function(generate_exports_file)
  list(GET INPUT_LIST -1 outputFilename)
  list(REMOVE_AT INPUT_LIST -1)
 
- if(CLR_CMAKE_TARGET_OSX OR CLR_CMAKE_TARGET_IOS OR CLR_CMAKE_TARGET_TVOS)
+ if(CLR_CMAKE_TARGET_OSX OR CLR_CMAKE_TARGET_MACCATALYST OR CLR_CMAKE_TARGET_IOS OR CLR_CMAKE_TARGET_TVOS)
  set(SCRIPT_NAME generateexportedsymbols.sh)
  else()
  set(SCRIPT_NAME generateversionscript.sh)
@@ -252,7 +252,7 @@ function(strip_symbols targetName outputFilename)
  if (CLR_CMAKE_HOST_UNIX)
  set(strip_source_file $<TARGET_FILE:${targetName}>)
 
- if (CLR_CMAKE_TARGET_OSX OR CLR_CMAKE_TARGET_IOS OR CLR_CMAKE_TARGET_TVOS)
+ if (CLR_CMAKE_TARGET_OSX OR CLR_CMAKE_TARGET_MACCATALYST OR CLR_CMAKE_TARGET_IOS OR CLR_CMAKE_TARGET_TVOS)
  set(strip_destination_file ${strip_source_file}.dwarf)
 
  # Ensure that dsymutil and strip are present
@@ -281,7 +281,7 @@ function(strip_symbols targetName outputFilename)
  COMMAND ${strip_command}
  COMMENT "Stripping symbols from ${strip_source_file} into file ${strip_destination_file}"
  )
- else (CLR_CMAKE_TARGET_OSX OR CLR_CMAKE_TARGET_IOS OR CLR_CMAKE_TARGET_TVOS)
+ else (CLR_CMAKE_TARGET_OSX OR CLR_CMAKE_TARGET_MACCATALYST OR CLR_CMAKE_TARGET_IOS OR CLR_CMAKE_TARGET_TVOS)
  set(strip_destination_file ${strip_source_file}.dbg)
 
  add_custom_command(
@@ -293,7 +293,7 @@ function(strip_symbols targetName outputFilename)
  COMMAND ${CMAKE_OBJCOPY} --add-gnu-debuglink=${strip_destination_file} ${strip_source_file}
  COMMENT "Stripping symbols from ${strip_source_file} into file ${strip_destination_file}"
  )
- endif (CLR_CMAKE_TARGET_OSX OR CLR_CMAKE_TARGET_IOS OR CLR_CMAKE_TARGET_TVOS)
+ endif (CLR_CMAKE_TARGET_OSX OR CLR_CMAKE_TARGET_MACCATALYST OR CLR_CMAKE_TARGET_IOS OR CLR_CMAKE_TARGET_TVOS)
 
  set(${outputFilename} ${strip_destination_file} PARENT_SCOPE)
  else(CLR_CMAKE_HOST_UNIX)
@@ -316,7 +316,7 @@ function(install_with_stripped_symbols targetName kind destination)
  install_symbols(${symbol_file} ${destination})
  endif()
 
- if ((CLR_CMAKE_TARGET_OSX OR CLR_CMAKE_TARGET_IOS OR CLR_CMAKE_TARGET_TVOS) AND ("${kind}" STREQUAL "TARGETS"))
+ if ((CLR_CMAKE_TARGET_OSX OR CLR_CMAKE_TARGET_MACCATALYST OR CLR_CMAKE_TARGET_IOS OR CLR_CMAKE_TARGET_TVOS) AND ("${kind}" STREQUAL "TARGETS"))
  # We want to avoid the kind=TARGET install behaviors which corrupt code signatures on osx-arm64
  set(kind PROGRAMS)
  endif()

diff --git a/eng/native/init-distro-rid.sh b/eng/native/init-distro-rid.sh
@@ -170,6 +170,8 @@ initDistroRidGlobal()
  distroRid="linux-$buildArch"
  elif [ "$targetOs" = "OSX" ]; then
  distroRid="osx-$buildArch"
+ elif [ "$targetOs" = "MacCatalyst" ]; then
+ distroRid="maccatalyst-$buildArch"
  elif [ "$targetOs" = "tvOS" ]; then
  distroRid="tvos-$buildArch"
  elif [ "$targetOs" = "iOS" ]; then

diff --git a/eng/pipelines/common/platform-matrix.yml b/eng/pipelines/common/platform-matrix.yml
@@ -323,6 +323,48 @@ jobs:
  helixQueueGroup: ${{ parameters.helixQueueGroup }}
  ${{ insert }}: ${{ parameters.jobParameters }}
 
+# Mac Catalyst x64
+
+- ${{ if containsValue(parameters.platforms, 'MacCatalyst_x64') }}:
+ - template: xplat-setup.yml
+ parameters:
+ jobTemplate: ${{ parameters.jobTemplate }}
+ helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
+ variables: ${{ parameters.variables }}
+ osGroup: MacCatalyst
+ archType: x64
+ targetRid: maccatalyst-x64
+ platform: MacCatalyst_x64
+ jobParameters:
+ runtimeFlavor: mono
+ stagedBuild: ${{ parameters.stagedBuild }}
+ buildConfig: ${{ parameters.buildConfig }}
+ ${{ if eq(parameters.passPlatforms, true) }}:
+ platforms: ${{ parameters.platforms }}
+ helixQueueGroup: ${{ parameters.helixQueueGroup }}
+ ${{ insert }}: ${{ parameters.jobParameters }}
+
+# Mac Catalyst arm64
+
+- ${{ if containsValue(parameters.platforms, 'MacCatalyst_arm64') }}:
+ - template: xplat-setup.yml
+ parameters:
+ jobTemplate: ${{ parameters.jobTemplate }}
+ helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
+ variables: ${{ parameters.variables }}
+ osGroup: MacCatalyst
+ archType: arm64
+ targetRid: maccatalyst-arm64
+ platform: MacCatalyst_arm64
+ jobParameters:
+ runtimeFlavor: mono
+ stagedBuild: ${{ parameters.stagedBuild }}
+ buildConfig: ${{ parameters.buildConfig }}
+ ${{ if eq(parameters.passPlatforms, true) }}:
+ platforms: ${{ parameters.platforms }}
+ helixQueueGroup: ${{ parameters.helixQueueGroup }}
+ ${{ insert }}: ${{ parameters.jobParameters }}
+
 # tvOS x64
 
 - ${{ if containsValue(parameters.platforms, 'tvOS_x64') }}:

diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml
@@ -119,7 +119,7 @@ jobs:
  queue: BuildPool.Ubuntu.1604.Amd64
 
  # OSX Build Pool (we don't have on-prem OSX BuildPool
- ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS') }}:
+ ${{ if in(parameters.osGroup, 'OSX', 'MacCatalyst', 'iOS', 'tvOS') }}:
  vmImage: 'macOS-10.15'
 
  # Official Build Windows Pool
@@ -135,7 +135,7 @@ jobs:
 
  ${{ if eq(parameters.helixQueuesTemplate, '') }}:
  # macOS hosted pool machines are slower so we need to give a greater timeout than the 60 mins default.
- ${{ if and(eq(parameters.jobParameters.timeoutInMinutes, ''), in(parameters.osGroup, 'OSX', 'iOS', 'tvOS')) }}:
+ ${{ if and(eq(parameters.jobParameters.timeoutInMinutes, ''), in(parameters.osGroup, 'OSX', 'MacCatalyst', 'iOS', 'tvOS')) }}:
  timeoutInMinutes: 120
  ${{ insert }}: ${{ parameters.jobParameters }}
  ${{ if ne(parameters.helixQueuesTemplate, '') }}:

diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml
@@ -98,6 +98,7 @@ stages:
  - Android_x86
  - Android_arm
  - Android_arm64
+ - MacCatalyst_x64
  - tvOS_x64
  - tvOS_arm64
  - iOS_x64

diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml
@@ -212,6 +212,7 @@ jobs:
  runtimeFlavor: mono
  platforms:
  - Android_x86
+ - MacCatalyst_x64
  - tvOS_x64
  - iOS_arm64
  - iOS_x86
@@ -1050,4 +1051,4 @@ jobs:
  or(
  eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true),
  eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
- eq(variables['isFullMatrix'], true))
+ eq(variables['isFullMatrix'], true))
diff --git a/eng/targetframeworksuffix.props b/eng/targetframeworksuffix.props
@@ -46,6 +46,13 @@
  <PackageTargetRuntime>osx</PackageTargetRuntime>
  </PropertyGroup>
  </When>
+ <When Condition="'$(TargetFrameworkSuffix)' == 'MacCatalyst'">
+ <PropertyGroup>
+ <TargetsUnix>true</TargetsUnix>
+ <TargetsMacCatalyst>true</TargetsMacCatalyst>
+ <PackageTargetRuntime>maccatalyst</PackageTargetRuntime>
+ </PropertyGroup>
+ </When>
  <When Condition="'$(TargetFrameworkSuffix)' == 'tvOS'">
  <PropertyGroup>
  <TargetsUnix>true</TargetsUnix>

diff --git a/eng/testing/AppleRunnerTemplate.sh b/eng/testing/AppleRunnerTemplate.sh
@@ -16,6 +16,8 @@ if [ -n "$5" ]; then
  EXPECTED_EXIT_CODE="--expected-exit-code $5"
 fi
 
+if [[ "$TARGET_OS" == "MacCatalyst" ]]; then TARGET=maccatalyst; fi
+
 if [[ "$TARGET_OS" == "iOS" && "$TARGET_ARCH" == "x86" ]]; then TARGET=ios-simulator-32; fi
 if [[ "$TARGET_OS" == "iOS" && "$TARGET_ARCH" == "x64" ]]; then TARGET=ios-simulator-64; fi
 if [[ "$TARGET_OS" == "iOS" && "$TARGET_ARCH" == "arm" ]]; then TARGET=ios-device; fi
@@ -29,6 +31,7 @@ if [[ "$TARGET" == "ios-simulator-"* ]]; then SCHEME_SDK=Release-iphonesimulator
 if [[ "$TARGET" == "tvos-simulator" ]]; then SCHEME_SDK=Release-appletvsimulator; fi
 if [[ "$TARGET" == "ios-device" ]]; then SCHEME_SDK=Release-iphoneos; fi
 if [[ "$TARGET" == "tvos-device" ]]; then SCHEME_SDK=Release-appletvos; fi
+if [[ "$TARGET" == "maccatalyst" ]]; then SCHEME_SDK=Release-maccatalyst; fi
 
 cd $EXECUTION_DIR
 

diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets
@@ -77,17 +77,21 @@
  </Target>
 
  <!-- Generate a self-contained app bundle for iOS with tests. -->
- <UsingTask Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS'"
+ <UsingTask Condition="'$(TargetOS)' == 'MacCatalyst' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS'"
  TaskName="AppleAppBuilderTask"
  AssemblyFile="$(AppleAppBuilderTasksAssemblyPath)" />
  <UsingTask TaskName="MonoAOTCompiler"
  AssemblyFile="$(MonoAOTCompilerTasksAssemblyPath)" />
 
  <Import Project="$(MonoAOTCompilerDir)MonoAOTCompiler.props" />
 
- <Target Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS'" Name="BundleTestAppleApp">
+ <PropertyGroup>
+ <DevTeamProvisioning Condition="'$(TargetOS)' == 'MacCatalyst' and '$(DevTeamProvisioning)' == ''">-</DevTeamProvisioning>
+ </PropertyGroup>
+
+ <Target Condition="'$(TargetOS)' == 'MacCatalyst' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS'" Name="BundleTestAppleApp">
  <Error Condition="!Exists('$(MicrosoftNetCoreAppRuntimePackRidDir)')" Text="MicrosoftNetCoreAppRuntimePackRidDir=$(MicrosoftNetCoreAppRuntimePackRidDir) doesn't exist" />
- <Error Condition="('$(TargetArchitecture)' == 'arm64' or '$(TargetArchitecture)' == 'arm') and '$(DevTeamProvisioning)' == ''"
+ <Error Condition="('$(TargetArchitecture)' == 'arm64' or '$(TargetArchitecture)' == 'arm' or '$(TargetOS)' == 'MacCatalyst') and '$(DevTeamProvisioning)' == ''"
  Text="'DevTeamProvisioning' needs to be set for device builds. Set it to 'UBF8T346G9' if you're part of the Microsoft team account." />
  <Error Condition="'$(TestArchiveTestsDir)' == ''" Text="TestArchiveTestsDir property to archive the test folder must be set." />
 
@@ -217,7 +221,7 @@
  AfterTargets="ComputeResolvedFilesToPublishList">
  <ItemGroup>
  <_runnerFilesToPublish Include="$(AndroidTestRunnerDir)*" Condition="'$(TargetOS)' == 'Android'" />
- <_runnerFilesToPublish Include="$(AppleTestRunnerDir)*" Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS'" />
+ <_runnerFilesToPublish Include="$(AppleTestRunnerDir)*" Condition="'$(TargetOS)' == 'MacCatalyst' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS'" />
  <_runnerFilesToPublish Include="$(WasmTestRunnerDir)*" Condition="'$(TargetOS)' == 'Browser'" />
 
  <ResolvedFileToPublish Include="@(_runnerFilesToPublish)" RelativePath="%(FileName)%(Extension)" CopyToPublishDirectory="PreserveNewest" PostprocessAssembly="true" />