diff options
author | Omair Majid <omajid@redhat.com> | 2021-04-19 21:38:01 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-19 21:38:01 +0300 |
commit | 5524f37b9e60144ba7df41da291470e2a9ac9976 (patch) | |
tree | 1c2c5182863a9719fe5017ab796b87534ccbf5db /Directory.Build.props | |
parent | af011f7a4c1c56537f3f11285d5a63e4d4e29bd7 (diff) |
Fix ./build.sh --portableBuild false
Non-portable builds are used by source-build and also use for
testing/debugging things, like trying out upcoming versions of OpenSSL.
Diffstat (limited to 'Directory.Build.props')
-rw-r--r-- | Directory.Build.props | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Directory.Build.props b/Directory.Build.props index 75e9882495d..22e1325b211 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -155,7 +155,9 @@ <!-- There are no Mac Catalyst, iOS or tvOS tools and it can be built on OSX only, so use that --> <_toolRuntimeRID Condition="'$(_runtimeOS)' == 'maccatalyst' or '$(_runtimeOS)' == 'ios' or '$(_runtimeOS)' == 'iOSSimulator' or '$(_runtimeOS)' == 'tvos' or '$(_runtimeOS)' == 'tvOSSimulator'">osx-x64</_toolRuntimeRID> - <MicrosoftNetCoreIlasmPackageRuntimeId>$(_toolRuntimeRID)</MicrosoftNetCoreIlasmPackageRuntimeId> + <!-- There are no non-portable builds for Ilasm/Ildasm --> + <MicrosoftNetCoreIlasmPackageRuntimeId Condition="'$(PortableBuild)' != 'true' and '$(_portableOS)' == 'linux'">linux-$(_hostArch)</MicrosoftNetCoreIlasmPackageRuntimeId> + <MicrosoftNetCoreIlasmPackageRuntimeId Condition="'$(MicrosoftNetCoreIlasmPackageRuntimeId)' == ''">$(_toolRuntimeRID)</MicrosoftNetCoreIlasmPackageRuntimeId> <_packageRID Condition="'$(PortableBuild)' == 'true'">$(_portableOS)-$(TargetArchitecture)</_packageRID> <PackageRID Condition="'$(PackageRID)' == ''">$(_packageRID)</PackageRID> |