From 1306f4bd7e58f80dce88e4d4a795c4fd3e88915a Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Fri, 20 Aug 2021 11:06:44 -0400 Subject: [PATCH 1/2] Add Fedora 36 to the RID graph Fedora 36 is under development: $ podman run -it registry.fedoraproject.org/fedora:rawhide /bin/cat /etc/os-release NAME="Fedora Linux" VERSION="36 (Container Image Prerelease)" ID=fedora VERSION_ID=36 VERSION_CODENAME="" PLATFORM_ID="platform:f36" PRETTY_NAME="Fedora Linux 36 (Container Image Prerelease)" ANSI_COLOR="0;38;2;60;110;180" LOGO=fedora-logo-icon CPE_NAME="cpe:/o:fedoraproject:fedora:36" 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 I couldn't get the changes runtime.json to show up until I built with a custom target. I updated readme.md with that extra information too. --- .../Microsoft.NETCore.Platforms/readme.md | 2 +- .../src/runtime.compatibility.json | 32 +++++++++++++++++++ .../src/runtime.json | 17 ++++++++++ .../src/runtimeGroups.props | 2 +- 4 files changed, 51 insertions(+), 2 deletions(-) diff --git a/src/libraries/Microsoft.NETCore.Platforms/readme.md b/src/libraries/Microsoft.NETCore.Platforms/readme.md index a4b7b667bd2af5..5a87b3d6b20e19 100644 --- a/src/libraries/Microsoft.NETCore.Platforms/readme.md +++ b/src/libraries/Microsoft.NETCore.Platforms/readme.md @@ -100,7 +100,7 @@ For example: This will create a new RID for `myLinuxDistro` where `myLinuxDistro` should be the string used for the `ID=` value in the `/etc/os-release` file. -Whenever modifying the `runtimeGroups.props` you should rebuild the project with `/p:UpdateRuntimeFiles=true` so that your changes will be regenerated in the checked-in `runtime.json`. +Whenever modifying the `runtimeGroups.props` you should rebuild the project with `/t:UpdateRuntimeJson /p:UpdateRuntimeFiles=true` so that your changes will be regenerated in the checked-in `runtime.json`. RuntimeGroup items have the following format: - `Identity`: the base string for the RID, without version architecture, or qualifiers. diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json index 1617ecf4dab272..9966d06dc38ead 100644 --- a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json +++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json @@ -2883,6 +2883,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", diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json index 04e41069e0a6d5..d40191ceaae150 100644 --- a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json +++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json @@ -1106,6 +1106,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" diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props b/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props index 57b19a9a4cab12..58b93131016b21 100644 --- a/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props +++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props @@ -72,7 +72,7 @@ linux x64;arm64 - 23;24;25;26;27;28;29;30;31;32;33;34;35 + 23;24;25;26;27;28;29;30;31;32;33;34;35;36 false From 6c4a397b5a801960ea2d88a09983c0c7a24ac9c6 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 23 Aug 2021 15:27:45 +0200 Subject: [PATCH 2/2] Update src/libraries/Microsoft.NETCore.Platforms/readme.md --- src/libraries/Microsoft.NETCore.Platforms/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/Microsoft.NETCore.Platforms/readme.md b/src/libraries/Microsoft.NETCore.Platforms/readme.md index 5a87b3d6b20e19..64271bb8cb4bc9 100644 --- a/src/libraries/Microsoft.NETCore.Platforms/readme.md +++ b/src/libraries/Microsoft.NETCore.Platforms/readme.md @@ -100,7 +100,7 @@ For example: This will create a new RID for `myLinuxDistro` where `myLinuxDistro` should be the string used for the `ID=` value in the `/etc/os-release` file. -Whenever modifying the `runtimeGroups.props` you should rebuild the project with `/t:UpdateRuntimeJson /p:UpdateRuntimeFiles=true` so that your changes will be regenerated in the checked-in `runtime.json`. +Whenever modifying the `runtimeGroups.props` make sure to pack the project via the `dotnet pack` command and inspect if the generated package contains the desired changes. RuntimeGroup items have the following format: - `Identity`: the base string for the RID, without version architecture, or qualifiers.