From 174043e6f961c5c63fb89a1995b469f03be7894d Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Wed, 2 Sep 2020 17:41:20 -0400
Subject: Fix Condition authoring.

---
 global.json                            |  2 +-
 src/wixlib/NetFx4.5.wxs                |  8 +++-----
 src/wixlib/NetFx4.wxs                  | 12 +++++-------
 src/wixlib/NetFx451.wxs                |  8 +++-----
 src/wixlib/NetFx452.wxs                |  8 +++-----
 src/wixlib/NetFx46.wxs                 |  8 +++-----
 src/wixlib/NetFx461.wxs                |  8 +++-----
 src/wixlib/NetFx462.wxs                |  8 +++-----
 src/wixlib/NetFx47.wxs                 |  4 +---
 src/wixlib/NetFx471.wxs                |  4 +---
 src/wixlib/NetFx472.wxs                |  8 +++-----
 src/wixlib/NetFx48.wxs                 |  8 +++-----
 src/wixlib/NetFxExtension_Platform.wxi |  8 ++++----
 src/wixlib/caDecor.wxi                 | 21 ++++++++++-----------
 src/wixlib/netfx.wixproj               |  2 +-
 15 files changed, 47 insertions(+), 70 deletions(-)

diff --git a/global.json b/global.json
index 7a995d0a..1ba230a5 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "msbuild-sdks": {
-    "WixToolset.Sdk": "4.0.0-build-0143"
+    "WixToolset.Sdk": "4.0.0-build-0154"
   }
 }
diff --git a/src/wixlib/NetFx4.5.wxs b/src/wixlib/NetFx4.5.wxs
index d2ee09cd..ace065e2 100644
--- a/src/wixlib/NetFx4.5.wxs
+++ b/src/wixlib/NetFx4.5.wxs
@@ -24,9 +24,7 @@
   <Fragment>
     <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
     <Property Id="WIX_IS_NETFRAMEWORK_45_OR_LATER_INSTALLED" Secure="yes" />
-    <SetProperty Id="WIX_IS_NETFRAMEWORK_45_OR_LATER_INSTALLED" Value="1" After="AppSearch">
-      WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx45MinRelease)"
-    </SetProperty>
+    <SetProperty Id="WIX_IS_NETFRAMEWORK_45_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED &gt;= &quot;#$(var.NetFx45MinRelease)&quot;" />
   </Fragment>
 
   <Fragment>
@@ -40,7 +38,7 @@
   </Fragment>
   
   <Fragment>
-    <util:RegistrySearchRef Id="NETFRAMEWORK45"/>
+    <util:RegistrySearchRef Id="NETFRAMEWORK45" />
 
     <WixVariable Id="NetFx45WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx45MinRelease)" Overridable="yes" />
     <WixVariable Id="NetFx45WebInstallCondition" Value="" Overridable="yes" />
@@ -81,7 +79,7 @@
   </Fragment>
 
   <Fragment>
-    <util:RegistrySearchRef Id="NETFRAMEWORK45"/>
+    <util:RegistrySearchRef Id="NETFRAMEWORK45" />
 
     <WixVariable Id="NetFx45RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx45MinRelease)" Overridable="yes" />
     <WixVariable Id="NetFx45RedistInstallCondition" Value="" Overridable="yes" />
diff --git a/src/wixlib/NetFx4.wxs b/src/wixlib/NetFx4.wxs
index cad4a31c..047915b9 100644
--- a/src/wixlib/NetFx4.wxs
+++ b/src/wixlib/NetFx4.wxs
@@ -27,9 +27,7 @@
   <Fragment>
     <PropertyRef Id="NETFRAMEWORK40FULL" />
     <Property Id="WIX_IS_NETFRAMEWORK_40_OR_LATER_INSTALLED" Secure="yes" />
-    <SetProperty Id="WIX_IS_NETFRAMEWORK_40_OR_LATER_INSTALLED" Value="1" After="AppSearch">
-      NETFRAMEWORK40FULL
-    </SetProperty>
+    <SetProperty Id="WIX_IS_NETFRAMEWORK_40_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="NETFRAMEWORK40FULL" />
   </Fragment>
 
   <Fragment>
