Merge branch 'Bug4198' of https://git01.codeplex.com/forks/bobarnso/wixdev into wix38
Conflicts: History.md
This commit is contained in:
Коммит
8314bb1851
|
@ -1,3 +1,5 @@
|
|||
* BobArnson: WIXBUG:4198 - Use the Release value for .NET 4.5.1 on Windows 8.1 rather than that of the downlevel redistributable.
|
||||
|
||||
* BobArnson: WIXBUG:4197 - Add VS2013 detection properties and custom actions to the doc. Add missing VS2012 entries.
|
||||
|
||||
## WixBuild: Version 3.8.1114.0
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
.NET Framework 4.5/4.5.1 - http://msdn.microsoft.com/en-us/library/5a4x27ek.aspx, http://msdn.microsoft.com/en-us/library/ee942965(v=VS.110).aspx
|
||||
-->
|
||||
|
||||
<?define NetFx451MinRelease = 378758?>
|
||||
<?define NetFx451MinRelease = 378675 ?>
|
||||
<?define NetFx451WebLink = http://go.microsoft.com/fwlink/?LinkId=322115 ?>
|
||||
<?define NetFx451RedistLink = http://go.microsoft.com/fwlink/?LinkId=322116 ?>
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче