diff options
| author | Rob Mensching <rob@firegiant.com> | 2021-05-11 09:14:53 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2021-05-11 09:14:53 -0700 |
| commit | dc6022da6cdbb9d7ca54c4a36485ceead07feaaf (patch) | |
| tree | 80dbfd39b48f80790f5c3c82ba4416b8cfdff78d /src/test/burn/TestData/DependencyTests/PatchA | |
| parent | aaae65d07ce2a78592fc533701975cc576341a46 (diff) | |
| parent | d8e47230e094a506406a83eb78916abf2668b29c (diff) | |
| download | wix-dc6022da6cdbb9d7ca54c4a36485ceead07feaaf.tar.gz wix-dc6022da6cdbb9d7ca54c4a36485ceead07feaaf.tar.bz2 wix-dc6022da6cdbb9d7ca54c4a36485ceead07feaaf.zip | |
Merge Integration
Diffstat (limited to 'src/test/burn/TestData/DependencyTests/PatchA')
| -rw-r--r-- | src/test/burn/TestData/DependencyTests/PatchA/PatchA.wixproj | 15 | ||||
| -rw-r--r-- | src/test/burn/TestData/DependencyTests/PatchA/PatchA.wxs | 22 |
2 files changed, 37 insertions, 0 deletions
diff --git a/src/test/burn/TestData/DependencyTests/PatchA/PatchA.wixproj b/src/test/burn/TestData/DependencyTests/PatchA/PatchA.wixproj new file mode 100644 index 00000000..b6653a19 --- /dev/null +++ b/src/test/burn/TestData/DependencyTests/PatchA/PatchA.wixproj | |||
| @@ -0,0 +1,15 @@ | |||
| 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>PatchCreation</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 | <ItemGroup> | ||
| 13 | <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.30" /> | ||
| 14 | </ItemGroup> | ||
| 15 | </Project> \ No newline at end of file | ||
diff --git a/src/test/burn/TestData/DependencyTests/PatchA/PatchA.wxs b/src/test/burn/TestData/DependencyTests/PatchA/PatchA.wxs new file mode 100644 index 00000000..acb6f887 --- /dev/null +++ b/src/test/burn/TestData/DependencyTests/PatchA/PatchA.wxs | |||
| @@ -0,0 +1,22 @@ | |||
| 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 Version?> | ||
| 4 | <?define Version = 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 in test $(var.TestGroupName)" DisplayName="$(var.TestGroupName) - Patch A" 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.Version)" Supersede="yes"> | ||
| 18 | <ComponentRef Id="RegistryComponent"/> | ||
| 19 | <PropertyRef Id="TestVersion"/> | ||
| 20 | </PatchFamily> | ||
| 21 | </Patch> | ||
| 22 | </Wix> | ||