diff options
| author | Tom Deseyn <tom.deseyn@gmail.com> | 2022-09-28 12:48:11 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-28 12:48:11 +0300 |
| commit | 58c3d52399bdddf0a7a7d6527f4df474141aef7d (patch) | |
| tree | ccf56fdd557dee25e7e6745137be461618405259 /src/libraries | |
| parent | 68593dd718390853b4c74dc1d79906390aaf1589 (diff) | |
Pass TargetRid and SourceBuildNonPortable to the native scripts (#74504)
* Pass SourceBuild TargetRid and SourceBuildPortable args through the native script.
* Rename -packagerid to -distrorid.
* Fix init-distro-rid.sh.
* Use OutputRid instead of PackageRid.
* Drop unnecessary Condition.
* Try passing --distrorid as OutputRid.
* NativeExport: use PackageRID for AppHostRuntimeIdentifier.
* Rename --distrorid to --outputrid.
* Fix SourceBuild.props.
* Undo changes to init-distro-rid.sh.
* Let source-build leg build 'banana-x64' rid.
* SourceBuild.props: don't force a RuntimeOS.
* SourceBuild.props: set AdditionalRuntimeIdentifierParent.
* Build banana.24-x64 instead.
* Fix SourceBuild.props.
* SourceBuild.props: try fix AdditionalRuntimeIdentifier* usage.
* source-build.yml: add runtimeOS parameter.
* SourceBuild.props: derive RuntimeOS from NETCoreSdkRuntimeIdentifier.
* Undo using NETCoreSdkRuntimeIdentifier.
* Update eng/pipelines/common/global-build-job.yml
Co-authored-by: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Co-authored-by: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Diffstat (limited to 'src/libraries')
| -rw-r--r-- | src/libraries/System.Runtime.InteropServices/tests/TestAssets/NativeExports/NativeExports.csproj | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libraries/System.Runtime.InteropServices/tests/TestAssets/NativeExports/NativeExports.csproj b/src/libraries/System.Runtime.InteropServices/tests/TestAssets/NativeExports/NativeExports.csproj index ef29b282725..fcf18ce41ef 100644 --- a/src/libraries/System.Runtime.InteropServices/tests/TestAssets/NativeExports/NativeExports.csproj +++ b/src/libraries/System.Runtime.InteropServices/tests/TestAssets/NativeExports/NativeExports.csproj @@ -9,7 +9,7 @@ <DnneGenRollForward>Major</DnneGenRollForward> <!-- To integrate with DNNE's architecture calculation, we need to set the RID for this project. --> <RuntimeIdentifier>$(OutputRid)</RuntimeIdentifier> - <AppHostRuntimeIdentifier>$(OutputRid)</AppHostRuntimeIdentifier> + <AppHostRuntimeIdentifier>$(PackageRID)</AppHostRuntimeIdentifier> <_TargetsAppleOS Condition="'$(TargetOS)' == 'OSX' or '$(TargetOS)' == 'MacCatalyst' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'iOSSimulator' or '$(TargetOS)' == 'tvOSSimulator'">true</_TargetsAppleOS> |