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