@@ -43,7 +41,7 @@
   </Fragment>
 
   <Fragment>
-    <util:RegistrySearchRef Id="NETFRAMEWORK40"/>
+    <util:RegistrySearchRef Id="NETFRAMEWORK40" />
 
     <PackageGroup Id="$(var.NetFx40WebId)">
       <ExePackage
@@ -78,7 +76,7 @@
   </Fragment>
 
   <Fragment>
-    <util:RegistrySearchRef Id="NETFRAMEWORK40"/>
+    <util:RegistrySearchRef Id="NETFRAMEWORK40" />
 
     <PackageGroup Id="$(var.NetFx40RedistId)">
       <ExePackage
@@ -123,7 +121,7 @@
   </Fragment>
 
   <Fragment>
-    <util:RegistrySearchRef Id="NETFRAMEWORK40CLIENT"/>
+    <util:RegistrySearchRef Id="NETFRAMEWORK40CLIENT" />
 
     <PackageGroup Id="$(var.NetFx40ClientWebId)">
       <ExePackage
@@ -158,7 +156,7 @@
   </Fragment>
 
   <Fragment>
-    <util:RegistrySearchRef Id="NETFRAMEWORK40CLIENT"/>
+    <util:RegistrySearchRef Id="NETFRAMEWORK40CLIENT" />
 
     <PackageGroup Id="$(var.NetFx40ClientRedistId)">
       <ExePackage
diff --git a/src/wixlib/NetFx451.wxs b/src/wixlib/NetFx451.wxs
index dc2b1fd6..36b6bab9 100644
--- a/src/wixlib/NetFx451.wxs
+++ b/src/wixlib/NetFx451.wxs
@@ -24,13 +24,11 @@
   <Fragment>
     <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
     <Property Id="WIX_IS_NETFRAMEWORK_451_OR_LATER_INSTALLED" Secure="yes" />
-    <SetProperty Id="WIX_IS_NETFRAMEWORK_451_OR_LATER_INSTALLED" Value="1" After="AppSearch">
-      WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx451MinRelease)"
-    </SetProperty>
+    <SetProperty Id="WIX_IS_NETFRAMEWORK_451_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED &gt;= &quot;#$(var.NetFx451MinRelease)&quot;" />
   </Fragment>
 
   <Fragment>
-    <util:RegistrySearchRef Id="NETFRAMEWORK45"/>
+    <util:RegistrySearchRef Id="NETFRAMEWORK45" />
 
     <WixVariable Id="NetFx451WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx451MinRelease)" Overridable="yes" />
     <WixVariable Id="NetFx451WebInstallCondition" Value="" Overridable="yes" />
@@ -71,7 +69,7 @@
   </Fragment>
 
   <Fragment>
-    <util:RegistrySearchRef Id="NETFRAMEWORK45"/>
+    <util:RegistrySearchRef Id="NETFRAMEWORK45" />
 
     <WixVariable Id="NetFx451RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx451MinRelease)" Overridable="yes" />
     <WixVariable Id="NetFx451RedistInstallCondition" Value="" Overridable="yes" />
diff --git a/src/wixlib/NetFx452.wxs b/src/wixlib/NetFx452.wxs
index 260f8ab1..8dbdd9b3 100644
--- a/src/wixlib/NetFx452.wxs
+++ b/src/wixlib/NetFx452.wxs
@@ -23,13 +23,11 @@
   <Fragment>
     <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
     <Property Id="WIX_IS_NETFRAMEWORK_452_OR_LATER_INSTALLED" Secure="yes" />
-    <SetProperty Id="WIX_IS_NETFRAMEWORK_452_OR_LATER_INSTALLED" Value="1" After="AppSearch">
-      WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx452MinRelease)"
-    </SetProperty>
+    <SetProperty Id="WIX_IS_NETFRAMEWORK_452_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED &gt;= &quot;#$(var.NetFx452MinRelease)&quot;" />
   </Fragment>
 
   <Fragment>
