From bdc0be22fbc486f6ecedcc77a2e997d6b1240e82 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Sun, 31 Jan 2021 20:20:04 -0500
Subject: Remove Burn Authenticode

Fixes https://github.com/wixtoolset/issues/issues/6301
Fix *Command attribute rename.
---
 src/wixlib/NetCore3.1.8_x64.wxs  | 30 ++++++++++++------------------
 src/wixlib/NetCore3.1.8_x86.wxs  | 30 ++++++++++++------------------
 src/wixlib/NetCore3_Platform.wxi | 12 ++++++------
 src/wixlib/NetFx4.5.wxs          | 16 ++++++----------
 src/wixlib/NetFx4.wxs            | 32 ++++++++++++--------------------
 src/wixlib/NetFx451.wxs          | 16 ++++++----------
 src/wixlib/NetFx452.wxs          | 27 ++++++++++++---------------
 src/wixlib/NetFx46.wxs           | 16 ++++++----------
 src/wixlib/NetFx461.wxs          | 16 ++++++----------
 src/wixlib/NetFx462.wxs          | 16 ++++++----------
 src/wixlib/NetFx472.wxs          | 16 ++++++----------
 src/wixlib/NetFx48.wxs           | 16 ++++++----------
 12 files changed, 96 insertions(+), 147 deletions(-)

(limited to 'src')

diff --git a/src/wixlib/NetCore3.1.8_x64.wxs b/src/wixlib/NetCore3.1.8_x64.wxs
index d6877e56..18392eec 100644
--- a/src/wixlib/NetCore3.1.8_x64.wxs
+++ b/src/wixlib/NetCore3.1.8_x64.wxs
@@ -19,14 +19,14 @@
         <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" />
         <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
         <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
-        <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
+        <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" />
 
         <PackageGroup Id="$(var.AspNetCoreRedistId)">
             <ExePackage
                 Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
-                InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
-                RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
-                UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
+                InstallArguments="$(var.AspNetCoreRedistInstallArguments)"
+                RepairArguments="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)"
+                UninstallArguments="$(var.AspNetCoreRedistUninstallArguments)"
                 PerMachine="yes"
                 DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
                 InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
@@ -38,8 +38,6 @@
                 LogPathVariable="$(var.AspNetCoreRedistLog)"
                 Compressed="no">
                 <RemotePayload
-                    CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
-                    CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
                     Description="Microsoft ASP.NET Core 3.1.8 - Shared Framework"
                     Hash="61DC9EAA0C8968E48E13C5913ED202A2F8F94DBA"
                     ProductName="Microsoft ASP.NET Core 3.1.8 - Shared Framework"
@@ -55,14 +53,14 @@
         <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
         <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
         <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
-        <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
+        <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" />
 
         <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
             <ExePackage
                 Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
-                InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
-                RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
-                UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
+                InstallArguments="$(var.DesktopNetCoreRedistInstallArguments)"
+                RepairArguments="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)"
+                UninstallArguments="$(var.DesktopNetCoreRedistUninstallArguments)"
                 PerMachine="yes"
                 DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
                 InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
@@ -74,8 +72,6 @@
                 LogPathVariable="$(var.DesktopNetCoreRedistLog)"
                 Compressed="no">
                 <RemotePayload
-                    CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
-                    CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
                     Description="Microsoft Windows Desktop Runtime - 3.1.8 (x64)"
                     Hash="6DEE30E0C636B13650E7CE1D13E8CCC99CB2A7AC"
                     ProductName="Microsoft Windows Desktop Runtime - 3.1.8 (x64)"
@@ -91,14 +87,14 @@
         <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" />
         <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
         <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
-        <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
+        <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" />
 
         <PackageGroup Id="$(var.DotNetCoreRedistId)">
             <ExePackage
                 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
-                InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
-                RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
-                UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
+                InstallArguments="$(var.DotNetCoreRedistInstallArguments)"
+                RepairArguments="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)"
+                UninstallArguments="$(var.DotNetCoreRedistUninstallArguments)"
                 PerMachine="yes"
                 DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
                 InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
@@ -110,8 +106,6 @@
                 LogPathVariable="$(var.DotNetCoreRedistLog)"
                 Compressed="no">
                 <RemotePayload
-                    CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
-                    CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
                     Description="Microsoft .NET Core Runtime - 3.1.8 (x64)"
                     Hash="C51D55F163788404ECADE0BF32B3D7796EEAE449"
                     ProductName="Microsoft .NET Core Runtime - 3.1.8 (x64)"
