From 0741acf89631bf226acb2d226981f0de0065c1f1 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Tue, 19 Jan 2021 15:37:24 -0600 Subject: Add warning for non-x86 bundles. --- src/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs | 5 +++++ src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs b/src/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs index dce28e82..66257ce3 100644 --- a/src/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs +++ b/src/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs @@ -56,6 +56,11 @@ namespace WixToolset.Core.Burn.Bundles var stubPlatform = this.BundleSymbol.Platform.ToString(); var stubFile = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), stubPlatform, "burn.exe"); + if (stubPlatform != "X86") + { + this.Messaging.Write(WarningMessages.ExperimentalBundlePlatform(stubPlatform)); + } + var bundleTempPath = Path.Combine(this.IntermediateFolder, bundleFilename); this.Messaging.Write(VerboseMessages.GeneratingBundle(bundleTempPath, stubFile)); diff --git a/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs b/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs index 30cbb18e..094e4df2 100644 --- a/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs @@ -146,7 +146,7 @@ namespace WixToolsetTest.CoreIntegration var baFolderPath = Path.Combine(baseFolder, "ba"); var extractFolderPath = Path.Combine(baseFolder, "extract"); - var result = WixRunner.Execute(new[] + var result = WixRunner.Execute(false, new[] // TODO: go back to elevating warnings as errors. { "build", "-arch", "x64", @@ -158,7 +158,8 @@ namespace WixToolsetTest.CoreIntegration }); result.AssertSuccess(); - Assert.Empty(result.Messages.Where(m => m.Level == MessageLevel.Warning)); + var warning = Assert.Single(result.Messages.Where(m => m.Level == MessageLevel.Warning)); + Assert.Equal((int)WarningMessages.Ids.ExperimentalBundlePlatform, warning.Id); Assert.True(File.Exists(exePath)); Assert.True(File.Exists(pdbPath)); -- cgit v1.2.3-55-g6feb