-    <util:RegistrySearchRef Id="NETFRAMEWORK45"/>
+    <util:RegistrySearchRef Id="NETFRAMEWORK45" />
 
     <WixVariable Id="NetFx452WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx452MinRelease)" Overridable="yes" />
     <WixVariable Id="NetFx452WebInstallCondition" Value="" Overridable="yes" />
@@ -69,7 +67,7 @@
   </Fragment>
 
   <Fragment>
-    <util:RegistrySearchRef Id="NETFRAMEWORK45"/>
+    <util:RegistrySearchRef Id="NETFRAMEWORK45" />
 
     <WixVariable Id="NetFx452RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx452MinRelease)" Overridable="yes" />
     <WixVariable Id="NetFx452RedistInstallCondition" Value="" Overridable="yes" />
diff --git a/src/wixlib/NetFx46.wxs b/src/wixlib/NetFx46.wxs
index a874ed95..5c875d09 100644
--- a/src/wixlib/NetFx46.wxs
+++ b/src/wixlib/NetFx46.wxs
@@ -24,13 +24,11 @@
   <Fragment>
     <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
     <Property Id="WIX_IS_NETFRAMEWORK_46_OR_LATER_INSTALLED" Secure="yes" />
-    <SetProperty Id="WIX_IS_NETFRAMEWORK_46_OR_LATER_INSTALLED" Value="1" After="AppSearch">
-      WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx46MinRelease)"
-    </SetProperty>
+    <SetProperty Id="WIX_IS_NETFRAMEWORK_46_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED &gt;= &quot;#$(var.NetFx46MinRelease)&quot;" />
   </Fragment>
 
   <Fragment>
-    <util:RegistrySearchRef Id="NETFRAMEWORK45"/>
+    <util:RegistrySearchRef Id="NETFRAMEWORK45" />
 
     <WixVariable Id="NetFx46WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx46MinRelease)" Overridable="yes" />
     <WixVariable Id="NetFx46WebInstallCondition" Value="" Overridable="yes" />
@@ -71,7 +69,7 @@
   </Fragment>
 
   <Fragment>
-    <util:RegistrySearchRef Id="NETFRAMEWORK45"/>
+    <util:RegistrySearchRef Id="NETFRAMEWORK45" />
 
     <WixVariable Id="NetFx46RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx46MinRelease)" Overridable="yes" />
     <WixVariable Id="NetFx46RedistInstallCondition" Value="" Overridable="yes" />
diff --git a/src/wixlib/NetFx461.wxs b/src/wixlib/NetFx461.wxs
index 52231a40..ec5a405c 100644
--- a/src/wixlib/NetFx461.wxs
+++ b/src/wixlib/NetFx461.wxs
@@ -23,13 +23,11 @@
   <Fragment>
     <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
     <Property Id="WIX_IS_NETFRAMEWORK_461_OR_LATER_INSTALLED" Secure="yes" />
-    <SetProperty Id="WIX_IS_NETFRAMEWORK_461_OR_LATER_INSTALLED" Value="1" After="AppSearch">
-      WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx461MinRelease)"
-    </SetProperty>
+    <SetProperty Id="WIX_IS_NETFRAMEWORK_461_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED &gt;= &quot;#$(var.NetFx461MinRelease)&quot;" />
   </Fragment>
 
   <Fragment>
-    <util:RegistrySearchRef Id="NETFRAMEWORK45"/>
+    <util:RegistrySearchRef Id="NETFRAMEWORK45" />
 
     <WixVariable Id="NetFx461WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx461MinRelease)" Overridable="yes" />
     <WixVariable Id="NetFx461WebInstallCondition" Value="" Overridable="yes" />
@@ -70,7 +68,7 @@
   </Fragment>
 
   <Fragment>