diff --git a/src/wixlib/NetCore3.1.8_x86.wxs b/src/wixlib/NetCore3.1.8_x86.wxs
index bf639c22..445addc2 100644
--- a/src/wixlib/NetCore3.1.8_x86.wxs
+++ b/src/wixlib/NetCore3.1.8_x86.wxs
@@ -19,14 +19,14 @@
         <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" />
         <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
         <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
-        <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
+        <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" />
 
         <PackageGroup Id="$(var.AspNetCoreRedistId)">
             <ExePackage
                 Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
-                InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
-                RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
-                UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
+                InstallArguments="$(var.AspNetCoreRedistInstallArguments)"
+                RepairArguments="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)"
+                UninstallArguments="$(var.AspNetCoreRedistUninstallArguments)"
                 PerMachine="yes"
                 DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
                 InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
@@ -38,8 +38,6 @@
                 LogPathVariable="$(var.AspNetCoreRedistLog)"
                 Compressed="no">
                 <RemotePayload
-                    CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
-                    CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
                     Description="Microsoft ASP.NET Core 3.1.8 - Shared Framework"
                     Hash="39CAC2A47CB57594C6FC2ED693DF1A02064CBC8D"
                     ProductName="Microsoft ASP.NET Core 3.1.8 - Shared Framework"
@@ -55,14 +53,14 @@
         <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
         <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
         <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
-        <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
+        <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" />
 
         <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
             <ExePackage
                 Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
-                InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
-                RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
-                UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
+                InstallArguments="$(var.DesktopNetCoreRedistInstallArguments)"
+                RepairArguments="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)"
+                UninstallArguments="$(var.DesktopNetCoreRedistUninstallArguments)"
                 PerMachine="yes"
                 DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
                 InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
@@ -74,8 +72,6 @@
                 LogPathVariable="$(var.DesktopNetCoreRedistLog)"
                 Compressed="no">
                 <RemotePayload
-                    CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
-                    CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
                     Description="Microsoft Windows Desktop Runtime - 3.1.8 (x86)"
                     Hash="6105823D7417C265929DF2978A7214E7394E404F"
                     ProductName="Microsoft Windows Desktop Runtime - 3.1.8 (x86)"
@@ -91,14 +87,14 @@
         <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" />
         <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
         <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
-        <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
+        <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" />
 
         <PackageGroup Id="$(var.DotNetCoreRedistId)">
             <ExePackage
                 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
-                InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
-                RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
-                UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
+                InstallArguments="$(var.DotNetCoreRedistInstallArguments)"
+                RepairArguments="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)"
+                UninstallArguments="$(var.DotNetCoreRedistUninstallArguments)"
                 PerMachine="yes"
                 DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
                 InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
@@ -110,8 +106,6 @@
                 LogPathVariable="$(var.DotNetCoreRedistLog)"
                 Compressed="no">
                 <RemotePayload
-                    CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
-                    CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
                     Description="Microsoft .NET Core Runtime - 3.1.8 (x86)"
                     Hash="E3B05751BA0E48D81EF3EB60DABFC6388BAA5E91"
                     ProductName="Microsoft .NET Core Runtime - 3.1.8 (x86)"
diff --git a/src/wixlib/NetCore3_Platform.wxi b/src/wixlib/NetCore3_Platform.wxi
index 2079b5c4..bb7e59a7 100644
--- a/src/wixlib/NetCore3_Platform.wxi
+++ b/src/wixlib/NetCore3_Platform.wxi
@@ -9,20 +9,20 @@
   <?define AspNetCoreId = ASPNETCORERUNTIME$(var.NetCoreIdVersion)_$(var.NetCorePlatform)?>
   <?define AspNetCoreRedistId = AspNetCoreRuntime$(var.NetCoreIdVersion)Redist_$(var.NetCorePlatform)?>
   <?define AspNetCoreRedistLog = AspNetCoreRuntime$(var.NetCoreIdVersion)RedistLog?>
-  <?define AspNetCoreRedistInstallCommand = /install /quiet /norestart /log &quot;[$(var.AspNetCoreRedistLog)]&quot;?>
-  <?define AspNetCoreRedistUninstallCommand = /uninstall /quiet /norestart /log &quot;[$(var.AspNetCoreRedistLog)]&quot;?>
+  <?define AspNetCoreRedistInstallArguments = /install /quiet /norestart /log &quot;[$(var.AspNetCoreRedistLog)]&quot;?>
+  <?define AspNetCoreRedistUninstallArguments = /uninstall /quiet /norestart /log &quot;[$(var.AspNetCoreRedistLog)]&quot;?>
 
   <?define DesktopNetCoreId = DESKTOPNETCORERUNTIME$(var.NetCoreIdVersion)_$(var.NetCorePlatform)?>
   <?define DesktopNetCoreRedistId = DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist_$(var.NetCorePlatform)?>
   <?define DesktopNetCoreRedistLog = DesktopNetCoreRuntime$(var.NetCoreIdVersion)RedistLog?>
