diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2021-01-19 15:37:24 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2021-01-19 15:56:43 -0600 |
| commit | 0741acf89631bf226acb2d226981f0de0065c1f1 (patch) | |
| tree | dce9d870f4bc43dcd416df696f4a1d2cd90aa52e | |
| parent | 2fccb302778f71cffb4791131bedf1bf7267b94e (diff) | |
| download | wix-0741acf89631bf226acb2d226981f0de0065c1f1.tar.gz wix-0741acf89631bf226acb2d226981f0de0065c1f1.tar.bz2 wix-0741acf89631bf226acb2d226981f0de0065c1f1.zip | |
Add warning for non-x86 bundles.
| -rw-r--r-- | src/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs | 5 | ||||
| -rw-r--r-- | src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs | 5 |
2 files changed, 8 insertions, 2 deletions
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 | |||
| 56 | var stubPlatform = this.BundleSymbol.Platform.ToString(); | 56 | var stubPlatform = this.BundleSymbol.Platform.ToString(); |
| 57 | var stubFile = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), stubPlatform, "burn.exe"); | 57 | var stubFile = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), stubPlatform, "burn.exe"); |
| 58 | 58 | ||
| 59 | if (stubPlatform != "X86") | ||
| 60 | { | ||
| 61 | this.Messaging.Write(WarningMessages.ExperimentalBundlePlatform(stubPlatform)); | ||
| 62 | } | ||
| 63 | |||
| 59 | var bundleTempPath = Path.Combine(this.IntermediateFolder, bundleFilename); | 64 | var bundleTempPath = Path.Combine(this.IntermediateFolder, bundleFilename); |
| 60 | 65 | ||
| 61 | this.Messaging.Write(VerboseMessages.GeneratingBundle(bundleTempPath, stubFile)); | 66 | 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 | |||
| 146 | var baFolderPath = Path.Combine(baseFolder, "ba"); | 146 | var baFolderPath = Path.Combine(baseFolder, "ba"); |
| 147 | var extractFolderPath = Path.Combine(baseFolder, "extract"); | 147 | var extractFolderPath = Path.Combine(baseFolder, "extract"); |
| 148 | 148 | ||
| 149 | var result = WixRunner.Execute(new[] | 149 | var result = WixRunner.Execute(false, new[] // TODO: go back to elevating warnings as errors. |
| 150 | { | 150 | { |
| 151 | "build", | 151 | "build", |
| 152 | "-arch", "x64", | 152 | "-arch", "x64", |
| @@ -158,7 +158,8 @@ namespace WixToolsetTest.CoreIntegration | |||
| 158 | }); | 158 | }); |
| 159 | 159 | ||
| 160 | result.AssertSuccess(); | 160 | result.AssertSuccess(); |
| 161 | Assert.Empty(result.Messages.Where(m => m.Level == MessageLevel.Warning)); | 161 | var warning = Assert.Single(result.Messages.Where(m => m.Level == MessageLevel.Warning)); |
| 162 | Assert.Equal((int)WarningMessages.Ids.ExperimentalBundlePlatform, warning.Id); | ||
| 162 | 163 | ||
| 163 | Assert.True(File.Exists(exePath)); | 164 | Assert.True(File.Exists(exePath)); |
| 164 | Assert.True(File.Exists(pdbPath)); | 165 | Assert.True(File.Exists(pdbPath)); |