-    <util:RegistrySearchRef Id="NETFRAMEWORK45"/>
+    <util:RegistrySearchRef Id="NETFRAMEWORK45" />
 
     <WixVariable Id="NetFx461RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx461MinRelease)" Overridable="yes" />
     <WixVariable Id="NetFx461RedistInstallCondition" Value="" Overridable="yes" />
diff --git a/src/wixlib/NetFx462.wxs b/src/wixlib/NetFx462.wxs
index e8628b15..fc3aa158 100644
--- a/src/wixlib/NetFx462.wxs
+++ b/src/wixlib/NetFx462.wxs
@@ -23,13 +23,11 @@
   <Fragment>
     <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
     <Property Id="WIX_IS_NETFRAMEWORK_462_OR_LATER_INSTALLED" Secure="yes" />
-    <SetProperty Id="WIX_IS_NETFRAMEWORK_462_OR_LATER_INSTALLED" Value="1" After="AppSearch">
-      WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx462MinRelease)"
-    </SetProperty>
+    <SetProperty Id="WIX_IS_NETFRAMEWORK_462_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED &gt;= &quot;#$(var.NetFx462MinRelease)&quot;" />
   </Fragment>
 
   <Fragment>
-    <util:RegistrySearchRef Id="NETFRAMEWORK45"/>
+    <util:RegistrySearchRef Id="NETFRAMEWORK45" />
 
     <WixVariable Id="NetFx462WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx462MinRelease)" Overridable="yes" />
     <WixVariable Id="NetFx462WebInstallCondition" Value="" Overridable="yes" />
@@ -70,7 +68,7 @@
   </Fragment>
 
   <Fragment>
-    <util:RegistrySearchRef Id="NETFRAMEWORK45"/>
+    <util:RegistrySearchRef Id="NETFRAMEWORK45" />
 
     <WixVariable Id="NetFx462RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx462MinRelease)" Overridable="yes" />
     <WixVariable Id="NetFx462RedistInstallCondition" Value="" Overridable="yes" />
diff --git a/src/wixlib/NetFx47.wxs b/src/wixlib/NetFx47.wxs
index 2f4966ad..97f31500 100644
--- a/src/wixlib/NetFx47.wxs
+++ b/src/wixlib/NetFx47.wxs
@@ -18,8 +18,6 @@
   <Fragment>
     <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
     <Property Id="WIX_IS_NETFRAMEWORK_47_OR_LATER_INSTALLED" Secure="yes" />
-    <SetProperty Id="WIX_IS_NETFRAMEWORK_47_OR_LATER_INSTALLED" Value="1" After="AppSearch">
-      WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx47MinRelease)"
-    </SetProperty>
+    <SetProperty Id="WIX_IS_NETFRAMEWORK_47_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED &gt;= &quot;#$(var.NetFx47MinRelease)&quot;" />
   </Fragment>
 </Wix>
diff --git a/src/wixlib/NetFx471.wxs b/src/wixlib/NetFx471.wxs
index 3fd99aa3..b5d2c659 100644
--- a/src/wixlib/NetFx471.wxs
+++ b/src/wixlib/NetFx471.wxs
@@ -18,8 +18,6 @@
   <Fragment>
     <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
     <Property Id="WIX_IS_NETFRAMEWORK_471_OR_LATER_INSTALLED" Secure="yes" />
-    <SetProperty Id="WIX_IS_NETFRAMEWORK_471_OR_LATER_INSTALLED" Value="1" After="AppSearch">
-      WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx471MinRelease)"
-    </SetProperty>
+    <SetProperty Id="WIX_IS_NETFRAMEWORK_471_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED &gt;= &quot;#$(var.NetFx471MinRelease)&quot;" />
   </Fragment>
 </Wix>
diff --git a/src/wixlib/NetFx472.wxs b/src/wixlib/NetFx472.wxs
index 08a17d5b..5aaa1976 100644
--- a/src/wixlib/NetFx472.wxs
+++ b/src/wixlib/NetFx472.wxs
@@ -21,13 +21,11 @@
   <Fragment>
     <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
     <Property Id="WIX_IS_NETFRAMEWORK_472_OR_LATER_INSTALLED" Secure="yes" />
