@joebigelow / wix / commits / 50a0d735

Add Combined intermediate levels to track librarian.

Bob Arnson committed Mar 26, 2020 at 15:02 UTC 50a0d7358e804138ec766adc107cb1f8762c59b0
2 files changed +2 -7
src/WixToolset.Data/ErrorMessages.cs
+1 -7
@@ -2254,11 +2254,6 @@ namespace WixToolset.Data
2254 return Message(null, Ids.IntermediatesMustBeCompiled, "Intermediates being linked must have been compiled. Intermediates with these ids were not compiled: {0}", invalidIntermediates);
2255 }
2256
2257 - public static Message IntermediatesMustBeLinked(string invalidIntermediate)
2258 - {
2259 - return Message(null, Ids.IntermediatesMustBeLinked, "Intermediates being resolved must have been linked. This intermediate was not linked: {0}", invalidIntermediate);
2260 - }
2261 -
2257 public static Message IntermediatesMustBeResolved(string invalidIntermediate)
2258 {
2259 return Message(null, Ids.IntermediatesMustBeResolved, "Intermediates being bound must have been resolved. This intermediate was not resolved: {0}", invalidIntermediate);
@@ -2662,8 +2657,7 @@ namespace WixToolset.Data
2657 UnableToConvertFieldToNumber = 393,
2658 CouldNotDetermineProductCodeFromTransformSummaryInfo = 394,
2659 IntermediatesMustBeCompiled = 395,
2665 - IntermediatesMustBeLinked = 396,
2666 - IntermediatesMustBeResolved = 397,
2660 + IntermediatesMustBeResolved = 396,
2661 }
2662 }
2663 }
src/WixToolset.Data/IntermediateLevels.cs
+1
@@ -3,6 +3,7 @@ namespace WixToolset.Data
3 public static class IntermediateLevels
4 {
5 public const string Compiled = "compiled";
6 + public const string Combined = "combined";
7 public const string Linked = "linked";
8 public const string Resolved = "resolved";
9 }