Skip to content

Commit 1a6cadf

Browse files
wfurtayakael
andauthored
[release/6.0] add RID for Alpine 3.15 (#64304)
* add RID for Alpine 3.15 (#62938) * add packaging Co-authored-by: Antoine Martin <[email protected]>
1 parent 3535b89 commit 1a6cadf

File tree

4 files changed

+140
-2
lines changed

4 files changed

+140
-2
lines changed

src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919

2020
<!-- When building from source, ensure the RID we're building for is part of the RID graph -->
2121
<AdditionalRuntimeIdentifiers Condition="'$(DotNetBuildFromSource)' == 'true'">$(AdditionalRuntimeIdentifiers);$(OutputRID)</AdditionalRuntimeIdentifiers>
22-
<ServicingVersion>1</ServicingVersion>
22+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
23+
<ServicingVersion>2</ServicingVersion>
2324
</PropertyGroup>
2425

2526
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">

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

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -508,6 +508,120 @@
508508
"any",
509509
"base"
510510
],
511+
"alpine.3.15": [
512+
"alpine.3.15",
513+
"alpine.3.14",
514+
"alpine.3.13",
515+
"alpine.3.12",
516+
"alpine.3.11",
517+
"alpine.3.10",
518+
"alpine.3.9",
519+
"alpine.3.8",
520+
"alpine.3.7",
521+
"alpine.3.6",
522+
"alpine",
523+
"linux-musl",
524+
"linux",
525+
"unix",
526+
"any",
527+
"base"
528+
],
529+
"alpine.3.15-arm": [
530+
"alpine.3.15-arm",
531+
"alpine.3.15",
532+
"alpine.3.14-arm",
533+
"alpine.3.14",
534+
"alpine.3.13-arm",
535+
"alpine.3.13",
536+
"alpine.3.12-arm",
537+
"alpine.3.12",
538+
"alpine.3.11-arm",
539+
"alpine.3.11",
540+
"alpine.3.10-arm",
541+
"alpine.3.10",
542+
"alpine.3.9-arm",
543+
"alpine.3.9",
544+
"alpine.3.8-arm",
545+
"alpine.3.8",
546+
"alpine.3.7-arm",
547+
"alpine.3.7",
548+
"alpine.3.6-arm",
549+
"alpine.3.6",
550+
"alpine-arm",
551+
"alpine",
552+
"linux-musl-arm",
553+
"linux-musl",
554+
"linux-arm",
555+
"linux",
556+
"unix-arm",
557+
"unix",
558+
"any",
559+
"base"
560+
],
561+
"alpine.3.15-arm64": [
562+
"alpine.3.15-arm64",
563+
"alpine.3.15",
564+
"alpine.3.14-arm64",
565+
"alpine.3.14",
566+
"alpine.3.13-arm64",
567+
"alpine.3.13",
568+
"alpine.3.12-arm64",
569+
"alpine.3.12",
570+
"alpine.3.11-arm64",
571+
"alpine.3.11",
572+
"alpine.3.10-arm64",
573+
"alpine.3.10",
574+
"alpine.3.9-arm64",
575+
"alpine.3.9",
576+
"alpine.3.8-arm64",
577+
"alpine.3.8",
578+
"alpine.3.7-arm64",
579+
"alpine.3.7",
580+
"alpine.3.6-arm64",
581+
"alpine.3.6",
582+
"alpine-arm64",
583+
"alpine",
584+
"linux-musl-arm64",
585+
"linux-musl",
586+
"linux-arm64",
587+
"linux",
588+
"unix-arm64",
589+
"unix",
590+
"any",
591+
"base"
592+
],
593+
"alpine.3.15-x64": [
594+
"alpine.3.15-x64",
595+
"alpine.3.15",
596+
"alpine.3.14-x64",
597+
"alpine.3.14",
598+
"alpine.3.13-x64",
599+
"alpine.3.13",
600+
"alpine.3.12-x64",
601+
"alpine.3.12",
602+
"alpine.3.11-x64",
603+
"alpine.3.11",
604+
"alpine.3.10-x64",
605+
"alpine.3.10",
606+
"alpine.3.9-x64",
607+
"alpine.3.9",
608+
"alpine.3.8-x64",
609+
"alpine.3.8",
610+
"alpine.3.7-x64",
611+
"alpine.3.7",
612+
"alpine.3.6-x64",
613+
"alpine.3.6",
614+
"alpine-x64",
615+
"alpine",
616+
"linux-musl-x64",
617+
"linux-musl",
618+
"linux-x64",
619+
"linux",
620+
"unix-x64",
621+
"unix",
622+
"any",
623+
"base"
624+
],
511625
"alpine.3.6": [
512626
"alpine.3.6",
513627
"alpine",

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,29 @@
138138
"alpine.3.13-x64"
139139
]
140140
},
141+
"alpine.3.15": {
142+
"#import": [
143+
"alpine.3.14"
144+
]
145+
},
146+
"alpine.3.15-arm": {
147+
"#import": [
148+
"alpine.3.15",
149+
"alpine.3.14-arm"
150+
]
151+
},
152+
"alpine.3.15-arm64": {
153+
"#import": [
154+
"alpine.3.15",
155+
"alpine.3.14-arm64"
156+
]
157+
},
158+
"alpine.3.15-x64": {
159+
"#import": [
160+
"alpine.3.15",
161+
"alpine.3.14-x64"
162+
]
163+
},
141164
"alpine.3.6": {
142165
"#import": [
143166
"alpine"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<RuntimeGroup Include="alpine">
1717
<Parent>linux-musl</Parent>
1818
<Architectures>x64;arm;arm64</Architectures>
19-
<Versions>3.6;3.7;3.8;3.9;3.10;3.11;3.12;3.13;3.14</Versions>
19+
<Versions>3.6;3.7;3.8;3.9;3.10;3.11;3.12;3.13;3.14;3.15</Versions>
2020
</RuntimeGroup>
2121

2222
<RuntimeGroup Include="android">

0 commit comments

Comments
 (0)