Introduce iossimulator RIDs, and convert as needed

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)' == 'MacCatalyst' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'Android' or '$(TargetOS)' == 'Browser'">true</TargetsMobile>
+ <TargetsMobile Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOS-sim' or '$(TargetOS)' == 'MacCatalyst' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'tvOS-sim' or '$(TargetOS)' == 'Android' or '$(TargetOS)' == 'Browser'">true</TargetsMobile>
  </PropertyGroup>
 
  <!-- Platform property is required by RepoLayout.props in Arcade SDK. -->
@@ -121,7 +121,9 @@
  <_portableOS Condition="'$(_runtimeOS)' == 'Browser'">browser</_portableOS>
  <_portableOS Condition="'$(_runtimeOS)' == 'maccatalyst'">maccatalyst</_portableOS>
  <_portableOS Condition="'$(_runtimeOS)' == 'ios'">ios</_portableOS>
+ <_portableOS Condition="'$(_runtimeOS)' == 'ios-sim'">ios-sim</_portableOS>
  <_portableOS Condition="'$(_runtimeOS)' == 'tvos'">tvos</_portableOS>
+ <_portableOS Condition="'$(_runtimeOS)' == 'tvos-sim'">tvos-sim</_portableOS>
  <_portableOS Condition="'$(_runtimeOS)' == 'android'">android</_portableOS>
 
  <_runtimeOS Condition="$(_runtimeOS.StartsWith('tizen'))">linux</_runtimeOS>
@@ -148,7 +150,7 @@
  <_toolRuntimeRID Condition="'$(_runtimeOS)' == 'android' and $([MSBuild]::IsOSPlatform('OSX'))">osx-x64</_toolRuntimeRID>
 
  <!-- There are no Mac Catalyst, iOS or tvOS tools and it can be built on OSX only, so use that -->
- <_toolRuntimeRID Condition="'$(_runtimeOS)' == 'maccatalyst' or '$(_runtimeOS)' == 'ios' or '$(_runtimeOS)' == 'tvos'">osx-x64</_toolRuntimeRID>
+ <_toolRuntimeRID Condition="'$(_runtimeOS)' == 'maccatalyst' or '$(_runtimeOS)' == 'ios' or '$(_runtimeOS)' == 'ios-sim' or '$(_runtimeOS)' == 'tvos' or '$(_runtimeOS)' == 'tvos-sim'">osx-x64</_toolRuntimeRID>
 
  <MicrosoftNetCoreIlasmPackageRuntimeId>$(_toolRuntimeRID)</MicrosoftNetCoreIlasmPackageRuntimeId>
 
@@ -165,7 +167,9 @@
  <_outputRID Condition="'$(TargetOS)' == 'Solaris'">solaris-$(TargetArchitecture)</_outputRID>
  <_outputRID Condition="'$(TargetOS)' == 'MacCatalyst'">maccatalyst-$(TargetArchitecture)</_outputRID>
  <_outputRID Condition="'$(TargetOS)' == 'iOS'">ios-$(TargetArchitecture)</_outputRID>
+ <_outputRID Condition="'$(TargetOS)' == 'iOS-sim'">ios-sim-$(TargetArchitecture)</_outputRID>
  <_outputRID Condition="'$(TargetOS)' == 'tvOS'">tvos-$(TargetArchitecture)</_outputRID>
+ <_outputRID Condition="'$(TargetOS)' == 'tvOS-sim'">tvos-sim-$(TargetArchitecture)</_outputRID>
  <_outputRID Condition="'$(TargetOS)' == 'Android'">android-$(TargetArchitecture)</_outputRID>
  <_outputRID Condition="'$(TargetOS)' == 'Browser'">browser-$(TargetArchitecture)</_outputRID>
 
@@ -181,10 +185,10 @@
  <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>