-  <?define DesktopNetCoreRedistInstallCommand = /install /quiet /norestart /log &quot;[$(var.DesktopNetCoreRedistLog)]&quot;?>
-  <?define DesktopNetCoreRedistUninstallCommand = /uninstall /quiet /norestart /log &quot;[$(var.DesktopNetCoreRedistLog)]&quot;?>
+  <?define DesktopNetCoreRedistInstallArguments = /install /quiet /norestart /log &quot;[$(var.DesktopNetCoreRedistLog)]&quot;?>
+  <?define DesktopNetCoreRedistUninstallArguments = /uninstall /quiet /norestart /log &quot;[$(var.DesktopNetCoreRedistLog)]&quot;?>
 
   <?define DotNetCoreId = DOTNETCORERUNTIME$(var.NetCoreIdVersion)_$(var.NetCorePlatform)?>
   <?define DotNetCoreRedistId = DotNetCoreRuntime$(var.NetCoreIdVersion)Redist_$(var.NetCorePlatform)?>
   <?define DotNetCoreRedistLog = DotNetCoreRuntime$(var.NetCoreIdVersion)RedistLog?>
-  <?define DotNetCoreRedistInstallCommand = /install /quiet /norestart /log &quot;[$(var.DotNetCoreRedistLog)]&quot;?>
-  <?define DotNetCoreRedistUninstallCommand = /uninstall /quiet /norestart /log &quot;[$(var.DotNetCoreRedistLog)]&quot;?>
+  <?define DotNetCoreRedistInstallArguments = /install /quiet /norestart /log &quot;[$(var.DotNetCoreRedistLog)]&quot;?>
+  <?define DotNetCoreRedistUninstallArguments = /uninstall /quiet /norestart /log &quot;[$(var.DotNetCoreRedistLog)]&quot;?>
 
   <?define DotNetHomeId = DOTNETHOME_$(var.NetCorePlatform)?>
   <?define NetCoreEulaLink = https://go.microsoft.com/fwlink/?LinkId=329770?>
diff --git a/src/wixlib/NetFx4.5.wxs b/src/wixlib/NetFx4.5.wxs
index ea8b66c5..883c34da 100644
--- a/src/wixlib/NetFx4.5.wxs
+++ b/src/wixlib/NetFx4.5.wxs
@@ -46,9 +46,9 @@
 
     <PackageGroup Id="$(var.NetFx45WebId)">
       <ExePackage
-          InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx45FullWebLog].html&quot;"
-          RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx45FullWebLog].html&quot;"
-          UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx45FullWebLog].html&quot;"
+          InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx45FullWebLog].html&quot;"
+          RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx45FullWebLog].html&quot;"
+          UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx45FullWebLog].html&quot;"
           PerMachine="yes"
           DetectCondition="!(wix.NetFx45WebDetectCondition)"
           InstallCondition="!(wix.NetFx45WebInstallCondition)"
@@ -65,8 +65,6 @@
             Version="4.5.50709.17929"
             ProductName="Microsoft .NET Framework 4.5"
             Description="Microsoft .NET Framework 4.5 Setup"
-            CertificatePublicKey="BE931A1B869E4BB989C2B32D0C105204ECBEFB3D" 
-            CertificateThumbprint="8363887511B4835B79C383ECF06FC055B5839255" 
             Hash="F6BA6F03C65C3996A258F58324A917463B2D6FF4"/>
       </ExePackage>
     </PackageGroup>
@@ -89,9 +87,9 @@
 
     <PackageGroup Id="$(var.NetFx45RedistId)">
       <ExePackage
-          InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx45FullLog].html&quot;"
-          RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx45FullLog].html&quot;"
-          UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx45FullLog].html&quot;"
+          InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx45FullLog].html&quot;"
+          RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx45FullLog].html&quot;"
+          UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx45FullLog].html&quot;"
           PerMachine="yes"
           DetectCondition="!(wix.NetFx45RedistDetectCondition)"
           InstallCondition="!(wix.NetFx45RedistInstallCondition)"
@@ -108,8 +106,6 @@
             Version="4.5.50709.17929"
             ProductName="Microsoft .NET Framework 4.5"
             Description="Microsoft .NET Framework 4.5 Setup"
-            CertificatePublicKey="BE931A1B869E4BB989C2B32D0C105204ECBEFB3D" 
-            CertificateThumbprint="8363887511B4835B79C383ECF06FC055B5839255" 
             Hash="B2FF712CA0947040CA0B8E9BD7436A3C3524BB5D"/>
       </ExePackage>
     </PackageGroup>
