aboutsummaryrefslogtreecommitdiff
path: root/src/wixext
diff options
context:
space:
mode:
Diffstat (limited to 'src/wixext')
-rw-r--r--src/wixext/Tuples/UtilTupleDefinitions.cs10
-rw-r--r--src/wixext/Tuples/WixDetectSHA2SupportTuple.cs33
-rw-r--r--src/wixext/UtilBinder.cs347
-rw-r--r--src/wixext/UtilCompiler.cs198
-rw-r--r--src/wixext/UtilConstants.cs2
-rw-r--r--src/wixext/UtilErrors.cs6
-rw-r--r--src/wixext/util.xsd24
7 files changed, 170 insertions, 450 deletions
diff --git a/src/wixext/Tuples/UtilTupleDefinitions.cs b/src/wixext/Tuples/UtilTupleDefinitions.cs
index 00c98337..ece64502 100644
--- a/src/wixext/Tuples/UtilTupleDefinitions.cs
+++ b/src/wixext/Tuples/UtilTupleDefinitions.cs
@@ -4,6 +4,7 @@ namespace WixToolset.Util
4{ 4{
5 using System; 5 using System;
6 using WixToolset.Data; 6 using WixToolset.Data;
7 using WixToolset.Data.Burn;
7 8
8 public enum UtilTupleDefinitionType 9 public enum UtilTupleDefinitionType
9 { 10 {
@@ -19,6 +20,7 @@ namespace WixToolset.Util
19 User, 20 User,
20 UserGroup, 21 UserGroup,
21 WixCloseApplication, 22 WixCloseApplication,
23 WixDetectSHA2Support,
22 WixFormatFiles, 24 WixFormatFiles,
23 WixInternetShortcut, 25 WixInternetShortcut,
24 WixRemoveFolderEx, 26 WixRemoveFolderEx,
@@ -82,6 +84,9 @@ namespace WixToolset.Util
82 case UtilTupleDefinitionType.WixCloseApplication: 84 case UtilTupleDefinitionType.WixCloseApplication:
83 return UtilTupleDefinitions.WixCloseApplication; 85 return UtilTupleDefinitions.WixCloseApplication;
84 86
87 case UtilTupleDefinitionType.WixDetectSHA2Support:
88 return UtilTupleDefinitions.WixDetectSHA2Support;
89
85 case UtilTupleDefinitionType.WixFormatFiles: 90 case UtilTupleDefinitionType.WixFormatFiles:
86 return UtilTupleDefinitions.WixFormatFiles; 91 return UtilTupleDefinitions.WixFormatFiles;
87 92
@@ -107,5 +112,10 @@ namespace WixToolset.Util
107 throw new ArgumentOutOfRangeException(nameof(type)); 112 throw new ArgumentOutOfRangeException(nameof(type));
108 } 113 }
109 } 114 }
115
116 static UtilTupleDefinitions()
117 {
118 WixDetectSHA2Support.AddTag(BurnConstants.BundleExtensionSearchTupleDefinitionTag);
119 }
110 } 120 }
111} 121}
diff --git a/src/wixext/Tuples/WixDetectSHA2SupportTuple.cs b/src/wixext/Tuples/WixDetectSHA2SupportTuple.cs
new file mode 100644
index 00000000..38b76ff2
--- /dev/null
+++ b/src/wixext/Tuples/WixDetectSHA2SupportTuple.cs
@@ -0,0 +1,33 @@
1// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
2
3namespace WixToolset.Util
4{
5 using WixToolset.Data;
6 using WixToolset.Util.Tuples;
7
8 public static partial class UtilTupleDefinitions
9 {
10 public static readonly IntermediateTupleDefinition WixDetectSHA2Support = new IntermediateTupleDefinition(
11 UtilTupleDefinitionType.WixDetectSHA2Support.ToString(),
12 new IntermediateFieldDefinition[0],
13 typeof(WixDetectSHA2SupportTuple));
14 }
15}
16
17namespace WixToolset.Util.Tuples
18{
19 using WixToolset.Data;
20
21 public class WixDetectSHA2SupportTuple : IntermediateTuple
22 {
23 public WixDetectSHA2SupportTuple() : base(UtilTupleDefinitions.WixDetectSHA2Support, null, null)
24 {
25 }
26
27 public WixDetectSHA2SupportTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilTupleDefinitions.WixDetectSHA2Support, sourceLineNumber, id)
28 {
29 }
30
31 public IntermediateField this[GroupTupleFields index] => this.Fields[(int)index];
32 }
33}
diff --git a/src/wixext/UtilBinder.cs b/src/wixext/UtilBinder.cs
deleted file mode 100644
index ef80a876..00000000
--- a/src/wixext/UtilBinder.cs
+++ /dev/null
@@ -1,347 +0,0 @@
1// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
2
3namespace WixToolset.Extensions
4{
5#if TODO_BRINGBACK_FOR_BUNDLES
6 using System;
7 using System.Collections.Generic;
8 using System.Globalization;
9 using WixToolset.Data;
10 using WixToolset.Extensibility;
11
12 /// <summary>
13 /// The binder for the WiX Toolset Utility Extension.
14 /// </summary>
15 public sealed class UtilBinder : BinderExtension
16 {
17 // TODO: When WixSearch is supported in Product, etc, we may need to call
18 // ReorderWixSearch() from each of those initializers.
19
20 // TODO: A general-purpose "reorder this table given these constraints"
21 // mechanism may end up being helpful. This could be declaratively stated
22 // in the table definitions, or exposed from the core Wix.dll and called
23 // as-needed by any extensions.
24
25 /// <summary>
26 /// Called before bundle binding occurs.
27 /// </summary>
28 public override void Initialize(Output bundle)
29 {
30 if (OutputType.Bundle == bundle.Type)
31 {
32 this.ReorderWixSearch(bundle);
33 }
34 }
35
36 /// <summary>
37 /// Reorders Any WixSearch items.
38 /// </summary>
39 /// <param name="output">Output containing the tables to process.</param>
40 private void ReorderWixSearch(Output output)
41 {
42 Table wixSearchTable = output.Tables["WixSearch"];
43 if (null == wixSearchTable || wixSearchTable.Rows.Count == 0)
44 {
45 // nothing to do!
46 return;
47 }
48
49 RowDictionary rowDictionary = new RowDictionary();
50 foreach (Row row in wixSearchTable.Rows)
51 {
52 rowDictionary.AddRow(row);
53 }
54
55 Constraints constraints = new Constraints();
56 Table wixSearchRelationTable = output.Tables["WixSearchRelation"];
57 if (null != wixSearchRelationTable && wixSearchRelationTable.Rows.Count > 0)
58 {
59 // add relational info to our data...
60 foreach (Row row in wixSearchRelationTable.Rows)
61 {
62 constraints.AddConstraint((string)row[0], (string)row[1]);
63 }
64 }
65
66 this.FindCircularReference(constraints);
67
68 if (this.Core.EncounteredError)
69 {
70 return;
71 }
72
73 this.FlattenDependentReferences(constraints);
74
75 // Reorder by topographical sort (http://en.wikipedia.org/wiki/Topological_sorting)
76 // We use a variation of Kahn (1962) algorithm as described in
77 // Wikipedia, with the additional criteria that start nodes are sorted
78 // lexicographically at each step to ensure a deterministic ordering
79 // based on 'after' dependencies and ID.
80 TopologicalSort sorter = new TopologicalSort();
81 List <string> sortedIds = sorter.Sort(rowDictionary.Keys, constraints);
82
83 // Now, re-write the table with the searches in order...
84 wixSearchTable.Rows.Clear();
85 foreach (string id in sortedIds)
86 {
87 wixSearchTable.Rows.Add(rowDictionary[id]);
88 }
89 }
90
91 /// <summary>
92 /// A dictionary of Row items, indexed by their first column.
93 /// </summary>
94 private class RowDictionary : Dictionary<string, Row>
95 {
96 public void AddRow(Row row)
97 {
98 this.Add((string)row[0], row);
99 }
100
101 // TODO: Hide other Add methods?
102 }
103
104 /// <summary>
105 /// A dictionary of constraints, mapping an id to a list of ids.
106 /// </summary>
107 private class Constraints : Dictionary<string, List<string>>
108 {
109 public void AddConstraint(string id, string afterId)
110 {
111 if (!this.ContainsKey(id))
112 {
113 this.Add(id, new List<string>());
114 }
115
116 // TODO: Show warning if a constraint is seen twice?
117 if (!this[id].Contains(afterId))
118 {
119 this[id].Add(afterId);
120 }
121 }
122
123 // TODO: Hide other Add methods?
124 }
125
126 /// <summary>
127 /// Finds circular references in the constraints.
128 /// </summary>
129 /// <param name="constraints">Constraints to check.</param>
130 /// <remarks>This is not particularly performant, but it works.</remarks>
131 private void FindCircularReference(Constraints constraints)
132 {
133 foreach (string id in constraints.Keys)
134 {
135 List<string> seenIds = new List<string>();
136 string chain = null;
137 if (FindCircularReference(constraints, id, id, seenIds, out chain))
138 {
139 // We will show a separate message for every ID that's in
140 // the loop. We could bail after the first one, but then
141 // we wouldn't catch disjoint loops in a single run.
142 this.Core.OnMessage(UtilErrors.CircularSearchReference(chain));
143 }
144 }
145 }
146
147 /// <summary>
148 /// Recursive function that finds circular references in the constraints.
149 /// </summary>
150 /// <param name="constraints">Constraints to check.</param>
151 /// <param name="checkId">The identifier currently being looking for. (Fixed across a given run.)</param>
152 /// <param name="currentId">The idenifier curently being tested.</param>
153 /// <param name="seenIds">A list of identifiers seen, to ensure each identifier is only expanded once.</param>
154 /// <param name="chain">If a circular reference is found, will contain the chain of references.</param>
155 /// <returns>True if a circular reference is found, false otherwise.</returns>
156 private bool FindCircularReference(Constraints constraints, string checkId, string currentId, List<string> seenIds, out string chain)
157 {
158 chain = null;
159 List<string> afterList = null;
160 if (constraints.TryGetValue(currentId, out afterList))
161 {
162 foreach (string afterId in afterList)
163 {
164 if (afterId == checkId)
165 {
166 chain = String.Format(CultureInfo.InvariantCulture, "{0} -> {1}", currentId, afterId);
167 return true;
168 }
169
170 if (!seenIds.Contains(afterId))
171 {
172 seenIds.Add(afterId);
173 if (FindCircularReference(constraints, checkId, afterId, seenIds, out chain))
174 {
175 chain = String.Format(CultureInfo.InvariantCulture, "{0} -> {1}", currentId, chain);
176 return true;
177 }
178 }
179 }
180 }
181
182 return false;
183 }
184
185 /// <summary>
186 /// Flattens any dependency chains to simplify reordering.
187 /// </summary>
188 /// <param name="constraints"></param>
189 private void FlattenDependentReferences(Constraints constraints)
190 {
191 foreach (string id in constraints.Keys)
192 {
193 List<string> flattenedIds = new List<string>();
194 AddDependentReferences(constraints, id, flattenedIds);
195 List<string> constraintList = constraints[id];
196 foreach (string flattenedId in flattenedIds)
197 {
198 if (!constraintList.Contains(flattenedId))
199 {
200 constraintList.Add(flattenedId);
201 }
202 }
203 }
204 }
205
206 /// <summary>
207 /// Adds dependent references to a list.
208 /// </summary>
209 /// <param name="constraints"></param>
210 /// <param name="currentId"></param>
211 /// <param name="seenIds"></param>
212 private void AddDependentReferences(Constraints constraints, string currentId, List<string> seenIds)
213 {
214 List<string> afterList = null;
215 if (constraints.TryGetValue(currentId, out afterList))
216 {
217 foreach (string afterId in afterList)
218 {
219 if (!seenIds.Contains(afterId))
220 {
221 seenIds.Add(afterId);
222 AddDependentReferences(constraints, afterId, seenIds);
223 }
224 }
225 }
226 }
227
228 /// <summary>
229 /// Reorder by topological sort
230 /// </summary>
231 /// <remarks>
232 /// We use a variation of Kahn (1962) algorithm as described in
233 /// Wikipedia (http://en.wikipedia.org/wiki/Topological_sorting), with
234 /// the additional criteria that start nodes are sorted lexicographically
235 /// at each step to ensure a deterministic ordering based on 'after'
236 /// dependencies and ID.
237 /// </remarks>
238 private class TopologicalSort
239 {
240 private List<string> startIds = new List<string>();
241 private Constraints constraints;
242
243 /// <summary>
244 /// Reorder by topological sort
245 /// </summary>
246 /// <param name="allIds">The complete list of IDs.</param>
247 /// <param name="constraints">Constraints to use.</param>
248 /// <returns>The topologically sorted list of IDs.</returns>
249 internal List<string> Sort(IEnumerable<string> allIds, Constraints constraints)
250 {
251 this.startIds.Clear();
252 this.CopyConstraints(constraints);
253
254 this.FindInitialStartIds(allIds);
255
256 // We always create a new sortedId list, because we return it
257 // to the caller and don't know what its lifetime may be.
258 List<string> sortedIds = new List<string>();
259
260 while (this.startIds.Count > 0)
261 {
262 this.SortStartIds();
263
264 string currentId = this.startIds[0];
265 sortedIds.Add(currentId);
266 this.startIds.RemoveAt(0);
267
268 this.ResolveConstraint(currentId);
269 }
270
271 return sortedIds;
272 }
273
274 /// <summary>
275 /// Copies a Constraints set (to prevent modifying the incoming data).
276 /// </summary>
277 /// <param name="constraints">Constraints to copy.</param>
278 private void CopyConstraints(Constraints constraints)
279 {
280 this.constraints = new Constraints();
281 foreach (string id in constraints.Keys)
282 {
283 foreach (string afterId in constraints[id])
284 {
285 this.constraints.AddConstraint(id, afterId);
286 }
287 }
288 }
289
290 /// <summary>
291 /// Finds initial start IDs. (Those with no constraints.)
292 /// </summary>
293 /// <param name="allIds">The complete list of IDs.</param>
294 private void FindInitialStartIds(IEnumerable<string> allIds)
295 {
296 foreach (string id in allIds)
297 {
298 if (!this.constraints.ContainsKey(id))
299 {
300 this.startIds.Add(id);
301 }
302 }
303 }
304
305 /// <summary>
306 /// Sorts start IDs.
307 /// </summary>
308 private void SortStartIds()
309 {
310 this.startIds.Sort();
311 }
312
313 /// <summary>
314 /// Removes the resolved constraint and updates the list of startIds
315 /// with any now-valid (all constraints resolved) IDs.
316 /// </summary>
317 /// <param name="resolvedId">The ID to resolve from the set of constraints.</param>
318 private void ResolveConstraint(string resolvedId)
319 {
320 List<string> newStartIds = new List<string>();
321
322 foreach (string id in constraints.Keys)
323 {
324 if (this.constraints[id].Contains(resolvedId))
325 {
326 this.constraints[id].Remove(resolvedId);
327
328 // If we just removed the last constraint for this
329 // ID, it is now a valid start ID.
330 if (0 == this.constraints[id].Count)
331 {
332 newStartIds.Add(id);
333 }
334 }
335 }
336
337 foreach (string id in newStartIds)
338 {
339 this.constraints.Remove(id);
340 }
341
342 this.startIds.AddRange(newStartIds);
343 }
344 }
345 }
346#endif
347}
diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs
index 6b359591..6e3c2531 100644
--- a/src/wixext/UtilCompiler.cs
+++ b/src/wixext/UtilCompiler.cs
@@ -230,6 +230,8 @@ namespace WixToolset.Util
230 break; 230 break;
231 case "ComponentSearch": 231 case "ComponentSearch":
232 case "ComponentSearchRef": 232 case "ComponentSearchRef":
233 case "DetectSHA2Support":
234 case "DetectSHA2SupportRef":
233 case "DirectorySearch": 235 case "DirectorySearch":
234 case "DirectorySearchRef": 236 case "DirectorySearchRef":
235 case "FileSearch": 237 case "FileSearch":
@@ -251,6 +253,12 @@ namespace WixToolset.Util
251 case "ComponentSearchRef": 253 case "ComponentSearchRef":
252 this.ParseComponentSearchRefElement(intermediate, section, element); 254 this.ParseComponentSearchRefElement(intermediate, section, element);
253 break; 255 break;
256 case "DetectSHA2Support":
257 this.ParseDetectSHA2SupportElement(intermediate, section, element);
258 break;
259 case "DetectSHA2SupportRef":
260 this.ParseDetectSHA2SupportRefElement(intermediate, section, element);
261 break;
254 case "DirectorySearch": 262 case "DirectorySearch":
255 this.ParseDirectorySearchElement(intermediate, section, element); 263 this.ParseDirectorySearchElement(intermediate, section, element);
256 break; 264 break;
@@ -422,11 +430,6 @@ namespace WixToolset.Util
422 } 430 }
423 } 431 }
424 432
425 if (null == variable)
426 {
427 this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Variable"));
428 }
429
430 if (null == guid) 433 if (null == guid)
431 { 434 {
432 this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Guid")); 435 this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Guid"));
@@ -439,16 +442,10 @@ namespace WixToolset.Util
439 442
440 this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); 443 this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
441 444
445 this.ParseHelper.CreateWixSearchTuple(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, null);
446
442 if (!this.Messaging.EncounteredError) 447 if (!this.Messaging.EncounteredError)
443 { 448 {
444 this.CreateWixSearchRow(section, sourceLineNumbers, id, variable, condition);
445 if (after != null)
446 {
447 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "WixSearch", after);
448 // TODO: We're currently defaulting to "always run after", which we will need to change...
449 this.CreateWixSearchRelationRow(section, sourceLineNumbers, id, after, 2);
450 }
451
452 WixComponentSearchAttributes attributes = WixComponentSearchAttributes.KeyPath; 449 WixComponentSearchAttributes attributes = WixComponentSearchAttributes.KeyPath;
453 switch (result) 450 switch (result)
454 { 451 {
@@ -506,6 +503,89 @@ namespace WixToolset.Util
506 } 503 }
507 504
508 /// <summary> 505 /// <summary>
506 /// Parses a DetectSHA2Support element.
507 /// </summary>
508 /// <param name="element">Element to parse.</param>
509 private void ParseDetectSHA2SupportElement(Intermediate intermediate, IntermediateSection section, XElement element)
510 {
511 var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element);
512 Identifier id = null;
513 string variable = null;
514 string condition = null;
515 string after = null;
516
517 foreach (var attrib in element.Attributes())
518 {
519 if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
520 {
521 switch (attrib.Name.LocalName)
522 {
523 case "Id":
524 case "Variable":
525 case "Condition":
526 case "After":
527 this.ParseCommonSearchAttributes(sourceLineNumbers, attrib, ref id, ref variable, ref condition, ref after);
528 break;
529 default:
530 this.ParseHelper.UnexpectedAttribute(element, attrib);
531 break;
532 }
533 }
534 else
535 {
536 this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib);
537 }
538 }
539
540 if (id == null)
541 {
542 id = this.ParseHelper.CreateIdentifier("wds2s", variable, condition, after);
543 }
544
545 this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
546
547 this.ParseHelper.CreateWixSearchTuple(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, UtilConstants.UtilBundleExtensionId);
548
549 if (!this.Messaging.EncounteredError)
550 {
551 section.Tuples.Add(new WixDetectSHA2SupportTuple(sourceLineNumbers, id));
552 }
553 }
554
555 /// <summary>
556 /// Parses a DetectSHA2SupportRef element
557 /// </summary>
558 /// <param name="element">Element to parse.</param>
559 private void ParseDetectSHA2SupportRefElement(Intermediate intermediate, IntermediateSection section, XElement element)
560 {
561 var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element);
562 string refId = null;
563
564 foreach (var attrib in element.Attributes())
565 {
566 if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
567 {
568 switch (attrib.Name.LocalName)
569 {
570 case "Id":
571 refId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
572 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "WixDetectSHA2Support", refId);
573 break;
574 default:
575 this.ParseHelper.UnexpectedAttribute(element, attrib);
576 break;
577 }
578 }
579 else
580 {
581 this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib);
582 }
583 }
584
585 this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
586 }
587
588 /// <summary>
509 /// Parses an event source element. 589 /// Parses an event source element.
510 /// </summary> 590 /// </summary>
511 /// <param name="element">Element to parse.</param> 591 /// <param name="element">Element to parse.</param>
@@ -868,11 +948,6 @@ namespace WixToolset.Util
868 } 948 }
869 } 949 }
870 950
871 if (null == variable)
872 {
873 this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Variable"));
874 }
875
876 if (null == path) 951 if (null == path)
877 { 952 {
878 this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Path")); 953 this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Path"));
@@ -885,16 +960,10 @@ namespace WixToolset.Util
885 960
886 this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); 961 this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
887 962
963 this.ParseHelper.CreateWixSearchTuple(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, null);
964
888 if (!this.Messaging.EncounteredError) 965 if (!this.Messaging.EncounteredError)
889 { 966 {
890 this.CreateWixSearchRow(section, sourceLineNumbers, id, variable, condition);
891 if (after != null)
892 {
893 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "WixSearch", after);
894 // TODO: We're currently defaulting to "always run after", which we will need to change...
895 this.CreateWixSearchRelationRow(section, sourceLineNumbers, id, after, 2);
896 }
897
898 WixFileSearchAttributes attributes = WixFileSearchAttributes.IsDirectory; 967 WixFileSearchAttributes attributes = WixFileSearchAttributes.IsDirectory;
899 switch (result) 968 switch (result)
900 { 969 {
@@ -990,11 +1059,6 @@ namespace WixToolset.Util
990 } 1059 }
991 } 1060 }
992 1061
993 if (null == variable)
994 {
995 this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Variable"));
996 }
997
998 if (null == path) 1062 if (null == path)
999 { 1063 {
1000 this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Path")); 1064 this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Path"));
@@ -1007,16 +1071,10 @@ namespace WixToolset.Util
1007 1071
1008 this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, node); 1072 this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, node);
1009 1073
1074 this.ParseHelper.CreateWixSearchTuple(section, sourceLineNumbers, node.Name.LocalName, id, variable, condition, after, null);
1075
1010 if (!this.Messaging.EncounteredError) 1076 if (!this.Messaging.EncounteredError)
1011 { 1077 {
1012 this.CreateWixSearchRow(section, sourceLineNumbers, id, variable, condition);
1013 if (after != null)
1014 {
1015 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "WixSearch", after);
1016 // TODO: We're currently defaulting to "always run after", which we will need to change...
1017 this.CreateWixSearchRelationRow(section, sourceLineNumbers, id, after, 2);
1018 }
1019
1020 WixFileSearchAttributes attributes = WixFileSearchAttributes.Default; 1078 WixFileSearchAttributes attributes = WixFileSearchAttributes.Default;
1021 switch (result) 1079 switch (result)
1022 { 1080 {
@@ -1049,38 +1107,6 @@ namespace WixToolset.Util
1049 } 1107 }
1050 1108
1051 /// <summary> 1109 /// <summary>
1052 /// Creates a row in the WixSearch table.
1053 /// </summary>
1054 /// <param name="sourceLineNumbers">Source line number for the parent element.</param>
1055 /// <param name="id">Identifier of the search.</param>
1056 /// <param name="variable">The Burn variable to store the result into.</param>
1057 /// <param name="condition">A condition to test before evaluating the search.</param>
1058 private void CreateWixSearchRow(IntermediateSection section, SourceLineNumber sourceLineNumbers, Identifier id, string variable, string condition)
1059 {
1060 section.Tuples.Add(new WixSearchTuple(sourceLineNumbers, id)
1061 {
1062 Variable = variable,
1063 Condition = condition,
1064 });
1065 }
1066
1067 /// <summary>
1068 ///
1069 /// </summary>
1070 /// <param name="sourceLineNumbers">Source line number for the parent element.</param>
1071 /// <param name="id">Identifier of the search (key into the WixSearch table)</param>
1072 /// <param name="parentId">Identifier of the search that comes before (key into the WixSearch table)</param>
1073 /// <param name="attributes">Further details about the relation between id and parentId.</param>
1074 private void CreateWixSearchRelationRow(IntermediateSection section, SourceLineNumber sourceLineNumbers, Identifier id, string parentId, int attributes)
1075 {
1076 section.Tuples.Add(new WixSearchRelationTuple(sourceLineNumbers, id)
1077 {
1078 ParentSearchRef = parentId,
1079 Attributes = attributes,
1080 });
1081 }
1082
1083 /// <summary>
1084 /// Parses a file share element. 1110 /// Parses a file share element.
1085 /// </summary> 1111 /// </summary>
1086 /// <param name="element">Element to parse.</param> 1112 /// <param name="element">Element to parse.</param>
@@ -2523,11 +2549,6 @@ namespace WixToolset.Util
2523 } 2549 }
2524 } 2550 }
2525 2551
2526 if (null == variable)
2527 {
2528 this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Variable"));
2529 }
2530
2531 if (null == upgradeCode && null == productCode) 2552 if (null == upgradeCode && null == productCode)
2532 { 2553 {
2533 this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "ProductCode", "UpgradeCode", true)); 2554 this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "ProductCode", "UpgradeCode", true));
@@ -2545,16 +2566,10 @@ namespace WixToolset.Util
2545 2566
2546 this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); 2567 this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
2547 2568
2569 this.ParseHelper.CreateWixSearchTuple(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, null);
2570
2548 if (!this.Messaging.EncounteredError) 2571 if (!this.Messaging.EncounteredError)
2549 { 2572 {
2550 this.CreateWixSearchRow(section, sourceLineNumbers, id, variable, condition);
2551 if (after != null)
2552 {
2553 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "WixSearch", after);
2554 // TODO: We're currently defaulting to "always run after", which we will need to change...
2555 this.CreateWixSearchRelationRow(section, sourceLineNumbers, id, after, 2);
2556 }
2557
2558 WixProductSearchAttributes attributes = WixProductSearchAttributes.Version; 2573 WixProductSearchAttributes attributes = WixProductSearchAttributes.Version;
2559 switch (result) 2574 switch (result)
2560 { 2575 {
@@ -2662,11 +2677,6 @@ namespace WixToolset.Util
2662 } 2677 }
2663 } 2678 }
2664 2679
2665 if (null == variable)
2666 {
2667 this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Variable"));
2668 }
2669
2670 if (!root.HasValue) 2680 if (!root.HasValue)
2671 { 2681 {
2672 this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Root")); 2682 this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Root"));
@@ -2726,16 +2736,10 @@ namespace WixToolset.Util
2726 2736
2727 this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); 2737 this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
2728 2738
2739 this.ParseHelper.CreateWixSearchTuple(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, null);
2740
2729 if (!this.Messaging.EncounteredError) 2741 if (!this.Messaging.EncounteredError)
2730 { 2742 {
2731 this.CreateWixSearchRow(section, sourceLineNumbers, id, variable, condition);
2732 if (after != null)
2733 {
2734 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "WixSearch", after);
2735 // TODO: We're currently defaulting to "always run after", which we will need to change...
2736 this.CreateWixSearchRelationRow(section, sourceLineNumbers, id, after, 2);
2737 }
2738
2739 section.Tuples.Add(new WixRegistrySearchTuple(sourceLineNumbers, id) 2743 section.Tuples.Add(new WixRegistrySearchTuple(sourceLineNumbers, id)
2740 { 2744 {
2741 Root = (RegistryRootType)root, 2745 Root = (RegistryRootType)root,
diff --git a/src/wixext/UtilConstants.cs b/src/wixext/UtilConstants.cs
index 28ff368f..d9ad460f 100644
--- a/src/wixext/UtilConstants.cs
+++ b/src/wixext/UtilConstants.cs
@@ -13,5 +13,7 @@ namespace WixToolset.Util
13 internal static readonly string[] RegistryPermissions = { "Read", "Write", "CreateSubkeys", "EnumerateSubkeys", "Notify", "CreateLink" }; 13 internal static readonly string[] RegistryPermissions = { "Read", "Write", "CreateSubkeys", "EnumerateSubkeys", "Notify", "CreateLink" };
14 internal static readonly string[] ServicePermissions = { "ServiceQueryConfig", "ServiceChangeConfig", "ServiceQueryStatus", "ServiceEnumerateDependents", "ServiceStart", "ServiceStop", "ServicePauseContinue", "ServiceInterrogate", "ServiceUserDefinedControl" }; 14 internal static readonly string[] ServicePermissions = { "ServiceQueryConfig", "ServiceChangeConfig", "ServiceQueryStatus", "ServiceEnumerateDependents", "ServiceStart", "ServiceStop", "ServicePauseContinue", "ServiceInterrogate", "ServiceUserDefinedControl" };
15 internal static readonly string[] StandardPermissions = { "Delete", "ReadPermission", "ChangePermission", "TakeOwnership", "Synchronize" }; 15 internal static readonly string[] StandardPermissions = { "Delete", "ReadPermission", "ChangePermission", "TakeOwnership", "Synchronize" };
16
17 internal const string UtilBundleExtensionId = "WixUtilBundleExtension";
16 } 18 }
17} 19}
diff --git a/src/wixext/UtilErrors.cs b/src/wixext/UtilErrors.cs
index 988b8321..c04f0449 100644
--- a/src/wixext/UtilErrors.cs
+++ b/src/wixext/UtilErrors.cs
@@ -13,11 +13,6 @@ namespace WixToolset.Util
13 return Message(null, Ids.ArgumentRequiresValue, "The argument '{0}' does not have a value specified and it is required.", argument); 13 return Message(null, Ids.ArgumentRequiresValue, "The argument '{0}' does not have a value specified and it is required.", argument);
14 } 14 }
15 15
16 public static Message CircularSearchReference(string chain)
17 {
18 return Message(null, Ids.CircularSearchReference, "A circular reference of search ordering constraints was detected: {0}. Search ordering references must form a directed acyclic graph.", chain);
19 }
20
21 public static Message DirectoryNotFound(string directory) 16 public static Message DirectoryNotFound(string directory)
22 { 17 {
23 return Message(null, Ids.DirectoryNotFound, "The directory '{0}' could not be found.", directory); 18 return Message(null, Ids.DirectoryNotFound, "The directory '{0}' could not be found.", directory);
@@ -102,7 +97,6 @@ namespace WixToolset.Util
102 FileNotFound = 5059, 97 FileNotFound = 5059,
103 PerformanceCategoryNotFound = 5060, 98 PerformanceCategoryNotFound = 5060,
104 UnsupportedPerformanceCounterType = 5061, 99 UnsupportedPerformanceCounterType = 5061,
105 CircularSearchReference = 5062,
106 InvalidRegistryObject = 5063, 100 InvalidRegistryObject = 5063,
107 } 101 }
108 } 102 }
diff --git a/src/wixext/util.xsd b/src/wixext/util.xsd
index fb8d8032..a8c3d208 100644
--- a/src/wixext/util.xsd
+++ b/src/wixext/util.xsd
@@ -172,6 +172,30 @@
172 <xs:attribute name="Id" type="xs:string" use="required" /> 172 <xs:attribute name="Id" type="xs:string" use="required" />
173 </xs:complexType> 173 </xs:complexType>
174 </xs:element> 174 </xs:element>
175 <xs:element name="DetectSHA2Support">
176 <xs:annotation>
177 <xs:documentation>Detects support for SHA2.</xs:documentation>
178 <xs:appinfo>
179 <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Bundle" />
180 <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Fragment" />
181 </xs:appinfo>
182 </xs:annotation>
183 <xs:complexType>
184 <xs:attributeGroup ref="SearchCommonAttributes" />
185 </xs:complexType>
186 </xs:element>
187 <xs:element name="DetectSHA2SupportRef">
188 <xs:annotation>
189 <xs:documentation>References a DetectSHA2Support.</xs:documentation>
190 <xs:appinfo>
191 <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Bundle" />
192 <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Fragment" />
193 </xs:appinfo>
194 </xs:annotation>
195 <xs:complexType>
196 <xs:attribute name="Id" type="xs:string" use="required" />
197 </xs:complexType>
198 </xs:element>
175 <xs:element name="DirectorySearch"> 199 <xs:element name="DirectorySearch">
176 <xs:annotation> 200 <xs:annotation>
177 <xs:documentation>Describes a directory search.</xs:documentation> 201 <xs:documentation>Describes a directory search.</xs:documentation>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-04-03 19:39:52 +0000