Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.
/ corefx Public archive

[release/2.1] add Alpine 3.13 and Fedora 34 to RID graph #43024

Merged
merged 2 commits into from
Feb 10, 2021
Merged

[release/2.1] add Alpine 3.13 and Fedora 34 to RID graph #43024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4149d3e
add Alpine 3.13 and Fedora 34 to RID graph
wfurt Feb 5, 2021
2a84aa5
Merge branch 'release/2.1' into rid_21
Anipik Feb 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />

<PropertyGroup>
<PackageVersion>2.1.12</PackageVersion>
<PackageVersion>2.1.13</PackageVersion>
<SkipValidatePackage>true</SkipValidatePackage>
<!-- We don't need to harvest the stable packages to build this -->
<HarvestStablePackage>false</HarvestStablePackage>
Expand Down
180 changes: 180 additions & 0 deletions pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,132 @@
"any",
"base"
],
"alpine.3.13": [
"alpine.3.13",
"alpine.3.12",
"alpine.3.11",
"alpine.3.10",
"alpine.3.9",
"alpine.3.8",
"alpine.3.7",
"alpine.3.6",
"alpine",
"linux-musl",
"linux",
"unix",
"any",
"base"
],
"alpine.3.13-corert": [
"alpine.3.13-corert",
"alpine.3.13",
"alpine.3.12-corert",
"alpine.3.12",
"alpine.3.11-corert",
"alpine.3.11",
"alpine.3.10-corert",
"alpine.3.10",
"alpine.3.9-corert",
"alpine.3.9",
"alpine.3.8-corert",
"alpine.3.8",
"alpine.3.7-corert",
"alpine.3.7",
"alpine.3.6-corert",
"alpine.3.6",
"alpine-corert",
"alpine",
"linux-musl-corert",
"linux-musl",
"linux-corert",
"linux",
"unix-corert",
"unix",
"corert",
"any",
"base"
],
"alpine.3.13-x64": [
"alpine.3.13-x64",
"alpine.3.13",
"alpine.3.12-x64",
"alpine.3.12",
"alpine.3.11-x64",
"alpine.3.11",
"alpine.3.10-x64",
"alpine.3.10",
"alpine.3.9-x64",
"alpine.3.9",
"alpine.3.8-x64",
"alpine.3.8",
"alpine.3.7-x64",
"alpine.3.7",
"alpine.3.6-x64",
"alpine.3.6",
"alpine-x64",
"alpine",
"linux-musl-x64",
"linux-musl",
"linux-x64",
"linux",
"unix-x64",
"unix",
"any",
"base"
],
"alpine.3.13-x64-corert": [
"alpine.3.13-x64-corert",
"alpine.3.13-corert",
"alpine.3.13-x64",
"alpine.3.13",
"alpine.3.12-x64-corert",
"alpine.3.12-corert",
"alpine.3.12-x64",
"alpine.3.12",
"alpine.3.11-x64-corert",
"alpine.3.11-corert",
"alpine.3.11-x64",
"alpine.3.11",
"alpine.3.10-x64-corert",
"alpine.3.10-corert",
"alpine.3.10-x64",
"alpine.3.10",
"alpine.3.9-x64-corert",
"alpine.3.9-corert",
"alpine.3.9-x64",
"alpine.3.9",
"alpine.3.8-x64-corert",
"alpine.3.8-corert",
"alpine.3.8-x64",
"alpine.3.8",
"alpine.3.7-x64-corert",
"alpine.3.7-corert",
"alpine.3.7-x64",
"alpine.3.7",
"alpine.3.6-x64-corert",
"alpine.3.6-corert",
"alpine.3.6-x64",
"alpine.3.6",
"alpine-x64-corert",
"alpine-corert",
"alpine-x64",
"alpine",
"linux-musl-x64-corert",
"linux-musl-corert",
"linux-musl-x64",
"linux-musl",
"linux-x64-corert",
"linux-corert",
"linux-x64",
"linux",
"unix-x64-corert",
"unix-corert",
"unix-x64",
"unix",
"corert",
"any",
"base"
],
"alpine.3.6": [
"alpine.3.6",
"alpine",
Expand Down Expand Up @@ -2405,6 +2531,60 @@
"any",
"base"
],
"fedora.34": [
"fedora.34",
"fedora",
"linux",
"unix",
"any",
"base"
],
"fedora.34-corert": [
"fedora.34-corert",
"fedora.34",
"fedora-corert",
"fedora",
"linux-corert",
"linux",
"unix-corert",
"unix",
"corert",
"any",
"base"
],
"fedora.34-x64": [
"fedora.34-x64",
"fedora.34",
"fedora-x64",
"fedora",
"linux-x64",
"linux",
"unix-x64",
"unix",
"any",
"base"
],
"fedora.34-x64-corert": [
"fedora.34-x64-corert",
"fedora.34-corert",
"fedora.34-x64",
"fedora.34",
"fedora-x64-corert",
"fedora-corert",
"fedora-x64",
"fedora",
"linux-x64-corert",
"linux-corert",
"linux-x64",
"linux",
"unix-x64-corert",
"unix-corert",
"unix-x64",
"unix",
"corert",
"any",
"base"
],
"gentoo": [
"gentoo",
"linux",
Expand Down
50 changes: 50 additions & 0 deletions pkg/Microsoft.NETCore.Platforms/runtime.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,31 @@
"alpine.3.11-x64-corert"
]
},
"alpine.3.13": {
"#import": [
"alpine.3.12"
]
},
"alpine.3.13-corert": {
"#import": [
"alpine.3.13",
"alpine.3.12-corert"
]
},
"alpine.3.13-x64": {
"#import": [
"alpine.3.13",
"alpine.3.12-x64"
]
},
"alpine.3.13-x64-corert": {
"#import": [
"alpine.3.13-corert",
"alpine.3.13-x64",
"alpine.3.13",
"alpine.3.12-x64-corert"
]
},
"alpine.3.6": {
"#import": [
"alpine"
Expand Down Expand Up @@ -991,6 +1016,31 @@
"fedora-x64-corert"
]
},
"fedora.34": {
"#import": [
"fedora"
]
},
"fedora.34-corert": {
"#import": [
"fedora.34",
"fedora-corert"
]
},
"fedora.34-x64": {
"#import": [
"fedora.34",
"fedora-x64"
]
},
"fedora.34-x64-corert": {
"#import": [
"fedora.34-corert",
"fedora.34-x64",
"fedora.34",
"fedora-x64-corert"
]
},
"gentoo": {
"#import": [
"linux"
Expand Down
4 changes: 2 additions & 2 deletions pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<RuntimeGroup Include="alpine">
<Parent>linux-musl</Parent>
<Architectures>x64</Architectures>
<Versions>3.6;3.7;3.8;3.9;3.10;3.11;3.12</Versions>
<Versions>3.6;3.7;3.8;3.9;3.10;3.11;3.12;3.13</Versions>
</RuntimeGroup>

<RuntimeGroup Include="android">
Expand All @@ -44,7 +44,7 @@
<RuntimeGroup Include="fedora">
<Parent>linux</Parent>
<Architectures>x64</Architectures>
<Versions>23;24;25;26;27;28;29;30;31;32;33</Versions>
<Versions>23;24;25;26;27;28;29;30;31;32;33;34</Versions>
<TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
</RuntimeGroup>

Expand Down
3 changes: 3 additions & 0 deletions src/packages.builds
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
<AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
</Project>
<!-- add specific builds / pkgproj's here to include in servicing builds -->
<Project Include="$(MSBuildThisFileDirectory)..\pkg\Microsoft.NETCore.Platforms\Microsoft.NETCore.Platforms.builds">
<AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
</Project>
</ItemGroup>

<!-- Need the PackageIndexFile file property from baseline.props -->
Expand Down