diff --git a/src/wixlib/NetFx4.wxs b/src/wixlib/NetFx4.wxs
index ac463c3c..8816a235 100644
--- a/src/wixlib/NetFx4.wxs
+++ b/src/wixlib/NetFx4.wxs
@@ -45,9 +45,9 @@
 
     <PackageGroup Id="$(var.NetFx40WebId)">
       <ExePackage
-          InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot;"
-          RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot;"
-          UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot;"
+          InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot;"
+          RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot;"
+          UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot;"
           PerMachine="yes"
           DetectCondition="NETFRAMEWORK40"
           Id="$(var.NetFx40WebId)"
@@ -62,8 +62,6 @@
             Version="4.0.30319.1"
             ProductName="Microsoft .NET Framework 4"
             Description="Microsoft .NET Framework 4 Setup"
-            CertificatePublicKey="672605E36DD71EC6B8325B91C5FE6971390CB6B6"
-            CertificateThumbprint="9617094A1CFB59AE7C1F7DFDB6739E4E7C40508F"
             Hash="06BECADB92A5FCCA2529C0B93687C2A0C6D0D610"/>
       </ExePackage>
     </PackageGroup>
@@ -82,9 +80,9 @@
 
     <PackageGroup Id="$(var.NetFx40RedistId)">
       <ExePackage
-          InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot;"
-          RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot;"
-          UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot;"
+          InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot;"
+          RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot;"
+          UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot;"
           PerMachine="yes"
           DetectCondition="NETFRAMEWORK40"
           Id="$(var.NetFx40RedistId)"
@@ -99,8 +97,6 @@
             Version="4.0.30319.1"
             ProductName="Microsoft .NET Framework 4"
             Description="Microsoft .NET Framework 4 Setup"
-            CertificatePublicKey="672605E36DD71EC6B8325B91C5FE6971390CB6B6"
-            CertificateThumbprint="9617094A1CFB59AE7C1F7DFDB6739E4E7C40508F"
             Hash="58DA3D74DB353AAD03588CBB5CEA8234166D8B99"/>
       </ExePackage>
     </PackageGroup>
@@ -129,9 +125,9 @@
 
     <PackageGroup Id="$(var.NetFx40ClientWebId)">
       <ExePackage
-          InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot;"
-          RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot;"
-          UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot;"
+          InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot;"
+          RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot;"
+          UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot;"
           PerMachine="yes"
           DetectCondition="NETFRAMEWORK40CLIENT"
           Id="$(var.NetFx40ClientWebId)"
@@ -146,8 +142,6 @@
             Version="4.0.30319.1"
             ProductName="Microsoft .NET Framework 4 Client Profile"
             Description="Microsoft .NET Framework 4 Client Profile Setup"
-            CertificatePublicKey="672605E36DD71EC6B8325B91C5FE6971390CB6B6"
-            CertificateThumbprint="9617094A1CFB59AE7C1F7DFDB6739E4E7C40508F"
             Hash="E15AD80FC74277EF2048312E9A71AF56B2EBA622"/>
       </ExePackage>
     </PackageGroup>
@@ -166,9 +160,9 @@
 
     <PackageGroup Id="$(var.NetFx40ClientRedistId)">
       <ExePackage
-          InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot;"
-          RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot;"
-          UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot;"
+          InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot;"
+          RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot;"
+          UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot;"
           PerMachine="yes"
           DetectCondition="NETFRAMEWORK40CLIENT"
           Id="$(var.NetFx40ClientRedistId)"
@@ -183,8 +177,6 @@
             Version="4.0.30319.1"
             ProductName="Microsoft .NET Framework 4 Client Profile"
             Description="Microsoft .NET Framework 4 Client Profile Setup"
-            CertificatePublicKey="672605E36DD71EC6B8325B91C5FE6971390CB6B6"
-            CertificateThumbprint="9617094A1CFB59AE7C1F7DFDB6739E4E7C40508F"
             Hash="4CD67F609F89D617D2B206341B8C211E1B88B287"/>
       </ExePackage>
     </PackageGroup>
diff --git a/src/wixlib/NetFx451.wxs b/src/wixlib/NetFx451.wxs
index 145de6d9..266a744b 100644
--- a/src/wixlib/NetFx451.wxs
+++ b/src/wixlib/NetFx451.wxs
@@ -36,9 +36,9 @@
 
     <PackageGroup Id="$(var.NetFx451WebId)">
       <ExePackage
-          InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx451FullWebLog].html&quot;"
-          RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx451FullWebLog].html&quot;"
-          UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx451FullWebLog].html&quot;"
+          InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx451FullWebLog].html&quot;"
+          RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx451FullWebLog].html&quot;"
+          UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx451FullWebLog].html&quot;"
           PerMachine="yes"
           DetectCondition="!(wix.NetFx451WebDetectCondition)"
           InstallCondition="!(wix.NetFx451WebInstallCondition)"
