diff options
3 files changed, 0 insertions, 15 deletions
diff --git a/src/api/wix/WixToolset.Data/WarningMessages.cs b/src/api/wix/WixToolset.Data/WarningMessages.cs index 78ed87af..a592fe48 100644 --- a/src/api/wix/WixToolset.Data/WarningMessages.cs +++ b/src/api/wix/WixToolset.Data/WarningMessages.cs | |||
@@ -277,11 +277,6 @@ namespace WixToolset.Data | |||
277 | return Message(sourceLineNumbers, Ids.ExpectedForeignRow, "The {0} table contains a row with primary key(s) '{1}' whose {2} and {4} columns contain the values, '{3}' and '{5}', which specify a foreign key relationship with the {6} table. However, since the expected foreign row specified by this value does not exist, this will result in some information being left out of the decompiled output.", tableName, primaryKey, columnName1, columnValue1, columnName2, columnValue2, foreignTableName); | 277 | return Message(sourceLineNumbers, Ids.ExpectedForeignRow, "The {0} table contains a row with primary key(s) '{1}' whose {2} and {4} columns contain the values, '{3}' and '{5}', which specify a foreign key relationship with the {6} table. However, since the expected foreign row specified by this value does not exist, this will result in some information being left out of the decompiled output.", tableName, primaryKey, columnName1, columnValue1, columnName2, columnValue2, foreignTableName); |
278 | } | 278 | } |
279 | 279 | ||
280 | public static Message ExperimentalBundlePlatform(string platform) | ||
281 | { | ||
282 | return Message(null, Ids.ExperimentalBundlePlatform, "The platform {0} is experimental for bundles. Use the x86 platform instead.", platform); | ||
283 | } | ||
284 | |||
285 | public static Message ExternalCabsAreNotSigned(string databaseFile) | 280 | public static Message ExternalCabsAreNotSigned(string databaseFile) |
286 | { | 281 | { |
287 | return Message(null, Ids.ExternalCabsAreNotSigned, "The installer database '{0}' has external cabs, but at least one of them is not signed. Please ensure that all external cabs are signed, if you mean to sign them. If you don't mean to sign them, there is no need to run the insignia tool as part of your build.", databaseFile); | 282 | return Message(null, Ids.ExternalCabsAreNotSigned, "The installer database '{0}' has external cabs, but at least one of them is not signed. Please ensure that all external cabs are signed, if you mean to sign them. If you don't mean to sign them, there is no need to run the insignia tool as part of your build.", databaseFile); |
@@ -807,8 +802,6 @@ namespace WixToolset.Data | |||
807 | MsiTransactionLimitations = 1151, | 802 | MsiTransactionLimitations = 1151, |
808 | PathCanonicalized = 1152, | 803 | PathCanonicalized = 1152, |
809 | DetectConditionRecommended = 1153, | 804 | DetectConditionRecommended = 1153, |
810 | ExperimentalBundlePlatform = 1154, | ||
811 | |||
812 | CollidingModularizationTypes = 1156, | 805 | CollidingModularizationTypes = 1156, |
813 | InvalidEnvironmentVariable = 1157, | 806 | InvalidEnvironmentVariable = 1157, |
814 | } | 807 | } |
diff --git a/src/wix/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs b/src/wix/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs index b802f556..aed539ae 100644 --- a/src/wix/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs +++ b/src/wix/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs | |||
@@ -56,12 +56,6 @@ namespace WixToolset.Core.Burn.Bundles | |||
56 | 56 | ||
57 | var stubPlatform = this.BundleSymbol.Platform.ToString(); | 57 | var stubPlatform = this.BundleSymbol.Platform.ToString(); |
58 | var stubFile = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), stubPlatform, "burn.exe"); | 58 | var stubFile = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), stubPlatform, "burn.exe"); |
59 | |||
60 | if (stubPlatform != "X86") | ||
61 | { | ||
62 | this.Messaging.Write(WarningMessages.ExperimentalBundlePlatform(stubPlatform)); | ||
63 | } | ||
64 | |||
65 | var bundleTempPath = Path.Combine(this.IntermediateFolder, bundleFilename); | 59 | var bundleTempPath = Path.Combine(this.IntermediateFolder, bundleFilename); |
66 | 60 | ||
67 | this.Messaging.Write(VerboseMessages.GeneratingBundle(bundleTempPath, stubFile)); | 61 | this.Messaging.Write(VerboseMessages.GeneratingBundle(bundleTempPath, stubFile)); |
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs index 40167eda..c9ae049e 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs | |||
@@ -166,8 +166,6 @@ namespace WixToolsetTest.CoreIntegration | |||
166 | }); | 166 | }); |
167 | 167 | ||
168 | result.AssertSuccess(); | 168 | result.AssertSuccess(); |
169 | var warning = Assert.Single(result.Messages.Where(m => m.Level == MessageLevel.Warning)); | ||
170 | Assert.Equal((int)WarningMessages.Ids.ExperimentalBundlePlatform, warning.Id); | ||
171 | 169 | ||
172 | Assert.True(File.Exists(exePath)); | 170 | Assert.True(File.Exists(exePath)); |
173 | Assert.True(File.Exists(pdbPath)); | 171 | Assert.True(File.Exists(pdbPath)); |