diff options
| author | Bob Arnson <bob@firegiant.com> | 2026-01-21 21:20:40 -0500 |
|---|---|---|
| committer | Bob Arnson <bob@firegiant.com> | 2026-01-21 21:20:40 -0500 |
| commit | fafdaa522ff2a3888dfceb0ab56911c4f8cdf48d (patch) | |
| tree | 02e91784289063f01ee71c2b72ec04b890802cee /src/test/burn/TestData/SlipstreamTests/PatchAMinor | |
| parent | 9a26c32398337aff57da6e92088b90314b81cf03 (diff) | |
| download | wix-bob/SupersededPackageUninstall.tar.gz wix-bob/SupersededPackageUninstall.tar.bz2 wix-bob/SupersededPackageUninstall.zip | |
Allow patched package to be uninstalled.bob/SupersededPackageUninstall
Normally, a patched package is detected as superseded and therefore a
normal uninstall takes no action. This change looks for applied patches
and allows a normal uninstall to remove the package.
Fixes https://github.com/wixtoolset/issues/issues/6350
Diffstat (limited to 'src/test/burn/TestData/SlipstreamTests/PatchAMinor')
| -rw-r--r-- | src/test/burn/TestData/SlipstreamTests/PatchAMinor/PatchAMinor.wixproj | 12 | ||||
| -rw-r--r-- | src/test/burn/TestData/SlipstreamTests/PatchAMinor/PatchAMinor.wxs | 23 |
2 files changed, 35 insertions, 0 deletions
diff --git a/src/test/burn/TestData/SlipstreamTests/PatchAMinor/PatchAMinor.wixproj b/src/test/burn/TestData/SlipstreamTests/PatchAMinor/PatchAMinor.wixproj new file mode 100644 index 00000000..3deb2263 --- /dev/null +++ b/src/test/burn/TestData/SlipstreamTests/PatchAMinor/PatchAMinor.wixproj | |||
| @@ -0,0 +1,12 @@ | |||
| 1 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | ||
| 2 | <Project Sdk="WixToolset.Sdk"> | ||
| 3 | <PropertyGroup> | ||
| 4 | <OutputType>Patch</OutputType> | ||
| 5 | <TargetExt>.msp</TargetExt> | ||
| 6 | <SuppressSpecificWarnings>1079</SuppressSpecificWarnings> | ||
| 7 | </PropertyGroup> | ||
| 8 | <ItemGroup> | ||
| 9 | <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" /> | ||
| 10 | <ProjectReference Include="..\PackageAv1_0_1\PackageAv1_0_1.wixproj" /> | ||
| 11 | </ItemGroup> | ||
| 12 | </Project> | ||
diff --git a/src/test/burn/TestData/SlipstreamTests/PatchAMinor/PatchAMinor.wxs b/src/test/burn/TestData/SlipstreamTests/PatchAMinor/PatchAMinor.wxs new file mode 100644 index 00000000..0f4abd2b --- /dev/null +++ b/src/test/burn/TestData/SlipstreamTests/PatchAMinor/PatchAMinor.wxs | |||
| @@ -0,0 +1,23 @@ | |||
| 1 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | ||
| 2 | |||
| 3 | <?ifndef TestVersion?> | ||
| 4 | <?define TestVersion = 1.0.0.0?> | ||
| 5 | <?endif?> | ||
| 6 | |||
| 7 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
| 8 | <Patch AllowRemoval="yes" Classification="Update" Description="Patch A minor upgrade in test $(var.TestGroupName)" DisplayName="$(var.TestGroupName) - Patch A minor upgrade" Manufacturer="Example Corporation" MinorUpdateTargetRTM="yes"> | ||
| 9 | <Media Id="100" Cabinet="PatchA" EmbedCab="yes"> | ||
| 10 | <PatchBaseline | ||
| 11 | Id="PatchA" | ||
| 12 | BaselineFile="$(var.PackageAv1.TargetDir)$(var.PackageAv1.TargetName).wixpdb" | ||
| 13 | UpdateFile="$(var.PackageAv1_0_1.TargetDir)$(var.PackageAv1_0_1.TargetName).wixpdb" | ||
| 14 | /> | ||
| 15 | </Media> | ||
| 16 | |||
| 17 | <PatchFamily Id="A" Version="$(var.TestVersion)" Supersede="yes"> | ||
| 18 | <ComponentRef Id="RegistryComponent" /> | ||
| 19 | <PropertyRef Id="TestVersion" /> | ||
| 20 | <PropertyRef Id="ProductVersion" /> | ||
| 21 | </PatchFamily> | ||
| 22 | </Patch> | ||
| 23 | </Wix> | ||
