diff options
author | Bob Arnson <bob@firegiant.com> | 2020-03-26 15:02:02 -0400 |
---|---|---|
committer | Bob Arnson <bob@firegiant.com> | 2020-03-26 15:07:01 -0400 |
commit | 50a0d7358e804138ec766adc107cb1f8762c59b0 (patch) | |
tree | d7b7274bddc0aac90a4710effe7eda447ad06ddb | |
parent | 271601dfe0990917ef6331fbddcfd1b400882eb2 (diff) | |
download | wix-50a0d7358e804138ec766adc107cb1f8762c59b0.tar.gz wix-50a0d7358e804138ec766adc107cb1f8762c59b0.tar.bz2 wix-50a0d7358e804138ec766adc107cb1f8762c59b0.zip |
Add Combined intermediate levels to track librarian.
-rw-r--r-- | src/WixToolset.Data/ErrorMessages.cs | 8 | ||||
-rw-r--r-- | src/WixToolset.Data/IntermediateLevels.cs | 1 |
2 files changed, 2 insertions, 7 deletions
diff --git a/src/WixToolset.Data/ErrorMessages.cs b/src/WixToolset.Data/ErrorMessages.cs index 1740f6c9..23d32b4f 100644 --- a/src/WixToolset.Data/ErrorMessages.cs +++ b/src/WixToolset.Data/ErrorMessages.cs | |||
@@ -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); | 2254 | return Message(null, Ids.IntermediatesMustBeCompiled, "Intermediates being linked must have been compiled. Intermediates with these ids were not compiled: {0}", invalidIntermediates); |
2255 | } | 2255 | } |
2256 | 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 | |||
2262 | public static Message IntermediatesMustBeResolved(string invalidIntermediate) | 2257 | public static Message IntermediatesMustBeResolved(string invalidIntermediate) |
2263 | { | 2258 | { |
2264 | return Message(null, Ids.IntermediatesMustBeResolved, "Intermediates being bound must have been resolved. This intermediate was not resolved: {0}", invalidIntermediate); | 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 | |||
2662 | UnableToConvertFieldToNumber = 393, | 2657 | UnableToConvertFieldToNumber = 393, |
2663 | CouldNotDetermineProductCodeFromTransformSummaryInfo = 394, | 2658 | CouldNotDetermineProductCodeFromTransformSummaryInfo = 394, |
2664 | IntermediatesMustBeCompiled = 395, | 2659 | IntermediatesMustBeCompiled = 395, |
2665 | IntermediatesMustBeLinked = 396, | 2660 | IntermediatesMustBeResolved = 396, |
2666 | IntermediatesMustBeResolved = 397, | ||
2667 | } | 2661 | } |
2668 | } | 2662 | } |
2669 | } | 2663 | } |
diff --git a/src/WixToolset.Data/IntermediateLevels.cs b/src/WixToolset.Data/IntermediateLevels.cs index 738cabaa..64c19ae1 100644 --- a/src/WixToolset.Data/IntermediateLevels.cs +++ b/src/WixToolset.Data/IntermediateLevels.cs | |||
@@ -3,6 +3,7 @@ namespace WixToolset.Data | |||
3 | public static class IntermediateLevels | 3 | public static class IntermediateLevels |
4 | { | 4 | { |
5 | public const string Compiled = "compiled"; | 5 | public const string Compiled = "compiled"; |
6 | public const string Combined = "combined"; | ||
6 | public const string Linked = "linked"; | 7 | public const string Linked = "linked"; |
7 | public const string Resolved = "resolved"; | 8 | public const string Resolved = "resolved"; |
8 | } | 9 | } |