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.

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

Add RID for Fedora 39 #82185

Merged
merged 1 commit into from
Mar 4, 2023
Merged

Add RID for Fedora 39 #82185

merged 1 commit into from
Mar 4, 2023

Conversation

omajid
Copy link
Member

@omajid omajid commented Feb 15, 2023

$ podman run -it registry.fedoraproject.org/fedora:rawhide bash -c 'cat /etc/os-release'
NAME="Fedora Linux"
VERSION="39 (Container Image Prerelease)"
ID=fedora
VERSION_ID=39
VERSION_CODENAME=""
PLATFORM_ID="platform:f39"
PRETTY_NAME="Fedora Linux 39 (Container Image Prerelease)"
ANSI_COLOR="0;38;2;60;110;180"
LOGO=fedora-logo-icon
CPE_NAME="cpe:/o:fedoraproject:fedora:39"
DEFAULT_HOSTNAME="fedora"
HOME_URL="https://fedoraproject.org/"
DOCUMENTATION_URL="https://docs.fedoraproject.org/en-US/fedora/rawhide/system-administrators-guide/"
SUPPORT_URL="https://ask.fedoraproject.org/"
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
SUPPORT_END=2024-05-14
VARIANT="Container Image"
VARIANT_ID=container

The changes to runtime.json and runtime.compatibility.json were generated by tooling.

@ghost ghost added the community-contribution Indicates that the PR has been added by a community member label Feb 15, 2023
@ghost
Copy link

ghost commented Feb 15, 2023

Tagging subscribers to this area: @dotnet/area-infrastructure-libraries
See info in area-owners.md if you want to be subscribed.

Issue Details

The changes to runtime.json and runtime.compatibility.json were generated by tooling.

Author: omajid
Assignees: -
Labels:

area-Infrastructure-libraries

Milestone: -

@omajid
Copy link
Member Author

omajid commented Feb 15, 2023

The readme.md says:

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.

That did not work for me. This is the command that finally worked for me: ./../../../.dotnet/dotnet msbuild /t:UpdateRuntimeJson /p:UpdateRuntimeFiles=true

@ViktorHofer
Copy link
Member

That did not work for me.

Did it produce an error and if yes, please share it - or did it just not update anything?

@carlossanlop
Copy link
Member

cc @rbhanda, who normally creates the dotnet/core issue first, then we add the RIDs (AFAIK): https://github.com/dotnet/core/issues/created_by/rbhanda

When should we merge this, @rbhanda / @wfurt?

@carlossanlop carlossanlop requested a review from wfurt February 15, 2023 19:01
@omajid
Copy link
Member Author

omajid commented Feb 15, 2023

Did it produce an error and if yes, please share it - or did it just not update anything?

It built projects without any errors. git diff showed no actual changes to the runtime.json files:

$ ../../../../.dotnet/dotnet pack                                                                                               
MSBuild version 17.4.0+18d5aef85 for .NET                                                                                                                     
  Determining projects to restore...                                                                                                                          
  All projects are up-to-date for restore.                                                                                                                    
  Microsoft.NETCore.Platforms -> /home/omajid/devel/dotnet/runtime/artifacts/bin/Microsoft.NETCore.Platforms/Debug/net472/Microsoft.NETCore.Platforms.BuildTasks.dll                                                                                                                                                        
  Microsoft.Interop.SourceGeneration -> /home/omajid/devel/dotnet/runtime/artifacts/bin/Microsoft.Interop.SourceGeneration/Debug/netstandard2.0/Microsoft.Interop.SourceGeneration.dll                                                                                                                                      
  LibraryImportGenerator -> /home/omajid/devel/dotnet/runtime/artifacts/bin/LibraryImportGenerator/Debug/netstandard2.0/Microsoft.Interop.LibraryImportGenerator.dll                                                                                                                                                        
  Microsoft.NETCore.Platforms -> /home/omajid/devel/dotnet/runtime/artifacts/bin/Microsoft.NETCore.Platforms/Debug/net7.0/Microsoft.NETCore.Platforms.BuildTasks.dll                                                                                                                                                        
$ git diff                                                                                                                      
diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props b/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props            
index 08327c9c112..d58aa631216 100644                                                                                                                         
--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props                                                                                       
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props                                                                                       
@@ -86,7 +86,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;36;37;38</Versions>                                                                                   
+      <Versions>23;24;25;26;27;28;29;30;31;32;33;34;35;36;37;38;39</Versions>                                                                                
       <TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>                                                                                           
     </RuntimeGroup>                             

@carlossanlop
Copy link
Member

@ViktorHofer seems to be the issue Tomas reported yesterday: #82125

@wfurt
Copy link
Member

wfurt commented Feb 15, 2023

This is essentially #82125
The logic seems busted @ViktorHofer but I did not have chance to investigate.

The changes to runtime.json and runtime.compatibility.json were
generated by tooling.
@omajid omajid force-pushed the add-rid-fedora.39 branch from 5dc7060 to 1be64bc Compare March 3, 2023 22:49
@omajid
Copy link
Member Author

omajid commented Mar 3, 2023

@wfurt can we merge this PR now?

Copy link
Member

@wfurt wfurt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@wfurt wfurt merged commit 141babc into dotnet:main Mar 4, 2023
@ghost ghost locked as resolved and limited conversation to collaborators Apr 3, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
area-Infrastructure-libraries community-contribution Indicates that the PR has been added by a community member
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants