From b81dd56a718d0eb5813cb7b6617478e2f7673cae Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Mon, 8 Mar 2021 08:34:10 -0500 Subject: [PATCH 01/48] WIP --- Directory.Build.props | 16 +- eng/Subsets.props | 2 +- eng/Version.Details.xml | 8 + eng/Versions.props | 2 + eng/build.sh | 6 +- eng/native/init-distro-rid.sh | 4 + eng/targetingpacks.targets | 2 +- .../pkg/runtime.compatibility.json | 577 ++++++++++++++++-- .../pkg/runtime.json | 223 +++++-- src/mono/llvm/llvm-init.proj | 26 +- src/mono/mono.proj | 6 +- src/mono/monoaotcross.proj | 4 +- 12 files changed, 740 insertions(+), 136 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 5736fce3341c2..f77b0c0bea07d 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -17,7 +17,7 @@ Solaris Linux windows - true + true @@ -121,7 +121,9 @@ <_portableOS Condition="'$(_runtimeOS)' == 'Browser'">browser <_portableOS Condition="'$(_runtimeOS)' == 'maccatalyst'">maccatalyst <_portableOS Condition="'$(_runtimeOS)' == 'ios'">ios + <_portableOS Condition="'$(_runtimeOS)' == 'ios-sim'">ios-sim <_portableOS Condition="'$(_runtimeOS)' == 'tvos'">tvos + <_portableOS Condition="'$(_runtimeOS)' == 'tvos-sim'">tvos-sim <_portableOS Condition="'$(_runtimeOS)' == 'android'">android <_runtimeOS Condition="$(_runtimeOS.StartsWith('tizen'))">linux @@ -148,7 +150,7 @@ <_toolRuntimeRID Condition="'$(_runtimeOS)' == 'android' and $([MSBuild]::IsOSPlatform('OSX'))">osx-x64 - <_toolRuntimeRID Condition="'$(_runtimeOS)' == 'maccatalyst' or '$(_runtimeOS)' == 'ios' or '$(_runtimeOS)' == 'tvos'">osx-x64 + <_toolRuntimeRID Condition="'$(_runtimeOS)' == 'maccatalyst' or '$(_runtimeOS)' == 'ios' or '$(_runtimeOS)' == 'ios-sim' or '$(_runtimeOS)' == 'tvos' or '$(_runtimeOS)' == 'tvos-sim'">osx-x64 $(_toolRuntimeRID) @@ -165,7 +167,9 @@ <_outputRID Condition="'$(TargetOS)' == 'Solaris'">solaris-$(TargetArchitecture) <_outputRID Condition="'$(TargetOS)' == 'MacCatalyst'">maccatalyst-$(TargetArchitecture) <_outputRID Condition="'$(TargetOS)' == 'iOS'">ios-$(TargetArchitecture) + <_outputRID Condition="'$(TargetOS)' == 'iOS-sim'">ios-sim-$(TargetArchitecture) <_outputRID Condition="'$(TargetOS)' == 'tvOS'">tvos-$(TargetArchitecture) + <_outputRID Condition="'$(TargetOS)' == 'tvOS-sim'">tvos-sim-$(TargetArchitecture) <_outputRID Condition="'$(TargetOS)' == 'Android'">android-$(TargetArchitecture) <_outputRID Condition="'$(TargetOS)' == 'Browser'">browser-$(TargetArchitecture) @@ -181,10 +185,10 @@ true true true - true - true - true - true + true + true + true + true true true true diff --git a/eng/Subsets.props b/eng/Subsets.props index f8e2005ff3b70..6efbb187b4d21 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -206,7 +206,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index be496d19a6417..1bc9d71b95a73 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -162,6 +162,14 @@ https://github.com/dotnet/llvm-project f2a7fc3d94f1a30b822d79ffe453e6b88ae242cf + + https://github.com/dotnet/llvm-project + f2a7fc3d94f1a30b822d79ffe453e6b88ae242cf + + + https://github.com/dotnet/llvm-project + f2a7fc3d94f1a30b822d79ffe453e6b88ae242cf + https://github.com/dotnet/runtime 38017c3935de95d0335bac04f4901ddfc2718656 diff --git a/eng/Versions.props b/eng/Versions.props index 27dbe8e98f172..aa18fac9bac0b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -167,6 +167,8 @@ 9.0.1-alpha.1.21154.1 9.0.1-alpha.1.21154.1 9.0.1-alpha.1.21154.1 + 9.0.1-alpha.1.21154.1 + 9.0.1-alpha.1.21154.1 diff --git a/eng/build.sh b/eng/build.sh index dc72e26d50092..6749dd5699ce3 100755 --- a/eng/build.sh +++ b/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 diff --git a/eng/native/init-distro-rid.sh b/eng/native/init-distro-rid.sh index 9c0092a22bce2..a8f64a85e4b90 100644 --- a/eng/native/init-distro-rid.sh +++ b/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 diff --git a/eng/targetingpacks.targets b/eng/targetingpacks.targets index 22435626d3cd4..4110c3dbc74b5 100644 --- a/eng/targetingpacks.targets +++ b/eng/targetingpacks.targets @@ -19,7 +19,7 @@ LatestRuntimeFrameworkVersion="$(ProductVersion)" RuntimeFrameworkName="$(LocalFrameworkOverrideName)" RuntimePackNamePatterns="$(LocalFrameworkOverrideName).Runtime.**RID**" - RuntimePackRuntimeIdentifiers="linux-arm;linux-arm64;linux-musl-arm64;linux-musl-x64;linux-x64;osx-x64;rhel.6-x64;tizen.4.0.0-armel;tizen.5.0.0-armel;win-arm;win-arm64;win-x64;win-x86;linux-musl-arm;ios-arm64;ios-arm;ios-x64;ios-x86;tvos-arm64;tvos-x64;maccatalyst-x64;maccatalyst-arm64;android-arm64;android-arm;android-x64;android-x86;browser-wasm;osx-arm64" + RuntimePackRuntimeIdentifiers="linux-arm;linux-arm64;linux-musl-arm64;linux-musl-x64;linux-x64;osx-x64;rhel.6-x64;tizen.4.0.0-armel;tizen.5.0.0-armel;win-arm;win-arm64;win-x64;win-x86;linux-musl-arm;ios-arm64;ios-sim-arm64;ios-arm;ios-sim-x64;ios-sim-x86;tvos-arm64;tvos-sim-arm64;tvos-sim-x64;maccatalyst-x64;maccatalyst-arm64;android-arm64;android-arm;android-x64;android-x86;browser-wasm;osx-arm64" TargetFramework="$(NetCoreAppCurrent)" TargetingPackName="$(LocalFrameworkOverrideName).Ref" TargetingPackVersion="$(ProductVersion)" diff --git a/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.compatibility.json b/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.compatibility.json index 128412b4ede96..202fbc6a34537 100644 --- a/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.compatibility.json +++ b/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.compatibility.json @@ -2641,6 +2641,13 @@ "any", "base" ], + "ios-sim": [ + "ios-sim", + "ios", + "unix", + "any", + "base" + ], "ios-arm": [ "ios-arm", "ios", @@ -2657,16 +2664,28 @@ "any", "base" ], - "ios-x64": [ - "ios-x64", + "ios-sim-arm64": [ + "ios-sim-arm64", + "ios-arm64", + "ios-sim", + "ios", + "unix-arm64", + "unix", + "any", + "base" + ], + "ios-sim-x64": [ + "ios-sim-x64", + "ios-sim", "ios", "unix-x64", "unix", "any", "base" ], - "ios-x86": [ - "ios-x86", + "ios-sim-x86": [ + "ios-sim-x86", + "ios-sim", "ios", "unix-x86", "unix", @@ -2682,6 +2701,19 @@ "any", "base" ], + "ios.10-sim": [ + "ios.10-sim", + "ios.10", + "ios.9-sim", + "ios.9", + "ios.8-sim", + "ios.8", + "ios-sim", + "ios", + "unix", + "any", + "base" + ], "ios.10-arm": [ "ios.10-arm", "ios.10", @@ -2710,28 +2742,58 @@ "any", "base" ], - "ios.10-x64": [ - "ios.10-x64", + "ios.10-sim-arm64": [ + "ios.10-sim-arm64", + "ios.10-arm64", + "ios.10-sim", "ios.10", - "ios.9-x64", + "ios.9-sim-arm64", + "ios.9-arm64", + "ios.9-sim", "ios.9", - "ios.8-x64", + "ios.8-sim-arm64", + "ios.8-arm64", + "ios.8-sim", "ios.8", - "ios-x64", + "ios-sim-arm64", + "ios-arm64", + "ios-sim", + "ios", + "unix-arm64", + "unix", + "any", + "base" + ], + "ios.10-sim-x64": [ + "ios.10-sim-x64", + "ios.10-sim", + "ios.10", + "ios.9-sim-x64", + "ios.9-sim", + "ios.9", + "ios.8-sim-x64", + "ios.8-sim", + "ios.8", + "ios-sim-x64", + "ios-sim", "ios", "unix-x64", "unix", "any", "base" ], - "ios.10-x86": [ - "ios.10-x86", + "ios.10-sim-x86": [ + "ios.10-sim-x86", + "ios.10-sim", "ios.10", - "ios.9-x86", + "ios.9-sim-x86", + "ios.9-sim", "ios.9", "ios.8-x86", + "ios.8-sim", "ios.8", - "ios-x86", + "ios-sim-x86", + "ios-sim", "ios", "unix-x86", "unix", @@ -2748,6 +2810,21 @@ "any", "base" ], + "ios.11-sim": [ + "ios.11-sim", + "ios.11", + "ios.10-sim", + "ios.10", + "ios.9-sim", + "ios.9", + "ios.8-sim", + "ios.8", + "ios-sim", + "ios", + "unix", + "any", + "base" + ], "ios.11-arm64": [ "ios.11-arm64", "ios.11", @@ -2764,16 +2841,47 @@ "any", "base" ], - "ios.11-x64": [ - "ios.11-x64", + "ios.11-sim-arm64": [ + "ios.11-sim-arm64", + "ios.11-arm64", + "ios.11-sim", "ios.11", - "ios.10-x64", + "ios.10-sim-arm64", + "ios.10-arm64", + "ios.10-sim", "ios.10", - "ios.9-x64", + "ios.9-sim-arm64", + "ios.9-arm64", + "ios.9-sim", + "ios.9", + "ios.8-simarm64", + "ios.8-arm64", + "ios.8-sim", + "ios.8", + "ios-sim-arm64", + "ios-arm64", + "ios-sim", + "ios", + "unix-arm64", + "unix", + "any", + "base" + ], + "ios.11-sim-x64": [ + "ios.11-sim-x64", + "ios.11-sim", + "ios.11", + "ios.10-sim-x64", + "ios.10-sim", + "ios.10", + "ios.9-sim-x64", + "ios.9-sim", "ios.9", "ios.8-x64", + "ios.8-sim", "ios.8", - "ios-x64", + "ios-sim-x64", + "ios-sim", "ios", "unix-x64", "unix", @@ -2791,6 +2899,23 @@ "any", "base" ], + "ios.12-sim": [ + "ios.12-sim", + "ios.12", + "ios.11-sim", + "ios.11", + "ios.10-sim", + "ios.10", + "ios.9-sim", + "ios.9", + "ios.8-sim", + "ios.8", + "ios-sim", + "ios", + "unix", + "any", + "base" + ], "ios.12-arm64": [ "ios.12-arm64", "ios.12", @@ -2809,18 +2934,54 @@ "any", "base" ], - "ios.12-x64": [ - "ios.12-x64", + "ios.12-sim-arm64": [ + "ios.12-sim-arm64", + "ios.12-arm64", + "ios.12-sim", "ios.12", - "ios.11-x64", + "ios.11-sim-arm64", + "ios.11-arm64", + "ios.11-sim", "ios.11", - "ios.10-x64", + "ios.10-sim-arm64", + "ios.10-arm64", + "ios.10-sim", "ios.10", - "ios.9-x64", + "ios.9-sim-arm64", + "ios.9-arm64", + "ios.9-sim", "ios.9", - "ios.8-x64", + "ios.8-sim-arm64", + "ios.8-arm64", + "ios.8-sim", "ios.8", - "ios-x64", + "ios-sim-arm64", + "ios-arm64", + "ios-sim", + "ios", + "unix-arm64", + "unix", + "any", + "base" + ], + "ios.12-sim-x64": [ + "ios.12-sim-x64", + "ios.12-sim", + "ios.12", + "ios.11-sim-x64", + "ios.11-sim", + "ios.11", + "ios.10-sim-x64", + "ios.10-sim", + "ios.10", + "ios.9-sim-x64", + "ios.9-sim", + "ios.9", + "ios.8-sim-x64", + "ios.8-sim", + "ios.8", + "ios-sim-x64", + "ios-sim", "ios", "unix-x64", "unix", @@ -2839,6 +3000,25 @@ "any", "base" ], + "ios.13-sim": [ + "ios.13-sim", + "ios.13", + "ios.12-sim", + "ios.12", + "ios.11-sim", + "ios.11", + "ios.10-sim", + "ios.10", + "ios.9-sim", + "ios.9", + "ios.8-sim", + "ios.8", + "ios-sim", + "ios", + "unix", + "any", + "base" + ], "ios.13-arm64": [ "ios.13-arm64", "ios.13", @@ -2859,20 +3039,61 @@ "any", "base" ], - "ios.13-x64": [ - "ios.13-x64", + "ios.13-sim-arm64": [ + "ios.13-sim-arm64", + "ios.13-arm64", + "ios.13-sim", "ios.13", - "ios.12-x64", + "ios.12-sim-arm64", + "ios.12-arm64", + "ios.12-sim", "ios.12", - "ios.11-x64", + "ios.11-sim-arm64", + "ios.11-arm64", + "ios.11-sim", "ios.11", - "ios.10-x64", + "ios.10-sim-arm64", + "ios.10-arm64", + "ios.10-sim", "ios.10", - "ios.9-x64", + "ios.9-sim-arm64", + "ios.9-arm64", + "ios.9-sim", "ios.9", - "ios.8-x64", + "ios.8-sim-arm64", + "ios.8-arm64", + "ios.8-sim", "ios.8", - "ios-x64", + "ios-sim-arm64", + "ios-arm64", + "ios-sim", + "ios", + "unix-arm64", + "unix", + "any", + "base" + ], + "ios.13-sim-x64": [ + "ios.13-sim-x64", + "ios.13-sim", + "ios.13", + "ios.12-sim-x64", + "ios.12-sim", + "ios.12", + "ios.11-sim-x64", + "ios.11-sim", + "ios.11", + "ios.10-sim-x64", + "ios.10-sim", + "ios.10", + "ios.9-sim-x64", + "ios.9-sim", + "ios.9", + "ios.8-sim-x64", + "ios.8-sim", + "ios.8", + "ios-sim-x64", + "ios-sim", "ios", "unix-x64", "unix", @@ -2886,6 +3107,15 @@ "any", "base" ], + "ios.8-sim": [ + "ios.8-sim", + "ios.8", + "ios-sim", + "ios", + "unix", + "any", + "base" + ], "ios.8-arm": [ "ios.8-arm", "ios.8", @@ -2906,20 +3136,38 @@ "any", "base" ], - "ios.8-x64": [ - "ios.8-x64", + "ios.8-sim-arm64": [ + "ios.8-sim-arm64", + "ios.8-arm64", + "ios.8-sim", "ios.8", - "ios-x64", + "ios-sim-arm64", + "ios-arm64", + "ios-sim", + "ios", + "unix-arm64", + "unix", + "any", + "base" + ], + "ios.8-sim-x64": [ + "ios.8-sim-x64", + "ios.8-sim", + "ios.8", + "ios-sim-x64", + "ios-sim", "ios", "unix-x64", "unix", "any", "base" ], - "ios.8-x86": [ - "ios.8-x86", + "ios.8-sim-x86": [ + "ios.8-sim-x86", + "ios.8-sim", "ios.8", - "ios-x86", + "ios-sim-x86", + "ios-sim", "ios", "unix-x86", "unix", @@ -2934,6 +3182,17 @@ "any", "base" ], + "ios.9-sim": [ + "ios.9-sim", + "ios.9", + "ios.8-sim", + "ios.8", + "ios-sim", + "ios", + "unix", + "any", + "base" + ], "ios.9-arm": [ "ios.9-arm", "ios.9", @@ -2958,24 +3217,48 @@ "any", "base" ], - "ios.9-x64": [ - "ios.9-x64", + "ios.9-sim-arm64": [ + "ios.9-sim-arm64", + "ios.9-arm64", + "ios.9-sim", "ios.9", - "ios.8-x64", + "ios.8-sim-arm64", + "ios.8-arm64", + "ios.8-sim", "ios.8", - "ios-x64", + "ios-sim-arm64", + "ios-arm64", + "ios-sim", + "ios", + "unix-arm64", + "unix", + "any", + "base" + ], + "ios.9-sim-x64": [ + "ios.9-sim-x64", + "ios.9-sim", + "ios.9", + "ios.8-sim-x64", + "ios.8-sim", + "ios.8", + "ios-sim-x64", + "ios-sim", "ios", "unix-x64", "unix", "any", "base" ], - "ios.9-x86": [ - "ios.9-x86", + "ios.9-sim-x86": [ + "ios.9-sim-x86", + "ios.9-sim", "ios.9", - "ios.8-x86", + "ios.8-sim-x86", + "ios.8-sim", "ios.8", - "ios-x86", + "ios-sim-x86", + "ios-sim", "ios", "unix-x86", "unix", @@ -5549,6 +5832,13 @@ "any", "base" ], + "tvos-sim": [ + "tvos-sim", + "tvos", + "unix", + "any", + "base" + ], "tvos-arm64": [ "tvos-arm64", "tvos", @@ -5557,8 +5847,19 @@ "any", "base" ], - "tvos-x64": [ - "tvos-x64", + "tvos-sim-arm64": [ + "tvos-sim-arm64", + "tvos-arm64", + "tvos-sim", + "tvos", + "unix-arm64", + "unix", + "any", + "base" + ], + "tvos-sim-x64": [ + "tvos-sim-x64", + "tvos-sim", "tvos", "unix-x64", "unix", @@ -5572,6 +5873,15 @@ "any", "base" ], + "tvos.10-sim": [ + "tvos.10-sim", + "tvos.10", + "tvos-sim", + "tvos", + "unix", + "any", + "base" + ], "tvos.10-arm64": [ "tvos.10-arm64", "tvos.10", @@ -5582,10 +5892,26 @@ "any", "base" ], - "tvos.10-x64": [ - "tvos.10-x64", + "tvos.10-sim-arm64": [ + "tvos.10-sim-arm64", + "tvos.10-arm64", + "tvos.10-sim", "tvos.10", - "tvos-x64", + "tvos-sim-arm64", + "tvos-arm64", + "tvos-sim", + "tvos", + "unix-arm64", + "unix", + "any", + "base" + ], + "tvos.10-sim-x64": [ + "tvos.10-sim-x64", + "tvos.10-sim", + "tvos.10", + "tvos-sim-x64", + "tvos-sim", "tvos", "unix-x64", "unix", @@ -5600,6 +5926,17 @@ "any", "base" ], + "tvos.11-sim": [ + "tvos.11-sim", + "tvos.11", + "tvos.10-sim", + "tvos.10", + "tvos-sim", + "tvos", + "unix", + "any", + "base" + ], "tvos.11-arm64": [ "tvos.11-arm64", "tvos.11", @@ -5612,12 +5949,33 @@ "any", "base" ], - "tvos.11-x64": [ - "tvos.11-x64", + "tvos.11-sim-arm64": [ + "tvos.11-sim-arm64", + "tvos.11-arm64", + "tvos.11-sim", "tvos.11", - "tvos.10-x64", + "tvos.10-sim-arm64", + "tvos.10-arm64", + "tvos.10-sim", "tvos.10", - "tvos-x64", + "tvos-sim-arm64", + "tvos-arm64", + "tvos-sim", + "tvos", + "unix-arm64", + "unix", + "any", + "base" + ], + "tvos.11-sim-x64": [ + "tvos.11-sim-x64", + "tvos.11-sim", + "tvos.11", + "tvos.10-sim-x64", + "tvos.10-sim", + "tvos.10", + "tvos-sim-x64", + "tvos-sim", "tvos", "unix-x64", "unix", @@ -5633,6 +5991,19 @@ "any", "base" ], + "tvos.12-sim": [ + "tvos.12-sim", + "tvos.12", + "tvos.11-sim", + "tvos.11", + "tvos.10-sim", + "tvos.10", + "tvos-sim", + "tvos", + "unix", + "any", + "base" + ], "tvos.12-arm64": [ "tvos.12-arm64", "tvos.12", @@ -5647,14 +6018,40 @@ "any", "base" ], - "tvos.12-x64": [ - "tvos.12-x64", + "tvos.12-sim-arm64": [ + "tvos.12-sim-arm64", + "tvos.12-arm64", + "tvos.12-sim", + "tvos.12", + "tvos.11-sim-arm64", + "tvos.11-arm64", + "tvos.11-sim", + "tvos.11", + "tvos.10-sim-arm64", + "tvos.10-arm64", + "tvos.10-sim", + "tvos.10", + "tvos-sim-arm64", + "tvos-arm64", + "tvos-sim", + "tvos", + "unix-arm64", + "unix", + "any", + "base" + ], + "tvos.12-sim-x64": [ + "tvos.12-sim-x64", + "tvos.12-sim", "tvos.12", - "tvos.11-x64", + "tvos.11-sim-x64", + "tvos.11-sim", "tvos.11", - "tvos.10-x64", + "tvos.10-sim-x64", + "tvos.10-sim", "tvos.10", - "tvos-x64", + "tvos-sim-x64", + "tvos-sim", "tvos", "unix-x64", "unix", @@ -5671,6 +6068,21 @@ "any", "base" ], + "tvos.13-sim": [ + "tvos.13-sim", + "tvos.13", + "tvos.12-sim", + "tvos.12", + "tvos.11-sim", + "tvos.11", + "tvos.10-sim", + "tvos.10", + "tvos-sim", + "tvos", + "unix", + "any", + "base" + ], "tvos.13-arm64": [ "tvos.13-arm64", "tvos.13", @@ -5687,16 +6099,47 @@ "any", "base" ], - "tvos.13-x64": [ - "tvos.13-x64", + "tvos.13-sim-arm64": [ + "tvos.13-sim-arm64", + "tvos.13-arm64", + "tvos.13-sim", + "tvos.13", + "tvos.12-sim-arm64", + "tvos.12-arm64", + "tvos.12-sim", + "tvos.12", + "tvos.11-sim-arm64", + "tvos.11-arm64", + "tvos.11-sim", + "tvos.11", + "tvos.10-sim-arm64", + "tvos.10-arm64", + "tvos.10-sim", + "tvos.10", + "tvos-sim-arm64", + "tvos-arm64", + "tvos-sim", + "tvos", + "unix-arm64", + "unix", + "any", + "base" + ], + "tvos.13-sim-x64": [ + "tvos.13-sim-x64", + "tvos.13-sim", "tvos.13", - "tvos.12-x64", + "tvos.12-sim-x64", + "tvos.12-sim", "tvos.12", - "tvos.11-x64", + "tvos.11-sim-x64", + "tvos.11-sim", "tvos.11", - "tvos.10-x64", + "tvos.10-sim-x64", + "tvos.10-sim", "tvos.10", - "tvos-x64", + "tvos-sim-x64", + "tvos-sim", "tvos", "unix-x64", "unix", diff --git a/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.json b/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.json index 91086023d3065..78aa173e896e5 100644 --- a/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.json +++ b/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.json @@ -1073,6 +1073,12 @@ "unix" ] }, + "ios-sim": { + "#import": [ + "ios", + "unix" + ] + }, "ios-arm": { "#import": [ "ios", @@ -1085,15 +1091,21 @@ "unix-arm64" ] }, - "ios-x64": { + "ios-sim-arm64": { "#import": [ - "ios", + "ios-sim", + "unix-arm64" + ] + }, + "ios-sim-x64": { + "#import": [ + "ios-sim", "unix-x64" ] }, - "ios-x86": { + "ios-sim-x86": { "#import": [ - "ios", + "ios-sim", "unix-x86" ] }, @@ -1102,6 +1114,11 @@ "ios.9" ] }, + "ios.10-sim": { + "#import": [ + "ios.9-sim" + ] + }, "ios.10-arm": { "#import": [ "ios.10", @@ -1114,16 +1131,22 @@ "ios.9-arm64" ] }, - "ios.10-x64": { + "ios.10-sim-arm64": { "#import": [ - "ios.10", - "ios.9-x64" + "ios.10-sim", + "ios.9-sim-arm64" ] }, - "ios.10-x86": { + "ios.10-sim-x64": { "#import": [ - "ios.10", - "ios.9-x86" + "ios.10-sim", + "ios.9-sim-x64" + ] + }, + "ios.10-sim-x86": { + "#import": [ + "ios.10-sim", + "ios.9-sim-x86" ] }, "ios.11": { @@ -1131,16 +1154,27 @@ "ios.10" ] }, + "ios.11-sim": { + "#import": [ + "ios.10-sim" + ] + }, "ios.11-arm64": { "#import": [ "ios.11", "ios.10-arm64" ] }, - "ios.11-x64": { + "ios.11-sim-arm64": { "#import": [ - "ios.11", - "ios.10-x64" + "ios.11-sim", + "ios.10-sim-arm64" + ] + }, + "ios.11-sim-x64": { + "#import": [ + "ios.11-sim", + "ios.10-sim-x64" ] }, "ios.12": { @@ -1148,16 +1182,27 @@ "ios.11" ] }, + "ios.12-sim": { + "#import": [ + "ios.11-sim" + ] + }, "ios.12-arm64": { "#import": [ "ios.12", "ios.11-arm64" ] }, - "ios.12-x64": { + "ios.12-sim-arm64": { "#import": [ - "ios.12", - "ios.11-x64" + "ios.12-sim", + "ios.11-sim-arm64" + ] + }, + "ios.12-sim-x64": { + "#import": [ + "ios.12-sim", + "ios.11-sim-x64" ] }, "ios.13": { @@ -1165,16 +1210,27 @@ "ios.12" ] }, + "ios.13-sim": { + "#import": [ + "ios.12-sim" + ] + }, "ios.13-arm64": { "#import": [ "ios.13", "ios.12-arm64" ] }, - "ios.13-x64": { + "ios.13-sim-arm64": { "#import": [ - "ios.13", - "ios.12-x64" + "ios.13-sim", + "ios.12-sim-arm64" + ] + }, + "ios.13-sim-x64": { + "#import": [ + "ios.13-sim", + "ios.12-sim-x64" ] }, "ios.8": { @@ -1182,6 +1238,11 @@ "ios" ] }, + "ios.8-sim": { + "#import": [ + "ios-sim" + ] + }, "ios.8-arm": { "#import": [ "ios.8", @@ -1194,16 +1255,22 @@ "ios-arm64" ] }, - "ios.8-x64": { + "ios.8-sim-arm64": { "#import": [ - "ios.8", - "ios-x64" + "ios.8-sim", + "ios-sim-arm64" ] }, - "ios.8-x86": { + "ios.8-sim-x64": { "#import": [ - "ios.8", - "ios-x86" + "ios.8-sim", + "ios-sim-x64" + ] + }, + "ios.8-sim-x86": { + "#import": [ + "ios.8-sim", + "ios-sim-x86" ] }, "ios.9": { @@ -1211,6 +1278,11 @@ "ios.8" ] }, + "ios.9-sim": { + "#import": [ + "ios.8-sim" + ] + }, "ios.9-arm": { "#import": [ "ios.9", @@ -1223,16 +1295,22 @@ "ios.8-arm64" ] }, - "ios.9-x64": { + "ios.9-sim-arm64": { "#import": [ - "ios.9", - "ios.8-x64" + "ios.9-sim", + "ios.8-sim-arm64" ] }, - "ios.9-x86": { + "ios.9-sim-x64": { "#import": [ - "ios.9", - "ios.8-x86" + "ios.9-sim", + "ios.8-sim-x64" + ] + }, + "ios.9-sim-x86": { + "#import": [ + "ios.9-sim", + "ios.8-sim-x86" ] }, "linux": { @@ -2334,15 +2412,26 @@ "unix" ] }, + "tvos-sim": { + "#import": [ + "tvos" + ] + }, "tvos-arm64": { "#import": [ "tvos", "unix-arm64" ] }, - "tvos-x64": { + "tvos-sim-arm64": { "#import": [ - "tvos", + "tvos-arm64", + "tvos-sim" + ] + }, + "tvos-sim-x64": { + "#import": [ + "tvos-sim", "unix-x64" ] }, @@ -2351,16 +2440,27 @@ "tvos" ] }, + "tvos.10-sim": { + "#import": [ + "tvos" + ] + }, "tvos.10-arm64": { "#import": [ "tvos.10", "tvos-arm64" ] }, - "tvos.10-x64": { + "tvos.10-sim-arm64": { "#import": [ - "tvos.10", - "tvos-x64" + "tvos.10-sim", + "tvos-sim-arm64" + ] + }, + "tvos.10-sim-x64": { + "#import": [ + "tvos.10-sim", + "tvos-sim-x64" ] }, "tvos.11": { @@ -2368,16 +2468,27 @@ "tvos.10" ] }, + "tvos.11-sim": { + "#import": [ + "tvos.10-sim" + ] + }, "tvos.11-arm64": { "#import": [ "tvos.11", "tvos.10-arm64" ] }, - "tvos.11-x64": { + "tvos.11-sim-arm64": { "#import": [ - "tvos.11", - "tvos.10-x64" + "tvos.11-sim", + "tvos.10-sim-arm64" + ] + }, + "tvos.11-sim-x64": { + "#import": [ + "tvos.11-sim", + "tvos.10-sim-x64" ] }, "tvos.12": { @@ -2385,16 +2496,27 @@ "tvos.11" ] }, + "tvos.12-sim": { + "#import": [ + "tvos.11-sim" + ] + }, "tvos.12-arm64": { "#import": [ "tvos.12", "tvos.11-arm64" ] }, - "tvos.12-x64": { + "tvos.12-sim-arm64": { "#import": [ - "tvos.12", - "tvos.11-x64" + "tvos.12-sim", + "tvos.11-sim-arm64" + ] + }, + "tvos.12-sim-x64": { + "#import": [ + "tvos.12-sim", + "tvos.11-sim-x64" ] }, "tvos.13": { @@ -2402,16 +2524,27 @@ "tvos.12" ] }, + "tvos.13-sim": { + "#import": [ + "tvos.12-sim" + ] + }, "tvos.13-arm64": { "#import": [ "tvos.13", "tvos.12-arm64" ] }, - "tvos.13-x64": { + "tvos.13-sim-arm64": { "#import": [ - "tvos.13", - "tvos.12-x64" + "tvos.13-sim", + "tvos.12-sim-arm64" + ] + }, + "tvos.13-sim-x64": { + "#import": [ + "tvos.13-sim", + "tvos.12-sim-x64" ] }, "ubuntu": { diff --git a/src/mono/llvm/llvm-init.proj b/src/mono/llvm/llvm-init.proj index 67af4a2e1947b..c465ba2583683 100644 --- a/src/mono/llvm/llvm-init.proj +++ b/src/mono/llvm/llvm-init.proj @@ -15,28 +15,32 @@ $(runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion) - + - $(TargetArchitecture) - $(BuildArchitecture) + $(TargetArchitecture) + $(BuildArchitecture) + <_TargetArchRid>$(MonoLLVMHostOS)-$(MonoLLVMTargetArchitecture) + <_TargetArchRid Condition="'$(_TargetArchRid)' == 'osx.10.12-arm64'">osx.11.0-arm64 + <_BuildArchRid>$(MonoLLVMHostOS)-$(BuildArchitecture) + <_BuildArchRid Condition="'$(_BuildArchRid)' == 'osx.10.12-arm64'">osx.11.0-arm64 - - + + - - + + - - + + - - + + diff --git a/src/mono/mono.proj b/src/mono/mono.proj index 0298eb1a378f5..273914990680d 100644 --- a/src/mono/mono.proj +++ b/src/mono/mono.proj @@ -72,8 +72,10 @@ - - + + + + diff --git a/src/mono/monoaotcross.proj b/src/mono/monoaotcross.proj index 2db55ced33b77..08eddc1f13964 100644 --- a/src/mono/monoaotcross.proj +++ b/src/mono/monoaotcross.proj @@ -14,8 +14,8 @@ $(MonoAotTargets);Android-x64;Android-arm64;Android-x86;Android-arm $(MonoAotTargets);Android-x64 $(MonoAotTargets);Browser-wasm - $(MonoAotTargets);tvOS-x64;tvOS-arm64 - $(MonoAotTargets);iOS-x64;iOS-arm64;iOS-x86;iOS-arm + $(MonoAotTargets);tvOS-sim-x64;tvOS-sim-arm64;tvOS-arm64 + $(MonoAotTargets);iOS-sim-x64;iOS-sim-arm64;iOS-arm64;iOS-sim-x86;iOS-arm From 6f12cf7fbe68480a01222a22267dbe41030cc6c4 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Mon, 8 Mar 2021 09:24:00 -0500 Subject: [PATCH 02/48] WIP --- eng/Version.Details.xml | 8 -------- eng/Versions.props | 2 -- eng/native/configureplatform.cmake | 8 ++++---- src/libraries/Native/build-native.sh | 29 ++++++++++++++++++++++++---- src/mono/llvm/llvm-init.proj | 26 +++++++++++-------------- 5 files changed, 40 insertions(+), 33 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1bc9d71b95a73..be496d19a6417 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -162,14 +162,6 @@ https://github.com/dotnet/llvm-project f2a7fc3d94f1a30b822d79ffe453e6b88ae242cf - - https://github.com/dotnet/llvm-project - f2a7fc3d94f1a30b822d79ffe453e6b88ae242cf - - - https://github.com/dotnet/llvm-project - f2a7fc3d94f1a30b822d79ffe453e6b88ae242cf - https://github.com/dotnet/runtime 38017c3935de95d0335bac04f4901ddfc2718656 diff --git a/eng/Versions.props b/eng/Versions.props index aa18fac9bac0b..27dbe8e98f172 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -167,8 +167,6 @@ 9.0.1-alpha.1.21154.1 9.0.1-alpha.1.21154.1 9.0.1-alpha.1.21154.1 - 9.0.1-alpha.1.21154.1 - 9.0.1-alpha.1.21154.1 diff --git a/eng/native/configureplatform.cmake b/eng/native/configureplatform.cmake index 9e7e7743c0f9e..d67beb8ec5ed9 100644 --- a/eng/native/configureplatform.cmake +++ b/eng/native/configureplatform.cmake @@ -88,7 +88,7 @@ if(CLR_CMAKE_HOST_OS STREQUAL Darwin) set(CMAKE_ASM_COMPILE_OBJECT "${CMAKE_C_COMPILER} -o -c ") 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) diff --git a/src/libraries/Native/build-native.sh b/src/libraries/Native/build-native.sh index 0dc7c80d674fa..22f5cd28189e6 100755 --- a/src/libraries/Native/build-native.sh +++ b/src/libraries/Native/build-native.sh @@ -56,10 +56,10 @@ if [[ "$__BuildArch" == wasm ]]; then export CLR_CC=$(which emcc) export CLR_CXX=$(which em++) -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 && -z "$ROOTFS_DIR" ]]; then @@ -103,7 +103,7 @@ elif [[ "$__TargetOS" == Android && -z "$ROOTFS_DIR" ]]; then echo "Error: Unknown Android architecture $__BuildArch." exit 1 fi -elif [[ "$__TargetOS" == iOS ]]; then +elif [[ "$__TargetOS" == iOS-sim ]]; then __CMakeArgs="-DCMAKE_SYSTEM_NAME=iOS $__CMakeArgs" if [[ "$__BuildArch" == x64 ]]; then # set default iOS simulator deployment target (8.0 is the minimum supported by Xcode 11) @@ -114,6 +114,16 @@ elif [[ "$__TargetOS" == iOS ]]; then # keep in sync with src/mono/Directory.Build.props __CMakeArgs="-DCMAKE_OSX_SYSROOT=iphonesimulator -DCMAKE_OSX_DEPLOYMENT_TARGET=8.0 -DCMAKE_OSX_ARCHITECTURES=\"i386\" $__CMakeArgs" elif [[ "$__BuildArch" == arm64 ]]; then + # set default iOS device deployment target + # keep in sync with src/mono/Directory.Build.props + __CMakeArgs="-DCMAKE_OSX_SYSROOT=iphonesimulator -DCMAKE_OSX_DEPLOYMENT_TARGET=8.0 -DCMAKE_OSX_ARCHITECTURES=\"arm64\" $__CMakeArgs" + else + echo "Error: Unknown iOS-sim architecture $__BuildArch." + exit 1 + fi +elif [[ "$__TargetOS" == iOS ]]; then + __CMakeArgs="-DCMAKE_SYSTEM_NAME=iOS $__CMakeArgs" + if [[ "$__BuildArch" == arm64 ]]; then # set default iOS device deployment target # keep in sync with src/mono/Directory.Build.props __CMakeArgs="-DCMAKE_OSX_SYSROOT=iphoneos -DCMAKE_OSX_DEPLOYMENT_TARGET=8.0 -DCMAKE_OSX_ARCHITECTURES=\"arm64\" $__CMakeArgs" @@ -125,7 +135,7 @@ elif [[ "$__TargetOS" == iOS ]]; then echo "Error: Unknown iOS architecture $__BuildArch." exit 1 fi -elif [[ "$__TargetOS" == tvOS ]]; then +elif [[ "$__TargetOS" == tvOS-sim ]]; then __CMakeArgs="-DCMAKE_SYSTEM_NAME=tvOS $__CMakeArgs" # set default tvOS device deployment target # keep in sync with tvOSVersionMin in src/mono/Directory.Build.props @@ -133,6 +143,17 @@ elif [[ "$__TargetOS" == tvOS ]]; then if [[ "$__BuildArch" == x64 ]]; then __CMakeArgs="-DCMAKE_OSX_SYSROOT=appletvsimulator -DCMAKE_OSX_ARCHITECTURES=\"x86_64\" $__CMakeArgs" elif [[ "$__BuildArch" == arm64 ]]; then + __CMakeArgs="-DCMAKE_OSX_SYSROOT=appletvsimulator -DCMAKE_OSX_ARCHITECTURES=\"arm64\" $__CMakeArgs" + else + echo "Error: Unknown tvOS architecture $__BuildArch." + exit 1 + fi +elif [[ "$__TargetOS" == tvOS ]]; then + __CMakeArgs="-DCMAKE_SYSTEM_NAME=tvOS $__CMakeArgs" + # set default tvOS device deployment target + # keep in sync with tvOSVersionMin in src/mono/Directory.Build.props + __CMakeArgs="-DCMAKE_OSX_DEPLOYMENT_TARGET=9.0 $__CMakeArgs" + if [[ "$__BuildArch" == arm64 ]]; then __CMakeArgs="-DCMAKE_OSX_SYSROOT=appletvos -DCMAKE_OSX_ARCHITECTURES=\"arm64\" $__CMakeArgs" else echo "Error: Unknown tvOS architecture $__BuildArch." diff --git a/src/mono/llvm/llvm-init.proj b/src/mono/llvm/llvm-init.proj index c465ba2583683..67af4a2e1947b 100644 --- a/src/mono/llvm/llvm-init.proj +++ b/src/mono/llvm/llvm-init.proj @@ -15,32 +15,28 @@ $(runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion) - + - $(TargetArchitecture) - $(BuildArchitecture) - <_TargetArchRid>$(MonoLLVMHostOS)-$(MonoLLVMTargetArchitecture) - <_TargetArchRid Condition="'$(_TargetArchRid)' == 'osx.10.12-arm64'">osx.11.0-arm64 - <_BuildArchRid>$(MonoLLVMHostOS)-$(BuildArchitecture) - <_BuildArchRid Condition="'$(_BuildArchRid)' == 'osx.10.12-arm64'">osx.11.0-arm64 + $(TargetArchitecture) + $(BuildArchitecture) - - + + - - + + - - + + - - + + From 580aeb62b854dce7d9b48fa56644f22f199484c0 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Mon, 8 Mar 2021 10:31:47 -0500 Subject: [PATCH 03/48] WIP --- eng/native/build-commons.sh | 4 ++-- eng/native/configureplatform.cmake | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/native/build-commons.sh b/eng/native/build-commons.sh index 400a3f3d4226a..53983c797a5e8 100755 --- a/eng/native/build-commons.sh +++ b/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 diff --git a/eng/native/configureplatform.cmake b/eng/native/configureplatform.cmake index d67beb8ec5ed9..17c23ee215273 100644 --- a/eng/native/configureplatform.cmake +++ b/eng/native/configureplatform.cmake @@ -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) From 54d56d73b2da3ed3717c37130e30c4384dbf8b21 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Mon, 8 Mar 2021 11:02:18 -0500 Subject: [PATCH 04/48] WIP --- .../pkg/runtime.compatibility.json | 930 ++++++++++-------- .../pkg/runtime.json | 417 +++++--- .../pkg/runtimeGroups.props | 17 + 3 files changed, 782 insertions(+), 582 deletions(-) diff --git a/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.compatibility.json b/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.compatibility.json index 202fbc6a34537..7620c159cfbac 100644 --- a/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.compatibility.json +++ b/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.compatibility.json @@ -2641,13 +2641,6 @@ "any", "base" ], - "ios-sim": [ - "ios-sim", - "ios", - "unix", - "any", - "base" - ], "ios-arm": [ "ios-arm", "ios", @@ -2664,10 +2657,17 @@ "any", "base" ], + "ios-sim": [ + "ios-sim", + "ios", + "unix", + "any", + "base" + ], "ios-sim-arm64": [ "ios-sim-arm64", - "ios-arm64", "ios-sim", + "ios-arm64", "ios", "unix-arm64", "unix", @@ -2677,6 +2677,7 @@ "ios-sim-x64": [ "ios-sim-x64", "ios-sim", + "ios-x64", "ios", "unix-x64", "unix", @@ -2686,55 +2687,93 @@ "ios-sim-x86": [ "ios-sim-x86", "ios-sim", + "ios-x86", "ios", "unix-x86", "unix", "any", "base" ], - "ios.10": [ - "ios.10", - "ios.9", - "ios.8", + "ios-sim.10": [ + "ios-sim.10", + "ios-sim.9", + "ios-sim.8", + "ios-sim", "ios", "unix", "any", "base" ], - "ios.10-sim": [ - "ios.10-sim", - "ios.10", - "ios.9-sim", - "ios.9", - "ios.8-sim", - "ios.8", + "ios-sim.10-arm64": [ + "ios-sim.10-arm64", + "ios-sim.10", + "ios-sim.9-arm64", + "ios-sim.9", + "ios-sim.8-arm64", + "ios-sim.8", + "ios-sim-arm64", "ios-sim", + "ios-arm64", "ios", + "unix-arm64", "unix", "any", "base" ], - "ios.10-arm": [ - "ios.10-arm", - "ios.10", - "ios.9-arm", - "ios.9", - "ios.8-arm", - "ios.8", - "ios-arm", + "ios-sim.10-x64": [ + "ios-sim.10-x64", + "ios-sim.10", + "ios-sim.9-x64", + "ios-sim.9", + "ios-sim.8-x64", + "ios-sim.8", + "ios-sim-x64", + "ios-sim", + "ios-x64", "ios", - "unix-arm", + "unix-x64", "unix", "any", "base" ], - "ios.10-arm64": [ - "ios.10-arm64", - "ios.10", - "ios.9-arm64", - "ios.9", - "ios.8-arm64", - "ios.8", + "ios-sim.10-x86": [ + "ios-sim.10-x86", + "ios-sim.10", + "ios-sim.9-x86", + "ios-sim.9", + "ios-sim.8-x86", + "ios-sim.8", + "ios-sim-x86", + "ios-sim", + "ios-x86", + "ios", + "unix-x86", + "unix", + "any", + "base" + ], + "ios-sim.11": [ + "ios-sim.11", + "ios-sim.10", + "ios-sim.9", + "ios-sim.8", + "ios-sim", + "ios", + "unix", + "any", + "base" + ], + "ios-sim.11-arm64": [ + "ios-sim.11-arm64", + "ios-sim.11", + "ios-sim.10-arm64", + "ios-sim.10", + "ios-sim.9-arm64", + "ios-sim.9", + "ios-sim.8-arm64", + "ios-sim.8", + "ios-sim-arm64", + "ios-sim", "ios-arm64", "ios", "unix-arm64", @@ -2742,183 +2781,320 @@ "any", "base" ], - "ios.10-sim-arm64": [ - "ios.10-sim-arm64", - "ios.10-arm64", - "ios.10-sim", - "ios.10", - "ios.9-sim-arm64", - "ios.9-arm64", - "ios.9-sim", - "ios.9", - "ios.8-sim-arm64", - "ios.8-arm64", - "ios.8-sim", - "ios.8", + "ios-sim.11-x64": [ + "ios-sim.11-x64", + "ios-sim.11", + "ios-sim.10-x64", + "ios-sim.10", + "ios-sim.9-x64", + "ios-sim.9", + "ios-sim.8-x64", + "ios-sim.8", + "ios-sim-x64", + "ios-sim", + "ios-x64", + "ios", + "unix-x64", + "unix", + "any", + "base" + ], + "ios-sim.12": [ + "ios-sim.12", + "ios-sim.11", + "ios-sim.10", + "ios-sim.9", + "ios-sim.8", + "ios-sim", + "ios", + "unix", + "any", + "base" + ], + "ios-sim.12-arm64": [ + "ios-sim.12-arm64", + "ios-sim.12", + "ios-sim.11-arm64", + "ios-sim.11", + "ios-sim.10-arm64", + "ios-sim.10", + "ios-sim.9-arm64", + "ios-sim.9", + "ios-sim.8-arm64", + "ios-sim.8", "ios-sim-arm64", + "ios-sim", "ios-arm64", + "ios", + "unix-arm64", + "unix", + "any", + "base" + ], + "ios-sim.12-x64": [ + "ios-sim.12-x64", + "ios-sim.12", + "ios-sim.11-x64", + "ios-sim.11", + "ios-sim.10-x64", + "ios-sim.10", + "ios-sim.9-x64", + "ios-sim.9", + "ios-sim.8-x64", + "ios-sim.8", + "ios-sim-x64", "ios-sim", + "ios-x64", + "ios", + "unix-x64", + "unix", + "any", + "base" + ], + "ios-sim.13": [ + "ios-sim.13", + "ios-sim.12", + "ios-sim.11", + "ios-sim.10", + "ios-sim.9", + "ios-sim.8", + "ios-sim", + "ios", + "unix", + "any", + "base" + ], + "ios-sim.13-arm64": [ + "ios-sim.13-arm64", + "ios-sim.13", + "ios-sim.12-arm64", + "ios-sim.12", + "ios-sim.11-arm64", + "ios-sim.11", + "ios-sim.10-arm64", + "ios-sim.10", + "ios-sim.9-arm64", + "ios-sim.9", + "ios-sim.8-arm64", + "ios-sim.8", + "ios-sim-arm64", + "ios-sim", + "ios-arm64", "ios", "unix-arm64", "unix", "any", "base" ], - "ios.10-sim-x64": [ - "ios.10-sim-x64", - "ios.10-sim", - "ios.10", - "ios.9-sim-x64", - "ios.9-sim", - "ios.9", - "ios.8-sim-x64", - "ios.8-sim", - "ios.8", + "ios-sim.13-x64": [ + "ios-sim.13-x64", + "ios-sim.13", + "ios-sim.12-x64", + "ios-sim.12", + "ios-sim.11-x64", + "ios-sim.11", + "ios-sim.10-x64", + "ios-sim.10", + "ios-sim.9-x64", + "ios-sim.9", + "ios-sim.8-x64", + "ios-sim.8", "ios-sim-x64", "ios-sim", + "ios-x64", "ios", "unix-x64", "unix", "any", "base" ], - "ios.10-sim-x86": [ - "ios.10-sim-x86", - "ios.10-sim", - "ios.10", - "ios.9-sim-x86", - "ios.9-sim", - "ios.9", - "ios.8-x86", - "ios.8-sim", - "ios.8", + "ios-sim.8": [ + "ios-sim.8", + "ios-sim", + "ios", + "unix", + "any", + "base" + ], + "ios-sim.8-arm64": [ + "ios-sim.8-arm64", + "ios-sim.8", + "ios-sim-arm64", + "ios-sim", + "ios-arm64", + "ios", + "unix-arm64", + "unix", + "any", + "base" + ], + "ios-sim.8-x64": [ + "ios-sim.8-x64", + "ios-sim.8", + "ios-sim-x64", + "ios-sim", + "ios-x64", + "ios", + "unix-x64", + "unix", + "any", + "base" + ], + "ios-sim.8-x86": [ + "ios-sim.8-x86", + "ios-sim.8", "ios-sim-x86", "ios-sim", + "ios-x86", "ios", "unix-x86", "unix", "any", "base" ], - "ios.11": [ - "ios.11", - "ios.10", - "ios.9", - "ios.8", + "ios-sim.9": [ + "ios-sim.9", + "ios-sim.8", + "ios-sim", "ios", "unix", "any", "base" ], - "ios.11-sim": [ - "ios.11-sim", - "ios.11", - "ios.10-sim", + "ios-sim.9-arm64": [ + "ios-sim.9-arm64", + "ios-sim.9", + "ios-sim.8-arm64", + "ios-sim.8", + "ios-sim-arm64", + "ios-sim", + "ios-arm64", + "ios", + "unix-arm64", + "unix", + "any", + "base" + ], + "ios-sim.9-x64": [ + "ios-sim.9-x64", + "ios-sim.9", + "ios-sim.8-x64", + "ios-sim.8", + "ios-sim-x64", + "ios-sim", + "ios-x64", + "ios", + "unix-x64", + "unix", + "any", + "base" + ], + "ios-sim.9-x86": [ + "ios-sim.9-x86", + "ios-sim.9", + "ios-sim.8-x86", + "ios-sim.8", + "ios-sim-x86", + "ios-sim", + "ios-x86", + "ios", + "unix-x86", + "unix", + "any", + "base" + ], + "ios-x64": [ + "ios-x64", + "ios", + "unix-x64", + "unix", + "any", + "base" + ], + "ios-x86": [ + "ios-x86", + "ios", + "unix-x86", + "unix", + "any", + "base" + ], + "ios.10": [ "ios.10", - "ios.9-sim", "ios.9", - "ios.8-sim", "ios.8", - "ios-sim", "ios", "unix", "any", "base" ], - "ios.11-arm64": [ - "ios.11-arm64", - "ios.11", - "ios.10-arm64", + "ios.10-arm": [ + "ios.10-arm", "ios.10", - "ios.9-arm64", + "ios.9-arm", "ios.9", - "ios.8-arm64", + "ios.8-arm", "ios.8", - "ios-arm64", + "ios-arm", "ios", - "unix-arm64", + "unix-arm", "unix", "any", "base" ], - "ios.11-sim-arm64": [ - "ios.11-sim-arm64", - "ios.11-arm64", - "ios.11-sim", - "ios.11", - "ios.10-sim-arm64", + "ios.10-arm64": [ "ios.10-arm64", - "ios.10-sim", "ios.10", - "ios.9-sim-arm64", "ios.9-arm64", - "ios.9-sim", "ios.9", - "ios.8-simarm64", "ios.8-arm64", - "ios.8-sim", "ios.8", - "ios-sim-arm64", "ios-arm64", - "ios-sim", "ios", "unix-arm64", "unix", "any", "base" ], - "ios.11-sim-x64": [ - "ios.11-sim-x64", - "ios.11-sim", - "ios.11", - "ios.10-sim-x64", - "ios.10-sim", + "ios.10-x64": [ + "ios.10-x64", "ios.10", - "ios.9-sim-x64", - "ios.9-sim", + "ios.9-x64", "ios.9", "ios.8-x64", - "ios.8-sim", "ios.8", - "ios-sim-x64", - "ios-sim", + "ios-x64", "ios", "unix-x64", "unix", "any", "base" ], - "ios.12": [ - "ios.12", - "ios.11", + "ios.10-x86": [ + "ios.10-x86", "ios.10", + "ios.9-x86", "ios.9", + "ios.8-x86", "ios.8", + "ios-x86", "ios", + "unix-x86", "unix", "any", "base" ], - "ios.12-sim": [ - "ios.12-sim", - "ios.12", - "ios.11-sim", + "ios.11": [ "ios.11", - "ios.10-sim", "ios.10", - "ios.9-sim", "ios.9", - "ios.8-sim", "ios.8", - "ios-sim", "ios", "unix", "any", "base" ], - "ios.12-arm64": [ - "ios.12-arm64", - "ios.12", + "ios.11-arm64": [ "ios.11-arm64", "ios.11", "ios.10-arm64", @@ -2934,166 +3110,115 @@ "any", "base" ], - "ios.12-sim-arm64": [ - "ios.12-sim-arm64", - "ios.12-arm64", - "ios.12-sim", - "ios.12", - "ios.11-sim-arm64", - "ios.11-arm64", - "ios.11-sim", + "ios.11-x64": [ + "ios.11-x64", "ios.11", - "ios.10-sim-arm64", - "ios.10-arm64", - "ios.10-sim", + "ios.10-x64", "ios.10", - "ios.9-sim-arm64", - "ios.9-arm64", - "ios.9-sim", + "ios.9-x64", "ios.9", - "ios.8-sim-arm64", - "ios.8-arm64", - "ios.8-sim", + "ios.8-x64", "ios.8", - "ios-sim-arm64", - "ios-arm64", - "ios-sim", + "ios-x64", "ios", - "unix-arm64", + "unix-x64", "unix", "any", "base" ], - "ios.12-sim-x64": [ - "ios.12-sim-x64", - "ios.12-sim", + "ios.12": [ "ios.12", - "ios.11-sim-x64", - "ios.11-sim", "ios.11", - "ios.10-sim-x64", - "ios.10-sim", "ios.10", - "ios.9-sim-x64", - "ios.9-sim", "ios.9", - "ios.8-sim-x64", - "ios.8-sim", "ios.8", - "ios-sim-x64", - "ios-sim", "ios", - "unix-x64", "unix", "any", "base" ], - "ios.13": [ - "ios.13", + "ios.12-arm64": [ + "ios.12-arm64", "ios.12", + "ios.11-arm64", "ios.11", + "ios.10-arm64", "ios.10", + "ios.9-arm64", "ios.9", + "ios.8-arm64", "ios.8", + "ios-arm64", "ios", + "unix-arm64", "unix", "any", "base" ], - "ios.13-sim": [ - "ios.13-sim", - "ios.13", - "ios.12-sim", + "ios.12-x64": [ + "ios.12-x64", "ios.12", - "ios.11-sim", + "ios.11-x64", "ios.11", - "ios.10-sim", + "ios.10-x64", "ios.10", - "ios.9-sim", + "ios.9-x64", "ios.9", - "ios.8-sim", + "ios.8-x64", "ios.8", - "ios-sim", + "ios-x64", "ios", + "unix-x64", "unix", "any", "base" ], - "ios.13-arm64": [ - "ios.13-arm64", + "ios.13": [ "ios.13", - "ios.12-arm64", "ios.12", - "ios.11-arm64", "ios.11", - "ios.10-arm64", "ios.10", - "ios.9-arm64", "ios.9", - "ios.8-arm64", "ios.8", - "ios-arm64", "ios", - "unix-arm64", "unix", "any", "base" ], - "ios.13-sim-arm64": [ - "ios.13-sim-arm64", + "ios.13-arm64": [ "ios.13-arm64", - "ios.13-sim", "ios.13", - "ios.12-sim-arm64", "ios.12-arm64", - "ios.12-sim", "ios.12", - "ios.11-sim-arm64", "ios.11-arm64", - "ios.11-sim", "ios.11", - "ios.10-sim-arm64", "ios.10-arm64", - "ios.10-sim", "ios.10", - "ios.9-sim-arm64", "ios.9-arm64", - "ios.9-sim", "ios.9", - "ios.8-sim-arm64", "ios.8-arm64", - "ios.8-sim", "ios.8", - "ios-sim-arm64", "ios-arm64", - "ios-sim", "ios", "unix-arm64", "unix", "any", "base" ], - "ios.13-sim-x64": [ - "ios.13-sim-x64", - "ios.13-sim", + "ios.13-x64": [ + "ios.13-x64", "ios.13", - "ios.12-sim-x64", - "ios.12-sim", + "ios.12-x64", "ios.12", - "ios.11-sim-x64", - "ios.11-sim", + "ios.11-x64", "ios.11", - "ios.10-sim-x64", - "ios.10-sim", + "ios.10-x64", "ios.10", - "ios.9-sim-x64", - "ios.9-sim", + "ios.9-x64", "ios.9", - "ios.8-sim-x64", - "ios.8-sim", + "ios.8-x64", "ios.8", - "ios-sim-x64", - "ios-sim", + "ios-x64", "ios", "unix-x64", "unix", @@ -3107,15 +3232,6 @@ "any", "base" ], - "ios.8-sim": [ - "ios.8-sim", - "ios.8", - "ios-sim", - "ios", - "unix", - "any", - "base" - ], "ios.8-arm": [ "ios.8-arm", "ios.8", @@ -3136,38 +3252,20 @@ "any", "base" ], - "ios.8-sim-arm64": [ - "ios.8-sim-arm64", - "ios.8-arm64", - "ios.8-sim", - "ios.8", - "ios-sim-arm64", - "ios-arm64", - "ios-sim", - "ios", - "unix-arm64", - "unix", - "any", - "base" - ], - "ios.8-sim-x64": [ - "ios.8-sim-x64", - "ios.8-sim", + "ios.8-x64": [ + "ios.8-x64", "ios.8", - "ios-sim-x64", - "ios-sim", + "ios-x64", "ios", "unix-x64", "unix", "any", "base" ], - "ios.8-sim-x86": [ - "ios.8-sim-x86", - "ios.8-sim", + "ios.8-x86": [ + "ios.8-x86", "ios.8", - "ios-sim-x86", - "ios-sim", + "ios-x86", "ios", "unix-x86", "unix", @@ -3182,17 +3280,6 @@ "any", "base" ], - "ios.9-sim": [ - "ios.9-sim", - "ios.9", - "ios.8-sim", - "ios.8", - "ios-sim", - "ios", - "unix", - "any", - "base" - ], "ios.9-arm": [ "ios.9-arm", "ios.9", @@ -3217,48 +3304,24 @@ "any", "base" ], - "ios.9-sim-arm64": [ - "ios.9-sim-arm64", - "ios.9-arm64", - "ios.9-sim", + "ios.9-x64": [ + "ios.9-x64", "ios.9", - "ios.8-sim-arm64", - "ios.8-arm64", - "ios.8-sim", - "ios.8", - "ios-sim-arm64", - "ios-arm64", - "ios-sim", - "ios", - "unix-arm64", - "unix", - "any", - "base" - ], - "ios.9-sim-x64": [ - "ios.9-sim-x64", - "ios.9-sim", - "ios.9", - "ios.8-sim-x64", - "ios.8-sim", + "ios.8-x64", "ios.8", - "ios-sim-x64", - "ios-sim", + "ios-x64", "ios", "unix-x64", "unix", "any", "base" ], - "ios.9-sim-x86": [ - "ios.9-sim-x86", - "ios.9-sim", + "ios.9-x86": [ + "ios.9-x86", "ios.9", - "ios.8-sim-x86", - "ios.8-sim", + "ios.8-x86", "ios.8", - "ios-sim-x86", - "ios-sim", + "ios-x86", "ios", "unix-x86", "unix", @@ -5832,25 +5895,25 @@ "any", "base" ], - "tvos-sim": [ - "tvos-sim", + "tvos-arm64": [ + "tvos-arm64", "tvos", + "unix-arm64", "unix", "any", "base" ], - "tvos-arm64": [ - "tvos-arm64", + "tvos-sim": [ + "tvos-sim", "tvos", - "unix-arm64", "unix", "any", "base" ], "tvos-sim-arm64": [ "tvos-sim-arm64", - "tvos-arm64", "tvos-sim", + "tvos-arm64", "tvos", "unix-arm64", "unix", @@ -5860,155 +5923,187 @@ "tvos-sim-x64": [ "tvos-sim-x64", "tvos-sim", + "tvos-x64", "tvos", "unix-x64", "unix", "any", "base" ], - "tvos.10": [ - "tvos.10", + "tvos-sim.10": [ + "tvos-sim.10", + "tvos-sim", "tvos", "unix", "any", "base" ], - "tvos.10-sim": [ - "tvos.10-sim", - "tvos.10", + "tvos-sim.10-arm64": [ + "tvos-sim.10-arm64", + "tvos-sim.10", + "tvos-sim-arm64", "tvos-sim", + "tvos-arm64", "tvos", + "unix-arm64", "unix", "any", "base" ], - "tvos.10-arm64": [ - "tvos.10-arm64", - "tvos.10", - "tvos-arm64", + "tvos-sim.10-x64": [ + "tvos-sim.10-x64", + "tvos-sim.10", + "tvos-sim-x64", + "tvos-sim", + "tvos-x64", "tvos", - "unix-arm64", + "unix-x64", "unix", "any", "base" ], - "tvos.10-sim-arm64": [ - "tvos.10-sim-arm64", - "tvos.10-arm64", - "tvos.10-sim", - "tvos.10", + "tvos-sim.11": [ + "tvos-sim.11", + "tvos-sim.10", + "tvos-sim", + "tvos", + "unix", + "any", + "base" + ], + "tvos-sim.11-arm64": [ + "tvos-sim.11-arm64", + "tvos-sim.11", + "tvos-sim.10-arm64", + "tvos-sim.10", "tvos-sim-arm64", - "tvos-arm64", "tvos-sim", + "tvos-arm64", "tvos", "unix-arm64", "unix", "any", "base" ], - "tvos.10-sim-x64": [ - "tvos.10-sim-x64", - "tvos.10-sim", - "tvos.10", + "tvos-sim.11-x64": [ + "tvos-sim.11-x64", + "tvos-sim.11", + "tvos-sim.10-x64", + "tvos-sim.10", "tvos-sim-x64", "tvos-sim", + "tvos-x64", "tvos", "unix-x64", "unix", "any", "base" ], - "tvos.11": [ - "tvos.11", - "tvos.10", + "tvos-sim.12": [ + "tvos-sim.12", + "tvos-sim.11", + "tvos-sim.10", + "tvos-sim", "tvos", "unix", "any", "base" ], - "tvos.11-sim": [ - "tvos.11-sim", - "tvos.11", - "tvos.10-sim", - "tvos.10", + "tvos-sim.12-arm64": [ + "tvos-sim.12-arm64", + "tvos-sim.12", + "tvos-sim.11-arm64", + "tvos-sim.11", + "tvos-sim.10-arm64", + "tvos-sim.10", + "tvos-sim-arm64", "tvos-sim", + "tvos-arm64", "tvos", + "unix-arm64", "unix", "any", "base" ], - "tvos.11-arm64": [ - "tvos.11-arm64", - "tvos.11", - "tvos.10-arm64", - "tvos.10", - "tvos-arm64", + "tvos-sim.12-x64": [ + "tvos-sim.12-x64", + "tvos-sim.12", + "tvos-sim.11-x64", + "tvos-sim.11", + "tvos-sim.10-x64", + "tvos-sim.10", + "tvos-sim-x64", + "tvos-sim", + "tvos-x64", "tvos", - "unix-arm64", + "unix-x64", "unix", "any", "base" ], - "tvos.11-sim-arm64": [ - "tvos.11-sim-arm64", - "tvos.11-arm64", - "tvos.11-sim", - "tvos.11", - "tvos.10-sim-arm64", - "tvos.10-arm64", - "tvos.10-sim", - "tvos.10", + "tvos-sim.13": [ + "tvos-sim.13", + "tvos-sim.12", + "tvos-sim.11", + "tvos-sim.10", + "tvos-sim", + "tvos", + "unix", + "any", + "base" + ], + "tvos-sim.13-arm64": [ + "tvos-sim.13-arm64", + "tvos-sim.13", + "tvos-sim.12-arm64", + "tvos-sim.12", + "tvos-sim.11-arm64", + "tvos-sim.11", + "tvos-sim.10-arm64", + "tvos-sim.10", "tvos-sim-arm64", - "tvos-arm64", "tvos-sim", + "tvos-arm64", "tvos", "unix-arm64", "unix", "any", "base" ], - "tvos.11-sim-x64": [ - "tvos.11-sim-x64", - "tvos.11-sim", - "tvos.11", - "tvos.10-sim-x64", - "tvos.10-sim", - "tvos.10", + "tvos-sim.13-x64": [ + "tvos-sim.13-x64", + "tvos-sim.13", + "tvos-sim.12-x64", + "tvos-sim.12", + "tvos-sim.11-x64", + "tvos-sim.11", + "tvos-sim.10-x64", + "tvos-sim.10", "tvos-sim-x64", "tvos-sim", + "tvos-x64", "tvos", "unix-x64", "unix", "any", "base" ], - "tvos.12": [ - "tvos.12", - "tvos.11", - "tvos.10", + "tvos-x64": [ + "tvos-x64", "tvos", + "unix-x64", "unix", "any", "base" ], - "tvos.12-sim": [ - "tvos.12-sim", - "tvos.12", - "tvos.11-sim", - "tvos.11", - "tvos.10-sim", + "tvos.10": [ "tvos.10", - "tvos-sim", "tvos", "unix", "any", "base" ], - "tvos.12-arm64": [ - "tvos.12-arm64", - "tvos.12", - "tvos.11-arm64", - "tvos.11", + "tvos.10-arm64": [ "tvos.10-arm64", "tvos.10", "tvos-arm64", @@ -6018,48 +6113,49 @@ "any", "base" ], - "tvos.12-sim-arm64": [ - "tvos.12-sim-arm64", - "tvos.12-arm64", - "tvos.12-sim", - "tvos.12", - "tvos.11-sim-arm64", + "tvos.10-x64": [ + "tvos.10-x64", + "tvos.10", + "tvos-x64", + "tvos", + "unix-x64", + "unix", + "any", + "base" + ], + "tvos.11": [ + "tvos.11", + "tvos.10", + "tvos", + "unix", + "any", + "base" + ], + "tvos.11-arm64": [ "tvos.11-arm64", - "tvos.11-sim", "tvos.11", - "tvos.10-sim-arm64", "tvos.10-arm64", - "tvos.10-sim", "tvos.10", - "tvos-sim-arm64", "tvos-arm64", - "tvos-sim", "tvos", "unix-arm64", "unix", "any", "base" ], - "tvos.12-sim-x64": [ - "tvos.12-sim-x64", - "tvos.12-sim", - "tvos.12", - "tvos.11-sim-x64", - "tvos.11-sim", + "tvos.11-x64": [ + "tvos.11-x64", "tvos.11", - "tvos.10-sim-x64", - "tvos.10-sim", + "tvos.10-x64", "tvos.10", - "tvos-sim-x64", - "tvos-sim", + "tvos-x64", "tvos", "unix-x64", "unix", "any", "base" ], - "tvos.13": [ - "tvos.13", + "tvos.12": [ "tvos.12", "tvos.11", "tvos.10", @@ -6068,78 +6164,70 @@ "any", "base" ], - "tvos.13-sim": [ - "tvos.13-sim", - "tvos.13", - "tvos.12-sim", + "tvos.12-arm64": [ + "tvos.12-arm64", "tvos.12", - "tvos.11-sim", + "tvos.11-arm64", "tvos.11", - "tvos.10-sim", + "tvos.10-arm64", "tvos.10", - "tvos-sim", + "tvos-arm64", "tvos", + "unix-arm64", "unix", "any", "base" ], - "tvos.13-arm64": [ - "tvos.13-arm64", + "tvos.12-x64": [ + "tvos.12-x64", + "tvos.12", + "tvos.11-x64", + "tvos.11", + "tvos.10-x64", + "tvos.10", + "tvos-x64", + "tvos", + "unix-x64", + "unix", + "any", + "base" + ], + "tvos.13": [ "tvos.13", - "tvos.12-arm64", "tvos.12", - "tvos.11-arm64", "tvos.11", - "tvos.10-arm64", "tvos.10", - "tvos-arm64", "tvos", - "unix-arm64", "unix", "any", "base" ], - "tvos.13-sim-arm64": [ - "tvos.13-sim-arm64", + "tvos.13-arm64": [ "tvos.13-arm64", - "tvos.13-sim", "tvos.13", - "tvos.12-sim-arm64", "tvos.12-arm64", - "tvos.12-sim", "tvos.12", - "tvos.11-sim-arm64", "tvos.11-arm64", - "tvos.11-sim", "tvos.11", - "tvos.10-sim-arm64", "tvos.10-arm64", - "tvos.10-sim", "tvos.10", - "tvos-sim-arm64", "tvos-arm64", - "tvos-sim", "tvos", "unix-arm64", "unix", "any", "base" ], - "tvos.13-sim-x64": [ - "tvos.13-sim-x64", - "tvos.13-sim", + "tvos.13-x64": [ + "tvos.13-x64", "tvos.13", - "tvos.12-sim-x64", - "tvos.12-sim", + "tvos.12-x64", "tvos.12", - "tvos.11-sim-x64", - "tvos.11-sim", + "tvos.11-x64", "tvos.11", - "tvos.10-sim-x64", - "tvos.10-sim", + "tvos.10-x64", "tvos.10", - "tvos-sim-x64", - "tvos-sim", + "tvos-x64", "tvos", "unix-x64", "unix", @@ -7857,4 +7945,4 @@ "any", "base" ] -} +} \ No newline at end of file diff --git a/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.json b/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.json index 78aa173e896e5..5b6c4b1f5882f 100644 --- a/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.json +++ b/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.json @@ -1073,12 +1073,6 @@ "unix" ] }, - "ios-sim": { - "#import": [ - "ios", - "unix" - ] - }, "ios-arm": { "#import": [ "ios", @@ -1091,156 +1085,244 @@ "unix-arm64" ] }, + "ios-sim": { + "#import": [ + "ios" + ] + }, "ios-sim-arm64": { "#import": [ "ios-sim", - "unix-arm64" + "ios-arm64" ] }, "ios-sim-x64": { "#import": [ "ios-sim", - "unix-x64" + "ios-x64" ] }, "ios-sim-x86": { "#import": [ "ios-sim", - "unix-x86" + "ios-x86" ] }, - "ios.10": { + "ios-sim.10": { "#import": [ - "ios.9" + "ios-sim.9" ] }, - "ios.10-sim": { + "ios-sim.10-arm64": { "#import": [ - "ios.9-sim" + "ios-sim.10", + "ios-sim.9-arm64" ] }, - "ios.10-arm": { + "ios-sim.10-x64": { "#import": [ - "ios.10", - "ios.9-arm" + "ios-sim.10", + "ios-sim.9-x64" ] }, - "ios.10-arm64": { + "ios-sim.10-x86": { "#import": [ - "ios.10", - "ios.9-arm64" + "ios-sim.10", + "ios-sim.9-x86" ] }, - "ios.10-sim-arm64": { + "ios-sim.11": { "#import": [ - "ios.10-sim", - "ios.9-sim-arm64" + "ios-sim.10" ] }, - "ios.10-sim-x64": { + "ios-sim.11-arm64": { "#import": [ - "ios.10-sim", - "ios.9-sim-x64" + "ios-sim.11", + "ios-sim.10-arm64" ] }, - "ios.10-sim-x86": { + "ios-sim.11-x64": { "#import": [ - "ios.10-sim", - "ios.9-sim-x86" + "ios-sim.11", + "ios-sim.10-x64" ] }, - "ios.11": { + "ios-sim.12": { "#import": [ - "ios.10" + "ios-sim.11" ] }, - "ios.11-sim": { + "ios-sim.12-arm64": { "#import": [ - "ios.10-sim" + "ios-sim.12", + "ios-sim.11-arm64" ] }, - "ios.11-arm64": { + "ios-sim.12-x64": { "#import": [ - "ios.11", - "ios.10-arm64" + "ios-sim.12", + "ios-sim.11-x64" ] }, - "ios.11-sim-arm64": { + "ios-sim.13": { "#import": [ - "ios.11-sim", - "ios.10-sim-arm64" + "ios-sim.12" ] }, - "ios.11-sim-x64": { + "ios-sim.13-arm64": { "#import": [ - "ios.11-sim", - "ios.10-sim-x64" + "ios-sim.13", + "ios-sim.12-arm64" ] }, - "ios.12": { + "ios-sim.13-x64": { "#import": [ - "ios.11" + "ios-sim.13", + "ios-sim.12-x64" ] }, - "ios.12-sim": { + "ios-sim.8": { "#import": [ - "ios.11-sim" + "ios-sim" ] }, - "ios.12-arm64": { + "ios-sim.8-arm64": { "#import": [ - "ios.12", - "ios.11-arm64" + "ios-sim.8", + "ios-sim-arm64" ] }, - "ios.12-sim-arm64": { + "ios-sim.8-x64": { "#import": [ - "ios.12-sim", - "ios.11-sim-arm64" + "ios-sim.8", + "ios-sim-x64" ] }, - "ios.12-sim-x64": { + "ios-sim.8-x86": { "#import": [ - "ios.12-sim", - "ios.11-sim-x64" + "ios-sim.8", + "ios-sim-x86" ] }, - "ios.13": { + "ios-sim.9": { "#import": [ - "ios.12" + "ios-sim.8" ] }, - "ios.13-sim": { + "ios-sim.9-arm64": { "#import": [ - "ios.12-sim" + "ios-sim.9", + "ios-sim.8-arm64" ] }, - "ios.13-arm64": { + "ios-sim.9-x64": { "#import": [ - "ios.13", - "ios.12-arm64" + "ios-sim.9", + "ios-sim.8-x64" ] }, - "ios.13-sim-arm64": { + "ios-sim.9-x86": { "#import": [ - "ios.13-sim", - "ios.12-sim-arm64" + "ios-sim.9", + "ios-sim.8-x86" ] }, - "ios.13-sim-x64": { + "ios-x64": { "#import": [ - "ios.13-sim", - "ios.12-sim-x64" + "ios", + "unix-x64" ] }, - "ios.8": { + "ios-x86": { "#import": [ - "ios" + "ios", + "unix-x86" ] }, - "ios.8-sim": { + "ios.10": { "#import": [ - "ios-sim" + "ios.9" + ] + }, + "ios.10-arm": { + "#import": [ + "ios.10", + "ios.9-arm" + ] + }, + "ios.10-arm64": { + "#import": [ + "ios.10", + "ios.9-arm64" + ] + }, + "ios.10-x64": { + "#import": [ + "ios.10", + "ios.9-x64" + ] + }, + "ios.10-x86": { + "#import": [ + "ios.10", + "ios.9-x86" + ] + }, + "ios.11": { + "#import": [ + "ios.10" + ] + }, + "ios.11-arm64": { + "#import": [ + "ios.11", + "ios.10-arm64" + ] + }, + "ios.11-x64": { + "#import": [ + "ios.11", + "ios.10-x64" + ] + }, + "ios.12": { + "#import": [ + "ios.11" + ] + }, + "ios.12-arm64": { + "#import": [ + "ios.12", + "ios.11-arm64" + ] + }, + "ios.12-x64": { + "#import": [ + "ios.12", + "ios.11-x64" + ] + }, + "ios.13": { + "#import": [ + "ios.12" + ] + }, + "ios.13-arm64": { + "#import": [ + "ios.13", + "ios.12-arm64" + ] + }, + "ios.13-x64": { + "#import": [ + "ios.13", + "ios.12-x64" + ] + }, + "ios.8": { + "#import": [ + "ios" ] }, "ios.8-arm": { @@ -1255,22 +1337,16 @@ "ios-arm64" ] }, - "ios.8-sim-arm64": { - "#import": [ - "ios.8-sim", - "ios-sim-arm64" - ] - }, - "ios.8-sim-x64": { + "ios.8-x64": { "#import": [ - "ios.8-sim", - "ios-sim-x64" + "ios.8", + "ios-x64" ] }, - "ios.8-sim-x86": { + "ios.8-x86": { "#import": [ - "ios.8-sim", - "ios-sim-x86" + "ios.8", + "ios-x86" ] }, "ios.9": { @@ -1278,11 +1354,6 @@ "ios.8" ] }, - "ios.9-sim": { - "#import": [ - "ios.8-sim" - ] - }, "ios.9-arm": { "#import": [ "ios.9", @@ -1295,22 +1366,16 @@ "ios.8-arm64" ] }, - "ios.9-sim-arm64": { + "ios.9-x64": { "#import": [ - "ios.9-sim", - "ios.8-sim-arm64" - ] - }, - "ios.9-sim-x64": { - "#import": [ - "ios.9-sim", - "ios.8-sim-x64" + "ios.9", + "ios.8-x64" ] }, - "ios.9-sim-x86": { + "ios.9-x86": { "#import": [ - "ios.9-sim", - "ios.8-sim-x86" + "ios.9", + "ios.8-x86" ] }, "linux": { @@ -2412,139 +2477,169 @@ "unix" ] }, - "tvos-sim": { - "#import": [ - "tvos" - ] - }, "tvos-arm64": { "#import": [ "tvos", "unix-arm64" ] }, + "tvos-sim": { + "#import": [ + "tvos" + ] + }, "tvos-sim-arm64": { "#import": [ - "tvos-arm64", - "tvos-sim" + "tvos-sim", + "tvos-arm64" ] }, "tvos-sim-x64": { "#import": [ "tvos-sim", - "unix-x64" + "tvos-x64" ] }, - "tvos.10": { + "tvos-sim.10": { "#import": [ - "tvos" + "tvos-sim" ] }, - "tvos.10-sim": { + "tvos-sim.10-arm64": { "#import": [ - "tvos" + "tvos-sim.10", + "tvos-sim-arm64" ] }, - "tvos.10-arm64": { + "tvos-sim.10-x64": { "#import": [ - "tvos.10", - "tvos-arm64" + "tvos-sim.10", + "tvos-sim-x64" ] }, - "tvos.10-sim-arm64": { + "tvos-sim.11": { "#import": [ - "tvos.10-sim", - "tvos-sim-arm64" + "tvos-sim.10" ] }, - "tvos.10-sim-x64": { + "tvos-sim.11-arm64": { "#import": [ - "tvos.10-sim", - "tvos-sim-x64" + "tvos-sim.11", + "tvos-sim.10-arm64" ] }, - "tvos.11": { + "tvos-sim.11-x64": { "#import": [ - "tvos.10" + "tvos-sim.11", + "tvos-sim.10-x64" ] }, - "tvos.11-sim": { + "tvos-sim.12": { "#import": [ - "tvos.10-sim" + "tvos-sim.11" ] }, - "tvos.11-arm64": { + "tvos-sim.12-arm64": { "#import": [ - "tvos.11", - "tvos.10-arm64" + "tvos-sim.12", + "tvos-sim.11-arm64" ] }, - "tvos.11-sim-arm64": { + "tvos-sim.12-x64": { "#import": [ - "tvos.11-sim", - "tvos.10-sim-arm64" + "tvos-sim.12", + "tvos-sim.11-x64" ] }, - "tvos.11-sim-x64": { + "tvos-sim.13": { "#import": [ - "tvos.11-sim", - "tvos.10-sim-x64" + "tvos-sim.12" ] }, - "tvos.12": { + "tvos-sim.13-arm64": { "#import": [ - "tvos.11" + "tvos-sim.13", + "tvos-sim.12-arm64" ] }, - "tvos.12-sim": { + "tvos-sim.13-x64": { "#import": [ - "tvos.11-sim" + "tvos-sim.13", + "tvos-sim.12-x64" ] }, - "tvos.12-arm64": { + "tvos-x64": { "#import": [ - "tvos.12", - "tvos.11-arm64" + "tvos", + "unix-x64" ] }, - "tvos.12-sim-arm64": { + "tvos.10": { "#import": [ - "tvos.12-sim", - "tvos.11-sim-arm64" + "tvos" ] }, - "tvos.12-sim-x64": { + "tvos.10-arm64": { "#import": [ - "tvos.12-sim", - "tvos.11-sim-x64" + "tvos.10", + "tvos-arm64" ] }, - "tvos.13": { + "tvos.10-x64": { "#import": [ - "tvos.12" + "tvos.10", + "tvos-x64" ] }, - "tvos.13-sim": { + "tvos.11": { "#import": [ - "tvos.12-sim" + "tvos.10" ] }, - "tvos.13-arm64": { + "tvos.11-arm64": { "#import": [ - "tvos.13", - "tvos.12-arm64" + "tvos.11", + "tvos.10-arm64" ] }, - "tvos.13-sim-arm64": { + "tvos.11-x64": { "#import": [ - "tvos.13-sim", - "tvos.12-sim-arm64" + "tvos.11", + "tvos.10-x64" ] }, - "tvos.13-sim-x64": { + "tvos.12": { + "#import": [ + "tvos.11" + ] + }, + "tvos.12-arm64": { + "#import": [ + "tvos.12", + "tvos.11-arm64" + ] + }, + "tvos.12-x64": { "#import": [ - "tvos.13-sim", - "tvos.12-sim-x64" + "tvos.12", + "tvos.11-x64" + ] + }, + "tvos.13": { + "#import": [ + "tvos.12" + ] + }, + "tvos.13-arm64": { + "#import": [ + "tvos.13", + "tvos.12-arm64" + ] + }, + "tvos.13-x64": { + "#import": [ + "tvos.13", + "tvos.12-x64" ] }, "ubuntu": { @@ -3375,4 +3470,4 @@ ] } } -} +} \ No newline at end of file diff --git a/src/libraries/Microsoft.NETCore.Platforms/pkg/runtimeGroups.props b/src/libraries/Microsoft.NETCore.Platforms/pkg/runtimeGroups.props index 3aa0280f4ab69..b2fa3ed2fba9a 100644 --- a/src/libraries/Microsoft.NETCore.Platforms/pkg/runtimeGroups.props +++ b/src/libraries/Microsoft.NETCore.Platforms/pkg/runtimeGroups.props @@ -91,6 +91,17 @@ 8;9;10;11;12;13 + + ios + x86 + 8;9;10 + + + ios + arm64;x64 + 8;9;10;11;12;13 + + ubuntu.14.04 @@ -210,6 +221,12 @@ 10;11;12;13 + + tvos + arm64;x64 + 10;11;12;13 + + debian x64;x86;arm From 9e7ed109a1cfc9e08909d58d802f4402d763adbe Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Mon, 8 Mar 2021 11:24:47 -0500 Subject: [PATCH 05/48] CI --- eng/pipelines/common/global-build-job.yml | 4 +- eng/pipelines/common/platform-matrix.yml | 104 ++++++++++++------ .../templates/runtimes/build-test-job.yml | 4 +- eng/pipelines/common/xplat-setup.yml | 4 +- eng/pipelines/coreclr/templates/build-job.yml | 4 +- eng/pipelines/installer/jobs/base-job.yml | 6 +- eng/pipelines/libraries/base-job.yml | 2 +- eng/pipelines/libraries/build-job.yml | 4 +- eng/pipelines/mono/templates/build-job.yml | 12 +- .../mono/templates/generate-offsets.yml | 2 +- eng/pipelines/runtime-official.yml | 14 ++- eng/pipelines/runtime.yml | 10 +- 12 files changed, 112 insertions(+), 58 deletions(-) diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index 3baff96b8df14..241aee178e7f0 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -108,7 +108,7 @@ jobs: artifact: Mono_Offsets_${{monoCrossAOTTargetOS}} path: '$(Build.SourcesDirectory)/artifacts/obj/mono/offsetfiles' - - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS', 'Android') }}: + - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'iOS-sim', 'tvOS', 'tvOS-sim', 'Android') }}: - script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh ${{ parameters.osGroup }} ${{ parameters.archType }} azDO displayName: Install Build Dependencies @@ -123,7 +123,7 @@ jobs: ${{ if eq(parameters.useContinueOnErrorDuringBuild, true) }}: continueOnError: ${{ parameters.shouldContinueOnError }} - - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS', 'Android') }}: + - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'iOS-sim', 'tvOS', 'tvOS-sim', 'Android') }}: - script: | du -sh $(Build.SourcesDirectory)/* df -h diff --git a/eng/pipelines/common/platform-matrix.yml b/eng/pipelines/common/platform-matrix.yml index cbf5370a09300..b7606c5ab1ac5 100644 --- a/eng/pipelines/common/platform-matrix.yml +++ b/eng/pipelines/common/platform-matrix.yml @@ -365,18 +365,39 @@ 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-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 +407,18 @@ 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 + osGroup: tvOS-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 +428,18 @@ 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 }} @@ -428,18 +449,18 @@ jobs: helixQueueGroup: ${{ parameters.helixQueueGroup }} ${{ insert }}: ${{ parameters.jobParameters }} -# iOS x86 +# iOS arm64 -- ${{ if containsValue(parameters.platforms, 'iOS_x86') }}: +- ${{ if containsValue(parameters.platforms, 'iOS_arm64') }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} osGroup: iOS - archType: x86 - targetRid: ios-x86 - platform: iOS_x86 + archType: arm64 + targetRid: ios-arm64 + platform: iOS_arm64 jobParameters: runtimeFlavor: mono stagedBuild: ${{ parameters.stagedBuild }} @@ -447,21 +468,20 @@ jobs: ${{ if eq(parameters.passPlatforms, true) }}: platforms: ${{ parameters.platforms }} helixQueueGroup: ${{ parameters.helixQueueGroup }} - managedTestBuildOsGroup: OSX ${{ insert }}: ${{ parameters.jobParameters }} -# iOS arm +# iOS Simulator x64 -- ${{ if containsValue(parameters.platforms, 'iOS_arm') }}: +- ${{ if containsValue(parameters.platforms, 'iOS-sim_x64') }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: iOS - archType: arm - targetRid: ios-arm - platform: iOS_arm + osGroup: iOS-sim + archType: x64 + targetRid: ios-sim-x64 + platform: iOS-sim_x64 jobParameters: runtimeFlavor: mono stagedBuild: ${{ parameters.stagedBuild }} @@ -471,18 +491,40 @@ jobs: helixQueueGroup: ${{ parameters.helixQueueGroup }} ${{ insert }}: ${{ parameters.jobParameters }} -# iOS arm64 +# iOS Simulator x86 -- ${{ if containsValue(parameters.platforms, 'iOS_arm64') }}: +- ${{ if containsValue(parameters.platforms, 'iOS-sim_x86') }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: iOS + osGroup: iOS-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 Simulator arm64 + +- ${{ if containsValue(parameters.platforms, 'iOS-sim_arm64') }}: + - template: xplat-setup.yml + parameters: + jobTemplate: ${{ parameters.jobTemplate }} + helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} + osGroup: iOS-sim archType: arm64 - targetRid: ios-arm64 - platform: iOS_arm64 + targetRid: ios-sim-arm64 + platform: iOS-sim_arm64 jobParameters: runtimeFlavor: mono stagedBuild: ${{ parameters.stagedBuild }} diff --git a/eng/pipelines/common/templates/runtimes/build-test-job.yml b/eng/pipelines/common/templates/runtimes/build-test-job.yml index 14d17b0849b5b..13b086e407821 100644 --- a/eng/pipelines/common/templates/runtimes/build-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/build-test-job.yml @@ -116,7 +116,7 @@ jobs: artifactName: '$(coreClrProductArtifactName)' displayName: 'CoreCLR product build' - - ${{ if in(parameters.osGroup, 'OSX', 'iOS','tvOS') }}: + - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'iOS-sim', 'tvOS', 'tvOS-sim') }}: - script: | du -sh $(Build.SourcesDirectory)/* df -h @@ -126,7 +126,7 @@ jobs: - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) allTargets skipnative skipgeneratelayout skiptestwrappers $(buildConfig) $(archType) $(crossArg) $(priorityArg) ci $(librariesOverrideArg) displayName: Build managed test components - - ${{ if in(parameters.osGroup, 'OSX', 'iOS','tvOS') }}: + - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'iOS-sim', 'tvOS', 'tvOS-sim') }}: - script: | du -sh $(Build.SourcesDirectory)/* df -h diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml index 5245e0314a82b..d4fbf8ea21f49 100644 --- 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', 'MacCatalyst', 'iOS', 'tvOS') }}: + ${{ if in(parameters.osGroup, 'OSX', 'MacCatalyst', 'iOS', 'iOS-sim', 'tvOS', 'tvOS-sim') }}: 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', 'MacCatalyst', 'iOS', 'tvOS')) }}: + ${{ if and(eq(parameters.jobParameters.timeoutInMinutes, ''), in(parameters.osGroup, 'OSX', 'MacCatalyst', 'iOS', 'iOS-sim', 'tvOS', 'tvOS-sim')) }}: timeoutInMinutes: 120 ${{ insert }}: ${{ parameters.jobParameters }} ${{ if ne(parameters.helixQueuesTemplate, '') }}: diff --git a/eng/pipelines/coreclr/templates/build-job.yml b/eng/pipelines/coreclr/templates/build-job.yml index 349cdfd0bb215..440a4e7e741bd 100644 --- a/eng/pipelines/coreclr/templates/build-job.yml +++ b/eng/pipelines/coreclr/templates/build-job.yml @@ -181,7 +181,7 @@ jobs: continueOnError: false condition: and(succeeded(), in(variables['SignType'], 'real', 'test')) - - ${{ if in(parameters.osGroup, 'OSX', 'iOS','tvOS') }}: + - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'iOS-sim', 'tvOS', 'tvOS-sim') }}: - script: | du -sh $(Build.SourcesDirectory)/* df -h @@ -200,7 +200,7 @@ jobs: - script: set __TestIntermediateDir=int&&$(Build.SourcesDirectory)/src/coreclr/build-runtime$(scriptExt) $(buildConfig) $(archType) -ci $(ninjaArg) $(enforcePgoArg) $(pgoInstrumentArg) $(officialBuildIdArg) $(clrInterpreterBuildArg) displayName: Build CoreCLR Runtime - - ${{ if in(parameters.osGroup, 'OSX', 'iOS','tvOS') }}: + - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'iOS-sim', 'tvOS', 'tvOS-sim') }}: - script: | du -sh $(Build.SourcesDirectory)/* df -h diff --git a/eng/pipelines/installer/jobs/base-job.yml b/eng/pipelines/installer/jobs/base-job.yml index 5941160fbdb32..e501a53439430 100644 --- a/eng/pipelines/installer/jobs/base-job.yml +++ b/eng/pipelines/installer/jobs/base-job.yml @@ -150,7 +150,7 @@ jobs: $(CommonMSBuildArgs) $(OfficialBuildArg) - - ${{ if in(parameters.osGroup, 'iOS', 'tvOS', 'Android', 'Browser') }}: + - ${{ if in(parameters.osGroup, 'iOS', 'iOS-sim', 'tvOS', 'tvOS-sim', 'Android', 'Browser') }}: - name: CommonMSBuildArgs value: >- @@ -379,7 +379,7 @@ jobs: displayName: 'Libraries artifacts' cleanUnpackFolder: false - - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS') }}: + - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'iOS-sim', 'tvOS', 'tvOS-sim') }}: - script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh ${{ parameters.osGroup }} ${{ parameters.archType }} azDO displayName: Install Build Dependencies @@ -415,7 +415,7 @@ jobs: displayName: Build and Package continueOnError: ${{ and(eq(variables.SkipTests, false), eq(parameters.shouldContinueOnError, true)) }} - - ${{ if in(parameters.osGroup, 'OSX', 'iOS','tvOS') }}: + - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'iOS-sim', 'tvOS', 'tvOS-sim') }}: - script: | du -sh $(Build.SourcesDirectory)/* df -h diff --git a/eng/pipelines/libraries/base-job.yml b/eng/pipelines/libraries/base-job.yml index bea30446deed6..519879ccd38f0 100644 --- a/eng/pipelines/libraries/base-job.yml +++ b/eng/pipelines/libraries/base-job.yml @@ -70,7 +70,7 @@ jobs: - _runtimeOSArg: /p:RuntimeOS=ubuntu.16.04 # force a value for OS when cross-building - - ${{ if in(parameters.osGroup, 'Browser', 'iOS', 'tvOS', 'Android', 'FreeBSD') }}: + - ${{ if in(parameters.osGroup, 'Browser', 'iOS', 'iOS-sim', 'tvOS', 'tvOS-sim', 'Android', 'FreeBSD') }}: - _osArg: -os ${{ parameters.osGroup }} - ${{ if ne(parameters.framework, '') }}: diff --git a/eng/pipelines/libraries/build-job.yml b/eng/pipelines/libraries/build-job.yml index 9d26ad7a4af06..9ad203876ad4a 100644 --- a/eng/pipelines/libraries/build-job.yml +++ b/eng/pipelines/libraries/build-job.yml @@ -81,7 +81,7 @@ jobs: - ${{ if eq(parameters.isOfficialBuild, true) }}: - template: /eng/pipelines/common/restore-internal-tools.yml - - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS') }}: + - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'iOS-sim', 'tvOS', 'tvOS-sim') }}: - script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh ${{ parameters.osGroup }} ${{ parameters.archType }} azDO displayName: Install Build Dependencies @@ -96,7 +96,7 @@ jobs: $(_additionalBuildArguments) displayName: Restore and Build Product - - ${{ if in(parameters.osGroup, 'OSX', 'iOS','tvOS') }}: + - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'iOS-sim', 'tvOS', 'tvOS-sim') }}: - script: | du -sh $(Build.SourcesDirectory)/* df -h diff --git a/eng/pipelines/mono/templates/build-job.yml b/eng/pipelines/mono/templates/build-job.yml index 07af7f490ebbf..abdee9018a891 100644 --- a/eng/pipelines/mono/templates/build-job.yml +++ b/eng/pipelines/mono/templates/build-job.yml @@ -74,9 +74,15 @@ jobs: - ${{ if eq(parameters.osGroup, 'tvOS') }}: - name: osOverride value: -os tvOS + - ${{ if eq(parameters.osGroup, 'tvOS-sim') }}: + - name: osOverride + value: -os tvOS-sim - ${{ if eq(parameters.osGroup, 'iOS') }}: - name: osOverride value: -os iOS + - ${{ if eq(parameters.osGroup, 'iOS-sim') }}: + - name: osOverride + value: -os iOS-sim - ${{ if eq(parameters.osGroup, 'Android') }}: - name: osOverride value: -os Android @@ -110,7 +116,7 @@ jobs: # Linux builds use docker images with dependencies preinstalled, # and FreeBSD builds use a build agent with dependencies # preinstalled, so we only need this step for OSX and Windows. - - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS') }}: + - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'iOS-sim', 'tvOS', 'tvOS-sim') }}: - script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh $(osGroup) ${{ parameters.archType }} azDO displayName: Install native dependencies - ${{ if eq(parameters.osGroup, 'windows') }}: @@ -125,7 +131,7 @@ jobs: artifact: Mono_Offsets_${{monoCrossAOTTargetOS}} path: '$(Build.SourcesDirectory)/artifacts/obj/mono/offsetfiles' - - ${{ if in(parameters.osGroup, 'OSX', 'iOS','tvOS') }}: + - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'iOS-sim', 'tvOS', 'tvOS-sim') }}: - script: | du -sh $(Build.SourcesDirectory)/* df -h @@ -139,7 +145,7 @@ jobs: - script: build$(scriptExt) -subset mono -c $(buildConfig) -arch $(archType) $(osOverride) -ci $(officialBuildIdArg) $(aotCrossParameter) $(llvmParameter) $(ninjaArg) displayName: Build product - - ${{ if in(parameters.osGroup, 'OSX', 'iOS','tvOS') }}: + - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'iOS-sim', 'tvOS', 'tvOS-sim') }}: - script: | du -sh $(Build.SourcesDirectory)/* df -h diff --git a/eng/pipelines/mono/templates/generate-offsets.yml b/eng/pipelines/mono/templates/generate-offsets.yml index ff3b3e9d70ca7..c53b9c67d8be6 100644 --- a/eng/pipelines/mono/templates/generate-offsets.yml +++ b/eng/pipelines/mono/templates/generate-offsets.yml @@ -52,7 +52,7 @@ jobs: # Linux builds use docker images with dependencies preinstalled, # and FreeBSD builds use a build agent with dependencies # preinstalled, so we only need this step for OSX and Windows. - - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS') }}: + - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'iOS-sim', 'tvOS', 'tvOS-sim') }}: - script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh $(osGroup) ${{ parameters.archType }} azDO displayName: Install native dependencies - ${{ if eq(parameters.osGroup, 'windows') }}: diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml index a6ba21f154ab0..b28ee3b0e3e4d 100644 --- a/eng/pipelines/runtime-official.yml +++ b/eng/pipelines/runtime-official.yml @@ -105,10 +105,12 @@ stages: - Android_arm64 - MacCatalyst_x64 - MacCatalyst_arm64 - - tvOS_x64 + - tvOS-sim_x64 + - tvOS-sim_arm64 - tvOS_arm64 - - iOS_x64 - - iOS_x86 + - iOS-sim_x64 + - iOS-sim_x86 + - iOS-sim_arm64 - iOS_arm - iOS_arm64 - OSX_x64 @@ -141,8 +143,10 @@ stages: platforms: - Android_x64 - Browser_wasm - - tvOS_x64 - - iOS_x64 + - tvOS-sim_x64 + - tvOS_arm64 + - iOS-sim_x64 + - iOS_arm64 # # Build Mono release AOT cross-compilers diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 931da897d04d5..c290ab0f7695a 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -205,8 +205,10 @@ jobs: platforms: - Android_x64 - Browser_wasm - - tvOS_x64 - - iOS_x64 + - tvOS-sim_x64 + - tvOS_arm64 + - iOS-sim_x64 + - iOS_arm64 jobParameters: condition: >- or( @@ -226,9 +228,9 @@ jobs: - Android_x86 - MacCatalyst_x64 - MacCatalyst_arm64 - - tvOS_x64 + - tvOS-sim_x64 + - iOS-sim_x86 - iOS_arm64 - - iOS_x86 - Linux_arm jobParameters: testGroup: innerloop From fa79b541446872da861ed145ddfcd3b33580c8f3 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Mon, 8 Mar 2021 11:50:54 -0500 Subject: [PATCH 06/48] Valid names may only contain alphanumeric characters and '_' --- eng/pipelines/common/platform-matrix.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/pipelines/common/platform-matrix.yml b/eng/pipelines/common/platform-matrix.yml index b7606c5ab1ac5..0f928aae6717b 100644 --- a/eng/pipelines/common/platform-matrix.yml +++ b/eng/pipelines/common/platform-matrix.yml @@ -397,7 +397,7 @@ jobs: osGroup: tvOS-sim archType: x64 targetRid: tvos-sim-x64 - platform: tvOS-sim_x64 + platform: tvOS_sim_x64 jobParameters: runtimeFlavor: mono stagedBuild: ${{ parameters.stagedBuild }} @@ -418,7 +418,7 @@ jobs: osGroup: tvOS-sim archType: arm64 targetRid: tvos-sim-arm64 - platform: tvOS-sim_arm64 + platform: tvOS_sim_arm64 jobParameters: runtimeFlavor: mono stagedBuild: ${{ parameters.stagedBuild }} @@ -481,7 +481,7 @@ jobs: osGroup: iOS-sim archType: x64 targetRid: ios-sim-x64 - platform: iOS-sim_x64 + platform: iOS_sim_x64 jobParameters: runtimeFlavor: mono stagedBuild: ${{ parameters.stagedBuild }} @@ -502,7 +502,7 @@ jobs: osGroup: iOS-sim archType: x86 targetRid: ios-sim-x86 - platform: iOS-sim_x86 + platform: iOS_sim_x86 jobParameters: runtimeFlavor: mono stagedBuild: ${{ parameters.stagedBuild }} @@ -524,7 +524,7 @@ jobs: osGroup: iOS-sim archType: arm64 targetRid: ios-sim-arm64 - platform: iOS-sim_arm64 + platform: iOS_sim_arm64 jobParameters: runtimeFlavor: mono stagedBuild: ${{ parameters.stagedBuild }} From 8ea5d5fafa6073360ff553dcc6132d091c94606e Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Mon, 8 Mar 2021 11:56:18 -0500 Subject: [PATCH 07/48] Try again --- eng/pipelines/common/platform-matrix.yml | 25 ++++++++++++++---------- eng/pipelines/runtime-official.yml | 14 ++++++------- eng/pipelines/runtime.yml | 8 ++++---- 3 files changed, 26 insertions(+), 21 deletions(-) diff --git a/eng/pipelines/common/platform-matrix.yml b/eng/pipelines/common/platform-matrix.yml index 0f928aae6717b..f83ba87e37c8b 100644 --- a/eng/pipelines/common/platform-matrix.yml +++ b/eng/pipelines/common/platform-matrix.yml @@ -388,13 +388,14 @@ jobs: # tvOS Simulator x64 -- ${{ if containsValue(parameters.platforms, 'tvOS-sim_x64') }}: +- ${{ if containsValue(parameters.platforms, 'tvOS_sim_x64') }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: tvOS-sim + osGroup: tvOS + osSubGroup: _sim archType: x64 targetRid: tvos-sim-x64 platform: tvOS_sim_x64 @@ -409,13 +410,14 @@ jobs: # tvOS Simulator arm64 -- ${{ if containsValue(parameters.platforms, 'tvOS-sim_arm64') }}: +- ${{ if containsValue(parameters.platforms, 'tvOS_sim_arm64') }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: tvOS-sim + osGroup: tvOS + osSubGroup: _sim archType: arm64 targetRid: tvos-sim-arm64 platform: tvOS_sim_arm64 @@ -472,13 +474,14 @@ jobs: # iOS Simulator x64 -- ${{ if containsValue(parameters.platforms, 'iOS-sim_x64') }}: +- ${{ if containsValue(parameters.platforms, 'iOS_sim_x64') }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: iOS-sim + osGroup: iOS + osSubGroup: _sim archType: x64 targetRid: ios-sim-x64 platform: iOS_sim_x64 @@ -493,13 +496,14 @@ jobs: # iOS Simulator x86 -- ${{ if containsValue(parameters.platforms, 'iOS-sim_x86') }}: +- ${{ if containsValue(parameters.platforms, 'iOS_sim_x86') }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: iOS-sim + osGroup: iOS + osSubGroup: _sim archType: x86 targetRid: ios-sim-x86 platform: iOS_sim_x86 @@ -515,13 +519,14 @@ jobs: # iOS Simulator arm64 -- ${{ if containsValue(parameters.platforms, 'iOS-sim_arm64') }}: +- ${{ if containsValue(parameters.platforms, 'iOS_sim_arm64') }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: iOS-sim + osGroup: iOS + osSubGroup: _sim archType: arm64 targetRid: ios-sim-arm64 platform: iOS_sim_arm64 diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml index b28ee3b0e3e4d..e3196f090d131 100644 --- a/eng/pipelines/runtime-official.yml +++ b/eng/pipelines/runtime-official.yml @@ -105,12 +105,12 @@ stages: - Android_arm64 - MacCatalyst_x64 - MacCatalyst_arm64 - - tvOS-sim_x64 - - tvOS-sim_arm64 + - tvOS_sim_x64 + - tvOS_sim_arm64 - tvOS_arm64 - - iOS-sim_x64 - - iOS-sim_x86 - - iOS-sim_arm64 + - iOS_sim_x64 + - iOS_sim_x86 + - iOS_sim_arm64 - iOS_arm - iOS_arm64 - OSX_x64 @@ -143,9 +143,9 @@ stages: platforms: - Android_x64 - Browser_wasm - - tvOS-sim_x64 + - tvOS_sim_x64 - tvOS_arm64 - - iOS-sim_x64 + - iOS_sim_x64 - iOS_arm64 # diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index c290ab0f7695a..c0bf9aef2f7ba 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -205,9 +205,9 @@ jobs: platforms: - Android_x64 - Browser_wasm - - tvOS-sim_x64 + - tvOS_sim_x64 - tvOS_arm64 - - iOS-sim_x64 + - iOS_sim_x64 - iOS_arm64 jobParameters: condition: >- @@ -228,8 +228,8 @@ jobs: - Android_x86 - MacCatalyst_x64 - MacCatalyst_arm64 - - tvOS-sim_x64 - - iOS-sim_x86 + - tvOS_sim_x64 + - iOS_sim_x86 - iOS_arm64 - Linux_arm jobParameters: From 57cc541252cfe059850804d3ea7910140c8f2347 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Mon, 8 Mar 2021 12:00:19 -0500 Subject: [PATCH 08/48] Use subgroup in offset job name generation --- eng/pipelines/mono/templates/generate-offsets.yml | 6 ++++-- eng/pipelines/runtime-official.yml | 2 ++ eng/pipelines/runtime.yml | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/mono/templates/generate-offsets.yml b/eng/pipelines/mono/templates/generate-offsets.yml index c53b9c67d8be6..4aca555ed8d23 100644 --- a/eng/pipelines/mono/templates/generate-offsets.yml +++ b/eng/pipelines/mono/templates/generate-offsets.yml @@ -1,6 +1,7 @@ parameters: buildConfig: 'Debug' osGroup: '' + osSubGroup: '' platform: '' container: '' timeoutInMinutes: '' @@ -15,6 +16,7 @@ jobs: parameters: buildConfig: ${{ parameters.buildConfig }} osGroup: ${{ parameters.osGroup }} + osSubGroup: ${{ parameters.osSubGroup }} helixType: 'build/product/' enableMicrobuild: true pool: ${{ parameters.pool }} @@ -22,8 +24,8 @@ jobs: dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }} # Compute job name from template parameters - name: ${{ format('mono_{0}_offsets', parameters.osGroup) }} - displayName: ${{ format('Mono {0} AOT offsets', parameters.osGroup) }} + name: ${{ format('mono_{0}{1}_offsets', parameters.osGroup, parameters.osSubGroup) }} + displayName: ${{ format('Mono {0}{1} AOT offsets', parameters.osGroup, parameters.osSubGroup) }} # Run all steps in the container. # Note that the containers are defined in platform-matrix.yml diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml index e3196f090d131..0e9bc43ad05d3 100644 --- a/eng/pipelines/runtime-official.yml +++ b/eng/pipelines/runtime-official.yml @@ -214,7 +214,9 @@ stages: - mono_android_offsets - mono_browser_offsets - mono_tvos_offsets + - mono_tvos_sim_offsets - mono_ios_offsets + - mono_ios_sim_offsets monoCrossAOTTargetOS: - Android - Browser diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index c0bf9aef2f7ba..0b24e3996981d 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -498,7 +498,9 @@ jobs: - mono_android_offsets - mono_browser_offsets - mono_tvos_offsets + - mono_tvos_sim_offsets - mono_ios_offsets + - mono_ios_sim_offsets monoCrossAOTTargetOS: - Android - Browser From 1611c1572f200a939403f56bfc3e24fe383ec7d1 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Mon, 8 Mar 2021 12:43:51 -0500 Subject: [PATCH 09/48] Lean more into subgroups --- eng/pipelines/common/global-build-job.yml | 4 ++-- .../templates/runtimes/build-test-job.yml | 4 ++-- eng/pipelines/common/xplat-setup.yml | 4 ++-- eng/pipelines/coreclr/templates/build-job.yml | 4 ++-- eng/pipelines/installer/jobs/base-job.yml | 6 +++--- eng/pipelines/libraries/base-job.yml | 2 +- eng/pipelines/libraries/build-job.yml | 4 ++-- eng/pipelines/mono/templates/build-job.yml | 10 +++++----- .../mono/templates/generate-offsets.yml | 20 ++++++++++++++++--- 9 files changed, 36 insertions(+), 22 deletions(-) diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index 241aee178e7f0..3baff96b8df14 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -108,7 +108,7 @@ jobs: artifact: Mono_Offsets_${{monoCrossAOTTargetOS}} path: '$(Build.SourcesDirectory)/artifacts/obj/mono/offsetfiles' - - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'iOS-sim', 'tvOS', 'tvOS-sim', 'Android') }}: + - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS', 'Android') }}: - script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh ${{ parameters.osGroup }} ${{ parameters.archType }} azDO displayName: Install Build Dependencies @@ -123,7 +123,7 @@ jobs: ${{ if eq(parameters.useContinueOnErrorDuringBuild, true) }}: continueOnError: ${{ parameters.shouldContinueOnError }} - - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'iOS-sim', 'tvOS', 'tvOS-sim', 'Android') }}: + - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS', 'Android') }}: - script: | du -sh $(Build.SourcesDirectory)/* df -h diff --git a/eng/pipelines/common/templates/runtimes/build-test-job.yml b/eng/pipelines/common/templates/runtimes/build-test-job.yml index 13b086e407821..50de94ee79c7d 100644 --- a/eng/pipelines/common/templates/runtimes/build-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/build-test-job.yml @@ -116,7 +116,7 @@ jobs: artifactName: '$(coreClrProductArtifactName)' displayName: 'CoreCLR product build' - - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'iOS-sim', 'tvOS', 'tvOS-sim') }}: + - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS') }}: - script: | du -sh $(Build.SourcesDirectory)/* df -h @@ -126,7 +126,7 @@ jobs: - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) allTargets skipnative skipgeneratelayout skiptestwrappers $(buildConfig) $(archType) $(crossArg) $(priorityArg) ci $(librariesOverrideArg) displayName: Build managed test components - - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'iOS-sim', 'tvOS', 'tvOS-sim') }}: + - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS') }}: - script: | du -sh $(Build.SourcesDirectory)/* df -h diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml index d4fbf8ea21f49..5245e0314a82b 100644 --- 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', 'MacCatalyst', 'iOS', 'iOS-sim', 'tvOS', 'tvOS-sim') }}: + ${{ 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', 'MacCatalyst', 'iOS', 'iOS-sim', 'tvOS', 'tvOS-sim')) }}: + ${{ 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/coreclr/templates/build-job.yml b/eng/pipelines/coreclr/templates/build-job.yml index 440a4e7e741bd..d857a6fd37595 100644 --- a/eng/pipelines/coreclr/templates/build-job.yml +++ b/eng/pipelines/coreclr/templates/build-job.yml @@ -181,7 +181,7 @@ jobs: continueOnError: false condition: and(succeeded(), in(variables['SignType'], 'real', 'test')) - - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'iOS-sim', 'tvOS', 'tvOS-sim') }}: + - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS') }}: - script: | du -sh $(Build.SourcesDirectory)/* df -h @@ -200,7 +200,7 @@ jobs: - script: set __TestIntermediateDir=int&&$(Build.SourcesDirectory)/src/coreclr/build-runtime$(scriptExt) $(buildConfig) $(archType) -ci $(ninjaArg) $(enforcePgoArg) $(pgoInstrumentArg) $(officialBuildIdArg) $(clrInterpreterBuildArg) displayName: Build CoreCLR Runtime - - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'iOS-sim', 'tvOS', 'tvOS-sim') }}: + - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS') }}: - script: | du -sh $(Build.SourcesDirectory)/* df -h diff --git a/eng/pipelines/installer/jobs/base-job.yml b/eng/pipelines/installer/jobs/base-job.yml index e501a53439430..706774485917b 100644 --- a/eng/pipelines/installer/jobs/base-job.yml +++ b/eng/pipelines/installer/jobs/base-job.yml @@ -150,7 +150,7 @@ jobs: $(CommonMSBuildArgs) $(OfficialBuildArg) - - ${{ if in(parameters.osGroup, 'iOS', 'iOS-sim', 'tvOS', 'tvOS-sim', 'Android', 'Browser') }}: + - ${{ if in(parameters.osGroup, 'iOS', 'tvOS', 'Android', 'Browser') }}: - name: CommonMSBuildArgs value: >- @@ -379,7 +379,7 @@ jobs: displayName: 'Libraries artifacts' cleanUnpackFolder: false - - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'iOS-sim', 'tvOS', 'tvOS-sim') }}: + - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS') }}: - script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh ${{ parameters.osGroup }} ${{ parameters.archType }} azDO displayName: Install Build Dependencies @@ -415,7 +415,7 @@ jobs: displayName: Build and Package continueOnError: ${{ and(eq(variables.SkipTests, false), eq(parameters.shouldContinueOnError, true)) }} - - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'iOS-sim', 'tvOS', 'tvOS-sim') }}: + - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS') }}: - script: | du -sh $(Build.SourcesDirectory)/* df -h diff --git a/eng/pipelines/libraries/base-job.yml b/eng/pipelines/libraries/base-job.yml index 519879ccd38f0..bea30446deed6 100644 --- a/eng/pipelines/libraries/base-job.yml +++ b/eng/pipelines/libraries/base-job.yml @@ -70,7 +70,7 @@ jobs: - _runtimeOSArg: /p:RuntimeOS=ubuntu.16.04 # force a value for OS when cross-building - - ${{ if in(parameters.osGroup, 'Browser', 'iOS', 'iOS-sim', 'tvOS', 'tvOS-sim', 'Android', 'FreeBSD') }}: + - ${{ if in(parameters.osGroup, 'Browser', 'iOS', 'tvOS', 'Android', 'FreeBSD') }}: - _osArg: -os ${{ parameters.osGroup }} - ${{ if ne(parameters.framework, '') }}: diff --git a/eng/pipelines/libraries/build-job.yml b/eng/pipelines/libraries/build-job.yml index 9ad203876ad4a..ee0c0fc938f69 100644 --- a/eng/pipelines/libraries/build-job.yml +++ b/eng/pipelines/libraries/build-job.yml @@ -81,7 +81,7 @@ jobs: - ${{ if eq(parameters.isOfficialBuild, true) }}: - template: /eng/pipelines/common/restore-internal-tools.yml - - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'iOS-sim', 'tvOS', 'tvOS-sim') }}: + - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS') }}: - script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh ${{ parameters.osGroup }} ${{ parameters.archType }} azDO displayName: Install Build Dependencies @@ -96,7 +96,7 @@ jobs: $(_additionalBuildArguments) displayName: Restore and Build Product - - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'iOS-sim', 'tvOS', 'tvOS-sim') }}: + - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS') }}: - script: | du -sh $(Build.SourcesDirectory)/* df -h diff --git a/eng/pipelines/mono/templates/build-job.yml b/eng/pipelines/mono/templates/build-job.yml index abdee9018a891..59ef515949575 100644 --- a/eng/pipelines/mono/templates/build-job.yml +++ b/eng/pipelines/mono/templates/build-job.yml @@ -74,13 +74,13 @@ jobs: - ${{ if eq(parameters.osGroup, 'tvOS') }}: - name: osOverride value: -os tvOS - - ${{ if eq(parameters.osGroup, 'tvOS-sim') }}: + - ${{ if and(eq(parameters.osGroup, 'tvOS'),eq(parameters.osSubGroup, '_sim')) }}: - name: osOverride value: -os tvOS-sim - ${{ if eq(parameters.osGroup, 'iOS') }}: - name: osOverride value: -os iOS - - ${{ if eq(parameters.osGroup, 'iOS-sim') }}: + - ${{ if and(eq(parameters.osGroup, 'iOS'),eq(parameters.osSubGroup, '_sim')) }}: - name: osOverride value: -os iOS-sim - ${{ if eq(parameters.osGroup, 'Android') }}: @@ -116,7 +116,7 @@ jobs: # Linux builds use docker images with dependencies preinstalled, # and FreeBSD builds use a build agent with dependencies # preinstalled, so we only need this step for OSX and Windows. - - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'iOS-sim', 'tvOS', 'tvOS-sim') }}: + - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS') }}: - script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh $(osGroup) ${{ parameters.archType }} azDO displayName: Install native dependencies - ${{ if eq(parameters.osGroup, 'windows') }}: @@ -131,7 +131,7 @@ jobs: artifact: Mono_Offsets_${{monoCrossAOTTargetOS}} path: '$(Build.SourcesDirectory)/artifacts/obj/mono/offsetfiles' - - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'iOS-sim', 'tvOS', 'tvOS-sim') }}: + - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS') }}: - script: | du -sh $(Build.SourcesDirectory)/* df -h @@ -145,7 +145,7 @@ jobs: - script: build$(scriptExt) -subset mono -c $(buildConfig) -arch $(archType) $(osOverride) -ci $(officialBuildIdArg) $(aotCrossParameter) $(llvmParameter) $(ninjaArg) displayName: Build product - - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'iOS-sim', 'tvOS', 'tvOS-sim') }}: + - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS') }}: - script: | du -sh $(Build.SourcesDirectory)/* df -h diff --git a/eng/pipelines/mono/templates/generate-offsets.yml b/eng/pipelines/mono/templates/generate-offsets.yml index 4aca555ed8d23..9978dcf927e51 100644 --- a/eng/pipelines/mono/templates/generate-offsets.yml +++ b/eng/pipelines/mono/templates/generate-offsets.yml @@ -37,6 +37,8 @@ jobs: variables: - name: osGroup value: ${{ parameters.osGroup }} + - name: osSubGroup + value: ${{ parameters.osSubGroup }} - name: officialBuildIdArg value: '' - ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}: @@ -44,6 +46,18 @@ jobs: value: '/p:officialBuildId=$(Build.BuildNumber)' - name: osOverride value: -os Linux + - ${{ if eq(parameters.osGroup, 'tvOS') }}: + - name: osOverride + value: -os tvOS + - ${{ if and(eq(parameters.osGroup, 'tvOS'),eq(parameters.osSubGroup, '_sim')) }}: + - name: osOverride + value: -os tvOS-sim + - ${{ if eq(parameters.osGroup, 'iOS') }}: + - name: osOverride + value: -os iOS + - ${{ if and(eq(parameters.osGroup, 'iOS'),eq(parameters.osSubGroup, '_sim')) }}: + - name: osOverride + value: -os iOS-sim - name: archType value: x64 - ${{ parameters.variables }} @@ -54,7 +68,7 @@ jobs: # Linux builds use docker images with dependencies preinstalled, # and FreeBSD builds use a build agent with dependencies # preinstalled, so we only need this step for OSX and Windows. - - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'iOS-sim', 'tvOS', 'tvOS-sim') }}: + - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS') }}: - script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh $(osGroup) ${{ parameters.archType }} azDO displayName: Install native dependencies - ${{ if eq(parameters.osGroup, 'windows') }}: @@ -82,13 +96,13 @@ jobs: displayName: Upload offset files inputs: targetPath: '$(Build.SourcesDirectory)/artifacts/obj/mono/offsetfiles' - artifactName: 'Mono_Offsets_$(osGroup)' + artifactName: 'Mono_Offsets_$(osGroup)$(osSubGroup)' # Publish Logs - task: PublishPipelineArtifact@1 displayName: Publish Logs inputs: targetPath: $(Build.SourcesDirectory)/artifacts/log - artifactName: 'BuildLogs_Mono_Offsets_$(osGroup)' + artifactName: 'BuildLogs_Mono_Offsets_$(osGroup)$(osSubGroup)' continueOnError: true condition: always() From 560045e55ffa7f8bbab8f6f7799e7be09d9dca39 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Mon, 8 Mar 2021 12:57:02 -0500 Subject: [PATCH 10/48] Create ios/tvos sim offsets in non-sim lane --- eng/pipelines/runtime-official.yml | 4 ---- eng/pipelines/runtime.yml | 4 ---- 2 files changed, 8 deletions(-) diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml index 0e9bc43ad05d3..7c33e18297740 100644 --- a/eng/pipelines/runtime-official.yml +++ b/eng/pipelines/runtime-official.yml @@ -143,9 +143,7 @@ stages: platforms: - Android_x64 - Browser_wasm - - tvOS_sim_x64 - tvOS_arm64 - - iOS_sim_x64 - iOS_arm64 # @@ -214,9 +212,7 @@ stages: - mono_android_offsets - mono_browser_offsets - mono_tvos_offsets - - mono_tvos_sim_offsets - mono_ios_offsets - - mono_ios_sim_offsets monoCrossAOTTargetOS: - Android - Browser diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 0b24e3996981d..4a4daa69127d5 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -205,9 +205,7 @@ jobs: platforms: - Android_x64 - Browser_wasm - - tvOS_sim_x64 - tvOS_arm64 - - iOS_sim_x64 - iOS_arm64 jobParameters: condition: >- @@ -498,9 +496,7 @@ jobs: - mono_android_offsets - mono_browser_offsets - mono_tvos_offsets - - mono_tvos_sim_offsets - mono_ios_offsets - - mono_ios_sim_offsets monoCrossAOTTargetOS: - Android - Browser From 2459d01e558688b243418f04c03348cdfb3332f8 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Mon, 8 Mar 2021 13:02:14 -0500 Subject: [PATCH 11/48] Deal with OS component in RID containing a dash --- src/mono/monoaotcross.proj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mono/monoaotcross.proj b/src/mono/monoaotcross.proj index 08eddc1f13964..5e47963ae9bbb 100644 --- a/src/mono/monoaotcross.proj +++ b/src/mono/monoaotcross.proj @@ -31,8 +31,8 @@ - $(MonoAotTargetRid.Split('-')[0]) - $(MonoAotTargetRid.Split('-')[1]) + $(MonoAotTargetRid.Substring(0,MonoAotTargetRid.LastIndexOf('-')) + $(MonoAotTargetRid.Substring(1+MonoAotTargetRid.LastIndexOf('-')) Date: Mon, 8 Mar 2021 13:11:25 -0500 Subject: [PATCH 12/48] Typo --- src/mono/monoaotcross.proj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mono/monoaotcross.proj b/src/mono/monoaotcross.proj index 5e47963ae9bbb..6900fbe11bc0a 100644 --- a/src/mono/monoaotcross.proj +++ b/src/mono/monoaotcross.proj @@ -31,8 +31,8 @@ - $(MonoAotTargetRid.Substring(0,MonoAotTargetRid.LastIndexOf('-')) - $(MonoAotTargetRid.Substring(1+MonoAotTargetRid.LastIndexOf('-')) + $(MonoAotTargetRid.Substring(0,MonoAotTargetRid.LastIndexOf('-'))) + $(MonoAotTargetRid.Substring(1+MonoAotTargetRid.LastIndexOf('-'))) Date: Mon, 8 Mar 2021 13:29:33 -0500 Subject: [PATCH 13/48] subgroups in global-build-job --- eng/pipelines/common/global-build-job.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index 3baff96b8df14..c83224febddfc 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/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 From c8379238daf78474863280fdd1d7993aa8b87b28 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Mon, 8 Mar 2021 13:32:52 -0500 Subject: [PATCH 14/48] Don't override in generate-offsets --- eng/pipelines/mono/templates/generate-offsets.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/eng/pipelines/mono/templates/generate-offsets.yml b/eng/pipelines/mono/templates/generate-offsets.yml index 9978dcf927e51..cbb05aaafff99 100644 --- a/eng/pipelines/mono/templates/generate-offsets.yml +++ b/eng/pipelines/mono/templates/generate-offsets.yml @@ -46,18 +46,6 @@ jobs: value: '/p:officialBuildId=$(Build.BuildNumber)' - name: osOverride value: -os Linux - - ${{ if eq(parameters.osGroup, 'tvOS') }}: - - name: osOverride - value: -os tvOS - - ${{ if and(eq(parameters.osGroup, 'tvOS'),eq(parameters.osSubGroup, '_sim')) }}: - - name: osOverride - value: -os tvOS-sim - - ${{ if eq(parameters.osGroup, 'iOS') }}: - - name: osOverride - value: -os iOS - - ${{ if and(eq(parameters.osGroup, 'iOS'),eq(parameters.osSubGroup, '_sim')) }}: - - name: osOverride - value: -os iOS-sim - name: archType value: x64 - ${{ parameters.variables }} From 61882bffeba87829e1e8b6d1b943bf5b3aa0eb42 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Mon, 8 Mar 2021 13:46:07 -0500 Subject: [PATCH 15/48] Fix MSBuild property syntax --- src/mono/monoaotcross.proj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mono/monoaotcross.proj b/src/mono/monoaotcross.proj index 6900fbe11bc0a..45084bc2a1fd5 100644 --- a/src/mono/monoaotcross.proj +++ b/src/mono/monoaotcross.proj @@ -31,8 +31,8 @@ - $(MonoAotTargetRid.Substring(0,MonoAotTargetRid.LastIndexOf('-'))) - $(MonoAotTargetRid.Substring(1+MonoAotTargetRid.LastIndexOf('-'))) + $(MonoAotTargetRid.Substring(0,$(MonoAotTargetRid.LastIndexOf('-')))) + $(MonoAotTargetRid.Substring($([MSBuild]::Add(1, $(MonoAotTargetRid.LastIndexOf('-')))))) Date: Mon, 8 Mar 2021 17:13:46 -0500 Subject: [PATCH 16/48] Fix AOT RIDs for ios-sim and tvos-sim --- .../pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj index 7e63e89f31ccf..3222f56f1230f 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj @@ -5,8 +5,8 @@ $(MonoAotTargets);android-x64;android-arm64;android-x86;android-arm $(MonoAotTargets);android-x64 $(MonoAotTargets);browser-wasm - $(MonoAotTargets);tvos-x64;tvos-arm64 - $(MonoAotTargets);ios-x64;ios-arm64;ios-x86;ios-arm + $(MonoAotTargets);tvos-sim-x64;tvos-sim-arm64;tvos-arm64 + $(MonoAotTargets);ios-sim-x64;ios-sim-arm64;ios-arm64;ios-sim-x86;ios-arm From 659c7d74d61c426ce97ddcaaa3ad9c7c9e359ab1 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Tue, 9 Mar 2021 09:59:09 -0500 Subject: [PATCH 17/48] Run iOS simulator x64 in staging --- eng/pipelines/runtime-staging.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/runtime-staging.yml b/eng/pipelines/runtime-staging.yml index 2a2afabf81398..cd2efcf107aa2 100644 --- a/eng/pipelines/runtime-staging.yml +++ b/eng/pipelines/runtime-staging.yml @@ -66,7 +66,7 @@ jobs: platforms: - Android_x64 - Android_arm64 - - iOS_x64 + - iOS_sim_x64 variables: # map dependencies variables to local variables - name: librariesContainsChange From 99c74c11ff054f70728c1b4f67f2687fe0f43587 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Tue, 9 Mar 2021 13:34:53 -0500 Subject: [PATCH 18/48] Fix up building/running tests on ios-sim --- eng/testing/tests.mobile.targets | 6 ++--- eng/testing/tests.targets | 2 +- src/libraries/pretest.proj | 2 +- src/tasks/AppleAppBuilder/TargetOS.cs | 2 ++ src/tasks/AppleAppBuilder/Xcode.cs | 37 ++++++++++++++++++++++++--- src/tasks/tasks.proj | 2 +- 6 files changed, 41 insertions(+), 10 deletions(-) diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets index 5a9e56c207fce..5c2158e32ca14 100644 --- a/eng/testing/tests.mobile.targets +++ b/eng/testing/tests.mobile.targets @@ -119,7 +119,7 @@ - @@ -127,7 +127,7 @@ - - + @@ -265,7 +265,7 @@ AfterTargets="ComputeResolvedFilesToPublishList"> <_runnerFilesToPublish Include="$(AndroidTestRunnerDir)*" Condition="'$(TargetOS)' == 'Android'" /> - <_runnerFilesToPublish Include="$(AppleTestRunnerDir)*" Condition="'$(TargetOS)' == 'MacCatalyst' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS'" /> + <_runnerFilesToPublish Include="$(AppleTestRunnerDir)*" Condition="'$(TargetOS)' == 'MacCatalyst' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOS-sim' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'tvOS-sim'" /> <_runnerFilesToPublish Include="$(WasmTestRunnerDir)*" Condition="'$(TargetOS)' == 'Browser'" /> diff --git a/eng/testing/tests.targets b/eng/testing/tests.targets index d5ab901145464..a426e5d8091b9 100644 --- a/eng/testing/tests.targets +++ b/eng/testing/tests.targets @@ -2,7 +2,7 @@ RunnerTemplate.cmd RunnerTemplate.sh - AppleRunnerTemplate.sh + AppleRunnerTemplate.sh AndroidRunnerTemplate.sh WasmRunnerTemplate.sh diff --git a/src/libraries/pretest.proj b/src/libraries/pretest.proj index bfc8106891de4..688c35172044a 100644 --- a/src/libraries/pretest.proj +++ b/src/libraries/pretest.proj @@ -19,7 +19,7 @@ - + diff --git a/src/tasks/AppleAppBuilder/TargetOS.cs b/src/tasks/AppleAppBuilder/TargetOS.cs index 3fb54c975c88c..98d057cceb4c2 100644 --- a/src/tasks/AppleAppBuilder/TargetOS.cs +++ b/src/tasks/AppleAppBuilder/TargetOS.cs @@ -4,6 +4,8 @@ internal class TargetNames { public const string iOS = "iOS"; + public const string iOSsim = "iOS-sim"; public const string tvOS = "tvOS"; + public const string tvOSsim = "tvOS-sim"; public const string MacCatalyst = "MacCatalyst"; } diff --git a/src/tasks/AppleAppBuilder/Xcode.cs b/src/tasks/AppleAppBuilder/Xcode.cs index ddf7dee5f8de0..3e3072dcb76ff 100644 --- a/src/tasks/AppleAppBuilder/Xcode.cs +++ b/src/tasks/AppleAppBuilder/Xcode.cs @@ -18,9 +18,11 @@ public Xcode(string target) switch (Target) { case TargetNames.iOS: + case TargetNames.iOSsim: SysRoot = Utils.RunProcess("xcrun", "--sdk iphoneos --show-sdk-path"); break; case TargetNames.tvOS: + case TargetNames.tvOSsim: SysRoot = Utils.RunProcess("xcrun", "--sdk appletvos --show-sdk-path"); break; default: @@ -104,7 +106,7 @@ public string GenerateXCode( } string frameworks = ""; - if ((Target == TargetNames.iOS) || (Target == TargetNames.MacCatalyst)) + if ((Target == TargetNames.iOS) || (Target == TargetNames.iOSsim) || (Target == TargetNames.MacCatalyst)) { frameworks = "\"-framework GSS\""; } @@ -131,7 +133,24 @@ public string GenerateXCode( File.WriteAllText(Path.Combine(binDir, "Info.plist"), plist); File.WriteAllText(Path.Combine(binDir, "CMakeLists.txt"), cmakeLists); - var targetName = (Target == TargetNames.MacCatalyst) ? "Darwin" : Target.ToString(); + string targetName; + switch (Target) + { + case TargetNames.MacCatalyst: + targetName = "Darwin"; + break; + case TargetNames.iOS: + case TargetNames.iOSsim: + targetName = "iOS"; + break; + case TargetNames.tvOS: + case TargetNames.tvOSsim: + targetName = "tvOS"; + break; + default: + targetName = Target.ToString(); + break; + } var deployTarget = (Target == TargetNames.MacCatalyst) ? " -DCMAKE_OSX_ARCHITECTURES=\"x86_64 arm64\"" : " -DCMAKE_OSX_DEPLOYMENT_TARGET=10.1"; var cmakeArgs = new StringBuilder(); cmakeArgs @@ -195,11 +214,21 @@ public string BuildAppBundle( args.Append(" -arch arm64") .Append(" -sdk " + sdk); break; + case TargetNames.iOSsim: + sdk = "iphonesimulator"; + args.Append(" -arch arm64") + .Append(" -sdk " + sdk); + break; case TargetNames.tvOS: sdk = "appletvos"; args.Append(" -arch arm64") .Append(" -sdk " + sdk); break; + case TargetNames.tvOSsim: + sdk = "appletvsimulator"; + args.Append(" -arch arm64") + .Append(" -sdk " + sdk); + break; default: sdk = "maccatalyst"; args.Append(" -scheme \"" + Path.GetFileNameWithoutExtension(xcodePrjPath) + "\"") @@ -213,12 +242,12 @@ public string BuildAppBundle( { switch (Target) { - case TargetNames.iOS: + case TargetNames.iOSsim: sdk = "iphonesimulator"; args.Append(" -arch x86_64") .Append(" -sdk " + sdk); break; - case TargetNames.tvOS: + case TargetNames.tvOSsim: sdk = "appletvsimulator"; args.Append(" -arch x86_64") .Append(" -sdk " + sdk); diff --git a/src/tasks/tasks.proj b/src/tasks/tasks.proj index 17ea46bc58669..befde1e3b5ca9 100644 --- a/src/tasks/tasks.proj +++ b/src/tasks/tasks.proj @@ -4,7 +4,7 @@ + Condition="'$(TargetOS)' != 'MacCatalyst' and '$(TargetOS)' != 'iOS' and '$(TargetOS)' != 'iOS-sim' and '$(TargetOS)' != 'tvOS' and '$(TargetOS)' != 'tvOS-sim'" /> Date: Tue, 9 Mar 2021 13:53:15 -0500 Subject: [PATCH 19/48] Apply exclusions correctly to sims --- src/libraries/tests.proj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj index b920de0d7c057..5c9528b8ef196 100644 --- a/src/libraries/tests.proj +++ b/src/libraries/tests.proj @@ -65,7 +65,7 @@ - + @@ -268,14 +268,14 @@ - + - + From 1d034849b9f5d8fb17b9f09766553211809e5947 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Wed, 10 Mar 2021 12:56:22 -0500 Subject: [PATCH 20/48] Bump ICU to build w/ renamed RIDs --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a064479ce7d93..8467fe5a40bed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - 3dc14146be2c110eedc947afa62894f9b53b4f04 + f8930f51020aeeeab5d3f96314b3c53d4122b6f9 diff --git a/eng/Versions.props b/eng/Versions.props index f6905d2916f0b..1cc2f5d2a4529 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -157,7 +157,7 @@ 6.0.100-preview.2.21126.1 - 6.0.0-preview.3.21151.1 + 6.0.0-preview.3.21160.1 9.0.1-alpha.1.21154.1 9.0.1-alpha.1.21154.1 From bf03e8e4c8d5be92d2bedce1c432c78bbd6f9b40 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Wed, 10 Mar 2021 14:56:54 -0500 Subject: [PATCH 21/48] In IOS test, deal with "ios" vs "ios-sim" --- src/mono/sample/iOS/Program.csproj | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/mono/sample/iOS/Program.csproj b/src/mono/sample/iOS/Program.csproj index f797af463084f..2170c8136d26a 100644 --- a/src/mono/sample/iOS/Program.csproj +++ b/src/mono/sample/iOS/Program.csproj @@ -3,10 +3,12 @@ Exe bin $(NetCoreAppToolCurrent) + $(TargetOS) iOS - $(ArtifactsBinDir)microsoft.netcore.app.runtime.ios-$(TargetArchitecture)\$(Configuration)\runtimes\ios-$(TargetArchitecture)\ + iOS-sim + $(ArtifactsBinDir)microsoft.netcore.app.runtime.$(TargetOS.ToLower())-$(TargetArchitecture)\$(Configuration)\runtimes\$(TargetOS.ToLower())-$(TargetArchitecture)\ false - ios-$(TargetArchitecture) + $(TargetOS.ToLower())-$(TargetArchitecture) true Link $(DefineConstants);CI_TEST @@ -16,7 +18,7 @@ - $(ArtifactsBinDir)microsoft.netcore.app.runtime.ios-$(TargetArchitecture)\$(Configuration) + $(ArtifactsBinDir)microsoft.netcore.app.runtime.$(TargetOS.ToLower())-$(TargetArchitecture)\$(Configuration) @@ -32,7 +34,7 @@ $(MSBuildThisFileDirectory)$(PublishDir)\app - iPhone 11 + iPhone 11 True true From 6588cfe07b5a7aaab4e17597ff3b6d200dd996b0 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Wed, 10 Mar 2021 17:15:07 -0500 Subject: [PATCH 22/48] Detect "device or not" based on RID name --- src/tasks/AppleAppBuilder/AppleAppBuilder.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tasks/AppleAppBuilder/AppleAppBuilder.cs b/src/tasks/AppleAppBuilder/AppleAppBuilder.cs index fc688ba239509..dfe467e416f34 100644 --- a/src/tasks/AppleAppBuilder/AppleAppBuilder.cs +++ b/src/tasks/AppleAppBuilder/AppleAppBuilder.cs @@ -131,7 +131,7 @@ public class AppleAppBuilderTask : Task public override bool Execute() { Utils.Logger = Log; - bool isDevice = Arch.Equals("arm64", StringComparison.InvariantCultureIgnoreCase) && TargetOS != TargetNames.MacCatalyst; + bool isDevice = (TargetOS == TargetNames.iOS || TargetOS == TargetNames.tvOS); if (!File.Exists(Path.Combine(AppDir, MainLibraryFileName))) { From a1730152f134d453341d85a827eb1b8cdf5f9dde Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Thu, 11 Mar 2021 11:24:22 -0500 Subject: [PATCH 23/48] Various ios vs ios-sim fixes --- .../libraries/helix-queues-setup.yml | 2 +- eng/testing/AppleRunnerTemplate.sh | 8 +++++--- eng/testing/xunit/xunit.console.targets | 2 +- src/libraries/sendtohelixhelp.proj | 20 +++++++++++++------ src/mono/nuget/mono-packages.proj | 2 +- src/mono/sample/iOS/Program.csproj | 3 +-- .../AotCompilerTask/MonoAOTCompiler.props | 4 ++-- 7 files changed, 25 insertions(+), 16 deletions(-) diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml index 7f66f5b0b6171..6cc0a07498f05 100644 --- a/eng/pipelines/libraries/helix-queues-setup.yml +++ b/eng/pipelines/libraries/helix-queues-setup.yml @@ -106,7 +106,7 @@ jobs: - Windows.10.Amd64.Android.Open # iOS x64/x86 - - ${{ if in(parameters.platform, 'iOS_x64', 'iOS_x86') }}: + - ${{ if in(parameters.platform, 'iOS_sim_x64', 'iOS_sim_x86') }}: - OSX.1015.Amd64.Open # windows x64 diff --git a/eng/testing/AppleRunnerTemplate.sh b/eng/testing/AppleRunnerTemplate.sh index e02a9a1569717..c1f6373878a6a 100644 --- a/eng/testing/AppleRunnerTemplate.sh +++ b/eng/testing/AppleRunnerTemplate.sh @@ -18,12 +18,14 @@ 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-sim" && "$TARGET_ARCH" == "x86" ]]; then TARGET=ios-simulator-32; fi +if [[ "$TARGET_OS" == "iOS-sim" && "$TARGET_ARCH" == "x64" ]]; then TARGET=ios-simulator-64; fi +if [[ "$TARGET_OS" == "iOS-sim" && "$TARGET_ARCH" == "arm64" ]]; then TARGET=ios-simulator-64; fi if [[ "$TARGET_OS" == "iOS" && "$TARGET_ARCH" == "arm" ]]; then TARGET=ios-device; fi if [[ "$TARGET_OS" == "iOS" && "$TARGET_ARCH" == "arm64" ]]; then TARGET=ios-device; fi -if [[ "$TARGET_OS" == "tvOS" && "$TARGET_ARCH" == "x64" ]]; then TARGET=tvos-simulator; fi +if [[ "$TARGET_OS" == "tvOS-sim" && "$TARGET_ARCH" == "x64" ]]; then TARGET=tvos-simulator; fi +if [[ "$TARGET_OS" == "tvOS-sim" && "$TARGET_ARCH" == "arm64" ]]; then TARGET=tvos-simulator; fi if [[ "$TARGET_OS" == "tvOS" && "$TARGET_ARCH" == "arm64" ]]; then TARGET=tvos-device; fi # "Release" in SCHEME_SDK is what xcode produces (see "bool Optimized" property in AppleAppBuilderTask) diff --git a/eng/testing/xunit/xunit.console.targets b/eng/testing/xunit/xunit.console.targets index a3e7d2614a4f5..078e73463e394 100644 --- a/eng/testing/xunit/xunit.console.targets +++ b/eng/testing/xunit/xunit.console.targets @@ -2,7 +2,7 @@ true testResults.xml - true + true diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj index 4efa7087a45cc..2ffdf5718ca3a 100644 --- a/src/libraries/sendtohelixhelp.proj +++ b/src/libraries/sendtohelixhelp.proj @@ -25,7 +25,7 @@ '$(Scenario)' == 'gcstress0xc_jitstress1' or '$(Scenario)' == 'gcstress0xc_jitstress2' or '$(Scenario)' == 'gcstress0xc_jitminopts_heapverify1'">01:30:00 - <_workItemTimeout Condition="'$(_workItemTimeout)' == '' and ('$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'Android')">00:30:00 + <_workItemTimeout Condition="'$(_workItemTimeout)' == '' and ('$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOS-sim' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'tvOS-sim' or '$(TargetOS)' == 'Android')">00:30:00 <_workItemTimeout Condition="'$(Scenario)' == '' and '$(_workItemTimeout)' == '' and ('$(TargetArchitecture)' == 'arm64' or '$(TargetArchitecture)' == 'arm')">00:45:00 <_workItemTimeout Condition="'$(Scenario)' != '' and '$(_workItemTimeout)' == '' and ('$(TargetArchitecture)' == 'arm64' or '$(TargetArchitecture)' == 'arm')">01:00:00 <_workItemTimeout Condition="'$(Scenario)' == 'BuildWasmApps' and '$(_workItemTimeout)' == ''">01:00:00 @@ -69,7 +69,7 @@ test/functional/packaging/ - + true @@ -167,6 +167,14 @@ ios-device ios-device + $(_workItemTimeout) + $(_workItemTimeout) + + + + + + ios-simulator-64 ios-simulator-64 ios-simulator-32 $(_workItemTimeout) @@ -202,7 +210,7 @@ - + @@ -256,7 +264,7 @@ - + @@ -294,8 +302,8 @@ - - + + diff --git a/src/mono/nuget/mono-packages.proj b/src/mono/nuget/mono-packages.proj index a64bebe497783..44afc8699ffeb 100644 --- a/src/mono/nuget/mono-packages.proj +++ b/src/mono/nuget/mono-packages.proj @@ -13,7 +13,7 @@ - + diff --git a/src/mono/sample/iOS/Program.csproj b/src/mono/sample/iOS/Program.csproj index 2170c8136d26a..dd37b1aef4aa5 100644 --- a/src/mono/sample/iOS/Program.csproj +++ b/src/mono/sample/iOS/Program.csproj @@ -3,9 +3,8 @@ Exe bin $(NetCoreAppToolCurrent) - $(TargetOS) iOS - iOS-sim + iOS-sim $(ArtifactsBinDir)microsoft.netcore.app.runtime.$(TargetOS.ToLower())-$(TargetArchitecture)\$(Configuration)\runtimes\$(TargetOS.ToLower())-$(TargetArchitecture)\ false $(TargetOS.ToLower())-$(TargetArchitecture) diff --git a/src/tasks/AotCompilerTask/MonoAOTCompiler.props b/src/tasks/AotCompilerTask/MonoAOTCompiler.props index 852a5330a0e73..46a7485f9c408 100644 --- a/src/tasks/AotCompilerTask/MonoAOTCompiler.props +++ b/src/tasks/AotCompilerTask/MonoAOTCompiler.props @@ -1,5 +1,5 @@ - + @@ -10,7 +10,7 @@ - + From 1989605c65ef3285c96a0a61fa1cd00a706e8ca2 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Thu, 11 Mar 2021 12:13:54 -0500 Subject: [PATCH 24/48] Fix bad half-reverted changey --- src/mono/sample/iOS/Program.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mono/sample/iOS/Program.csproj b/src/mono/sample/iOS/Program.csproj index dd37b1aef4aa5..acfe76c489d66 100644 --- a/src/mono/sample/iOS/Program.csproj +++ b/src/mono/sample/iOS/Program.csproj @@ -33,7 +33,7 @@ $(MSBuildThisFileDirectory)$(PublishDir)\app - iPhone 11 + iPhone 11 True true From 528743f3d464d93aaf2d376d3abec344b09f690b Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Thu, 11 Mar 2021 13:57:05 -0500 Subject: [PATCH 25/48] Enable passing OS subgroups & overriding targetOS based on them to Helix --- eng/pipelines/libraries/helix.yml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/libraries/helix.yml b/eng/pipelines/libraries/helix.yml index ec6aeea424f75..80d323a0ea893 100644 --- a/eng/pipelines/libraries/helix.yml +++ b/eng/pipelines/libraries/helix.yml @@ -5,6 +5,7 @@ parameters: creator: '' helixQueues: '' osGroup: '' + osSubGroup: '' targetRid: '' testRunNamePrefixSuffix: '' testScope: 'innerloop' # innerloop | outerloop | all @@ -14,6 +15,20 @@ parameters: shouldContinueOnError: false scenarios: '' +variables: +- name: osGroup + value: ${{ parameters.osGroup }} +- name: osSubgroup + value: ${{ parameters.osSubgroup }} +- name: osOverride + value: '/p:TargetOS=${{ parameters.osGroup }}' +- ${{ if and(eq(parameters.osGroup, 'tvOS'),eq(parameters.osSubGroup, '_sim')) }}: + - name: osOverride + value: '/p:TargetOS=tvOS-sim' +- ${{ if and(eq(parameters.osGroup, 'iOS'),eq(parameters.osSubGroup, '_sim')) }}: + - name: osOverride + value: '/p:TargetOS=iOS-sim' + steps: - script: $(_msbuildCommand) $(Build.SourcesDirectory)/src/libraries/sendtohelix.proj @@ -21,7 +36,7 @@ steps: /p:TargetArchitecture=${{ parameters.archType }} /p:TargetRuntimeIdentifier=${{ parameters.targetRid }} /p:Configuration=${{ parameters.buildConfig }} - /p:TargetOS=${{ parameters.osGroup }} + ${{ osOverride }} /p:MonoForceInterpreter=${{ parameters.interpreter }} /p:TestScope=${{ parameters.testScope }} /p:TestRunNamePrefixSuffix=${{ parameters.testRunNamePrefixSuffix }} From d1b1f7882e963a9fb29b14b6308c033fe010c2a2 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Thu, 11 Mar 2021 14:52:35 -0500 Subject: [PATCH 26/48] Indent varaibles --- eng/pipelines/libraries/helix.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/pipelines/libraries/helix.yml b/eng/pipelines/libraries/helix.yml index 80d323a0ea893..e42408d81b222 100644 --- a/eng/pipelines/libraries/helix.yml +++ b/eng/pipelines/libraries/helix.yml @@ -15,19 +15,19 @@ parameters: shouldContinueOnError: false scenarios: '' -variables: -- name: osGroup - value: ${{ parameters.osGroup }} -- name: osSubgroup - value: ${{ parameters.osSubgroup }} -- name: osOverride - value: '/p:TargetOS=${{ parameters.osGroup }}' -- ${{ if and(eq(parameters.osGroup, 'tvOS'),eq(parameters.osSubGroup, '_sim')) }}: - - name: osOverride - value: '/p:TargetOS=tvOS-sim' -- ${{ if and(eq(parameters.osGroup, 'iOS'),eq(parameters.osSubGroup, '_sim')) }}: - - name: osOverride - value: '/p:TargetOS=iOS-sim' + variables: + - name: osGroup + value: ${{ parameters.osGroup }} + - name: osSubgroup + value: ${{ parameters.osSubgroup }} + - name: osOverride + value: '/p:TargetOS=${{ parameters.osGroup }}' + - ${{ if and(eq(parameters.osGroup, 'tvOS'),eq(parameters.osSubGroup, '_sim')) }}: + - name: osOverride + value: '/p:TargetOS=tvOS-sim' + - ${{ if and(eq(parameters.osGroup, 'iOS'),eq(parameters.osSubGroup, '_sim')) }}: + - name: osOverride + value: '/p:TargetOS=iOS-sim' steps: - script: $(_msbuildCommand) From 5e4a69e9295160b91d0c505b069cc11fa94ff9c7 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Thu, 11 Mar 2021 15:01:53 -0500 Subject: [PATCH 27/48] yaml!! --- eng/pipelines/libraries/helix.yml | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/eng/pipelines/libraries/helix.yml b/eng/pipelines/libraries/helix.yml index e42408d81b222..0be044d731a91 100644 --- a/eng/pipelines/libraries/helix.yml +++ b/eng/pipelines/libraries/helix.yml @@ -4,8 +4,8 @@ parameters: buildConfig: '' creator: '' helixQueues: '' - osGroup: '' - osSubGroup: '' + osGroup: '${{ parameters.osGroup }}' + osSubGroup: '${{ parameters.osSubgroup }}' targetRid: '' testRunNamePrefixSuffix: '' testScope: 'innerloop' # innerloop | outerloop | all @@ -15,19 +15,13 @@ parameters: shouldContinueOnError: false scenarios: '' - variables: - - name: osGroup - value: ${{ parameters.osGroup }} - - name: osSubgroup - value: ${{ parameters.osSubgroup }} + osOverride: '/p:TargetOS=${{ parameters.osGroup }}' + ${{ if and(eq(parameters.osGroup, 'tvOS'),eq(parameters.osSubGroup, '_sim')) }}: - name: osOverride - value: '/p:TargetOS=${{ parameters.osGroup }}' - - ${{ if and(eq(parameters.osGroup, 'tvOS'),eq(parameters.osSubGroup, '_sim')) }}: - - name: osOverride - value: '/p:TargetOS=tvOS-sim' - - ${{ if and(eq(parameters.osGroup, 'iOS'),eq(parameters.osSubGroup, '_sim')) }}: - - name: osOverride - value: '/p:TargetOS=iOS-sim' + value: '/p:TargetOS=tvOS-sim' + ${{ if and(eq(parameters.osGroup, 'iOS'),eq(parameters.osSubGroup, '_sim')) }}: + - name: osOverride + value: '/p:TargetOS=iOS-sim' steps: - script: $(_msbuildCommand) From 30f654164c9731b1d9c954a30a9af7ec324fbb6c Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Thu, 11 Mar 2021 15:11:18 -0500 Subject: [PATCH 28/48] Override the OS in msbuild, apparently it's easier than yaml --- eng/pipelines/libraries/helix.yml | 15 ++++----------- src/libraries/sendtohelix.proj | 5 +++++ 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/eng/pipelines/libraries/helix.yml b/eng/pipelines/libraries/helix.yml index 0be044d731a91..b96755482c7bb 100644 --- a/eng/pipelines/libraries/helix.yml +++ b/eng/pipelines/libraries/helix.yml @@ -4,8 +4,8 @@ parameters: buildConfig: '' creator: '' helixQueues: '' - osGroup: '${{ parameters.osGroup }}' - osSubGroup: '${{ parameters.osSubgroup }}' + osGroup: '' + osSubGroup: '' targetRid: '' testRunNamePrefixSuffix: '' testScope: 'innerloop' # innerloop | outerloop | all @@ -15,14 +15,6 @@ parameters: shouldContinueOnError: false scenarios: '' - osOverride: '/p:TargetOS=${{ parameters.osGroup }}' - ${{ if and(eq(parameters.osGroup, 'tvOS'),eq(parameters.osSubGroup, '_sim')) }}: - - name: osOverride - value: '/p:TargetOS=tvOS-sim' - ${{ if and(eq(parameters.osGroup, 'iOS'),eq(parameters.osSubGroup, '_sim')) }}: - - name: osOverride - value: '/p:TargetOS=iOS-sim' - steps: - script: $(_msbuildCommand) $(Build.SourcesDirectory)/src/libraries/sendtohelix.proj @@ -30,7 +22,8 @@ steps: /p:TargetArchitecture=${{ parameters.archType }} /p:TargetRuntimeIdentifier=${{ parameters.targetRid }} /p:Configuration=${{ parameters.buildConfig }} - ${{ osOverride }} + /p:TargetOS=${{ parameters.osGroup }} + /p:osSubGroup=${{ parameters.osSubGroup }} /p:MonoForceInterpreter=${{ parameters.interpreter }} /p:TestScope=${{ parameters.testScope }} /p:TestRunNamePrefixSuffix=${{ parameters.testRunNamePrefixSuffix }} diff --git a/src/libraries/sendtohelix.proj b/src/libraries/sendtohelix.proj index 4d113c917f7b5..308e46298867f 100644 --- a/src/libraries/sendtohelix.proj +++ b/src/libraries/sendtohelix.proj @@ -15,6 +15,11 @@ + + + $(TargetOS)-sim + + From cf907027e633f8a0b4ec3b6c2112c29bf63b836c Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Thu, 11 Mar 2021 16:54:05 -0500 Subject: [PATCH 29/48] Revert "Override the OS in msbuild, apparently it's easier than yaml" This reverts commit 30f654164c9731b1d9c954a30a9af7ec324fbb6c. --- eng/pipelines/libraries/helix.yml | 15 +++++++++++---- src/libraries/sendtohelix.proj | 5 ----- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/eng/pipelines/libraries/helix.yml b/eng/pipelines/libraries/helix.yml index b96755482c7bb..0be044d731a91 100644 --- a/eng/pipelines/libraries/helix.yml +++ b/eng/pipelines/libraries/helix.yml @@ -4,8 +4,8 @@ parameters: buildConfig: '' creator: '' helixQueues: '' - osGroup: '' - osSubGroup: '' + osGroup: '${{ parameters.osGroup }}' + osSubGroup: '${{ parameters.osSubgroup }}' targetRid: '' testRunNamePrefixSuffix: '' testScope: 'innerloop' # innerloop | outerloop | all @@ -15,6 +15,14 @@ parameters: shouldContinueOnError: false scenarios: '' + osOverride: '/p:TargetOS=${{ parameters.osGroup }}' + ${{ if and(eq(parameters.osGroup, 'tvOS'),eq(parameters.osSubGroup, '_sim')) }}: + - name: osOverride + value: '/p:TargetOS=tvOS-sim' + ${{ if and(eq(parameters.osGroup, 'iOS'),eq(parameters.osSubGroup, '_sim')) }}: + - name: osOverride + value: '/p:TargetOS=iOS-sim' + steps: - script: $(_msbuildCommand) $(Build.SourcesDirectory)/src/libraries/sendtohelix.proj @@ -22,8 +30,7 @@ steps: /p:TargetArchitecture=${{ parameters.archType }} /p:TargetRuntimeIdentifier=${{ parameters.targetRid }} /p:Configuration=${{ parameters.buildConfig }} - /p:TargetOS=${{ parameters.osGroup }} - /p:osSubGroup=${{ parameters.osSubGroup }} + ${{ osOverride }} /p:MonoForceInterpreter=${{ parameters.interpreter }} /p:TestScope=${{ parameters.testScope }} /p:TestRunNamePrefixSuffix=${{ parameters.testRunNamePrefixSuffix }} diff --git a/src/libraries/sendtohelix.proj b/src/libraries/sendtohelix.proj index 308e46298867f..4d113c917f7b5 100644 --- a/src/libraries/sendtohelix.proj +++ b/src/libraries/sendtohelix.proj @@ -15,11 +15,6 @@ - - - $(TargetOS)-sim - - From 97759698973c247bb55e6f561df5add7fc21c6a2 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Thu, 11 Mar 2021 16:59:28 -0500 Subject: [PATCH 30/48] Try doing ios-sim conditional via env var --- eng/pipelines/libraries/helix.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/eng/pipelines/libraries/helix.yml b/eng/pipelines/libraries/helix.yml index 0be044d731a91..18580cf65683f 100644 --- a/eng/pipelines/libraries/helix.yml +++ b/eng/pipelines/libraries/helix.yml @@ -4,8 +4,8 @@ parameters: buildConfig: '' creator: '' helixQueues: '' - osGroup: '${{ parameters.osGroup }}' - osSubGroup: '${{ parameters.osSubgroup }}' + osGroup: '' + osSubGroup: '' targetRid: '' testRunNamePrefixSuffix: '' testScope: 'innerloop' # innerloop | outerloop | all @@ -15,14 +15,6 @@ parameters: shouldContinueOnError: false scenarios: '' - osOverride: '/p:TargetOS=${{ parameters.osGroup }}' - ${{ if and(eq(parameters.osGroup, 'tvOS'),eq(parameters.osSubGroup, '_sim')) }}: - - name: osOverride - value: '/p:TargetOS=tvOS-sim' - ${{ if and(eq(parameters.osGroup, 'iOS'),eq(parameters.osSubGroup, '_sim')) }}: - - name: osOverride - value: '/p:TargetOS=iOS-sim' - steps: - script: $(_msbuildCommand) $(Build.SourcesDirectory)/src/libraries/sendtohelix.proj @@ -45,3 +37,10 @@ steps: SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops HelixTargetQueues: ${{ join('+', parameters.helixQueues) }} # Pass queues to MSBuild as env var to avoid need of escaping them _Scenarios: ${{ join(',', parameters.scenarios) }} # Pass scenarios to MSBuild as env var to avoid need of escaping comma separated list + ${{ if ne(parameters.osSubGroup, '_sim') }}: + TargetOS: ${{ parameters.osGroup }} + ${{ if and(eq(parameters.osGroup, 'tvOS'),eq(parameters.osSubGroup, '_sim')) }}: + TargetOS: tvOS-sim + ${{ if and(eq(parameters.osGroup, 'iOS'),eq(parameters.osSubGroup, '_sim')) }}: + TargetOS: iOS-sim + From f0ea01d2f596967a517814169779e0bc44d901a4 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Thu, 11 Mar 2021 17:00:57 -0500 Subject: [PATCH 31/48] Fix --- eng/pipelines/libraries/helix.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/pipelines/libraries/helix.yml b/eng/pipelines/libraries/helix.yml index 18580cf65683f..cabff6fdeb3c5 100644 --- a/eng/pipelines/libraries/helix.yml +++ b/eng/pipelines/libraries/helix.yml @@ -22,7 +22,6 @@ steps: /p:TargetArchitecture=${{ parameters.archType }} /p:TargetRuntimeIdentifier=${{ parameters.targetRid }} /p:Configuration=${{ parameters.buildConfig }} - ${{ osOverride }} /p:MonoForceInterpreter=${{ parameters.interpreter }} /p:TestScope=${{ parameters.testScope }} /p:TestRunNamePrefixSuffix=${{ parameters.testRunNamePrefixSuffix }} From 51c3d04861494d27cf5cfb67ec2d11439b16c2b5 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Fri, 12 Mar 2021 12:06:40 -0500 Subject: [PATCH 32/48] Update src/libraries/Native/build-native.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Alexander Köplinger --- src/libraries/Native/build-native.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/Native/build-native.sh b/src/libraries/Native/build-native.sh index 22f5cd28189e6..2baf188be09a8 100755 --- a/src/libraries/Native/build-native.sh +++ b/src/libraries/Native/build-native.sh @@ -145,7 +145,7 @@ elif [[ "$__TargetOS" == tvOS-sim ]]; then elif [[ "$__BuildArch" == arm64 ]]; then __CMakeArgs="-DCMAKE_OSX_SYSROOT=appletvsimulator -DCMAKE_OSX_ARCHITECTURES=\"arm64\" $__CMakeArgs" else - echo "Error: Unknown tvOS architecture $__BuildArch." + echo "Error: Unknown tvOS-sim architecture $__BuildArch." exit 1 fi elif [[ "$__TargetOS" == tvOS ]]; then From 5060c65cb587c463f4b6ae8cd1ed2cdd5ee584c0 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Fri, 12 Mar 2021 12:07:54 -0500 Subject: [PATCH 33/48] Update src/mono/sample/iOS/Program.csproj MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Alexander Köplinger --- src/mono/sample/iOS/Program.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mono/sample/iOS/Program.csproj b/src/mono/sample/iOS/Program.csproj index acfe76c489d66..85ed394905319 100644 --- a/src/mono/sample/iOS/Program.csproj +++ b/src/mono/sample/iOS/Program.csproj @@ -17,7 +17,7 @@ - $(ArtifactsBinDir)microsoft.netcore.app.runtime.$(TargetOS.ToLower())-$(TargetArchitecture)\$(Configuration) + $(ArtifactsBinDir)microsoft.netcore.app.runtime.$(RuntimeIdentifier)\$(Configuration) From 44d2c06301f29fdc56b4c085f40e5626319efba7 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Fri, 12 Mar 2021 13:33:57 -0500 Subject: [PATCH 34/48] Try using osGroup=ios-sim instead of osGroup=iOS, osSubGroup=_sim --- eng/pipelines/common/global-build-job.yml | 7 ------- eng/pipelines/common/platform-matrix.yml | 15 +++++---------- eng/pipelines/libraries/helix.yml | 9 +-------- eng/pipelines/mono/templates/build-job.yml | 4 ++-- 4 files changed, 8 insertions(+), 27 deletions(-) diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index c83224febddfc..3baff96b8df14 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -63,13 +63,6 @@ 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 diff --git a/eng/pipelines/common/platform-matrix.yml b/eng/pipelines/common/platform-matrix.yml index f83ba87e37c8b..5a1e085901cce 100644 --- a/eng/pipelines/common/platform-matrix.yml +++ b/eng/pipelines/common/platform-matrix.yml @@ -394,8 +394,7 @@ jobs: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: tvOS - osSubGroup: _sim + osGroup: tvOS-sim archType: x64 targetRid: tvos-sim-x64 platform: tvOS_sim_x64 @@ -416,8 +415,7 @@ jobs: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: tvOS - osSubGroup: _sim + osGroup: tvOS-sim archType: arm64 targetRid: tvos-sim-arm64 platform: tvOS_sim_arm64 @@ -480,8 +478,7 @@ jobs: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: iOS - osSubGroup: _sim + osGroup: iOS-sim archType: x64 targetRid: ios-sim-x64 platform: iOS_sim_x64 @@ -502,8 +499,7 @@ jobs: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: iOS - osSubGroup: _sim + osGroup: iOS-sim archType: x86 targetRid: ios-sim-x86 platform: iOS_sim_x86 @@ -525,8 +521,7 @@ jobs: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: iOS - osSubGroup: _sim + osGroup: iOS-sim archType: arm64 targetRid: ios-sim-arm64 platform: iOS_sim_arm64 diff --git a/eng/pipelines/libraries/helix.yml b/eng/pipelines/libraries/helix.yml index cabff6fdeb3c5..ec6aeea424f75 100644 --- a/eng/pipelines/libraries/helix.yml +++ b/eng/pipelines/libraries/helix.yml @@ -5,7 +5,6 @@ parameters: creator: '' helixQueues: '' osGroup: '' - osSubGroup: '' targetRid: '' testRunNamePrefixSuffix: '' testScope: 'innerloop' # innerloop | outerloop | all @@ -22,6 +21,7 @@ steps: /p:TargetArchitecture=${{ parameters.archType }} /p:TargetRuntimeIdentifier=${{ parameters.targetRid }} /p:Configuration=${{ parameters.buildConfig }} + /p:TargetOS=${{ parameters.osGroup }} /p:MonoForceInterpreter=${{ parameters.interpreter }} /p:TestScope=${{ parameters.testScope }} /p:TestRunNamePrefixSuffix=${{ parameters.testRunNamePrefixSuffix }} @@ -36,10 +36,3 @@ steps: SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops HelixTargetQueues: ${{ join('+', parameters.helixQueues) }} # Pass queues to MSBuild as env var to avoid need of escaping them _Scenarios: ${{ join(',', parameters.scenarios) }} # Pass scenarios to MSBuild as env var to avoid need of escaping comma separated list - ${{ if ne(parameters.osSubGroup, '_sim') }}: - TargetOS: ${{ parameters.osGroup }} - ${{ if and(eq(parameters.osGroup, 'tvOS'),eq(parameters.osSubGroup, '_sim')) }}: - TargetOS: tvOS-sim - ${{ if and(eq(parameters.osGroup, 'iOS'),eq(parameters.osSubGroup, '_sim')) }}: - TargetOS: iOS-sim - diff --git a/eng/pipelines/mono/templates/build-job.yml b/eng/pipelines/mono/templates/build-job.yml index 59ef515949575..d7d0cdb0eeb6b 100644 --- a/eng/pipelines/mono/templates/build-job.yml +++ b/eng/pipelines/mono/templates/build-job.yml @@ -74,13 +74,13 @@ jobs: - ${{ if eq(parameters.osGroup, 'tvOS') }}: - name: osOverride value: -os tvOS - - ${{ if and(eq(parameters.osGroup, 'tvOS'),eq(parameters.osSubGroup, '_sim')) }}: + - ${{ if eq(parameters.osGroup, 'tvOS-sim') }}: - name: osOverride value: -os tvOS-sim - ${{ if eq(parameters.osGroup, 'iOS') }}: - name: osOverride value: -os iOS - - ${{ if and(eq(parameters.osGroup, 'iOS'),eq(parameters.osSubGroup, '_sim')) }}: + - ${{ if eq(parameters.osGroup, 'iOS-sim') }}: - name: osOverride value: -os iOS-sim - ${{ if eq(parameters.osGroup, 'Android') }}: From 85ecc3f0a50be3bf46960a145057f046bc245147 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Fri, 12 Mar 2021 13:34:27 -0500 Subject: [PATCH 35/48] Address PR review --- src/mono/sample/iOS/Makefile | 2 +- src/tasks/AppleAppBuilder/Xcode.cs | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/mono/sample/iOS/Makefile b/src/mono/sample/iOS/Makefile index 44f7b40dabe79..cda5da83e4951 100644 --- a/src/mono/sample/iOS/Makefile +++ b/src/mono/sample/iOS/Makefile @@ -12,7 +12,7 @@ appbuilder: $(DOTNET) build -c Debug $(TOOLS_DIR)/AppleAppBuilder/AppleAppBuilder.csproj runtimepack: - ../../../../build.sh Mono+Libs -os iOS -arch $(MONO_ARCH) -c $(MONO_CONFIG) + ../../../../build.sh Mono+Libs -os iOS-sim -arch $(MONO_ARCH) -c $(MONO_CONFIG) run: clean appbuilder $(DOTNET) publish -c $(MONO_CONFIG) /p:TargetArchitecture=$(MONO_ARCH) \ diff --git a/src/tasks/AppleAppBuilder/Xcode.cs b/src/tasks/AppleAppBuilder/Xcode.cs index 695f1c9427992..7f40f3f13d809 100644 --- a/src/tasks/AppleAppBuilder/Xcode.cs +++ b/src/tasks/AppleAppBuilder/Xcode.cs @@ -18,13 +18,17 @@ public Xcode(string target) switch (Target) { case TargetNames.iOS: - case TargetNames.iOSsim: SysRoot = Utils.RunProcess("xcrun", "--sdk iphoneos --show-sdk-path"); break; + case TargetNames.iOSsim: + SysRoot = Utils.RunProcess("xcrun", "--sdk iphonesimulator --show-sdk-path"); + break; case TargetNames.tvOS: - case TargetNames.tvOSsim: SysRoot = Utils.RunProcess("xcrun", "--sdk appletvos --show-sdk-path"); break; + case TargetNames.tvOSsim: + SysRoot = Utils.RunProcess("xcrun", "--sdk appletvsimulator --show-sdk-path"); + break; default: SysRoot = Utils.RunProcess("xcrun", "--sdk macosx --show-sdk-path"); break; From cceac841222ed415206e31f8e31bf7773150498c Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Fri, 12 Mar 2021 14:53:05 -0500 Subject: [PATCH 36/48] Revert "Try using osGroup=ios-sim instead of osGroup=iOS, osSubGroup=_sim" This reverts commit 44d2c06301f29fdc56b4c085f40e5626319efba7. --- eng/pipelines/common/global-build-job.yml | 7 +++++++ eng/pipelines/common/platform-matrix.yml | 15 ++++++++++----- eng/pipelines/libraries/helix.yml | 9 ++++++++- eng/pipelines/mono/templates/build-job.yml | 4 ++-- 4 files changed, 27 insertions(+), 8 deletions(-) diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index 3baff96b8df14..c83224febddfc 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/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 diff --git a/eng/pipelines/common/platform-matrix.yml b/eng/pipelines/common/platform-matrix.yml index 5a1e085901cce..f83ba87e37c8b 100644 --- a/eng/pipelines/common/platform-matrix.yml +++ b/eng/pipelines/common/platform-matrix.yml @@ -394,7 +394,8 @@ jobs: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: tvOS-sim + osGroup: tvOS + osSubGroup: _sim archType: x64 targetRid: tvos-sim-x64 platform: tvOS_sim_x64 @@ -415,7 +416,8 @@ jobs: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: tvOS-sim + osGroup: tvOS + osSubGroup: _sim archType: arm64 targetRid: tvos-sim-arm64 platform: tvOS_sim_arm64 @@ -478,7 +480,8 @@ jobs: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: iOS-sim + osGroup: iOS + osSubGroup: _sim archType: x64 targetRid: ios-sim-x64 platform: iOS_sim_x64 @@ -499,7 +502,8 @@ jobs: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: iOS-sim + osGroup: iOS + osSubGroup: _sim archType: x86 targetRid: ios-sim-x86 platform: iOS_sim_x86 @@ -521,7 +525,8 @@ jobs: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: iOS-sim + osGroup: iOS + osSubGroup: _sim archType: arm64 targetRid: ios-sim-arm64 platform: iOS_sim_arm64 diff --git a/eng/pipelines/libraries/helix.yml b/eng/pipelines/libraries/helix.yml index ec6aeea424f75..cabff6fdeb3c5 100644 --- a/eng/pipelines/libraries/helix.yml +++ b/eng/pipelines/libraries/helix.yml @@ -5,6 +5,7 @@ parameters: creator: '' helixQueues: '' osGroup: '' + osSubGroup: '' targetRid: '' testRunNamePrefixSuffix: '' testScope: 'innerloop' # innerloop | outerloop | all @@ -21,7 +22,6 @@ steps: /p:TargetArchitecture=${{ parameters.archType }} /p:TargetRuntimeIdentifier=${{ parameters.targetRid }} /p:Configuration=${{ parameters.buildConfig }} - /p:TargetOS=${{ parameters.osGroup }} /p:MonoForceInterpreter=${{ parameters.interpreter }} /p:TestScope=${{ parameters.testScope }} /p:TestRunNamePrefixSuffix=${{ parameters.testRunNamePrefixSuffix }} @@ -36,3 +36,10 @@ steps: SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops HelixTargetQueues: ${{ join('+', parameters.helixQueues) }} # Pass queues to MSBuild as env var to avoid need of escaping them _Scenarios: ${{ join(',', parameters.scenarios) }} # Pass scenarios to MSBuild as env var to avoid need of escaping comma separated list + ${{ if ne(parameters.osSubGroup, '_sim') }}: + TargetOS: ${{ parameters.osGroup }} + ${{ if and(eq(parameters.osGroup, 'tvOS'),eq(parameters.osSubGroup, '_sim')) }}: + TargetOS: tvOS-sim + ${{ if and(eq(parameters.osGroup, 'iOS'),eq(parameters.osSubGroup, '_sim')) }}: + TargetOS: iOS-sim + diff --git a/eng/pipelines/mono/templates/build-job.yml b/eng/pipelines/mono/templates/build-job.yml index d7d0cdb0eeb6b..59ef515949575 100644 --- a/eng/pipelines/mono/templates/build-job.yml +++ b/eng/pipelines/mono/templates/build-job.yml @@ -74,13 +74,13 @@ jobs: - ${{ if eq(parameters.osGroup, 'tvOS') }}: - name: osOverride value: -os tvOS - - ${{ if eq(parameters.osGroup, 'tvOS-sim') }}: + - ${{ if and(eq(parameters.osGroup, 'tvOS'),eq(parameters.osSubGroup, '_sim')) }}: - name: osOverride value: -os tvOS-sim - ${{ if eq(parameters.osGroup, 'iOS') }}: - name: osOverride value: -os iOS - - ${{ if eq(parameters.osGroup, 'iOS-sim') }}: + - ${{ if and(eq(parameters.osGroup, 'iOS'),eq(parameters.osSubGroup, '_sim')) }}: - name: osOverride value: -os iOS-sim - ${{ if eq(parameters.osGroup, 'Android') }}: From f1a485163cc20f4618764fbe57c9258a530739d1 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Mon, 15 Mar 2021 09:05:39 -0400 Subject: [PATCH 37/48] Add ios-sim/tvos-sim to osGroups.json --- src/libraries/OSGroups.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/libraries/OSGroups.json b/src/libraries/OSGroups.json index 6abdb84c5192b..1afdaccf07d73 100644 --- a/src/libraries/OSGroups.json +++ b/src/libraries/OSGroups.json @@ -24,11 +24,21 @@ "Unix" ] }, + "iOS-sim": { + "#import": [ + "iOS" + ] + }, "tvOS": { "#import": [ "Unix" ] }, + "tvOS-sim": { + "#import": [ + "tvOS" + ] + }, "Android": { "#import": [ "Linux" From 0443e3a2ac1e84900625f5969b3e97a284840b6b Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Tue, 16 Mar 2021 09:54:38 -0400 Subject: [PATCH 38/48] Revert "Add ios-sim/tvos-sim to osGroups.json" This reverts commit f1a485163cc20f4618764fbe57c9258a530739d1. --- src/libraries/OSGroups.json | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/libraries/OSGroups.json b/src/libraries/OSGroups.json index 1afdaccf07d73..6abdb84c5192b 100644 --- a/src/libraries/OSGroups.json +++ b/src/libraries/OSGroups.json @@ -24,21 +24,11 @@ "Unix" ] }, - "iOS-sim": { - "#import": [ - "iOS" - ] - }, "tvOS": { "#import": [ "Unix" ] }, - "tvOS-sim": { - "#import": [ - "tvOS" - ] - }, "Android": { "#import": [ "Linux" From c6f007da1f30a571255844bf7b2358a5885cee4f Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Wed, 17 Mar 2021 12:38:46 -0400 Subject: [PATCH 39/48] Rename iOS-sim to iOSSimulator --- Directory.Build.props | 20 ++++----- eng/Subsets.props | 2 +- eng/build.sh | 14 +++--- eng/native/build-commons.sh | 4 +- eng/native/configureplatform.cmake | 16 +++---- eng/native/init-distro-rid.sh | 8 ++-- eng/pipelines/common/global-build-job.yml | 7 --- eng/pipelines/common/platform-matrix.yml | 45 +++++++++---------- .../libraries/helix-queues-setup.yml | 2 +- eng/pipelines/libraries/helix.yml | 8 +--- eng/pipelines/mono/templates/build-job.yml | 8 ++-- eng/pipelines/runtime-official.yml | 10 ++--- eng/pipelines/runtime-staging.yml | 2 +- eng/pipelines/runtime.yml | 4 +- eng/targetingpacks.targets | 2 +- eng/testing/AppleRunnerTemplate.sh | 10 ++--- eng/testing/tests.mobile.targets | 6 +-- eng/testing/tests.targets | 2 +- eng/testing/xunit/xunit.console.targets | 2 +- .../monocrossaot.sfxproj | 2 +- .../pkg/runtimeGroups.props | 12 ++--- src/libraries/Native/build-native.sh | 12 ++--- src/libraries/pretest.proj | 2 +- src/libraries/sendtohelixhelp.proj | 14 +++--- src/libraries/tests.proj | 6 +-- src/mono/monoaotcross.proj | 4 +- src/mono/nuget/mono-packages.proj | 2 +- src/mono/sample/iOS/Makefile | 2 +- src/mono/sample/iOS/Program.csproj | 2 +- .../AotCompilerTask/MonoAOTCompiler.props | 4 +- src/tasks/AppleAppBuilder/TargetOS.cs | 4 +- src/tasks/tasks.proj | 2 +- 32 files changed, 111 insertions(+), 129 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index e495d6f065e64..16b9ac6daeaaf 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -17,7 +17,7 @@ Solaris Linux windows - true + true @@ -123,9 +123,9 @@ <_portableOS Condition="'$(_runtimeOS)' == 'Browser'">browser <_portableOS Condition="'$(_runtimeOS)' == 'maccatalyst'">maccatalyst <_portableOS Condition="'$(_runtimeOS)' == 'ios'">ios - <_portableOS Condition="'$(_runtimeOS)' == 'ios-sim'">ios-sim + <_portableOS Condition="'$(_runtimeOS)' == 'iOSSimulator'">iOSSimulator <_portableOS Condition="'$(_runtimeOS)' == 'tvos'">tvos - <_portableOS Condition="'$(_runtimeOS)' == 'tvos-sim'">tvos-sim + <_portableOS Condition="'$(_runtimeOS)' == 'tvOSSimulator'">tvOSSimulator <_portableOS Condition="'$(_runtimeOS)' == 'android'">android <_runtimeOS Condition="$(_runtimeOS.StartsWith('tizen'))">linux @@ -152,7 +152,7 @@ <_toolRuntimeRID Condition="'$(_runtimeOS)' == 'android' and $([MSBuild]::IsOSPlatform('OSX'))">osx-x64 - <_toolRuntimeRID Condition="'$(_runtimeOS)' == 'maccatalyst' or '$(_runtimeOS)' == 'ios' or '$(_runtimeOS)' == 'ios-sim' or '$(_runtimeOS)' == 'tvos' or '$(_runtimeOS)' == 'tvos-sim'">osx-x64 + <_toolRuntimeRID Condition="'$(_runtimeOS)' == 'maccatalyst' or '$(_runtimeOS)' == 'ios' or '$(_runtimeOS)' == 'iOSSimulator' or '$(_runtimeOS)' == 'tvos' or '$(_runtimeOS)' == 'tvOSSimulator'">osx-x64 $(_toolRuntimeRID) @@ -169,9 +169,9 @@ <_outputRID Condition="'$(TargetOS)' == 'Solaris'">solaris-$(TargetArchitecture) <_outputRID Condition="'$(TargetOS)' == 'MacCatalyst'">maccatalyst-$(TargetArchitecture) <_outputRID Condition="'$(TargetOS)' == 'iOS'">ios-$(TargetArchitecture) - <_outputRID Condition="'$(TargetOS)' == 'iOS-sim'">ios-sim-$(TargetArchitecture) + <_outputRID Condition="'$(TargetOS)' == 'iOSSimulator'">iOSSimulator-$(TargetArchitecture) <_outputRID Condition="'$(TargetOS)' == 'tvOS'">tvos-$(TargetArchitecture) - <_outputRID Condition="'$(TargetOS)' == 'tvOS-sim'">tvos-sim-$(TargetArchitecture) + <_outputRID Condition="'$(TargetOS)' == 'tvOSSimulator'">tvOSSimulator-$(TargetArchitecture) <_outputRID Condition="'$(TargetOS)' == 'Android'">android-$(TargetArchitecture) <_outputRID Condition="'$(TargetOS)' == 'Browser'">browser-$(TargetArchitecture) @@ -187,10 +187,10 @@ true true true - true - true - true - true + true + true + true + true true true true diff --git a/eng/Subsets.props b/eng/Subsets.props index 0083c54ea094d..57ce9a119abc5 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -207,7 +207,7 @@ - + diff --git a/eng/build.sh b/eng/build.sh index 6749dd5699ce3..bb53dd16894ac 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -28,8 +28,8 @@ 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, MacCatalyst, tvOS, iOS, Android," - echo " Browser, NetBSD, illumos or Solaris." + echo " --os Target operating system: windows, Linux, FreeBSD, OSX, MacCatalyst, tvOS, + echo " tvOSSimulator, iOS, iOSSimulator, Android, Browser, NetBSD, illumos or Solaris." echo " [Default: Your machine's OS.]" echo " --projects Project or solution file(s) to build." echo " --runtimeConfiguration (-rc) Runtime build configuration: Debug, Release or Checked." @@ -266,12 +266,12 @@ while [[ $# > 0 ]]; do os="MacCatalyst" ;; tvos) os="tvOS" ;; - tvos-sim) - os="tvOS-sim" ;; + tvossimulator) + os="tvOSSimulator" ;; ios) os="iOS" ;; - ios-sim) - os="iOS-sim" ;; + iossimulator) + os="iOSSimulator" ;; android) os="Android" ;; browser) @@ -282,7 +282,7 @@ while [[ $# > 0 ]]; do os="Solaris" ;; *) echo "Unsupported target OS '$2'." - echo "The allowed values are windows, Linux, FreeBSD, OSX, MacCatalyst, tvOS, tvOS-sim, iOS, iOS-sim, Android, Browser, illumos and Solaris." + echo "The allowed values are windows, Linux, FreeBSD, OSX, MacCatalyst, tvOS, tvOSSimulator, iOS, iOSSimulator, Android, Browser, illumos and Solaris." exit 1 ;; esac diff --git a/eng/native/build-commons.sh b/eng/native/build-commons.sh index 53983c797a5e8..7a84e9136492c 100755 --- a/eng/native/build-commons.sh +++ b/eng/native/build-commons.sh @@ -462,10 +462,10 @@ fi if [[ "$__BuildArch" == wasm ]]; then # nothing to do here true -elif [[ "$__TargetOS" == iOS || "$__TargetOS" == iOS-sim ]]; then +elif [[ "$__TargetOS" == iOS || "$__TargetOS" == iOSSimulator ]]; then # nothing to do here true -elif [[ "$__TargetOS" == tvOS || "$__TargetOS" == tvOS-sim ]]; then +elif [[ "$__TargetOS" == tvOS || "$__TargetOS" == tvOSSimulator ]]; then # nothing to do here true elif [[ "$__TargetOS" == Android ]]; then diff --git a/eng/native/configureplatform.cmake b/eng/native/configureplatform.cmake index 37f35db6a0b5a..aa141437e190c 100644 --- a/eng/native/configureplatform.cmake +++ b/eng/native/configureplatform.cmake @@ -88,7 +88,7 @@ if(CLR_CMAKE_HOST_OS STREQUAL Darwin) set(CMAKE_ASM_COMPILE_OBJECT "${CMAKE_C_COMPILER} -o -c ") endif(CLR_CMAKE_HOST_OS STREQUAL Darwin) -if(CLR_CMAKE_HOST_OS STREQUAL iOS OR CLR_CMAKE_HOST_OS STREQUAL iOS-sim) +if(CLR_CMAKE_HOST_OS STREQUAL iOS OR CLR_CMAKE_HOST_OS STREQUAL iOSSimulator) 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 OR CLR_CMAKE_HOST_OS STREQUAL iOS-sim) else() clr_unknown_arch() endif() -endif(CLR_CMAKE_HOST_OS STREQUAL iOS OR CLR_CMAKE_HOST_OS STREQUAL iOS-sim) +endif(CLR_CMAKE_HOST_OS STREQUAL iOS OR CLR_CMAKE_HOST_OS STREQUAL iOSSimulator) -if(CLR_CMAKE_HOST_OS STREQUAL tvOS OR CLR_CMAKE_HOST_OS STREQUAL tvOS-sim) +if(CLR_CMAKE_HOST_OS STREQUAL tvOS OR CLR_CMAKE_HOST_OS STREQUAL tvOSSimulator) 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 OR CLR_CMAKE_HOST_OS STREQUAL tvOS-sim) else() clr_unknown_arch() endif() -endif(CLR_CMAKE_HOST_OS STREQUAL tvOS OR CLR_CMAKE_HOST_OS STREQUAL tvOS-sim) +endif(CLR_CMAKE_HOST_OS STREQUAL tvOS OR CLR_CMAKE_HOST_OS STREQUAL tvOSSimulator) 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 OR CLR_CMAKE_TARGET_OS STREQUAL iOS-sim) +if(CLR_CMAKE_TARGET_OS STREQUAL iOS OR CLR_CMAKE_TARGET_OS STREQUAL iOSSimulator) set(CLR_CMAKE_TARGET_UNIX 1) set(CLR_CMAKE_TARGET_IOS 1) -endif(CLR_CMAKE_TARGET_OS STREQUAL iOS OR CLR_CMAKE_TARGET_OS STREQUAL iOS-sim) +endif(CLR_CMAKE_TARGET_OS STREQUAL iOS OR CLR_CMAKE_TARGET_OS STREQUAL iOSSimulator) 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 OR CLR_CMAKE_TARGET_OS STREQUAL tvOS-sim) +if(CLR_CMAKE_TARGET_OS STREQUAL tvOS OR CLR_CMAKE_TARGET_OS STREQUAL tvOSSimulator) set(CLR_CMAKE_TARGET_UNIX 1) set(CLR_CMAKE_TARGET_TVOS 1) -endif(CLR_CMAKE_TARGET_OS STREQUAL tvOS OR CLR_CMAKE_TARGET_OS STREQUAL tvOS-sim) +endif(CLR_CMAKE_TARGET_OS STREQUAL tvOS OR CLR_CMAKE_TARGET_OS STREQUAL tvOSSimulator) if(CLR_CMAKE_TARGET_OS STREQUAL FreeBSD) set(CLR_CMAKE_TARGET_UNIX 1) diff --git a/eng/native/init-distro-rid.sh b/eng/native/init-distro-rid.sh index a8f64a85e4b90..f71aa8640b160 100644 --- a/eng/native/init-distro-rid.sh +++ b/eng/native/init-distro-rid.sh @@ -174,12 +174,12 @@ initDistroRidGlobal() distroRid="maccatalyst-$buildArch" elif [ "$targetOs" = "tvOS" ]; then distroRid="tvos-$buildArch" - elif [ "$targetOs" = "tvOS-sim" ]; then - distroRid="tvos-sim-$buildArch" + elif [ "$targetOs" = "tvOSSimulator" ]; then + distroRid="tvossimulator-$buildArch" elif [ "$targetOs" = "iOS" ]; then distroRid="ios-$buildArch" - elif [ "$targetOs" = "iOS-sim" ]; then - distroRid="ios-sim-$buildArch" + elif [ "$targetOs" = "iOSSimulator" ]; then + distroRid="iossimulator-$buildArch" elif [ "$targetOs" = "Android" ]; then distroRid="android-$buildArch" elif [ "$targetOs" = "Browser" ]; then diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index c83224febddfc..3baff96b8df14 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -63,13 +63,6 @@ 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 diff --git a/eng/pipelines/common/platform-matrix.yml b/eng/pipelines/common/platform-matrix.yml index f83ba87e37c8b..b8b28c898c242 100644 --- a/eng/pipelines/common/platform-matrix.yml +++ b/eng/pipelines/common/platform-matrix.yml @@ -388,17 +388,16 @@ jobs: # tvOS Simulator x64 -- ${{ if containsValue(parameters.platforms, 'tvOS_sim_x64') }}: +- ${{ if containsValue(parameters.platforms, 'tvOSSimulator_x64') }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: tvOS - osSubGroup: _sim + osGroup: tvOSSimulator archType: x64 - targetRid: tvos-sim-x64 - platform: tvOS_sim_x64 + targetRid: tvossimulator-x64 + platform: tvOSSimulatorim_x64 jobParameters: runtimeFlavor: mono stagedBuild: ${{ parameters.stagedBuild }} @@ -410,17 +409,16 @@ jobs: # tvOS Simulator arm64 -- ${{ if containsValue(parameters.platforms, 'tvOS_sim_arm64') }}: +- ${{ if containsValue(parameters.platforms, 'tvOSSimulator_arm64') }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: tvOS - osSubGroup: _sim + osGroup: tvOSSimulator archType: arm64 - targetRid: tvos-sim-arm64 - platform: tvOS_sim_arm64 + targetRid: tvossimulator-arm64 + platform: tvOSSimulator_arm64 jobParameters: runtimeFlavor: mono stagedBuild: ${{ parameters.stagedBuild }} @@ -474,17 +472,16 @@ jobs: # iOS Simulator x64 -- ${{ if containsValue(parameters.platforms, 'iOS_sim_x64') }}: +- ${{ if containsValue(parameters.platforms, 'iOSSimulator_x64') }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: iOS - osSubGroup: _sim + osGroup: iOSSimulator archType: x64 - targetRid: ios-sim-x64 - platform: iOS_sim_x64 + targetRid: iossimulator-x64 + platform: iOSSimulator_x64 jobParameters: runtimeFlavor: mono stagedBuild: ${{ parameters.stagedBuild }} @@ -496,17 +493,16 @@ jobs: # iOS Simulator x86 -- ${{ if containsValue(parameters.platforms, 'iOS_sim_x86') }}: +- ${{ if containsValue(parameters.platforms, 'iOSSimulator_x86') }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: iOS - osSubGroup: _sim + osGroup: iOSSimulator archType: x86 - targetRid: ios-sim-x86 - platform: iOS_sim_x86 + targetRid: iossimulator-x86 + platform: iOSsimulator_x86 jobParameters: runtimeFlavor: mono stagedBuild: ${{ parameters.stagedBuild }} @@ -519,17 +515,16 @@ jobs: # iOS Simulator arm64 -- ${{ if containsValue(parameters.platforms, 'iOS_sim_arm64') }}: +- ${{ if containsValue(parameters.platforms, 'iOSSimulator_arm64') }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: iOS - osSubGroup: _sim + osGroup: iOSSimulator archType: arm64 - targetRid: ios-sim-arm64 - platform: iOS_sim_arm64 + targetRid: iossimulator-arm64 + platform: iOSSimulator_arm64 jobParameters: runtimeFlavor: mono stagedBuild: ${{ parameters.stagedBuild }} diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml index 2b137cb1fcd7c..8b0f58894cd4e 100644 --- a/eng/pipelines/libraries/helix-queues-setup.yml +++ b/eng/pipelines/libraries/helix-queues-setup.yml @@ -106,7 +106,7 @@ jobs: - Windows.10.Amd64.Android.Open # iOS x64/x86 - - ${{ if in(parameters.platform, 'iOS_sim_x64', 'iOS_sim_x86') }}: + - ${{ if in(parameters.platform, 'iOSSimulator_x64', 'iOSSimulator_x86') }}: - OSX.1015.Amd64.Open # windows x64 diff --git a/eng/pipelines/libraries/helix.yml b/eng/pipelines/libraries/helix.yml index cabff6fdeb3c5..ec154c4c9a83a 100644 --- a/eng/pipelines/libraries/helix.yml +++ b/eng/pipelines/libraries/helix.yml @@ -27,7 +27,7 @@ steps: /p:TestRunNamePrefixSuffix=${{ parameters.testRunNamePrefixSuffix }} /p:HelixBuild=$(Build.BuildNumber) /p:Creator=${{ parameters.creator }} - ${{ parameters.extraHelixArguments }} + /p:TargetOS=${{ parameters.osGroup }} /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog displayName: Send to Helix condition: and(succeeded(), ${{ parameters.condition }}) @@ -36,10 +36,4 @@ steps: SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops HelixTargetQueues: ${{ join('+', parameters.helixQueues) }} # Pass queues to MSBuild as env var to avoid need of escaping them _Scenarios: ${{ join(',', parameters.scenarios) }} # Pass scenarios to MSBuild as env var to avoid need of escaping comma separated list - ${{ if ne(parameters.osSubGroup, '_sim') }}: - TargetOS: ${{ parameters.osGroup }} - ${{ if and(eq(parameters.osGroup, 'tvOS'),eq(parameters.osSubGroup, '_sim')) }}: - TargetOS: tvOS-sim - ${{ if and(eq(parameters.osGroup, 'iOS'),eq(parameters.osSubGroup, '_sim')) }}: - TargetOS: iOS-sim diff --git a/eng/pipelines/mono/templates/build-job.yml b/eng/pipelines/mono/templates/build-job.yml index cb7f96a0c8c58..308abed987e91 100644 --- a/eng/pipelines/mono/templates/build-job.yml +++ b/eng/pipelines/mono/templates/build-job.yml @@ -76,15 +76,15 @@ jobs: - ${{ if eq(parameters.osGroup, 'tvOS') }}: - name: osOverride value: -os tvOS - - ${{ if and(eq(parameters.osGroup, 'tvOS'),eq(parameters.osSubGroup, '_sim')) }}: + - ${{ if eq(parameters.osGroup, 'tvOSSimulator') }}: - name: osOverride - value: -os tvOS-sim + value: -os tvOSSimulator - ${{ if eq(parameters.osGroup, 'iOS') }}: - name: osOverride value: -os iOS - - ${{ if and(eq(parameters.osGroup, 'iOS'),eq(parameters.osSubGroup, '_sim')) }}: + - ${{ if eq(parameters.osGroup, 'iOSSimulator') }}: - name: osOverride - value: -os iOS-sim + value: -os iOSSimulator - ${{ if eq(parameters.osGroup, 'Android') }}: - name: osOverride value: -os Android diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml index e2fb2edba0bf1..8205661ba4e4b 100644 --- a/eng/pipelines/runtime-official.yml +++ b/eng/pipelines/runtime-official.yml @@ -105,12 +105,12 @@ stages: - Android_arm64 - MacCatalyst_x64 - MacCatalyst_arm64 - - tvOS_sim_x64 - - tvOS_sim_arm64 + - tvOSSimulator_x64 + - tvOSSimulator_arm64 - tvOS_arm64 - - iOS_sim_x64 - - iOS_sim_x86 - - iOS_sim_arm64 + - iOSSimulator_x64 + - iOSSimulator_x86 + - iOSSimulator_arm64 - iOS_arm - iOS_arm64 - OSX_x64 diff --git a/eng/pipelines/runtime-staging.yml b/eng/pipelines/runtime-staging.yml index efd3cf1fa01b6..2cc93ec413611 100644 --- a/eng/pipelines/runtime-staging.yml +++ b/eng/pipelines/runtime-staging.yml @@ -66,7 +66,7 @@ jobs: platforms: - Android_x64 - Android_arm64 - - iOS_sim_x64 + - iOSSimulator_x64 variables: # map dependencies variables to local variables - name: librariesContainsChange diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 636e5457572bc..e0d5603cba234 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -225,8 +225,8 @@ jobs: - Android_x86 - MacCatalyst_x64 - MacCatalyst_arm64 - - tvOS_sim_x64 - - iOS_sim_x86 + - tvOSSimulator_x64 + - iOSSimulator_x86 - iOS_arm64 - Linux_arm jobParameters: diff --git a/eng/targetingpacks.targets b/eng/targetingpacks.targets index 4110c3dbc74b5..793f1954524fd 100644 --- a/eng/targetingpacks.targets +++ b/eng/targetingpacks.targets @@ -19,7 +19,7 @@ LatestRuntimeFrameworkVersion="$(ProductVersion)" RuntimeFrameworkName="$(LocalFrameworkOverrideName)" RuntimePackNamePatterns="$(LocalFrameworkOverrideName).Runtime.**RID**" - RuntimePackRuntimeIdentifiers="linux-arm;linux-arm64;linux-musl-arm64;linux-musl-x64;linux-x64;osx-x64;rhel.6-x64;tizen.4.0.0-armel;tizen.5.0.0-armel;win-arm;win-arm64;win-x64;win-x86;linux-musl-arm;ios-arm64;ios-sim-arm64;ios-arm;ios-sim-x64;ios-sim-x86;tvos-arm64;tvos-sim-arm64;tvos-sim-x64;maccatalyst-x64;maccatalyst-arm64;android-arm64;android-arm;android-x64;android-x86;browser-wasm;osx-arm64" + RuntimePackRuntimeIdentifiers="linux-arm;linux-arm64;linux-musl-arm64;linux-musl-x64;linux-x64;osx-x64;rhel.6-x64;tizen.4.0.0-armel;tizen.5.0.0-armel;win-arm;win-arm64;win-x64;win-x86;linux-musl-arm;ios-arm64;iossimulator-arm64;ios-arm;iossimulator-x64;iossimulator-x86;tvos-arm64;tvossimulator-arm64;tvossimulator-x64;maccatalyst-x64;maccatalyst-arm64;android-arm64;android-arm;android-x64;android-x86;browser-wasm;osx-arm64" TargetFramework="$(NetCoreAppCurrent)" TargetingPackName="$(LocalFrameworkOverrideName).Ref" TargetingPackVersion="$(ProductVersion)" diff --git a/eng/testing/AppleRunnerTemplate.sh b/eng/testing/AppleRunnerTemplate.sh index c1f6373878a6a..5ec52b36c7ee3 100644 --- a/eng/testing/AppleRunnerTemplate.sh +++ b/eng/testing/AppleRunnerTemplate.sh @@ -18,14 +18,14 @@ fi if [[ "$TARGET_OS" == "MacCatalyst" ]]; then TARGET=maccatalyst; fi -if [[ "$TARGET_OS" == "iOS-sim" && "$TARGET_ARCH" == "x86" ]]; then TARGET=ios-simulator-32; fi -if [[ "$TARGET_OS" == "iOS-sim" && "$TARGET_ARCH" == "x64" ]]; then TARGET=ios-simulator-64; fi -if [[ "$TARGET_OS" == "iOS-sim" && "$TARGET_ARCH" == "arm64" ]]; then TARGET=ios-simulator-64; fi +if [[ "$TARGET_OS" == "iOSSimulator" && "$TARGET_ARCH" == "x86" ]]; then TARGET=ios-simulator-32; fi +if [[ "$TARGET_OS" == "iOSSimulator" && "$TARGET_ARCH" == "x64" ]]; then TARGET=ios-simulator-64; fi +if [[ "$TARGET_OS" == "iOSSimulator" && "$TARGET_ARCH" == "arm64" ]]; then TARGET=ios-simulator-64; fi if [[ "$TARGET_OS" == "iOS" && "$TARGET_ARCH" == "arm" ]]; then TARGET=ios-device; fi if [[ "$TARGET_OS" == "iOS" && "$TARGET_ARCH" == "arm64" ]]; then TARGET=ios-device; fi -if [[ "$TARGET_OS" == "tvOS-sim" && "$TARGET_ARCH" == "x64" ]]; then TARGET=tvos-simulator; fi -if [[ "$TARGET_OS" == "tvOS-sim" && "$TARGET_ARCH" == "arm64" ]]; then TARGET=tvos-simulator; fi +if [[ "$TARGET_OS" == "tvOSSimulator" && "$TARGET_ARCH" == "x64" ]]; then TARGET=tvos-simulator; fi +if [[ "$TARGET_OS" == "tvOSSimulator" && "$TARGET_ARCH" == "arm64" ]]; then TARGET=tvos-simulator; fi if [[ "$TARGET_OS" == "tvOS" && "$TARGET_ARCH" == "arm64" ]]; then TARGET=tvos-device; fi # "Release" in SCHEME_SDK is what xcode produces (see "bool Optimized" property in AppleAppBuilderTask) diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets index 7b7de6bea9ff8..57dfe62527bd9 100644 --- a/eng/testing/tests.mobile.targets +++ b/eng/testing/tests.mobile.targets @@ -119,7 +119,7 @@ - @@ -127,7 +127,7 @@ - - + @@ -282,7 +282,7 @@ AfterTargets="ComputeResolvedFilesToPublishList"> <_runnerFilesToPublish Include="$(AndroidTestRunnerDir)*" Condition="'$(TargetOS)' == 'Android'" /> - <_runnerFilesToPublish Include="$(AppleTestRunnerDir)*" Condition="'$(TargetOS)' == 'MacCatalyst' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOS-sim' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'tvOS-sim'" /> + <_runnerFilesToPublish Include="$(AppleTestRunnerDir)*" Condition="'$(TargetOS)' == 'MacCatalyst' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOSSimulator' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'tvOSSimulator'" /> <_runnerFilesToPublish Include="$(WasmTestRunnerDir)*" Condition="'$(TargetOS)' == 'Browser'" /> diff --git a/eng/testing/tests.targets b/eng/testing/tests.targets index a426e5d8091b9..1ad1ae7df0df3 100644 --- a/eng/testing/tests.targets +++ b/eng/testing/tests.targets @@ -2,7 +2,7 @@ RunnerTemplate.cmd RunnerTemplate.sh - AppleRunnerTemplate.sh + AppleRunnerTemplate.sh AndroidRunnerTemplate.sh WasmRunnerTemplate.sh diff --git a/eng/testing/xunit/xunit.console.targets b/eng/testing/xunit/xunit.console.targets index 078e73463e394..a88b08f613981 100644 --- a/eng/testing/xunit/xunit.console.targets +++ b/eng/testing/xunit/xunit.console.targets @@ -2,7 +2,7 @@ true testResults.xml - true + true diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj index 3222f56f1230f..e39300567dfd2 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj @@ -6,7 +6,7 @@ $(MonoAotTargets);android-x64 $(MonoAotTargets);browser-wasm $(MonoAotTargets);tvos-sim-x64;tvos-sim-arm64;tvos-arm64 - $(MonoAotTargets);ios-sim-x64;ios-sim-arm64;ios-arm64;ios-sim-x86;ios-arm + $(MonoAotTargets);iossimulator-x64;iossimulator-arm64;iossimulator-x86;ios-arm64;ios-arm diff --git a/src/libraries/Microsoft.NETCore.Platforms/pkg/runtimeGroups.props b/src/libraries/Microsoft.NETCore.Platforms/pkg/runtimeGroups.props index 424e408576ef4..dfd025df6067d 100644 --- a/src/libraries/Microsoft.NETCore.Platforms/pkg/runtimeGroups.props +++ b/src/libraries/Microsoft.NETCore.Platforms/pkg/runtimeGroups.props @@ -91,13 +91,13 @@ 8;9;10;11;12;13 - - ios + + unix x86 8;9;10 - - ios + + unix arm64;x64 8;9;10;11;12;13 @@ -221,8 +221,8 @@ 10;11;12;13 - - tvos + + unix arm64;x64 10;11;12;13 diff --git a/src/libraries/Native/build-native.sh b/src/libraries/Native/build-native.sh index 2baf188be09a8..19dedb234f739 100755 --- a/src/libraries/Native/build-native.sh +++ b/src/libraries/Native/build-native.sh @@ -56,10 +56,10 @@ if [[ "$__BuildArch" == wasm ]]; then export CLR_CC=$(which emcc) export CLR_CXX=$(which em++) -elif [[ "$__TargetOS" == iOS || "$__TargetOS" == iOS-sim ]]; then +elif [[ "$__TargetOS" == iOS || "$__TargetOS" == iOSSimulator ]]; then # nothing to do here true -elif [[ "$__TargetOS" == tvOS || "$__TargetOS" == tvOS-sim ]]; then +elif [[ "$__TargetOS" == tvOS || "$__TargetOS" == tvOSSimulator ]]; then # nothing to do here true elif [[ "$__TargetOS" == Android && -z "$ROOTFS_DIR" ]]; then @@ -103,7 +103,7 @@ elif [[ "$__TargetOS" == Android && -z "$ROOTFS_DIR" ]]; then echo "Error: Unknown Android architecture $__BuildArch." exit 1 fi -elif [[ "$__TargetOS" == iOS-sim ]]; then +elif [[ "$__TargetOS" == iOSSimulator ]]; then __CMakeArgs="-DCMAKE_SYSTEM_NAME=iOS $__CMakeArgs" if [[ "$__BuildArch" == x64 ]]; then # set default iOS simulator deployment target (8.0 is the minimum supported by Xcode 11) @@ -118,7 +118,7 @@ elif [[ "$__TargetOS" == iOS-sim ]]; then # keep in sync with src/mono/Directory.Build.props __CMakeArgs="-DCMAKE_OSX_SYSROOT=iphonesimulator -DCMAKE_OSX_DEPLOYMENT_TARGET=8.0 -DCMAKE_OSX_ARCHITECTURES=\"arm64\" $__CMakeArgs" else - echo "Error: Unknown iOS-sim architecture $__BuildArch." + echo "Error: Unknown iOSSimulator architecture $__BuildArch." exit 1 fi elif [[ "$__TargetOS" == iOS ]]; then @@ -135,7 +135,7 @@ elif [[ "$__TargetOS" == iOS ]]; then echo "Error: Unknown iOS architecture $__BuildArch." exit 1 fi -elif [[ "$__TargetOS" == tvOS-sim ]]; then +elif [[ "$__TargetOS" == tvOSSimulator ]]; then __CMakeArgs="-DCMAKE_SYSTEM_NAME=tvOS $__CMakeArgs" # set default tvOS device deployment target # keep in sync with tvOSVersionMin in src/mono/Directory.Build.props @@ -145,7 +145,7 @@ elif [[ "$__TargetOS" == tvOS-sim ]]; then elif [[ "$__BuildArch" == arm64 ]]; then __CMakeArgs="-DCMAKE_OSX_SYSROOT=appletvsimulator -DCMAKE_OSX_ARCHITECTURES=\"arm64\" $__CMakeArgs" else - echo "Error: Unknown tvOS-sim architecture $__BuildArch." + echo "Error: Unknown tvOSSimulator architecture $__BuildArch." exit 1 fi elif [[ "$__TargetOS" == tvOS ]]; then diff --git a/src/libraries/pretest.proj b/src/libraries/pretest.proj index 688c35172044a..176842f5d6284 100644 --- a/src/libraries/pretest.proj +++ b/src/libraries/pretest.proj @@ -19,7 +19,7 @@ - + diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj index 22e9c8a1a0a6f..5b14fbe068955 100644 --- a/src/libraries/sendtohelixhelp.proj +++ b/src/libraries/sendtohelixhelp.proj @@ -25,7 +25,7 @@ '$(Scenario)' == 'gcstress0xc_jitstress1' or '$(Scenario)' == 'gcstress0xc_jitstress2' or '$(Scenario)' == 'gcstress0xc_jitminopts_heapverify1'">01:30:00 - <_workItemTimeout Condition="'$(_workItemTimeout)' == '' and ('$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOS-sim' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'tvOS-sim' or '$(TargetOS)' == 'Android')">00:30:00 + <_workItemTimeout Condition="'$(_workItemTimeout)' == '' and ('$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOSSimulator' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'tvOSSimulator' or '$(TargetOS)' == 'Android')">00:30:00 <_workItemTimeout Condition="'$(Scenario)' == '' and '$(_workItemTimeout)' == '' and ('$(TargetArchitecture)' == 'arm64' or '$(TargetArchitecture)' == 'arm')">00:45:00 <_workItemTimeout Condition="'$(Scenario)' != '' and '$(_workItemTimeout)' == '' and ('$(TargetArchitecture)' == 'arm64' or '$(TargetArchitecture)' == 'arm')">01:00:00 <_workItemTimeout Condition="'$(Scenario)' == 'BuildWasmApps' and '$(_workItemTimeout)' == ''">01:00:00 @@ -69,7 +69,7 @@ test/functional/packaging/ - + true @@ -172,7 +172,7 @@ - + ios-simulator-64 ios-simulator-64 @@ -210,7 +210,7 @@ - + @@ -264,7 +264,7 @@ - + @@ -302,8 +302,8 @@ - - + + diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj index af795b2641eb9..9c68fd628d8c5 100644 --- a/src/libraries/tests.proj +++ b/src/libraries/tests.proj @@ -64,7 +64,7 @@ - + @@ -277,14 +277,14 @@ BuildInParallel="false" /> - + - + diff --git a/src/mono/monoaotcross.proj b/src/mono/monoaotcross.proj index 45084bc2a1fd5..bd69e2e8eccdc 100644 --- a/src/mono/monoaotcross.proj +++ b/src/mono/monoaotcross.proj @@ -14,8 +14,8 @@ $(MonoAotTargets);Android-x64;Android-arm64;Android-x86;Android-arm $(MonoAotTargets);Android-x64 $(MonoAotTargets);Browser-wasm - $(MonoAotTargets);tvOS-sim-x64;tvOS-sim-arm64;tvOS-arm64 - $(MonoAotTargets);iOS-sim-x64;iOS-sim-arm64;iOS-arm64;iOS-sim-x86;iOS-arm + $(MonoAotTargets);tvOSSimulator-x64;tvOSSimulator-arm64;tvOS-arm64 + $(MonoAotTargets);iOSSimulator-x64;iOSSimulator-arm64;iOSSimulator-x86;iOS-arm64;iOS-arm diff --git a/src/mono/nuget/mono-packages.proj b/src/mono/nuget/mono-packages.proj index 44afc8699ffeb..febf6812f735a 100644 --- a/src/mono/nuget/mono-packages.proj +++ b/src/mono/nuget/mono-packages.proj @@ -13,7 +13,7 @@ - + diff --git a/src/mono/sample/iOS/Makefile b/src/mono/sample/iOS/Makefile index cda5da83e4951..7d4a6c680fcc1 100644 --- a/src/mono/sample/iOS/Makefile +++ b/src/mono/sample/iOS/Makefile @@ -12,7 +12,7 @@ appbuilder: $(DOTNET) build -c Debug $(TOOLS_DIR)/AppleAppBuilder/AppleAppBuilder.csproj runtimepack: - ../../../../build.sh Mono+Libs -os iOS-sim -arch $(MONO_ARCH) -c $(MONO_CONFIG) + ../../../../build.sh Mono+Libs -os iOSSimulator -arch $(MONO_ARCH) -c $(MONO_CONFIG) run: clean appbuilder $(DOTNET) publish -c $(MONO_CONFIG) /p:TargetArchitecture=$(MONO_ARCH) \ diff --git a/src/mono/sample/iOS/Program.csproj b/src/mono/sample/iOS/Program.csproj index 85ed394905319..56f3124b3865c 100644 --- a/src/mono/sample/iOS/Program.csproj +++ b/src/mono/sample/iOS/Program.csproj @@ -4,7 +4,7 @@ bin $(NetCoreAppToolCurrent) iOS - iOS-sim + iOSSimulator $(ArtifactsBinDir)microsoft.netcore.app.runtime.$(TargetOS.ToLower())-$(TargetArchitecture)\$(Configuration)\runtimes\$(TargetOS.ToLower())-$(TargetArchitecture)\ false $(TargetOS.ToLower())-$(TargetArchitecture) diff --git a/src/tasks/AotCompilerTask/MonoAOTCompiler.props b/src/tasks/AotCompilerTask/MonoAOTCompiler.props index 46a7485f9c408..987162a2a0df1 100644 --- a/src/tasks/AotCompilerTask/MonoAOTCompiler.props +++ b/src/tasks/AotCompilerTask/MonoAOTCompiler.props @@ -1,5 +1,5 @@ - + @@ -10,7 +10,7 @@ - + diff --git a/src/tasks/AppleAppBuilder/TargetOS.cs b/src/tasks/AppleAppBuilder/TargetOS.cs index 98d057cceb4c2..bd9c5c40602ae 100644 --- a/src/tasks/AppleAppBuilder/TargetOS.cs +++ b/src/tasks/AppleAppBuilder/TargetOS.cs @@ -4,8 +4,8 @@ internal class TargetNames { public const string iOS = "iOS"; - public const string iOSsim = "iOS-sim"; + public const string iOSsim = "iOSSimulator"; public const string tvOS = "tvOS"; - public const string tvOSsim = "tvOS-sim"; + public const string tvOSsim = "tvOSSimulator"; public const string MacCatalyst = "MacCatalyst"; } diff --git a/src/tasks/tasks.proj b/src/tasks/tasks.proj index befde1e3b5ca9..7aacd889c92a5 100644 --- a/src/tasks/tasks.proj +++ b/src/tasks/tasks.proj @@ -4,7 +4,7 @@ + Condition="'$(TargetOS)' != 'MacCatalyst' and '$(TargetOS)' != 'iOS' and '$(TargetOS)' != 'iOSSimulator' and '$(TargetOS)' != 'tvOS' and '$(TargetOS)' != 'tvOSSimulator'" /> Date: Wed, 17 Mar 2021 12:44:36 -0400 Subject: [PATCH 40/48] Fix typo --- eng/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/build.sh b/eng/build.sh index bb53dd16894ac..50b91f7187634 100755 --- 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, MacCatalyst, tvOS, + echo " --os Target operating system: windows, Linux, FreeBSD, OSX, MacCatalyst, tvOS," echo " tvOSSimulator, iOS, iOSSimulator, Android, Browser, NetBSD, illumos or Solaris." echo " [Default: Your machine's OS.]" echo " --projects Project or solution file(s) to build." From 0eae82dda493422c90f6f3bad3c013acc0a17ab6 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Wed, 17 Mar 2021 13:36:46 -0400 Subject: [PATCH 41/48] UpdateRuntimeFiles --- .../pkg/runtime.compatibility.json | 994 ++++++++---------- .../pkg/runtime.json | 428 ++++---- 2 files changed, 677 insertions(+), 745 deletions(-) diff --git a/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.compatibility.json b/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.compatibility.json index f40130ec58f19..4f86a112c7ed2 100644 --- a/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.compatibility.json +++ b/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.compatibility.json @@ -2689,352 +2689,6 @@ "any", "base" ], - "ios-sim": [ - "ios-sim", - "ios", - "unix", - "any", - "base" - ], - "ios-sim-arm64": [ - "ios-sim-arm64", - "ios-sim", - "ios-arm64", - "ios", - "unix-arm64", - "unix", - "any", - "base" - ], - "ios-sim-x64": [ - "ios-sim-x64", - "ios-sim", - "ios-x64", - "ios", - "unix-x64", - "unix", - "any", - "base" - ], - "ios-sim-x86": [ - "ios-sim-x86", - "ios-sim", - "ios-x86", - "ios", - "unix-x86", - "unix", - "any", - "base" - ], - "ios-sim.10": [ - "ios-sim.10", - "ios-sim.9", - "ios-sim.8", - "ios-sim", - "ios", - "unix", - "any", - "base" - ], - "ios-sim.10-arm64": [ - "ios-sim.10-arm64", - "ios-sim.10", - "ios-sim.9-arm64", - "ios-sim.9", - "ios-sim.8-arm64", - "ios-sim.8", - "ios-sim-arm64", - "ios-sim", - "ios-arm64", - "ios", - "unix-arm64", - "unix", - "any", - "base" - ], - "ios-sim.10-x64": [ - "ios-sim.10-x64", - "ios-sim.10", - "ios-sim.9-x64", - "ios-sim.9", - "ios-sim.8-x64", - "ios-sim.8", - "ios-sim-x64", - "ios-sim", - "ios-x64", - "ios", - "unix-x64", - "unix", - "any", - "base" - ], - "ios-sim.10-x86": [ - "ios-sim.10-x86", - "ios-sim.10", - "ios-sim.9-x86", - "ios-sim.9", - "ios-sim.8-x86", - "ios-sim.8", - "ios-sim-x86", - "ios-sim", - "ios-x86", - "ios", - "unix-x86", - "unix", - "any", - "base" - ], - "ios-sim.11": [ - "ios-sim.11", - "ios-sim.10", - "ios-sim.9", - "ios-sim.8", - "ios-sim", - "ios", - "unix", - "any", - "base" - ], - "ios-sim.11-arm64": [ - "ios-sim.11-arm64", - "ios-sim.11", - "ios-sim.10-arm64", - "ios-sim.10", - "ios-sim.9-arm64", - "ios-sim.9", - "ios-sim.8-arm64", - "ios-sim.8", - "ios-sim-arm64", - "ios-sim", - "ios-arm64", - "ios", - "unix-arm64", - "unix", - "any", - "base" - ], - "ios-sim.11-x64": [ - "ios-sim.11-x64", - "ios-sim.11", - "ios-sim.10-x64", - "ios-sim.10", - "ios-sim.9-x64", - "ios-sim.9", - "ios-sim.8-x64", - "ios-sim.8", - "ios-sim-x64", - "ios-sim", - "ios-x64", - "ios", - "unix-x64", - "unix", - "any", - "base" - ], - "ios-sim.12": [ - "ios-sim.12", - "ios-sim.11", - "ios-sim.10", - "ios-sim.9", - "ios-sim.8", - "ios-sim", - "ios", - "unix", - "any", - "base" - ], - "ios-sim.12-arm64": [ - "ios-sim.12-arm64", - "ios-sim.12", - "ios-sim.11-arm64", - "ios-sim.11", - "ios-sim.10-arm64", - "ios-sim.10", - "ios-sim.9-arm64", - "ios-sim.9", - "ios-sim.8-arm64", - "ios-sim.8", - "ios-sim-arm64", - "ios-sim", - "ios-arm64", - "ios", - "unix-arm64", - "unix", - "any", - "base" - ], - "ios-sim.12-x64": [ - "ios-sim.12-x64", - "ios-sim.12", - "ios-sim.11-x64", - "ios-sim.11", - "ios-sim.10-x64", - "ios-sim.10", - "ios-sim.9-x64", - "ios-sim.9", - "ios-sim.8-x64", - "ios-sim.8", - "ios-sim-x64", - "ios-sim", - "ios-x64", - "ios", - "unix-x64", - "unix", - "any", - "base" - ], - "ios-sim.13": [ - "ios-sim.13", - "ios-sim.12", - "ios-sim.11", - "ios-sim.10", - "ios-sim.9", - "ios-sim.8", - "ios-sim", - "ios", - "unix", - "any", - "base" - ], - "ios-sim.13-arm64": [ - "ios-sim.13-arm64", - "ios-sim.13", - "ios-sim.12-arm64", - "ios-sim.12", - "ios-sim.11-arm64", - "ios-sim.11", - "ios-sim.10-arm64", - "ios-sim.10", - "ios-sim.9-arm64", - "ios-sim.9", - "ios-sim.8-arm64", - "ios-sim.8", - "ios-sim-arm64", - "ios-sim", - "ios-arm64", - "ios", - "unix-arm64", - "unix", - "any", - "base" - ], - "ios-sim.13-x64": [ - "ios-sim.13-x64", - "ios-sim.13", - "ios-sim.12-x64", - "ios-sim.12", - "ios-sim.11-x64", - "ios-sim.11", - "ios-sim.10-x64", - "ios-sim.10", - "ios-sim.9-x64", - "ios-sim.9", - "ios-sim.8-x64", - "ios-sim.8", - "ios-sim-x64", - "ios-sim", - "ios-x64", - "ios", - "unix-x64", - "unix", - "any", - "base" - ], - "ios-sim.8": [ - "ios-sim.8", - "ios-sim", - "ios", - "unix", - "any", - "base" - ], - "ios-sim.8-arm64": [ - "ios-sim.8-arm64", - "ios-sim.8", - "ios-sim-arm64", - "ios-sim", - "ios-arm64", - "ios", - "unix-arm64", - "unix", - "any", - "base" - ], - "ios-sim.8-x64": [ - "ios-sim.8-x64", - "ios-sim.8", - "ios-sim-x64", - "ios-sim", - "ios-x64", - "ios", - "unix-x64", - "unix", - "any", - "base" - ], - "ios-sim.8-x86": [ - "ios-sim.8-x86", - "ios-sim.8", - "ios-sim-x86", - "ios-sim", - "ios-x86", - "ios", - "unix-x86", - "unix", - "any", - "base" - ], - "ios-sim.9": [ - "ios-sim.9", - "ios-sim.8", - "ios-sim", - "ios", - "unix", - "any", - "base" - ], - "ios-sim.9-arm64": [ - "ios-sim.9-arm64", - "ios-sim.9", - "ios-sim.8-arm64", - "ios-sim.8", - "ios-sim-arm64", - "ios-sim", - "ios-arm64", - "ios", - "unix-arm64", - "unix", - "any", - "base" - ], - "ios-sim.9-x64": [ - "ios-sim.9-x64", - "ios-sim.9", - "ios-sim.8-x64", - "ios-sim.8", - "ios-sim-x64", - "ios-sim", - "ios-x64", - "ios", - "unix-x64", - "unix", - "any", - "base" - ], - "ios-sim.9-x86": [ - "ios-sim.9-x86", - "ios-sim.9", - "ios-sim.8-x86", - "ios-sim.8", - "ios-sim-x86", - "ios-sim", - "ios-x86", - "ios", - "unix-x86", - "unix", - "any", - "base" - ], "ios-x64": [ "ios-x64", "ios", @@ -3360,6 +3014,309 @@ "any", "base" ], + "iossimulator": [ + "iossimulator", + "unix", + "any", + "base" + ], + "iossimulator-arm64": [ + "iossimulator-arm64", + "iossimulator", + "unix-arm64", + "unix", + "any", + "base" + ], + "iossimulator-x64": [ + "iossimulator-x64", + "iossimulator", + "unix-x64", + "unix", + "any", + "base" + ], + "iossimulator-x86": [ + "iossimulator-x86", + "iossimulator", + "unix-x86", + "unix", + "any", + "base" + ], + "iossimulator.10": [ + "iossimulator.10", + "iossimulator.9", + "iossimulator.8", + "iossimulator", + "unix", + "any", + "base" + ], + "iossimulator.10-arm64": [ + "iossimulator.10-arm64", + "iossimulator.10", + "iossimulator.9-arm64", + "iossimulator.9", + "iossimulator.8-arm64", + "iossimulator.8", + "iossimulator-arm64", + "iossimulator", + "unix-arm64", + "unix", + "any", + "base" + ], + "iossimulator.10-x64": [ + "iossimulator.10-x64", + "iossimulator.10", + "iossimulator.9-x64", + "iossimulator.9", + "iossimulator.8-x64", + "iossimulator.8", + "iossimulator-x64", + "iossimulator", + "unix-x64", + "unix", + "any", + "base" + ], + "iossimulator.10-x86": [ + "iossimulator.10-x86", + "iossimulator.10", + "iossimulator.9-x86", + "iossimulator.9", + "iossimulator.8-x86", + "iossimulator.8", + "iossimulator-x86", + "iossimulator", + "unix-x86", + "unix", + "any", + "base" + ], + "iossimulator.11": [ + "iossimulator.11", + "iossimulator.10", + "iossimulator.9", + "iossimulator.8", + "iossimulator", + "unix", + "any", + "base" + ], + "iossimulator.11-arm64": [ + "iossimulator.11-arm64", + "iossimulator.11", + "iossimulator.10-arm64", + "iossimulator.10", + "iossimulator.9-arm64", + "iossimulator.9", + "iossimulator.8-arm64", + "iossimulator.8", + "iossimulator-arm64", + "iossimulator", + "unix-arm64", + "unix", + "any", + "base" + ], + "iossimulator.11-x64": [ + "iossimulator.11-x64", + "iossimulator.11", + "iossimulator.10-x64", + "iossimulator.10", + "iossimulator.9-x64", + "iossimulator.9", + "iossimulator.8-x64", + "iossimulator.8", + "iossimulator-x64", + "iossimulator", + "unix-x64", + "unix", + "any", + "base" + ], + "iossimulator.12": [ + "iossimulator.12", + "iossimulator.11", + "iossimulator.10", + "iossimulator.9", + "iossimulator.8", + "iossimulator", + "unix", + "any", + "base" + ], + "iossimulator.12-arm64": [ + "iossimulator.12-arm64", + "iossimulator.12", + "iossimulator.11-arm64", + "iossimulator.11", + "iossimulator.10-arm64", + "iossimulator.10", + "iossimulator.9-arm64", + "iossimulator.9", + "iossimulator.8-arm64", + "iossimulator.8", + "iossimulator-arm64", + "iossimulator", + "unix-arm64", + "unix", + "any", + "base" + ], + "iossimulator.12-x64": [ + "iossimulator.12-x64", + "iossimulator.12", + "iossimulator.11-x64", + "iossimulator.11", + "iossimulator.10-x64", + "iossimulator.10", + "iossimulator.9-x64", + "iossimulator.9", + "iossimulator.8-x64", + "iossimulator.8", + "iossimulator-x64", + "iossimulator", + "unix-x64", + "unix", + "any", + "base" + ], + "iossimulator.13": [ + "iossimulator.13", + "iossimulator.12", + "iossimulator.11", + "iossimulator.10", + "iossimulator.9", + "iossimulator.8", + "iossimulator", + "unix", + "any", + "base" + ], + "iossimulator.13-arm64": [ + "iossimulator.13-arm64", + "iossimulator.13", + "iossimulator.12-arm64", + "iossimulator.12", + "iossimulator.11-arm64", + "iossimulator.11", + "iossimulator.10-arm64", + "iossimulator.10", + "iossimulator.9-arm64", + "iossimulator.9", + "iossimulator.8-arm64", + "iossimulator.8", + "iossimulator-arm64", + "iossimulator", + "unix-arm64", + "unix", + "any", + "base" + ], + "iossimulator.13-x64": [ + "iossimulator.13-x64", + "iossimulator.13", + "iossimulator.12-x64", + "iossimulator.12", + "iossimulator.11-x64", + "iossimulator.11", + "iossimulator.10-x64", + "iossimulator.10", + "iossimulator.9-x64", + "iossimulator.9", + "iossimulator.8-x64", + "iossimulator.8", + "iossimulator-x64", + "iossimulator", + "unix-x64", + "unix", + "any", + "base" + ], + "iossimulator.8": [ + "iossimulator.8", + "iossimulator", + "unix", + "any", + "base" + ], + "iossimulator.8-arm64": [ + "iossimulator.8-arm64", + "iossimulator.8", + "iossimulator-arm64", + "iossimulator", + "unix-arm64", + "unix", + "any", + "base" + ], + "iossimulator.8-x64": [ + "iossimulator.8-x64", + "iossimulator.8", + "iossimulator-x64", + "iossimulator", + "unix-x64", + "unix", + "any", + "base" + ], + "iossimulator.8-x86": [ + "iossimulator.8-x86", + "iossimulator.8", + "iossimulator-x86", + "iossimulator", + "unix-x86", + "unix", + "any", + "base" + ], + "iossimulator.9": [ + "iossimulator.9", + "iossimulator.8", + "iossimulator", + "unix", + "any", + "base" + ], + "iossimulator.9-arm64": [ + "iossimulator.9-arm64", + "iossimulator.9", + "iossimulator.8-arm64", + "iossimulator.8", + "iossimulator-arm64", + "iossimulator", + "unix-arm64", + "unix", + "any", + "base" + ], + "iossimulator.9-x64": [ + "iossimulator.9-x64", + "iossimulator.9", + "iossimulator.8-x64", + "iossimulator.8", + "iossimulator-x64", + "iossimulator", + "unix-x64", + "unix", + "any", + "base" + ], + "iossimulator.9-x86": [ + "iossimulator.9-x86", + "iossimulator.9", + "iossimulator.8-x86", + "iossimulator.8", + "iossimulator-x86", + "iossimulator", + "unix-x86", + "unix", + "any", + "base" + ], "linux": [ "linux", "unix", @@ -5935,191 +5892,6 @@ "any", "base" ], - "tvos-sim": [ - "tvos-sim", - "tvos", - "unix", - "any", - "base" - ], - "tvos-sim-arm64": [ - "tvos-sim-arm64", - "tvos-sim", - "tvos-arm64", - "tvos", - "unix-arm64", - "unix", - "any", - "base" - ], - "tvos-sim-x64": [ - "tvos-sim-x64", - "tvos-sim", - "tvos-x64", - "tvos", - "unix-x64", - "unix", - "any", - "base" - ], - "tvos-sim.10": [ - "tvos-sim.10", - "tvos-sim", - "tvos", - "unix", - "any", - "base" - ], - "tvos-sim.10-arm64": [ - "tvos-sim.10-arm64", - "tvos-sim.10", - "tvos-sim-arm64", - "tvos-sim", - "tvos-arm64", - "tvos", - "unix-arm64", - "unix", - "any", - "base" - ], - "tvos-sim.10-x64": [ - "tvos-sim.10-x64", - "tvos-sim.10", - "tvos-sim-x64", - "tvos-sim", - "tvos-x64", - "tvos", - "unix-x64", - "unix", - "any", - "base" - ], - "tvos-sim.11": [ - "tvos-sim.11", - "tvos-sim.10", - "tvos-sim", - "tvos", - "unix", - "any", - "base" - ], - "tvos-sim.11-arm64": [ - "tvos-sim.11-arm64", - "tvos-sim.11", - "tvos-sim.10-arm64", - "tvos-sim.10", - "tvos-sim-arm64", - "tvos-sim", - "tvos-arm64", - "tvos", - "unix-arm64", - "unix", - "any", - "base" - ], - "tvos-sim.11-x64": [ - "tvos-sim.11-x64", - "tvos-sim.11", - "tvos-sim.10-x64", - "tvos-sim.10", - "tvos-sim-x64", - "tvos-sim", - "tvos-x64", - "tvos", - "unix-x64", - "unix", - "any", - "base" - ], - "tvos-sim.12": [ - "tvos-sim.12", - "tvos-sim.11", - "tvos-sim.10", - "tvos-sim", - "tvos", - "unix", - "any", - "base" - ], - "tvos-sim.12-arm64": [ - "tvos-sim.12-arm64", - "tvos-sim.12", - "tvos-sim.11-arm64", - "tvos-sim.11", - "tvos-sim.10-arm64", - "tvos-sim.10", - "tvos-sim-arm64", - "tvos-sim", - "tvos-arm64", - "tvos", - "unix-arm64", - "unix", - "any", - "base" - ], - "tvos-sim.12-x64": [ - "tvos-sim.12-x64", - "tvos-sim.12", - "tvos-sim.11-x64", - "tvos-sim.11", - "tvos-sim.10-x64", - "tvos-sim.10", - "tvos-sim-x64", - "tvos-sim", - "tvos-x64", - "tvos", - "unix-x64", - "unix", - "any", - "base" - ], - "tvos-sim.13": [ - "tvos-sim.13", - "tvos-sim.12", - "tvos-sim.11", - "tvos-sim.10", - "tvos-sim", - "tvos", - "unix", - "any", - "base" - ], - "tvos-sim.13-arm64": [ - "tvos-sim.13-arm64", - "tvos-sim.13", - "tvos-sim.12-arm64", - "tvos-sim.12", - "tvos-sim.11-arm64", - "tvos-sim.11", - "tvos-sim.10-arm64", - "tvos-sim.10", - "tvos-sim-arm64", - "tvos-sim", - "tvos-arm64", - "tvos", - "unix-arm64", - "unix", - "any", - "base" - ], - "tvos-sim.13-x64": [ - "tvos-sim.13-x64", - "tvos-sim.13", - "tvos-sim.12-x64", - "tvos-sim.12", - "tvos-sim.11-x64", - "tvos-sim.11", - "tvos-sim.10-x64", - "tvos-sim.10", - "tvos-sim-x64", - "tvos-sim", - "tvos-x64", - "tvos", - "unix-x64", - "unix", - "any", - "base" - ], "tvos-x64": [ "tvos-x64", "tvos", @@ -6266,6 +6038,166 @@ "any", "base" ], + "tvossimulator": [ + "tvossimulator", + "unix", + "any", + "base" + ], + "tvossimulator-arm64": [ + "tvossimulator-arm64", + "tvossimulator", + "unix-arm64", + "unix", + "any", + "base" + ], + "tvossimulator-x64": [ + "tvossimulator-x64", + "tvossimulator", + "unix-x64", + "unix", + "any", + "base" + ], + "tvossimulator.10": [ + "tvossimulator.10", + "tvossimulator", + "unix", + "any", + "base" + ], + "tvossimulator.10-arm64": [ + "tvossimulator.10-arm64", + "tvossimulator.10", + "tvossimulator-arm64", + "tvossimulator", + "unix-arm64", + "unix", + "any", + "base" + ], + "tvossimulator.10-x64": [ + "tvossimulator.10-x64", + "tvossimulator.10", + "tvossimulator-x64", + "tvossimulator", + "unix-x64", + "unix", + "any", + "base" + ], + "tvossimulator.11": [ + "tvossimulator.11", + "tvossimulator.10", + "tvossimulator", + "unix", + "any", + "base" + ], + "tvossimulator.11-arm64": [ + "tvossimulator.11-arm64", + "tvossimulator.11", + "tvossimulator.10-arm64", + "tvossimulator.10", + "tvossimulator-arm64", + "tvossimulator", + "unix-arm64", + "unix", + "any", + "base" + ], + "tvossimulator.11-x64": [ + "tvossimulator.11-x64", + "tvossimulator.11", + "tvossimulator.10-x64", + "tvossimulator.10", + "tvossimulator-x64", + "tvossimulator", + "unix-x64", + "unix", + "any", + "base" + ], + "tvossimulator.12": [ + "tvossimulator.12", + "tvossimulator.11", + "tvossimulator.10", + "tvossimulator", + "unix", + "any", + "base" + ], + "tvossimulator.12-arm64": [ + "tvossimulator.12-arm64", + "tvossimulator.12", + "tvossimulator.11-arm64", + "tvossimulator.11", + "tvossimulator.10-arm64", + "tvossimulator.10", + "tvossimulator-arm64", + "tvossimulator", + "unix-arm64", + "unix", + "any", + "base" + ], + "tvossimulator.12-x64": [ + "tvossimulator.12-x64", + "tvossimulator.12", + "tvossimulator.11-x64", + "tvossimulator.11", + "tvossimulator.10-x64", + "tvossimulator.10", + "tvossimulator-x64", + "tvossimulator", + "unix-x64", + "unix", + "any", + "base" + ], + "tvossimulator.13": [ + "tvossimulator.13", + "tvossimulator.12", + "tvossimulator.11", + "tvossimulator.10", + "tvossimulator", + "unix", + "any", + "base" + ], + "tvossimulator.13-arm64": [ + "tvossimulator.13-arm64", + "tvossimulator.13", + "tvossimulator.12-arm64", + "tvossimulator.12", + "tvossimulator.11-arm64", + "tvossimulator.11", + "tvossimulator.10-arm64", + "tvossimulator.10", + "tvossimulator-arm64", + "tvossimulator", + "unix-arm64", + "unix", + "any", + "base" + ], + "tvossimulator.13-x64": [ + "tvossimulator.13-x64", + "tvossimulator.13", + "tvossimulator.12-x64", + "tvossimulator.12", + "tvossimulator.11-x64", + "tvossimulator.11", + "tvossimulator.10-x64", + "tvossimulator.10", + "tvossimulator-x64", + "tvossimulator", + "unix-x64", + "unix", + "any", + "base" + ], "ubuntu": [ "ubuntu", "debian", diff --git a/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.json b/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.json index 88d9bf891840c..ebf0c7a8a365b 100644 --- a/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.json +++ b/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.json @@ -1102,297 +1102,297 @@ "unix-arm64" ] }, - "ios-sim": { + "ios-x64": { "#import": [ - "ios" + "ios", + "unix-x64" ] }, - "ios-sim-arm64": { + "ios-x86": { "#import": [ - "ios-sim", - "ios-arm64" + "ios", + "unix-x86" ] }, - "ios-sim-x64": { + "ios.10": { "#import": [ - "ios-sim", - "ios-x64" + "ios.9" ] }, - "ios-sim-x86": { + "ios.10-arm": { "#import": [ - "ios-sim", - "ios-x86" + "ios.10", + "ios.9-arm" ] }, - "ios-sim.10": { + "ios.10-arm64": { "#import": [ - "ios-sim.9" + "ios.10", + "ios.9-arm64" ] }, - "ios-sim.10-arm64": { + "ios.10-x64": { "#import": [ - "ios-sim.10", - "ios-sim.9-arm64" + "ios.10", + "ios.9-x64" ] }, - "ios-sim.10-x64": { + "ios.10-x86": { "#import": [ - "ios-sim.10", - "ios-sim.9-x64" + "ios.10", + "ios.9-x86" ] }, - "ios-sim.10-x86": { + "ios.11": { "#import": [ - "ios-sim.10", - "ios-sim.9-x86" + "ios.10" ] }, - "ios-sim.11": { + "ios.11-arm64": { "#import": [ - "ios-sim.10" + "ios.11", + "ios.10-arm64" ] }, - "ios-sim.11-arm64": { + "ios.11-x64": { "#import": [ - "ios-sim.11", - "ios-sim.10-arm64" + "ios.11", + "ios.10-x64" ] }, - "ios-sim.11-x64": { + "ios.12": { "#import": [ - "ios-sim.11", - "ios-sim.10-x64" + "ios.11" ] }, - "ios-sim.12": { + "ios.12-arm64": { "#import": [ - "ios-sim.11" + "ios.12", + "ios.11-arm64" ] }, - "ios-sim.12-arm64": { + "ios.12-x64": { "#import": [ - "ios-sim.12", - "ios-sim.11-arm64" + "ios.12", + "ios.11-x64" ] }, - "ios-sim.12-x64": { + "ios.13": { "#import": [ - "ios-sim.12", - "ios-sim.11-x64" + "ios.12" ] }, - "ios-sim.13": { + "ios.13-arm64": { "#import": [ - "ios-sim.12" + "ios.13", + "ios.12-arm64" ] }, - "ios-sim.13-arm64": { + "ios.13-x64": { "#import": [ - "ios-sim.13", - "ios-sim.12-arm64" + "ios.13", + "ios.12-x64" ] }, - "ios-sim.13-x64": { + "ios.8": { "#import": [ - "ios-sim.13", - "ios-sim.12-x64" + "ios" ] }, - "ios-sim.8": { + "ios.8-arm": { "#import": [ - "ios-sim" + "ios.8", + "ios-arm" ] }, - "ios-sim.8-arm64": { + "ios.8-arm64": { "#import": [ - "ios-sim.8", - "ios-sim-arm64" + "ios.8", + "ios-arm64" ] }, - "ios-sim.8-x64": { + "ios.8-x64": { "#import": [ - "ios-sim.8", - "ios-sim-x64" + "ios.8", + "ios-x64" ] }, - "ios-sim.8-x86": { + "ios.8-x86": { "#import": [ - "ios-sim.8", - "ios-sim-x86" + "ios.8", + "ios-x86" ] }, - "ios-sim.9": { + "ios.9": { "#import": [ - "ios-sim.8" + "ios.8" ] }, - "ios-sim.9-arm64": { + "ios.9-arm": { "#import": [ - "ios-sim.9", - "ios-sim.8-arm64" + "ios.9", + "ios.8-arm" ] }, - "ios-sim.9-x64": { + "ios.9-arm64": { "#import": [ - "ios-sim.9", - "ios-sim.8-x64" + "ios.9", + "ios.8-arm64" ] }, - "ios-sim.9-x86": { + "ios.9-x64": { "#import": [ - "ios-sim.9", - "ios-sim.8-x86" + "ios.9", + "ios.8-x64" ] }, - "ios-x64": { + "ios.9-x86": { "#import": [ - "ios", - "unix-x64" + "ios.9", + "ios.8-x86" ] }, - "ios-x86": { + "iossimulator": { "#import": [ - "ios", - "unix-x86" + "unix" ] }, - "ios.10": { + "iossimulator-arm64": { "#import": [ - "ios.9" + "iossimulator", + "unix-arm64" ] }, - "ios.10-arm": { + "iossimulator-x64": { "#import": [ - "ios.10", - "ios.9-arm" + "iossimulator", + "unix-x64" ] }, - "ios.10-arm64": { + "iossimulator-x86": { "#import": [ - "ios.10", - "ios.9-arm64" + "iossimulator", + "unix-x86" ] }, - "ios.10-x64": { + "iossimulator.10": { "#import": [ - "ios.10", - "ios.9-x64" + "iossimulator.9" ] }, - "ios.10-x86": { + "iossimulator.10-arm64": { "#import": [ - "ios.10", - "ios.9-x86" + "iossimulator.10", + "iossimulator.9-arm64" ] }, - "ios.11": { + "iossimulator.10-x64": { "#import": [ - "ios.10" + "iossimulator.10", + "iossimulator.9-x64" ] }, - "ios.11-arm64": { + "iossimulator.10-x86": { "#import": [ - "ios.11", - "ios.10-arm64" + "iossimulator.10", + "iossimulator.9-x86" ] }, - "ios.11-x64": { + "iossimulator.11": { "#import": [ - "ios.11", - "ios.10-x64" + "iossimulator.10" ] }, - "ios.12": { + "iossimulator.11-arm64": { "#import": [ - "ios.11" + "iossimulator.11", + "iossimulator.10-arm64" ] }, - "ios.12-arm64": { + "iossimulator.11-x64": { "#import": [ - "ios.12", - "ios.11-arm64" + "iossimulator.11", + "iossimulator.10-x64" ] }, - "ios.12-x64": { + "iossimulator.12": { "#import": [ - "ios.12", - "ios.11-x64" + "iossimulator.11" ] }, - "ios.13": { + "iossimulator.12-arm64": { "#import": [ - "ios.12" + "iossimulator.12", + "iossimulator.11-arm64" ] }, - "ios.13-arm64": { + "iossimulator.12-x64": { "#import": [ - "ios.13", - "ios.12-arm64" + "iossimulator.12", + "iossimulator.11-x64" ] }, - "ios.13-x64": { + "iossimulator.13": { "#import": [ - "ios.13", - "ios.12-x64" + "iossimulator.12" ] }, - "ios.8": { + "iossimulator.13-arm64": { "#import": [ - "ios" + "iossimulator.13", + "iossimulator.12-arm64" ] }, - "ios.8-arm": { + "iossimulator.13-x64": { "#import": [ - "ios.8", - "ios-arm" + "iossimulator.13", + "iossimulator.12-x64" ] }, - "ios.8-arm64": { + "iossimulator.8": { "#import": [ - "ios.8", - "ios-arm64" + "iossimulator" ] }, - "ios.8-x64": { + "iossimulator.8-arm64": { "#import": [ - "ios.8", - "ios-x64" + "iossimulator.8", + "iossimulator-arm64" ] }, - "ios.8-x86": { + "iossimulator.8-x64": { "#import": [ - "ios.8", - "ios-x86" + "iossimulator.8", + "iossimulator-x64" ] }, - "ios.9": { + "iossimulator.8-x86": { "#import": [ - "ios.8" + "iossimulator.8", + "iossimulator-x86" ] }, - "ios.9-arm": { + "iossimulator.9": { "#import": [ - "ios.9", - "ios.8-arm" + "iossimulator.8" ] }, - "ios.9-arm64": { + "iossimulator.9-arm64": { "#import": [ - "ios.9", - "ios.8-arm64" + "iossimulator.9", + "iossimulator.8-arm64" ] }, - "ios.9-x64": { + "iossimulator.9-x64": { "#import": [ - "ios.9", - "ios.8-x64" + "iossimulator.9", + "iossimulator.8-x64" ] }, - "ios.9-x86": { + "iossimulator.9-x86": { "#import": [ - "ios.9", - "ios.8-x86" + "iossimulator.9", + "iossimulator.8-x86" ] }, "linux": { @@ -2500,163 +2500,163 @@ "unix-arm64" ] }, - "tvos-sim": { + "tvos-x64": { "#import": [ - "tvos" + "tvos", + "unix-x64" ] }, - "tvos-sim-arm64": { + "tvos.10": { "#import": [ - "tvos-sim", - "tvos-arm64" + "tvos" ] }, - "tvos-sim-x64": { + "tvos.10-arm64": { "#import": [ - "tvos-sim", - "tvos-x64" + "tvos.10", + "tvos-arm64" ] }, - "tvos-sim.10": { + "tvos.10-x64": { "#import": [ - "tvos-sim" + "tvos.10", + "tvos-x64" ] }, - "tvos-sim.10-arm64": { + "tvos.11": { "#import": [ - "tvos-sim.10", - "tvos-sim-arm64" + "tvos.10" ] }, - "tvos-sim.10-x64": { + "tvos.11-arm64": { "#import": [ - "tvos-sim.10", - "tvos-sim-x64" + "tvos.11", + "tvos.10-arm64" ] }, - "tvos-sim.11": { + "tvos.11-x64": { "#import": [ - "tvos-sim.10" + "tvos.11", + "tvos.10-x64" ] }, - "tvos-sim.11-arm64": { + "tvos.12": { "#import": [ - "tvos-sim.11", - "tvos-sim.10-arm64" + "tvos.11" ] }, - "tvos-sim.11-x64": { + "tvos.12-arm64": { "#import": [ - "tvos-sim.11", - "tvos-sim.10-x64" + "tvos.12", + "tvos.11-arm64" ] }, - "tvos-sim.12": { + "tvos.12-x64": { "#import": [ - "tvos-sim.11" + "tvos.12", + "tvos.11-x64" ] }, - "tvos-sim.12-arm64": { + "tvos.13": { "#import": [ - "tvos-sim.12", - "tvos-sim.11-arm64" + "tvos.12" ] }, - "tvos-sim.12-x64": { + "tvos.13-arm64": { "#import": [ - "tvos-sim.12", - "tvos-sim.11-x64" + "tvos.13", + "tvos.12-arm64" ] }, - "tvos-sim.13": { + "tvos.13-x64": { "#import": [ - "tvos-sim.12" + "tvos.13", + "tvos.12-x64" ] }, - "tvos-sim.13-arm64": { + "tvossimulator": { "#import": [ - "tvos-sim.13", - "tvos-sim.12-arm64" + "unix" ] }, - "tvos-sim.13-x64": { + "tvossimulator-arm64": { "#import": [ - "tvos-sim.13", - "tvos-sim.12-x64" + "tvossimulator", + "unix-arm64" ] }, - "tvos-x64": { + "tvossimulator-x64": { "#import": [ - "tvos", + "tvossimulator", "unix-x64" ] }, - "tvos.10": { + "tvossimulator.10": { "#import": [ - "tvos" + "tvossimulator" ] }, - "tvos.10-arm64": { + "tvossimulator.10-arm64": { "#import": [ - "tvos.10", - "tvos-arm64" + "tvossimulator.10", + "tvossimulator-arm64" ] }, - "tvos.10-x64": { + "tvossimulator.10-x64": { "#import": [ - "tvos.10", - "tvos-x64" + "tvossimulator.10", + "tvossimulator-x64" ] }, - "tvos.11": { + "tvossimulator.11": { "#import": [ - "tvos.10" + "tvossimulator.10" ] }, - "tvos.11-arm64": { + "tvossimulator.11-arm64": { "#import": [ - "tvos.11", - "tvos.10-arm64" + "tvossimulator.11", + "tvossimulator.10-arm64" ] }, - "tvos.11-x64": { + "tvossimulator.11-x64": { "#import": [ - "tvos.11", - "tvos.10-x64" + "tvossimulator.11", + "tvossimulator.10-x64" ] }, - "tvos.12": { + "tvossimulator.12": { "#import": [ - "tvos.11" + "tvossimulator.11" ] }, - "tvos.12-arm64": { + "tvossimulator.12-arm64": { "#import": [ - "tvos.12", - "tvos.11-arm64" + "tvossimulator.12", + "tvossimulator.11-arm64" ] }, - "tvos.12-x64": { + "tvossimulator.12-x64": { "#import": [ - "tvos.12", - "tvos.11-x64" + "tvossimulator.12", + "tvossimulator.11-x64" ] }, - "tvos.13": { + "tvossimulator.13": { "#import": [ - "tvos.12" + "tvossimulator.12" ] }, - "tvos.13-arm64": { + "tvossimulator.13-arm64": { "#import": [ - "tvos.13", - "tvos.12-arm64" + "tvossimulator.13", + "tvossimulator.12-arm64" ] }, - "tvos.13-x64": { + "tvossimulator.13-x64": { "#import": [ - "tvos.13", - "tvos.12-x64" + "tvossimulator.13", + "tvossimulator.12-x64" ] }, "ubuntu": { From 57668a9419d5b3d2a60634596525279158185334 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Wed, 17 Mar 2021 14:05:27 -0400 Subject: [PATCH 42/48] Add iOSSimulator to xplat-setup --- eng/pipelines/common/xplat-setup.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml index 5245e0314a82b..9d422ce118859 100644 --- 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', 'MacCatalyst', 'iOS', 'tvOS') }}: + ${{ if in(parameters.osGroup, 'OSX', 'MacCatalyst', 'iOS', 'iOSSimulator', 'tvOS', 'tvOSSimulator') }}: vmImage: 'macOS-10.15' # Official Build Windows Pool From 7fb2dd23c8cfccf21f39bcea90afcf32d3fa079c Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Wed, 17 Mar 2021 14:39:42 -0400 Subject: [PATCH 43/48] Bump ICU --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6dfa256cdb801..1cff0353be38d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - f8930f51020aeeeab5d3f96314b3c53d4122b6f9 + 4515910c7f374fe3332677b3a1b8321072d7f8de diff --git a/eng/Versions.props b/eng/Versions.props index c90ddbbfff5c7..ad8dc679a0380 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -157,7 +157,7 @@ 6.0.100-preview.2.21126.1 - 6.0.0-preview.3.21160.1 + 6.0.0-preview.3.21167.1 9.0.1-alpha.1.21158.1 9.0.1-alpha.1.21158.1 From 07de08f7430f3f89071d71c0f6ced631af9eb178 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Wed, 17 Mar 2021 16:01:04 -0400 Subject: [PATCH 44/48] Add simulators to osGroups --- src/libraries/OSGroups.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/libraries/OSGroups.json b/src/libraries/OSGroups.json index 6abdb84c5192b..df367e07b744e 100644 --- a/src/libraries/OSGroups.json +++ b/src/libraries/OSGroups.json @@ -24,11 +24,21 @@ "Unix" ] }, + "iOSSimulator": { + "#import": [ + "iOS" + ] + }, "tvOS": { "#import": [ "Unix" ] }, + "tvOSSimulator": { + "#import": [ + "tvOS" + ] + }, "Android": { "#import": [ "Linux" From 9c302e03b6b8464a48fd0544806322443386c5f1 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Wed, 17 Mar 2021 17:03:13 -0400 Subject: [PATCH 45/48] Fix case sensitivity error --- Directory.Build.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 16b9ac6daeaaf..571eabc34b5ae 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -123,9 +123,9 @@ <_portableOS Condition="'$(_runtimeOS)' == 'Browser'">browser <_portableOS Condition="'$(_runtimeOS)' == 'maccatalyst'">maccatalyst <_portableOS Condition="'$(_runtimeOS)' == 'ios'">ios - <_portableOS Condition="'$(_runtimeOS)' == 'iOSSimulator'">iOSSimulator + <_portableOS Condition="'$(_runtimeOS)' == 'iOSSimulator'">iossimulator <_portableOS Condition="'$(_runtimeOS)' == 'tvos'">tvos - <_portableOS Condition="'$(_runtimeOS)' == 'tvOSSimulator'">tvOSSimulator + <_portableOS Condition="'$(_runtimeOS)' == 'tvOSSimulator'">tvossimulator <_portableOS Condition="'$(_runtimeOS)' == 'android'">android <_runtimeOS Condition="$(_runtimeOS.StartsWith('tizen'))">linux From 3e9b7f80cc64233847e5d5d429336bc252f1a6a9 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Wed, 17 Mar 2021 21:56:47 -0400 Subject: [PATCH 46/48] Fix a few casing issues --- Directory.Build.props | 4 ++-- eng/testing/tests.mobile.targets | 2 +- .../pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 571eabc34b5ae..f0989ccad940f 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -169,9 +169,9 @@ <_outputRID Condition="'$(TargetOS)' == 'Solaris'">solaris-$(TargetArchitecture) <_outputRID Condition="'$(TargetOS)' == 'MacCatalyst'">maccatalyst-$(TargetArchitecture) <_outputRID Condition="'$(TargetOS)' == 'iOS'">ios-$(TargetArchitecture) - <_outputRID Condition="'$(TargetOS)' == 'iOSSimulator'">iOSSimulator-$(TargetArchitecture) + <_outputRID Condition="'$(TargetOS)' == 'iOSSimulator'">iossimulator-$(TargetArchitecture) <_outputRID Condition="'$(TargetOS)' == 'tvOS'">tvos-$(TargetArchitecture) - <_outputRID Condition="'$(TargetOS)' == 'tvOSSimulator'">tvOSSimulator-$(TargetArchitecture) + <_outputRID Condition="'$(TargetOS)' == 'tvOSSimulator'">tvossimulator-$(TargetArchitecture) <_outputRID Condition="'$(TargetOS)' == 'Android'">android-$(TargetArchitecture) <_outputRID Condition="'$(TargetOS)' == 'Browser'">browser-$(TargetArchitecture) diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets index 57dfe62527bd9..dad68387f86b5 100644 --- a/eng/testing/tests.mobile.targets +++ b/eng/testing/tests.mobile.targets @@ -3,7 +3,7 @@ $([MSBuild]::NormalizeDirectory('$(OutDir)', 'AppBundle')) $([MSBuild]::NormalizePath('$(BundleDir)', '$(RunScriptOutputName)')) - true + true V8 $(JSEngineArgs) --engine-arg=--stack-trace-limit=1000 diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj index e39300567dfd2..854f4d454ebb9 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/monocrossaot.sfxproj @@ -5,7 +5,7 @@ $(MonoAotTargets);android-x64;android-arm64;android-x86;android-arm $(MonoAotTargets);android-x64 $(MonoAotTargets);browser-wasm - $(MonoAotTargets);tvos-sim-x64;tvos-sim-arm64;tvos-arm64 + $(MonoAotTargets);tvossimulator-x64;tvossimulator-arm64;tvos-arm64 $(MonoAotTargets);iossimulator-x64;iossimulator-arm64;iossimulator-x86;ios-arm64;ios-arm From 6bcf466beb9743bc4252f50ddb0320be4c0ea9d5 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Thu, 18 Mar 2021 08:38:28 -0400 Subject: [PATCH 47/48] Parent iossimulator to ios not unix. Fixes issues in known framework resolution --- .../pkg/runtime.compatibility.json | 68 +++++++++++++++++++ .../pkg/runtime.json | 14 ++-- .../pkg/runtimeGroups.props | 6 +- 3 files changed, 78 insertions(+), 10 deletions(-) diff --git a/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.compatibility.json b/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.compatibility.json index 4f86a112c7ed2..a740ab7324fbc 100644 --- a/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.compatibility.json +++ b/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.compatibility.json @@ -3016,6 +3016,7 @@ ], "iossimulator": [ "iossimulator", + "ios", "unix", "any", "base" @@ -3023,6 +3024,8 @@ "iossimulator-arm64": [ "iossimulator-arm64", "iossimulator", + "ios-arm64", + "ios", "unix-arm64", "unix", "any", @@ -3031,6 +3034,8 @@ "iossimulator-x64": [ "iossimulator-x64", "iossimulator", + "ios-x64", + "ios", "unix-x64", "unix", "any", @@ -3039,6 +3044,8 @@ "iossimulator-x86": [ "iossimulator-x86", "iossimulator", + "ios-x86", + "ios", "unix-x86", "unix", "any", @@ -3049,6 +3056,7 @@ "iossimulator.9", "iossimulator.8", "iossimulator", + "ios", "unix", "any", "base" @@ -3062,6 +3070,8 @@ "iossimulator.8", "iossimulator-arm64", "iossimulator", + "ios-arm64", + "ios", "unix-arm64", "unix", "any", @@ -3076,6 +3086,8 @@ "iossimulator.8", "iossimulator-x64", "iossimulator", + "ios-x64", + "ios", "unix-x64", "unix", "any", @@ -3090,6 +3102,8 @@ "iossimulator.8", "iossimulator-x86", "iossimulator", + "ios-x86", + "ios", "unix-x86", "unix", "any", @@ -3101,6 +3115,7 @@ "iossimulator.9", "iossimulator.8", "iossimulator", + "ios", "unix", "any", "base" @@ -3116,6 +3131,8 @@ "iossimulator.8", "iossimulator-arm64", "iossimulator", + "ios-arm64", + "ios", "unix-arm64", "unix", "any", @@ -3132,6 +3149,8 @@ "iossimulator.8", "iossimulator-x64", "iossimulator", + "ios-x64", + "ios", "unix-x64", "unix", "any", @@ -3144,6 +3163,7 @@ "iossimulator.9", "iossimulator.8", "iossimulator", + "ios", "unix", "any", "base" @@ -3161,6 +3181,8 @@ "iossimulator.8", "iossimulator-arm64", "iossimulator", + "ios-arm64", + "ios", "unix-arm64", "unix", "any", @@ -3179,6 +3201,8 @@ "iossimulator.8", "iossimulator-x64", "iossimulator", + "ios-x64", + "ios", "unix-x64", "unix", "any", @@ -3192,6 +3216,7 @@ "iossimulator.9", "iossimulator.8", "iossimulator", + "ios", "unix", "any", "base" @@ -3211,6 +3236,8 @@ "iossimulator.8", "iossimulator-arm64", "iossimulator", + "ios-arm64", + "ios", "unix-arm64", "unix", "any", @@ -3231,6 +3258,8 @@ "iossimulator.8", "iossimulator-x64", "iossimulator", + "ios-x64", + "ios", "unix-x64", "unix", "any", @@ -3239,6 +3268,7 @@ "iossimulator.8": [ "iossimulator.8", "iossimulator", + "ios", "unix", "any", "base" @@ -3248,6 +3278,8 @@ "iossimulator.8", "iossimulator-arm64", "iossimulator", + "ios-arm64", + "ios", "unix-arm64", "unix", "any", @@ -3258,6 +3290,8 @@ "iossimulator.8", "iossimulator-x64", "iossimulator", + "ios-x64", + "ios", "unix-x64", "unix", "any", @@ -3268,6 +3302,8 @@ "iossimulator.8", "iossimulator-x86", "iossimulator", + "ios-x86", + "ios", "unix-x86", "unix", "any", @@ -3277,6 +3313,7 @@ "iossimulator.9", "iossimulator.8", "iossimulator", + "ios", "unix", "any", "base" @@ -3288,6 +3325,8 @@ "iossimulator.8", "iossimulator-arm64", "iossimulator", + "ios-arm64", + "ios", "unix-arm64", "unix", "any", @@ -3300,6 +3339,8 @@ "iossimulator.8", "iossimulator-x64", "iossimulator", + "ios-x64", + "ios", "unix-x64", "unix", "any", @@ -3312,6 +3353,8 @@ "iossimulator.8", "iossimulator-x86", "iossimulator", + "ios-x86", + "ios", "unix-x86", "unix", "any", @@ -6040,6 +6083,7 @@ ], "tvossimulator": [ "tvossimulator", + "tvos", "unix", "any", "base" @@ -6047,6 +6091,8 @@ "tvossimulator-arm64": [ "tvossimulator-arm64", "tvossimulator", + "tvos-arm64", + "tvos", "unix-arm64", "unix", "any", @@ -6055,6 +6101,8 @@ "tvossimulator-x64": [ "tvossimulator-x64", "tvossimulator", + "tvos-x64", + "tvos", "unix-x64", "unix", "any", @@ -6063,6 +6111,7 @@ "tvossimulator.10": [ "tvossimulator.10", "tvossimulator", + "tvos", "unix", "any", "base" @@ -6072,6 +6121,8 @@ "tvossimulator.10", "tvossimulator-arm64", "tvossimulator", + "tvos-arm64", + "tvos", "unix-arm64", "unix", "any", @@ -6082,6 +6133,8 @@ "tvossimulator.10", "tvossimulator-x64", "tvossimulator", + "tvos-x64", + "tvos", "unix-x64", "unix", "any", @@ -6091,6 +6144,7 @@ "tvossimulator.11", "tvossimulator.10", "tvossimulator", + "tvos", "unix", "any", "base" @@ -6102,6 +6156,8 @@ "tvossimulator.10", "tvossimulator-arm64", "tvossimulator", + "tvos-arm64", + "tvos", "unix-arm64", "unix", "any", @@ -6114,6 +6170,8 @@ "tvossimulator.10", "tvossimulator-x64", "tvossimulator", + "tvos-x64", + "tvos", "unix-x64", "unix", "any", @@ -6124,6 +6182,7 @@ "tvossimulator.11", "tvossimulator.10", "tvossimulator", + "tvos", "unix", "any", "base" @@ -6137,6 +6196,8 @@ "tvossimulator.10", "tvossimulator-arm64", "tvossimulator", + "tvos-arm64", + "tvos", "unix-arm64", "unix", "any", @@ -6151,6 +6212,8 @@ "tvossimulator.10", "tvossimulator-x64", "tvossimulator", + "tvos-x64", + "tvos", "unix-x64", "unix", "any", @@ -6162,6 +6225,7 @@ "tvossimulator.11", "tvossimulator.10", "tvossimulator", + "tvos", "unix", "any", "base" @@ -6177,6 +6241,8 @@ "tvossimulator.10", "tvossimulator-arm64", "tvossimulator", + "tvos-arm64", + "tvos", "unix-arm64", "unix", "any", @@ -6193,6 +6259,8 @@ "tvossimulator.10", "tvossimulator-x64", "tvossimulator", + "tvos-x64", + "tvos", "unix-x64", "unix", "any", diff --git a/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.json b/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.json index ebf0c7a8a365b..9ce5b6033f61e 100644 --- a/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.json +++ b/src/libraries/Microsoft.NETCore.Platforms/pkg/runtime.json @@ -1254,25 +1254,25 @@ }, "iossimulator": { "#import": [ - "unix" + "ios" ] }, "iossimulator-arm64": { "#import": [ "iossimulator", - "unix-arm64" + "ios-arm64" ] }, "iossimulator-x64": { "#import": [ "iossimulator", - "unix-x64" + "ios-x64" ] }, "iossimulator-x86": { "#import": [ "iossimulator", - "unix-x86" + "ios-x86" ] }, "iossimulator.10": { @@ -2576,19 +2576,19 @@ }, "tvossimulator": { "#import": [ - "unix" + "tvos" ] }, "tvossimulator-arm64": { "#import": [ "tvossimulator", - "unix-arm64" + "tvos-arm64" ] }, "tvossimulator-x64": { "#import": [ "tvossimulator", - "unix-x64" + "tvos-x64" ] }, "tvossimulator.10": { diff --git a/src/libraries/Microsoft.NETCore.Platforms/pkg/runtimeGroups.props b/src/libraries/Microsoft.NETCore.Platforms/pkg/runtimeGroups.props index dfd025df6067d..5d4a3edf9e956 100644 --- a/src/libraries/Microsoft.NETCore.Platforms/pkg/runtimeGroups.props +++ b/src/libraries/Microsoft.NETCore.Platforms/pkg/runtimeGroups.props @@ -92,12 +92,12 @@ - unix + ios x86 8;9;10 - unix + ios arm64;x64 8;9;10;11;12;13 @@ -222,7 +222,7 @@ - unix + tvos arm64;x64 10;11;12;13 From 85577a12edf99cc89cc6a44f7b3d93038a7ea829 Mon Sep 17 00:00:00 2001 From: Joseph Shields Date: Thu, 18 Mar 2021 13:41:19 -0400 Subject: [PATCH 48/48] Fix bad Helix changes? --- eng/pipelines/libraries/helix.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/eng/pipelines/libraries/helix.yml b/eng/pipelines/libraries/helix.yml index ec154c4c9a83a..ec6aeea424f75 100644 --- a/eng/pipelines/libraries/helix.yml +++ b/eng/pipelines/libraries/helix.yml @@ -5,7 +5,6 @@ parameters: creator: '' helixQueues: '' osGroup: '' - osSubGroup: '' targetRid: '' testRunNamePrefixSuffix: '' testScope: 'innerloop' # innerloop | outerloop | all @@ -22,12 +21,13 @@ steps: /p:TargetArchitecture=${{ parameters.archType }} /p:TargetRuntimeIdentifier=${{ parameters.targetRid }} /p:Configuration=${{ parameters.buildConfig }} + /p:TargetOS=${{ parameters.osGroup }} /p:MonoForceInterpreter=${{ parameters.interpreter }} /p:TestScope=${{ parameters.testScope }} /p:TestRunNamePrefixSuffix=${{ parameters.testRunNamePrefixSuffix }} /p:HelixBuild=$(Build.BuildNumber) /p:Creator=${{ parameters.creator }} - /p:TargetOS=${{ parameters.osGroup }} + ${{ parameters.extraHelixArguments }} /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog displayName: Send to Helix condition: and(succeeded(), ${{ parameters.condition }}) @@ -36,4 +36,3 @@ steps: SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops HelixTargetQueues: ${{ join('+', parameters.helixQueues) }} # Pass queues to MSBuild as env var to avoid need of escaping them _Scenarios: ${{ join(',', parameters.scenarios) }} # Pass scenarios to MSBuild as env var to avoid need of escaping comma separated list -