@@ -55,8 +55,6 @@
             Version="4.5.50938.18408"
             ProductName="Microsoft .NET Framework 4.5.1"
             Description="Microsoft .NET Framework 4.5.1 Setup"
-            CertificatePublicKey="A260A870BE1145ED71E2BB5AA19463A4FE9DCC41"
-            CertificateThumbprint="108E2BA23632620C427C570B6D9DB51AC31387FE"
             Hash="4CBEA1E408DB5B423E130931B9478972E6798431" />
       </ExePackage>
     </PackageGroup>
@@ -79,9 +77,9 @@
 
     <PackageGroup Id="$(var.NetFx451RedistId)">
       <ExePackage
-          InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx451FullLog].html&quot;"
-          RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx451FullLog].html&quot;"
-          UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx451FullLog].html&quot;"
+          InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx451FullLog].html&quot;"
+          RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx451FullLog].html&quot;"
+          UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx451FullLog].html&quot;"
           PerMachine="yes"
           DetectCondition="!(wix.NetFx451RedistDetectCondition)"
           InstallCondition="!(wix.NetFx451RedistInstallCondition)"
@@ -98,8 +96,6 @@
             Version="4.5.50938.18408"
             ProductName="Microsoft .NET Framework 4.5.1"
             Description="Microsoft .NET Framework 4.5.1 Setup"
-            CertificatePublicKey="A260A870BE1145ED71E2BB5AA19463A4FE9DCC41"
-            CertificateThumbprint="108E2BA23632620C427C570B6D9DB51AC31387FE"
             Hash="5934DD101414BBC0B7F1EE2780D2FC8B9BEC5C4D" />
       </ExePackage>
     </PackageGroup>
diff --git a/src/wixlib/NetFx452.wxs b/src/wixlib/NetFx452.wxs
index 1dfa6600..ca8859c2 100644
--- a/src/wixlib/NetFx452.wxs
+++ b/src/wixlib/NetFx452.wxs
@@ -35,9 +35,9 @@
 
     <PackageGroup Id="$(var.NetFx452WebId)">
       <ExePackage
-          InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx452FullWebLog].html&quot;"
-          RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx452FullWebLog].html&quot;"
-          UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx452FullWebLog].html&quot;"
+          InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx452FullWebLog].html&quot;"
+          RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx452FullWebLog].html&quot;"
+          UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx452FullWebLog].html&quot;"
           PerMachine="yes"
           DetectCondition="!(wix.NetFx452WebDetectCondition)"
           InstallCondition="!(wix.NetFx452WebInstallCondition)"
@@ -49,13 +49,12 @@
           LogPathVariable="NetFx452FullWebLog"
           Compressed="no"
           Name="!(wix.NetFx452WebPackageDirectory)NDP452-KB2901954-Web.exe">
-        <RemotePayload CertificatePublicKey="B78FE7F6917E1BC5F4A9C77BA3D555A0E807B9E0"
-                       CertificateThumbprint="67B1757863E3EFF760EA9EBB02849AF07D3A8080"
-                       Description="Microsoft .NET Framework 4.5.2 Setup"
-                       Hash="5B71B20A455F6EEAB79DD1EDCAB0BA66AD0D2208"
-                       ProductName="Microsoft .NET Framework 4.5.2"
-                       Size="1118920"
-                       Version="4.5.51209.34209" />
+        <RemotePayload 
+          Description="Microsoft .NET Framework 4.5.2 Setup"
+          Hash="5B71B20A455F6EEAB79DD1EDCAB0BA66AD0D2208"
+          ProductName="Microsoft .NET Framework 4.5.2"
+          Size="1118920"
+          Version="4.5.51209.34209" />
       </ExePackage>
     </PackageGroup>
   </Fragment>
@@ -77,9 +76,9 @@
 
     <PackageGroup Id="$(var.NetFx452RedistId)">
       <ExePackage
-          InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx452FullLog].html&quot;"
-          RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx452FullLog].html&quot;"
-          UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx452FullLog].html&quot;"
+          InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx452FullLog].html&quot;"
+          RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx452FullLog].html&quot;"
+          UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx452FullLog].html&quot;"
           PerMachine="yes"
           DetectCondition="!(wix.NetFx452RedistDetectCondition)"
           InstallCondition="!(wix.NetFx452RedistInstallCondition)"
@@ -92,8 +91,6 @@
           Compressed="no"
           Name="!(wix.NetFx452RedistPackageDirectory)NDP452-KB2901907-x86-x64-AllOS-ENU.exe">
         <RemotePayload 
