diff options
Diffstat (limited to 'src/ext/NetFx/wixlib/NetFx481.wxs')
-rw-r--r-- | src/ext/NetFx/wixlib/NetFx481.wxs | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/ext/NetFx/wixlib/NetFx481.wxs b/src/ext/NetFx/wixlib/NetFx481.wxs index b0da8bb0..dc29a585 100644 --- a/src/ext/NetFx/wixlib/NetFx481.wxs +++ b/src/ext/NetFx/wixlib/NetFx481.wxs | |||
@@ -63,7 +63,7 @@ | |||
63 | <PackageGroupRef Id="$(var.NetFx481WebId)" /> | 63 | <PackageGroupRef Id="$(var.NetFx481WebId)" /> |
64 | </PackageGroup> | 64 | </PackageGroup> |
65 | 65 | ||
66 | <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx481WebId)" LicenseUrl="$(var.NetFx481EulaLink)" /> | 66 | <bal:BootstrapperApplicationPrerequisiteInformation PackageId="$(var.NetFx481WebId)" LicenseUrl="$(var.NetFx481EulaLink)" /> |
67 | </Fragment> | 67 | </Fragment> |
68 | 68 | ||
69 | <Fragment> | 69 | <Fragment> |
@@ -74,28 +74,28 @@ | |||
74 | <WixVariable Id="NetFx481RedistPackageDirectory" Value="redist\" Overridable="yes" /> | 74 | <WixVariable Id="NetFx481RedistPackageDirectory" Value="redist\" Overridable="yes" /> |
75 | 75 | ||
76 | <PackageGroup Id="$(var.NetFx481RedistId)"> | 76 | <PackageGroup Id="$(var.NetFx481RedistId)"> |
77 | <ExePackage | 77 | <ExePackage |
78 | CacheId="$(var.NetFx481RedistId)_AFBF0B8B6A18F7E23CCA1DDCD0AC1A55B4035173" | 78 | CacheId="$(var.NetFx481RedistId)_AFBF0B8B6A18F7E23CCA1DDCD0AC1A55B4035173" |
79 | InstallArguments="/q /norestart /log "[NetFx481RedistLog].html"" | 79 | InstallArguments="/q /norestart /log "[NetFx481RedistLog].html"" |
80 | PerMachine="yes" | 80 | PerMachine="yes" |
81 | DetectCondition="!(wix.NetFx481RedistDetectCondition)" | 81 | DetectCondition="!(wix.NetFx481RedistDetectCondition)" |
82 | InstallCondition="!(wix.NetFx481RedistInstallCondition)" | 82 | InstallCondition="!(wix.NetFx481RedistInstallCondition)" |
83 | Id="$(var.NetFx481RedistId)" | 83 | Id="$(var.NetFx481RedistId)" |
84 | Vital="yes" | 84 | Vital="yes" |
85 | Permanent="yes" | 85 | Permanent="yes" |
86 | Protocol="netfx4" | 86 | Protocol="netfx4" |
87 | LogPathVariable="NetFx481RedistLog" | 87 | LogPathVariable="NetFx481RedistLog" |
88 | Cache="remove"> | 88 | Cache="remove"> |
89 | 89 | ||
90 | <ExePackagePayload | 90 | <ExePackagePayload |
91 | Name="!(wix.NetFx481RedistPackageDirectory)ndp481-x86-x64-allos-enu.exe" | 91 | Name="!(wix.NetFx481RedistPackageDirectory)ndp481-x86-x64-allos-enu.exe" |
92 | DownloadUrl="$(var.NetFx481RedistLink)" | 92 | DownloadUrl="$(var.NetFx481RedistLink)" |
93 | ProductName="Microsoft .NET Framework 4.8.1" | 93 | ProductName="Microsoft .NET Framework 4.8.1" |
94 | Description="Microsoft .NET Framework 4.8.1 Setup" | 94 | Description="Microsoft .NET Framework 4.8.1 Setup" |
95 | CertificatePublicKey="0A7D1EFF01D4EBAD21E85C51499576EBAA40E676" | 95 | CertificatePublicKey="0A7D1EFF01D4EBAD21E85C51499576EBAA40E676" |
96 | CertificateThumbprint="AFBF0B8B6A18F7E23CCA1DDCD0AC1A55B4035173" | 96 | CertificateThumbprint="AFBF0B8B6A18F7E23CCA1DDCD0AC1A55B4035173" |
97 | Size="63610344" | 97 | Size="63610344" |
98 | Version="4.8.09037.06" | 98 | Version="4.8.09037.06" |
99 | /> | 99 | /> |
100 | </ExePackage> | 100 | </ExePackage> |
101 | </PackageGroup> | 101 | </PackageGroup> |
@@ -106,6 +106,6 @@ | |||
106 | <PackageGroupRef Id="$(var.NetFx481RedistId)" /> | 106 | <PackageGroupRef Id="$(var.NetFx481RedistId)" /> |
107 | </PackageGroup> | 107 | </PackageGroup> |
108 | 108 | ||
109 | <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx481RedistId)" LicenseUrl="$(var.NetFx481EulaLink)" /> | 109 | <bal:BootstrapperApplicationPrerequisiteInformation PackageId="$(var.NetFx481RedistId)" LicenseUrl="$(var.NetFx481EulaLink)" /> |
110 | </Fragment> | 110 | </Fragment> |
111 | </Wix> | 111 | </Wix> |