Skip to content

Commit f985652

Browse files
Use BuildSdkRpm property to condition RPM packaging
1 parent 703a86b commit f985652

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

.vsts-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ extends:
288288
buildArchitecture: x64
289289
# Do not publish zips and tarballs. The linux-x64 binaries are
290290
# already published by Build_LinuxPortable_Release_x64
291-
additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:IsRPMBasedDistro=true'
291+
additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:BuildSdkRpm=true'
292292
linuxPortable: true
293293
runTests: false
294294
- template: eng/build.yml@self
@@ -301,7 +301,7 @@ extends:
301301
runtimeIdentifier: 'linux-arm64'
302302
# Do not publish zips and tarballs. The linux-x64 binaries are
303303
# already published by Build_LinuxPortable_Release_x64
304-
additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true /p:IsRPMBasedDistro=true'
304+
additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true /p:BuildSdkRpm=true'
305305
linuxPortable: true
306306
runTests: false
307307
- template: eng/build.yml@self

.vsts-pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ stages:
247247
buildArchitecture: x64
248248
# Do not publish zips and tarballs. The linux-x64 binaries are
249249
# already published by Build_LinuxPortable_Release_x64
250-
additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:IsRPMBasedDistro=true'
250+
additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:BuildSdkRpm=true'
251251
linuxPortable: true
252252
runTests: false
253253
- template: eng/build-pr.yml
@@ -260,7 +260,7 @@ stages:
260260
runtimeIdentifier: 'linux-arm64'
261261
# Do not publish zips and tarballs. The linux-x64 binaries are
262262
# already published by Build_LinuxPortable_Release_x64
263-
additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true /p:IsRPMBasedDistro=true'
263+
additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true /p:BuildSdkRpm=true'
264264
linuxPortable: true
265265
runTests: false
266266
- template: eng/build-pr.yml

src/redist/targets/GenerateRPMs.targets

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
build environment. https://github.com/dotnet/sdk/issues/41910 -->
1717
<Target Name="GenerateRpmsInner"
1818
DependsOnTargets="TestFPMTool;BuildRpms"
19-
Condition=" '$(IsRPMBasedDistro)' == 'True' "
19+
Condition=" '$(BuildSdkRpm)' == 'True' "
2020
Outputs="@(GeneratedInstallers)"/>
2121

2222
<Target Name="BuildRpms"
2323
DependsOnTargets="GenerateSdkRpm"
24-
Condition=" '$(IsRPMBasedDistro)' == 'True' and '$(FPMPresent)' == 'True' "/>
24+
Condition=" '$(BuildSdkRpm)' == 'True' and '$(FPMPresent)' == 'True' "/>
2525

2626
<Target Name="GenerateSdkRpm"
2727
DependsOnTargets="SetupRpmProps">
@@ -322,7 +322,7 @@
322322
</Target>
323323

324324
<Target Name="TestSdkRpm"
325-
Condition=" '$(CLIBUILD_SKIP_TESTS)' != 'true' and '$(IsRPMBasedDistro)' == 'True' and '$(FPMPresent)' == 'True' "
325+
Condition=" '$(CLIBUILD_SKIP_TESTS)' != 'true' and '$(BuildSdkRpm)' == 'True' and '$(FPMPresent)' == 'True' "
326326
Inputs="$(DownloadedNetCoreAppTargetingPackInstallerFile);
327327
$(DownloadedNetStandardTargetingPackInstallerFile);
328328
$(DownloadedNetCoreAppHostPackInstallerFile);

0 commit comments

Comments
 (0)