@joebigelow / wix-1 / commits / 3c11c138

Attempt ordinal sort to fix CI test failure

Rob Mensching committed Oct 4, 2022 at 14:51 UTC 3c11c1389f67824fb1f368cedacbaf566645e56f
1 file changed +4 -6
src/wix/test/WixToolsetTest.CoreIntegration/BadInputFixture.cs
+4 -6
@@ -243,8 +243,7 @@ namespace WixToolsetTest.CoreIntegration
243 "-o", Path.Combine(baseFolder, @"bin\test.exe")
244 });
245
246 - var warningMessages = result.Messages.Where(m => m.Level == MessageLevel.Warning).Select(m => m.ToString()).ToList();
247 - warningMessages.Sort();
246 + var warningMessages = result.Messages.Where(m => m.Level == MessageLevel.Warning).Select(m => m.ToString()).OrderBy(s => s, StringComparer.Ordinal).ToArray();
247
248 WixAssert.CompareLineByLine(new[]
249 {
@@ -253,10 +252,9 @@ namespace WixToolsetTest.CoreIntegration
252 "ExePackage/@DetectCondition contains the built-in Variable 'WixBundleAction', which is not available when it is evaluated. (Unavailable Variables are: 'WixBundleAction'.). Rewrite the condition to avoid Variables that are never valid during its evaluation.",
253 "The *Search/@Variable attribute's value begins with the reserved prefix 'Wix'. Some prefixes are reserved by the WiX toolset for well-known values. Change your attribute's value to not begin with the same prefix.",
254 "The *Search/@Variable attribute's value references the well-known log Variable 'WixBundleLog' to change its value. This variable is set by the engine and is intended to be read-only. Change your attribute's value to reference a custom variable.",
256 - }, warningMessages.ToArray());
255 + }, warningMessages);
256
258 - var errorMessages = result.Messages.Where(m => m.Level == MessageLevel.Error).Select(m => m.ToString()).ToList();
259 - errorMessages.Sort();
257 + var errorMessages = result.Messages.Where(m => m.Level == MessageLevel.Error).Select(m => m.ToString()).OrderBy(s => s, StringComparer.Ordinal).ToArray();
258
259 WixAssert.CompareLineByLine(new[]
260 {
@@ -264,7 +262,7 @@ namespace WixToolsetTest.CoreIntegration
262 "The CommandLine/@Condition attribute's value '=' is not a valid bundle condition.",
263 "The MsiPackage/@InstallCondition attribute's value '=' is not a valid bundle condition.",
264 "The MsiProperty/@Condition attribute's value '=' is not a valid bundle condition.",
267 - }, errorMessages.ToArray());
265 + }, errorMessages);
266
267 Assert.Equal(409, result.ExitCode);
268 }