Handle missing attribute DeletePath/@order

nirbar · Jun 5, 2024 · 26c8266 · 26c8266
1 parent efe623d
commit 26c8266
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/.github/workflows/github-actions-build.yml b/.github/workflows/github-actions-build.yml
@@ -11,7 +11,7 @@ on:
       psw_wix_version:
         description: 'Custom WiX version'
         required: true
-        default: '3.15.0-a61'
+        default: '3.15.0-a62'
         type: string
 
 jobs:

diff --git a/PanelSwWixExtension/PanelSwWixCompiler.cs b/PanelSwWixExtension/PanelSwWixCompiler.cs
@@ -5231,6 +5231,13 @@ private void ParseDeletePath(XmlNode node)
                         case "Condition":
                             condition = Core.GetAttributeValue(sourceLineNumbers, attrib);
                             break;
+                        case "Order":
+                            order = Core.GetAttributeIntegerValue(sourceLineNumbers, attrib, -1000000000, 1000000000);
+                            if (order < 0)
+                            {
+                                order += int.MaxValue;
+                            }
+                            break;
 
                         default:
                             Core.UnexpectedAttribute(sourceLineNumbers, attrib);

diff --git a/PanelSwWixExtension/Xsd/PanelSwWixExtension.xsd b/PanelSwWixExtension/Xsd/PanelSwWixExtension.xsd
@@ -1568,6 +1568,11 @@ Delete folder or file specified by a path. DeletePath entries are processed in o
               <xs:documentation>If a lock prevents file removal then defer the removal to after reboot. Default is yes.</xs:documentation>
             </xs:annotation>
           </xs:attribute>
+          <xs:attribute name="Order" use="optional" type="xs:int" default="0">
+            <xs:annotation>
+              <xs:documentation><![CDATA[Order of execution, defaults to line number. Elements with explicit order field will be executed before elements with implicit order. Negative Order values will be executed last in increasing order. For example, Order="-1" will be executed last, after Order="-2"]]></xs:documentation>
+            </xs:annotation>
+          </xs:attribute>
         </xs:extension>
       </xs:simpleContent>
     </xs:complexType>

diff --git a/TidyBuild.custom.props b/TidyBuild.custom.props
@@ -2,7 +2,7 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <Import Project="$(MSBuildThisFileDirectory)TidyBuild.user.props" Condition="Exists('$(MSBuildThisFileDirectory)TidyBuild.user.props')"/>
   <PropertyGroup>
-    <FullVersion>3.11.1</FullVersion>
+    <FullVersion>3.11.2</FullVersion>
     <FullVersion Condition=" '$(GITHUB_RUN_NUMBER)'!='' ">$(FullVersion).$(GITHUB_RUN_NUMBER)</FullVersion>
     <ProductName>PanelSwWixExtension</ProductName>
     <Manufacturer>Panel::Software</Manufacturer>