Only reference FreeBSD RIDs when targetting FreeBSD #98948
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,7 +12,9 @@ | |
| <ArchiveName>dotnet-crossgen2</ArchiveName> | ||
| <SharedFrameworkHostFileNameOverride>crossgen2</SharedFrameworkHostFileNameOverride> | ||
| <!-- Build this pack for any RID if building from source. Otherwise, only build select RIDs. --> | ||
| <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 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. |
||
| <GenerateInstallers>false</GenerateInstallers> | ||
| <HostJsonTargetPath>tools/</HostJsonTargetPath> | ||
| <PermitDllAndExeFilesLackingFileVersion>true</PermitDllAndExeFilesLackingFileVersion> | ||
|
|
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is
andgoing to break source build for FreeBSD?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
or wouldn't fix the build as this affects non-source build. This should probably just be
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
no this should be fine: