Skip to content
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.

Sign up for GitHub

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

[release/5.0] Add Fedora 35 RID #48203

Merged
merged 4 commits into from
Mar 15, 2021
Merged

[release/5.0] Add Fedora 35 RID #48203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e806448
Add Fedora 35 RID
omajid Feb 12, 2021
41c2530
update the baseline version to 5.0.2
Anipik Feb 12, 2021
d807688
Merge branch 'release/5.0' into 5.0-add-fedora-rid
Anipik Mar 10, 2021
6f1a46b
Merge branch 'release/5.0' into 5.0-add-fedora-rid
Anipik Mar 14, 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 eng/packaging.props
View file
Open in desktop
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.1</PlatformPackageVersion>
<PlatformPackageVersion>5.0.2</PlatformPackageVersion>
<SkipValidatePackageTargetFramework>true</SkipValidatePackageTargetFramework>
<SkipGenerationCheck>true</SkipGenerationCheck>
</PropertyGroup>
Expand Down
1 change: 1 addition & 0 deletions src/libraries/libraries-packages.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<ProjectReference Include="$(PkgDir)*\*.proj" Exclude="$(PkgDir)test\*" Condition="'$(BuildAllOOBPackages)' == 'true'" />
<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 -->
<ProjectReference Include="$(PkgDir)\Microsoft.NETCore.Platforms\Microsoft.NETCore.Platforms.proj" />
<ProjectReference Condition="'$(BuildAllConfigurations)' == 'true'" Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Logging.EventSource\pkg\Microsoft.Extensions.Logging.EventSource.pkgproj" />
<ProjectReference Condition="'$(BuildAllConfigurations)' == 'true'" Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Primitives\pkg\Microsoft.Extensions.Primitives.pkgproj" />
<ProjectReference Condition="'$(BuildAllConfigurations)' == 'true'" Include="$(MSBuildThisFileDirectory)System.Reflection.MetadataLoadContext\pkg\System.Reflection.MetadataLoadContext.pkgproj" />
Expand Down
32 changes: 32 additions & 0 deletions src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2376,6 +2376,38 @@
"any",
"base"
],
"fedora.35": [
"fedora.35",
"fedora",
"linux",
"unix",
"any",
"base"
],
"fedora.35-arm64": [
"fedora.35-arm64",
"fedora.35",
"fedora-arm64",
"fedora",
"linux-arm64",
"linux",
"unix-arm64",
"unix",
"any",
"base"
],
"fedora.35-x64": [
"fedora.35-x64",
"fedora.35",
"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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -962,6 +962,23 @@
"fedora-x64"
]
},
"fedora.35": {
"#import": [
"fedora"
]
},
"fedora.35-arm64": {
"#import": [
"fedora.35",
"fedora-arm64"
]
},
"fedora.35-x64": {
"#import": [
"fedora.35",
"fedora-x64"
]
},
"freebsd": {
"#import": [
"unix"
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
View file
Open in desktop
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</Versions>
<Versions>23;24;25;26;27;28;29;30;31;32;33;34;35</Versions>
<TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
</RuntimeGroup>

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