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

Fix multiple version strings in coreclr shared libraries #41711

Merged
merged 1 commit into from
Sep 2, 2020

Conversation

janvorli
Copy link
Member

@janvorli janvorli commented Sep 1, 2020

We were incorrectly adding the version.c source to all coreclr
libraries and not just the shared ones. That caused multiple
occurences of the version string in coreclr shared libraries
composed of sublibraries.
This change fixes it by adding that source file for shared
libraries only.
I've also discovered that libcoreclrtraceptprovider.so was
missing the version string completely, so I've added it there.

Close #39456

We were incorrectly adding the version.c source to all coreclr
libraries and not just the shared ones. That caused multiple
occurences of the version string in coreclr shared libraries
composed of sublibraries.
This change fixes it by adding that source file for shared
libraries only.
I've also discovered that libcoreclrtraceptprovider.so was
missing the version string completely, so I've added it there.
@janvorli janvorli added this to the 5.0.0 milestone Sep 1, 2020
@janvorli janvorli requested a review from jkotas September 1, 2020 22:04
@janvorli janvorli self-assigned this Sep 1, 2020
Copy link
Member

@jkotas jkotas left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks!

@am11
Copy link
Member

am11 commented Sep 2, 2020

@janvorli, a question related to version string; currently we get version line like @(#)Version 42.42.42.42424 @Commit: e7b332a50fccbd13d7f0041a7d9a6a0597c657bd from:

$ strings ./artifacts/bin/coreclr/OSX.x64.Release/libcoreclr.dylib | grep "@Commit"
$ strings ./.dotnet/dotnet | grep "@Commit"
# etc.

what is 42.42.42.42424? Can it be something more useful like 5.0.0-dev which corresponds to the version of toolset we built the product against?

@janvorli
Copy link
Member Author

janvorli commented Sep 2, 2020

what is 42.42.42.42424?

That is for local builds. Official builds have the proper version number.

@am11
Copy link
Member

am11 commented Sep 2, 2020

Ah right, the RC1 I have installed has @(#)Version 5.0.20.42518 @Commit: 55ab8ce696ea3d2458543176c79c332fecf0af6c.

@janvorli janvorli merged commit a664bbc into dotnet:master Sep 2, 2020
@janvorli
Copy link
Member Author

janvorli commented Sep 2, 2020

/backport to release/5.0-rc2

@github-actions
Copy link
Contributor

github-actions bot commented Sep 2, 2020

Started backporting to release/5.0-rc2: https://github.com/dotnet/runtime/actions/runs/236120279

@ghost ghost locked as resolved and limited conversation to collaborators Dec 7, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

@Commit appears multiple times in strings libcoreclr.so output
3 participants