diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props index 43ea8e32792d69..5a8e7a4b4f05d4 100644 --- a/eng/SourceBuild.props +++ b/eng/SourceBuild.props @@ -15,13 +15,6 @@ <_targetRidPlatformIndex>$(TargetRid.LastIndexOf('-')) $(TargetRid.Substring($(_targetRidPlatformIndex)).TrimStart('-')) - - $(TargetRid.Substring(0, $(_targetRidPlatformIndex))) - - - $(RuntimeOS) - minimal @@ -38,10 +31,13 @@ $(InnerBuildArgs) --nodereuse false $(InnerBuildArgs) --warnAsError false $(InnerBuildArgs) --outputrid $(TargetRid) + $(InnerBuildArgs) /p:RuntimeOS=$(RuntimeOS) + + $(InnerBuildArgs) /p:AdditionalRuntimeIdentifierParent=$(BaseOS) $(InnerBuildArgs) /p:OfficialBuildId=$(OfficialBuildId) $(InnerBuildArgs) /p:ContinuousIntegrationBuild=$(ContinuousIntegrationBuild) - $(InnerBuildArgs) /p:AdditionalRuntimeIdentifierParent=$(BaseOS) $(InnerBuildArgs) /p:PrimaryRuntimeFlavor=Mono /p:RuntimeFlavor=Mono diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index bd35f41e5b1c9c..e54e498626d161 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -147,7 +147,6 @@ jobs: buildScript: $(_sclEnableCommand) $(Build.SourcesDirectory)$(dir)build$(scriptExt) nonPortable: ${{ parameters.isNonPortableSourceBuild }} targetRID: ${{ parameters.targetRid }} - runtimeOS: linux name: ${{ parameters.platform }} - ${{ if in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator') }}: