Skip to content

Commit fb642e9

Browse files
authored
Fix PortableBuild comparisons (#15306)
1 parent 110749f commit fb642e9

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

eng/common/core-templates/steps/source-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ steps:
7878
7979
portableBuildArgs=
8080
if [ '${{ parameters.platform.portableBuild }}' != '' ]; then
81-
portableBuildArgs='/p:PortabelBuild=${{ parameters.platform.portableBuild }}'
81+
portableBuildArgs='/p:PortableBuild=${{ parameters.platform.portableBuild }}'
8282
fi
8383
8484
${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \

src/Microsoft.DotNet.Build.Tasks.Installers/build/installer.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
<InstallerRuntimeIdentifiers Condition="'$(InstallerRuntimeIdentifiers)' == ''">$(RuntimeIdentifiers)</InstallerRuntimeIdentifiers>
123123
<InstallerRuntimeIdentifier Condition="'$(InstallerRuntimeIdentifier)' == ''">$(RuntimeIdentifier)</InstallerRuntimeIdentifier>
124124
<!-- When building a non-portable build, BaseOS specifies a known (portable) RID that is a parent of the curent runtime identifier. -->
125-
<InstallerRuntimeIdentifier Condition="'$(PortableBuild)' != 'true' and '$(BaseOS)' != '$(RuntimeIdentifier)'">$(BaseOS)</InstallerRuntimeIdentifier>
125+
<InstallerRuntimeIdentifier Condition="'$(PortableBuild)' == 'false' and '$(BaseOS)' != '$(RuntimeIdentifier)'">$(BaseOS)</InstallerRuntimeIdentifier>
126126
</PropertyGroup>
127127

128128
<Import Project="$(MSBuildThisFileDirectory)installer.singlerid.targets"

0 commit comments

Comments
 (0)