diff options
Diffstat (limited to 'src/ext/Bal/test')
6 files changed, 22 insertions, 8 deletions
diff --git a/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/BalExtensionFixture.cs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/BalExtensionFixture.cs index 576e7c6c..e599b8e2 100644 --- a/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/BalExtensionFixture.cs +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/BalExtensionFixture.cs | |||
| @@ -24,7 +24,8 @@ namespace WixToolsetTest.BootstrapperApplications | |||
| 24 | { | 24 | { |
| 25 | var baseFolder = fs.GetFolder(); | 25 | var baseFolder = fs.GetFolder(); |
| 26 | var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); | 26 | var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); |
| 27 | var bundleSourceFolder = TestData.Get(@"TestData\WixStdBa"); | 27 | var bundleSourceFolder = TestData.Get(@"TestData", "WixStdBa"); |
| 28 | var dataFolder = TestData.Get(@"TestData", ".Data"); | ||
| 28 | var intermediateFolder = Path.Combine(baseFolder, "obj"); | 29 | var intermediateFolder = Path.Combine(baseFolder, "obj"); |
| 29 | var baFolderPath = Path.Combine(baseFolder, "ba"); | 30 | var baFolderPath = Path.Combine(baseFolder, "ba"); |
| 30 | var extractFolderPath = Path.Combine(baseFolder, "extract"); | 31 | var extractFolderPath = Path.Combine(baseFolder, "extract"); |
| @@ -36,6 +37,7 @@ namespace WixToolsetTest.BootstrapperApplications | |||
| 36 | "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), | 37 | "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), |
| 37 | "-intermediateFolder", intermediateFolder, | 38 | "-intermediateFolder", intermediateFolder, |
| 38 | "-bindpath", Path.Combine(bundleSourceFolder, "data"), | 39 | "-bindpath", Path.Combine(bundleSourceFolder, "data"), |
| 40 | "-bindpath", dataFolder, | ||
| 39 | "-o", bundleFile, | 41 | "-o", bundleFile, |
| 40 | }); | 42 | }); |
| 41 | compileResult.AssertSuccess(); | 43 | compileResult.AssertSuccess(); |
| @@ -62,7 +64,8 @@ namespace WixToolsetTest.BootstrapperApplications | |||
| 62 | { | 64 | { |
| 63 | var baseFolder = fs.GetFolder(); | 65 | var baseFolder = fs.GetFolder(); |
| 64 | var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); | 66 | var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); |
| 65 | var bundleSourceFolder = TestData.Get(@"TestData\WixStdBa"); | 67 | var bundleSourceFolder = TestData.Get(@"TestData", "WixStdBa"); |
| 68 | var dataFolder = TestData.Get(@"TestData", ".Data"); | ||
| 66 | var intermediateFolder = Path.Combine(baseFolder, "obj"); | 69 | var intermediateFolder = Path.Combine(baseFolder, "obj"); |
| 67 | var baFolderPath = Path.Combine(baseFolder, "ba"); | 70 | var baFolderPath = Path.Combine(baseFolder, "ba"); |
| 68 | var extractFolderPath = Path.Combine(baseFolder, "extract"); | 71 | var extractFolderPath = Path.Combine(baseFolder, "extract"); |
| @@ -74,6 +77,7 @@ namespace WixToolsetTest.BootstrapperApplications | |||
| 74 | "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), | 77 | "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), |
| 75 | "-intermediateFolder", intermediateFolder, | 78 | "-intermediateFolder", intermediateFolder, |
| 76 | "-bindpath", Path.Combine(bundleSourceFolder, "data"), | 79 | "-bindpath", Path.Combine(bundleSourceFolder, "data"), |
| 80 | "-bindpath", dataFolder, | ||
| 77 | "-o", bundleFile, | 81 | "-o", bundleFile, |
| 78 | }); | 82 | }); |
| 79 | compileResult.AssertSuccess(); | 83 | compileResult.AssertSuccess(); |
| @@ -101,6 +105,7 @@ namespace WixToolsetTest.BootstrapperApplications | |||
| 101 | var baseFolder = fs.GetFolder(); | 105 | var baseFolder = fs.GetFolder(); |
| 102 | var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); | 106 | var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); |
| 103 | var bundleSourceFolder = TestData.Get("TestData", "WixStdBa"); | 107 | var bundleSourceFolder = TestData.Get("TestData", "WixStdBa"); |
| 108 | var dataFolder = TestData.Get(@"TestData", ".Data"); | ||
| 104 | var intermediateFolder = Path.Combine(baseFolder, "obj"); | 109 | var intermediateFolder = Path.Combine(baseFolder, "obj"); |
| 105 | var baFolderPath = Path.Combine(baseFolder, "ba"); | 110 | var baFolderPath = Path.Combine(baseFolder, "ba"); |
| 106 | var extractFolderPath = Path.Combine(baseFolder, "extract"); | 111 | var extractFolderPath = Path.Combine(baseFolder, "extract"); |
| @@ -112,6 +117,7 @@ namespace WixToolsetTest.BootstrapperApplications | |||
| 112 | "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), | 117 | "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), |
| 113 | "-intermediateFolder", intermediateFolder, | 118 | "-intermediateFolder", intermediateFolder, |
| 114 | "-bindpath", Path.Combine(bundleSourceFolder, "data"), | 119 | "-bindpath", Path.Combine(bundleSourceFolder, "data"), |
| 120 | "-bindpath", dataFolder, | ||
| 115 | "-o", bundleFile, | 121 | "-o", bundleFile, |
| 116 | }); | 122 | }); |
| 117 | compileResult.AssertSuccess(); | 123 | compileResult.AssertSuccess(); |
| @@ -141,7 +147,8 @@ namespace WixToolsetTest.BootstrapperApplications | |||
| 141 | { | 147 | { |
| 142 | var baseFolder = fs.GetFolder(); | 148 | var baseFolder = fs.GetFolder(); |
| 143 | var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); | 149 | var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); |
| 144 | var bundleSourceFolder = TestData.Get(@"TestData\Overridable"); | 150 | var bundleSourceFolder = TestData.Get(@"TestData", "Overridable"); |
| 151 | var dataFolder = TestData.Get(@"TestData", ".Data"); | ||
| 145 | var intermediateFolder = Path.Combine(baseFolder, "obj"); | 152 | var intermediateFolder = Path.Combine(baseFolder, "obj"); |
| 146 | var baFolderPath = Path.Combine(baseFolder, "ba"); | 153 | var baFolderPath = Path.Combine(baseFolder, "ba"); |
| 147 | var extractFolderPath = Path.Combine(baseFolder, "extract"); | 154 | var extractFolderPath = Path.Combine(baseFolder, "extract"); |
| @@ -152,6 +159,7 @@ namespace WixToolsetTest.BootstrapperApplications | |||
| 152 | Path.Combine(bundleSourceFolder, "Bundle.wxs"), | 159 | Path.Combine(bundleSourceFolder, "Bundle.wxs"), |
| 153 | "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), | 160 | "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), |
| 154 | "-intermediateFolder", intermediateFolder, | 161 | "-intermediateFolder", intermediateFolder, |
| 162 | "-bindpath", dataFolder, | ||
| 155 | "-o", bundleFile, | 163 | "-o", bundleFile, |
| 156 | }); | 164 | }); |
| 157 | compileResult.AssertSuccess(); | 165 | compileResult.AssertSuccess(); |
| @@ -182,7 +190,8 @@ namespace WixToolsetTest.BootstrapperApplications | |||
| 182 | { | 190 | { |
| 183 | var baseFolder = fs.GetFolder(); | 191 | var baseFolder = fs.GetFolder(); |
| 184 | var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); | 192 | var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); |
| 185 | var bundleSourceFolder = TestData.Get(@"TestData\WixStdBa"); | 193 | var bundleSourceFolder = TestData.Get(@"TestData", "WixStdBa"); |
| 194 | var dataFolder = TestData.Get(@"TestData", ".Data"); | ||
| 186 | var intermediateFolder = Path.Combine(baseFolder, "obj"); | 195 | var intermediateFolder = Path.Combine(baseFolder, "obj"); |
| 187 | 196 | ||
| 188 | var compileResult = WixRunner.Execute(new[] | 197 | var compileResult = WixRunner.Execute(new[] |
| @@ -191,6 +200,7 @@ namespace WixToolsetTest.BootstrapperApplications | |||
| 191 | Path.Combine(bundleSourceFolder, "Bundle.wxs"), | 200 | Path.Combine(bundleSourceFolder, "Bundle.wxs"), |
| 192 | "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), | 201 | "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), |
| 193 | "-intermediateFolder", intermediateFolder, | 202 | "-intermediateFolder", intermediateFolder, |
| 203 | "-bindpath", dataFolder, | ||
| 194 | "-o", bundleFile, | 204 | "-o", bundleFile, |
| 195 | }); | 205 | }); |
| 196 | compileResult.AssertSuccess(); | 206 | compileResult.AssertSuccess(); |
diff --git a/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/.Data/test.ico b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/.Data/test.ico new file mode 100644 index 00000000..906ce324 --- /dev/null +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/.Data/test.ico | |||
| Binary files differ | |||
diff --git a/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixStdBa/BootstrapperApplicationId.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixStdBa/BootstrapperApplicationId.wxs index e1945f53..44c15999 100644 --- a/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixStdBa/BootstrapperApplicationId.wxs +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixStdBa/BootstrapperApplicationId.wxs | |||
| @@ -1,7 +1,8 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" | 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" |
| 3 | xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> | 3 | xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> |
| 4 | <Bundle Name="WixStdBa" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="75D5D534-E177-4689-AAE9-CAC1C39002C2"> | 4 | <Bundle Name="WixStdBa" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="75D5D534-E177-4689-AAE9-CAC1C39002C2" |
| 5 | IconSourceFile="test.ico"> | ||
| 5 | <BootstrapperApplication Id="Custom"> | 6 | <BootstrapperApplication Id="Custom"> |
| 6 | <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" Theme="hyperlinkLicense" /> | 7 | <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" Theme="hyperlinkLicense" /> |
| 7 | </BootstrapperApplication> | 8 | </BootstrapperApplication> |
diff --git a/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixStdBa/Bundle.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixStdBa/Bundle.wxs index c17b53ff..e0346900 100644 --- a/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixStdBa/Bundle.wxs +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixStdBa/Bundle.wxs | |||
| @@ -1,7 +1,8 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" | 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" |
| 3 | xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> | 3 | xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> |
| 4 | <Bundle Name="WixStdBa" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="75D5D534-E177-4689-AAE9-CAC1C39002C2"> | 4 | <Bundle Name="WixStdBa" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="75D5D534-E177-4689-AAE9-CAC1C39002C2" |
| 5 | IconSourceFile="test.ico"> | ||
| 5 | <BootstrapperApplication> | 6 | <BootstrapperApplication> |
| 6 | <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" Theme="hyperlinkLicense" /> | 7 | <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" Theme="hyperlinkLicense" /> |
| 7 | </BootstrapperApplication> | 8 | </BootstrapperApplication> |
diff --git a/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixStdBa/DisplayFilesInUseDialogConditionBundle.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixStdBa/DisplayFilesInUseDialogConditionBundle.wxs index 1041eb39..098d6f83 100644 --- a/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixStdBa/DisplayFilesInUseDialogConditionBundle.wxs +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixStdBa/DisplayFilesInUseDialogConditionBundle.wxs | |||
| @@ -1,7 +1,8 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" | 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" |
| 3 | xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> | 3 | xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> |
| 4 | <Bundle Name="WixStdBa" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="75D5D534-E177-4689-AAE9-CAC1C39002C2"> | 4 | <Bundle Name="WixStdBa" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="75D5D534-E177-4689-AAE9-CAC1C39002C2" |
| 5 | IconSourceFile="test.ico"> | ||
| 5 | <BootstrapperApplication> | 6 | <BootstrapperApplication> |
| 6 | <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" Theme="hyperlinkLicense" /> | 7 | <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" Theme="hyperlinkLicense" /> |
| 7 | </BootstrapperApplication> | 8 | </BootstrapperApplication> |
diff --git a/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixStdBa/DisplayInternalUIConditionBundle.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixStdBa/DisplayInternalUIConditionBundle.wxs index f08cfe6a..2dea66fd 100644 --- a/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixStdBa/DisplayInternalUIConditionBundle.wxs +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixStdBa/DisplayInternalUIConditionBundle.wxs | |||
| @@ -1,7 +1,8 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" | 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" |
| 3 | xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> | 3 | xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> |
| 4 | <Bundle Name="WixStdBa" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="75D5D534-E177-4689-AAE9-CAC1C39002C2"> | 4 | <Bundle Name="WixStdBa" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="75D5D534-E177-4689-AAE9-CAC1C39002C2" |
| 5 | IconSourceFile="test.ico"> | ||
| 5 | <BootstrapperApplication> | 6 | <BootstrapperApplication> |
| 6 | <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" Theme="hyperlinkLicense" /> | 7 | <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" Theme="hyperlinkLicense" /> |
| 7 | </BootstrapperApplication> | 8 | </BootstrapperApplication> |
