Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIXBUG:4180 - Add wixtoolset.org EULA service links. #278

Merged
merged 1 commit into from
Jul 6, 2015
Merged

WIXBUG:4180 - Add wixtoolset.org EULA service links. #278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions history/4180.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* BobArnson: WIXBUG:4180 - Add wixtoolset.org EULA service links.
5 changes: 5 additions & 0 deletions src/ext/NetFxExtension/wixlib/NetFx451.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
<?define NetFx451MinRelease = 378675 ?>
<?define NetFx451WebLink = http://go.microsoft.com/fwlink/?LinkId=322115 ?>
<?define NetFx451RedistLink = http://go.microsoft.com/fwlink/?LinkId=322116 ?>
<?define NetFx451EulaLink = http://wixtoolset.org/licenses/netfx451 ?>

<Fragment>
<PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
Expand All @@ -32,6 +33,8 @@
<Fragment>
<util:RegistrySearchRef Id="NETFRAMEWORK45"/>

<WixVariable Id="WixMbaPrereqPackageId" Value="NetFx451Web" />
<WixVariable Id="WixMbaPrereqLicenseUrl" Value="$(var.NetFx451EulaLink)" />
<WixVariable Id="NetFx451WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx451MinRelease)" Overridable="yes" />
<WixVariable Id="NetFx451WebInstallCondition" Value="" Overridable="yes" />
<WixVariable Id="NetFx451WebPackageDirectory" Value="redist\" Overridable="yes" />
Expand Down Expand Up @@ -67,6 +70,8 @@
<Fragment>
<util:RegistrySearchRef Id="NETFRAMEWORK45"/>

<WixVariable Id="WixMbaPrereqPackageId" Value="NetFx451Redist" />
<WixVariable Id="WixMbaPrereqLicenseUrl" Value="$(var.NetFx451EulaLink)" />
<WixVariable Id="NetFx451RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx451MinRelease)" Overridable="yes" />
<WixVariable Id="NetFx451RedistInstallCondition" Value="" Overridable="yes" />
<WixVariable Id="NetFx451RedistPackageDirectory" Value="redist\" Overridable="yes" />
Expand Down
5 changes: 5 additions & 0 deletions src/ext/NetFxExtension/wixlib/NetFx452.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
<?define NetFx452MinRelease = 379893 ?>
<?define NetFx452WebLink = http://go.microsoft.com/fwlink/?LinkId=397707 ?>
<?define NetFx452RedistLink = http://go.microsoft.com/fwlink/?LinkId=397708 ?>
<?define NetFx452EulaLink = http://wixtoolset.org/licenses/netfx452 ?>

<Fragment>
<PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
Expand All @@ -32,6 +33,8 @@
<Fragment>
<util:RegistrySearchRef Id="NETFRAMEWORK45"/>

<WixVariable Id="WixMbaPrereqPackageId" Value="NetFx452Web" />
<WixVariable Id="WixMbaPrereqLicenseUrl" Value="$(var.NetFx452EulaLink)" />
<WixVariable Id="NetFx452WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx452MinRelease)" Overridable="yes" />
<WixVariable Id="NetFx452WebInstallCondition" Value="" Overridable="yes" />
<WixVariable Id="NetFx452WebPackageDirectory" Value="redist\" Overridable="yes" />
Expand Down Expand Up @@ -66,6 +69,8 @@
<Fragment>
<util:RegistrySearchRef Id="NETFRAMEWORK45"/>

<WixVariable Id="WixMbaPrereqPackageId" Value="NetFx452Redist" />
<WixVariable Id="WixMbaPrereqLicenseUrl" Value="$(var.NetFx452EulaLink)" />
<WixVariable Id="NetFx452RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx452MinRelease)" Overridable="yes" />
<WixVariable Id="NetFx452RedistInstallCondition" Value="" Overridable="yes" />
<WixVariable Id="NetFx452RedistPackageDirectory" Value="redist\" Overridable="yes" />
Expand Down