-    <SetProperty Id="WIX_IS_NETFRAMEWORK_472_OR_LATER_INSTALLED" Value="1" After="AppSearch">
-      WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx472MinRelease)"
-    </SetProperty>
+    <SetProperty Id="WIX_IS_NETFRAMEWORK_472_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED &gt;= &quot;#$(var.NetFx472MinRelease)&quot;" />
   </Fragment>
 
   <Fragment>
-    <util:RegistrySearchRef Id="NETFRAMEWORK45"/>
+    <util:RegistrySearchRef Id="NETFRAMEWORK45" />
 
     <WixVariable Id="NetFx472WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx472MinRelease)" Overridable="yes" />
     <WixVariable Id="NetFx472WebInstallCondition" Value="" Overridable="yes" />
@@ -68,7 +66,7 @@
   </Fragment>
 
   <Fragment>
-    <util:RegistrySearchRef Id="NETFRAMEWORK45"/>
+    <util:RegistrySearchRef Id="NETFRAMEWORK45" />
 
     <WixVariable Id="NetFx472RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx472MinRelease)" Overridable="yes" />
     <WixVariable Id="NetFx472RedistInstallCondition" Value="" Overridable="yes" />
diff --git a/src/wixlib/NetFx48.wxs b/src/wixlib/NetFx48.wxs
index d65d36be..acc79a31 100644
--- a/src/wixlib/NetFx48.wxs
+++ b/src/wixlib/NetFx48.wxs
@@ -21,13 +21,11 @@
     <Fragment>
         <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
         <Property Id="WIX_IS_NETFRAMEWORK_48_OR_LATER_INSTALLED" Secure="yes" />
-        <SetProperty Id="WIX_IS_NETFRAMEWORK_48_OR_LATER_INSTALLED" Value="1" After="AppSearch">
-            WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx48MinRelease)"
-        </SetProperty>
+        <SetProperty Id="WIX_IS_NETFRAMEWORK_48_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED &gt;= &quot;#$(var.NetFx48MinRelease)&quot;" />
     </Fragment>
 
     <Fragment>
-        <util:RegistrySearchRef Id="NETFRAMEWORK45"/>
+        <util:RegistrySearchRef Id="NETFRAMEWORK45" />
 
         <WixVariable Id="NetFx48WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx48MinRelease)" Overridable="yes" />
         <WixVariable Id="NetFx48WebInstallCondition" Value="" Overridable="yes" />
@@ -68,7 +66,7 @@
     </Fragment>
 
     <Fragment>
-        <util:RegistrySearchRef Id="NETFRAMEWORK45"/>
+        <util:RegistrySearchRef Id="NETFRAMEWORK45" />
 
         <WixVariable Id="NetFx48RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx48MinRelease)" Overridable="yes" />
         <WixVariable Id="NetFx48RedistInstallCondition" Value="" Overridable="yes" />
diff --git a/src/wixlib/NetFxExtension_Platform.wxi b/src/wixlib/NetFxExtension_Platform.wxi
index 92b13dad..96f03d44 100644
--- a/src/wixlib/NetFxExtension_Platform.wxi
+++ b/src/wixlib/NetFxExtension_Platform.wxi
@@ -15,10 +15,10 @@
 
     <InstallExecuteSequence>
       <Custom Action="$(var.Prefix)NetFxScheduleNativeImage$(var.Suffix)" Before="InstallFiles" Overridable="yes" />