-          CertificatePublicKey="B78FE7F6917E1BC5F4A9C77BA3D555A0E807B9E0"
-          CertificateThumbprint="67B1757863E3EFF760EA9EBB02849AF07D3A8080"
           Description="Microsoft .NET Framework 4.5.2 Setup"
           Hash="89F86F9522DC7A8A965FACCE839ABB790A285A63"
           ProductName="Microsoft .NET Framework 4.5.2"
diff --git a/src/wixlib/NetFx46.wxs b/src/wixlib/NetFx46.wxs
index c185f339..dbe629ac 100644
--- a/src/wixlib/NetFx46.wxs
+++ b/src/wixlib/NetFx46.wxs
@@ -36,9 +36,9 @@
 
     <PackageGroup Id="$(var.NetFx46WebId)">
       <ExePackage
-          InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx46FullLog].html&quot;"
-          RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx46FullLog].html&quot;"
-          UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx46FullLog].html&quot;"
+          InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx46FullLog].html&quot;"
+          RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx46FullLog].html&quot;"
+          UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx46FullLog].html&quot;"
           PerMachine="yes"
           DetectCondition="!(wix.NetFx46WebDetectCondition)"
           InstallCondition="!(wix.NetFx46WebInstallCondition)"
@@ -51,8 +51,6 @@
           Compressed="no"
           Name="!(wix.NetFx46WebPackageDirectory)NDP46-KB3045560-Web.exe">
         <RemotePayload 
-          CertificatePublicKey="52868DFCA6E3AF2632389E6C1EE7D0468D3797D0" 
-          CertificateThumbprint="3BDA323E552DB1FDE5F4FBEE75D6D5B2B187EEDC" 
           Description="Microsoft .NET Framework 4.6 Setup" 
           Hash="480CA134B9E3F2437DF10719D5A8C77DDEC0A4F1" 
           ProductName="Microsoft .NET Framework 4.6" 
@@ -79,9 +77,9 @@
 
     <PackageGroup Id="$(var.NetFx46RedistId)">
       <ExePackage
-          InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx46FullLog].html&quot;"
-          RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx46FullLog].html&quot;"
-          UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx46FullLog].html&quot;"
+          InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx46FullLog].html&quot;"
+          RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx46FullLog].html&quot;"
+          UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx46FullLog].html&quot;"
           PerMachine="yes"
           DetectCondition="!(wix.NetFx46RedistDetectCondition)"
           InstallCondition="!(wix.NetFx46RedistInstallCondition)"
@@ -94,8 +92,6 @@
           Compressed="no"
           Name="!(wix.NetFx46RedistPackageDirectory)NDP46-KB3045557-x86-x64-AllOS-ENU.exe">
         <RemotePayload
-          CertificatePublicKey="52868DFCA6E3AF2632389E6C1EE7D0468D3797D0" 
-          CertificateThumbprint="3BDA323E552DB1FDE5F4FBEE75D6D5B2B187EEDC" 
           Description="Microsoft .NET Framework 4.6 Setup" 
           Hash="3049A85843EAF65E89E2336D5FE6E85E416797BE" 
           ProductName="Microsoft .NET Framework 4.6" 
diff --git a/src/wixlib/NetFx461.wxs b/src/wixlib/NetFx461.wxs
index 5a43929f..900080cc 100644
--- a/src/wixlib/NetFx461.wxs
+++ b/src/wixlib/NetFx461.wxs
@@ -35,9 +35,9 @@
 
     <PackageGroup Id="$(var.NetFx461WebId)">
       <ExePackage
-          InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx461FullLog].html&quot;"
-          RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx461FullLog].html&quot;"
-          UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx461FullLog].html&quot;"
+          InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx461FullLog].html&quot;"
+          RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx461FullLog].html&quot;"
+          UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx461FullLog].html&quot;"
           PerMachine="yes"
           DetectCondition="!(wix.NetFx461WebDetectCondition)"
           InstallCondition="!(wix.NetFx461WebInstallCondition)"
@@ -50,8 +50,6 @@
           Compressed="no"
           Name="!(wix.NetFx461WebPackageDirectory)NDP461-KB3102438-Web.exe">
         <RemotePayload 
-          CertificatePublicKey="52868DFCA6E3AF2632389E6C1EE7D0468D3797D0" 
-          CertificateThumbprint="3BDA323E552DB1FDE5F4FBEE75D6D5B2B187EEDC" 
           Description="Microsoft .NET Framework 4.6.1 Setup" 
           Hash="EE88B05232F43B517D4A368F7EE5065CDE7F67FA" 
           ProductName="Microsoft .NET Framework 4.6.1" 
