From 10c417394c4fb5993dc417b412e67fcd68802194 Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Wed, 8 Oct 2025 10:37:06 -0700
Subject: [PATCH 1/3] Fail the RPM build if FPM tool is not present

---
 src/Installer/redist-installer/targets/GenerateRPMs.targets | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/Installer/redist-installer/targets/GenerateRPMs.targets b/src/Installer/redist-installer/targets/GenerateRPMs.targets
index 12a7489d2172..a3eaf31f3fc3 100644
--- a/src/Installer/redist-installer/targets/GenerateRPMs.targets
+++ b/src/Installer/redist-installer/targets/GenerateRPMs.targets
@@ -301,10 +301,8 @@
       <FPMPresent Condition=" '$(FPMExitCode)' == '0' ">True</FPMPresent>
     </PropertyGroup>
 
-    <!-- Workaround for Jenkins machines that don't have the necessary packages https://github.com/dotnet/core-setup/issues/2260 -->
-    <Message Condition=" '$(FPMPresent)' != 'True' "
-             Text="FPM tool Not found, RPM packages will not be built."
-             Importance="High" />
+    <Error Condition=" '$(FPMPresent)' != 'True' "
+           Text="FPM tool Not found, RPM packages will not be built." />
   </Target>
 
   <!-- Removed the TestSdkRpm task as it would fail when the installed package exactly matched the upgrade package -->

From a50e178898556780ba7c1653ffad72494ef5e3d3 Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Mon, 13 Oct 2025 14:28:30 -0700
Subject: [PATCH 2/3] Use BuildSdkRpm property to condition RPM packaging

---
 .vsts-ci.yml                                                | 4 ++--
 src/Installer/redist-installer/targets/GenerateRPMs.targets | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index bcfe050a1225..def621bfebaa 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -213,7 +213,7 @@ extends:
               # Do not publish zips and tarballs. The linux-x64 binaries are already published by Official.
               publishArgument: $(_publishArgument) /p:PublishBinariesAndBadge=false
               officialBuildProperties: $(_officialBuildProperties)
-              osProperties: $(linuxOsPortableProperties) /p:IsRPMBasedDistro=true
+              osProperties: $(linuxOsPortableProperties) /p:BuildSdkRpm=true
               runTests: false
             - categoryName: Portable
               container: azureLinux30fpm
@@ -222,7 +222,7 @@ extends:
               # Do not publish zips and tarballs. The linux-arm64 binaries are already published by Official.
               publishArgument: $(_publishArgument) /p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true
               officialBuildProperties: $(_officialBuildProperties)
-              osProperties: $(linuxOsPortableProperties) /p:IsRPMBasedDistro=true
+              osProperties: $(linuxOsPortableProperties) /p:BuildSdkRpm=true
               runTests: false
             ### MUSL ###
             - categoryName: Musl
diff --git a/src/Installer/redist-installer/targets/GenerateRPMs.targets b/src/Installer/redist-installer/targets/GenerateRPMs.targets
index a3eaf31f3fc3..c3052108a2ce 100644
--- a/src/Installer/redist-installer/targets/GenerateRPMs.targets
+++ b/src/Installer/redist-installer/targets/GenerateRPMs.targets
@@ -13,12 +13,12 @@
 
   <Target Name="GenerateRpmsInner"
           DependsOnTargets="TestFPMTool;BuildRpms"
-          Condition=" '$(IsRPMBasedDistro)' == 'True' "
+          Condition=" '$(BuildSdkRpm)' == 'True' "
           Outputs="@(GeneratedInstallers)" />
 
   <Target Name="BuildRpms"
           DependsOnTargets="GenerateSdkRpm"
-          Condition=" '$(IsRPMBasedDistro)' == 'True' and '$(FPMPresent)' == 'True' " />
+          Condition=" '$(BuildSdkRpm)' == 'True' and '$(FPMPresent)' == 'True' " />
 
   <Target Name="GenerateSdkRpm"
           DependsOnTargets="SetupRpmProps">

From c14d32a040d0b4407426b87d90c71db0806a505e Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Tue, 14 Oct 2025 08:43:50 -0700
Subject: [PATCH 3/3] Add support for Azure Linux as host OS

---
 .../redist-installer/targets/GetRuntimeInformation.targets       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Installer/redist-installer/targets/GetRuntimeInformation.targets b/src/Installer/redist-installer/targets/GetRuntimeInformation.targets
index 8361ccd2854f..9a4726e282e4 100644
--- a/src/Installer/redist-installer/targets/GetRuntimeInformation.targets
+++ b/src/Installer/redist-installer/targets/GetRuntimeInformation.targets
@@ -28,6 +28,7 @@
       <IsDebianBaseDistro Condition=" $(HostRid.StartsWith('ubuntu')) OR $(HostRid.StartsWith('debian')) ">true</IsDebianBaseDistro>
       <IsRPMBasedDistro Condition=" $(HostRid.StartsWith('rhel')) AND '$(HostRid)' != 'rhel.6-x64' ">true</IsRPMBasedDistro>
       <IsRPMBasedDistro Condition=" $(HostRid.StartsWith('centos')) ">true</IsRPMBasedDistro>
+      <IsRPMBasedDistro Condition=" $(HostRid.StartsWith('azurelinux')) ">true</IsRPMBasedDistro>
       <PublishNativeInstallers Condition=" '$(IslinuxPortable)' != 'true' AND '$(HostRid)' != 'rhel.6-x64' AND !$(Rid.StartsWith('linux-musl'))">true</PublishNativeInstallers>
       <PublishArchives Condition=" '$(IslinuxPortable)' == 'true' OR ('$(IsDebianBaseDistro)' != 'true' AND '$(IsRPMBasedDistro)' != 'true') ">true</PublishArchives>
     </PropertyGroup>