diff options
| author | Rob Mensching <rob@firegiant.com> | 2024-03-06 14:48:10 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2024-03-07 10:55:57 -0800 |
| commit | 3d2d46f62fc01e2653d0251ad9703090574e7c41 (patch) | |
| tree | ffdf7dce6c646f38b5e3ad8325c2ce78ca891a1a /src/ext/Bal/test | |
| parent | a8504dc4eb1c2d09965b0858699ac737336ef3c1 (diff) | |
| download | wix-3d2d46f62fc01e2653d0251ad9703090574e7c41.tar.gz wix-3d2d46f62fc01e2653d0251ad9703090574e7c41.tar.bz2 wix-3d2d46f62fc01e2653d0251ad9703090574e7c41.zip | |
Better .nupkg names
Diffstat (limited to 'src/ext/Bal/test')
53 files changed, 50 insertions, 54 deletions
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/BalExtensionFixture.cs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/BalExtensionFixture.cs index 217fdfb1..a9460008 100644 --- a/src/ext/Bal/test/WixToolsetTest.Bal/BalExtensionFixture.cs +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/BalExtensionFixture.cs | |||
| @@ -1,12 +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. | 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 | 2 | ||
| 3 | namespace WixToolsetTest.Bal | 3 | namespace WixToolsetTest.BootstrapperApplications |
| 4 | { | 4 | { |
| 5 | using System; | 5 | using System; |
| 6 | using System.IO; | 6 | using System.IO; |
| 7 | using System.Linq; | 7 | using System.Linq; |
| 8 | using System.Xml; | 8 | using System.Xml; |
| 9 | using WixToolset.Bal; | 9 | using WixToolset.BootstrapperApplications; |
| 10 | using WixInternal.Core.TestPackage; | 10 | using WixInternal.Core.TestPackage; |
| 11 | using WixInternal.TestSupport; | 11 | using WixInternal.TestSupport; |
| 12 | using Xunit; | 12 | using Xunit; |
| @@ -29,7 +29,7 @@ namespace WixToolsetTest.Bal | |||
| 29 | { | 29 | { |
| 30 | "build", | 30 | "build", |
| 31 | Path.Combine(bundleSourceFolder, "DisplayInternalUIConditionBundle.wxs"), | 31 | Path.Combine(bundleSourceFolder, "DisplayInternalUIConditionBundle.wxs"), |
| 32 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), | 32 | "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), |
| 33 | "-intermediateFolder", intermediateFolder, | 33 | "-intermediateFolder", intermediateFolder, |
| 34 | "-bindpath", Path.Combine(bundleSourceFolder, "data"), | 34 | "-bindpath", Path.Combine(bundleSourceFolder, "data"), |
| 35 | "-o", bundleFile, | 35 | "-o", bundleFile, |
| @@ -67,7 +67,7 @@ namespace WixToolsetTest.Bal | |||
| 67 | { | 67 | { |
| 68 | "build", | 68 | "build", |
| 69 | Path.Combine(bundleSourceFolder, "Bundle.wxs"), | 69 | Path.Combine(bundleSourceFolder, "Bundle.wxs"), |
| 70 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), | 70 | "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), |
| 71 | "-intermediateFolder", intermediateFolder, | 71 | "-intermediateFolder", intermediateFolder, |
| 72 | "-o", bundleFile, | 72 | "-o", bundleFile, |
| 73 | }); | 73 | }); |
| @@ -106,7 +106,7 @@ namespace WixToolsetTest.Bal | |||
| 106 | { | 106 | { |
| 107 | "build", | 107 | "build", |
| 108 | Path.Combine(bundleSourceFolder, "Bundle.wxs"), | 108 | Path.Combine(bundleSourceFolder, "Bundle.wxs"), |
| 109 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), | 109 | "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), |
| 110 | "-intermediateFolder", intermediateFolder, | 110 | "-intermediateFolder", intermediateFolder, |
| 111 | "-o", bundleFile, | 111 | "-o", bundleFile, |
| 112 | }); | 112 | }); |
| @@ -132,7 +132,7 @@ namespace WixToolsetTest.Bal | |||
| 132 | // { | 132 | // { |
| 133 | // "build", | 133 | // "build", |
| 134 | // Path.Combine(bundleSourceFolder, "AlwaysInstallPrereqsBundle.wxs"), | 134 | // Path.Combine(bundleSourceFolder, "AlwaysInstallPrereqsBundle.wxs"), |
| 135 | // "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), | 135 | // "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), |
| 136 | // "-intermediateFolder", intermediateFolder, | 136 | // "-intermediateFolder", intermediateFolder, |
| 137 | // "-o", bundleFile, | 137 | // "-o", bundleFile, |
| 138 | // }); | 138 | // }); |
| @@ -173,7 +173,7 @@ namespace WixToolsetTest.Bal | |||
| 173 | { | 173 | { |
| 174 | "build", | 174 | "build", |
| 175 | Path.Combine(bundleSourceFolder, "Bundle.wxs"), | 175 | Path.Combine(bundleSourceFolder, "Bundle.wxs"), |
| 176 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), | 176 | "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), |
| 177 | "-intermediateFolder", intermediateFolder, | 177 | "-intermediateFolder", intermediateFolder, |
| 178 | "-bindpath", dataFolder, | 178 | "-bindpath", dataFolder, |
| 179 | "-o", bundleFile, | 179 | "-o", bundleFile, |
| @@ -204,7 +204,7 @@ namespace WixToolsetTest.Bal | |||
| 204 | { | 204 | { |
| 205 | "build", | 205 | "build", |
| 206 | Path.Combine(bundleSourceFolder, "Bundle.wxs"), | 206 | Path.Combine(bundleSourceFolder, "Bundle.wxs"), |
| 207 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), | 207 | "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), |
| 208 | "-intermediateFolder", intermediateFolder, | 208 | "-intermediateFolder", intermediateFolder, |
| 209 | "-o", bundleFile, | 209 | "-o", bundleFile, |
| 210 | }); | 210 | }); |
| @@ -239,7 +239,7 @@ namespace WixToolsetTest.Bal | |||
| 239 | Path.Combine(bundleSourceFolder, "Overridable", "WrongCaseBundle.wxs"), | 239 | Path.Combine(bundleSourceFolder, "Overridable", "WrongCaseBundle.wxs"), |
| 240 | "-loc", Path.Combine(bundleSourceFolder, "Overridable", "WrongCaseBundle.wxl"), | 240 | "-loc", Path.Combine(bundleSourceFolder, "Overridable", "WrongCaseBundle.wxl"), |
| 241 | "-bindpath", Path.Combine(bundleSourceFolder, "WixStdBa", "Data"), | 241 | "-bindpath", Path.Combine(bundleSourceFolder, "WixStdBa", "Data"), |
| 242 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), | 242 | "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), |
| 243 | "-intermediateFolder", intermediateFolder, | 243 | "-intermediateFolder", intermediateFolder, |
| 244 | "-o", bundleFile, | 244 | "-o", bundleFile, |
| 245 | }); | 245 | }); |
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/InternalUIBAFixture.cs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/InternalUIBAFixture.cs index 22e2fec1..7e64c13f 100644 --- a/src/ext/Bal/test/WixToolsetTest.Bal/InternalUIBAFixture.cs +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/InternalUIBAFixture.cs | |||
| @@ -1,6 +1,6 @@ | |||
| 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. | 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 | 2 | ||
| 3 | namespace WixToolsetTest.Bal | 3 | namespace WixToolsetTest.BootstrapperApplications |
| 4 | { | 4 | { |
| 5 | using System; | 5 | using System; |
| 6 | using System.IO; | 6 | using System.IO; |
| @@ -27,7 +27,7 @@ namespace WixToolsetTest.Bal | |||
| 27 | { | 27 | { |
| 28 | "build", | 28 | "build", |
| 29 | Path.Combine(bundleSourceFolder, "SinglePrimaryPackage.wxs"), | 29 | Path.Combine(bundleSourceFolder, "SinglePrimaryPackage.wxs"), |
| 30 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), | 30 | "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), |
| 31 | "-intermediateFolder", intermediateFolder, | 31 | "-intermediateFolder", intermediateFolder, |
| 32 | "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), | 32 | "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), |
| 33 | "-o", bundleFile, | 33 | "-o", bundleFile, |
| @@ -66,7 +66,7 @@ namespace WixToolsetTest.Bal | |||
| 66 | { | 66 | { |
| 67 | "build", | 67 | "build", |
| 68 | Path.Combine(bundleSourceFolder, "UrlPrereqPackage.wxs"), | 68 | Path.Combine(bundleSourceFolder, "UrlPrereqPackage.wxs"), |
| 69 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), | 69 | "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), |
| 70 | "-intermediateFolder", intermediateFolder, | 70 | "-intermediateFolder", intermediateFolder, |
| 71 | "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), | 71 | "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), |
| 72 | "-o", bundleFile, | 72 | "-o", bundleFile, |
| @@ -111,7 +111,7 @@ namespace WixToolsetTest.Bal | |||
| 111 | { | 111 | { |
| 112 | "build", | 112 | "build", |
| 113 | Path.Combine(bundleSourceFolder, "ImplicitPrimaryPackage.wxs"), | 113 | Path.Combine(bundleSourceFolder, "ImplicitPrimaryPackage.wxs"), |
| 114 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), | 114 | "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), |
| 115 | "-intermediateFolder", intermediateFolder, | 115 | "-intermediateFolder", intermediateFolder, |
| 116 | "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), | 116 | "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), |
| 117 | "-o", bundleFile, | 117 | "-o", bundleFile, |
| @@ -156,7 +156,7 @@ namespace WixToolsetTest.Bal | |||
| 156 | { | 156 | { |
| 157 | "build", | 157 | "build", |
| 158 | Path.Combine(bundleSourceFolder, "IuiBaWarnings.wxs"), | 158 | Path.Combine(bundleSourceFolder, "IuiBaWarnings.wxs"), |
| 159 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), | 159 | "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), |
| 160 | "-intermediateFolder", intermediateFolder, | 160 | "-intermediateFolder", intermediateFolder, |
| 161 | "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), | 161 | "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), |
| 162 | "-o", bundleFile, | 162 | "-o", bundleFile, |
| @@ -208,7 +208,7 @@ namespace WixToolsetTest.Bal | |||
| 208 | { | 208 | { |
| 209 | "build", | 209 | "build", |
| 210 | Path.Combine(bundleSourceFolder, "AllPrereqPackages.wxs"), | 210 | Path.Combine(bundleSourceFolder, "AllPrereqPackages.wxs"), |
| 211 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), | 211 | "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), |
| 212 | "-intermediateFolder", intermediateFolder, | 212 | "-intermediateFolder", intermediateFolder, |
| 213 | "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), | 213 | "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), |
| 214 | "-o", bundleFile, | 214 | "-o", bundleFile, |
| @@ -237,7 +237,7 @@ namespace WixToolsetTest.Bal | |||
| 237 | { | 237 | { |
| 238 | "build", | 238 | "build", |
| 239 | Path.Combine(bundleSourceFolder, "ImplicitNonMsiPrimaryPackage.wxs"), | 239 | Path.Combine(bundleSourceFolder, "ImplicitNonMsiPrimaryPackage.wxs"), |
| 240 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), | 240 | "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), |
| 241 | "-intermediateFolder", intermediateFolder, | 241 | "-intermediateFolder", intermediateFolder, |
| 242 | "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), | 242 | "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), |
| 243 | "-o", bundleFile, | 243 | "-o", bundleFile, |
| @@ -266,7 +266,7 @@ namespace WixToolsetTest.Bal | |||
| 266 | { | 266 | { |
| 267 | "build", | 267 | "build", |
| 268 | Path.Combine(bundleSourceFolder, "ImplicitPrimaryPackageEnableFeatureSelection.wxs"), | 268 | Path.Combine(bundleSourceFolder, "ImplicitPrimaryPackageEnableFeatureSelection.wxs"), |
| 269 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), | 269 | "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), |
| 270 | "-intermediateFolder", intermediateFolder, | 270 | "-intermediateFolder", intermediateFolder, |
| 271 | "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), | 271 | "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), |
| 272 | "-o", bundleFile, | 272 | "-o", bundleFile, |
| @@ -295,7 +295,7 @@ namespace WixToolsetTest.Bal | |||
| 295 | { | 295 | { |
| 296 | "build", | 296 | "build", |
| 297 | Path.Combine(bundleSourceFolder, "MultipleNonPermanentNonPrimaryPackages.wxs"), | 297 | Path.Combine(bundleSourceFolder, "MultipleNonPermanentNonPrimaryPackages.wxs"), |
| 298 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), | 298 | "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), |
| 299 | "-intermediateFolder", intermediateFolder, | 299 | "-intermediateFolder", intermediateFolder, |
| 300 | "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), | 300 | "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), |
| 301 | "-o", bundleFile, | 301 | "-o", bundleFile, |
| @@ -325,7 +325,7 @@ namespace WixToolsetTest.Bal | |||
| 325 | { | 325 | { |
| 326 | "build", | 326 | "build", |
| 327 | Path.Combine(bundleSourceFolder, "MultipleDefaultPrimaryPackages.wxs"), | 327 | Path.Combine(bundleSourceFolder, "MultipleDefaultPrimaryPackages.wxs"), |
| 328 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), | 328 | "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), |
| 329 | "-intermediateFolder", intermediateFolder, | 329 | "-intermediateFolder", intermediateFolder, |
| 330 | "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), | 330 | "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), |
| 331 | "-o", bundleFile, | 331 | "-o", bundleFile, |
| @@ -355,7 +355,7 @@ namespace WixToolsetTest.Bal | |||
| 355 | { | 355 | { |
| 356 | "build", | 356 | "build", |
| 357 | Path.Combine(bundleSourceFolder, "NoDefaultPrimaryPackage.wxs"), | 357 | Path.Combine(bundleSourceFolder, "NoDefaultPrimaryPackage.wxs"), |
| 358 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), | 358 | "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), |
| 359 | "-intermediateFolder", intermediateFolder, | 359 | "-intermediateFolder", intermediateFolder, |
| 360 | "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), | 360 | "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), |
| 361 | "-o", bundleFile, | 361 | "-o", bundleFile, |
| @@ -384,7 +384,7 @@ namespace WixToolsetTest.Bal | |||
| 384 | { | 384 | { |
| 385 | "build", | 385 | "build", |
| 386 | Path.Combine(bundleSourceFolder, "NonMsiPrimaryPackage.wxs"), | 386 | Path.Combine(bundleSourceFolder, "NonMsiPrimaryPackage.wxs"), |
| 387 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), | 387 | "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), |
| 388 | "-intermediateFolder", intermediateFolder, | 388 | "-intermediateFolder", intermediateFolder, |
| 389 | "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), | 389 | "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), |
| 390 | "-o", bundleFile, | 390 | "-o", bundleFile, |
| @@ -413,7 +413,7 @@ namespace WixToolsetTest.Bal | |||
| 413 | { | 413 | { |
| 414 | "build", | 414 | "build", |
| 415 | Path.Combine(bundleSourceFolder, "NonPermanentPrereqPackage.wxs"), | 415 | Path.Combine(bundleSourceFolder, "NonPermanentPrereqPackage.wxs"), |
| 416 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), | 416 | "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), |
| 417 | "-intermediateFolder", intermediateFolder, | 417 | "-intermediateFolder", intermediateFolder, |
| 418 | "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), | 418 | "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), |
| 419 | "-o", bundleFile, | 419 | "-o", bundleFile, |
| @@ -442,7 +442,7 @@ namespace WixToolsetTest.Bal | |||
| 442 | { | 442 | { |
| 443 | "build", | 443 | "build", |
| 444 | Path.Combine(bundleSourceFolder, "PermanentPrimaryPackage.wxs"), | 444 | Path.Combine(bundleSourceFolder, "PermanentPrimaryPackage.wxs"), |
| 445 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), | 445 | "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), |
| 446 | "-intermediateFolder", intermediateFolder, | 446 | "-intermediateFolder", intermediateFolder, |
| 447 | "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), | 447 | "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), |
| 448 | "-o", bundleFile, | 448 | "-o", bundleFile, |
| @@ -472,7 +472,7 @@ namespace WixToolsetTest.Bal | |||
| 472 | { | 472 | { |
| 473 | "build", | 473 | "build", |
| 474 | Path.Combine(bundleSourceFolder, "PrimaryPackageEnableFeatureSelection.wxs"), | 474 | Path.Combine(bundleSourceFolder, "PrimaryPackageEnableFeatureSelection.wxs"), |
| 475 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), | 475 | "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), |
| 476 | "-intermediateFolder", intermediateFolder, | 476 | "-intermediateFolder", intermediateFolder, |
| 477 | "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), | 477 | "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), |
| 478 | "-o", bundleFile, | 478 | "-o", bundleFile, |
| @@ -502,7 +502,7 @@ namespace WixToolsetTest.Bal | |||
| 502 | { | 502 | { |
| 503 | "build", | 503 | "build", |
| 504 | Path.Combine(bundleSourceFolder, "PrimaryPrereqPackage.wxs"), | 504 | Path.Combine(bundleSourceFolder, "PrimaryPrereqPackage.wxs"), |
| 505 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), | 505 | "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), |
| 506 | "-intermediateFolder", intermediateFolder, | 506 | "-intermediateFolder", intermediateFolder, |
| 507 | "-o", wixlibFile, | 507 | "-o", wixlibFile, |
| 508 | }); | 508 | }); |
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/.Data/fake.exe b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/.Data/fake.exe index f27639e9..f27639e9 100644 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/.Data/fake.exe +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/.Data/fake.exe | |||
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/Dncba/Bundle.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/Dncba/Bundle.wxs index 5b25da8c..5b25da8c 100644 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/Dncba/Bundle.wxs +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/Dncba/Bundle.wxs | |||
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/MBA/AlwaysInstallPrereqsBundle.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/MBA/AlwaysInstallPrereqsBundle.wxs index 685fef7b..685fef7b 100644 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/MBA/AlwaysInstallPrereqsBundle.wxs +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/MBA/AlwaysInstallPrereqsBundle.wxs | |||
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/MBA/Bundle.wxs index 59be4bd4..59be4bd4 100644 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/MBA/Bundle.wxs | |||
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/Overridable/Bundle.wxs index 1274826f..1274826f 100644 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/Overridable/Bundle.wxs | |||
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/Overridable/WrongCaseBundle.wxl b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/Overridable/WrongCaseBundle.wxl index 0667c3cb..0667c3cb 100644 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/Overridable/WrongCaseBundle.wxl +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/Overridable/WrongCaseBundle.wxl | |||
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/Overridable/WrongCaseBundle.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/Overridable/WrongCaseBundle.wxs index 67dfc589..67dfc589 100644 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/Overridable/WrongCaseBundle.wxs +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/Overridable/WrongCaseBundle.wxs | |||
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/AllPrereqPackages.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/AllPrereqPackages.wxs index 17f1ee77..17f1ee77 100644 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/AllPrereqPackages.wxs +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/AllPrereqPackages.wxs | |||
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/ImplicitNonMsiPrimaryPackage.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/ImplicitNonMsiPrimaryPackage.wxs index ca1f9358..ca1f9358 100644 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/ImplicitNonMsiPrimaryPackage.wxs +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/ImplicitNonMsiPrimaryPackage.wxs | |||
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/ImplicitPrimaryPackage.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/ImplicitPrimaryPackage.wxs index 16a99e92..16a99e92 100644 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/ImplicitPrimaryPackage.wxs +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/ImplicitPrimaryPackage.wxs | |||
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/ImplicitPrimaryPackageEnableFeatureSelection.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/ImplicitPrimaryPackageEnableFeatureSelection.wxs index 85b9df65..85b9df65 100644 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/ImplicitPrimaryPackageEnableFeatureSelection.wxs +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/ImplicitPrimaryPackageEnableFeatureSelection.wxs | |||
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/IuibaWarnings.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/IuibaWarnings.wxs index 2cf9787d..2cf9787d 100644 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/IuibaWarnings.wxs +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/IuibaWarnings.wxs | |||
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/MultipleDefaultPrimaryPackages.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/MultipleDefaultPrimaryPackages.wxs index 11736fbb..11736fbb 100644 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/MultipleDefaultPrimaryPackages.wxs +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/MultipleDefaultPrimaryPackages.wxs | |||
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/MultipleNonPermanentNonPrimaryPackages.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/MultipleNonPermanentNonPrimaryPackages.wxs index c5b923df..c5b923df 100644 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/MultipleNonPermanentNonPrimaryPackages.wxs +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/MultipleNonPermanentNonPrimaryPackages.wxs | |||
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/NoDefaultPrimaryPackage.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/NoDefaultPrimaryPackage.wxs index 7f7528d0..7f7528d0 100644 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/NoDefaultPrimaryPackage.wxs +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/NoDefaultPrimaryPackage.wxs | |||
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/NonMsiPrimaryPackage.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/NonMsiPrimaryPackage.wxs index a6f93bcb..a6f93bcb 100644 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/NonMsiPrimaryPackage.wxs +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/NonMsiPrimaryPackage.wxs | |||
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/NonPermanentPrereqPackage.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/NonPermanentPrereqPackage.wxs index a60943b0..a60943b0 100644 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/NonPermanentPrereqPackage.wxs +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/NonPermanentPrereqPackage.wxs | |||
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/PermanentPrimaryPackage.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/PermanentPrimaryPackage.wxs index 43caaf86..43caaf86 100644 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/PermanentPrimaryPackage.wxs +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/PermanentPrimaryPackage.wxs | |||
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/PrimaryPackageEnableFeatureSelection.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/PrimaryPackageEnableFeatureSelection.wxs index 4f1c40dd..4f1c40dd 100644 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/PrimaryPackageEnableFeatureSelection.wxs +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/PrimaryPackageEnableFeatureSelection.wxs | |||
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/PrimaryPrereqPackage.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/PrimaryPrereqPackage.wxs index bdb8c470..bdb8c470 100644 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/PrimaryPrereqPackage.wxs +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/PrimaryPrereqPackage.wxs | |||
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/SinglePrimaryPackage.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/SinglePrimaryPackage.wxs index 1e9a87c2..1e9a87c2 100644 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/SinglePrimaryPackage.wxs +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/SinglePrimaryPackage.wxs | |||
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/UrlPrereqPackage.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/UrlPrereqPackage.wxs index 0c68908c..0c68908c 100644 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/UrlPrereqPackage.wxs +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/UrlPrereqPackage.wxs | |||
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixStdBa/Bundle.wxs index c17b53ff..c17b53ff 100644 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixStdBa/Bundle.wxs | |||
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixStdBa/Data/test.msi b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixStdBa/Data/test.msi index 94aacd1a..94aacd1a 100644 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixStdBa/Data/test.msi +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixStdBa/Data/test.msi | |||
| Binary files differ | |||
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixStdBa/DisplayInternalUIConditionBundle.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixStdBa/DisplayInternalUIConditionBundle.wxs index f08cfe6a..f08cfe6a 100644 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixStdBa/DisplayInternalUIConditionBundle.wxs +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixStdBa/DisplayInternalUIConditionBundle.wxs | |||
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/WixToolsetTest.BootstrapperApplications.csproj index 644fb625..64fc297c 100644 --- a/src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/WixToolsetTest.BootstrapperApplications.csproj | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | </Target> | 16 | </Target> |
| 17 | 17 | ||
| 18 | <ItemGroup> | 18 | <ItemGroup> |
| 19 | <ProjectReference Include="..\..\wixext\WixToolset.Bal.wixext.csproj" /> | 19 | <ProjectReference Include="..\..\wixext\WixToolset.BootstrapperApplications.wixext.csproj" /> |
| 20 | </ItemGroup> | 20 | </ItemGroup> |
| 21 | 21 | ||
| 22 | <ItemGroup> | 22 | <ItemGroup> |
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.v3.ncrunchproject b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/WixToolsetTest.BootstrapperApplications.v3.ncrunchproject index 7b5b2139..7b5b2139 100644 --- a/src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.v3.ncrunchproject +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/WixToolsetTest.BootstrapperApplications.v3.ncrunchproject | |||
diff --git a/src/ext/Bal/test/examples/Directory.wixproj.targets b/src/ext/Bal/test/examples/Directory.wixproj.targets index f126c632..a50ebcf4 100644 --- a/src/ext/Bal/test/examples/Directory.wixproj.targets +++ b/src/ext/Bal/test/examples/Directory.wixproj.targets | |||
| @@ -3,6 +3,6 @@ | |||
| 3 | <Project> | 3 | <Project> |
| 4 | <ItemGroup> | 4 | <ItemGroup> |
| 5 | <BindPath Include="$(OutputPath)" /> | 5 | <BindPath Include="$(OutputPath)" /> |
| 6 | <WixExtension Include="$(OutputPath)..\netstandard2.0\WixToolset.Bal.wixext.dll" /> | 6 | <WixExtension Include="$(OutputPath)..\netstandard2.0\WixToolset.BootstrapperApplications.wixext.dll" /> |
| 7 | </ItemGroup> | 7 | </ItemGroup> |
| 8 | </Project> | 8 | </Project> |
diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs b/src/ext/Bal/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs index bb83568f..3d92eb55 100644 --- a/src/ext/Bal/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs +++ b/src/ext/Bal/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | <!-- <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\Example.EarliestCoreMBA.dll" Name="Example.EarliestCoreMBA.dll" bal:BAFactoryAssembly="yes" /> --> | 5 | <!-- <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\Example.EarliestCoreMBA.dll" Name="Example.EarliestCoreMBA.dll" bal:BAFactoryAssembly="yes" /> --> |
| 6 | <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\Example.EarliestCoreMBA.runtimeconfig.json" Name="Example.EarliestCoreMBA.runtimeconfig.json" /> | 6 | <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\Example.EarliestCoreMBA.runtimeconfig.json" Name="Example.EarliestCoreMBA.runtimeconfig.json" /> |
| 7 | <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\mbanative.dll" Name="mbanative.dll" /> | 7 | <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\mbanative.dll" Name="mbanative.dll" /> |
| 8 | <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\WixToolset.Mba.Core.dll" Name="WixToolset.Mba.Core.dll" /> | 8 | <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\WixToolset.BootstrapperApplicationApi.dll" Name="WixToolset.BootstrapperApplicationApi.dll" /> |
| 9 | <!-- <bal:WixDotNetCoreBootstrapperApplicationHost /> --> | 9 | <!-- <bal:WixDotNetCoreBootstrapperApplicationHost /> --> |
| 10 | </BootstrapperApplication> | 10 | </BootstrapperApplication> |
| 11 | <Chain> | 11 | <Chain> |
diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleFDDx86/FrameworkDependentBundle.wxs b/src/ext/Bal/test/examples/EarliestCoreBundleFDDx86/FrameworkDependentBundle.wxs index ca3d4cf0..071b21fc 100644 --- a/src/ext/Bal/test/examples/EarliestCoreBundleFDDx86/FrameworkDependentBundle.wxs +++ b/src/ext/Bal/test/examples/EarliestCoreBundleFDDx86/FrameworkDependentBundle.wxs | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | <!-- <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd-x86\Example.EarliestCoreMBA.dll" Name="Example.EarliestCoreMBA.dll" bal:BAFactoryAssembly="yes" /> --> | 5 | <!-- <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd-x86\Example.EarliestCoreMBA.dll" Name="Example.EarliestCoreMBA.dll" bal:BAFactoryAssembly="yes" /> --> |
| 6 | <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd-x86\Example.EarliestCoreMBA.runtimeconfig.json" Name="Example.EarliestCoreMBA.runtimeconfig.json" /> | 6 | <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd-x86\Example.EarliestCoreMBA.runtimeconfig.json" Name="Example.EarliestCoreMBA.runtimeconfig.json" /> |
| 7 | <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd-x86\mbanative.dll" Name="mbanative.dll" /> | 7 | <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd-x86\mbanative.dll" Name="mbanative.dll" /> |
| 8 | <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd-x86\WixToolset.Mba.Core.dll" Name="WixToolset.Mba.Core.dll" /> | 8 | <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd-x86\WixToolset.BootstrapperApplicationApi.dll" Name="WixToolset.BootstrapperApplicationApi.dll" /> |
| 9 | <!-- <bal:WixDotNetCoreBootstrapperApplicationHost /> --> | 9 | <!-- <bal:WixDotNetCoreBootstrapperApplicationHost /> --> |
| 10 | </BootstrapperApplication> | 10 | </BootstrapperApplication> |
| 11 | <Chain> | 11 | <Chain> |
diff --git a/src/ext/Bal/test/examples/EarliestCoreMBA/EarliestCoreBA.cs b/src/ext/Bal/test/examples/EarliestCoreMBA/EarliestCoreBA.cs index 490f4051..2e92f911 100644 --- a/src/ext/Bal/test/examples/EarliestCoreMBA/EarliestCoreBA.cs +++ b/src/ext/Bal/test/examples/EarliestCoreMBA/EarliestCoreBA.cs | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | namespace Example.EarliestCoreMBA | 3 | namespace Example.EarliestCoreMBA |
| 4 | { | 4 | { |
| 5 | using WixToolset.Mba.Core; | 5 | using WixToolset.BootstrapperApplicationApi; |
| 6 | 6 | ||
| 7 | public class EarliestCoreBA : BootstrapperApplication | 7 | public class EarliestCoreBA : BootstrapperApplication |
| 8 | { | 8 | { |
diff --git a/src/ext/Bal/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj b/src/ext/Bal/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj index 958381c3..93ceb7d4 100644 --- a/src/ext/Bal/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj +++ b/src/ext/Bal/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj | |||
| @@ -9,6 +9,6 @@ | |||
| 9 | </PropertyGroup> | 9 | </PropertyGroup> |
| 10 | 10 | ||
| 11 | <ItemGroup> | 11 | <ItemGroup> |
| 12 | <PackageReference Include="WixToolset.Mba.Core" /> | 12 | <PackageReference Include="WixToolset.BootstrapperApplicationApi" /> |
| 13 | </ItemGroup> | 13 | </ItemGroup> |
| 14 | </Project> | 14 | </Project> |
diff --git a/src/ext/Bal/test/examples/EarliestCoreMBA/Program.cs b/src/ext/Bal/test/examples/EarliestCoreMBA/Program.cs index 11cc46f0..97d471bf 100644 --- a/src/ext/Bal/test/examples/EarliestCoreMBA/Program.cs +++ b/src/ext/Bal/test/examples/EarliestCoreMBA/Program.cs | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | namespace Example.EarliestCoreMBA | 3 | namespace Example.EarliestCoreMBA |
| 4 | { | 4 | { |
| 5 | using WixToolset.Mba.Core; | 5 | using WixToolset.BootstrapperApplicationApi; |
| 6 | 6 | ||
| 7 | internal class Program | 7 | internal class Program |
| 8 | { | 8 | { |
diff --git a/src/ext/Bal/test/examples/FullFramework2Bundle/Bundle.wxs b/src/ext/Bal/test/examples/FullFramework2Bundle/Bundle.wxs index 9ca93c7f..3bc823e9 100644 --- a/src/ext/Bal/test/examples/FullFramework2Bundle/Bundle.wxs +++ b/src/ext/Bal/test/examples/FullFramework2Bundle/Bundle.wxs | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | <BootstrapperApplication SourceFile="Example.FullFramework2MBA\net462\win-x64\Example.FullFramework2MBA.exe"> | 3 | <BootstrapperApplication SourceFile="Example.FullFramework2MBA\net462\win-x64\Example.FullFramework2MBA.exe"> |
| 4 | <Payload SourceFile="Example.FullFramework2MBA\net462\win-x64\Example.FullFramework2MBA.exe.config" /> | 4 | <Payload SourceFile="Example.FullFramework2MBA\net462\win-x64\Example.FullFramework2MBA.exe.config" /> |
| 5 | <Payload SourceFile="Example.FullFramework2MBA\net462\win-x64\mbanative.dll" /> | 5 | <Payload SourceFile="Example.FullFramework2MBA\net462\win-x64\mbanative.dll" /> |
| 6 | <Payload SourceFile="Example.FullFramework2MBA\net462\win-x64\WixToolset.Mba.Core.dll" /> | 6 | <Payload SourceFile="Example.FullFramework2MBA\net462\win-x64\WixToolset.BootstrapperApplicationApi.dll" /> |
| 7 | <!-- <bal:WixManagedBootstrapperApplicationHost /> --> | 7 | <!-- <bal:WixManagedBootstrapperApplicationHost /> --> |
| 8 | </BootstrapperApplication> | 8 | </BootstrapperApplication> |
| 9 | <Chain> | 9 | <Chain> |
diff --git a/src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj b/src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj index 7c4db8c1..ff4df6fb 100644 --- a/src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj +++ b/src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj | |||
| @@ -12,10 +12,6 @@ | |||
| 12 | </PropertyGroup> | 12 | </PropertyGroup> |
| 13 | 13 | ||
| 14 | <ItemGroup> | 14 | <ItemGroup> |
| 15 | <PackageReference Include="WixToolset.Mba.Core" /> | 15 | <PackageReference Include="WixToolset.BootstrapperApplicationApi" /> |
| 16 | </ItemGroup> | ||
| 17 | |||
| 18 | <ItemGroup> | ||
| 19 | <ProjectReference Include="..\..\..\..\..\api\burn\WixToolset.Mba.Core\WixToolset.Mba.Core.csproj" /> | ||
| 20 | </ItemGroup> | 16 | </ItemGroup> |
| 21 | </Project> | 17 | </Project> |
diff --git a/src/ext/Bal/test/examples/FullFramework2MBA/FullFramework2BA.cs b/src/ext/Bal/test/examples/FullFramework2MBA/FullFramework2BA.cs index c6d478af..ab93a796 100644 --- a/src/ext/Bal/test/examples/FullFramework2MBA/FullFramework2BA.cs +++ b/src/ext/Bal/test/examples/FullFramework2MBA/FullFramework2BA.cs | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | namespace Example.FullFramework2MBA | 3 | namespace Example.FullFramework2MBA |
| 4 | { | 4 | { |
| 5 | using WixToolset.Mba.Core; | 5 | using WixToolset.BootstrapperApplicationApi; |
| 6 | 6 | ||
| 7 | public class FullFramework2BA : BootstrapperApplication | 7 | public class FullFramework2BA : BootstrapperApplication |
| 8 | { | 8 | { |
diff --git a/src/ext/Bal/test/examples/FullFramework2MBA/Program.cs b/src/ext/Bal/test/examples/FullFramework2MBA/Program.cs index 067fefe8..bfa62666 100644 --- a/src/ext/Bal/test/examples/FullFramework2MBA/Program.cs +++ b/src/ext/Bal/test/examples/FullFramework2MBA/Program.cs | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | namespace Example.FullFramework2MBA | 3 | namespace Example.FullFramework2MBA |
| 4 | { | 4 | { |
| 5 | using WixToolset.Mba.Core; | 5 | using WixToolset.BootstrapperApplicationApi; |
| 6 | 6 | ||
| 7 | internal class Program | 7 | internal class Program |
| 8 | { | 8 | { |
diff --git a/src/ext/Bal/test/examples/FullFramework4Bundle/Bundle.wxs b/src/ext/Bal/test/examples/FullFramework4Bundle/Bundle.wxs index 7cac54f2..48668c19 100644 --- a/src/ext/Bal/test/examples/FullFramework4Bundle/Bundle.wxs +++ b/src/ext/Bal/test/examples/FullFramework4Bundle/Bundle.wxs | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | <!-- <Payload SourceFile="Example.FullFramework4MBA\net472\win-x64\Example.FullFramework4MBA.dll" /> --> | 4 | <!-- <Payload SourceFile="Example.FullFramework4MBA\net472\win-x64\Example.FullFramework4MBA.dll" /> --> |
| 5 | <Payload SourceFile="Example.FullFramework4MBA\net472\win-x64\Example.FullFramework4MBA.exe.config" /> | 5 | <Payload SourceFile="Example.FullFramework4MBA\net472\win-x64\Example.FullFramework4MBA.exe.config" /> |
| 6 | <Payload SourceFile="Example.FullFramework4MBA\net472\win-x64\mbanative.dll" /> | 6 | <Payload SourceFile="Example.FullFramework4MBA\net472\win-x64\mbanative.dll" /> |
| 7 | <Payload SourceFile="Example.FullFramework4MBA\net472\win-x64\WixToolset.Mba.Core.dll" /> | 7 | <Payload SourceFile="Example.FullFramework4MBA\net472\win-x64\WixToolset.BootstrapperApplicationApi.dll" /> |
| 8 | <!-- <bal:WixManagedBootstrapperApplicationHost /> --> | 8 | <!-- <bal:WixManagedBootstrapperApplicationHost /> --> |
| 9 | </BootstrapperApplication> | 9 | </BootstrapperApplication> |
| 10 | <Chain> | 10 | <Chain> |
diff --git a/src/ext/Bal/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj b/src/ext/Bal/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj index 09665180..e17e7525 100644 --- a/src/ext/Bal/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj +++ b/src/ext/Bal/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj | |||
| @@ -11,6 +11,6 @@ | |||
| 11 | </PropertyGroup> | 11 | </PropertyGroup> |
| 12 | 12 | ||
| 13 | <ItemGroup> | 13 | <ItemGroup> |
| 14 | <PackageReference Include="WixToolset.Mba.Core" /> | 14 | <PackageReference Include="WixToolset.BootstrapperApplicationApi" /> |
| 15 | </ItemGroup> | 15 | </ItemGroup> |
| 16 | </Project> | 16 | </Project> |
diff --git a/src/ext/Bal/test/examples/FullFramework4MBA/FullFramework4BA.cs b/src/ext/Bal/test/examples/FullFramework4MBA/FullFramework4BA.cs index 8a91195a..3c6fa13b 100644 --- a/src/ext/Bal/test/examples/FullFramework4MBA/FullFramework4BA.cs +++ b/src/ext/Bal/test/examples/FullFramework4MBA/FullFramework4BA.cs | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | namespace Example.FullFramework4MBA | 3 | namespace Example.FullFramework4MBA |
| 4 | { | 4 | { |
| 5 | using WixToolset.Mba.Core; | 5 | using WixToolset.BootstrapperApplicationApi; |
| 6 | 6 | ||
| 7 | public class FullFramework4BA : BootstrapperApplication | 7 | public class FullFramework4BA : BootstrapperApplication |
| 8 | { | 8 | { |
diff --git a/src/ext/Bal/test/examples/FullFramework4MBA/Program.cs b/src/ext/Bal/test/examples/FullFramework4MBA/Program.cs index 23fb6851..3e21a0fd 100644 --- a/src/ext/Bal/test/examples/FullFramework4MBA/Program.cs +++ b/src/ext/Bal/test/examples/FullFramework4MBA/Program.cs | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | namespace Example.FullFramework4MBA | 3 | namespace Example.FullFramework4MBA |
| 4 | { | 4 | { |
| 5 | using WixToolset.Mba.Core; | 5 | using WixToolset.BootstrapperApplicationApi; |
| 6 | 6 | ||
| 7 | internal class Program | 7 | internal class Program |
| 8 | { | 8 | { |
diff --git a/src/ext/Bal/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs b/src/ext/Bal/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs index 74f82d99..07fb4ac3 100644 --- a/src/ext/Bal/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs +++ b/src/ext/Bal/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | <!-- <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\Example.LatestCoreMBA.dll" Name="Example.LatestCoreMBA.dll" bal:BAFactoryAssembly="yes" /> --> | 5 | <!-- <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\Example.LatestCoreMBA.dll" Name="Example.LatestCoreMBA.dll" bal:BAFactoryAssembly="yes" /> --> |
| 6 | <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\Example.LatestCoreMBA.runtimeconfig.json" Name="Example.LatestCoreMBA.runtimeconfig.json" /> | 6 | <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\Example.LatestCoreMBA.runtimeconfig.json" Name="Example.LatestCoreMBA.runtimeconfig.json" /> |
| 7 | <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\mbanative.dll" Name="mbanative.dll" /> | 7 | <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\mbanative.dll" Name="mbanative.dll" /> |
| 8 | <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\WixToolset.Mba.Core.dll" Name="WixToolset.Mba.Core.dll" /> | 8 | <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\WixToolset.BootstrapperApplicationApi.dll" Name="WixToolset.BootstrapperApplicationApi.dll" /> |
| 9 | <!-- <bal:WixDotNetCoreBootstrapperApplicationHost /> --> | 9 | <!-- <bal:WixDotNetCoreBootstrapperApplicationHost /> --> |
| 10 | </BootstrapperApplication> | 10 | </BootstrapperApplication> |
| 11 | <Chain> | 11 | <Chain> |
diff --git a/src/ext/Bal/test/examples/LatestCoreBundleFDDx86/FrameworkDependentBundle.wxs b/src/ext/Bal/test/examples/LatestCoreBundleFDDx86/FrameworkDependentBundle.wxs index ab40a543..928cfb3b 100644 --- a/src/ext/Bal/test/examples/LatestCoreBundleFDDx86/FrameworkDependentBundle.wxs +++ b/src/ext/Bal/test/examples/LatestCoreBundleFDDx86/FrameworkDependentBundle.wxs | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | <!-- <Payload SourceFile="publish\Example.LatestCoreMBA\fdd-x86\Example.LatestCoreMBA.dll" Name="Example.LatestCoreMBA.dll" bal:BAFactoryAssembly="yes" /> --> | 5 | <!-- <Payload SourceFile="publish\Example.LatestCoreMBA\fdd-x86\Example.LatestCoreMBA.dll" Name="Example.LatestCoreMBA.dll" bal:BAFactoryAssembly="yes" /> --> |
| 6 | <Payload SourceFile="publish\Example.LatestCoreMBA\fdd-x86\Example.LatestCoreMBA.runtimeconfig.json" Name="Example.LatestCoreMBA.runtimeconfig.json" /> | 6 | <Payload SourceFile="publish\Example.LatestCoreMBA\fdd-x86\Example.LatestCoreMBA.runtimeconfig.json" Name="Example.LatestCoreMBA.runtimeconfig.json" /> |
| 7 | <Payload SourceFile="publish\Example.LatestCoreMBA\fdd-x86\mbanative.dll" Name="mbanative.dll" /> | 7 | <Payload SourceFile="publish\Example.LatestCoreMBA\fdd-x86\mbanative.dll" Name="mbanative.dll" /> |
| 8 | <Payload SourceFile="publish\Example.LatestCoreMBA\fdd-x86\WixToolset.Mba.Core.dll" Name="WixToolset.Mba.Core.dll" /> | 8 | <Payload SourceFile="publish\Example.LatestCoreMBA\fdd-x86\WixToolset.BootstrapperApplicationApi.dll" Name="WixToolset.BootstrapperApplicationApi.dll" /> |
| 9 | <!-- <bal:WixDotNetCoreBootstrapperApplicationHost /> --> | 9 | <!-- <bal:WixDotNetCoreBootstrapperApplicationHost /> --> |
| 10 | </BootstrapperApplication> | 10 | </BootstrapperApplication> |
| 11 | <Chain> | 11 | <Chain> |
diff --git a/src/ext/Bal/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj b/src/ext/Bal/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj index c4d31151..96587d26 100644 --- a/src/ext/Bal/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj +++ b/src/ext/Bal/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj | |||
| @@ -9,6 +9,6 @@ | |||
| 9 | </PropertyGroup> | 9 | </PropertyGroup> |
| 10 | 10 | ||
| 11 | <ItemGroup> | 11 | <ItemGroup> |
| 12 | <PackageReference Include="WixToolset.Mba.Core" /> | 12 | <PackageReference Include="WixToolset.BootstrapperApplicationApi" /> |
| 13 | </ItemGroup> | 13 | </ItemGroup> |
| 14 | </Project> | 14 | </Project> |
diff --git a/src/ext/Bal/test/examples/LatestCoreMBA/LatestCoreBA.cs b/src/ext/Bal/test/examples/LatestCoreMBA/LatestCoreBA.cs index bd5378eb..f3195bfe 100644 --- a/src/ext/Bal/test/examples/LatestCoreMBA/LatestCoreBA.cs +++ b/src/ext/Bal/test/examples/LatestCoreMBA/LatestCoreBA.cs | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | namespace Example.LatestCoreMBA | 3 | namespace Example.LatestCoreMBA |
| 4 | { | 4 | { |
| 5 | using WixToolset.Mba.Core; | 5 | using WixToolset.BootstrapperApplicationApi; |
| 6 | 6 | ||
| 7 | public class LatestCoreBA : BootstrapperApplication | 7 | public class LatestCoreBA : BootstrapperApplication |
| 8 | { | 8 | { |
diff --git a/src/ext/Bal/test/examples/LatestCoreMBA/Program.cs b/src/ext/Bal/test/examples/LatestCoreMBA/Program.cs index 94da360b..d8205b62 100644 --- a/src/ext/Bal/test/examples/LatestCoreMBA/Program.cs +++ b/src/ext/Bal/test/examples/LatestCoreMBA/Program.cs | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | namespace Example.LatestCoreMBA | 3 | namespace Example.LatestCoreMBA |
| 4 | { | 4 | { |
| 5 | using WixToolset.Mba.Core; | 5 | using WixToolset.BootstrapperApplicationApi; |
| 6 | 6 | ||
| 7 | internal class Program | 7 | internal class Program |
| 8 | { | 8 | { |
diff --git a/src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj b/src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj index 42c51c9e..8a3b8120 100644 --- a/src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj +++ b/src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj | |||
| @@ -61,7 +61,7 @@ | |||
| 61 | </ItemGroup> | 61 | </ItemGroup> |
| 62 | 62 | ||
| 63 | <ItemGroup> | 63 | <ItemGroup> |
| 64 | <PackageReference Include="WixToolset.BalUtil" /> | 64 | <PackageReference Include="WixToolset.BootstrapperApplicationApi" /> |
| 65 | 65 | ||
| 66 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> | 66 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> |
| 67 | </ItemGroup> | 67 | </ItemGroup> |
diff --git a/src/ext/Bal/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs b/src/ext/Bal/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs index e95fbba0..f35f9251 100644 --- a/src/ext/Bal/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs +++ b/src/ext/Bal/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | <!-- <Payload SourceFile="publish\Example.WPFCoreMBA\fdd\Example.WPFCoreMBA.dll" Name="Example.WPFCoreMBA.dll" bal:BAFactoryAssembly="yes" /> --> | 5 | <!-- <Payload SourceFile="publish\Example.WPFCoreMBA\fdd\Example.WPFCoreMBA.dll" Name="Example.WPFCoreMBA.dll" bal:BAFactoryAssembly="yes" /> --> |
| 6 | <Payload SourceFile="publish\Example.WPFCoreMBA\fdd\Example.WPFCoreMBA.runtimeconfig.json" Name="Example.WPFCoreMBA.runtimeconfig.json" /> | 6 | <Payload SourceFile="publish\Example.WPFCoreMBA\fdd\Example.WPFCoreMBA.runtimeconfig.json" Name="Example.WPFCoreMBA.runtimeconfig.json" /> |
| 7 | <Payload SourceFile="publish\Example.WPFCoreMBA\fdd\mbanative.dll" Name="mbanative.dll" /> | 7 | <Payload SourceFile="publish\Example.WPFCoreMBA\fdd\mbanative.dll" Name="mbanative.dll" /> |
| 8 | <Payload SourceFile="publish\Example.WPFCoreMBA\fdd\WixToolset.Mba.Core.dll" Name="WixToolset.Mba.Core.dll" /> | 8 | <Payload SourceFile="publish\Example.WPFCoreMBA\fdd\WixToolset.BootstrapperApplicationApi.dll" Name="WixToolset.BootstrapperApplicationApi.dll" /> |
| 9 | <!-- <bal:WixDotNetCoreBootstrapperApplicationHost /> --> | 9 | <!-- <bal:WixDotNetCoreBootstrapperApplicationHost /> --> |
| 10 | </BootstrapperApplication> | 10 | </BootstrapperApplication> |
| 11 | <Chain> | 11 | <Chain> |
diff --git a/src/ext/Bal/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj b/src/ext/Bal/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj index 279b498f..37639021 100644 --- a/src/ext/Bal/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj +++ b/src/ext/Bal/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj | |||
| @@ -9,6 +9,6 @@ | |||
| 9 | </PropertyGroup> | 9 | </PropertyGroup> |
| 10 | 10 | ||
| 11 | <ItemGroup> | 11 | <ItemGroup> |
| 12 | <PackageReference Include="WixToolset.Mba.Core" /> | 12 | <PackageReference Include="WixToolset.BootstrapperApplicationApi" /> |
| 13 | </ItemGroup> | 13 | </ItemGroup> |
| 14 | </Project> | 14 | </Project> |
diff --git a/src/ext/Bal/test/examples/WPFCoreMBA/Program.cs b/src/ext/Bal/test/examples/WPFCoreMBA/Program.cs index 185e92cc..17a3a7ca 100644 --- a/src/ext/Bal/test/examples/WPFCoreMBA/Program.cs +++ b/src/ext/Bal/test/examples/WPFCoreMBA/Program.cs | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | namespace Example.WPFCoreMBA | 3 | namespace Example.WPFCoreMBA |
| 4 | { | 4 | { |
| 5 | using WixToolset.Mba.Core; | 5 | using WixToolset.BootstrapperApplicationApi; |
| 6 | // using WixToolset.BootstrapperApplications.Managed; | 6 | // using WixToolset.BootstrapperApplications.Managed; |
| 7 | 7 | ||
| 8 | public class Program | 8 | public class Program |
diff --git a/src/ext/Bal/test/examples/WPFCoreMBA/WPFCoreBA.cs b/src/ext/Bal/test/examples/WPFCoreMBA/WPFCoreBA.cs index 7bc06094..c9bcef23 100644 --- a/src/ext/Bal/test/examples/WPFCoreMBA/WPFCoreBA.cs +++ b/src/ext/Bal/test/examples/WPFCoreMBA/WPFCoreBA.cs | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | namespace Example.WPFCoreMBA | 3 | namespace Example.WPFCoreMBA |
| 4 | { | 4 | { |
| 5 | using System.Windows.Threading; | 5 | using System.Windows.Threading; |
| 6 | using WixToolset.Mba.Core; | 6 | using WixToolset.BootstrapperApplicationApi; |
| 7 | 7 | ||
| 8 | public class WPFCoreBA : BootstrapperApplication | 8 | public class WPFCoreBA : BootstrapperApplication |
| 9 | { | 9 | { |
