aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2021-01-31 20:20:04 -0500
committerBob Arnson <bob@firegiant.com>2021-01-31 20:22:16 -0500
commitbdc0be22fbc486f6ecedcc77a2e997d6b1240e82 (patch)
tree4569956a2c6574d7f73bd3647fbf07dae35f1139
parentdf3a3eba860a853495579bdb32ec6e00aa7a67f2 (diff)
downloadwix-bdc0be22fbc486f6ecedcc77a2e997d6b1240e82.tar.gz
wix-bdc0be22fbc486f6ecedcc77a2e997d6b1240e82.tar.bz2
wix-bdc0be22fbc486f6ecedcc77a2e997d6b1240e82.zip
Remove Burn Authenticode
Fixes https://github.com/wixtoolset/issues/issues/6301 Fix *Command attribute rename.
Diffstat
-rw-r--r--global.json2
-rw-r--r--src/wixlib/NetCore3.1.8_x64.wxs30
-rw-r--r--src/wixlib/NetCore3.1.8_x86.wxs30
-rw-r--r--src/wixlib/NetCore3_Platform.wxi12
-rw-r--r--src/wixlib/NetFx4.5.wxs16
-rw-r--r--src/wixlib/NetFx4.wxs32
-rw-r--r--src/wixlib/NetFx451.wxs16
-rw-r--r--src/wixlib/NetFx452.wxs27
-rw-r--r--src/wixlib/NetFx46.wxs16
-rw-r--r--src/wixlib/NetFx461.wxs16
-rw-r--r--src/wixlib/NetFx462.wxs16
-rw-r--r--src/wixlib/NetFx472.wxs16
-rw-r--r--src/wixlib/NetFx48.wxs16
13 files changed, 97 insertions, 148 deletions
diff --git a/global.json b/global.json
index 70abf3dd..f6e1d10f 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
1{ 1{
2 "msbuild-sdks": { 2 "msbuild-sdks": {
3 "WixToolset.Sdk": "4.0.0-build-0176" 3 "WixToolset.Sdk": "4.0.0-build-0185"
4 } 4 }
5} 5}
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 @@
19 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" /> 19 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" />
20 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" /> 20 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
21 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" /> 21 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
22 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" /> 22 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" />
23 23
24 <PackageGroup Id="$(var.AspNetCoreRedistId)"> 24 <PackageGroup Id="$(var.AspNetCoreRedistId)">
25 <ExePackage 25 <ExePackage
26 Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" 26 Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
27 InstallCommand="$(var.AspNetCoreRedistInstallCommand)" 27 InstallArguments="$(var.AspNetCoreRedistInstallArguments)"
28 RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)" 28 RepairArguments="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)"
29 UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)" 29 UninstallArguments="$(var.AspNetCoreRedistUninstallArguments)"
30 PerMachine="yes" 30 PerMachine="yes"
31 DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" 31 DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
32 InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" 32 InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
@@ -38,8 +38,6 @@
38 LogPathVariable="$(var.AspNetCoreRedistLog)" 38 LogPathVariable="$(var.AspNetCoreRedistLog)"
39 Compressed="no"> 39 Compressed="no">
40 <RemotePayload 40 <RemotePayload
41 CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
42 CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
43 Description="Microsoft ASP.NET Core 3.1.8 - Shared Framework" 41 Description="Microsoft ASP.NET Core 3.1.8 - Shared Framework"
44 Hash="61DC9EAA0C8968E48E13C5913ED202A2F8F94DBA" 42 Hash="61DC9EAA0C8968E48E13C5913ED202A2F8F94DBA"
45 ProductName="Microsoft ASP.NET Core 3.1.8 - Shared Framework" 43 ProductName="Microsoft ASP.NET Core 3.1.8 - Shared Framework"
@@ -55,14 +53,14 @@
55 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" /> 53 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
56 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" /> 54 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
57 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" /> 55 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
58 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" /> 56 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" />
59 57
60 <PackageGroup Id="$(var.DesktopNetCoreRedistId)"> 58 <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
61 <ExePackage 59 <ExePackage
62 Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" 60 Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
63 InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)" 61 InstallArguments="$(var.DesktopNetCoreRedistInstallArguments)"
64 RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)" 62 RepairArguments="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)"
65 UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)" 63 UninstallArguments="$(var.DesktopNetCoreRedistUninstallArguments)"
66 PerMachine="yes" 64 PerMachine="yes"
67 DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" 65 DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
68 InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" 66 InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
@@ -74,8 +72,6 @@
74 LogPathVariable="$(var.DesktopNetCoreRedistLog)" 72 LogPathVariable="$(var.DesktopNetCoreRedistLog)"
75 Compressed="no"> 73 Compressed="no">
76 <RemotePayload 74 <RemotePayload
77 CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
78 CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
79 Description="Microsoft Windows Desktop Runtime - 3.1.8 (x64)" 75 Description="Microsoft Windows Desktop Runtime - 3.1.8 (x64)"
80 Hash="6DEE30E0C636B13650E7CE1D13E8CCC99CB2A7AC" 76 Hash="6DEE30E0C636B13650E7CE1D13E8CCC99CB2A7AC"
81 ProductName="Microsoft Windows Desktop Runtime - 3.1.8 (x64)" 77 ProductName="Microsoft Windows Desktop Runtime - 3.1.8 (x64)"
@@ -91,14 +87,14 @@
91 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" /> 87 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" />
92 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" /> 88 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
93 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" /> 89 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
94 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" /> 90 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" />
95 91
96 <PackageGroup Id="$(var.DotNetCoreRedistId)"> 92 <PackageGroup Id="$(var.DotNetCoreRedistId)">
97 <ExePackage 93 <ExePackage
98 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" 94 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
99 InstallCommand="$(var.DotNetCoreRedistInstallCommand)" 95 InstallArguments="$(var.DotNetCoreRedistInstallArguments)"
100 RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)" 96 RepairArguments="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)"
101 UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)" 97 UninstallArguments="$(var.DotNetCoreRedistUninstallArguments)"
102 PerMachine="yes" 98 PerMachine="yes"
103 DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" 99 DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
104 InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" 100 InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
@@ -110,8 +106,6 @@
110 LogPathVariable="$(var.DotNetCoreRedistLog)" 106 LogPathVariable="$(var.DotNetCoreRedistLog)"
111 Compressed="no"> 107 Compressed="no">
112 <RemotePayload 108 <RemotePayload
113 CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
114 CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
115 Description="Microsoft .NET Core Runtime - 3.1.8 (x64)" 109 Description="Microsoft .NET Core Runtime - 3.1.8 (x64)"
116 Hash="C51D55F163788404ECADE0BF32B3D7796EEAE449" 110 Hash="C51D55F163788404ECADE0BF32B3D7796EEAE449"
117 ProductName="Microsoft .NET Core Runtime - 3.1.8 (x64)" 111 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 @@
19 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" /> 19 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" />
20 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" /> 20 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
21 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" /> 21 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
22 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" /> 22 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" />
23 23
24 <PackageGroup Id="$(var.AspNetCoreRedistId)"> 24 <PackageGroup Id="$(var.AspNetCoreRedistId)">
25 <ExePackage 25 <ExePackage
26 Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" 26 Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
27 InstallCommand="$(var.AspNetCoreRedistInstallCommand)" 27 InstallArguments="$(var.AspNetCoreRedistInstallArguments)"
28 RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)" 28 RepairArguments="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)"
29 UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)" 29 UninstallArguments="$(var.AspNetCoreRedistUninstallArguments)"
30 PerMachine="yes" 30 PerMachine="yes"
31 DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" 31 DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
32 InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" 32 InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
@@ -38,8 +38,6 @@
38 LogPathVariable="$(var.AspNetCoreRedistLog)" 38 LogPathVariable="$(var.AspNetCoreRedistLog)"
39 Compressed="no"> 39 Compressed="no">
40 <RemotePayload 40 <RemotePayload
41 CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
42 CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
43 Description="Microsoft ASP.NET Core 3.1.8 - Shared Framework" 41 Description="Microsoft ASP.NET Core 3.1.8 - Shared Framework"
44 Hash="39CAC2A47CB57594C6FC2ED693DF1A02064CBC8D" 42 Hash="39CAC2A47CB57594C6FC2ED693DF1A02064CBC8D"
45 ProductName="Microsoft ASP.NET Core 3.1.8 - Shared Framework" 43 ProductName="Microsoft ASP.NET Core 3.1.8 - Shared Framework"
@@ -55,14 +53,14 @@
55 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" /> 53 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
56 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" /> 54 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
57 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" /> 55 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
58 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" /> 56 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" />
59 57
60 <PackageGroup Id="$(var.DesktopNetCoreRedistId)"> 58 <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
61 <ExePackage 59 <ExePackage
62 Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" 60 Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
63 InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)" 61 InstallArguments="$(var.DesktopNetCoreRedistInstallArguments)"
64 RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)" 62 RepairArguments="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)"
65 UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)" 63 UninstallArguments="$(var.DesktopNetCoreRedistUninstallArguments)"
66 PerMachine="yes" 64 PerMachine="yes"
67 DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" 65 DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
68 InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" 66 InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
@@ -74,8 +72,6 @@
74 LogPathVariable="$(var.DesktopNetCoreRedistLog)" 72 LogPathVariable="$(var.DesktopNetCoreRedistLog)"
75 Compressed="no"> 73 Compressed="no">
76 <RemotePayload 74 <RemotePayload
77 CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
78 CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
79 Description="Microsoft Windows Desktop Runtime - 3.1.8 (x86)" 75 Description="Microsoft Windows Desktop Runtime - 3.1.8 (x86)"
80 Hash="6105823D7417C265929DF2978A7214E7394E404F" 76 Hash="6105823D7417C265929DF2978A7214E7394E404F"
81 ProductName="Microsoft Windows Desktop Runtime - 3.1.8 (x86)" 77 ProductName="Microsoft Windows Desktop Runtime - 3.1.8 (x86)"
@@ -91,14 +87,14 @@
91 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" /> 87 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" />
92 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" /> 88 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
93 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" /> 89 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
94 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" /> 90 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments" Value="" Overridable="yes" />
95 91
96 <PackageGroup Id="$(var.DotNetCoreRedistId)"> 92 <PackageGroup Id="$(var.DotNetCoreRedistId)">
97 <ExePackage 93 <ExePackage
98 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" 94 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
99 InstallCommand="$(var.DotNetCoreRedistInstallCommand)" 95 InstallArguments="$(var.DotNetCoreRedistInstallArguments)"
100 RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)" 96 RepairArguments="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)"
101 UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)" 97 UninstallArguments="$(var.DotNetCoreRedistUninstallArguments)"
102 PerMachine="yes" 98 PerMachine="yes"
103 DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" 99 DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
104 InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" 100 InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
@@ -110,8 +106,6 @@
110 LogPathVariable="$(var.DotNetCoreRedistLog)" 106 LogPathVariable="$(var.DotNetCoreRedistLog)"
111 Compressed="no"> 107 Compressed="no">
112 <RemotePayload 108 <RemotePayload
113 CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
114 CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
115 Description="Microsoft .NET Core Runtime - 3.1.8 (x86)" 109 Description="Microsoft .NET Core Runtime - 3.1.8 (x86)"
116 Hash="E3B05751BA0E48D81EF3EB60DABFC6388BAA5E91" 110 Hash="E3B05751BA0E48D81EF3EB60DABFC6388BAA5E91"
117 ProductName="Microsoft .NET Core Runtime - 3.1.8 (x86)" 111 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 @@
9 <?define AspNetCoreId = ASPNETCORERUNTIME$(var.NetCoreIdVersion)_$(var.NetCorePlatform)?> 9 <?define AspNetCoreId = ASPNETCORERUNTIME$(var.NetCoreIdVersion)_$(var.NetCorePlatform)?>
10 <?define AspNetCoreRedistId = AspNetCoreRuntime$(var.NetCoreIdVersion)Redist_$(var.NetCorePlatform)?> 10 <?define AspNetCoreRedistId = AspNetCoreRuntime$(var.NetCoreIdVersion)Redist_$(var.NetCorePlatform)?>
11 <?define AspNetCoreRedistLog = AspNetCoreRuntime$(var.NetCoreIdVersion)RedistLog?> 11 <?define AspNetCoreRedistLog = AspNetCoreRuntime$(var.NetCoreIdVersion)RedistLog?>
12 <?define AspNetCoreRedistInstallCommand = /install /quiet /norestart /log &quot;[$(var.AspNetCoreRedistLog)]&quot;?> 12 <?define AspNetCoreRedistInstallArguments = /install /quiet /norestart /log &quot;[$(var.AspNetCoreRedistLog)]&quot;?>
13 <?define AspNetCoreRedistUninstallCommand = /uninstall /quiet /norestart /log &quot;[$(var.AspNetCoreRedistLog)]&quot;?> 13 <?define AspNetCoreRedistUninstallArguments = /uninstall /quiet /norestart /log &quot;[$(var.AspNetCoreRedistLog)]&quot;?>
14 14
15 <?define DesktopNetCoreId = DESKTOPNETCORERUNTIME$(var.NetCoreIdVersion)_$(var.NetCorePlatform)?> 15 <?define DesktopNetCoreId = DESKTOPNETCORERUNTIME$(var.NetCoreIdVersion)_$(var.NetCorePlatform)?>
16 <?define DesktopNetCoreRedistId = DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist_$(var.NetCorePlatform)?> 16 <?define DesktopNetCoreRedistId = DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist_$(var.NetCorePlatform)?>
17 <?define DesktopNetCoreRedistLog = DesktopNetCoreRuntime$(var.NetCoreIdVersion)RedistLog?> 17 <?define DesktopNetCoreRedistLog = DesktopNetCoreRuntime$(var.NetCoreIdVersion)RedistLog?>
18 <?define DesktopNetCoreRedistInstallCommand = /install /quiet /norestart /log &quot;[$(var.DesktopNetCoreRedistLog)]&quot;?> 18 <?define DesktopNetCoreRedistInstallArguments = /install /quiet /norestart /log &quot;[$(var.DesktopNetCoreRedistLog)]&quot;?>
19 <?define DesktopNetCoreRedistUninstallCommand = /uninstall /quiet /norestart /log &quot;[$(var.DesktopNetCoreRedistLog)]&quot;?> 19 <?define DesktopNetCoreRedistUninstallArguments = /uninstall /quiet /norestart /log &quot;[$(var.DesktopNetCoreRedistLog)]&quot;?>
20 20
21 <?define DotNetCoreId = DOTNETCORERUNTIME$(var.NetCoreIdVersion)_$(var.NetCorePlatform)?> 21 <?define DotNetCoreId = DOTNETCORERUNTIME$(var.NetCoreIdVersion)_$(var.NetCorePlatform)?>
22 <?define DotNetCoreRedistId = DotNetCoreRuntime$(var.NetCoreIdVersion)Redist_$(var.NetCorePlatform)?> 22 <?define DotNetCoreRedistId = DotNetCoreRuntime$(var.NetCoreIdVersion)Redist_$(var.NetCorePlatform)?>
23 <?define DotNetCoreRedistLog = DotNetCoreRuntime$(var.NetCoreIdVersion)RedistLog?> 23 <?define DotNetCoreRedistLog = DotNetCoreRuntime$(var.NetCoreIdVersion)RedistLog?>
24 <?define DotNetCoreRedistInstallCommand = /install /quiet /norestart /log &quot;[$(var.DotNetCoreRedistLog)]&quot;?> 24 <?define DotNetCoreRedistInstallArguments = /install /quiet /norestart /log &quot;[$(var.DotNetCoreRedistLog)]&quot;?>
25 <?define DotNetCoreRedistUninstallCommand = /uninstall /quiet /norestart /log &quot;[$(var.DotNetCoreRedistLog)]&quot;?> 25 <?define DotNetCoreRedistUninstallArguments = /uninstall /quiet /norestart /log &quot;[$(var.DotNetCoreRedistLog)]&quot;?>
26 26
27 <?define DotNetHomeId = DOTNETHOME_$(var.NetCorePlatform)?> 27 <?define DotNetHomeId = DOTNETHOME_$(var.NetCorePlatform)?>
28 <?define NetCoreEulaLink = https://go.microsoft.com/fwlink/?LinkId=329770?> 28 <?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 @@
46 46
47 <PackageGroup Id="$(var.NetFx45WebId)"> 47 <PackageGroup Id="$(var.NetFx45WebId)">
48 <ExePackage 48 <ExePackage
49 InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx45FullWebLog].html&quot;" 49 InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx45FullWebLog].html&quot;"
50 RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx45FullWebLog].html&quot;" 50 RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx45FullWebLog].html&quot;"
51 UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx45FullWebLog].html&quot;" 51 UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx45FullWebLog].html&quot;"
52 PerMachine="yes" 52 PerMachine="yes"
53 DetectCondition="!(wix.NetFx45WebDetectCondition)" 53 DetectCondition="!(wix.NetFx45WebDetectCondition)"
54 InstallCondition="!(wix.NetFx45WebInstallCondition)" 54 InstallCondition="!(wix.NetFx45WebInstallCondition)"
@@ -65,8 +65,6 @@
65 Version="4.5.50709.17929" 65 Version="4.5.50709.17929"
66 ProductName="Microsoft .NET Framework 4.5" 66 ProductName="Microsoft .NET Framework 4.5"
67 Description="Microsoft .NET Framework 4.5 Setup" 67 Description="Microsoft .NET Framework 4.5 Setup"
68 CertificatePublicKey="BE931A1B869E4BB989C2B32D0C105204ECBEFB3D"
69 CertificateThumbprint="8363887511B4835B79C383ECF06FC055B5839255"
70 Hash="F6BA6F03C65C3996A258F58324A917463B2D6FF4"/> 68 Hash="F6BA6F03C65C3996A258F58324A917463B2D6FF4"/>
71 </ExePackage> 69 </ExePackage>
72 </PackageGroup> 70 </PackageGroup>
@@ -89,9 +87,9 @@
89 87
90 <PackageGroup Id="$(var.NetFx45RedistId)"> 88 <PackageGroup Id="$(var.NetFx45RedistId)">
91 <ExePackage 89 <ExePackage
92 InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx45FullLog].html&quot;" 90 InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx45FullLog].html&quot;"
93 RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx45FullLog].html&quot;" 91 RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx45FullLog].html&quot;"
94 UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx45FullLog].html&quot;" 92 UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx45FullLog].html&quot;"
95 PerMachine="yes" 93 PerMachine="yes"
96 DetectCondition="!(wix.NetFx45RedistDetectCondition)" 94 DetectCondition="!(wix.NetFx45RedistDetectCondition)"
97 InstallCondition="!(wix.NetFx45RedistInstallCondition)" 95 InstallCondition="!(wix.NetFx45RedistInstallCondition)"
@@ -108,8 +106,6 @@
108 Version="4.5.50709.17929" 106 Version="4.5.50709.17929"
109 ProductName="Microsoft .NET Framework 4.5" 107 ProductName="Microsoft .NET Framework 4.5"
110 Description="Microsoft .NET Framework 4.5 Setup" 108 Description="Microsoft .NET Framework 4.5 Setup"
111 CertificatePublicKey="BE931A1B869E4BB989C2B32D0C105204ECBEFB3D"
112 CertificateThumbprint="8363887511B4835B79C383ECF06FC055B5839255"
113 Hash="B2FF712CA0947040CA0B8E9BD7436A3C3524BB5D"/> 109 Hash="B2FF712CA0947040CA0B8E9BD7436A3C3524BB5D"/>
114 </ExePackage> 110 </ExePackage>
115 </PackageGroup> 111 </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 @@
45 45
46 <PackageGroup Id="$(var.NetFx40WebId)"> 46 <PackageGroup Id="$(var.NetFx40WebId)">
47 <ExePackage 47 <ExePackage
48 InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot;" 48 InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot;"
49 RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot;" 49 RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot;"
50 UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot;" 50 UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot;"
51 PerMachine="yes" 51 PerMachine="yes"
52 DetectCondition="NETFRAMEWORK40" 52 DetectCondition="NETFRAMEWORK40"
53 Id="$(var.NetFx40WebId)" 53 Id="$(var.NetFx40WebId)"
@@ -62,8 +62,6 @@
62 Version="4.0.30319.1" 62 Version="4.0.30319.1"
63 ProductName="Microsoft .NET Framework 4" 63 ProductName="Microsoft .NET Framework 4"
64 Description="Microsoft .NET Framework 4 Setup" 64 Description="Microsoft .NET Framework 4 Setup"
65 CertificatePublicKey="672605E36DD71EC6B8325B91C5FE6971390CB6B6"
66 CertificateThumbprint="9617094A1CFB59AE7C1F7DFDB6739E4E7C40508F"
67 Hash="06BECADB92A5FCCA2529C0B93687C2A0C6D0D610"/> 65 Hash="06BECADB92A5FCCA2529C0B93687C2A0C6D0D610"/>
68 </ExePackage> 66 </ExePackage>
69 </PackageGroup> 67 </PackageGroup>
@@ -82,9 +80,9 @@
82 80
83 <PackageGroup Id="$(var.NetFx40RedistId)"> 81 <PackageGroup Id="$(var.NetFx40RedistId)">
84 <ExePackage 82 <ExePackage
85 InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot;" 83 InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot;"
86 RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot;" 84 RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot;"
87 UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot;" 85 UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot;"
88 PerMachine="yes" 86 PerMachine="yes"
89 DetectCondition="NETFRAMEWORK40" 87 DetectCondition="NETFRAMEWORK40"
90 Id="$(var.NetFx40RedistId)" 88 Id="$(var.NetFx40RedistId)"
@@ -99,8 +97,6 @@
99 Version="4.0.30319.1" 97 Version="4.0.30319.1"
100 ProductName="Microsoft .NET Framework 4" 98 ProductName="Microsoft .NET Framework 4"
101 Description="Microsoft .NET Framework 4 Setup" 99 Description="Microsoft .NET Framework 4 Setup"
102 CertificatePublicKey="672605E36DD71EC6B8325B91C5FE6971390CB6B6"
103 CertificateThumbprint="9617094A1CFB59AE7C1F7DFDB6739E4E7C40508F"
104 Hash="58DA3D74DB353AAD03588CBB5CEA8234166D8B99"/> 100 Hash="58DA3D74DB353AAD03588CBB5CEA8234166D8B99"/>
105 </ExePackage> 101 </ExePackage>
106 </PackageGroup> 102 </PackageGroup>
@@ -129,9 +125,9 @@
129 125
130 <PackageGroup Id="$(var.NetFx40ClientWebId)"> 126 <PackageGroup Id="$(var.NetFx40ClientWebId)">
131 <ExePackage 127 <ExePackage
132 InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot;" 128 InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot;"
133 RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot;" 129 RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot;"
134 UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot;" 130 UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot;"
135 PerMachine="yes" 131 PerMachine="yes"
136 DetectCondition="NETFRAMEWORK40CLIENT" 132 DetectCondition="NETFRAMEWORK40CLIENT"
137 Id="$(var.NetFx40ClientWebId)" 133 Id="$(var.NetFx40ClientWebId)"
@@ -146,8 +142,6 @@
146 Version="4.0.30319.1" 142 Version="4.0.30319.1"
147 ProductName="Microsoft .NET Framework 4 Client Profile" 143 ProductName="Microsoft .NET Framework 4 Client Profile"
148 Description="Microsoft .NET Framework 4 Client Profile Setup" 144 Description="Microsoft .NET Framework 4 Client Profile Setup"
149 CertificatePublicKey="672605E36DD71EC6B8325B91C5FE6971390CB6B6"
150 CertificateThumbprint="9617094A1CFB59AE7C1F7DFDB6739E4E7C40508F"
151 Hash="E15AD80FC74277EF2048312E9A71AF56B2EBA622"/> 145 Hash="E15AD80FC74277EF2048312E9A71AF56B2EBA622"/>
152 </ExePackage> 146 </ExePackage>
153 </PackageGroup> 147 </PackageGroup>
@@ -166,9 +160,9 @@
166 160
167 <PackageGroup Id="$(var.NetFx40ClientRedistId)"> 161 <PackageGroup Id="$(var.NetFx40ClientRedistId)">
168 <ExePackage 162 <ExePackage
169 InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot;" 163 InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot;"
170 RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot;" 164 RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot;"
171 UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot;" 165 UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot;"
172 PerMachine="yes" 166 PerMachine="yes"
173 DetectCondition="NETFRAMEWORK40CLIENT" 167 DetectCondition="NETFRAMEWORK40CLIENT"
174 Id="$(var.NetFx40ClientRedistId)" 168 Id="$(var.NetFx40ClientRedistId)"
@@ -183,8 +177,6 @@
183 Version="4.0.30319.1" 177 Version="4.0.30319.1"
184 ProductName="Microsoft .NET Framework 4 Client Profile" 178 ProductName="Microsoft .NET Framework 4 Client Profile"
185 Description="Microsoft .NET Framework 4 Client Profile Setup" 179 Description="Microsoft .NET Framework 4 Client Profile Setup"
186 CertificatePublicKey="672605E36DD71EC6B8325B91C5FE6971390CB6B6"
187 CertificateThumbprint="9617094A1CFB59AE7C1F7DFDB6739E4E7C40508F"
188 Hash="4CD67F609F89D617D2B206341B8C211E1B88B287"/> 180 Hash="4CD67F609F89D617D2B206341B8C211E1B88B287"/>
189 </ExePackage> 181 </ExePackage>
190 </PackageGroup> 182 </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 @@
36 36
37 <PackageGroup Id="$(var.NetFx451WebId)"> 37 <PackageGroup Id="$(var.NetFx451WebId)">
38 <ExePackage 38 <ExePackage
39 InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx451FullWebLog].html&quot;" 39 InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx451FullWebLog].html&quot;"
40 RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx451FullWebLog].html&quot;" 40 RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx451FullWebLog].html&quot;"
41 UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx451FullWebLog].html&quot;" 41 UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx451FullWebLog].html&quot;"
42 PerMachine="yes" 42 PerMachine="yes"
43 DetectCondition="!(wix.NetFx451WebDetectCondition)" 43 DetectCondition="!(wix.NetFx451WebDetectCondition)"
44 InstallCondition="!(wix.NetFx451WebInstallCondition)" 44 InstallCondition="!(wix.NetFx451WebInstallCondition)"
@@ -55,8 +55,6 @@
55 Version="4.5.50938.18408" 55 Version="4.5.50938.18408"
56 ProductName="Microsoft .NET Framework 4.5.1" 56 ProductName="Microsoft .NET Framework 4.5.1"
57 Description="Microsoft .NET Framework 4.5.1 Setup" 57 Description="Microsoft .NET Framework 4.5.1 Setup"
58 CertificatePublicKey="A260A870BE1145ED71E2BB5AA19463A4FE9DCC41"
59 CertificateThumbprint="108E2BA23632620C427C570B6D9DB51AC31387FE"
60 Hash="4CBEA1E408DB5B423E130931B9478972E6798431" /> 58 Hash="4CBEA1E408DB5B423E130931B9478972E6798431" />
61 </ExePackage> 59 </ExePackage>
62 </PackageGroup> 60 </PackageGroup>
@@ -79,9 +77,9 @@
79 77
80 <PackageGroup Id="$(var.NetFx451RedistId)"> 78 <PackageGroup Id="$(var.NetFx451RedistId)">
81 <ExePackage 79 <ExePackage
82 InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx451FullLog].html&quot;" 80 InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx451FullLog].html&quot;"
83 RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx451FullLog].html&quot;" 81 RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx451FullLog].html&quot;"
84 UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx451FullLog].html&quot;" 82 UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx451FullLog].html&quot;"
85 PerMachine="yes" 83 PerMachine="yes"
86 DetectCondition="!(wix.NetFx451RedistDetectCondition)" 84 DetectCondition="!(wix.NetFx451RedistDetectCondition)"
87 InstallCondition="!(wix.NetFx451RedistInstallCondition)" 85 InstallCondition="!(wix.NetFx451RedistInstallCondition)"
@@ -98,8 +96,6 @@
98 Version="4.5.50938.18408" 96 Version="4.5.50938.18408"
99 ProductName="Microsoft .NET Framework 4.5.1" 97 ProductName="Microsoft .NET Framework 4.5.1"
100 Description="Microsoft .NET Framework 4.5.1 Setup" 98 Description="Microsoft .NET Framework 4.5.1 Setup"
101 CertificatePublicKey="A260A870BE1145ED71E2BB5AA19463A4FE9DCC41"
102 CertificateThumbprint="108E2BA23632620C427C570B6D9DB51AC31387FE"
103 Hash="5934DD101414BBC0B7F1EE2780D2FC8B9BEC5C4D" /> 99 Hash="5934DD101414BBC0B7F1EE2780D2FC8B9BEC5C4D" />
104 </ExePackage> 100 </ExePackage>
105 </PackageGroup> 101 </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 @@
35 35
36 <PackageGroup Id="$(var.NetFx452WebId)"> 36 <PackageGroup Id="$(var.NetFx452WebId)">
37 <ExePackage 37 <ExePackage
38 InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx452FullWebLog].html&quot;" 38 InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx452FullWebLog].html&quot;"
39 RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx452FullWebLog].html&quot;" 39 RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx452FullWebLog].html&quot;"
40 UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx452FullWebLog].html&quot;" 40 UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx452FullWebLog].html&quot;"
41 PerMachine="yes" 41 PerMachine="yes"
42 DetectCondition="!(wix.NetFx452WebDetectCondition)" 42 DetectCondition="!(wix.NetFx452WebDetectCondition)"
43 InstallCondition="!(wix.NetFx452WebInstallCondition)" 43 InstallCondition="!(wix.NetFx452WebInstallCondition)"
@@ -49,13 +49,12 @@
49 LogPathVariable="NetFx452FullWebLog" 49 LogPathVariable="NetFx452FullWebLog"
50 Compressed="no" 50 Compressed="no"
51 Name="!(wix.NetFx452WebPackageDirectory)NDP452-KB2901954-Web.exe"> 51 Name="!(wix.NetFx452WebPackageDirectory)NDP452-KB2901954-Web.exe">
52 <RemotePayload CertificatePublicKey="B78FE7F6917E1BC5F4A9C77BA3D555A0E807B9E0" 52 <RemotePayload
53 CertificateThumbprint="67B1757863E3EFF760EA9EBB02849AF07D3A8080" 53 Description="Microsoft .NET Framework 4.5.2 Setup"
54 Description="Microsoft .NET Framework 4.5.2 Setup" 54 Hash="5B71B20A455F6EEAB79DD1EDCAB0BA66AD0D2208"
55 Hash="5B71B20A455F6EEAB79DD1EDCAB0BA66AD0D2208" 55 ProductName="Microsoft .NET Framework 4.5.2"
56 ProductName="Microsoft .NET Framework 4.5.2" 56 Size="1118920"
57 Size="1118920" 57 Version="4.5.51209.34209" />
58 Version="4.5.51209.34209" />
59 </ExePackage> 58 </ExePackage>
60 </PackageGroup> 59 </PackageGroup>
61 </Fragment> 60 </Fragment>
@@ -77,9 +76,9 @@
77 76
78 <PackageGroup Id="$(var.NetFx452RedistId)"> 77 <PackageGroup Id="$(var.NetFx452RedistId)">
79 <ExePackage 78 <ExePackage
80 InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx452FullLog].html&quot;" 79 InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx452FullLog].html&quot;"
81 RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx452FullLog].html&quot;" 80 RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx452FullLog].html&quot;"
82 UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx452FullLog].html&quot;" 81 UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx452FullLog].html&quot;"
83 PerMachine="yes" 82 PerMachine="yes"
84 DetectCondition="!(wix.NetFx452RedistDetectCondition)" 83 DetectCondition="!(wix.NetFx452RedistDetectCondition)"
85 InstallCondition="!(wix.NetFx452RedistInstallCondition)" 84 InstallCondition="!(wix.NetFx452RedistInstallCondition)"
@@ -92,8 +91,6 @@
92 Compressed="no" 91 Compressed="no"
93 Name="!(wix.NetFx452RedistPackageDirectory)NDP452-KB2901907-x86-x64-AllOS-ENU.exe"> 92 Name="!(wix.NetFx452RedistPackageDirectory)NDP452-KB2901907-x86-x64-AllOS-ENU.exe">
94 <RemotePayload 93 <RemotePayload
95 CertificatePublicKey="B78FE7F6917E1BC5F4A9C77BA3D555A0E807B9E0"
96 CertificateThumbprint="67B1757863E3EFF760EA9EBB02849AF07D3A8080"
97 Description="Microsoft .NET Framework 4.5.2 Setup" 94 Description="Microsoft .NET Framework 4.5.2 Setup"
98 Hash="89F86F9522DC7A8A965FACCE839ABB790A285A63" 95 Hash="89F86F9522DC7A8A965FACCE839ABB790A285A63"
99 ProductName="Microsoft .NET Framework 4.5.2" 96 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 @@
36 36
37 <PackageGroup Id="$(var.NetFx46WebId)"> 37 <PackageGroup Id="$(var.NetFx46WebId)">
38 <ExePackage 38 <ExePackage
39 InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx46FullLog].html&quot;" 39 InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx46FullLog].html&quot;"
40 RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx46FullLog].html&quot;" 40 RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx46FullLog].html&quot;"
41 UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx46FullLog].html&quot;" 41 UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx46FullLog].html&quot;"
42 PerMachine="yes" 42 PerMachine="yes"
43 DetectCondition="!(wix.NetFx46WebDetectCondition)" 43 DetectCondition="!(wix.NetFx46WebDetectCondition)"
44 InstallCondition="!(wix.NetFx46WebInstallCondition)" 44 InstallCondition="!(wix.NetFx46WebInstallCondition)"
@@ -51,8 +51,6 @@
51 Compressed="no" 51 Compressed="no"
52 Name="!(wix.NetFx46WebPackageDirectory)NDP46-KB3045560-Web.exe"> 52 Name="!(wix.NetFx46WebPackageDirectory)NDP46-KB3045560-Web.exe">
53 <RemotePayload 53 <RemotePayload
54 CertificatePublicKey="52868DFCA6E3AF2632389E6C1EE7D0468D3797D0"
55 CertificateThumbprint="3BDA323E552DB1FDE5F4FBEE75D6D5B2B187EEDC"
56 Description="Microsoft .NET Framework 4.6 Setup" 54 Description="Microsoft .NET Framework 4.6 Setup"
57 Hash="480CA134B9E3F2437DF10719D5A8C77DDEC0A4F1" 55 Hash="480CA134B9E3F2437DF10719D5A8C77DDEC0A4F1"
58 ProductName="Microsoft .NET Framework 4.6" 56 ProductName="Microsoft .NET Framework 4.6"
@@ -79,9 +77,9 @@
79 77
80 <PackageGroup Id="$(var.NetFx46RedistId)"> 78 <PackageGroup Id="$(var.NetFx46RedistId)">
81 <ExePackage 79 <ExePackage
82 InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx46FullLog].html&quot;" 80 InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx46FullLog].html&quot;"
83 RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx46FullLog].html&quot;" 81 RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx46FullLog].html&quot;"
84 UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx46FullLog].html&quot;" 82 UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx46FullLog].html&quot;"
85 PerMachine="yes" 83 PerMachine="yes"
86 DetectCondition="!(wix.NetFx46RedistDetectCondition)" 84 DetectCondition="!(wix.NetFx46RedistDetectCondition)"
87 InstallCondition="!(wix.NetFx46RedistInstallCondition)" 85 InstallCondition="!(wix.NetFx46RedistInstallCondition)"
@@ -94,8 +92,6 @@
94 Compressed="no" 92 Compressed="no"
95 Name="!(wix.NetFx46RedistPackageDirectory)NDP46-KB3045557-x86-x64-AllOS-ENU.exe"> 93 Name="!(wix.NetFx46RedistPackageDirectory)NDP46-KB3045557-x86-x64-AllOS-ENU.exe">
96 <RemotePayload 94 <RemotePayload
97 CertificatePublicKey="52868DFCA6E3AF2632389E6C1EE7D0468D3797D0"
98 CertificateThumbprint="3BDA323E552DB1FDE5F4FBEE75D6D5B2B187EEDC"
99 Description="Microsoft .NET Framework 4.6 Setup" 95 Description="Microsoft .NET Framework 4.6 Setup"
100 Hash="3049A85843EAF65E89E2336D5FE6E85E416797BE" 96 Hash="3049A85843EAF65E89E2336D5FE6E85E416797BE"
101 ProductName="Microsoft .NET Framework 4.6" 97 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 @@
35 35
36 <PackageGroup Id="$(var.NetFx461WebId)"> 36 <PackageGroup Id="$(var.NetFx461WebId)">
37 <ExePackage 37 <ExePackage
38 InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx461FullLog].html&quot;" 38 InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx461FullLog].html&quot;"
39 RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx461FullLog].html&quot;" 39 RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx461FullLog].html&quot;"
40 UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx461FullLog].html&quot;" 40 UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx461FullLog].html&quot;"
41 PerMachine="yes" 41 PerMachine="yes"
42 DetectCondition="!(wix.NetFx461WebDetectCondition)" 42 DetectCondition="!(wix.NetFx461WebDetectCondition)"
43 InstallCondition="!(wix.NetFx461WebInstallCondition)" 43 InstallCondition="!(wix.NetFx461WebInstallCondition)"
@@ -50,8 +50,6 @@
50 Compressed="no" 50 Compressed="no"
51 Name="!(wix.NetFx461WebPackageDirectory)NDP461-KB3102438-Web.exe"> 51 Name="!(wix.NetFx461WebPackageDirectory)NDP461-KB3102438-Web.exe">
52 <RemotePayload 52 <RemotePayload
53 CertificatePublicKey="52868DFCA6E3AF2632389E6C1EE7D0468D3797D0"
54 CertificateThumbprint="3BDA323E552DB1FDE5F4FBEE75D6D5B2B187EEDC"
55 Description="Microsoft .NET Framework 4.6.1 Setup" 53 Description="Microsoft .NET Framework 4.6.1 Setup"
56 Hash="EE88B05232F43B517D4A368F7EE5065CDE7F67FA" 54 Hash="EE88B05232F43B517D4A368F7EE5065CDE7F67FA"
57 ProductName="Microsoft .NET Framework 4.6.1" 55 ProductName="Microsoft .NET Framework 4.6.1"
@@ -78,9 +76,9 @@
78 76
79 <PackageGroup Id="$(var.NetFx461RedistId)"> 77 <PackageGroup Id="$(var.NetFx461RedistId)">
80 <ExePackage 78 <ExePackage
81 InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx461FullLog].html&quot;" 79 InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx461FullLog].html&quot;"
82 RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx461FullLog].html&quot;" 80 RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx461FullLog].html&quot;"
83 UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx461FullLog].html&quot;" 81 UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx461FullLog].html&quot;"
84 PerMachine="yes" 82 PerMachine="yes"
85 DetectCondition="!(wix.NetFx461RedistDetectCondition)" 83 DetectCondition="!(wix.NetFx461RedistDetectCondition)"
86 InstallCondition="!(wix.NetFx461RedistInstallCondition)" 84 InstallCondition="!(wix.NetFx461RedistInstallCondition)"
@@ -93,8 +91,6 @@
93 Compressed="no" 91 Compressed="no"
94 Name="!(wix.NetFx461RedistPackageDirectory)NDP461-KB3102436-x86-x64-AllOS-ENU.exe"> 92 Name="!(wix.NetFx461RedistPackageDirectory)NDP461-KB3102436-x86-x64-AllOS-ENU.exe">
95 <RemotePayload 93 <RemotePayload
96 CertificatePublicKey="52868DFCA6E3AF2632389E6C1EE7D0468D3797D0"
97 CertificateThumbprint="3BDA323E552DB1FDE5F4FBEE75D6D5B2B187EEDC"
98 Description="Microsoft .NET Framework 4.6.1 Setup" 94 Description="Microsoft .NET Framework 4.6.1 Setup"
99 Hash="83D048D171FF44A3CAD9B422137656F585295866" 95 Hash="83D048D171FF44A3CAD9B422137656F585295866"
100 ProductName="Microsoft .NET Framework 4.6.1" 96 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 @@
35 35
36 <PackageGroup Id="$(var.NetFx462WebId)"> 36 <PackageGroup Id="$(var.NetFx462WebId)">
37 <ExePackage 37 <ExePackage
38 InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx462FullLog].html&quot;" 38 InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx462FullLog].html&quot;"
39 RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx462FullLog].html&quot;" 39 RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx462FullLog].html&quot;"
40 UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx462FullLog].html&quot;" 40 UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx462FullLog].html&quot;"
41 PerMachine="yes" 41 PerMachine="yes"
42 DetectCondition="!(wix.NetFx462WebDetectCondition)" 42 DetectCondition="!(wix.NetFx462WebDetectCondition)"
43 InstallCondition="!(wix.NetFx462WebInstallCondition)" 43 InstallCondition="!(wix.NetFx462WebInstallCondition)"
@@ -50,8 +50,6 @@
50 Compressed="no" 50 Compressed="no"
51 Name="!(wix.NetFx462WebPackageDirectory)NDP462-KB3151802-Web.exe"> 51 Name="!(wix.NetFx462WebPackageDirectory)NDP462-KB3151802-Web.exe">
52 <RemotePayload 52 <RemotePayload
53 CertificatePublicKey="52868DFCA6E3AF2632389E6C1EE7D0468D3797D0"
54 CertificateThumbprint="3BDA323E552DB1FDE5F4FBEE75D6D5B2B187EEDC"
55 Description="Microsoft .NET Framework 4.6.2 Setup" 53 Description="Microsoft .NET Framework 4.6.2 Setup"
56 Hash="C42E6ED280290648BBD59F664008852F4CFE4548" 54 Hash="C42E6ED280290648BBD59F664008852F4CFE4548"
57 ProductName="Microsoft .NET Framework 4.6.2" 55 ProductName="Microsoft .NET Framework 4.6.2"
@@ -78,9 +76,9 @@
78 76
79 <PackageGroup Id="$(var.NetFx462RedistId)"> 77 <PackageGroup Id="$(var.NetFx462RedistId)">
80 <ExePackage 78 <ExePackage
81 InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx462FullLog].html&quot;" 79 InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx462FullLog].html&quot;"
82 RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx462FullLog].html&quot;" 80 RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx462FullLog].html&quot;"
83 UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx462FullLog].html&quot;" 81 UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx462FullLog].html&quot;"
84 PerMachine="yes" 82 PerMachine="yes"
85 DetectCondition="!(wix.NetFx462RedistDetectCondition)" 83 DetectCondition="!(wix.NetFx462RedistDetectCondition)"
86 InstallCondition="!(wix.NetFx462RedistInstallCondition)" 84 InstallCondition="!(wix.NetFx462RedistInstallCondition)"
@@ -93,8 +91,6 @@
93 Compressed="no" 91 Compressed="no"
94 Name="!(wix.NetFx462RedistPackageDirectory)NDP462-KB3151800-x86-x64-AllOS-ENU.exe"> 92 Name="!(wix.NetFx462RedistPackageDirectory)NDP462-KB3151800-x86-x64-AllOS-ENU.exe">
95 <RemotePayload 93 <RemotePayload
96 CertificatePublicKey="52868DFCA6E3AF2632389E6C1EE7D0468D3797D0"
97 CertificateThumbprint="3BDA323E552DB1FDE5F4FBEE75D6D5B2B187EEDC"
98 Description="Microsoft .NET Framework 4.6.2 Setup" 94 Description="Microsoft .NET Framework 4.6.2 Setup"
99 Hash="A70F856BDA33D45AD0A8AD035F73092441715431" 95 Hash="A70F856BDA33D45AD0A8AD035F73092441715431"
100 ProductName="Microsoft .NET Framework 4.6.2" 96 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 @@
33 33
34 <PackageGroup Id="$(var.NetFx472WebId)"> 34 <PackageGroup Id="$(var.NetFx472WebId)">
35 <ExePackage 35 <ExePackage
36 InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472WebLog].html&quot;" 36 InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472WebLog].html&quot;"
37 RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472WebLog].html&quot;" 37 RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472WebLog].html&quot;"
38 UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472WebLog].html&quot;" 38 UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472WebLog].html&quot;"
39 PerMachine="yes" 39 PerMachine="yes"
40 DetectCondition="!(wix.NetFx472WebDetectCondition)" 40 DetectCondition="!(wix.NetFx472WebDetectCondition)"
41 InstallCondition="!(wix.NetFx472WebInstallCondition)" 41 InstallCondition="!(wix.NetFx472WebInstallCondition)"
@@ -48,8 +48,6 @@
48 Compressed="no" 48 Compressed="no"
49 Name="!(wix.NetFx472WebPackageDirectory)NDP472-KB4054531-Web.exe"> 49 Name="!(wix.NetFx472WebPackageDirectory)NDP472-KB4054531-Web.exe">
50 <RemotePayload 50 <RemotePayload
51 CertificatePublicKey="C090C1A2CAFA9B967D9C87C7FE02F7C01FBDE4F2"
52 CertificateThumbprint="5EAD300DC7E4D637948ECB0ED829A072BD152E17"
53 Description="Microsoft .NET Framework 4.7.2 Setup" 51 Description="Microsoft .NET Framework 4.7.2 Setup"
54 Hash="CEDBBF404B166A5E72D035760BCB0FA508E4F4CB" 52 Hash="CEDBBF404B166A5E72D035760BCB0FA508E4F4CB"
55 ProductName="Microsoft .NET Framework 4.7.2" 53 ProductName="Microsoft .NET Framework 4.7.2"
@@ -76,9 +74,9 @@
76 74
77 <PackageGroup Id="$(var.NetFx472RedistId)"> 75 <PackageGroup Id="$(var.NetFx472RedistId)">
78 <ExePackage 76 <ExePackage
79 InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472RedistLog].html&quot;" 77 InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472RedistLog].html&quot;"
80 RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472RedistLog].html&quot;" 78 RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472RedistLog].html&quot;"
81 UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472RedistLog].html&quot;" 79 UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472RedistLog].html&quot;"
82 PerMachine="yes" 80 PerMachine="yes"
83 DetectCondition="!(wix.NetFx472RedistDetectCondition)" 81 DetectCondition="!(wix.NetFx472RedistDetectCondition)"
84 InstallCondition="!(wix.NetFx472RedistInstallCondition)" 82 InstallCondition="!(wix.NetFx472RedistInstallCondition)"
@@ -91,8 +89,6 @@
91 Compressed="no" 89 Compressed="no"
92 Name="!(wix.NetFx472RedistPackageDirectory)NDP472-KB4054530-x86-x64-AllOS-ENU.exe"> 90 Name="!(wix.NetFx472RedistPackageDirectory)NDP472-KB4054530-x86-x64-AllOS-ENU.exe">
93 <RemotePayload 91 <RemotePayload
94 CertificatePublicKey="C090C1A2CAFA9B967D9C87C7FE02F7C01FBDE4F2"
95 CertificateThumbprint="5EAD300DC7E4D637948ECB0ED829A072BD152E17"
96 Description="Microsoft .NET Framework 4.7.2 Setup" 92 Description="Microsoft .NET Framework 4.7.2 Setup"
97 Hash="31FC0D305A6F651C9E892C98EB10997AE885EB1E" 93 Hash="31FC0D305A6F651C9E892C98EB10997AE885EB1E"
98 ProductName="Microsoft .NET Framework 4.7.2" 94 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 @@
33 33
34 <PackageGroup Id="$(var.NetFx48WebId)"> 34 <PackageGroup Id="$(var.NetFx48WebId)">
35 <ExePackage 35 <ExePackage
36 InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48WebLog].html&quot;" 36 InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48WebLog].html&quot;"
37 RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48WebLog].html&quot;" 37 RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48WebLog].html&quot;"
38 UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48WebLog].html&quot;" 38 UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48WebLog].html&quot;"
39 PerMachine="yes" 39 PerMachine="yes"
40 DetectCondition="!(wix.NetFx48WebDetectCondition)" 40 DetectCondition="!(wix.NetFx48WebDetectCondition)"
41 InstallCondition="!(wix.NetFx48WebInstallCondition)" 41 InstallCondition="!(wix.NetFx48WebInstallCondition)"
@@ -48,8 +48,6 @@
48 Compressed="no" 48 Compressed="no"
49 Name="!(wix.NetFx48WebPackageDirectory)ndp48-web.exe"> 49 Name="!(wix.NetFx48WebPackageDirectory)ndp48-web.exe">
50 <RemotePayload 50 <RemotePayload
51 CertificatePublicKey="D17AFCE951979605250FAEBAFA7AE974899AED22"
52 CertificateThumbprint="C82273A065EC470FB1EBDE846A91E6FFB29E9C12"
53 Description="Microsoft .NET Framework 4.8 Setup" 51 Description="Microsoft .NET Framework 4.8 Setup"
54 Hash="5A84A8E612E270E27D0061D58DB6B470153BE1F9" 52 Hash="5A84A8E612E270E27D0061D58DB6B470153BE1F9"
55 ProductName="Microsoft .NET Framework 4.8" 53 ProductName="Microsoft .NET Framework 4.8"
@@ -76,9 +74,9 @@
76 74
77 <PackageGroup Id="$(var.NetFx48RedistId)"> 75 <PackageGroup Id="$(var.NetFx48RedistId)">
78 <ExePackage 76 <ExePackage
79 InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48RedistLog].html&quot;" 77 InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48RedistLog].html&quot;"
80 RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48RedistLog].html&quot;" 78 RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48RedistLog].html&quot;"
81 UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48RedistLog].html&quot;" 79 UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48RedistLog].html&quot;"
82 PerMachine="yes" 80 PerMachine="yes"
83 DetectCondition="!(wix.NetFx48RedistDetectCondition)" 81 DetectCondition="!(wix.NetFx48RedistDetectCondition)"
84 InstallCondition="!(wix.NetFx48RedistInstallCondition)" 82 InstallCondition="!(wix.NetFx48RedistInstallCondition)"
@@ -91,8 +89,6 @@
91 Compressed="no" 89 Compressed="no"
92 Name="!(wix.NetFx48RedistPackageDirectory)ndp48-x86-x64-allos-enu.exe"> 90 Name="!(wix.NetFx48RedistPackageDirectory)ndp48-x86-x64-allos-enu.exe">
93 <RemotePayload 91 <RemotePayload
94 CertificatePublicKey="D17AFCE951979605250FAEBAFA7AE974899AED22"
95 CertificateThumbprint="C82273A065EC470FB1EBDE846A91E6FFB29E9C12"
96 Description="Microsoft .NET Framework 4.8 Setup" 92 Description="Microsoft .NET Framework 4.8 Setup"
97 Hash="8DD233698D5EB4609B86C2AC917279FE39E0EF4C" 93 Hash="8DD233698D5EB4609B86C2AC917279FE39E0EF4C"
98 ProductName="Microsoft .NET Framework 4.8" 94 ProductName="Microsoft .NET Framework 4.8"
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-29 13:17:57 +0000