Skip to content

[release/5.0] Add Fedora 36 RID #57703

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 14, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 eng/packaging.props
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<PackageVersion Condition="'$(PackageVersion)' == ''">$(ProductVersion)</PackageVersion>
<!-- major.minor.release version of the platforms package we're currently building
Pre-release will be appended during build -->
<PlatformPackageVersion>5.0.3</PlatformPackageVersion>
<PlatformPackageVersion>5.0.4</PlatformPackageVersion>
<SkipValidatePackageTargetFramework>true</SkipValidatePackageTargetFramework>
<SkipGenerationCheck>true</SkipGenerationCheck>
</PropertyGroup>
Expand Down
1 change: 1 addition & 0 deletions src/libraries/libraries-packages.proj
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<ProjectReference Include="$(MSBuildThisFileDirectory)*\pkg\**\*.pkgproj" Condition="('$(BuildAllConfigurations)' == 'true' or '$(DotNetBuildFromSource)' == 'true') And '$(BuildAllOOBPackages)' == 'true'" />
<!-- If setting BuildAllOOBPackages to false, add bellow the individual OOB packages you want to continue to build -->
<!-- This is merge marker 1 to help automerge -->
<ProjectReference Include="$(PkgDir)\Microsoft.NETCore.Platforms\Microsoft.NETCore.Platforms.proj" />
<!-- This is merge marker 2 to help automerge -->
<!-- This is merge marker 3 to help automerge -->
<!-- This is merge marker 4 to help automerge -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2583,6 +2583,38 @@
"any",
"base"
],
"fedora.36": [
"fedora.36",
"fedora",
"linux",
"unix",
"any",
"base"
],
"fedora.36-arm64": [
"fedora.36-arm64",
"fedora.36",
"fedora-arm64",
"fedora",
"linux-arm64",
"linux",
"unix-arm64",
"unix",
"any",
"base"
],
"fedora.36-x64": [
"fedora.36-x64",
"fedora.36",
"fedora-x64",
"fedora",
"linux-x64",
"linux",
"unix-x64",
"unix",
"any",
"base"
],
"freebsd": [
"freebsd",
"unix",
Expand Down
17 changes: 17 additions & 0 deletions src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
Original file line number Diff line number Diff line change
Expand Up @@ -1037,6 +1037,23 @@
"fedora-x64"
]
},
"fedora.36": {
"#import": [
"fedora"
]
},
"fedora.36-arm64": {
"#import": [
"fedora.36",
"fedora-arm64"
]
},
"fedora.36-x64": {
"#import": [
"fedora.36",
"fedora-x64"
]
},
"freebsd": {
"#import": [
"unix"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<RuntimeGroup Include="fedora">
<Parent>linux</Parent>
<Architectures>x64;arm64</Architectures>
<Versions>23;24;25;26;27;28;29;30;31;32;33;34;35</Versions>
<Versions>23;24;25;26;27;28;29;30;31;32;33;34;35;36</Versions>
<TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
</RuntimeGroup>

Expand Down
5 changes: 3 additions & 2 deletions src/libraries/pkg/baseline/packageIndex.json
Original file line number Diff line number Diff line change
Expand Up @@ -1110,9 +1110,10 @@
"5.0.0",
"5.0.1",
"5.0.2",
"5.0.3"
"5.0.3",
"5.0.4"
],
"BaselineVersion": "5.0.3",
"BaselineVersion": "5.0.4",
"InboxOn": {}
},
"Microsoft.NETCore.Targets": {
Expand Down