Skip to content

Commit 74b6321

Browse files
authored
[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.3xx' (#51252)
2 parents 46e5748 + ea576af commit 74b6321

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

.vsts-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ extends:
217217
# Do not publish zips and tarballs. The linux-x64 binaries are already published by Official.
218218
publishArgument: $(_publishArgument) /p:PublishBinariesAndBadge=false
219219
officialBuildProperties: $(_officialBuildProperties)
220-
osProperties: $(linuxOsPortableProperties) /p:IsRPMBasedDistro=true
220+
osProperties: $(linuxOsPortableProperties) /p:BuildSdkRpm=true
221221
runTests: false
222222
- categoryName: Portable
223223
container: azureLinux30fpm
@@ -226,7 +226,7 @@ extends:
226226
# Do not publish zips and tarballs. The linux-arm64 binaries are already published by Official.
227227
publishArgument: $(_publishArgument) /p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true
228228
officialBuildProperties: $(_officialBuildProperties)
229-
osProperties: $(linuxOsPortableProperties) /p:IsRPMBasedDistro=true
229+
osProperties: $(linuxOsPortableProperties) /p:BuildSdkRpm=true
230230
runTests: false
231231
### MUSL ###
232232
- categoryName: Musl

src/Installer/redist-installer/targets/GenerateRPMs.targets

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

2121
<Target Name="BuildRpms"
2222
DependsOnTargets="GenerateSdkRpm"
23-
Condition=" '$(IsRPMBasedDistro)' == 'True' and '$(FPMPresent)' == 'True' " />
23+
Condition=" '$(BuildSdkRpm)' == 'True' and '$(FPMPresent)' == 'True' " />
2424

2525
<Target Name="GenerateSdkRpm"
2626
DependsOnTargets="SetupRpmProps">
@@ -303,10 +303,8 @@
303303
<FPMPresent Condition=" '$(FPMExitCode)' == '0' ">True</FPMPresent>
304304
</PropertyGroup>
305305

306-
<!-- Workaround for Jenkins machines that don't have the necessary packages https://github.com/dotnet/core-setup/issues/2260 -->
307-
<Message Condition=" '$(FPMPresent)' != 'True' "
308-
Text="FPM tool Not found, RPM packages will not be built."
309-
Importance="High" />
306+
<Error Condition=" '$(FPMPresent)' != 'True' "
307+
Text="FPM tool Not found, RPM packages will not be built." />
310308
</Target>
311309

312310
</Project>

src/Installer/redist-installer/targets/GetRuntimeInformation.targets

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
<IsDebianBaseDistro Condition=" $(HostRid.StartsWith('ubuntu')) OR $(HostRid.StartsWith('debian')) ">true</IsDebianBaseDistro>
2929
<IsRPMBasedDistro Condition=" $(HostRid.StartsWith('rhel')) AND '$(HostRid)' != 'rhel.6-x64' ">true</IsRPMBasedDistro>
3030
<IsRPMBasedDistro Condition=" $(HostRid.StartsWith('centos')) ">true</IsRPMBasedDistro>
31+
<IsRPMBasedDistro Condition=" $(HostRid.StartsWith('azurelinux')) ">true</IsRPMBasedDistro>
3132
<PublishNativeInstallers Condition=" '$(IslinuxPortable)' != 'true' AND '$(HostRid)' != 'rhel.6-x64' AND !$(Rid.StartsWith('linux-musl'))">true</PublishNativeInstallers>
3233
<PublishArchives Condition=" '$(IslinuxPortable)' == 'true' OR ('$(IsDebianBaseDistro)' != 'true' AND '$(IsRPMBasedDistro)' != 'true') ">true</PublishArchives>
3334
</PropertyGroup>

0 commit comments

Comments
 (0)