+ <TargetsiOS Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOS-sim'">true</TargetsiOS>
+ <TargetstvOS Condition="'$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'tvOS-sim'">true</TargetstvOS>
+ <TargetsiOSSimulator Condition="'$(TargetOS)' == 'iOS-sim'">true</TargetsiOSSimulator>
+ <TargetstvOSSimulator Condition="'$(TargetOS)' == 'tvOS-sim'">true</TargetstvOSSimulator>
  <TargetsAndroid Condition="'$(TargetOS)' == 'Android'">true</TargetsAndroid>
  <TargetsBrowser Condition="'$(TargetOS)' == 'Browser'">true</TargetsBrowser>
  <TargetsWindows Condition="'$(TargetOS)' == 'windows'">true</TargetsWindows>

eng/Subsets.props

@@ -206,7 +206,7 @@
  </ItemGroup>
 
  <!-- Mono sets -->
- <ItemGroup Condition="$(_subset.Contains('+mono.llvm+')) or $(_subset.Contains('+mono.aotcross+')) or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'Android' or '$(TargetOS)' == 'Browser'">
+ <ItemGroup Condition="$(_subset.Contains('+mono.llvm+')) or $(_subset.Contains('+mono.aotcross+')) or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOS-sim' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'tvOS-sim' or '$(TargetOS)' == 'Android' or '$(TargetOS)' == 'Browser'">
  <ProjectToBuild Include="$(MonoProjectRoot)llvm\llvm-init.proj" Category="mono" />
  </ItemGroup>
 

eng/Version.Details.xml

@@ -1,8 +1,8 @@
 <Dependencies>
  <ProductDependencies>
- <Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="6.0.0-preview.3.21151.1">
+ <Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="6.0.0-preview.3.21160.1">
  <Uri>https://github.com/dotnet/icu</Uri>
- <Sha>3dc14146be2c110eedc947afa62894f9b53b4f04</Sha>
+ <Sha>f8930f51020aeeeab5d3f96314b3c53d4122b6f9</Sha>
  </Dependency>
  </ProductDependencies>
  <ToolsetDependencies>

eng/Versions.props

@@ -157,7 +157,7 @@
  <!-- ILLink -->
  <MicrosoftNETILLinkTasksVersion>6.0.100-preview.2.21126.1</MicrosoftNETILLinkTasksVersion>
  <!-- ICU -->
- <MicrosoftNETCoreRuntimeICUTransportVersion>6.0.0-preview.3.21151.1</MicrosoftNETCoreRuntimeICUTransportVersion>
+ <MicrosoftNETCoreRuntimeICUTransportVersion>6.0.0-preview.3.21160.1</MicrosoftNETCoreRuntimeICUTransportVersion>
  <!-- Mono LLVM -->
  <runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>9.0.1-alpha.1.21158.1</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
  <runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>9.0.1-alpha.1.21158.1</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>

eng/build.sh

@@ -266,8 +266,12 @@ while [[ $# > 0 ]]; do
  os="MacCatalyst" ;;
  tvos)
  os="tvOS" ;;
+ tvos-sim)
+ os="tvOS-sim" ;;
  ios)
  os="iOS" ;;
+ ios-sim)
+ os="iOS-sim" ;;
  android)
  os="Android" ;;
  browser)
