Skip to content

Commit cc40cfd

Browse files
ericstjericstj
authored
Add iOS.10 with arm support to RID graph (#33990)
* Add iOS.10 with arm support to RID graph * Make iOS RIDs go back to 8
1 parent c39af4f commit cc40cfd

File tree

3 files changed

+269
-5
lines changed

3 files changed

+269
-5
lines changed

‎src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json‎

Lines changed: 185 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1915,6 +1915,14 @@
19151915
"any",
19161916
"base"
19171917
],
1918+
"ios-arm": [
1919+
"ios-arm",
1920+
"ios",
1921+
"unix-arm",
1922+
"unix",
1923+
"any",
1924+
"base"
1925+
],
19181926
"ios-arm64": [
19191927
"ios-arm64",
19201928
"ios",
@@ -1931,8 +1939,62 @@
19311939
"any",
19321940
"base"
19331941
],
1942+
"ios.10": [
1943+
"ios.10",
1944+
"ios.9",
1945+
"ios.8",
1946+
"ios",
1947+
"unix",
1948+
"any",
1949+
"base"
1950+
],
1951+
"ios.10-arm": [
1952+
"ios.10-arm",
1953+
"ios.10",
1954+
"ios.9-arm",
1955+
"ios.9",
1956+
"ios.8-arm",
1957+
"ios.8",
1958+
"ios-arm",
1959+
"ios",
1960+
"unix-arm",
1961+
"unix",
1962+
"any",
1963+
"base"
1964+
],
1965+
"ios.10-arm64": [
1966+
"ios.10-arm64",
1967+
"ios.10",
1968+
"ios.9-arm64",
1969+
"ios.9",
1970+
"ios.8-arm64",
1971+
"ios.8",
1972+
"ios-arm64",
1973+
"ios",
1974+
"unix-arm64",
1975+
"unix",
1976+
"any",
1977+
"base"
1978+
],
1979+
"ios.10-x64": [
1980+
"ios.10-x64",
1981+
"ios.10",
1982+
"ios.9-x64",
1983+
"ios.9",
1984+
"ios.8-x64",
1985+
"ios.8",
1986+
"ios-x64",
1987+
"ios",
1988+
"unix-x64",
1989+
"unix",
1990+
"any",
1991+
"base"
1992+
],
19341993
"ios.11": [
19351994
"ios.11",
1995+
"ios.10",
1996+
"ios.9",
1997+
"ios.8",
19361998
"ios",
19371999
"unix",
19382000
"any",
@@ -1941,6 +2003,12 @@
19412003
"ios.11-arm64": [
19422004
"ios.11-arm64",
19432005
"ios.11",
2006+
"ios.10-arm64",
2007+
"ios.10",
2008+
"ios.9-arm64",
2009+
"ios.9",
2010+
"ios.8-arm64",
2011+
"ios.8",
19442012
"ios-arm64",
19452013
"ios",
19462014
"unix-arm64",
@@ -1951,6 +2019,12 @@
19512019
"ios.11-x64": [
19522020
"ios.11-x64",
19532021
"ios.11",
2022+
"ios.10-x64",
2023+
"ios.10",
2024+
"ios.9-x64",
2025+
"ios.9",
2026+
"ios.8-x64",
2027+
"ios.8",
19542028
"ios-x64",
19552029
"ios",
19562030
"unix-x64",
@@ -1961,6 +2035,9 @@
19612035
"ios.12": [
19622036
"ios.12",
19632037
"ios.11",
2038+
"ios.10",
2039+
"ios.9",
2040+
"ios.8",
19642041
"ios",
19652042
"unix",
19662043
"any",
@@ -1971,6 +2048,12 @@
19712048
"ios.12",
19722049
"ios.11-arm64",
19732050
"ios.11",
2051+
"ios.10-arm64",
2052+
"ios.10",
2053+
"ios.9-arm64",
2054+
"ios.9",
2055+
"ios.8-arm64",
2056+
"ios.8",
19742057
"ios-arm64",
19752058
"ios",
19762059
"unix-arm64",
@@ -1983,6 +2066,12 @@
19832066
"ios.12",
19842067
"ios.11-x64",
19852068
"ios.11",
2069+
"ios.10-x64",
2070+
"ios.10",
2071+
"ios.9-x64",
2072+
"ios.9",
2073+
"ios.8-x64",
2074+
"ios.8",
19862075
"ios-x64",
19872076
"ios",
19882077
"unix-x64",
@@ -1994,6 +2083,9 @@
19942083
"ios.13",
19952084
"ios.12",
19962085
"ios.11",
2086+
"ios.10",
2087+
"ios.9",
2088+
"ios.8",
19972089
"ios",
19982090
"unix",
19992091
"any",
@@ -2006,6 +2098,12 @@
20062098
"ios.12",
20072099
"ios.11-arm64",
20082100
"ios.11",
2101+
"ios.10-arm64",
2102+
"ios.10",
2103+
"ios.9-arm64",
2104+
"ios.9",
2105+
"ios.8-arm64",
2106+
"ios.8",
20092107
"ios-arm64",
20102108
"ios",
20112109
"unix-arm64",
@@ -2020,6 +2118,93 @@
20202118
"ios.12",
20212119
"ios.11-x64",
20222120
"ios.11",
2121+
"ios.10-x64",
2122+
"ios.10",
2123+
"ios.9-x64",
2124+
"ios.9",
2125+
"ios.8-x64",
2126+
"ios.8",
2127+
"ios-x64",
2128+
"ios",
2129+
"unix-x64",
2130+
"unix",
2131+
"any",
2132+
"base"
2133+
],
2134+
"ios.8": [
2135+
"ios.8",
2136+
"ios",
2137+
"unix",
2138+
"any",
2139+
"base"
2140+
],
2141+
"ios.8-arm": [
2142+
"ios.8-arm",
2143+
"ios.8",
2144+
"ios-arm",
2145+
"ios",
2146+
"unix-arm",
2147+
"unix",
2148+
"any",
2149+
"base"
2150+
],
2151+
"ios.8-arm64": [
2152+
"ios.8-arm64",
2153+
"ios.8",
2154+
"ios-arm64",
2155+
"ios",
2156+
"unix-arm64",
2157+
"unix",
2158+
"any",
2159+
"base"
2160+
],
2161+
"ios.8-x64": [
2162+
"ios.8-x64",
2163+
"ios.8",
2164+
"ios-x64",
2165+
"ios",
2166+
"unix-x64",
2167+
"unix",
2168+
"any",
2169+
"base"
2170+
],
2171+
"ios.9": [
2172+
"ios.9",
2173+
"ios.8",
2174+
"ios",
2175+
"unix",
2176+
"any",
2177+
"base"
2178+
],
2179+
"ios.9-arm": [
2180+
"ios.9-arm",
2181+
"ios.9",
2182+
"ios.8-arm",
2183+
"ios.8",
2184+
"ios-arm",
2185+
"ios",
2186+
"unix-arm",
2187+
"unix",
2188+
"any",
2189+
"base"
2190+
],
2191+
"ios.9-arm64": [
2192+
"ios.9-arm64",
2193+
"ios.9",
2194+
"ios.8-arm64",
2195+
"ios.8",
2196+
"ios-arm64",
2197+
"ios",
2198+
"unix-arm64",
2199+
"unix",
2200+
"any",
2201+
"base"
2202+
],
2203+
"ios.9-x64": [
2204+
"ios.9-x64",
2205+
"ios.9",
2206+
"ios.8-x64",
2207+
"ios.8",
20232208
"ios-x64",
20242209
"ios",
20252210
"unix-x64",

‎src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json‎

Lines changed: 78 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -832,6 +832,12 @@
832832
"unix"
833833
]
834834
},
835+
"ios-arm": {
836+
"#import": [
837+
"ios",
838+
"unix-arm"
839+
]
840+
},
835841
"ios-arm64": {
836842
"#import": [
837843
"ios",
@@ -844,21 +850,44 @@
844850
"unix-x64"
845851
]
846852
},
853+
"ios.10": {
854+
"#import": [
855+
"ios.9"
856+
]
857+
},
858+
"ios.10-arm": {
859+
"#import": [
860+
"ios.10",
861+
"ios.9-arm"
862+
]
863+
},
864+
"ios.10-arm64": {
865+
"#import": [
866+
"ios.10",
867+
"ios.9-arm64"
868+
]
869+
},
870+
"ios.10-x64": {
871+
"#import": [
872+
"ios.10",
873+
"ios.9-x64"
874+
]
875+
},
847876
"ios.11": {
848877
"#import": [
849-
"ios"
878+
"ios.10"
850879
]
851880
},
852881
"ios.11-arm64": {
853882
"#import": [
854883
"ios.11",
855-
"ios-arm64"
884+
"ios.10-arm64"
856885
]
857886
},
858887
"ios.11-x64": {
859888
"#import": [
860889
"ios.11",
861-
"ios-x64"
890+
"ios.10-x64"
862891
]
863892
},
864893
"ios.12": {
@@ -895,6 +924,52 @@
895924
"ios.12-x64"
896925
]
897926
},
927+
"ios.8": {
928+
"#import": [
929+
"ios"
930+
]
931+
},
932+
"ios.8-arm": {
933+
"#import": [
934+
"ios.8",
935+
"ios-arm"
936+
]
937+
},
938+
"ios.8-arm64": {
939+
"#import": [
940+
"ios.8",
941+
"ios-arm64"
942+
]
943+
},
944+
"ios.8-x64": {
945+
"#import": [
946+
"ios.8",
947+
"ios-x64"
948+
]
949+
},
950+
"ios.9": {
951+
"#import": [
952+
"ios.8"
953+
]
954+
},
955+
"ios.9-arm": {
956+
"#import": [
957+
"ios.9",
958+
"ios.8-arm"
959+
]
960+
},
961+
"ios.9-arm64": {
962+
"#import": [
963+
"ios.9",
964+
"ios.8-arm64"
965+
]
966+
},
967+
"ios.9-x64": {
968+
"#import": [
969+
"ios.9",
970+
"ios.8-x64"
971+
]
972+
},
898973
"linux": {
899974
"#import": [
900975
"unix"

‎src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,15 @@
5757
<Architectures>x64</Architectures>
5858
</RuntimeGroup>
5959

60+
<RuntimeGroup Include="ios">
61+
<Parent>unix</Parent>
62+
<Architectures>arm</Architectures>
63+
<Versions>8;9;10</Versions>
64+
</RuntimeGroup>
6065
<RuntimeGroup Include="ios">
6166
<Parent>unix</Parent>
6267
<Architectures>arm64;x64</Architectures>
63-
<!-- starting from 11 because 10 will need different graph with arm included -->
64-
<Versions>11;12;13</Versions>
68+
<Versions>8;9;10;11;12;13</Versions>
6569
</RuntimeGroup>
6670

6771
<!-- linux mint includes major version in Include because Parent is different for each major -->

0 commit comments

Comments
 (0)