Only reference FreeBSD RIDs when targetting FreeBSD #98948
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Since they're not built as part of the official build and aren't on the nuget feeds we won't find the runtime and apphost packs so only include them when targetting FreeBSD. Fixes dotnet/installer#18768
ghost
assigned 
mthalman
approved these changes
Feb 26, 2024
ViktorHofer
approved these changes
Feb 26, 2024
jkotas
reviewed
Feb 26, 2024
| <RuntimeIdentifiers Condition="'$(DotNetBuildSourceOnly)' != 'true'">linux-x64;linux-musl-x64;linux-arm;linux-musl-arm;linux-arm64;linux-musl-arm64;freebsd-x64;freebsd-arm64;osx-x64;osx-arm64;win-x64;win-x86;win-arm64</RuntimeIdentifiers> | ||
| <RuntimeIdentifiers Condition="'$(DotNetBuildSourceOnly)' != 'true'">linux-x64;linux-musl-x64;linux-arm;linux-musl-arm;linux-arm64;linux-musl-arm64;osx-x64;osx-arm64;win-x64;win-x86;win-arm64</RuntimeIdentifiers> | ||
| <!-- FreeBSD runtime/apphost packs aren't built in the official build so only reference the RIDs when targetting FreeBSD --> | ||
| <RuntimeIdentifiers Condition="'$(DotNetBuildSourceOnly)' != 'true' and '$(TargetOS)' == 'freebsd'">$(RuntimeIdentifiers);freebsd-x64;freebsd-arm64</RuntimeIdentifiers> |
There was a problem hiding this comment.
Suggested change
| <RuntimeIdentifiers Condition="'$(DotNetBuildSourceOnly)' != 'true' and '$(TargetOS)' == 'freebsd'">$(RuntimeIdentifiers);freebsd-x64;freebsd-arm64</RuntimeIdentifiers> | |
| <RuntimeIdentifiers Condition="'$(DotNetBuildSourceOnly)' != 'true' or '$(TargetOS)' == 'freebsd'">$(RuntimeIdentifiers);freebsd-x64;freebsd-arm64</RuntimeIdentifiers> |
Is and going to break source build for FreeBSD?
There was a problem hiding this comment.
or wouldn't fix the build as this affects non-source build. This should probably just be
Suggested change
| <RuntimeIdentifiers Condition="'$(DotNetBuildSourceOnly)' != 'true' and '$(TargetOS)' == 'freebsd'">$(RuntimeIdentifiers);freebsd-x64;freebsd-arm64</RuntimeIdentifiers> | |
| <RuntimeIdentifiers Condition="'$(TargetOS)' == 'freebsd'">$(RuntimeIdentifiers);freebsd-x64;freebsd-arm64</RuntimeIdentifiers> |
There was a problem hiding this comment.
no this should be fine:
- source-build case: DotNetBuildSourceOnly == true so this condition doesn't apply now and didn't before
- non-source-build case: DotNetBuildSourceOnly == false and now we only add the freebsd RIDs when we're targetting freebsd
jkotas
reviewed
Feb 26, 2024
| <RuntimeIdentifiers Condition="'$(DotNetBuildSourceOnly)' != 'true'">linux-x64;linux-musl-x64;linux-arm;linux-musl-arm;linux-arm64;linux-musl-arm64;freebsd-x64;freebsd-arm64;osx-x64;osx-arm64;win-x64;win-x86;win-arm64</RuntimeIdentifiers> | ||
| <RuntimeIdentifiers Condition="'$(DotNetBuildSourceOnly)' != 'true'">linux-x64;linux-musl-x64;linux-arm;linux-musl-arm;linux-arm64;linux-musl-arm64;osx-x64;osx-arm64;win-x64;win-x86;win-arm64</RuntimeIdentifiers> | ||
| <!-- FreeBSD runtime/apphost packs aren't built in the official build so only reference the RIDs when targetting FreeBSD --> | ||
| <RuntimeIdentifiers Condition="'$(DotNetBuildSourceOnly)' != 'true' and '$(TargetOS)' == 'freebsd'">$(RuntimeIdentifiers);freebsd-x64;freebsd-arm64</RuntimeIdentifiers> |
There was a problem hiding this comment.
Do we need the RuntimeIdentifiers property at all? What happens if this line is deleted?
These lists of OS/architectures combos are pain to maintain. It would be best to get rid of them where possible.
There was a problem hiding this comment.
I think this line defines which crossgen2 packs are getting generated. cc @jkoritzinsky
There was a problem hiding this comment.
I'll need to check, but I'm pretty sure we can remove this (as we produce shared framework package per rid-specific build anyway).
There was a problem hiding this comment.
OK, I'll merge this to fix codeflow but I'll open a follow-up PR to try removing the line.
This was referenced Feb 26, 2024
akoeplinger
added a commit
to akoeplinger/runtime
that referenced
this pull request
Feb 26, 2024
It shouldn't be needed according to dotnet#98948 (comment)
akoeplinger
added a commit
to akoeplinger/runtime
that referenced
this pull request
Mar 1, 2024
It shouldn't be needed according to dotnet#98948 (comment)
akoeplinger
added a commit
to akoeplinger/runtime
that referenced
this pull request
Mar 4, 2024
It shouldn't be needed according to dotnet#98948 (comment)
akoeplinger
added a commit
that referenced
this pull request
Mar 4, 2024
#98956) It shouldn't be needed according to #98948 (comment)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Since they're not built as part of the official build and aren't on the nuget feeds we won't find the runtime and apphost packs so only include them when targetting FreeBSD.
Fixes dotnet/installer#18768