@@ -78,9 +76,9 @@
 
     <PackageGroup Id="$(var.NetFx461RedistId)">
       <ExePackage
-          InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx461FullLog].html&quot;"
-          RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx461FullLog].html&quot;"
-          UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx461FullLog].html&quot;"
+          InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx461FullLog].html&quot;"
+          RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx461FullLog].html&quot;"
+          UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx461FullLog].html&quot;"
           PerMachine="yes"
           DetectCondition="!(wix.NetFx461RedistDetectCondition)"
           InstallCondition="!(wix.NetFx461RedistInstallCondition)"
@@ -93,8 +91,6 @@
           Compressed="no"
           Name="!(wix.NetFx461RedistPackageDirectory)NDP461-KB3102436-x86-x64-AllOS-ENU.exe">
         <RemotePayload
-          CertificatePublicKey="52868DFCA6E3AF2632389E6C1EE7D0468D3797D0" 
-          CertificateThumbprint="3BDA323E552DB1FDE5F4FBEE75D6D5B2B187EEDC" 
           Description="Microsoft .NET Framework 4.6.1 Setup" 
           Hash="83D048D171FF44A3CAD9B422137656F585295866" 
           ProductName="Microsoft .NET Framework 4.6.1" 
diff --git a/src/wixlib/NetFx462.wxs b/src/wixlib/NetFx462.wxs
index 75321147..c80e7c27 100644
--- a/src/wixlib/NetFx462.wxs
+++ b/src/wixlib/NetFx462.wxs
@@ -35,9 +35,9 @@
 
     <PackageGroup Id="$(var.NetFx462WebId)">
       <ExePackage
-          InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx462FullLog].html&quot;"
-          RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx462FullLog].html&quot;"
-          UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx462FullLog].html&quot;"
+          InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx462FullLog].html&quot;"
+          RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx462FullLog].html&quot;"
+          UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx462FullLog].html&quot;"
           PerMachine="yes"
           DetectCondition="!(wix.NetFx462WebDetectCondition)"
           InstallCondition="!(wix.NetFx462WebInstallCondition)"
@@ -50,8 +50,6 @@
           Compressed="no"
           Name="!(wix.NetFx462WebPackageDirectory)NDP462-KB3151802-Web.exe">
         <RemotePayload 
-          CertificatePublicKey="52868DFCA6E3AF2632389E6C1EE7D0468D3797D0" 
-          CertificateThumbprint="3BDA323E552DB1FDE5F4FBEE75D6D5B2B187EEDC" 
           Description="Microsoft .NET Framework 4.6.2 Setup" 
           Hash="C42E6ED280290648BBD59F664008852F4CFE4548" 
           ProductName="Microsoft .NET Framework 4.6.2" 
@@ -78,9 +76,9 @@
 
     <PackageGroup Id="$(var.NetFx462RedistId)">
       <ExePackage
-          InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx462FullLog].html&quot;"
-          RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx462FullLog].html&quot;"
-          UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx462FullLog].html&quot;"
+          InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx462FullLog].html&quot;"
+          RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx462FullLog].html&quot;"
+          UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx462FullLog].html&quot;"
           PerMachine="yes"
           DetectCondition="!(wix.NetFx462RedistDetectCondition)"
           InstallCondition="!(wix.NetFx462RedistInstallCondition)"
@@ -93,8 +91,6 @@
           Compressed="no"
           Name="!(wix.NetFx462RedistPackageDirectory)NDP462-KB3151800-x86-x64-AllOS-ENU.exe">
         <RemotePayload
-          CertificatePublicKey="52868DFCA6E3AF2632389E6C1EE7D0468D3797D0" 
-          CertificateThumbprint="3BDA323E552DB1FDE5F4FBEE75D6D5B2B187EEDC" 
           Description="Microsoft .NET Framework 4.6.2 Setup" 
           Hash="A70F856BDA33D45AD0A8AD035F73092441715431" 
           ProductName="Microsoft .NET Framework 4.6.2" 
diff --git a/src/wixlib/NetFx472.wxs b/src/wixlib/NetFx472.wxs
index f17e9997..bb439649 100644
--- a/src/wixlib/NetFx472.wxs
+++ b/src/wixlib/NetFx472.wxs
@@ -33,9 +33,9 @@
 
     <PackageGroup Id="$(var.NetFx472WebId)">
       <ExePackage
-          InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472WebLog].html&quot;"
-          RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472WebLog].html&quot;"
-          UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472WebLog].html&quot;"
+          InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472WebLog].html&quot;"
+          RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472WebLog].html&quot;"
+          UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472WebLog].html&quot;"
           PerMachine="yes"
           DetectCondition="!(wix.NetFx472WebDetectCondition)"
           InstallCondition="!(wix.NetFx472WebInstallCondition)"