@@ -278,7 +282,7 @@ while [[ $# > 0 ]]; do
  os="Solaris" ;;
  *)
  echo "Unsupported target OS '$2'."
- echo "The allowed values are windows, Linux, FreeBSD, OSX, MacCatalyst, tvOS, iOS, Android, Browser, illumos and Solaris."
+ echo "The allowed values are windows, Linux, FreeBSD, OSX, MacCatalyst, tvOS, tvOS-sim, iOS, iOS-sim, Android, Browser, illumos and Solaris."
  exit 1
  ;;
  esac

eng/native/build-commons.sh

@@ -462,10 +462,10 @@ fi
 if [[ "$__BuildArch" == wasm ]]; then
  # nothing to do here
  true
-elif [[ "$__TargetOS" == iOS ]]; then
+elif [[ "$__TargetOS" == iOS || "$__TargetOS" == iOS-sim ]]; then
  # nothing to do here
  true
-elif [[ "$__TargetOS" == tvOS ]]; then
+elif [[ "$__TargetOS" == tvOS || "$__TargetOS" == tvOS-sim ]]; then
  # nothing to do here
  true
 elif [[ "$__TargetOS" == Android ]]; then

eng/native/configureplatform.cmake

@@ -88,7 +88,7 @@ if(CLR_CMAKE_HOST_OS STREQUAL Darwin)
  set(CMAKE_ASM_COMPILE_OBJECT "${CMAKE_C_COMPILER} <FLAGS> <DEFINES> <INCLUDES> -o <OBJECT> -c <SOURCE>")
 endif(CLR_CMAKE_HOST_OS STREQUAL Darwin)
 
-if(CLR_CMAKE_HOST_OS STREQUAL iOS)
+if(CLR_CMAKE_HOST_OS STREQUAL iOS OR CLR_CMAKE_HOST_OS STREQUAL iOS-sim)
  set(CLR_CMAKE_HOST_UNIX 1)
  set(CLR_CMAKE_HOST_IOS 1)
  if(CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")
@@ -102,9 +102,9 @@ if(CLR_CMAKE_HOST_OS STREQUAL iOS)
  else()
  clr_unknown_arch()
  endif()
-endif(CLR_CMAKE_HOST_OS STREQUAL iOS)
+endif(CLR_CMAKE_HOST_OS STREQUAL iOS OR CLR_CMAKE_HOST_OS STREQUAL iOS-sim)
 
-if(CLR_CMAKE_HOST_OS STREQUAL tvOS)
+if(CLR_CMAKE_HOST_OS STREQUAL tvOS OR CLR_CMAKE_HOST_OS STREQUAL tvOS-sim)
  set(CLR_CMAKE_HOST_UNIX 1)
  set(CLR_CMAKE_HOST_TVOS 1)
  if(CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")
@@ -114,7 +114,7 @@ if(CLR_CMAKE_HOST_OS STREQUAL tvOS)
  else()
  clr_unknown_arch()
  endif()
-endif(CLR_CMAKE_HOST_OS STREQUAL tvOS)
+endif(CLR_CMAKE_HOST_OS STREQUAL tvOS OR CLR_CMAKE_HOST_OS STREQUAL tvOS-sim)
 
 if(CLR_CMAKE_HOST_OS STREQUAL Android)
  set(CLR_CMAKE_HOST_UNIX 1)
@@ -300,20 +300,20 @@ if(CLR_CMAKE_TARGET_OS STREQUAL Darwin)
  set(CLR_CMAKE_TARGET_OSX 1)
 endif(CLR_CMAKE_TARGET_OS STREQUAL Darwin)
 
-if(CLR_CMAKE_TARGET_OS STREQUAL iOS)
+if(CLR_CMAKE_TARGET_OS STREQUAL iOS OR CLR_CMAKE_TARGET_OS STREQUAL iOS-sim)
  set(CLR_CMAKE_TARGET_UNIX 1)
  set(CLR_CMAKE_TARGET_IOS 1)
-endif(CLR_CMAKE_TARGET_OS STREQUAL iOS)
+endif(CLR_CMAKE_TARGET_OS STREQUAL iOS OR CLR_CMAKE_TARGET_OS STREQUAL iOS-sim)
 
 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)
+if(CLR_CMAKE_TARGET_OS STREQUAL tvOS OR CLR_CMAKE_TARGET_OS STREQUAL tvOS-sim)
  set(CLR_CMAKE_TARGET_UNIX 1)
  set(CLR_CMAKE_TARGET_TVOS 1)
-endif(CLR_CMAKE_TARGET_OS STREQUAL tvOS)
+endif(CLR_CMAKE_TARGET_OS STREQUAL tvOS OR CLR_CMAKE_TARGET_OS STREQUAL tvOS-sim)
 
 if(CLR_CMAKE_TARGET_OS STREQUAL FreeBSD)
  set(CLR_CMAKE_TARGET_UNIX 1)

eng/native/init-distro-rid.sh

@@ -174,8 +174,12 @@ initDistroRidGlobal()
  distroRid="maccatalyst-$buildArch"
  elif [ "$targetOs" = "tvOS" ]; then
  distroRid="tvos-$buildArch"
+ elif [ "$targetOs" = "tvOS-sim" ]; then
+ distroRid="tvos-sim-$buildArch"
  elif [ "$targetOs" = "iOS" ]; then
  distroRid="ios-$buildArch"
+ elif [ "$targetOs" = "iOS-sim" ]; then
+ distroRid="ios-sim-$buildArch"
  elif [ "$targetOs" = "Android" ]; then
  distroRid="android-$buildArch"
  elif [ "$targetOs" = "Browser" ]; then

eng/pipelines/common/global-build-job.yml

@@ -63,6 +63,13 @@ jobs:
  - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubGroup, '_musl')) }}:
  - name: _osParameter
  value: /p:RuntimeOS=linux-musl /p:OutputRid=linux-musl-${{ parameters.archType }}
