From 932a5b9be5a7ad705f84a975737115d4f674a37c Mon Sep 17 00:00:00 2001
From: Kritika Agarwal <kritika.agarwal@enterprisedb.com>
Date: Tue, 7 Nov 2023 23:25:31 +0530
Subject: [PATCH] [DBP-413] Fix for BUG #18040- Reporting PostgreSQL minor
 version to Windows OS

---
 build.sh                | 1 +
 server/build.sh         | 1 +
 server/installer.xml.in | 8 ++++++++
 3 files changed, 10 insertions(+)

diff --git a/build.sh b/build.sh
index fcbc1a91e..1bcfc55a7 100755
--- a/build.sh
+++ b/build.sh
@@ -48,6 +48,7 @@ _init() {
 
     # Set the package versions string
     PG_PACKAGE_VERSION=$PG_MAJOR_VERSION.`echo $PG_MINOR_VERSION | sed -e 's/\./-/'`
+    PG_PACKAGE_MINOR_VERSION=`echo $PG_MINOR_VERSION | awk -F'.' '{print $1}'`
 
     # Setup CVS
     export CVS_RSH=ssh
diff --git a/server/build.sh b/server/build.sh
index 838ffcb6b..3d350b473 100755
--- a/server/build.sh
+++ b/server/build.sh
@@ -348,6 +348,7 @@ _prepare_server_xml() {
                 _replace PG_MAJOR_VERSION $PG_MAJOR_VERSION $filename || _die "Failed to set major version in $filename"
                 _replace PG_MINOR_VERSION $PG_MINOR_VERSION $filename || _die "Failed to set minor version in $filename"
                 _replace PG_PACKAGE_VERSION $PG_PACKAGE_VERSION $filename || _die "Failed to set package version in $filename"
+		_replace PG_PACKAGE_MINOR_VERSION $PG_PACKAGE_MINOR_VERSION $filename || _die "Failed to set package minor version in $filename"
                 _replace PG_STAGING_DIR $WD/server/staging $filename || _die "Failed to set staging directory in $filename"
                 _replace PG_CATALOG_VERSION $PG_CATALOG_VERSION $filename || _die "Failed to set catalog version number in $filename"
                 _replace PG_CONTROL_VERSION $PG_CONTROL_VERSION $filename || _die "Failed to set catalog version number in $filename"
diff --git a/server/installer.xml.in b/server/installer.xml.in
index 0d6470191..506ffb34f 100755
--- a/server/installer.xml.in
+++ b/server/installer.xml.in
@@ -905,6 +905,14 @@ EOF
     </preUninstallationActionList>
 
     <!-- Post-uninstall actions -->
+    <postUninstallerCreationActionList>
+        <registrySet>
+            <key>HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall\${project.windowsARPRegistryPrefix}</key>
+            <name>MinorVersion</name>
+            <value>PG_PACKAGE_MINOR_VERSION</value>
+        </registrySet>
+    </postUninstallerCreationActionList>
+
     <postUninstallationActionList>
         <actionGroup>
               <actionList>