Merge in 'release/5.0' changes
This commit is contained in:
commit
ae2eabad0e
|
|
@ -10,6 +10,7 @@
|
||||||
Vital="yes"
|
Vital="yes"
|
||||||
InstallCondition="VersionNT64 AND (NOT OPT_NO_RUNTIME)"
|
InstallCondition="VersionNT64 AND (NOT OPT_NO_RUNTIME)"
|
||||||
InstallCommand="/quiet /norestart"
|
InstallCommand="/quiet /norestart"
|
||||||
|
RepairCommand="/quiet /repair"
|
||||||
Permanent="yes"
|
Permanent="yes"
|
||||||
DetectCondition="DotNetRedistLtsProductVersion_x64 = v$(var.DotNetRedistLtsInstallerProductVersionx64)">
|
DetectCondition="DotNetRedistLtsProductVersion_x64 = v$(var.DotNetRedistLtsInstallerProductVersionx64)">
|
||||||
</ExePackage>
|
</ExePackage>
|
||||||
|
|
@ -20,6 +21,7 @@
|
||||||
Vital="yes"
|
Vital="yes"
|
||||||
InstallCondition="(NOT OPT_NO_RUNTIME) AND (NOT OPT_NO_X86)"
|
InstallCondition="(NOT OPT_NO_RUNTIME) AND (NOT OPT_NO_X86)"
|
||||||
InstallCommand="/quiet /norestart"
|
InstallCommand="/quiet /norestart"
|
||||||
|
RepairCommand="/quiet /repair"
|
||||||
Permanent="yes"
|
Permanent="yes"
|
||||||
DetectCondition="DotNetRedistLtsProductVersion_x86 = v$(var.DotNetRedistLtsInstallerProductVersionx86)">
|
DetectCondition="DotNetRedistLtsProductVersion_x86 = v$(var.DotNetRedistLtsInstallerProductVersionx86)">
|
||||||
</ExePackage>
|
</ExePackage>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue