From 3d2d46f62fc01e2653d0251ad9703090574e7c41 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Wed, 6 Mar 2024 14:48:10 -0800 Subject: Better .nupkg names --- src/ext/Bal/Bal.wixext.sln | 6 +- src/ext/Bal/README.md | 4 +- .../Bal/Samples/bafunctions/bafunctions.vcxproj | 2 +- src/ext/Bal/bal.cmd | 11 +- src/ext/Bal/stdbas/stdbas.vcxproj | 2 +- .../test/WixToolsetTest.Bal/BalExtensionFixture.cs | 262 ----------- .../test/WixToolsetTest.Bal/InternalUIBAFixture.cs | 519 --------------------- .../WixToolsetTest.Bal/TestData/.Data/fake.exe | 1 - .../WixToolsetTest.Bal/TestData/Dncba/Bundle.wxs | 13 - .../TestData/MBA/AlwaysInstallPrereqsBundle.wxs | 12 - .../WixToolsetTest.Bal/TestData/MBA/Bundle.wxs | 12 - .../TestData/Overridable/Bundle.wxs | 13 - .../TestData/Overridable/WrongCaseBundle.wxl | 4 - .../TestData/Overridable/WrongCaseBundle.wxs | 16 - .../TestData/WixIuiBa/AllPrereqPackages.wxs | 13 - .../WixIuiBa/ImplicitNonMsiPrimaryPackage.wxs | 13 - .../TestData/WixIuiBa/ImplicitPrimaryPackage.wxs | 13 - ...mplicitPrimaryPackageEnableFeatureSelection.wxs | 13 - .../TestData/WixIuiBa/IuibaWarnings.wxs | 13 - .../WixIuiBa/MultipleDefaultPrimaryPackages.wxs | 13 - .../MultipleNonPermanentNonPrimaryPackages.wxs | 13 - .../TestData/WixIuiBa/NoDefaultPrimaryPackage.wxs | 13 - .../TestData/WixIuiBa/NonMsiPrimaryPackage.wxs | 13 - .../WixIuiBa/NonPermanentPrereqPackage.wxs | 13 - .../TestData/WixIuiBa/PermanentPrimaryPackage.wxs | 13 - .../PrimaryPackageEnableFeatureSelection.wxs | 13 - .../TestData/WixIuiBa/PrimaryPrereqPackage.wxs | 13 - .../TestData/WixIuiBa/SinglePrimaryPackage.wxs | 13 - .../TestData/WixIuiBa/UrlPrereqPackage.wxs | 19 - .../TestData/WixStdBa/Bundle.wxs | 12 - .../TestData/WixStdBa/Data/test.msi | Bin 32768 -> 0 bytes .../WixStdBa/DisplayInternalUIConditionBundle.wxs | 12 - .../WixToolsetTest.Bal/WixToolsetTest.Bal.csproj | 25 - .../WixToolsetTest.Bal.v3.ncrunchproject | 5 - .../BalExtensionFixture.cs | 262 +++++++++++ .../InternalUIBAFixture.cs | 519 +++++++++++++++++++++ .../TestData/.Data/fake.exe | 1 + .../TestData/Dncba/Bundle.wxs | 13 + .../TestData/MBA/AlwaysInstallPrereqsBundle.wxs | 12 + .../TestData/MBA/Bundle.wxs | 12 + .../TestData/Overridable/Bundle.wxs | 13 + .../TestData/Overridable/WrongCaseBundle.wxl | 4 + .../TestData/Overridable/WrongCaseBundle.wxs | 16 + .../TestData/WixIuiBa/AllPrereqPackages.wxs | 13 + .../WixIuiBa/ImplicitNonMsiPrimaryPackage.wxs | 13 + .../TestData/WixIuiBa/ImplicitPrimaryPackage.wxs | 13 + ...mplicitPrimaryPackageEnableFeatureSelection.wxs | 13 + .../TestData/WixIuiBa/IuibaWarnings.wxs | 13 + .../WixIuiBa/MultipleDefaultPrimaryPackages.wxs | 13 + .../MultipleNonPermanentNonPrimaryPackages.wxs | 13 + .../TestData/WixIuiBa/NoDefaultPrimaryPackage.wxs | 13 + .../TestData/WixIuiBa/NonMsiPrimaryPackage.wxs | 13 + .../WixIuiBa/NonPermanentPrereqPackage.wxs | 13 + .../TestData/WixIuiBa/PermanentPrimaryPackage.wxs | 13 + .../PrimaryPackageEnableFeatureSelection.wxs | 13 + .../TestData/WixIuiBa/PrimaryPrereqPackage.wxs | 13 + .../TestData/WixIuiBa/SinglePrimaryPackage.wxs | 13 + .../TestData/WixIuiBa/UrlPrereqPackage.wxs | 19 + .../TestData/WixStdBa/Bundle.wxs | 12 + .../TestData/WixStdBa/Data/test.msi | Bin 0 -> 32768 bytes .../WixStdBa/DisplayInternalUIConditionBundle.wxs | 12 + .../WixToolsetTest.BootstrapperApplications.csproj | 25 + ...Test.BootstrapperApplications.v3.ncrunchproject | 5 + .../Bal/test/examples/Directory.wixproj.targets | 2 +- .../FrameworkDependentBundle.wxs | 2 +- .../FrameworkDependentBundle.wxs | 2 +- .../examples/EarliestCoreMBA/EarliestCoreBA.cs | 2 +- .../EarliestCoreMBA/Example.EarliestCoreMBA.csproj | 2 +- .../Bal/test/examples/EarliestCoreMBA/Program.cs | 2 +- .../test/examples/FullFramework2Bundle/Bundle.wxs | 2 +- .../Example.FullFramework2MBA.csproj | 6 +- .../examples/FullFramework2MBA/FullFramework2BA.cs | 2 +- .../Bal/test/examples/FullFramework2MBA/Program.cs | 2 +- .../test/examples/FullFramework4Bundle/Bundle.wxs | 2 +- .../Example.FullFramework4MBA.csproj | 2 +- .../examples/FullFramework4MBA/FullFramework4BA.cs | 2 +- .../Bal/test/examples/FullFramework4MBA/Program.cs | 2 +- .../FrameworkDependentBundle.wxs | 2 +- .../FrameworkDependentBundle.wxs | 2 +- .../LatestCoreMBA/Example.LatestCoreMBA.csproj | 2 +- .../test/examples/LatestCoreMBA/LatestCoreBA.cs | 2 +- src/ext/Bal/test/examples/LatestCoreMBA/Program.cs | 2 +- .../examples/TestEngine/Example.TestEngine.vcxproj | 2 +- .../WPFCoreBundleFDD/FrameworkDependentBundle.wxs | 2 +- .../examples/WPFCoreMBA/Example.WPFCoreMBA.csproj | 2 +- src/ext/Bal/test/examples/WPFCoreMBA/Program.cs | 2 +- src/ext/Bal/test/examples/WPFCoreMBA/WPFCoreBA.cs | 2 +- .../WixToolset.Bal.wixext.csproj | 16 + .../WixToolset.Bal.wixext.nuspec | 22 + .../WixToolset.Bal.wixext.targets | 11 + src/ext/Bal/wixext/BalBurnBackendExtension.cs | 4 +- src/ext/Bal/wixext/BalCompiler.cs | 4 +- src/ext/Bal/wixext/BalErrors.cs | 2 +- src/ext/Bal/wixext/BalExtensionData.cs | 4 +- src/ext/Bal/wixext/BalExtensionFactory.cs | 2 +- src/ext/Bal/wixext/BalWarnings.cs | 2 +- src/ext/Bal/wixext/Symbols/BalSymbolDefinitions.cs | 2 +- .../Symbols/WixBalBAFactoryAssemblySymbol.cs | 6 +- .../Bal/wixext/Symbols/WixBalBAFunctionsSymbol.cs | 8 +- .../Symbols/WixBalBootstrapperApplicationSymbol.cs | 6 +- .../Bal/wixext/Symbols/WixBalConditionSymbol.cs | 8 +- .../Bal/wixext/Symbols/WixBalPackageInfoSymbol.cs | 6 +- .../wixext/Symbols/WixPrereqInformationSymbol.cs | 6 +- .../Bal/wixext/Symbols/WixPrereqOptionsSymbol.cs | 6 +- .../wixext/Symbols/WixStdbaCommandLineSymbol.cs | 6 +- .../Bal/wixext/Symbols/WixStdbaOptionsSymbol.cs | 8 +- .../Symbols/WixStdbaOverridableVariableSymbol.cs | 8 +- src/ext/Bal/wixext/WixToolset.Bal.wixext.csproj | 22 - src/ext/Bal/wixext/WixToolset.Bal.wixext.targets | 11 - ...xToolset.BootstrapperApplications.wixext.csproj | 22 + ...Toolset.BootstrapperApplications.wixext.targets | 11 + src/ext/Bal/wixiuiba/wixiuiba.vcxproj | 2 +- src/ext/Bal/wixlib/bal.wixproj | 23 - src/ext/Bal/wixlib/bal_arm64.wxs | 6 - src/ext/Bal/wixlib/bal_platform.wxi | 34 -- src/ext/Bal/wixlib/bal_x64.wxs | 7 - src/ext/Bal/wixlib/bal_x86.wxs | 7 - src/ext/Bal/wixlib/bas.wixproj | 23 + src/ext/Bal/wixlib/bas_arm64.wxs | 6 + src/ext/Bal/wixlib/bas_platform.wxi | 34 ++ src/ext/Bal/wixlib/bas_x64.wxs | 7 + src/ext/Bal/wixlib/bas_x86.wxs | 7 + src/ext/Bal/wixprqba/wixprqba.vcxproj | 2 +- src/ext/Bal/wixstdba/wixstdba.vcxproj | 2 +- src/ext/NetFx/be/precomp.h | 5 - .../WixToolsetTest.Netfx/NetfxExtensionFixture.cs | 16 +- src/ext/NetFx/wixlib/netfx.wixproj | 2 +- src/ext/Util/be/precomp.h | 5 - src/ext/WixExt.props | 3 +- 129 files changed, 1362 insertions(+), 1323 deletions(-) delete mode 100644 src/ext/Bal/test/WixToolsetTest.Bal/BalExtensionFixture.cs delete mode 100644 src/ext/Bal/test/WixToolsetTest.Bal/InternalUIBAFixture.cs delete mode 100644 src/ext/Bal/test/WixToolsetTest.Bal/TestData/.Data/fake.exe delete mode 100644 src/ext/Bal/test/WixToolsetTest.Bal/TestData/Dncba/Bundle.wxs delete mode 100644 src/ext/Bal/test/WixToolsetTest.Bal/TestData/MBA/AlwaysInstallPrereqsBundle.wxs delete mode 100644 src/ext/Bal/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs delete mode 100644 src/ext/Bal/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs delete mode 100644 src/ext/Bal/test/WixToolsetTest.Bal/TestData/Overridable/WrongCaseBundle.wxl delete mode 100644 src/ext/Bal/test/WixToolsetTest.Bal/TestData/Overridable/WrongCaseBundle.wxs delete mode 100644 src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/AllPrereqPackages.wxs delete mode 100644 src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/ImplicitNonMsiPrimaryPackage.wxs delete mode 100644 src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/ImplicitPrimaryPackage.wxs delete mode 100644 src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/ImplicitPrimaryPackageEnableFeatureSelection.wxs delete mode 100644 src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/IuibaWarnings.wxs delete mode 100644 src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/MultipleDefaultPrimaryPackages.wxs delete mode 100644 src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/MultipleNonPermanentNonPrimaryPackages.wxs delete mode 100644 src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/NoDefaultPrimaryPackage.wxs delete mode 100644 src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/NonMsiPrimaryPackage.wxs delete mode 100644 src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/NonPermanentPrereqPackage.wxs delete mode 100644 src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/PermanentPrimaryPackage.wxs delete mode 100644 src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/PrimaryPackageEnableFeatureSelection.wxs delete mode 100644 src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/PrimaryPrereqPackage.wxs delete mode 100644 src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/SinglePrimaryPackage.wxs delete mode 100644 src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/UrlPrereqPackage.wxs delete mode 100644 src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs delete mode 100644 src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixStdBa/Data/test.msi delete mode 100644 src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixStdBa/DisplayInternalUIConditionBundle.wxs delete mode 100644 src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj delete mode 100644 src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.v3.ncrunchproject create mode 100644 src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/BalExtensionFixture.cs create mode 100644 src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/InternalUIBAFixture.cs create mode 100644 src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/.Data/fake.exe create mode 100644 src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/Dncba/Bundle.wxs create mode 100644 src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/MBA/AlwaysInstallPrereqsBundle.wxs create mode 100644 src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/MBA/Bundle.wxs create mode 100644 src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/Overridable/Bundle.wxs create mode 100644 src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/Overridable/WrongCaseBundle.wxl create mode 100644 src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/Overridable/WrongCaseBundle.wxs create mode 100644 src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/AllPrereqPackages.wxs create mode 100644 src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/ImplicitNonMsiPrimaryPackage.wxs create mode 100644 src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/ImplicitPrimaryPackage.wxs create mode 100644 src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/ImplicitPrimaryPackageEnableFeatureSelection.wxs create mode 100644 src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/IuibaWarnings.wxs create mode 100644 src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/MultipleDefaultPrimaryPackages.wxs create mode 100644 src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/MultipleNonPermanentNonPrimaryPackages.wxs create mode 100644 src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/NoDefaultPrimaryPackage.wxs create mode 100644 src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/NonMsiPrimaryPackage.wxs create mode 100644 src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/NonPermanentPrereqPackage.wxs create mode 100644 src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/PermanentPrimaryPackage.wxs create mode 100644 src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/PrimaryPackageEnableFeatureSelection.wxs create mode 100644 src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/PrimaryPrereqPackage.wxs create mode 100644 src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/SinglePrimaryPackage.wxs create mode 100644 src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/UrlPrereqPackage.wxs create mode 100644 src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixStdBa/Bundle.wxs create mode 100644 src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixStdBa/Data/test.msi create mode 100644 src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixStdBa/DisplayInternalUIConditionBundle.wxs create mode 100644 src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/WixToolsetTest.BootstrapperApplications.csproj create mode 100644 src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/WixToolsetTest.BootstrapperApplications.v3.ncrunchproject create mode 100644 src/ext/Bal/wixext-backward-compatible/WixToolset.Bal.wixext.csproj create mode 100644 src/ext/Bal/wixext-backward-compatible/WixToolset.Bal.wixext.nuspec create mode 100644 src/ext/Bal/wixext-backward-compatible/WixToolset.Bal.wixext.targets delete mode 100644 src/ext/Bal/wixext/WixToolset.Bal.wixext.csproj delete mode 100644 src/ext/Bal/wixext/WixToolset.Bal.wixext.targets create mode 100644 src/ext/Bal/wixext/WixToolset.BootstrapperApplications.wixext.csproj create mode 100644 src/ext/Bal/wixext/WixToolset.BootstrapperApplications.wixext.targets delete mode 100644 src/ext/Bal/wixlib/bal.wixproj delete mode 100644 src/ext/Bal/wixlib/bal_arm64.wxs delete mode 100644 src/ext/Bal/wixlib/bal_platform.wxi delete mode 100644 src/ext/Bal/wixlib/bal_x64.wxs delete mode 100644 src/ext/Bal/wixlib/bal_x86.wxs create mode 100644 src/ext/Bal/wixlib/bas.wixproj create mode 100644 src/ext/Bal/wixlib/bas_arm64.wxs create mode 100644 src/ext/Bal/wixlib/bas_platform.wxi create mode 100644 src/ext/Bal/wixlib/bas_x64.wxs create mode 100644 src/ext/Bal/wixlib/bas_x86.wxs (limited to 'src/ext') diff --git a/src/ext/Bal/Bal.wixext.sln b/src/ext/Bal/Bal.wixext.sln index f341a7be..48eb190e 100644 --- a/src/ext/Bal/Bal.wixext.sln +++ b/src/ext/Bal/Bal.wixext.sln @@ -7,11 +7,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bafunctions", "Samples\bafu EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wixstdba", "wixstdba\wixstdba.vcxproj", "{41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}" EndProject -Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "bal", "wixlib\bal.wixproj", "{3444D952-F21C-496F-AB6B-56435BFD0787}" +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "bas", "wixlib\bas.wixproj", "{3444D952-F21C-496F-AB6B-56435BFD0787}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Bal.wixext", "wixext\WixToolset.Bal.wixext.csproj", "{BF720A63-9D7B-456E-B60C-8122852D9FED}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.BootstrapperApplications.wixext", "wixext\WixToolset.BootstrapperApplications.wixext.csproj", "{BF720A63-9D7B-456E-B60C-8122852D9FED}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Bal", "test\WixToolsetTest.Bal\WixToolsetTest.Bal.csproj", "{89D479FC-20DA-44D8-AE38-48F063223498}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.BootstrapperApplications", "test\WixToolsetTest.BootstrapperApplications\WixToolsetTest.BootstrapperApplications.csproj", "{89D479FC-20DA-44D8-AE38-48F063223498}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wixiuiba", "wixiuiba\wixiuiba.vcxproj", "{0F73E566-925C-448D-99CB-3A7F5DF399C8}" EndProject diff --git a/src/ext/Bal/README.md b/src/ext/Bal/README.md index cc5d9b34..4a14b1a2 100644 --- a/src/ext/Bal/README.md +++ b/src/ext/Bal/README.md @@ -1,2 +1,2 @@ -# Bal.wixext -WixToolset.Bal.wixext - Bootstrapper Application Layer WiX Toolset Extension +# WixToolset.BootstrapperApplications.wixext +WixToolset.BootstrapperApplications.wixext - Bootstrapper Applications WiX Toolset Extension diff --git a/src/ext/Bal/Samples/bafunctions/bafunctions.vcxproj b/src/ext/Bal/Samples/bafunctions/bafunctions.vcxproj index 7e41313f..13ead500 100644 --- a/src/ext/Bal/Samples/bafunctions/bafunctions.vcxproj +++ b/src/ext/Bal/Samples/bafunctions/bafunctions.vcxproj @@ -60,7 +60,7 @@ - + diff --git a/src/ext/Bal/bal.cmd b/src/ext/Bal/bal.cmd index 23a53a91..7a48f6fc 100644 --- a/src/ext/Bal/bal.cmd +++ b/src/ext/Bal/bal.cmd @@ -17,31 +17,34 @@ @if "%_INC%"=="" call :clean @if NOT "%_CLEAN%"=="" goto :end -@echo Building ext\Bal %_C% using %_N% +@echo Building ext\BootstrapperApplications %_C% using %_N% :: Restore :: Build -msbuild -Restore -p:Configuration=%_C% -tl -nologo -m -warnaserror test\WixToolsetTest.Bal\WixToolsetTest.Bal.csproj -bl:%_L%\ext_bal_build.binlog || exit /b +msbuild -Restore -p:Configuration=%_C% -tl -nologo -m -warnaserror test\WixToolsetTest.BootstrapperApplications\WixToolsetTest.BootstrapperApplications.csproj -bl:%_L%\ext_bal_build.binlog || exit /b msbuild -Restore -p:Configuration=%_C% -tl -nologo -m -warnaserror test\examples\examples.proj -bl:%_L%\bal_examples_build.binlog || exit /b :: Test dotnet test ^ - %_B%\net6.0\WixToolsetTest.Bal.dll ^ + %_B%\net6.0\WixToolsetTest.BootstrapperApplications.dll ^ --nologo -l "trx;LogFileName=%_L%\TestResults\bal.wixext.trx" || exit /b :: Pack -msbuild -t:Pack -p:Configuration=%_C% -tl -nologo -warnaserror -p:NoBuild=true wixext\WixToolset.Bal.wixext.csproj || exit /b +msbuild -t:Pack -p:Configuration=%_C% -tl -nologo -warnaserror -p:NoBuild=true wixext\WixToolset.BootstrapperApplications.wixext.csproj || exit /b +msbuild -t:Pack -Restore -p:Configuration=%_C% -tl -nologo -warnaserror wixext-backward-compatible\WixToolset.Bal.wixext.csproj || exit /b @goto :end :clean @rd /s/q "..\..\..\build\Bal.wixext" 2> nul @del "..\..\..\build\artifacts\WixToolset.Bal.wixext.*.nupkg" 2> nul +@del "..\..\..\build\artifacts\WixToolset.BootstrapperApplications.wixext.*.nupkg" 2> nul @del "%_L%\ext_bal_build.binlog" 2> nul @del "%_L%\TestResults\bal.wixext.trx" 2> nul @rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.bal.wixext" 2> nul +@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.bootstrapperapplications.wixext" 2> nul @exit /b :end diff --git a/src/ext/Bal/stdbas/stdbas.vcxproj b/src/ext/Bal/stdbas/stdbas.vcxproj index 3722b40a..c9b1451b 100644 --- a/src/ext/Bal/stdbas/stdbas.vcxproj +++ b/src/ext/Bal/stdbas/stdbas.vcxproj @@ -71,7 +71,7 @@ rc.exe -fo "$(OutDir)stdbas.res" "$(IntDir)stdbas.messages.rc" - + diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/BalExtensionFixture.cs b/src/ext/Bal/test/WixToolsetTest.Bal/BalExtensionFixture.cs deleted file mode 100644 index 217fdfb1..00000000 --- a/src/ext/Bal/test/WixToolsetTest.Bal/BalExtensionFixture.cs +++ /dev/null @@ -1,262 +0,0 @@ -// 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. - -namespace WixToolsetTest.Bal -{ - using System; - using System.IO; - using System.Linq; - using System.Xml; - using WixToolset.Bal; - using WixInternal.Core.TestPackage; - using WixInternal.TestSupport; - using Xunit; - - public class BalExtensionFixture - { - [Fact] - public void CanBuildUsingDisplayInternalUICondition() - { - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); - var bundleSourceFolder = TestData.Get(@"TestData\WixStdBa"); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - var baFolderPath = Path.Combine(baseFolder, "ba"); - var extractFolderPath = Path.Combine(baseFolder, "extract"); - - var compileResult = WixRunner.Execute(new[] - { - "build", - Path.Combine(bundleSourceFolder, "DisplayInternalUIConditionBundle.wxs"), - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), - "-intermediateFolder", intermediateFolder, - "-bindpath", Path.Combine(bundleSourceFolder, "data"), - "-o", bundleFile, - }); - compileResult.AssertSuccess(); - - Assert.True(File.Exists(bundleFile)); - - var extractResult = BundleExtractor.ExtractBAContainer(null, bundleFile, baFolderPath, extractFolderPath); - extractResult.AssertSuccess(); - - var balPackageInfos = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixBalPackageInfo"); - WixAssert.CompareLineByLine(new string[] - { - "", - }, balPackageInfos); - - Assert.True(File.Exists(Path.Combine(baFolderPath, "thm.wxl"))); - } - } - - [Fact] - public void CanBuildUsingOverridable() - { - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); - var bundleSourceFolder = TestData.Get(@"TestData\Overridable"); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - var baFolderPath = Path.Combine(baseFolder, "ba"); - var extractFolderPath = Path.Combine(baseFolder, "extract"); - - var compileResult = WixRunner.Execute(new[] - { - "build", - Path.Combine(bundleSourceFolder, "Bundle.wxs"), - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), - "-intermediateFolder", intermediateFolder, - "-o", bundleFile, - }); - compileResult.AssertSuccess(); - - Assert.True(File.Exists(bundleFile)); - - var extractResult = BundleExtractor.ExtractBAContainer(null, bundleFile, baFolderPath, extractFolderPath); - extractResult.AssertSuccess(); - - var balCommandLines = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixStdbaCommandLine"); - WixAssert.CompareLineByLine(new[] - { - "", - }, balCommandLines); - - var balOverridableVariables = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixStdbaOverridableVariable"); - WixAssert.CompareLineByLine(new[] - { - "", - }, balOverridableVariables); - } - } - - [Fact] - public void CanBuildUsingWixStdBa() - { - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); - var bundleSourceFolder = TestData.Get(@"TestData\WixStdBa"); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - - var compileResult = WixRunner.Execute(new[] - { - "build", - Path.Combine(bundleSourceFolder, "Bundle.wxs"), - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), - "-intermediateFolder", intermediateFolder, - "-o", bundleFile, - }); - compileResult.AssertSuccess(); - - Assert.True(File.Exists(bundleFile)); - } - } - - //[Fact] - //public void CanBuildUsingMBAWithAlwaysInstallPrereqs() - //{ - // using (var fs = new DisposableFileSystem()) - // { - // var baseFolder = fs.GetFolder(); - // var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); - // var bundleSourceFolder = TestData.Get("TestData", "MBA"); - // var intermediateFolder = Path.Combine(baseFolder, "obj"); - // var baFolderPath = Path.Combine(baseFolder, "ba"); - // var extractFolderPath = Path.Combine(baseFolder, "extract"); - - // var compileResult = WixRunner.Execute(new[] - // { - // "build", - // Path.Combine(bundleSourceFolder, "AlwaysInstallPrereqsBundle.wxs"), - // "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), - // "-intermediateFolder", intermediateFolder, - // "-o", bundleFile, - // }); - - // compileResult.AssertSuccess(); - - // Assert.True(File.Exists(bundleFile)); - - // var extractResult = BundleExtractor.ExtractBAContainer(null, bundleFile, baFolderPath, extractFolderPath); - // extractResult.AssertSuccess(); - - // var wixPrereqOptionsElements = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixPrereqOptions"); - // WixAssert.CompareLineByLine(new[] - // { - // "", - // }, wixPrereqOptionsElements); - - // var wixPrereqInformationElements = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixPrereqInformation"); - // WixAssert.CompareLineByLine(new[] - // { - // "", - // }, wixPrereqInformationElements); - // } - //} - - [Fact] - public void CannotBuildUsingMBAWithNoPrereqs() - { - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); - var bundleSourceFolder = TestData.Get(@"TestData", "MBA"); - var dataFolder = TestData.Get(@"TestData", ".Data"); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - - var compileResult = WixRunner.Execute(new[] - { - "build", - Path.Combine(bundleSourceFolder, "Bundle.wxs"), - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), - "-intermediateFolder", intermediateFolder, - "-bindpath", dataFolder, - "-o", bundleFile, - }); - - WixAssert.CompareLineByLine(new[] - { - "The WixManagedBootstrapperApplicationHost element has been deprecated.", - }, compileResult.Messages.Select(m => m.ToString()).ToArray()); - Assert.Equal(1130, compileResult.ExitCode); - - Assert.False(File.Exists(bundleFile)); - Assert.False(File.Exists(Path.Combine(intermediateFolder, "test.exe"))); - } - } - - [Fact] - public void CannotBuildUsingDncbaMissingBAFactoryPayload() - { - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); - var bundleSourceFolder = TestData.Get(@"TestData\Dncba"); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - - var compileResult = WixRunner.Execute(new[] - { - "build", - Path.Combine(bundleSourceFolder, "Bundle.wxs"), - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), - "-intermediateFolder", intermediateFolder, - "-o", bundleFile, - }); - - WixAssert.CompareLineByLine(new[] - { - "The WixDotNetCoreBootstrapperApplicationHost element has been deprecated.", - "The BootstrapperApplication element's Name or SourceFile attribute was not found; one of these is required." - }, compileResult.Messages.Select(x => x.ToString()).ToArray()); - Assert.Equal(44, compileResult.ExitCode); - - Assert.False(File.Exists(bundleFile)); - Assert.False(File.Exists(Path.Combine(intermediateFolder, "test.exe"))); - } - } - - [Fact] - public void CannotBuildUsingOverridableWrongCase() - { - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); - var bundleSourceFolder = TestData.Get(@"TestData"); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - var baFolderPath = Path.Combine(baseFolder, "ba"); - var extractFolderPath = Path.Combine(baseFolder, "extract"); - - var result = WixRunner.Execute(new[] - { - "build", - Path.Combine(bundleSourceFolder, "Overridable", "WrongCaseBundle.wxs"), - "-loc", Path.Combine(bundleSourceFolder, "Overridable", "WrongCaseBundle.wxl"), - "-bindpath", Path.Combine(bundleSourceFolder, "WixStdBa", "Data"), - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), - "-intermediateFolder", intermediateFolder, - "-o", bundleFile, - }); - - Assert.InRange(result.ExitCode, 2, Int32.MaxValue); - - var messages = result.Messages.Select(m => m.ToString()).ToList(); - messages.Sort(); - - WixAssert.CompareLineByLine(new[] - { - "bal:Condition/@Condition contains the built-in Variable 'WixBundleAction', which is not available when it is evaluated. (Unavailable Variables are: 'WixBundleAction'.). Rewrite the condition to avoid Variables that are never valid during its evaluation.", - "Overridable variable 'TEST1' collides with 'Test1' with Bundle/@CommandLineVariables value 'caseInsensitive'.", - "The *Package/@bal:DisplayInternalUICondition attribute's value '=' is not a valid bundle condition.", - "The location of the Variable related to the previous error.", - }, messages.ToArray()); - } - } - } -} diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/InternalUIBAFixture.cs b/src/ext/Bal/test/WixToolsetTest.Bal/InternalUIBAFixture.cs deleted file mode 100644 index 22e2fec1..00000000 --- a/src/ext/Bal/test/WixToolsetTest.Bal/InternalUIBAFixture.cs +++ /dev/null @@ -1,519 +0,0 @@ -// 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. - -namespace WixToolsetTest.Bal -{ - using System; - using System.IO; - using System.Linq; - using WixInternal.TestSupport; - using WixInternal.Core.TestPackage; - using Xunit; - - public class InternalUIBAFixture - { - [Fact] - public void CanBuildUsingWixIuiBa() - { - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); - var bundleSourceFolder = TestData.Get(@"TestData\WixIuiBa"); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - var baFolderPath = Path.Combine(baseFolder, "ba"); - var extractFolderPath = Path.Combine(baseFolder, "extract"); - - var compileResult = WixRunner.Execute(new[] - { - "build", - Path.Combine(bundleSourceFolder, "SinglePrimaryPackage.wxs"), - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), - "-intermediateFolder", intermediateFolder, - "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), - "-o", bundleFile, - }); - compileResult.AssertSuccess(); - - Assert.True(File.Exists(bundleFile)); - - var extractResult = BundleExtractor.ExtractBAContainer(null, bundleFile, baFolderPath, extractFolderPath); - extractResult.AssertSuccess(); - - var balPackageInfos = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixBalPackageInfo"); - WixAssert.CompareLineByLine(new string[] - { - "", - }, balPackageInfos); - - Assert.True(File.Exists(Path.Combine(baFolderPath, "wixpreq.thm"))); - Assert.True(File.Exists(Path.Combine(baFolderPath, "wixpreq.wxl"))); - } - } - - [Fact] - public void CanBuildUsingWixIuiBaWithUrlPrereqPackage() - { - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); - var bundleSourceFolder = TestData.Get(@"TestData\WixIuiBa"); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - var baFolderPath = Path.Combine(baseFolder, "ba"); - var extractFolderPath = Path.Combine(baseFolder, "extract"); - - var compileResult = WixRunner.Execute(new[] - { - "build", - Path.Combine(bundleSourceFolder, "UrlPrereqPackage.wxs"), - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), - "-intermediateFolder", intermediateFolder, - "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), - "-o", bundleFile, - }); - compileResult.AssertSuccess(); - - Assert.True(File.Exists(bundleFile)); - - var extractResult = BundleExtractor.ExtractBAContainer(null, bundleFile, baFolderPath, extractFolderPath); - extractResult.AssertSuccess(); - - var balPackageInfos = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixBalPackageInfo"); - WixAssert.CompareLineByLine(new string[] - { - "", - }, balPackageInfos); - - var mbaPrereqInfos = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixPrereqInformation"); - WixAssert.CompareLineByLine(new[] - { - "", - }, mbaPrereqInfos); - - Assert.True(File.Exists(Path.Combine(baFolderPath, "wixpreq.thm"))); - Assert.True(File.Exists(Path.Combine(baFolderPath, "wixpreq.wxl"))); - } - } - - [Fact] - public void CanBuildUsingWixIuiBaWithImplicitPrimaryPackage() - { - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); - var bundleSourceFolder = TestData.Get(@"TestData\WixIuiBa"); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - var baFolderPath = Path.Combine(baseFolder, "ba"); - var extractFolderPath = Path.Combine(baseFolder, "extract"); - - var compileResult = WixRunner.Execute(new[] - { - "build", - Path.Combine(bundleSourceFolder, "ImplicitPrimaryPackage.wxs"), - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), - "-intermediateFolder", intermediateFolder, - "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), - "-o", bundleFile, - }); - compileResult.AssertSuccess(); - - Assert.True(File.Exists(bundleFile)); - - var extractResult = BundleExtractor.ExtractBAContainer(null, bundleFile, baFolderPath, extractFolderPath); - extractResult.AssertSuccess(); - - var balPackageInfos = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixBalPackageInfo"); - WixAssert.CompareLineByLine(new string[] - { - "", - }, balPackageInfos); - - var mbaPrereqInfos = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixPrereqInformation"); - WixAssert.CompareLineByLine(new[] - { - "", - }, mbaPrereqInfos); - - Assert.True(File.Exists(Path.Combine(baFolderPath, "wixpreq.thm"))); - Assert.True(File.Exists(Path.Combine(baFolderPath, "wixpreq.wxl"))); - } - } - - [Fact] - public void CanBuildUsingWixIuiBaWithWarnings() - { - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); - var bundleSourceFolder = TestData.Get(@"TestData\WixIuiBa"); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - var baFolderPath = Path.Combine(baseFolder, "ba"); - var extractFolderPath = Path.Combine(baseFolder, "extract"); - - var compileResult = WixRunner.Execute(warningsAsErrors: false, new[] - { - "build", - Path.Combine(bundleSourceFolder, "IuiBaWarnings.wxs"), - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), - "-intermediateFolder", intermediateFolder, - "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), - "-o", bundleFile, - }); - - WixAssert.CompareLineByLine(new[] - { - "WixInternalUIBootstrapperApplication does not support the value of 'force' for Cache on prereq packages. Prereq packages are only cached when they need to be installed.", - "WixInternalUIBootstrapperApplication ignores InstallCondition for the primary package so that the MSI UI is always shown.", - "WixInternalUIBootstrapperApplication ignores DisplayInternalUICondition for the primary package so that the MSI UI is always shown.", - "When using WixInternalUIBootstrapperApplication, all prereq packages should be before the primary package in the chain. The prereq packages are always installed before the primary package.", - }, compileResult.Messages.Select(m => m.ToString()).ToArray()); - - compileResult.AssertSuccess(); - - Assert.True(File.Exists(bundleFile)); - - var extractResult = BundleExtractor.ExtractBAContainer(null, bundleFile, baFolderPath, extractFolderPath); - extractResult.AssertSuccess(); - - var balPackageInfos = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixBalPackageInfo"); - WixAssert.CompareLineByLine(new string[] - { - "", - }, balPackageInfos); - - var mbaPrereqInfos = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixPrereqInformation"); - WixAssert.CompareLineByLine(new[] - { - "", - }, mbaPrereqInfos); - - Assert.True(File.Exists(Path.Combine(baFolderPath, "wixpreq.thm"))); - Assert.True(File.Exists(Path.Combine(baFolderPath, "wixpreq.wxl"))); - } - } - - [Fact] - public void CannotBuildUsingWixIuiBaWithAllPrereqPackages() - { - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); - var bundleSourceFolder = TestData.Get(@"TestData\WixIuiBa"); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - - var compileResult = WixRunner.Execute(new[] - { - "build", - Path.Combine(bundleSourceFolder, "AllPrereqPackages.wxs"), - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), - "-intermediateFolder", intermediateFolder, - "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), - "-o", bundleFile, - }); - - WixAssert.CompareLineByLine(new[] - { - "When using WixInternalUIBootstrapperApplication, there must be one package with bal:PrimaryPackageType=\"default\".", - }, compileResult.Messages.Select(m => m.ToString()).ToArray()); - - Assert.Equal(6808, compileResult.ExitCode); - } - } - - [Fact] - public void CannotBuildUsingWixIuiBaWithImplicitNonMsiPrimaryPackage() - { - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); - var bundleSourceFolder = TestData.Get(@"TestData\WixIuiBa"); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - - var compileResult = WixRunner.Execute(new[] - { - "build", - Path.Combine(bundleSourceFolder, "ImplicitNonMsiPrimaryPackage.wxs"), - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), - "-intermediateFolder", intermediateFolder, - "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), - "-o", bundleFile, - }); - - WixAssert.CompareLineByLine(new[] - { - "When using WixInternalUIBootstrapperApplication, packages must either be non-permanent and have the bal:PrimaryPackageType attribute, or be permanent and have the bal:PrereqPackage attribute set to 'yes'.", - }, compileResult.Messages.Select(m => m.ToString()).ToArray()); - - Assert.Equal(6811, compileResult.ExitCode); - } - } - - [Fact] - public void CannotBuildUsingWixIuiBaWithImplicitPrimaryPackageEnableFeatureSelection() - { - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); - var bundleSourceFolder = TestData.Get(@"TestData\WixIuiBa"); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - - var compileResult = WixRunner.Execute(new[] - { - "build", - Path.Combine(bundleSourceFolder, "ImplicitPrimaryPackageEnableFeatureSelection.wxs"), - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), - "-intermediateFolder", intermediateFolder, - "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), - "-o", bundleFile, - }); - - WixAssert.CompareLineByLine(new[] - { - "When using WixInternalUIBootstrapperApplication, packages must either be non-permanent and have the bal:PrimaryPackageType attribute, or be permanent and have the bal:PrereqPackage attribute set to 'yes'.", - }, compileResult.Messages.Select(m => m.ToString()).ToArray()); - - Assert.Equal(6811, compileResult.ExitCode); - } - } - - [Fact] - public void CannotBuildUsingWixIuiBaWithMultipleNonPermanentNonPrimaryPackages() - { - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); - var bundleSourceFolder = TestData.Get(@"TestData\WixIuiBa"); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - - var compileResult = WixRunner.Execute(new[] - { - "build", - Path.Combine(bundleSourceFolder, "MultipleNonPermanentNonPrimaryPackages.wxs"), - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), - "-intermediateFolder", intermediateFolder, - "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), - "-o", bundleFile, - }); - - WixAssert.CompareLineByLine(new[] - { - "When using WixInternalUIBootstrapperApplication, packages must either be non-permanent and have the bal:PrimaryPackageType attribute, or be permanent and have the bal:PrereqPackage attribute set to 'yes'.", - "When using WixInternalUIBootstrapperApplication, packages must either be non-permanent and have the bal:PrimaryPackageType attribute, or be permanent and have the bal:PrereqPackage attribute set to 'yes'.", - }, compileResult.Messages.Select(m => m.ToString()).ToArray()); - - Assert.Equal(6811, compileResult.ExitCode); - } - } - - [Fact] - public void CannotBuildUsingWixIuiBaWithMultiplePrimaryPackagesOfSameType() - { - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); - var bundleSourceFolder = TestData.Get(@"TestData\WixIuiBa"); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - - var compileResult = WixRunner.Execute(new[] - { - "build", - Path.Combine(bundleSourceFolder, "MultipleDefaultPrimaryPackages.wxs"), - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), - "-intermediateFolder", intermediateFolder, - "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), - "-o", bundleFile, - }); - - WixAssert.CompareLineByLine(new[] - { - "There may only be one package in the bundle with PrimaryPackageType of 'default'.", - "The location of the package related to the previous error.", - }, compileResult.Messages.Select(m => m.ToString()).ToArray()); - - Assert.Equal(6810, compileResult.ExitCode); - } - } - - [Fact] - public void CannotBuildUsingWixIuiBaWithNoDefaultPrimaryPackage() - { - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); - var bundleSourceFolder = TestData.Get(@"TestData\WixIuiBa"); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - - var compileResult = WixRunner.Execute(new[] - { - "build", - Path.Combine(bundleSourceFolder, "NoDefaultPrimaryPackage.wxs"), - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), - "-intermediateFolder", intermediateFolder, - "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), - "-o", bundleFile, - }); - - WixAssert.CompareLineByLine(new[] - { - "When using WixInternalUIBootstrapperApplication, there must be one package with bal:PrimaryPackageType=\"default\".", - }, compileResult.Messages.Select(m => m.ToString()).ToArray()); - - Assert.Equal(6808, compileResult.ExitCode); - } - } - - [Fact] - public void CannotBuildUsingWixIuiBaWithNonMsiPrimaryPackage() - { - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); - var bundleSourceFolder = TestData.Get(@"TestData\WixIuiBa"); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - - var compileResult = WixRunner.Execute(new[] - { - "build", - Path.Combine(bundleSourceFolder, "NonMsiPrimaryPackage.wxs"), - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), - "-intermediateFolder", intermediateFolder, - "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), - "-o", bundleFile, - }); - - WixAssert.CompareLineByLine(new[] - { - "When using WixInternalUIBootstrapperApplication, each primary package must be an MsiPackage.", - }, compileResult.Messages.Select(m => m.ToString()).ToArray()); - - Assert.Equal(6814, compileResult.ExitCode); - } - } - - [Fact] - public void CannotBuildUsingWixIuiBaWithNonPermanentPrereqPackage() - { - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); - var bundleSourceFolder = TestData.Get(@"TestData\WixIuiBa"); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - - var compileResult = WixRunner.Execute(new[] - { - "build", - Path.Combine(bundleSourceFolder, "NonPermanentPrereqPackage.wxs"), - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), - "-intermediateFolder", intermediateFolder, - "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), - "-o", bundleFile, - }); - - WixAssert.CompareLineByLine(new[] - { - "When using WixInternalUIBootstrapperApplication and bal:PrereqPackage is set to 'yes', the package must be permanent.", - }, compileResult.Messages.Select(m => m.ToString()).ToArray()); - - Assert.Equal(6812, compileResult.ExitCode); - } - } - - [Fact] - public void CannotBuildUsingWixIuiBaWithPermanentPrimaryPackage() - { - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); - var bundleSourceFolder = TestData.Get(@"TestData\WixIuiBa"); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - - var compileResult = WixRunner.Execute(new[] - { - "build", - Path.Combine(bundleSourceFolder, "PermanentPrimaryPackage.wxs"), - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), - "-intermediateFolder", intermediateFolder, - "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), - "-o", bundleFile, - }); - - WixAssert.CompareLineByLine(new[] - { - "When using WixInternalUIBootstrapperApplication, packages with the bal:PrimaryPackageType attribute must not be permanent.", - "When using WixInternalUIBootstrapperApplication, there must be one package with bal:PrimaryPackageType=\"default\".", - }, compileResult.Messages.Select(m => m.ToString()).ToArray()); - - Assert.Equal(6808, compileResult.ExitCode); - } - } - - [Fact] - public void CannotBuildUsingWixIuiBaWithPrimaryPackageEnableFeatureSelection() - { - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); - var bundleSourceFolder = TestData.Get(@"TestData\WixIuiBa"); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - - var compileResult = WixRunner.Execute(new[] - { - "build", - Path.Combine(bundleSourceFolder, "PrimaryPackageEnableFeatureSelection.wxs"), - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), - "-intermediateFolder", intermediateFolder, - "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), - "-o", bundleFile, - }); - - WixAssert.CompareLineByLine(new[] - { - "When using WixInternalUIBootstrapperApplication, primary packages must not have feature selection enabled because it interferes with the user selecting feature through the MSI UI.", - "When using WixInternalUIBootstrapperApplication, there must be one package with bal:PrimaryPackageType=\"default\".", - }, compileResult.Messages.Select(m => m.ToString()).ToArray()); - - Assert.Equal(6808, compileResult.ExitCode); - } - } - - [Fact] - public void CannotBuildUsingWixIuiBaWithPrimaryPrereqPackage() - { - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var wixlibFile = Path.Combine(baseFolder, "bin", "test.wixlib"); - var bundleSourceFolder = TestData.Get(@"TestData\WixIuiBa"); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - - var compileResult = WixRunner.Execute(new[] - { - "build", - Path.Combine(bundleSourceFolder, "PrimaryPrereqPackage.wxs"), - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), - "-intermediateFolder", intermediateFolder, - "-o", wixlibFile, - }); - - WixAssert.CompareLineByLine(new[] - { - "The MsiPackage/@PrereqPackage attribute's value, 'yes', cannot be specified with attribute PrimaryPackageType present.", - }, compileResult.Messages.Select(m => m.ToString()).ToArray()); - - Assert.Equal(193, compileResult.ExitCode); - } - } - } -} diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/.Data/fake.exe b/src/ext/Bal/test/WixToolsetTest.Bal/TestData/.Data/fake.exe deleted file mode 100644 index f27639e9..00000000 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/.Data/fake.exe +++ /dev/null @@ -1 +0,0 @@ -This is fake.exe \ No newline at end of file diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/Dncba/Bundle.wxs b/src/ext/Bal/test/WixToolsetTest.Bal/TestData/Dncba/Bundle.wxs deleted file mode 100644 index 5b25da8c..00000000 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/Dncba/Bundle.wxs +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/MBA/AlwaysInstallPrereqsBundle.wxs b/src/ext/Bal/test/WixToolsetTest.Bal/TestData/MBA/AlwaysInstallPrereqsBundle.wxs deleted file mode 100644 index 685fef7b..00000000 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/MBA/AlwaysInstallPrereqsBundle.wxs +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs b/src/ext/Bal/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs deleted file mode 100644 index 59be4bd4..00000000 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs b/src/ext/Bal/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs deleted file mode 100644 index 1274826f..00000000 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/Overridable/WrongCaseBundle.wxl b/src/ext/Bal/test/WixToolsetTest.Bal/TestData/Overridable/WrongCaseBundle.wxl deleted file mode 100644 index 0667c3cb..00000000 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/Overridable/WrongCaseBundle.wxl +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/Overridable/WrongCaseBundle.wxs b/src/ext/Bal/test/WixToolsetTest.Bal/TestData/Overridable/WrongCaseBundle.wxs deleted file mode 100644 index 67dfc589..00000000 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/Overridable/WrongCaseBundle.wxs +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/AllPrereqPackages.wxs b/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/AllPrereqPackages.wxs deleted file mode 100644 index 17f1ee77..00000000 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/AllPrereqPackages.wxs +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/ImplicitNonMsiPrimaryPackage.wxs b/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/ImplicitNonMsiPrimaryPackage.wxs deleted file mode 100644 index ca1f9358..00000000 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/ImplicitNonMsiPrimaryPackage.wxs +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/ImplicitPrimaryPackage.wxs b/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/ImplicitPrimaryPackage.wxs deleted file mode 100644 index 16a99e92..00000000 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/ImplicitPrimaryPackage.wxs +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/ImplicitPrimaryPackageEnableFeatureSelection.wxs b/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/ImplicitPrimaryPackageEnableFeatureSelection.wxs deleted file mode 100644 index 85b9df65..00000000 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/ImplicitPrimaryPackageEnableFeatureSelection.wxs +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/IuibaWarnings.wxs b/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/IuibaWarnings.wxs deleted file mode 100644 index 2cf9787d..00000000 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/IuibaWarnings.wxs +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/MultipleDefaultPrimaryPackages.wxs b/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/MultipleDefaultPrimaryPackages.wxs deleted file mode 100644 index 11736fbb..00000000 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/MultipleDefaultPrimaryPackages.wxs +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/MultipleNonPermanentNonPrimaryPackages.wxs b/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/MultipleNonPermanentNonPrimaryPackages.wxs deleted file mode 100644 index c5b923df..00000000 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/MultipleNonPermanentNonPrimaryPackages.wxs +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/NoDefaultPrimaryPackage.wxs b/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/NoDefaultPrimaryPackage.wxs deleted file mode 100644 index 7f7528d0..00000000 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/NoDefaultPrimaryPackage.wxs +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/NonMsiPrimaryPackage.wxs b/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/NonMsiPrimaryPackage.wxs deleted file mode 100644 index a6f93bcb..00000000 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/NonMsiPrimaryPackage.wxs +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/NonPermanentPrereqPackage.wxs b/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/NonPermanentPrereqPackage.wxs deleted file mode 100644 index a60943b0..00000000 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/NonPermanentPrereqPackage.wxs +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/PermanentPrimaryPackage.wxs b/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/PermanentPrimaryPackage.wxs deleted file mode 100644 index 43caaf86..00000000 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/PermanentPrimaryPackage.wxs +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/PrimaryPackageEnableFeatureSelection.wxs b/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/PrimaryPackageEnableFeatureSelection.wxs deleted file mode 100644 index 4f1c40dd..00000000 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/PrimaryPackageEnableFeatureSelection.wxs +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/PrimaryPrereqPackage.wxs b/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/PrimaryPrereqPackage.wxs deleted file mode 100644 index bdb8c470..00000000 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/PrimaryPrereqPackage.wxs +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/SinglePrimaryPackage.wxs b/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/SinglePrimaryPackage.wxs deleted file mode 100644 index 1e9a87c2..00000000 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/SinglePrimaryPackage.wxs +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/UrlPrereqPackage.wxs b/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/UrlPrereqPackage.wxs deleted file mode 100644 index 0c68908c..00000000 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixIuiBa/UrlPrereqPackage.wxs +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs b/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs deleted file mode 100644 index c17b53ff..00000000 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixStdBa/Data/test.msi b/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixStdBa/Data/test.msi deleted file mode 100644 index 94aacd1a..00000000 Binary files a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixStdBa/Data/test.msi and /dev/null differ diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixStdBa/DisplayInternalUIConditionBundle.wxs b/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixStdBa/DisplayInternalUIConditionBundle.wxs deleted file mode 100644 index f08cfe6a..00000000 --- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixStdBa/DisplayInternalUIConditionBundle.wxs +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj b/src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj deleted file mode 100644 index 644fb625..00000000 --- a/src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - net6.0 - true - - - - - - - - - - - - - - - - - - diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.v3.ncrunchproject b/src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.v3.ncrunchproject deleted file mode 100644 index 7b5b2139..00000000 --- a/src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.v3.ncrunchproject +++ /dev/null @@ -1,5 +0,0 @@ - - - True - - \ No newline at end of file diff --git a/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/BalExtensionFixture.cs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/BalExtensionFixture.cs new file mode 100644 index 00000000..a9460008 --- /dev/null +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/BalExtensionFixture.cs @@ -0,0 +1,262 @@ +// 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. + +namespace WixToolsetTest.BootstrapperApplications +{ + using System; + using System.IO; + using System.Linq; + using System.Xml; + using WixToolset.BootstrapperApplications; + using WixInternal.Core.TestPackage; + using WixInternal.TestSupport; + using Xunit; + + public class BalExtensionFixture + { + [Fact] + public void CanBuildUsingDisplayInternalUICondition() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); + var bundleSourceFolder = TestData.Get(@"TestData\WixStdBa"); + var intermediateFolder = Path.Combine(baseFolder, "obj"); + var baFolderPath = Path.Combine(baseFolder, "ba"); + var extractFolderPath = Path.Combine(baseFolder, "extract"); + + var compileResult = WixRunner.Execute(new[] + { + "build", + Path.Combine(bundleSourceFolder, "DisplayInternalUIConditionBundle.wxs"), + "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), + "-intermediateFolder", intermediateFolder, + "-bindpath", Path.Combine(bundleSourceFolder, "data"), + "-o", bundleFile, + }); + compileResult.AssertSuccess(); + + Assert.True(File.Exists(bundleFile)); + + var extractResult = BundleExtractor.ExtractBAContainer(null, bundleFile, baFolderPath, extractFolderPath); + extractResult.AssertSuccess(); + + var balPackageInfos = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixBalPackageInfo"); + WixAssert.CompareLineByLine(new string[] + { + "", + }, balPackageInfos); + + Assert.True(File.Exists(Path.Combine(baFolderPath, "thm.wxl"))); + } + } + + [Fact] + public void CanBuildUsingOverridable() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); + var bundleSourceFolder = TestData.Get(@"TestData\Overridable"); + var intermediateFolder = Path.Combine(baseFolder, "obj"); + var baFolderPath = Path.Combine(baseFolder, "ba"); + var extractFolderPath = Path.Combine(baseFolder, "extract"); + + var compileResult = WixRunner.Execute(new[] + { + "build", + Path.Combine(bundleSourceFolder, "Bundle.wxs"), + "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), + "-intermediateFolder", intermediateFolder, + "-o", bundleFile, + }); + compileResult.AssertSuccess(); + + Assert.True(File.Exists(bundleFile)); + + var extractResult = BundleExtractor.ExtractBAContainer(null, bundleFile, baFolderPath, extractFolderPath); + extractResult.AssertSuccess(); + + var balCommandLines = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixStdbaCommandLine"); + WixAssert.CompareLineByLine(new[] + { + "", + }, balCommandLines); + + var balOverridableVariables = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixStdbaOverridableVariable"); + WixAssert.CompareLineByLine(new[] + { + "", + }, balOverridableVariables); + } + } + + [Fact] + public void CanBuildUsingWixStdBa() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); + var bundleSourceFolder = TestData.Get(@"TestData\WixStdBa"); + var intermediateFolder = Path.Combine(baseFolder, "obj"); + + var compileResult = WixRunner.Execute(new[] + { + "build", + Path.Combine(bundleSourceFolder, "Bundle.wxs"), + "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), + "-intermediateFolder", intermediateFolder, + "-o", bundleFile, + }); + compileResult.AssertSuccess(); + + Assert.True(File.Exists(bundleFile)); + } + } + + //[Fact] + //public void CanBuildUsingMBAWithAlwaysInstallPrereqs() + //{ + // using (var fs = new DisposableFileSystem()) + // { + // var baseFolder = fs.GetFolder(); + // var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); + // var bundleSourceFolder = TestData.Get("TestData", "MBA"); + // var intermediateFolder = Path.Combine(baseFolder, "obj"); + // var baFolderPath = Path.Combine(baseFolder, "ba"); + // var extractFolderPath = Path.Combine(baseFolder, "extract"); + + // var compileResult = WixRunner.Execute(new[] + // { + // "build", + // Path.Combine(bundleSourceFolder, "AlwaysInstallPrereqsBundle.wxs"), + // "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), + // "-intermediateFolder", intermediateFolder, + // "-o", bundleFile, + // }); + + // compileResult.AssertSuccess(); + + // Assert.True(File.Exists(bundleFile)); + + // var extractResult = BundleExtractor.ExtractBAContainer(null, bundleFile, baFolderPath, extractFolderPath); + // extractResult.AssertSuccess(); + + // var wixPrereqOptionsElements = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixPrereqOptions"); + // WixAssert.CompareLineByLine(new[] + // { + // "", + // }, wixPrereqOptionsElements); + + // var wixPrereqInformationElements = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixPrereqInformation"); + // WixAssert.CompareLineByLine(new[] + // { + // "", + // }, wixPrereqInformationElements); + // } + //} + + [Fact] + public void CannotBuildUsingMBAWithNoPrereqs() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); + var bundleSourceFolder = TestData.Get(@"TestData", "MBA"); + var dataFolder = TestData.Get(@"TestData", ".Data"); + var intermediateFolder = Path.Combine(baseFolder, "obj"); + + var compileResult = WixRunner.Execute(new[] + { + "build", + Path.Combine(bundleSourceFolder, "Bundle.wxs"), + "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), + "-intermediateFolder", intermediateFolder, + "-bindpath", dataFolder, + "-o", bundleFile, + }); + + WixAssert.CompareLineByLine(new[] + { + "The WixManagedBootstrapperApplicationHost element has been deprecated.", + }, compileResult.Messages.Select(m => m.ToString()).ToArray()); + Assert.Equal(1130, compileResult.ExitCode); + + Assert.False(File.Exists(bundleFile)); + Assert.False(File.Exists(Path.Combine(intermediateFolder, "test.exe"))); + } + } + + [Fact] + public void CannotBuildUsingDncbaMissingBAFactoryPayload() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); + var bundleSourceFolder = TestData.Get(@"TestData\Dncba"); + var intermediateFolder = Path.Combine(baseFolder, "obj"); + + var compileResult = WixRunner.Execute(new[] + { + "build", + Path.Combine(bundleSourceFolder, "Bundle.wxs"), + "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), + "-intermediateFolder", intermediateFolder, + "-o", bundleFile, + }); + + WixAssert.CompareLineByLine(new[] + { + "The WixDotNetCoreBootstrapperApplicationHost element has been deprecated.", + "The BootstrapperApplication element's Name or SourceFile attribute was not found; one of these is required." + }, compileResult.Messages.Select(x => x.ToString()).ToArray()); + Assert.Equal(44, compileResult.ExitCode); + + Assert.False(File.Exists(bundleFile)); + Assert.False(File.Exists(Path.Combine(intermediateFolder, "test.exe"))); + } + } + + [Fact] + public void CannotBuildUsingOverridableWrongCase() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); + var bundleSourceFolder = TestData.Get(@"TestData"); + var intermediateFolder = Path.Combine(baseFolder, "obj"); + var baFolderPath = Path.Combine(baseFolder, "ba"); + var extractFolderPath = Path.Combine(baseFolder, "extract"); + + var result = WixRunner.Execute(new[] + { + "build", + Path.Combine(bundleSourceFolder, "Overridable", "WrongCaseBundle.wxs"), + "-loc", Path.Combine(bundleSourceFolder, "Overridable", "WrongCaseBundle.wxl"), + "-bindpath", Path.Combine(bundleSourceFolder, "WixStdBa", "Data"), + "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), + "-intermediateFolder", intermediateFolder, + "-o", bundleFile, + }); + + Assert.InRange(result.ExitCode, 2, Int32.MaxValue); + + var messages = result.Messages.Select(m => m.ToString()).ToList(); + messages.Sort(); + + WixAssert.CompareLineByLine(new[] + { + "bal:Condition/@Condition contains the built-in Variable 'WixBundleAction', which is not available when it is evaluated. (Unavailable Variables are: 'WixBundleAction'.). Rewrite the condition to avoid Variables that are never valid during its evaluation.", + "Overridable variable 'TEST1' collides with 'Test1' with Bundle/@CommandLineVariables value 'caseInsensitive'.", + "The *Package/@bal:DisplayInternalUICondition attribute's value '=' is not a valid bundle condition.", + "The location of the Variable related to the previous error.", + }, messages.ToArray()); + } + } + } +} diff --git a/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/InternalUIBAFixture.cs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/InternalUIBAFixture.cs new file mode 100644 index 00000000..7e64c13f --- /dev/null +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/InternalUIBAFixture.cs @@ -0,0 +1,519 @@ +// 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. + +namespace WixToolsetTest.BootstrapperApplications +{ + using System; + using System.IO; + using System.Linq; + using WixInternal.TestSupport; + using WixInternal.Core.TestPackage; + using Xunit; + + public class InternalUIBAFixture + { + [Fact] + public void CanBuildUsingWixIuiBa() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); + var bundleSourceFolder = TestData.Get(@"TestData\WixIuiBa"); + var intermediateFolder = Path.Combine(baseFolder, "obj"); + var baFolderPath = Path.Combine(baseFolder, "ba"); + var extractFolderPath = Path.Combine(baseFolder, "extract"); + + var compileResult = WixRunner.Execute(new[] + { + "build", + Path.Combine(bundleSourceFolder, "SinglePrimaryPackage.wxs"), + "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), + "-intermediateFolder", intermediateFolder, + "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), + "-o", bundleFile, + }); + compileResult.AssertSuccess(); + + Assert.True(File.Exists(bundleFile)); + + var extractResult = BundleExtractor.ExtractBAContainer(null, bundleFile, baFolderPath, extractFolderPath); + extractResult.AssertSuccess(); + + var balPackageInfos = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixBalPackageInfo"); + WixAssert.CompareLineByLine(new string[] + { + "", + }, balPackageInfos); + + Assert.True(File.Exists(Path.Combine(baFolderPath, "wixpreq.thm"))); + Assert.True(File.Exists(Path.Combine(baFolderPath, "wixpreq.wxl"))); + } + } + + [Fact] + public void CanBuildUsingWixIuiBaWithUrlPrereqPackage() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); + var bundleSourceFolder = TestData.Get(@"TestData\WixIuiBa"); + var intermediateFolder = Path.Combine(baseFolder, "obj"); + var baFolderPath = Path.Combine(baseFolder, "ba"); + var extractFolderPath = Path.Combine(baseFolder, "extract"); + + var compileResult = WixRunner.Execute(new[] + { + "build", + Path.Combine(bundleSourceFolder, "UrlPrereqPackage.wxs"), + "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), + "-intermediateFolder", intermediateFolder, + "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), + "-o", bundleFile, + }); + compileResult.AssertSuccess(); + + Assert.True(File.Exists(bundleFile)); + + var extractResult = BundleExtractor.ExtractBAContainer(null, bundleFile, baFolderPath, extractFolderPath); + extractResult.AssertSuccess(); + + var balPackageInfos = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixBalPackageInfo"); + WixAssert.CompareLineByLine(new string[] + { + "", + }, balPackageInfos); + + var mbaPrereqInfos = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixPrereqInformation"); + WixAssert.CompareLineByLine(new[] + { + "", + }, mbaPrereqInfos); + + Assert.True(File.Exists(Path.Combine(baFolderPath, "wixpreq.thm"))); + Assert.True(File.Exists(Path.Combine(baFolderPath, "wixpreq.wxl"))); + } + } + + [Fact] + public void CanBuildUsingWixIuiBaWithImplicitPrimaryPackage() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); + var bundleSourceFolder = TestData.Get(@"TestData\WixIuiBa"); + var intermediateFolder = Path.Combine(baseFolder, "obj"); + var baFolderPath = Path.Combine(baseFolder, "ba"); + var extractFolderPath = Path.Combine(baseFolder, "extract"); + + var compileResult = WixRunner.Execute(new[] + { + "build", + Path.Combine(bundleSourceFolder, "ImplicitPrimaryPackage.wxs"), + "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), + "-intermediateFolder", intermediateFolder, + "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), + "-o", bundleFile, + }); + compileResult.AssertSuccess(); + + Assert.True(File.Exists(bundleFile)); + + var extractResult = BundleExtractor.ExtractBAContainer(null, bundleFile, baFolderPath, extractFolderPath); + extractResult.AssertSuccess(); + + var balPackageInfos = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixBalPackageInfo"); + WixAssert.CompareLineByLine(new string[] + { + "", + }, balPackageInfos); + + var mbaPrereqInfos = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixPrereqInformation"); + WixAssert.CompareLineByLine(new[] + { + "", + }, mbaPrereqInfos); + + Assert.True(File.Exists(Path.Combine(baFolderPath, "wixpreq.thm"))); + Assert.True(File.Exists(Path.Combine(baFolderPath, "wixpreq.wxl"))); + } + } + + [Fact] + public void CanBuildUsingWixIuiBaWithWarnings() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); + var bundleSourceFolder = TestData.Get(@"TestData\WixIuiBa"); + var intermediateFolder = Path.Combine(baseFolder, "obj"); + var baFolderPath = Path.Combine(baseFolder, "ba"); + var extractFolderPath = Path.Combine(baseFolder, "extract"); + + var compileResult = WixRunner.Execute(warningsAsErrors: false, new[] + { + "build", + Path.Combine(bundleSourceFolder, "IuiBaWarnings.wxs"), + "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), + "-intermediateFolder", intermediateFolder, + "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), + "-o", bundleFile, + }); + + WixAssert.CompareLineByLine(new[] + { + "WixInternalUIBootstrapperApplication does not support the value of 'force' for Cache on prereq packages. Prereq packages are only cached when they need to be installed.", + "WixInternalUIBootstrapperApplication ignores InstallCondition for the primary package so that the MSI UI is always shown.", + "WixInternalUIBootstrapperApplication ignores DisplayInternalUICondition for the primary package so that the MSI UI is always shown.", + "When using WixInternalUIBootstrapperApplication, all prereq packages should be before the primary package in the chain. The prereq packages are always installed before the primary package.", + }, compileResult.Messages.Select(m => m.ToString()).ToArray()); + + compileResult.AssertSuccess(); + + Assert.True(File.Exists(bundleFile)); + + var extractResult = BundleExtractor.ExtractBAContainer(null, bundleFile, baFolderPath, extractFolderPath); + extractResult.AssertSuccess(); + + var balPackageInfos = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixBalPackageInfo"); + WixAssert.CompareLineByLine(new string[] + { + "", + }, balPackageInfos); + + var mbaPrereqInfos = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixPrereqInformation"); + WixAssert.CompareLineByLine(new[] + { + "", + }, mbaPrereqInfos); + + Assert.True(File.Exists(Path.Combine(baFolderPath, "wixpreq.thm"))); + Assert.True(File.Exists(Path.Combine(baFolderPath, "wixpreq.wxl"))); + } + } + + [Fact] + public void CannotBuildUsingWixIuiBaWithAllPrereqPackages() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); + var bundleSourceFolder = TestData.Get(@"TestData\WixIuiBa"); + var intermediateFolder = Path.Combine(baseFolder, "obj"); + + var compileResult = WixRunner.Execute(new[] + { + "build", + Path.Combine(bundleSourceFolder, "AllPrereqPackages.wxs"), + "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), + "-intermediateFolder", intermediateFolder, + "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), + "-o", bundleFile, + }); + + WixAssert.CompareLineByLine(new[] + { + "When using WixInternalUIBootstrapperApplication, there must be one package with bal:PrimaryPackageType=\"default\".", + }, compileResult.Messages.Select(m => m.ToString()).ToArray()); + + Assert.Equal(6808, compileResult.ExitCode); + } + } + + [Fact] + public void CannotBuildUsingWixIuiBaWithImplicitNonMsiPrimaryPackage() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); + var bundleSourceFolder = TestData.Get(@"TestData\WixIuiBa"); + var intermediateFolder = Path.Combine(baseFolder, "obj"); + + var compileResult = WixRunner.Execute(new[] + { + "build", + Path.Combine(bundleSourceFolder, "ImplicitNonMsiPrimaryPackage.wxs"), + "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), + "-intermediateFolder", intermediateFolder, + "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), + "-o", bundleFile, + }); + + WixAssert.CompareLineByLine(new[] + { + "When using WixInternalUIBootstrapperApplication, packages must either be non-permanent and have the bal:PrimaryPackageType attribute, or be permanent and have the bal:PrereqPackage attribute set to 'yes'.", + }, compileResult.Messages.Select(m => m.ToString()).ToArray()); + + Assert.Equal(6811, compileResult.ExitCode); + } + } + + [Fact] + public void CannotBuildUsingWixIuiBaWithImplicitPrimaryPackageEnableFeatureSelection() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); + var bundleSourceFolder = TestData.Get(@"TestData\WixIuiBa"); + var intermediateFolder = Path.Combine(baseFolder, "obj"); + + var compileResult = WixRunner.Execute(new[] + { + "build", + Path.Combine(bundleSourceFolder, "ImplicitPrimaryPackageEnableFeatureSelection.wxs"), + "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), + "-intermediateFolder", intermediateFolder, + "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), + "-o", bundleFile, + }); + + WixAssert.CompareLineByLine(new[] + { + "When using WixInternalUIBootstrapperApplication, packages must either be non-permanent and have the bal:PrimaryPackageType attribute, or be permanent and have the bal:PrereqPackage attribute set to 'yes'.", + }, compileResult.Messages.Select(m => m.ToString()).ToArray()); + + Assert.Equal(6811, compileResult.ExitCode); + } + } + + [Fact] + public void CannotBuildUsingWixIuiBaWithMultipleNonPermanentNonPrimaryPackages() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); + var bundleSourceFolder = TestData.Get(@"TestData\WixIuiBa"); + var intermediateFolder = Path.Combine(baseFolder, "obj"); + + var compileResult = WixRunner.Execute(new[] + { + "build", + Path.Combine(bundleSourceFolder, "MultipleNonPermanentNonPrimaryPackages.wxs"), + "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), + "-intermediateFolder", intermediateFolder, + "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), + "-o", bundleFile, + }); + + WixAssert.CompareLineByLine(new[] + { + "When using WixInternalUIBootstrapperApplication, packages must either be non-permanent and have the bal:PrimaryPackageType attribute, or be permanent and have the bal:PrereqPackage attribute set to 'yes'.", + "When using WixInternalUIBootstrapperApplication, packages must either be non-permanent and have the bal:PrimaryPackageType attribute, or be permanent and have the bal:PrereqPackage attribute set to 'yes'.", + }, compileResult.Messages.Select(m => m.ToString()).ToArray()); + + Assert.Equal(6811, compileResult.ExitCode); + } + } + + [Fact] + public void CannotBuildUsingWixIuiBaWithMultiplePrimaryPackagesOfSameType() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); + var bundleSourceFolder = TestData.Get(@"TestData\WixIuiBa"); + var intermediateFolder = Path.Combine(baseFolder, "obj"); + + var compileResult = WixRunner.Execute(new[] + { + "build", + Path.Combine(bundleSourceFolder, "MultipleDefaultPrimaryPackages.wxs"), + "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), + "-intermediateFolder", intermediateFolder, + "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), + "-o", bundleFile, + }); + + WixAssert.CompareLineByLine(new[] + { + "There may only be one package in the bundle with PrimaryPackageType of 'default'.", + "The location of the package related to the previous error.", + }, compileResult.Messages.Select(m => m.ToString()).ToArray()); + + Assert.Equal(6810, compileResult.ExitCode); + } + } + + [Fact] + public void CannotBuildUsingWixIuiBaWithNoDefaultPrimaryPackage() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); + var bundleSourceFolder = TestData.Get(@"TestData\WixIuiBa"); + var intermediateFolder = Path.Combine(baseFolder, "obj"); + + var compileResult = WixRunner.Execute(new[] + { + "build", + Path.Combine(bundleSourceFolder, "NoDefaultPrimaryPackage.wxs"), + "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), + "-intermediateFolder", intermediateFolder, + "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), + "-o", bundleFile, + }); + + WixAssert.CompareLineByLine(new[] + { + "When using WixInternalUIBootstrapperApplication, there must be one package with bal:PrimaryPackageType=\"default\".", + }, compileResult.Messages.Select(m => m.ToString()).ToArray()); + + Assert.Equal(6808, compileResult.ExitCode); + } + } + + [Fact] + public void CannotBuildUsingWixIuiBaWithNonMsiPrimaryPackage() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); + var bundleSourceFolder = TestData.Get(@"TestData\WixIuiBa"); + var intermediateFolder = Path.Combine(baseFolder, "obj"); + + var compileResult = WixRunner.Execute(new[] + { + "build", + Path.Combine(bundleSourceFolder, "NonMsiPrimaryPackage.wxs"), + "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), + "-intermediateFolder", intermediateFolder, + "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), + "-o", bundleFile, + }); + + WixAssert.CompareLineByLine(new[] + { + "When using WixInternalUIBootstrapperApplication, each primary package must be an MsiPackage.", + }, compileResult.Messages.Select(m => m.ToString()).ToArray()); + + Assert.Equal(6814, compileResult.ExitCode); + } + } + + [Fact] + public void CannotBuildUsingWixIuiBaWithNonPermanentPrereqPackage() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); + var bundleSourceFolder = TestData.Get(@"TestData\WixIuiBa"); + var intermediateFolder = Path.Combine(baseFolder, "obj"); + + var compileResult = WixRunner.Execute(new[] + { + "build", + Path.Combine(bundleSourceFolder, "NonPermanentPrereqPackage.wxs"), + "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), + "-intermediateFolder", intermediateFolder, + "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), + "-o", bundleFile, + }); + + WixAssert.CompareLineByLine(new[] + { + "When using WixInternalUIBootstrapperApplication and bal:PrereqPackage is set to 'yes', the package must be permanent.", + }, compileResult.Messages.Select(m => m.ToString()).ToArray()); + + Assert.Equal(6812, compileResult.ExitCode); + } + } + + [Fact] + public void CannotBuildUsingWixIuiBaWithPermanentPrimaryPackage() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); + var bundleSourceFolder = TestData.Get(@"TestData\WixIuiBa"); + var intermediateFolder = Path.Combine(baseFolder, "obj"); + + var compileResult = WixRunner.Execute(new[] + { + "build", + Path.Combine(bundleSourceFolder, "PermanentPrimaryPackage.wxs"), + "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), + "-intermediateFolder", intermediateFolder, + "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), + "-o", bundleFile, + }); + + WixAssert.CompareLineByLine(new[] + { + "When using WixInternalUIBootstrapperApplication, packages with the bal:PrimaryPackageType attribute must not be permanent.", + "When using WixInternalUIBootstrapperApplication, there must be one package with bal:PrimaryPackageType=\"default\".", + }, compileResult.Messages.Select(m => m.ToString()).ToArray()); + + Assert.Equal(6808, compileResult.ExitCode); + } + } + + [Fact] + public void CannotBuildUsingWixIuiBaWithPrimaryPackageEnableFeatureSelection() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); + var bundleSourceFolder = TestData.Get(@"TestData\WixIuiBa"); + var intermediateFolder = Path.Combine(baseFolder, "obj"); + + var compileResult = WixRunner.Execute(new[] + { + "build", + Path.Combine(bundleSourceFolder, "PrimaryPackageEnableFeatureSelection.wxs"), + "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), + "-intermediateFolder", intermediateFolder, + "-bindpath", TestData.Get(@"TestData\WixStdBa\Data"), + "-o", bundleFile, + }); + + WixAssert.CompareLineByLine(new[] + { + "When using WixInternalUIBootstrapperApplication, primary packages must not have feature selection enabled because it interferes with the user selecting feature through the MSI UI.", + "When using WixInternalUIBootstrapperApplication, there must be one package with bal:PrimaryPackageType=\"default\".", + }, compileResult.Messages.Select(m => m.ToString()).ToArray()); + + Assert.Equal(6808, compileResult.ExitCode); + } + } + + [Fact] + public void CannotBuildUsingWixIuiBaWithPrimaryPrereqPackage() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var wixlibFile = Path.Combine(baseFolder, "bin", "test.wixlib"); + var bundleSourceFolder = TestData.Get(@"TestData\WixIuiBa"); + var intermediateFolder = Path.Combine(baseFolder, "obj"); + + var compileResult = WixRunner.Execute(new[] + { + "build", + Path.Combine(bundleSourceFolder, "PrimaryPrereqPackage.wxs"), + "-ext", TestData.Get(@"WixToolset.BootstrapperApplications.wixext.dll"), + "-intermediateFolder", intermediateFolder, + "-o", wixlibFile, + }); + + WixAssert.CompareLineByLine(new[] + { + "The MsiPackage/@PrereqPackage attribute's value, 'yes', cannot be specified with attribute PrimaryPackageType present.", + }, compileResult.Messages.Select(m => m.ToString()).ToArray()); + + Assert.Equal(193, compileResult.ExitCode); + } + } + } +} diff --git a/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/.Data/fake.exe b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/.Data/fake.exe new file mode 100644 index 00000000..f27639e9 --- /dev/null +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/.Data/fake.exe @@ -0,0 +1 @@ +This is fake.exe \ No newline at end of file diff --git a/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/Dncba/Bundle.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/Dncba/Bundle.wxs new file mode 100644 index 00000000..5b25da8c --- /dev/null +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/Dncba/Bundle.wxs @@ -0,0 +1,13 @@ + + + + + + + + + + + + diff --git a/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/MBA/AlwaysInstallPrereqsBundle.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/MBA/AlwaysInstallPrereqsBundle.wxs new file mode 100644 index 00000000..685fef7b --- /dev/null +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/MBA/AlwaysInstallPrereqsBundle.wxs @@ -0,0 +1,12 @@ + + + + + + + + + + + diff --git a/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/MBA/Bundle.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/MBA/Bundle.wxs new file mode 100644 index 00000000..59be4bd4 --- /dev/null +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/MBA/Bundle.wxs @@ -0,0 +1,12 @@ + + + + + + + + + + + diff --git a/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/Overridable/Bundle.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/Overridable/Bundle.wxs new file mode 100644 index 00000000..1274826f --- /dev/null +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/Overridable/Bundle.wxs @@ -0,0 +1,13 @@ + + + + + + + + + + + + diff --git a/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/Overridable/WrongCaseBundle.wxl b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/Overridable/WrongCaseBundle.wxl new file mode 100644 index 00000000..0667c3cb --- /dev/null +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/Overridable/WrongCaseBundle.wxl @@ -0,0 +1,4 @@ + + + + diff --git a/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/Overridable/WrongCaseBundle.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/Overridable/WrongCaseBundle.wxs new file mode 100644 index 00000000..67dfc589 --- /dev/null +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/Overridable/WrongCaseBundle.wxs @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + diff --git a/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/AllPrereqPackages.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/AllPrereqPackages.wxs new file mode 100644 index 00000000..17f1ee77 --- /dev/null +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/AllPrereqPackages.wxs @@ -0,0 +1,13 @@ + + + + + + + + + + + + diff --git a/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/ImplicitNonMsiPrimaryPackage.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/ImplicitNonMsiPrimaryPackage.wxs new file mode 100644 index 00000000..ca1f9358 --- /dev/null +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/ImplicitNonMsiPrimaryPackage.wxs @@ -0,0 +1,13 @@ + + + + + + + + + + + + diff --git a/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/ImplicitPrimaryPackage.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/ImplicitPrimaryPackage.wxs new file mode 100644 index 00000000..16a99e92 --- /dev/null +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/ImplicitPrimaryPackage.wxs @@ -0,0 +1,13 @@ + + + + + + + + + + + + diff --git a/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/ImplicitPrimaryPackageEnableFeatureSelection.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/ImplicitPrimaryPackageEnableFeatureSelection.wxs new file mode 100644 index 00000000..85b9df65 --- /dev/null +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/ImplicitPrimaryPackageEnableFeatureSelection.wxs @@ -0,0 +1,13 @@ + + + + + + + + + + + + diff --git a/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/IuibaWarnings.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/IuibaWarnings.wxs new file mode 100644 index 00000000..2cf9787d --- /dev/null +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/IuibaWarnings.wxs @@ -0,0 +1,13 @@ + + + + + + + + + + + + diff --git a/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/MultipleDefaultPrimaryPackages.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/MultipleDefaultPrimaryPackages.wxs new file mode 100644 index 00000000..11736fbb --- /dev/null +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/MultipleDefaultPrimaryPackages.wxs @@ -0,0 +1,13 @@ + + + + + + + + + + + + diff --git a/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/MultipleNonPermanentNonPrimaryPackages.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/MultipleNonPermanentNonPrimaryPackages.wxs new file mode 100644 index 00000000..c5b923df --- /dev/null +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/MultipleNonPermanentNonPrimaryPackages.wxs @@ -0,0 +1,13 @@ + + + + + + + + + + + + diff --git a/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/NoDefaultPrimaryPackage.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/NoDefaultPrimaryPackage.wxs new file mode 100644 index 00000000..7f7528d0 --- /dev/null +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/NoDefaultPrimaryPackage.wxs @@ -0,0 +1,13 @@ + + + + + + + + + + + + diff --git a/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/NonMsiPrimaryPackage.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/NonMsiPrimaryPackage.wxs new file mode 100644 index 00000000..a6f93bcb --- /dev/null +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/NonMsiPrimaryPackage.wxs @@ -0,0 +1,13 @@ + + + + + + + + + + + + diff --git a/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/NonPermanentPrereqPackage.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/NonPermanentPrereqPackage.wxs new file mode 100644 index 00000000..a60943b0 --- /dev/null +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/NonPermanentPrereqPackage.wxs @@ -0,0 +1,13 @@ + + + + + + + + + + + + diff --git a/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/PermanentPrimaryPackage.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/PermanentPrimaryPackage.wxs new file mode 100644 index 00000000..43caaf86 --- /dev/null +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/PermanentPrimaryPackage.wxs @@ -0,0 +1,13 @@ + + + + + + + + + + + + diff --git a/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/PrimaryPackageEnableFeatureSelection.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/PrimaryPackageEnableFeatureSelection.wxs new file mode 100644 index 00000000..4f1c40dd --- /dev/null +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/PrimaryPackageEnableFeatureSelection.wxs @@ -0,0 +1,13 @@ + + + + + + + + + + + + diff --git a/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/PrimaryPrereqPackage.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/PrimaryPrereqPackage.wxs new file mode 100644 index 00000000..bdb8c470 --- /dev/null +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/PrimaryPrereqPackage.wxs @@ -0,0 +1,13 @@ + + + + + + + + + + + + diff --git a/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/SinglePrimaryPackage.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/SinglePrimaryPackage.wxs new file mode 100644 index 00000000..1e9a87c2 --- /dev/null +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/SinglePrimaryPackage.wxs @@ -0,0 +1,13 @@ + + + + + + + + + + + + diff --git a/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/UrlPrereqPackage.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/UrlPrereqPackage.wxs new file mode 100644 index 00000000..0c68908c --- /dev/null +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixIuiBa/UrlPrereqPackage.wxs @@ -0,0 +1,19 @@ + + + + + + + + + + + + diff --git a/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixStdBa/Bundle.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixStdBa/Bundle.wxs new file mode 100644 index 00000000..c17b53ff --- /dev/null +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixStdBa/Bundle.wxs @@ -0,0 +1,12 @@ + + + + + + + + + + + diff --git a/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixStdBa/Data/test.msi b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixStdBa/Data/test.msi new file mode 100644 index 00000000..94aacd1a Binary files /dev/null and b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixStdBa/Data/test.msi differ diff --git a/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixStdBa/DisplayInternalUIConditionBundle.wxs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixStdBa/DisplayInternalUIConditionBundle.wxs new file mode 100644 index 00000000..f08cfe6a --- /dev/null +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/TestData/WixStdBa/DisplayInternalUIConditionBundle.wxs @@ -0,0 +1,12 @@ + + + + + + + + + + + diff --git a/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/WixToolsetTest.BootstrapperApplications.csproj b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/WixToolsetTest.BootstrapperApplications.csproj new file mode 100644 index 00000000..64fc297c --- /dev/null +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/WixToolsetTest.BootstrapperApplications.csproj @@ -0,0 +1,25 @@ + + + + + + net6.0 + true + + + + + + + + + + + + + + + + + + diff --git a/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/WixToolsetTest.BootstrapperApplications.v3.ncrunchproject b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/WixToolsetTest.BootstrapperApplications.v3.ncrunchproject new file mode 100644 index 00000000..7b5b2139 --- /dev/null +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/WixToolsetTest.BootstrapperApplications.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file 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 @@ - + 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 @@ - + 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 @@ - + 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 @@ namespace Example.EarliestCoreMBA { - using WixToolset.Mba.Core; + using WixToolset.BootstrapperApplicationApi; public class EarliestCoreBA : BootstrapperApplication { 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 @@ - + 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 @@ namespace Example.EarliestCoreMBA { - using WixToolset.Mba.Core; + using WixToolset.BootstrapperApplicationApi; internal class Program { 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 @@ - + 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 @@ - - - - - + 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 @@ namespace Example.FullFramework2MBA { - using WixToolset.Mba.Core; + using WixToolset.BootstrapperApplicationApi; public class FullFramework2BA : BootstrapperApplication { 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 @@ namespace Example.FullFramework2MBA { - using WixToolset.Mba.Core; + using WixToolset.BootstrapperApplicationApi; internal class Program { 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 @@ - + 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 @@ - + 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 @@ namespace Example.FullFramework4MBA { - using WixToolset.Mba.Core; + using WixToolset.BootstrapperApplicationApi; public class FullFramework4BA : BootstrapperApplication { 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 @@ namespace Example.FullFramework4MBA { - using WixToolset.Mba.Core; + using WixToolset.BootstrapperApplicationApi; internal class Program { 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 @@ - + 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 @@ - + 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 @@ - + 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 @@ namespace Example.LatestCoreMBA { - using WixToolset.Mba.Core; + using WixToolset.BootstrapperApplicationApi; public class LatestCoreBA : BootstrapperApplication { 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 @@ namespace Example.LatestCoreMBA { - using WixToolset.Mba.Core; + using WixToolset.BootstrapperApplicationApi; internal class Program { 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 @@ - + 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 @@ - + 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 @@ - + 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 @@ namespace Example.WPFCoreMBA { - using WixToolset.Mba.Core; + using WixToolset.BootstrapperApplicationApi; // using WixToolset.BootstrapperApplications.Managed; 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 @@ namespace Example.WPFCoreMBA { using System.Windows.Threading; - using WixToolset.Mba.Core; + using WixToolset.BootstrapperApplicationApi; public class WPFCoreBA : BootstrapperApplication { diff --git a/src/ext/Bal/wixext-backward-compatible/WixToolset.Bal.wixext.csproj b/src/ext/Bal/wixext-backward-compatible/WixToolset.Bal.wixext.csproj new file mode 100644 index 00000000..91253621 --- /dev/null +++ b/src/ext/Bal/wixext-backward-compatible/WixToolset.Bal.wixext.csproj @@ -0,0 +1,16 @@ + + + + + + + + net6.0 + false + WiX Toolset BootstrapperApplications extension + WiX Toolset BootstrapperApplications extension + WixToolset.Bal.wixext + $(OutputPath)netstandard2.0 + $(NuspecProperties);WixExtensionPackageFolder=$(WixExtensionPackageFolder) + + diff --git a/src/ext/Bal/wixext-backward-compatible/WixToolset.Bal.wixext.nuspec b/src/ext/Bal/wixext-backward-compatible/WixToolset.Bal.wixext.nuspec new file mode 100644 index 00000000..7a681707 --- /dev/null +++ b/src/ext/Bal/wixext-backward-compatible/WixToolset.Bal.wixext.nuspec @@ -0,0 +1,22 @@ + + + + $id$ + $version$ + $title$ + $description$ + $authors$ + wix.png + MS-RL + false + $copyright$ + $projectUrl$ + + + + + + + + + diff --git a/src/ext/Bal/wixext-backward-compatible/WixToolset.Bal.wixext.targets b/src/ext/Bal/wixext-backward-compatible/WixToolset.Bal.wixext.targets new file mode 100644 index 00000000..8203d95b --- /dev/null +++ b/src/ext/Bal/wixext-backward-compatible/WixToolset.Bal.wixext.targets @@ -0,0 +1,11 @@ + + + + + + + + + diff --git a/src/ext/Bal/wixext/BalBurnBackendExtension.cs b/src/ext/Bal/wixext/BalBurnBackendExtension.cs index 84e4323e..82195549 100644 --- a/src/ext/Bal/wixext/BalBurnBackendExtension.cs +++ b/src/ext/Bal/wixext/BalBurnBackendExtension.cs @@ -1,13 +1,13 @@ // 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. -namespace WixToolset.Bal +namespace WixToolset.BootstrapperApplications { using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Xml; - using WixToolset.Bal.Symbols; + using WixToolset.BootstrapperApplications.Symbols; using WixToolset.Data; using WixToolset.Data.Burn; using WixToolset.Data.Symbols; diff --git a/src/ext/Bal/wixext/BalCompiler.cs b/src/ext/Bal/wixext/BalCompiler.cs index 829da0e6..35c86233 100644 --- a/src/ext/Bal/wixext/BalCompiler.cs +++ b/src/ext/Bal/wixext/BalCompiler.cs @@ -1,11 +1,11 @@ // 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. -namespace WixToolset.Bal +namespace WixToolset.BootstrapperApplications { using System; using System.Collections.Generic; using System.Xml.Linq; - using WixToolset.Bal.Symbols; + using WixToolset.BootstrapperApplications.Symbols; using WixToolset.Data; using WixToolset.Data.Burn; using WixToolset.Data.Symbols; diff --git a/src/ext/Bal/wixext/BalErrors.cs b/src/ext/Bal/wixext/BalErrors.cs index 10986f0e..4c719091 100644 --- a/src/ext/Bal/wixext/BalErrors.cs +++ b/src/ext/Bal/wixext/BalErrors.cs @@ -1,6 +1,6 @@ // 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. -namespace WixToolset.Bal +namespace WixToolset.BootstrapperApplications { using System; using System.Resources; diff --git a/src/ext/Bal/wixext/BalExtensionData.cs b/src/ext/Bal/wixext/BalExtensionData.cs index 9dc99705..a005d695 100644 --- a/src/ext/Bal/wixext/BalExtensionData.cs +++ b/src/ext/Bal/wixext/BalExtensionData.cs @@ -1,6 +1,6 @@ // 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. -namespace WixToolset.Bal +namespace WixToolset.BootstrapperApplications { using WixToolset.Data; using WixToolset.Extensibility; @@ -18,7 +18,7 @@ namespace WixToolset.Bal public override Intermediate GetLibrary(ISymbolDefinitionCreator symbolDefinitions) { - return Intermediate.Load(typeof(BalExtensionData).Assembly, "WixToolset.Bal.bal.wixlib", symbolDefinitions); + return Intermediate.Load(typeof(BalExtensionData).Assembly, "WixToolset.BootstrapperApplications.bas.wixlib", symbolDefinitions); } } } diff --git a/src/ext/Bal/wixext/BalExtensionFactory.cs b/src/ext/Bal/wixext/BalExtensionFactory.cs index 0bfb6c5f..88b59a4c 100644 --- a/src/ext/Bal/wixext/BalExtensionFactory.cs +++ b/src/ext/Bal/wixext/BalExtensionFactory.cs @@ -1,6 +1,6 @@ // 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. -namespace WixToolset.Bal +namespace WixToolset.BootstrapperApplications { using System; using System.Collections.Generic; diff --git a/src/ext/Bal/wixext/BalWarnings.cs b/src/ext/Bal/wixext/BalWarnings.cs index 73a19d07..8c5d892f 100644 --- a/src/ext/Bal/wixext/BalWarnings.cs +++ b/src/ext/Bal/wixext/BalWarnings.cs @@ -1,6 +1,6 @@ // 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. -namespace WixToolset.Bal +namespace WixToolset.BootstrapperApplications { using System; using System.Resources; diff --git a/src/ext/Bal/wixext/Symbols/BalSymbolDefinitions.cs b/src/ext/Bal/wixext/Symbols/BalSymbolDefinitions.cs index 5e9fb936..8179e38b 100644 --- a/src/ext/Bal/wixext/Symbols/BalSymbolDefinitions.cs +++ b/src/ext/Bal/wixext/Symbols/BalSymbolDefinitions.cs @@ -1,6 +1,6 @@ // 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. -namespace WixToolset.Bal +namespace WixToolset.BootstrapperApplications { using System; using WixToolset.Data; diff --git a/src/ext/Bal/wixext/Symbols/WixBalBAFactoryAssemblySymbol.cs b/src/ext/Bal/wixext/Symbols/WixBalBAFactoryAssemblySymbol.cs index 3ce535a3..c418843b 100644 --- a/src/ext/Bal/wixext/Symbols/WixBalBAFactoryAssemblySymbol.cs +++ b/src/ext/Bal/wixext/Symbols/WixBalBAFactoryAssemblySymbol.cs @@ -1,10 +1,10 @@ // 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. -namespace WixToolset.Bal +namespace WixToolset.BootstrapperApplications { using System; using WixToolset.Data; - using WixToolset.Bal.Symbols; + using WixToolset.BootstrapperApplications.Symbols; public static partial class BalSymbolDefinitions { @@ -20,7 +20,7 @@ namespace WixToolset.Bal } } -namespace WixToolset.Bal.Symbols +namespace WixToolset.BootstrapperApplications.Symbols { using System; using WixToolset.Data; diff --git a/src/ext/Bal/wixext/Symbols/WixBalBAFunctionsSymbol.cs b/src/ext/Bal/wixext/Symbols/WixBalBAFunctionsSymbol.cs index 83dd20b0..0cd80de1 100644 --- a/src/ext/Bal/wixext/Symbols/WixBalBAFunctionsSymbol.cs +++ b/src/ext/Bal/wixext/Symbols/WixBalBAFunctionsSymbol.cs @@ -1,9 +1,9 @@ // 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. -namespace WixToolset.Bal +namespace WixToolset.BootstrapperApplications { using WixToolset.Data; - using WixToolset.Bal.Symbols; + using WixToolset.BootstrapperApplications.Symbols; public static partial class BalSymbolDefinitions { @@ -18,7 +18,7 @@ namespace WixToolset.Bal } } -namespace WixToolset.Bal.Symbols +namespace WixToolset.BootstrapperApplications.Symbols { using WixToolset.Data; @@ -52,4 +52,4 @@ namespace WixToolset.Bal.Symbols set => this.Set((int)WixBalBAFunctionsSymbolFields.FilePath, value); } } -} \ No newline at end of file +} diff --git a/src/ext/Bal/wixext/Symbols/WixBalBootstrapperApplicationSymbol.cs b/src/ext/Bal/wixext/Symbols/WixBalBootstrapperApplicationSymbol.cs index 47e930c2..4f6dfd91 100644 --- a/src/ext/Bal/wixext/Symbols/WixBalBootstrapperApplicationSymbol.cs +++ b/src/ext/Bal/wixext/Symbols/WixBalBootstrapperApplicationSymbol.cs @@ -1,9 +1,9 @@ // 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. -namespace WixToolset.Bal +namespace WixToolset.BootstrapperApplications { using WixToolset.Data; - using WixToolset.Bal.Symbols; + using WixToolset.BootstrapperApplications.Symbols; public static partial class BalSymbolDefinitions { @@ -17,7 +17,7 @@ namespace WixToolset.Bal } } -namespace WixToolset.Bal.Symbols +namespace WixToolset.BootstrapperApplications.Symbols { using System; using WixToolset.Data; diff --git a/src/ext/Bal/wixext/Symbols/WixBalConditionSymbol.cs b/src/ext/Bal/wixext/Symbols/WixBalConditionSymbol.cs index c2527fbc..40976c5a 100644 --- a/src/ext/Bal/wixext/Symbols/WixBalConditionSymbol.cs +++ b/src/ext/Bal/wixext/Symbols/WixBalConditionSymbol.cs @@ -1,9 +1,9 @@ // 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. -namespace WixToolset.Bal +namespace WixToolset.BootstrapperApplications { using WixToolset.Data; - using WixToolset.Bal.Symbols; + using WixToolset.BootstrapperApplications.Symbols; public static partial class BalSymbolDefinitions { @@ -18,7 +18,7 @@ namespace WixToolset.Bal } } -namespace WixToolset.Bal.Symbols +namespace WixToolset.BootstrapperApplications.Symbols { using WixToolset.Data; @@ -52,4 +52,4 @@ namespace WixToolset.Bal.Symbols set => this.Set((int)WixBalConditionSymbolFields.Message, value); } } -} \ No newline at end of file +} diff --git a/src/ext/Bal/wixext/Symbols/WixBalPackageInfoSymbol.cs b/src/ext/Bal/wixext/Symbols/WixBalPackageInfoSymbol.cs index 08d4ce4e..e2636d33 100644 --- a/src/ext/Bal/wixext/Symbols/WixBalPackageInfoSymbol.cs +++ b/src/ext/Bal/wixext/Symbols/WixBalPackageInfoSymbol.cs @@ -1,9 +1,9 @@ // 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. -namespace WixToolset.Bal +namespace WixToolset.BootstrapperApplications { using WixToolset.Data; - using WixToolset.Bal.Symbols; + using WixToolset.BootstrapperApplications.Symbols; public static partial class BalSymbolDefinitions { @@ -19,7 +19,7 @@ namespace WixToolset.Bal } } -namespace WixToolset.Bal.Symbols +namespace WixToolset.BootstrapperApplications.Symbols { using WixToolset.Data; diff --git a/src/ext/Bal/wixext/Symbols/WixPrereqInformationSymbol.cs b/src/ext/Bal/wixext/Symbols/WixPrereqInformationSymbol.cs index 4b5e301e..9ab492e6 100644 --- a/src/ext/Bal/wixext/Symbols/WixPrereqInformationSymbol.cs +++ b/src/ext/Bal/wixext/Symbols/WixPrereqInformationSymbol.cs @@ -1,9 +1,9 @@ // 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. -namespace WixToolset.Bal +namespace WixToolset.BootstrapperApplications { using WixToolset.Data; - using WixToolset.Bal.Symbols; + using WixToolset.BootstrapperApplications.Symbols; public static partial class BalSymbolDefinitions { @@ -19,7 +19,7 @@ namespace WixToolset.Bal } } -namespace WixToolset.Bal.Symbols +namespace WixToolset.BootstrapperApplications.Symbols { using WixToolset.Data; diff --git a/src/ext/Bal/wixext/Symbols/WixPrereqOptionsSymbol.cs b/src/ext/Bal/wixext/Symbols/WixPrereqOptionsSymbol.cs index a351d7da..9fc2a8fc 100644 --- a/src/ext/Bal/wixext/Symbols/WixPrereqOptionsSymbol.cs +++ b/src/ext/Bal/wixext/Symbols/WixPrereqOptionsSymbol.cs @@ -1,9 +1,9 @@ // 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. -namespace WixToolset.Bal +namespace WixToolset.BootstrapperApplications { using WixToolset.Data; - using WixToolset.Bal.Symbols; + using WixToolset.BootstrapperApplications.Symbols; public static partial class BalSymbolDefinitions { @@ -19,7 +19,7 @@ namespace WixToolset.Bal } } -namespace WixToolset.Bal.Symbols +namespace WixToolset.BootstrapperApplications.Symbols { using WixToolset.Data; diff --git a/src/ext/Bal/wixext/Symbols/WixStdbaCommandLineSymbol.cs b/src/ext/Bal/wixext/Symbols/WixStdbaCommandLineSymbol.cs index 3b3823f3..17f0afaa 100644 --- a/src/ext/Bal/wixext/Symbols/WixStdbaCommandLineSymbol.cs +++ b/src/ext/Bal/wixext/Symbols/WixStdbaCommandLineSymbol.cs @@ -1,9 +1,9 @@ // 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. -namespace WixToolset.Bal +namespace WixToolset.BootstrapperApplications { using WixToolset.Data; - using WixToolset.Bal.Symbols; + using WixToolset.BootstrapperApplications.Symbols; public static partial class BalSymbolDefinitions { @@ -17,7 +17,7 @@ namespace WixToolset.Bal } } -namespace WixToolset.Bal.Symbols +namespace WixToolset.BootstrapperApplications.Symbols { using System; using WixToolset.Data; diff --git a/src/ext/Bal/wixext/Symbols/WixStdbaOptionsSymbol.cs b/src/ext/Bal/wixext/Symbols/WixStdbaOptionsSymbol.cs index cb2694da..43f634ea 100644 --- a/src/ext/Bal/wixext/Symbols/WixStdbaOptionsSymbol.cs +++ b/src/ext/Bal/wixext/Symbols/WixStdbaOptionsSymbol.cs @@ -1,9 +1,9 @@ // 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. -namespace WixToolset.Bal +namespace WixToolset.BootstrapperApplications { using WixToolset.Data; - using WixToolset.Bal.Symbols; + using WixToolset.BootstrapperApplications.Symbols; public static partial class BalSymbolDefinitions { @@ -21,7 +21,7 @@ namespace WixToolset.Bal } } -namespace WixToolset.Bal.Symbols +namespace WixToolset.BootstrapperApplications.Symbols { using WixToolset.Data; @@ -76,4 +76,4 @@ namespace WixToolset.Bal.Symbols set => this.Set((int)WixStdbaOptionsSymbolFields.SupportCacheOnly, value); } } -} \ No newline at end of file +} diff --git a/src/ext/Bal/wixext/Symbols/WixStdbaOverridableVariableSymbol.cs b/src/ext/Bal/wixext/Symbols/WixStdbaOverridableVariableSymbol.cs index 1d84d1aa..2b5f2a9c 100644 --- a/src/ext/Bal/wixext/Symbols/WixStdbaOverridableVariableSymbol.cs +++ b/src/ext/Bal/wixext/Symbols/WixStdbaOverridableVariableSymbol.cs @@ -1,9 +1,9 @@ // 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. -namespace WixToolset.Bal +namespace WixToolset.BootstrapperApplications { using WixToolset.Data; - using WixToolset.Bal.Symbols; + using WixToolset.BootstrapperApplications.Symbols; public static partial class BalSymbolDefinitions { @@ -17,7 +17,7 @@ namespace WixToolset.Bal } } -namespace WixToolset.Bal.Symbols +namespace WixToolset.BootstrapperApplications.Symbols { using WixToolset.Data; @@ -44,4 +44,4 @@ namespace WixToolset.Bal.Symbols set => this.Set((int)WixStdbaOverridableVariableSymbolFields.Name, value); } } -} \ No newline at end of file +} diff --git a/src/ext/Bal/wixext/WixToolset.Bal.wixext.csproj b/src/ext/Bal/wixext/WixToolset.Bal.wixext.csproj deleted file mode 100644 index 5591abde..00000000 --- a/src/ext/Bal/wixext/WixToolset.Bal.wixext.csproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - netstandard2.0 - WixToolset.Bal - WiX Toolset Bundle extension - WiX Toolset Bundle extension - embedded - - - - - - - - - - - - diff --git a/src/ext/Bal/wixext/WixToolset.Bal.wixext.targets b/src/ext/Bal/wixext/WixToolset.Bal.wixext.targets deleted file mode 100644 index bf6df083..00000000 --- a/src/ext/Bal/wixext/WixToolset.Bal.wixext.targets +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - diff --git a/src/ext/Bal/wixext/WixToolset.BootstrapperApplications.wixext.csproj b/src/ext/Bal/wixext/WixToolset.BootstrapperApplications.wixext.csproj new file mode 100644 index 00000000..3dd8d306 --- /dev/null +++ b/src/ext/Bal/wixext/WixToolset.BootstrapperApplications.wixext.csproj @@ -0,0 +1,22 @@ + + + + + + netstandard2.0 + WixToolset.BootstrapperApplications + WiX Toolset BootstrapperApplications extension + WiX Toolset BootstrapperApplications extension + embedded + + + + + + + + + + + + diff --git a/src/ext/Bal/wixext/WixToolset.BootstrapperApplications.wixext.targets b/src/ext/Bal/wixext/WixToolset.BootstrapperApplications.wixext.targets new file mode 100644 index 00000000..bf6df083 --- /dev/null +++ b/src/ext/Bal/wixext/WixToolset.BootstrapperApplications.wixext.targets @@ -0,0 +1,11 @@ + + + + + + + + + diff --git a/src/ext/Bal/wixiuiba/wixiuiba.vcxproj b/src/ext/Bal/wixiuiba/wixiuiba.vcxproj index 6b20db30..8d47c39a 100644 --- a/src/ext/Bal/wixiuiba/wixiuiba.vcxproj +++ b/src/ext/Bal/wixiuiba/wixiuiba.vcxproj @@ -82,7 +82,7 @@ - + diff --git a/src/ext/Bal/wixlib/bal.wixproj b/src/ext/Bal/wixlib/bal.wixproj deleted file mode 100644 index 31369115..00000000 --- a/src/ext/Bal/wixlib/bal.wixproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - Library - true - en-us - - - - - - - - - - - - - - - - - diff --git a/src/ext/Bal/wixlib/bal_arm64.wxs b/src/ext/Bal/wixlib/bal_arm64.wxs deleted file mode 100644 index 4ddbfc47..00000000 --- a/src/ext/Bal/wixlib/bal_arm64.wxs +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/ext/Bal/wixlib/bal_platform.wxi b/src/ext/Bal/wixlib/bal_platform.wxi deleted file mode 100644 index af58f4c3..00000000 --- a/src/ext/Bal/wixlib/bal_platform.wxi +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/ext/Bal/wixlib/bal_x64.wxs b/src/ext/Bal/wixlib/bal_x64.wxs deleted file mode 100644 index f2c62418..00000000 --- a/src/ext/Bal/wixlib/bal_x64.wxs +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/ext/Bal/wixlib/bal_x86.wxs b/src/ext/Bal/wixlib/bal_x86.wxs deleted file mode 100644 index e00115b2..00000000 --- a/src/ext/Bal/wixlib/bal_x86.wxs +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/ext/Bal/wixlib/bas.wixproj b/src/ext/Bal/wixlib/bas.wixproj new file mode 100644 index 00000000..31369115 --- /dev/null +++ b/src/ext/Bal/wixlib/bas.wixproj @@ -0,0 +1,23 @@ + + + + Library + true + en-us + + + + + + + + + + + + + + + + + diff --git a/src/ext/Bal/wixlib/bas_arm64.wxs b/src/ext/Bal/wixlib/bas_arm64.wxs new file mode 100644 index 00000000..ba6c5d82 --- /dev/null +++ b/src/ext/Bal/wixlib/bas_arm64.wxs @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/ext/Bal/wixlib/bas_platform.wxi b/src/ext/Bal/wixlib/bas_platform.wxi new file mode 100644 index 00000000..af58f4c3 --- /dev/null +++ b/src/ext/Bal/wixlib/bas_platform.wxi @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ext/Bal/wixlib/bas_x64.wxs b/src/ext/Bal/wixlib/bas_x64.wxs new file mode 100644 index 00000000..7a8cade5 --- /dev/null +++ b/src/ext/Bal/wixlib/bas_x64.wxs @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/ext/Bal/wixlib/bas_x86.wxs b/src/ext/Bal/wixlib/bas_x86.wxs new file mode 100644 index 00000000..419702db --- /dev/null +++ b/src/ext/Bal/wixlib/bas_x86.wxs @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/ext/Bal/wixprqba/wixprqba.vcxproj b/src/ext/Bal/wixprqba/wixprqba.vcxproj index b992fe14..8c838fb5 100644 --- a/src/ext/Bal/wixprqba/wixprqba.vcxproj +++ b/src/ext/Bal/wixprqba/wixprqba.vcxproj @@ -82,7 +82,7 @@ - + diff --git a/src/ext/Bal/wixstdba/wixstdba.vcxproj b/src/ext/Bal/wixstdba/wixstdba.vcxproj index e8317fbf..1f961018 100644 --- a/src/ext/Bal/wixstdba/wixstdba.vcxproj +++ b/src/ext/Bal/wixstdba/wixstdba.vcxproj @@ -82,7 +82,7 @@ - + diff --git a/src/ext/NetFx/be/precomp.h b/src/ext/NetFx/be/precomp.h index c164834d..a0ae1038 100644 --- a/src/ext/NetFx/be/precomp.h +++ b/src/ext/NetFx/be/precomp.h @@ -19,11 +19,6 @@ #include #include -#include -#include - -#include -#include #include #include diff --git a/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs b/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs index 27a19116..a78a5617 100644 --- a/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs +++ b/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs @@ -24,7 +24,7 @@ namespace WixToolsetTest.Netfx var extensionResult = WixRunner.Execute(new[] { "extension", "add", - "WixToolset.Bal.wixext" + "WixToolset.BootstrapperApplications.wixext" }); var compileResult = WixRunner.Execute(new[] @@ -33,7 +33,7 @@ namespace WixToolsetTest.Netfx Path.Combine(bundleSourceFolder, "BundleLatest.wxs"), Path.Combine(bundleSourceFolder, "NetCore3.1.12_x86.wxs"), Path.Combine(bundleSourceFolder, "NetCore3.1.12_x64.wxs"), - "-ext", "WixToolset.Bal.wixext", + "-ext", "WixToolset.BootstrapperApplications.wixext", "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"), "-intermediateFolder", intermediateFolder, "-o", bundleFile, @@ -57,7 +57,7 @@ namespace WixToolsetTest.Netfx var extensionResult = WixRunner.Execute(new[] { "extension", "add", - "WixToolset.Bal.wixext" + "WixToolset.BootstrapperApplications.wixext" }); var compileResult = WixRunner.Execute(new[] @@ -65,7 +65,7 @@ namespace WixToolsetTest.Netfx "build", Path.Combine(bundleSourceFolder, "BundleLatest_x64.wxs"), Path.Combine(bundleSourceFolder, "NetCore3.1.12_x64.wxs"), - "-ext", "WixToolset.Bal.wixext", + "-ext", "WixToolset.BootstrapperApplications.wixext", "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"), "-intermediateFolder", intermediateFolder, "-o", bundleFile, @@ -89,14 +89,14 @@ namespace WixToolsetTest.Netfx var extensionResult = WixRunner.Execute(new[] { "extension", "add", - "WixToolset.Bal.wixext" + "WixToolset.BootstrapperApplications.wixext" }); var compileResult = WixRunner.Execute(new[] { "build", Path.Combine(bundleSourceFolder, "BundleLatest.wxs"), - "-ext", "WixToolset.Bal.wixext", + "-ext", "WixToolset.BootstrapperApplications.wixext", "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"), "-intermediateFolder", intermediateFolder, "-o", bundleFile, @@ -121,7 +121,7 @@ namespace WixToolsetTest.Netfx var extensionResult = WixRunner.Execute(warningsAsErrors: true, new[] { "extension", "add", - "WixToolset.Bal.wixext", + "WixToolset.BootstrapperApplications.wixext", "extension", "add", "WixToolset.Util.wixext", }); @@ -130,7 +130,7 @@ namespace WixToolsetTest.Netfx { "build", Path.Combine(bundleSourceFolder, "BundleLatest.wxs"), - "-ext", "WixToolset.Bal.wixext", + "-ext", "WixToolset.BootstrapperApplications.wixext", "-ext", "WixToolset.Util.wixext", "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"), "-intermediateFolder", intermediateFolder, diff --git a/src/ext/NetFx/wixlib/netfx.wixproj b/src/ext/NetFx/wixlib/netfx.wixproj index 2bd09d95..4327257a 100644 --- a/src/ext/NetFx/wixlib/netfx.wixproj +++ b/src/ext/NetFx/wixlib/netfx.wixproj @@ -20,7 +20,7 @@ - + diff --git a/src/ext/Util/be/precomp.h b/src/ext/Util/be/precomp.h index 5ce5744f..d04bf305 100644 --- a/src/ext/Util/be/precomp.h +++ b/src/ext/Util/be/precomp.h @@ -23,11 +23,6 @@ #include #include -#include -#include - -#include -#include #include #include diff --git a/src/ext/WixExt.props b/src/ext/WixExt.props index 19a96254..4babfb7c 100644 --- a/src/ext/WixExt.props +++ b/src/ext/WixExt.props @@ -6,11 +6,12 @@ false true NU5100 + wixext5 - + -- cgit v1.2.3-55-g6feb