Update to latest Tools and fix 4.8 remote information.
Sean Hall committed
Apr 25, 2021 at 23:25 UTC
088bc489796e8e0ffbd9323d5eab27e45d2fbc79
2 files changed
+3
-3
global.json
+1
-1
@@ -1,5 +1,5 @@
1
{
2
"msbuild-sdks": {
3
- "WixToolset.Sdk": "4.0.0-build-0211"
3
+ "WixToolset.Sdk": "4.0.0-build-0212"
4
}
5
}
src/wixlib/NetFx48.wxs
+2
-2
@@ -30,7 +30,7 @@
30
31
<PackageGroup Id="$(var.NetFx48WebId)">
32
<ExePackage InstallArguments="/q /norestart /log "[NetFx48WebLog].html"" UninstallArguments="/uninstall /q /norestart /log "[NetFx48WebLog].html"" PerMachine="yes" DetectCondition="!(wix.NetFx48WebDetectCondition)" InstallCondition="!(wix.NetFx48WebInstallCondition)" Id="$(var.NetFx48WebId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx48WebLog">
33
- <ExePackagePayload Name="!(wix.NetFx48WebPackageDirectory)ndp48-web.exe" DownloadUrl="$(var.NetFx48WebLink)" Description="Microsoft .NET Framework 4.8 Setup" Hash="E18E3DB30A0AB2B51F34A9B7EBCEC0FD7B015F74B4525643C170FDE73EE94BA4092E3A82C98BCAE4AEBF48009BA8B6E7FA60B89AB917D8F28E74E84DB9D8CF21" ProductName="Microsoft .NET Framework 4.8" Size="1479400" Version="4.8.3928.0" />
33
+ <ExePackagePayload Name="!(wix.NetFx48WebPackageDirectory)ndp48-web.exe" DownloadUrl="$(var.NetFx48WebLink)" Description="Microsoft .NET Framework 4.8 Setup" Hash="B09A3F6802741BD5E4A9598FF3F890FEB760D865C98F33B3CF6951C3ADE396C9819D6ECA562CAD6C339C53FC1AF88F7936DD09CBBAC22EE16FC67BAE076646B6" ProductName="Microsoft .NET Framework 4.8" Size="1443272" Version="4.8.4115.0" />
34
</ExePackage>
35
</PackageGroup>
36
</Fragment>
@@ -52,7 +52,7 @@
52
53
<PackageGroup Id="$(var.NetFx48RedistId)">
54
<ExePackage InstallArguments="/q /norestart /log "[NetFx48RedistLog].html"" UninstallArguments="/uninstall /q /norestart /log "[NetFx48RedistLog].html"" PerMachine="yes" DetectCondition="!(wix.NetFx48RedistDetectCondition)" InstallCondition="!(wix.NetFx48RedistInstallCondition)" Id="$(var.NetFx48RedistId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx48RedistLog">
55
- <ExePackagePayload Name="!(wix.NetFx48RedistPackageDirectory)ndp48-x86-x64-allos-enu.exe" DownloadUrl="$(var.NetFx48RedistLink)" Description="Microsoft .NET Framework 4.8 Setup" Hash="B758812388CD1BE1E6994B58267088FE6C22961D875153CC8B924DFC590F681AF85D750AA412571745B3872CADA56E2A45C4328CFDC5EE8E201743830614609E" ProductName="Microsoft .NET Framework 4.8" Size="117380440" Version="4.8.3928.0" />
55
+ <ExePackagePayload Name="!(wix.NetFx48RedistPackageDirectory)ndp48-x86-x64-allos-enu.exe" DownloadUrl="$(var.NetFx48RedistLink)" Description="Microsoft .NET Framework 4.8 Setup" Hash="DE7FD1B245BAAAC3A2BA1C2C650492AB71EB689902E281DDA02B069A441BAF9B1CF067D596C2E67C27EB58C341F572D8E7D481EC5D6E3A4CFB8D0C9AA7B55181" ProductName="Microsoft .NET Framework 4.8" Size="121319368" Version="4.8.4115.0" />
56
</ExePackage>
57
</PackageGroup>
58
</Fragment>