-      <Custom Action="$(var.Prefix)NetFxExecuteNativeImageCommitUninstall$(var.Suffix)" After="MsiPublishAssemblies" Overridable="yes">RollbackDisabled &lt;&gt; 1</Custom>
-      <Custom Action="$(var.Prefix)NetFxExecuteNativeImageUninstall$(var.Suffix)" After="$(var.Prefix)NetFxExecuteNativeImageCommitUninstall$(var.Suffix)" Overridable="yes">RollbackDisabled = 1</Custom>
-      <Custom Action="$(var.Prefix)NetFxExecuteNativeImageCommitInstall$(var.Suffix)" After="$(var.Prefix)NetFxExecuteNativeImageUninstall$(var.Suffix)" Overridable="yes">RollbackDisabled &lt;&gt; 1</Custom>
-      <Custom Action="$(var.Prefix)NetFxExecuteNativeImageInstall$(var.Suffix)" After="$(var.Prefix)NetFxExecuteNativeImageCommitInstall$(var.Suffix)" Overridable="yes">RollbackDisabled = 1</Custom>
+      <Custom Action="$(var.Prefix)NetFxExecuteNativeImageCommitUninstall$(var.Suffix)" After="MsiPublishAssemblies" Overridable="yes" Condition="RollbackDisabled &lt;&gt; 1" />
+      <Custom Action="$(var.Prefix)NetFxExecuteNativeImageUninstall$(var.Suffix)" After="$(var.Prefix)NetFxExecuteNativeImageCommitUninstall$(var.Suffix)" Overridable="yes" Condition="RollbackDisabled = 1" />
+      <Custom Action="$(var.Prefix)NetFxExecuteNativeImageCommitInstall$(var.Suffix)" After="$(var.Prefix)NetFxExecuteNativeImageUninstall$(var.Suffix)" Overridable="yes" Condition="RollbackDisabled &lt;&gt; 1" />
+      <Custom Action="$(var.Prefix)NetFxExecuteNativeImageInstall$(var.Suffix)" After="$(var.Prefix)NetFxExecuteNativeImageCommitInstall$(var.Suffix)" Overridable="yes" Condition="RollbackDisabled = 1" />
     </InstallExecuteSequence>
   </Fragment>
 
diff --git a/src/wixlib/caDecor.wxi b/src/wixlib/caDecor.wxi
index 1d00df8f..b1711518 100644
--- a/src/wixlib/caDecor.wxi
+++ b/src/wixlib/caDecor.wxi
@@ -1,40 +1,39 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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. -->
+<!-- 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. -->
 
 
-<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <?ifdef Prefix ?>
         <?undef Prefix ?>
-    <?endif ?>
+    <?endif?>
 
     <?define Prefix="Wix4" ?>
 
     <?ifndef platform ?>
         <?define platform="x86" ?>
-    <?endif ?>
+    <?endif?>
 
     <?if $(var.platform)="" ?>
         <?undef platform ?>
         <?define platform="x86" ?>
-    <?endif ?>
+    <?endif?>
 
     <?ifdef Suffix ?>
         <?undef Suffix ?>
-    <?endif ?>
+    <?endif?>
 
     <?if $(var.platform)~="x86" ?>
         <?define Suffix="_X86" ?>
-    <?endif ?>
+    <?endif?>
 
     <?if $(var.platform)~="x64" ?>
         <?define Suffix="_X64" ?>
-    <?endif ?>
+    <?endif?>
 
     <?if $(var.platform)~="arm" ?>
         <?define Suffix="_A32" ?>
-    <?endif ?>
+    <?endif?>
 
     <?if $(var.platform)~="arm64" ?>
         <?define Suffix="_A64" ?>
-    <?endif ?>
+    <?endif?>
 </Include>
diff --git a/src/wixlib/netfx.wixproj b/src/wixlib/netfx.wixproj
index faf539a7..426446e8 100644
--- a/src/wixlib/netfx.wixproj
+++ b/src/wixlib/netfx.wixproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <BindInputPaths Include="$(OutputPath)Win32" BindName='x86' />
+    <BindInputPaths Include="$(OutputPath)x86" BindName='x86' />
     <BindInputPaths Include="$(OutputPath)x64" BindName='x64' />
     <BindInputPaths Include="$(OutputPath)arm" BindName='arm' />
     <BindInputPaths Include="$(OutputPath)arm64" BindName='arm64' />
-- 
cgit v1.2.3-55-g6feb