+ - ${{ if and(eq(parameters.osGroup, 'tvOS'), eq(parameters.osSubGroup, '_sim')) }}:
+ - name: _osParameter
+ value: -os tvOS-sim
+ - ${{ if and(eq(parameters.osGroup, 'iOS'), eq(parameters.osSubGroup, '_sim')) }}:
+ - name: _osParameter
+ value: -os iOS-sim
+
 
  # Do not rename as it clashes with MSBuild property in libraries/build-native.proj
  - name: _crossBuildPropertyArg

eng/pipelines/common/platform-matrix.yml

@@ -365,18 +365,40 @@ jobs:
  helixQueueGroup: ${{ parameters.helixQueueGroup }}
  ${{ insert }}: ${{ parameters.jobParameters }}
 
-# tvOS x64
+# tvOS arm64
 
-- ${{ if containsValue(parameters.platforms, 'tvOS_x64') }}:
+- ${{ if containsValue(parameters.platforms, 'tvOS_arm64') }}:
  - template: xplat-setup.yml
  parameters:
  jobTemplate: ${{ parameters.jobTemplate }}
  helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
  variables: ${{ parameters.variables }}
  osGroup: tvOS
+ archType: arm64
+ targetRid: tvos-arm64
+ platform: tvOS_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 Simulator x64
+
+- ${{ if containsValue(parameters.platforms, 'tvOS_sim_x64') }}:
+ - template: xplat-setup.yml
+ parameters:
+ jobTemplate: ${{ parameters.jobTemplate }}
+ helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
+ variables: ${{ parameters.variables }}
+ osGroup: tvOS
+ osSubGroup: _sim
  archType: x64
- targetRid: tvos-x64
- platform: tvOS_x64
+ targetRid: tvos-sim-x64
+ platform: tvOS_sim_x64
  jobParameters:
  runtimeFlavor: mono
  stagedBuild: ${{ parameters.stagedBuild }}
@@ -386,18 +408,19 @@ jobs:
  helixQueueGroup: ${{ parameters.helixQueueGroup }}
  ${{ insert }}: ${{ parameters.jobParameters }}
 
-# tvOS arm64
+# tvOS Simulator arm64
 
-- ${{ if containsValue(parameters.platforms, 'tvOS_arm64') }}:
+- ${{ if containsValue(parameters.platforms, 'tvOS_sim_arm64') }}:
  - template: xplat-setup.yml
  parameters:
  jobTemplate: ${{ parameters.jobTemplate }}
  helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
  variables: ${{ parameters.variables }}
  osGroup: tvOS
+ osSubGroup: _sim
  archType: arm64
- targetRid: tvos-arm64
- platform: tvOS_arm64
+ targetRid: tvos-sim-arm64
+ platform: tvOS_sim_arm64
  jobParameters:
  runtimeFlavor: mono
  stagedBuild: ${{ parameters.stagedBuild }}
@@ -407,18 +430,39 @@ jobs:
  helixQueueGroup: ${{ parameters.helixQueueGroup }}
  ${{ insert }}: ${{ parameters.jobParameters }}
 
-# iOS x64
+# iOS arm
 
-- ${{ if containsValue(parameters.platforms, 'iOS_x64') }}:
+- ${{ if containsValue(parameters.platforms, 'iOS_arm') }}:
  - template: xplat-setup.yml
  parameters:
  jobTemplate: ${{ parameters.jobTemplate }}
  helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
  variables: ${{ parameters.variables }}
  osGroup: iOS
