From e806448fdf844ca925c461b356b31363e844e902 Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Thu, 11 Feb 2021 20:13:18 -0500 Subject: [PATCH 1/2] Add Fedora 35 RID Fedora rawhide now uses the fedora.35-x64 RID: $ podman run -it registry.fedoraproject.org/fedora:rawhide /bin/bash -c 'cat /etc/os-release' NAME=Fedora VERSION="35 (Container Image Prerelease)" ID=fedora VERSION_ID=35 VERSION_CODENAME="" PLATFORM_ID="platform:f35" PRETTY_NAME="Fedora 35 (Container Image Prerelease)" ANSI_COLOR="0;38;2;60;110;180" LOGO=fedora-logo-icon CPE_NAME="cpe:/o:fedoraproject:fedora:35" HOME_URL="https://fedoraproject.org/" DOCUMENTATION_URL="https://docs.fedoraproject.org/en-US/fedora/rawhide/system-administrators-guide/" SUPPORT_URL="https://fedoraproject.org/wiki/Communicating_and_getting_help" BUG_REPORT_URL="https://bugzilla.redhat.com/" REDHAT_BUGZILLA_PRODUCT="Fedora" REDHAT_BUGZILLA_PRODUCT_VERSION=rawhide REDHAT_SUPPORT_PRODUCT="Fedora" REDHAT_SUPPORT_PRODUCT_VERSION=rawhide PRIVACY_POLICY_URL="https://fedoraproject.org/wiki/Legal:PrivacyPolicy" VARIANT="Container Image" VARIANT_ID=container --- eng/packaging.props | 2 +- src/libraries/libraries-packages.proj | 1 + .../runtime.compatibility.json | 32 ++++++++++++++++++ .../Microsoft.NETCore.Platforms/runtime.json | 17 ++++++++++ .../runtimeGroups.props | 2 +- src/libraries/pkg/baseline/packageIndex.json | 33 ++++++++++--------- 6 files changed, 69 insertions(+), 18 deletions(-) diff --git a/eng/packaging.props b/eng/packaging.props index 21dfeffc871a3..2dd4d1d71e1cc 100644 --- a/eng/packaging.props +++ b/eng/packaging.props @@ -23,7 +23,7 @@ $(ProductVersion) - 5.0.1 + 5.0.2 true true diff --git a/src/libraries/libraries-packages.proj b/src/libraries/libraries-packages.proj index a319914f171a1..c17e1bde0f484 100644 --- a/src/libraries/libraries-packages.proj +++ b/src/libraries/libraries-packages.proj @@ -20,6 +20,7 @@ + diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json index 275929bf1fce0..f56d7461e90c9 100644 --- a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json +++ b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json @@ -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", diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json index 5a2631cccd9a2..3e8b2e74e85f0 100644 --- a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json +++ b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json @@ -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" diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props index 5bd4306409de1..e78268c077fd8 100644 --- a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props +++ b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props @@ -60,7 +60,7 @@ linux x64;arm64 - 23;24;25;26;27;28;29;30;31;32;33;34 + 23;24;25;26;27;28;29;30;31;32;33;34;35 false diff --git a/src/libraries/pkg/baseline/packageIndex.json b/src/libraries/pkg/baseline/packageIndex.json index 066a9f6d6d34b..125526181b844 100644 --- a/src/libraries/pkg/baseline/packageIndex.json +++ b/src/libraries/pkg/baseline/packageIndex.json @@ -1100,7 +1100,8 @@ "2.2.2", "3.0.0", "5.0.0", - "5.0.1" + "5.0.1", + "5.0.2" ], "BaselineVersion": "5.0.1", "InboxOn": {} @@ -1502,18 +1503,6 @@ "net45": "4.0.0.0" } }, - "runtime.native.System.Data.SqlClient.sni": { - "StableVersions": [ - "4.0.0", - "4.3.0", - "4.4.0", - "4.5.0", - "4.6.0", - "4.7.0" - ], - "BaselineVersion": "5.0.0", - "InboxOn": {} - }, "runtime.linux-arm.runtime.native.System.IO.Ports": { "StableVersions": [ "4.7.0", @@ -1535,11 +1524,16 @@ ], "InboxOn": {} }, - "runtime.osx-x64.runtime.native.System.IO.Ports": { + "runtime.native.System.Data.SqlClient.sni": { "StableVersions": [ - "4.7.0", - "5.0.0" + "4.0.0", + "4.3.0", + "4.4.0", + "4.5.0", + "4.6.0", + "4.7.0" ], + "BaselineVersion": "5.0.0", "InboxOn": {} }, "runtime.native.System.IO.Ports": { @@ -1551,6 +1545,13 @@ "BaselineVersion": "5.0.1", "InboxOn": {} }, + "runtime.osx-x64.runtime.native.System.IO.Ports": { + "StableVersions": [ + "4.7.0", + "5.0.0" + ], + "InboxOn": {} + }, "SMDiagnostics": { "InboxOn": { "monoandroid10": "Any" From 41c2530d7eb925059956882cb25a6895a308fcea Mon Sep 17 00:00:00 2001 From: Anirudh Agnihotry Date: Fri, 12 Feb 2021 12:03:18 -0800 Subject: [PATCH 2/2] update the baseline version to 5.0.2 --- src/libraries/pkg/baseline/packageIndex.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libraries/pkg/baseline/packageIndex.json b/src/libraries/pkg/baseline/packageIndex.json index 125526181b844..3c392b69c27a4 100644 --- a/src/libraries/pkg/baseline/packageIndex.json +++ b/src/libraries/pkg/baseline/packageIndex.json @@ -1103,7 +1103,7 @@ "5.0.1", "5.0.2" ], - "BaselineVersion": "5.0.1", + "BaselineVersion": "5.0.2", "InboxOn": {} }, "Microsoft.NETCore.Targets": { @@ -7514,4 +7514,4 @@ "System.Xml.XDocument" ] } -} \ No newline at end of file +}