diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-10-18 14:05:51 -0500 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-10-24 20:07:21 -0500 |
| commit | bafc4f682a798eb375d32c1f4777664aceb1e15f (patch) | |
| tree | cc9bcec75252a7e4025e6efc28f1918ac8361e62 /src/engine/engine.mc | |
| parent | 273c69f34311f4f4e5f6b5896e71d0788f12d96a (diff) | |
| download | wix-bafc4f682a798eb375d32c1f4777664aceb1e15f.tar.gz wix-bafc4f682a798eb375d32c1f4777664aceb1e15f.tar.bz2 wix-bafc4f682a798eb375d32c1f4777664aceb1e15f.zip | |
Update string versioning.
Update condition parsing to allow specific characters for versions.
Log every time an invalid version is parsed.
Diffstat (limited to 'src/engine/engine.mc')
| -rw-r--r-- | src/engine/engine.mc | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/src/engine/engine.mc b/src/engine/engine.mc index fb2dd6e9..c8cd6d37 100644 --- a/src/engine/engine.mc +++ b/src/engine/engine.mc | |||
| @@ -114,6 +114,13 @@ Language=English | |||
| 114 | Connected to elevated engine. | 114 | Connected to elevated engine. |
| 115 | . | 115 | . |
| 116 | 116 | ||
| 117 | MessageId=13 | ||
| 118 | Severity=Warning | ||
| 119 | SymbolicName=MSG_MANIFEST_INVALID_VERSION | ||
| 120 | Language=English | ||
| 121 | The manifest contains an invalid version string: '%1!ls!' | ||
| 122 | . | ||
| 123 | |||
| 117 | MessageId=51 | 124 | MessageId=51 |
| 118 | Severity=Error | 125 | Severity=Error |
| 119 | SymbolicName=MSG_FAILED_PARSE_CONDITION | 126 | SymbolicName=MSG_FAILED_PARSE_CONDITION |
| @@ -156,6 +163,13 @@ Language=English | |||
| 156 | Application canceled operation: %2!ls!, error: %1!ls! | 163 | Application canceled operation: %2!ls!, error: %1!ls! |
| 157 | . | 164 | . |
| 158 | 165 | ||
| 166 | MessageId=57 | ||
| 167 | Severity=Warning | ||
| 168 | SymbolicName=MSG_CONDITION_INVALID_VERSION | ||
| 169 | Language=English | ||
| 170 | Condition '%1!ls!' contains invalid version string '%2!ls!'. | ||
| 171 | . | ||
| 172 | |||
| 159 | MessageId=100 | 173 | MessageId=100 |
| 160 | Severity=Success | 174 | Severity=Success |
| 161 | SymbolicName=MSG_DETECT_BEGIN | 175 | SymbolicName=MSG_DETECT_BEGIN |
| @@ -233,6 +247,20 @@ Language=English | |||
| 233 | Could not calculate patch applicability for target product code: %1!ls!, context: %2!hs!, reason: 0x%3!x! | 247 | Could not calculate patch applicability for target product code: %1!ls!, context: %2!hs!, reason: 0x%3!x! |
| 234 | . | 248 | . |
| 235 | 249 | ||
| 250 | MessageId=122 | ||
| 251 | Severity=Warning | ||
| 252 | SymbolicName=MSG_RELATED_PACKAGE_INVALID_VERSION | ||
| 253 | Language=English | ||
| 254 | Related package: '%1!ls!' has invalid version: %2!ls! | ||
| 255 | . | ||
| 256 | |||
| 257 | MessageId=123 | ||
| 258 | Severity=Warning | ||
| 259 | SymbolicName=MSG_DETECTED_MSI_PACKAGE_INVALID_VERSION | ||
| 260 | Language=English | ||
| 261 | Detected msi package with invalid version, product code: '%1!ls!', version: '%2!ls!' | ||
| 262 | . | ||
| 263 | |||
| 236 | MessageId=151 | 264 | MessageId=151 |
| 237 | Severity=Error | 265 | Severity=Error |
| 238 | SymbolicName=MSG_FAILED_DETECT_PACKAGE | 266 | SymbolicName=MSG_FAILED_DETECT_PACKAGE |
| @@ -836,6 +864,20 @@ Language=English | |||
| 836 | Variable: %1!ls! | 864 | Variable: %1!ls! |
| 837 | . | 865 | . |
| 838 | 866 | ||
| 867 | MessageId=411 | ||
| 868 | Severity=Warning | ||
| 869 | SymbolicName=MSG_VARIABLE_INVALID_VERSION | ||
| 870 | Language=English | ||
| 871 | The variable '%1!ls!' is being set with an invalid version string. | ||
| 872 | . | ||
| 873 | |||
| 874 | MessageId=412 | ||
| 875 | Severity=Warning | ||
| 876 | SymbolicName=MSG_INVALID_VERSION_COERSION | ||
| 877 | Language=English | ||
| 878 | The string '%1!ls!' could not be coerced to a valid version. | ||
| 879 | . | ||
| 880 | |||
| 839 | MessageId=420 | 881 | MessageId=420 |
| 840 | Severity=Success | 882 | Severity=Success |
| 841 | SymbolicName=MSG_RESUME_AU_STARTING | 883 | SymbolicName=MSG_RESUME_AU_STARTING |
