Skip to content

Pass TargetRid and SourceBuildNonPortable to the native scripts #74504

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.

Sign up for GitHub

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

Merged
ViktorHofer merged 22 commits into from
Sep 28, 2022
Merged

Pass TargetRid and SourceBuildNonPortable to the native scripts #74504

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
45a8ea8
Pass SourceBuild TargetRid and SourceBuildPortable args through the n…
tmds Aug 26, 2022
9d2af1d
Rename -packagerid to -distrorid.
tmds Aug 31, 2022
a619594
Fix init-distro-rid.sh.
tmds Aug 31, 2022
599ef82
Use OutputRid instead of PackageRid.
tmds Aug 31, 2022
f39f890
Drop unnecessary Condition.
tmds Aug 31, 2022
3da8276
Try passing --distrorid as OutputRid.
tmds Aug 31, 2022
2fdda4a
NativeExport: use PackageRID for AppHostRuntimeIdentifier.
tmds Aug 31, 2022
d89911f
Rename --distrorid to --outputrid.
tmds Aug 31, 2022
165206c
Fix SourceBuild.props.
tmds Sep 1, 2022
3499ee1
Undo changes to init-distro-rid.sh.
tmds Sep 1, 2022
b1b93c2
Let source-build leg build 'banana-x64' rid.
tmds Sep 1, 2022
cd699f0
Merge branch 'main' into sb_portable
tmds Sep 1, 2022
8b7f3f9
SourceBuild.props: don't force a RuntimeOS.
tmds Sep 2, 2022
9244703
SourceBuild.props: set AdditionalRuntimeIdentifierParent.
tmds Sep 2, 2022
77958f9
Build banana.24-x64 instead.
tmds Sep 2, 2022
2b3a641
Fix SourceBuild.props.
tmds Sep 2, 2022
763dc66
SourceBuild.props: try fix AdditionalRuntimeIdentifier* usage.
tmds Sep 2, 2022
a9da4af
source-build.yml: add runtimeOS parameter.
tmds Sep 2, 2022
502c373
Merge branch 'main' into sb_portable
tmds Sep 19, 2022
0b228a7
SourceBuild.props: derive RuntimeOS from NETCoreSdkRuntimeIdentifier.
tmds Sep 27, 2022
5aa074a
Undo using NETCoreSdkRuntimeIdentifier.
tmds Sep 27, 2022
1965c29
Update eng/pipelines/common/global-build-job.yml
tmds Sep 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use OutputRid instead of PackageRid.
  • Loading branch information
@tmds
tmds committed Aug 31, 2022
commit 599ef824089c48f6748bd84099b2900fd42bbfc3
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@
</PropertyGroup>

<PropertyGroup>
<DotNetHostBinDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', '$(PackageRID).$(Configuration)', 'corehost'))</DotNetHostBinDir>
<DotNetHostBinDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', '$(OutputRid).$(Configuration)', 'corehost'))</DotNetHostBinDir>
</PropertyGroup>

<!--Feature switches -->
Expand Down
2 changes: 1 addition & 1 deletion src/native/corehost/corehost.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
<BuildArgs Condition="'$(Ninja)' == 'true'">$(BuildArgs) -ninja</BuildArgs>
<BuildArgs>$(BuildArgs) -runtimeflavor $(RuntimeFlavor)</BuildArgs>
<BuildArgs Condition="'$(OfficialBuildId)' != ''">$(BuildArgs) /p:OfficialBuildId="$(OfficialBuildId)"</BuildArgs>
<BuildArgs Condition="'$(PackageRid)' != ''">$(BuildArgs) -distrorid $(PackageRid)</BuildArgs>
<BuildArgs Condition="'$(OutputRid)' != ''">$(BuildArgs) -distrorid $(OutputRid)</BuildArgs>
</PropertyGroup>

<!--
Expand Down