corehost: align artifacts dir used by managed and native build. #74498
Conversation
ghost
added
the
community-contribution
|
Tagging subscribers to this area: @vitek-karas, @agocke, @VSadov Issue DetailsFixes build failure that occurs when OutputRid and __DistroRid are not the same. cc @omajid
|
| __DistroRidLower="$(echo $__DistroRid | tr '[:upper:]' '[:lower:]')" | ||
| __BinDir="$__RootBinDir/bin/$__DistroRidLower.$__BuildType" | ||
| __IntermediatesDir="$__RootBinDir/obj/$__DistroRidLower.$__BuildType" | ||
|
|
||
| export __BinDir __IntermediatesDir __RuntimeFlavor | ||
|
|
||
| __CMakeArgs="-DCLI_CMAKE_HOST_VER=\"$__host_ver\" -DCLI_CMAKE_COMMON_HOST_VER=\"$__apphost_ver\" -DCLI_CMAKE_HOST_FXR_VER=\"$__fxr_ver\" $__CMakeArgs" | ||
| __CMakeArgs="-DCLI_CMAKE_HOST_POLICY_VER=\"$__policy_ver\" -DCLI_CMAKE_PKG_RID=\"$__DistroRid\" -DCLI_CMAKE_COMMIT_HASH=\"$__commit_hash\" $__CMakeArgs" | ||
| __CMakeArgs="-DCLI_CMAKE_HOST_POLICY_VER=\"$__policy_ver\" -DCLI_CMAKE_PKG_RID=\"$__PackageRid\" -DCLI_CMAKE_COMMIT_HASH=\"$__commit_hash\" $__CMakeArgs" |
There was a problem hiding this comment.
While changing this file, I noticed this use of __DistroRid. From the name of the property, I assume we want to pass in the PackageRid.
| @@ -231,7 +231,7 @@ | |||
| </PropertyGroup> | |||
|
|
|||
| <PropertyGroup> | |||
| <DotNetHostBinDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', '$(OutputRid).$(Configuration)', 'corehost'))</DotNetHostBinDir> | |||
| <DotNetHostBinDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', '$(__DistroRid.ToLowerInvariant()).$(Configuration)', 'corehost'))</DotNetHostBinDir> | |||
There was a problem hiding this comment.
This now matches with the logic in the corehost/build.sh script.
Do you mean "Add support for .." or is it an existing scenario which was working before and broke by some other change? |
I'm not aware this was working before. I think we're the first to try set |
ghost
locked as resolved and limited conversation to collaborators
Fixes build failure that occurs when OutputRid and __DistroRid are not the same.
cc @omajid