From 0d3d54992104288e9ee0c834d0b96e8502fd2d42 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Thu, 11 Jan 2024 18:26:20 -0800 Subject: Move the BootstrapperApplication out of proc --- .../test/WixToolsetTest.Bal/BalExtensionFixture.cs | 100 +++++++++++---------- 1 file changed, 54 insertions(+), 46 deletions(-) (limited to 'src/ext/Bal/test/WixToolsetTest.Bal/BalExtensionFixture.cs') diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/BalExtensionFixture.cs b/src/ext/Bal/test/WixToolsetTest.Bal/BalExtensionFixture.cs index 2e60e2c0..217fdfb1 100644 --- a/src/ext/Bal/test/WixToolsetTest.Bal/BalExtensionFixture.cs +++ b/src/ext/Bal/test/WixToolsetTest.Bal/BalExtensionFixture.cs @@ -116,47 +116,47 @@ namespace WixToolsetTest.Bal } } - [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 wixMbaPrereqOptionsElements = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixMbaPrereqOptions"); - WixAssert.CompareLineByLine(new[] - { - "", - }, wixMbaPrereqOptionsElements); - - var wixMbaPrereqInformationElements = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixMbaPrereqInformation"); - WixAssert.CompareLineByLine(new[] - { - "", - }, wixMbaPrereqInformationElements); - } - } + //[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() @@ -165,7 +165,8 @@ namespace WixToolsetTest.Bal { var baseFolder = fs.GetFolder(); var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); - var bundleSourceFolder = TestData.Get(@"TestData\MBA"); + var bundleSourceFolder = TestData.Get(@"TestData", "MBA"); + var dataFolder = TestData.Get(@"TestData", ".Data"); var intermediateFolder = Path.Combine(baseFolder, "obj"); var compileResult = WixRunner.Execute(new[] @@ -174,10 +175,15 @@ namespace WixToolsetTest.Bal Path.Combine(bundleSourceFolder, "Bundle.wxs"), "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), "-intermediateFolder", intermediateFolder, + "-bindpath", dataFolder, "-o", bundleFile, }); - Assert.Equal(6802, compileResult.ExitCode); - WixAssert.StringEqual("There must be at least one package with bal:PrereqPackage=\"yes\" when using the ManagedBootstrapperApplicationHost.\nThis is typically done by using the WixNetFxExtension and referencing one of the NetFxAsPrereq package groups.", compileResult.Messages[0].ToString()); + + 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"))); @@ -202,11 +208,13 @@ namespace WixToolsetTest.Bal "-intermediateFolder", intermediateFolder, "-o", bundleFile, }); + WixAssert.CompareLineByLine(new[] { - "When using DotNetCoreBootstrapperApplicationHost, the Payload element for the BA's entry point DLL must have bal:BAFactoryAssembly=\"yes\".", + "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(6818, compileResult.ExitCode); + Assert.Equal(44, compileResult.ExitCode); Assert.False(File.Exists(bundleFile)); Assert.False(File.Exists(Path.Combine(intermediateFolder, "test.exe"))); -- cgit v1.2.3-55-g6feb