aboutsummaryrefslogtreecommitdiff
path: root/src/test/burn/TestData/Templates
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2022-08-26 17:47:46 -0700
committerRob Mensching <rob@firegiant.com>2022-08-26 22:09:49 -0700
commit3e0e54aff605da9c5ec6c02f7e83d5e816c857a2 (patch)
treee09e2d4e16620e4587af8e7a35f23a3c1db803a7 /src/test/burn/TestData/Templates
parent7b59be82400f3c4d6e4f294940118e85b77f5a92 (diff)
downloadwix-3e0e54aff605da9c5ec6c02f7e83d5e816c857a2.tar.gz
wix-3e0e54aff605da9c5ec6c02f7e83d5e816c857a2.tar.bz2
wix-3e0e54aff605da9c5ec6c02f7e83d5e816c857a2.zip
Update old test code to latest SWID tag spec
Fixes 6675
Diffstat (limited to 'src/test/burn/TestData/Templates')
-rw-r--r--src/test/burn/TestData/Templates/Bundle.wxs2
-rw-r--r--src/test/burn/TestData/Templates/Package.wxs8
2 files changed, 8 insertions, 2 deletions
diff --git a/src/test/burn/TestData/Templates/Bundle.wxs b/src/test/burn/TestData/Templates/Bundle.wxs
index c55f67a7..43974524 100644
--- a/src/test/burn/TestData/Templates/Bundle.wxs
+++ b/src/test/burn/TestData/Templates/Bundle.wxs
@@ -14,7 +14,7 @@
14 <Variable Name="TestGroupName" Value="$(var.TestGroupName)" /> 14 <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
15 15
16 <?ifdef SoftwareTag?> 16 <?ifdef SoftwareTag?>
17 <SoftwareTag Regid="regid.1995-08.com.example" InstallPath="[CommonAppDataFolder]regid.1995-08.com.example" /> 17 <SoftwareTag Regid="regid.1995-08.com.example" InstallPath="[CommonAppDataFolder]TestingSwidTags" />
18 <?endif?> 18 <?endif?>
19 19
20 <?ifndef BA?> 20 <?ifndef BA?>
diff --git a/src/test/burn/TestData/Templates/Package.wxs b/src/test/burn/TestData/Templates/Package.wxs
index c7597131..a1189fd9 100644
--- a/src/test/burn/TestData/Templates/Package.wxs
+++ b/src/test/burn/TestData/Templates/Package.wxs
@@ -20,7 +20,7 @@
20 <?endif?> 20 <?endif?>
21 21
22 <?ifdef SoftwareTag?> 22 <?ifdef SoftwareTag?>
23 <SoftwareTag Regid="regid.1995-08.com.example" InstallDirectory="CommonAppDataFolder" /> 23 <SoftwareTag Regid="regid.1995-08.com.example" InstallDirectory="SwidTagBaseFolder" />
24 <?endif?> 24 <?endif?>
25 25
26 <PropertyRef Id="TestVersion" /> 26 <PropertyRef Id="TestVersion" />
@@ -35,6 +35,12 @@
35 </Package> 35 </Package>
36 36
37 <Fragment> 37 <Fragment>
38 <?ifdef SoftwareTag?>
39 <StandardDirectory Id="CommonAppDataFolder">
40 <Directory Id="SwidTagBaseFolder" Name="TestingSwidTags" />
41 </StandardDirectory>
42 <?endif?>
43
38 <StandardDirectory Id="ProgramFiles6432Folder"> 44 <StandardDirectory Id="ProgramFiles6432Folder">
39 <Directory Id="WixDir" Name="~Test WiX"> 45 <Directory Id="WixDir" Name="~Test WiX">
40 <Directory Id="TestDir" Name="$(var.TestGroupName)"> 46 <Directory Id="TestDir" Name="$(var.TestGroupName)">