Handle missing attribute DeletePath/@order

nirbar · Jun 5, 2024 · 1ee4015 · 1ee4015
1 parent 629b04d
commit 1ee4015
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 5 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: 'PanelSwWix4 version'
         required: true
-        default: 5.0.0-psw-wix.0275-51
+        default: 5.0.0-psw-wix.0285-52
         type: string
 
 jobs:
@@ -37,7 +37,7 @@ jobs:
             Add-Content -Path ${{ github.env }} -Value "PSW_WIX_VERSION=${{ env.DEFAULT_PSW_WIX_VERSION }}"
           }
         env:
-          DEFAULT_PSW_WIX_VERSION: '5.0.0-psw-wix.0275-51'
+          DEFAULT_PSW_WIX_VERSION: '5.0.0-psw-wix.0285-52'
 
       - name: Prepare for build
         run: |

diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <Wix4Version Condition=" '$(Wix4Version)' == '' ">4.0.5</Wix4Version>
-    <PanelSwWix4Version Condition=" '$(PanelSwWix4Version)' == '' ">5.0.0-psw-wix.0275-51</PanelSwWix4Version>
+    <PanelSwWix4Version Condition=" '$(PanelSwWix4Version)' == '' ">5.0.0-psw-wix.0285-52</PanelSwWix4Version>
     <SevenZapVersion Condition=" '$(SevenZapVersion)' == '' ">23.1.33</SevenZapVersion>
   </PropertyGroup>
   <ItemGroup>

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

diff --git a/src/PanelSwWixExtension/Xsd/PanelSwWixExtension.xsd b/src/PanelSwWixExtension/Xsd/PanelSwWixExtension.xsd
@@ -1573,6 +1573,11 @@ Note that build-time resolution may be harmed by this process. For example, MsiA
               <xs:documentation>Condition on executing the deletion.</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/src/TidyBuild.custom.props b/src/TidyBuild.custom.props
@@ -2,7 +2,7 @@
 <Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildThisFileDirectory)TidyBuild.user.props" Condition="Exists('$(MSBuildThisFileDirectory)TidyBuild.user.props')"/>
   <PropertyGroup>
-    <FullVersion>3.19.0</FullVersion>
+    <FullVersion>3.19.1</FullVersion>
     <FullVersion Condition=" '$(GITHUB_RUN_NUMBER)'!='' ">$(FullVersion).$(GITHUB_RUN_NUMBER)</FullVersion>
     <ProductName>PanelSwWixExtension</ProductName>
     <Manufacturer>Panel::Software</Manufacturer>

diff --git a/src/global.json b/src/global.json
@@ -1,7 +1,7 @@
 {
   "msbuild-sdks": {
     "WixToolset.Sdk": "4.0.5",
-    "PanelSwWix4.Sdk": "5.0.0-psw-wix.0275-51",
+    "PanelSwWix4.Sdk": "5.0.0-psw-wix.0285-52",
     "Microsoft.Build.Traversal": "4.0.0"
   }
 }