Skip to content

Commit 19a0db4

Browse files
omajidomajid
authored
Add some upcoming distro RIDs
This adds some RIDs that we know are current/upcoming: - Fedora 33 is in development, and the version after this is most likely going to be Fedora 34. Adding this RID now, so we can get this RID in all current releases when it comes time to build on Fedora 34 - RHEL has generally committed to doing a major release every 3 years. With RHEL 8 released in 2019, RHEL 9 is under development. There's even a plan on how to create that from Fedora here: https://fedoraproject.org/wiki/Changes/ELN_Buildroot_and_Compose - If there's a RHEL 9, there will most likely be an equivalent CentOS 9. Lets add that too. - CentOS 7 has an aarch64 port. As does CentOS 8.
1 parent 230538b commit 19a0db4

File tree

3 files changed

+215
-2
lines changed

3 files changed

+215
-2
lines changed

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

+134
Original file line numberDiff line numberDiff line change
@@ -1125,6 +1125,18 @@
11251125
"any",
11261126
"base"
11271127
],
1128+
"centos-arm64": [
1129+
"centos-arm64",
1130+
"centos",
1131+
"rhel-arm64",
1132+
"rhel",
1133+
"linux-arm64",
1134+
"linux",
1135+
"unix-arm64",
1136+
"unix",
1137+
"any",
1138+
"base"
1139+
],
11281140
"centos-x64": [
11291141
"centos-x64",
11301142
"centos",
@@ -1173,6 +1185,22 @@
11731185
"any",
11741186
"base"
11751187
],
1188+
"centos.8-arm64": [
1189+
"centos.8-arm64",
1190+
"centos.8",
1191+
"centos-arm64",
1192+
"rhel.8-arm64",
1193+
"centos",
1194+
"rhel.8",
1195+
"rhel-arm64",
1196+
"rhel",
1197+
"linux-arm64",
1198+
"linux",
1199+
"unix-arm64",
1200+
"unix",
1201+
"any",
1202+
"base"
1203+
],
11761204
"centos.8-x64": [
11771205
"centos.8-x64",
11781206
"centos.8",
@@ -1189,6 +1217,48 @@
11891217
"any",
11901218
"base"
11911219
],
1220+
"centos.9": [
1221+
"centos.9",
1222+
"centos",
1223+
"rhel.9",
1224+
"rhel",
1225+
"linux",
1226+
"unix",
1227+
"any",
1228+
"base"
1229+
],
1230+
"centos.9-arm64": [
1231+
"centos.9-arm64",
1232+
"centos.9",
1233+
"centos-arm64",
1234+
"rhel.9-arm64",
1235+
"centos",
1236+
"rhel.9",
1237+
"rhel-arm64",
1238+
"rhel",
1239+
"linux-arm64",
1240+
"linux",
1241+
"unix-arm64",
1242+
"unix",
1243+
"any",
1244+
"base"
1245+
],
1246+
"centos.9-x64": [
1247+
"centos.9-x64",
1248+
"centos.9",
1249+
"centos-x64",
1250+
"rhel.9-x64",
1251+
"centos",
1252+
"rhel.9",
1253+
"rhel-x64",
1254+
"rhel",
1255+
"linux-x64",
1256+
"linux",
1257+
"unix-x64",
1258+
"unix",
1259+
"any",
1260+
"base"
1261+
],
11921262
"debian": [
11931263
"debian",
11941264
"linux",
@@ -1829,6 +1899,38 @@
18291899
"any",
18301900
"base"
18311901
],
1902+
"fedora.34": [
1903+
"fedora.34",
1904+
"fedora",
1905+
"linux",
1906+
"unix",
1907+
"any",
1908+
"base"
1909+
],
1910+
"fedora.34-arm64": [
1911+
"fedora.34-arm64",
1912+
"fedora.34",
1913+
"fedora-arm64",
1914+
"fedora",
1915+
"linux-arm64",
1916+
"linux",
1917+
"unix-arm64",
1918+
"unix",
1919+
"any",
1920+
"base"
1921+
],
1922+
"fedora.34-x64": [
1923+
"fedora.34-x64",
1924+
"fedora.34",
1925+
"fedora-x64",
1926+
"fedora",
1927+
"linux-x64",
1928+
"linux",
1929+
"unix-x64",
1930+
"unix",
1931+
"any",
1932+
"base"
1933+
],
18321934
"freebsd": [
18331935
"freebsd",
18341936
"unix",
@@ -3811,6 +3913,38 @@
38113913
"any",
38123914
"base"
38133915
],
3916+
"rhel.9": [
3917+
"rhel.9",
3918+
"rhel",
3919+
"linux",
3920+
"unix",
3921+
"any",
3922+
"base"
3923+
],
3924+
"rhel.9-arm64": [
3925+
"rhel.9-arm64",
3926+
"rhel.9",
3927+
"rhel-arm64",
3928+
"rhel",
3929+
"linux-arm64",
3930+
"linux",
3931+
"unix-arm64",
3932+
"unix",
3933+
"any",
3934+
"base"
3935+
],
3936+
"rhel.9-x64": [
3937+
"rhel.9-x64",
3938+
"rhel.9",
3939+
"rhel-x64",
3940+
"rhel",
3941+
"linux-x64",
3942+
"linux",
3943+
"unix-x64",
3944+
"unix",
3945+
"any",
3946+
"base"
3947+
],
38143948
"sles": [
38153949
"sles",
38163950
"linux",

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

+67
Original file line numberDiff line numberDiff line change
@@ -406,6 +406,12 @@
406406
"rhel"
407407
]
408408
},
409+
"centos-arm64": {
410+
"#import": [
411+
"centos",
412+
"rhel-arm64"
413+
]
414+
},
409415
"centos-x64": {
410416
"#import": [
411417
"centos",
@@ -431,13 +437,40 @@
431437
"rhel.8"
432438
]
433439
},
440+
"centos.8-arm64": {
441+
"#import": [
442+
"centos.8",
443+
"centos-arm64",
444+
"rhel.8-arm64"
445+
]
446+
},
434447
"centos.8-x64": {
435448
"#import": [
436449
"centos.8",
437450
"centos-x64",
438451
"rhel.8-x64"
439452
]
440453
},
454+
"centos.9": {
455+
"#import": [
456+
"centos",
457+
"rhel.9"
458+
]
459+
},
460+
"centos.9-arm64": {
461+
"#import": [
462+
"centos.9",
463+
"centos-arm64",
464+
"rhel.9-arm64"
465+
]
466+
},
467+
"centos.9-x64": {
468+
"#import": [
469+
"centos.9",
470+
"centos-x64",
471+
"rhel.9-x64"
472+
]
473+
},
441474
"debian": {
442475
"#import": [
443476
"linux"
@@ -782,6 +815,23 @@
782815
"fedora-x64"
783816
]
784817
},
818+
"fedora.34": {
819+
"#import": [
820+
"fedora"
821+
]
822+
},
823+
"fedora.34-arm64": {
824+
"#import": [
825+
"fedora.34",
826+
"fedora-arm64"
827+
]
828+
},
829+
"fedora.34-x64": {
830+
"#import": [
831+
"fedora.34",
832+
"fedora-x64"
833+
]
834+
},
785835
"freebsd": {
786836
"#import": [
787837
"unix"
@@ -1633,6 +1683,23 @@
16331683
"rhel.8.0-x64"
16341684
]
16351685
},
1686+
"rhel.9": {
1687+
"#import": [
1688+
"rhel"
1689+
]
1690+
},
1691+
"rhel.9-arm64": {
1692+
"#import": [
1693+
"rhel.9",
1694+
"rhel-arm64"
1695+
]
1696+
},
1697+
"rhel.9-x64": {
1698+
"#import": [
1699+
"rhel.9",
1700+
"rhel-x64"
1701+
]
1702+
},
16361703
"sles": {
16371704
"#import": [
16381705
"linux"

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

+14-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,14 @@
3838
<RuntimeGroup Include="centos">
3939
<Parent>rhel</Parent>
4040
<Architectures>x64</Architectures>
41-
<Versions>7;8</Versions>
41+
<Versions>7</Versions>
42+
<ApplyVersionsToParent>true</ApplyVersionsToParent>
43+
<TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
44+
</RuntimeGroup>
45+
<RuntimeGroup Include="centos">
46+
<Parent>rhel</Parent>
47+
<Architectures>x64;arm64</Architectures>
48+
<Versions>8;9</Versions>
4249
<ApplyVersionsToParent>true</ApplyVersionsToParent>
4350
<TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
4451
</RuntimeGroup>
@@ -53,7 +60,7 @@
5360
<RuntimeGroup Include="fedora">
5461
<Parent>linux</Parent>
5562
<Architectures>x64;arm64</Architectures>
56-
<Versions>23;24;25;26;27;28;29;30;31;32;33</Versions>
63+
<Versions>23;24;25;26;27;28;29;30;31;32;33;34</Versions>
5764
<TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
5865
</RuntimeGroup>
5966

@@ -140,6 +147,11 @@
140147
<Architectures>x64;arm64</Architectures>
141148
<Versions>8;8.0;8.1</Versions>
142149
</RuntimeGroup>
150+
<RuntimeGroup Include="rhel">
151+
<Parent>linux</Parent>
152+
<Architectures>x64;arm64</Architectures>
153+
<Versions>9</Versions>
154+
</RuntimeGroup>
143155

144156
<RuntimeGroup Include="sles">
145157
<Parent>linux</Parent>

0 commit comments

Comments
 (0)