- archType: x64
- targetRid: ios-x64
- platform: iOS_x64
+ archType: arm
+ targetRid: ios-arm
+ platform: iOS_arm
+ jobParameters:
+ runtimeFlavor: mono
+ stagedBuild: ${{ parameters.stagedBuild }}
+ buildConfig: ${{ parameters.buildConfig }}
+ ${{ if eq(parameters.passPlatforms, true) }}:
+ platforms: ${{ parameters.platforms }}
+ helixQueueGroup: ${{ parameters.helixQueueGroup }}
+ ${{ insert }}: ${{ parameters.jobParameters }}
+
+# iOS arm64
+
+- ${{ if containsValue(parameters.platforms, 'iOS_arm64') }}:
+ - template: xplat-setup.yml
+ parameters:
+ jobTemplate: ${{ parameters.jobTemplate }}
+ helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
+ variables: ${{ parameters.variables }}
+ osGroup: iOS
+ archType: arm64
+ targetRid: ios-arm64
+ platform: iOS_arm64
  jobParameters:
  runtimeFlavor: mono
  stagedBuild: ${{ parameters.stagedBuild }}
@@ -428,61 +472,64 @@ jobs:
  helixQueueGroup: ${{ parameters.helixQueueGroup }}
  ${{ insert }}: ${{ parameters.jobParameters }}
 
-# iOS x86
+# iOS Simulator x64
 
-- ${{ if containsValue(parameters.platforms, 'iOS_x86') }}:
+- ${{ if containsValue(parameters.platforms, 'iOS_sim_x64') }}:
  - template: xplat-setup.yml
  parameters:
  jobTemplate: ${{ parameters.jobTemplate }}
  helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
  variables: ${{ parameters.variables }}
  osGroup: iOS
- archType: x86
- targetRid: ios-x86
- platform: iOS_x86
+ osSubGroup: _sim
+ archType: x64
+ targetRid: ios-sim-x64
+ platform: iOS_sim_x64
  jobParameters:
  runtimeFlavor: mono
  stagedBuild: ${{ parameters.stagedBuild }}
  buildConfig: ${{ parameters.buildConfig }}
  ${{ if eq(parameters.passPlatforms, true) }}:
  platforms: ${{ parameters.platforms }}
  helixQueueGroup: ${{ parameters.helixQueueGroup }}
- managedTestBuildOsGroup: OSX
  ${{ insert }}: ${{ parameters.jobParameters }}
 
-# iOS arm
+# iOS Simulator x86
 
-- ${{ if containsValue(parameters.platforms, 'iOS_arm') }}:
+- ${{ if containsValue(parameters.platforms, 'iOS_sim_x86') }}:
  - template: xplat-setup.yml
  parameters:
  jobTemplate: ${{ parameters.jobTemplate }}
  helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
  variables: ${{ parameters.variables }}
  osGroup: iOS
- archType: arm
- targetRid: ios-arm
- platform: iOS_arm
+ osSubGroup: _sim
+ archType: x86
+ targetRid: ios-sim-x86
+ platform: iOS_sim_x86
  jobParameters:
  runtimeFlavor: mono
  stagedBuild: ${{ parameters.stagedBuild }}
  buildConfig: ${{ parameters.buildConfig }}
  ${{ if eq(parameters.passPlatforms, true) }}:
  platforms: ${{ parameters.platforms }}
  helixQueueGroup: ${{ parameters.helixQueueGroup }}
+ managedTestBuildOsGroup: OSX
  ${{ insert }}: ${{ parameters.jobParameters }}
 
-# iOS arm64
+# iOS Simulator arm64
 
-- ${{ if containsValue(parameters.platforms, 'iOS_arm64') }}:
+- ${{ if containsValue(parameters.platforms, 'iOS_sim_arm64') }}:
  - template: xplat-setup.yml
  parameters:
  jobTemplate: ${{ parameters.jobTemplate }}
  helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
  variables: ${{ parameters.variables }}
  osGroup: iOS
+ osSubGroup: _sim
  archType: arm64
- targetRid: ios-arm64
- platform: iOS_arm64
+ targetRid: ios-sim-arm64
+ platform: iOS_sim_arm64
  jobParameters:
  runtimeFlavor: mono
  stagedBuild: ${{ parameters.stagedBuild }}