@@ -48,8 +48,6 @@
           Compressed="no"
           Name="!(wix.NetFx472WebPackageDirectory)NDP472-KB4054531-Web.exe">
         <RemotePayload
-          CertificatePublicKey="C090C1A2CAFA9B967D9C87C7FE02F7C01FBDE4F2"
-          CertificateThumbprint="5EAD300DC7E4D637948ECB0ED829A072BD152E17"
           Description="Microsoft .NET Framework 4.7.2 Setup"
           Hash="CEDBBF404B166A5E72D035760BCB0FA508E4F4CB"
           ProductName="Microsoft .NET Framework 4.7.2"
@@ -76,9 +74,9 @@
 
     <PackageGroup Id="$(var.NetFx472RedistId)">
       <ExePackage
-          InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472RedistLog].html&quot;"
-          RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472RedistLog].html&quot;"
-          UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472RedistLog].html&quot;"
+          InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472RedistLog].html&quot;"
+          RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472RedistLog].html&quot;"
+          UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472RedistLog].html&quot;"
           PerMachine="yes"
           DetectCondition="!(wix.NetFx472RedistDetectCondition)"
           InstallCondition="!(wix.NetFx472RedistInstallCondition)"
@@ -91,8 +89,6 @@
           Compressed="no"
           Name="!(wix.NetFx472RedistPackageDirectory)NDP472-KB4054530-x86-x64-AllOS-ENU.exe">
         <RemotePayload
-          CertificatePublicKey="C090C1A2CAFA9B967D9C87C7FE02F7C01FBDE4F2"
-          CertificateThumbprint="5EAD300DC7E4D637948ECB0ED829A072BD152E17"
           Description="Microsoft .NET Framework 4.7.2 Setup"
           Hash="31FC0D305A6F651C9E892C98EB10997AE885EB1E"
           ProductName="Microsoft .NET Framework 4.7.2"
diff --git a/src/wixlib/NetFx48.wxs b/src/wixlib/NetFx48.wxs
index 9a5dd8bf..1945e139 100644
--- a/src/wixlib/NetFx48.wxs
+++ b/src/wixlib/NetFx48.wxs
@@ -33,9 +33,9 @@
 
         <PackageGroup Id="$(var.NetFx48WebId)">
             <ExePackage
-                InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48WebLog].html&quot;"
-                RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48WebLog].html&quot;"
-                UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48WebLog].html&quot;"
+                InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48WebLog].html&quot;"
+                RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48WebLog].html&quot;"
+                UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48WebLog].html&quot;"
                 PerMachine="yes"
                 DetectCondition="!(wix.NetFx48WebDetectCondition)"
                 InstallCondition="!(wix.NetFx48WebInstallCondition)"
@@ -48,8 +48,6 @@
                 Compressed="no"
                 Name="!(wix.NetFx48WebPackageDirectory)ndp48-web.exe">
                 <RemotePayload
-                  CertificatePublicKey="D17AFCE951979605250FAEBAFA7AE974899AED22" 
-                  CertificateThumbprint="C82273A065EC470FB1EBDE846A91E6FFB29E9C12" 
                   Description="Microsoft .NET Framework 4.8 Setup"
                   Hash="5A84A8E612E270E27D0061D58DB6B470153BE1F9" 
                   ProductName="Microsoft .NET Framework 4.8"
@@ -76,9 +74,9 @@
 
         <PackageGroup Id="$(var.NetFx48RedistId)">
             <ExePackage
-                InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48RedistLog].html&quot;"
-                RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48RedistLog].html&quot;"
-                UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48RedistLog].html&quot;"
+                InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48RedistLog].html&quot;"
+                RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48RedistLog].html&quot;"
+                UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48RedistLog].html&quot;"
                 PerMachine="yes"
                 DetectCondition="!(wix.NetFx48RedistDetectCondition)"
                 InstallCondition="!(wix.NetFx48RedistInstallCondition)"
@@ -91,8 +89,6 @@
                 Compressed="no"
                 Name="!(wix.NetFx48RedistPackageDirectory)ndp48-x86-x64-allos-enu.exe">
                 <RemotePayload
-                  CertificatePublicKey="D17AFCE951979605250FAEBAFA7AE974899AED22" 
-                  CertificateThumbprint="C82273A065EC470FB1EBDE846A91E6FFB29E9C12" 
                   Description="Microsoft .NET Framework 4.8 Setup"
                   Hash="8DD233698D5EB4609B86C2AC917279FE39E0EF4C" 
                   ProductName="Microsoft .NET Framework 4.8"
-- 
cgit v1.2.3-55-g6feb