[release/6.0] Uninstalling Hosting Bundle should uninstall chained runtimes (#41057)

Author: wtgodbe

src/Installers/Windows/WindowsHostingBundle/DotNetCore.wxs

@@ -1,6 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
     <Fragment>
+        <util:ProductSearch Id="DotNetRedistLtsProductSearch_x86"
+                            Condition="NOT VersionNT64"
+                            ProductCode="$(var.DotNetRedistLtsInstallerProductCodex86)"
+                            Result="version"
+                            Variable="DotNetRedistLtsProductVersion_x86" />
+
+        <util:ProductSearch Id="DotNetRedistLtsProductSearch_x64"
+                            Condition="VersionNT64"
+                            ProductCode="$(var.DotNetRedistLtsInstallerProductCodex64)"
+                            Result="version"
+                            Variable="DotNetRedistLtsProductVersion_x64" />
+
         <PackageGroup Id="PG_DOTNET_REDIST_LTS_BUNDLE">
             <RollbackBoundary Id="RB_DOTNET_REDIST_LTS_BUNDLE" />
 
@@ -12,7 +24,7 @@
                         InstallCondition="VersionNT64 AND (NOT OPT_NO_RUNTIME OR OPT_NO_RUNTIME=&quot;0&quot;)"
                         InstallCommand="/quiet /norestart"
                         RepairCommand="/quiet /repair"
-                        Permanent="yes"
+                        UninstallCommand="/quiet /uninstall"
                         DetectCondition="DotNetRedistLtsProductVersion_x64 = v$(var.DotNetRedistLtsInstallerProductVersionx64)">
             </ExePackage>
 
@@ -24,23 +36,9 @@
                         InstallCondition="(NOT OPT_NO_RUNTIME OR OPT_NO_RUNTIME=&quot;0&quot;) AND (NOT OPT_NO_X86 OR OPT_NO_X86=&quot;0&quot;)"
                         InstallCommand="/quiet /norestart"
                         RepairCommand="/quiet /repair"
-                        Permanent="yes"
+                        UninstallCommand="/quiet /uninstall"
                         DetectCondition="DotNetRedistLtsProductVersion_x86 = v$(var.DotNetRedistLtsInstallerProductVersionx86)">
             </ExePackage>
         </PackageGroup>
     </Fragment>
-
-    <Fragment>
-        <util:ProductSearch Id="DotNetRedistLtsProductSearch_x86"
-                            Condition="NOT VersionNT64"
-                            ProductCode="$(var.DotNetRedistLtsInstallerProductCodex86)"
-                            Result="version"
-                            Variable="DotNetRedistLtsProductVersion_x86" />
-
-        <util:ProductSearch Id="DotNetRedistLtsProductSearch_x64"
-                            Condition="VersionNT64"
-                            ProductCode="$(var.DotNetRedistLtsInstallerProductCodex64)"
-                            Result="version"
-                            Variable="DotNetRedistLtsProductVersion_x64" />
-    </Fragment>
 </Wix>

src/Installers/Windows/WindowsHostingBundle/SharedFramework.wxs

@@ -1,6 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
     <Fragment>
+        <util:ProductSearch Id="SharedFxRedistProductSearch_x86"
+                            Condition="NOT VersionNT64"
+                            ProductCode="$(var.SharedFxInstallerProductCodex86)"
+                            Result="version"
+                            Variable="SharedFxRedistProductVersion_x86" />
+
+        <util:ProductSearch Id="SharedFxRedistProductSearch_x64"
+                            Condition="VersionNT64"
+                            ProductCode="$(var.SharedFxInstallerProductCodex64)"
+                            Result="version"
+                            Variable="SharedFxRedistProductVersion_x64" />
+
         <PackageGroup Id="PG_SHAREDFX_REDIST_BUNDLE">
             <RollbackBoundary Id="RB_SHAREDFX_REDIST_BUNDLE" />
 
@@ -12,7 +24,7 @@
                         InstallCondition="VersionNT64 AND (NOT OPT_NO_SHAREDFX OR OPT_NO_SHAREDFX=&quot;0&quot;)"
                         InstallCommand="/quiet /norestart"
                         RepairCommand="/quiet /repair"
-                        Permanent="yes"
+                        UninstallCommand="/quiet /uninstall"
                         DetectCondition="SharedFxRedistProductVersion_x64 = v$(var.SharedFxInstallerProductVersionx64)">
             </ExePackage>
 
@@ -24,23 +36,9 @@
                         InstallCondition="(NOT OPT_NO_SHAREDFX OR OPT_NO_SHAREDFX=&quot;0&quot;) AND (NOT OPT_NO_X86 OR OPT_NO_X86=&quot;0&quot;)"
                         InstallCommand="/quiet /norestart"
                         RepairCommand="/quiet /repair"
-                        Permanent="yes"
+                        UninstallCommand="/quiet /uninstall"
                         DetectCondition="SharedFxRedistProductVersion_x86 = v$(var.SharedFxInstallerProductVersionx86)">
             </ExePackage>
         </PackageGroup>
     </Fragment>
-
-    <Fragment>
-        <util:ProductSearch Id="SharedFxRedistProductSearch_x86"
-                            Condition="NOT VersionNT64"
-                            ProductCode="$(var.SharedFxInstallerProductCodex86)"
-                            Result="version"
-                            Variable="SharedFxRedistProductVersion_x86" />
-
-        <util:ProductSearch Id="SharedFxRedistProductSearch_x64"
-                            Condition="VersionNT64"
-                            ProductCode="$(var.SharedFxInstallerProductCodex64)"
-                            Result="version"
-                            Variable="SharedFxRedistProductVersion_x64" />
-    </Fragment>
 </Wix>