diff options
| author | Rob Mensching <rob@firegiant.com> | 2025-03-19 16:26:36 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2025-03-19 17:55:00 -0700 |
| commit | 4d3f7c8cf16db06932596beb27d8d025be501b95 (patch) | |
| tree | ca9306b13294190a85de1fbd13ff0eac8da34602 /src/setup/WixAdditionalTools | |
| parent | 669057f49c207de597604f847fb6ec55f17df121 (diff) | |
| download | wix-4d3f7c8cf16db06932596beb27d8d025be501b95.tar.gz wix-4d3f7c8cf16db06932596beb27d8d025be501b95.tar.bz2 wix-4d3f7c8cf16db06932596beb27d8d025be501b95.zip | |
Introduce the Open Source Maintenance Fee EULA
This adds the EULA to all the binary releases
Closes 8974
Diffstat (limited to 'src/setup/WixAdditionalTools')
| -rw-r--r-- | src/setup/WixAdditionalTools/WixAdditionalTools.wxl | 1 | ||||
| -rw-r--r-- | src/setup/WixAdditionalTools/WixAdditionalTools.wxs | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/setup/WixAdditionalTools/WixAdditionalTools.wxl b/src/setup/WixAdditionalTools/WixAdditionalTools.wxl index 5085b5dd..9c1264a2 100644 --- a/src/setup/WixAdditionalTools/WixAdditionalTools.wxl +++ b/src/setup/WixAdditionalTools/WixAdditionalTools.wxl | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | <String Id="Name" Overridable="yes" Value="WiX Toolset Additional Tools" /> | 6 | <String Id="Name" Overridable="yes" Value="WiX Toolset Additional Tools" /> |
| 7 | <String Id="Regid" Overridable="yes" Value="wixtoolset.org" /> | 7 | <String Id="Regid" Overridable="yes" Value="wixtoolset.org" /> |
| 8 | <String Id="AboutUrl" Overridable="yes" Value="https://wixtoolset.org/" /> | 8 | <String Id="AboutUrl" Overridable="yes" Value="https://wixtoolset.org/" /> |
| 9 | <String Id="LicenseUrl" Overridable="yes" Value="https://wixtoolset.org/about/license/" /> | ||
| 10 | <String Id="SupportUrl" Overridable="yes" Value="https://wixtoolset.org/docs/gethelp/" /> | 9 | <String Id="SupportUrl" Overridable="yes" Value="https://wixtoolset.org/docs/gethelp/" /> |
| 11 | <String Id="UpdateUrl" Overridable="yes" Value="https://wixtoolset.org/releases/feeds/wix-additional-tools-$(SetupDashedMajorMinorVersion)$(SetupDashedPrerelease).feed" /> | 10 | <String Id="UpdateUrl" Overridable="yes" Value="https://wixtoolset.org/releases/feeds/wix-additional-tools-$(SetupDashedMajorMinorVersion)$(SetupDashedPrerelease).feed" /> |
| 12 | </WixLocalization> | 11 | </WixLocalization> |
diff --git a/src/setup/WixAdditionalTools/WixAdditionalTools.wxs b/src/setup/WixAdditionalTools/WixAdditionalTools.wxs index 9369f32e..da8201ee 100644 --- a/src/setup/WixAdditionalTools/WixAdditionalTools.wxs +++ b/src/setup/WixAdditionalTools/WixAdditionalTools.wxs | |||
| @@ -6,8 +6,8 @@ | |||
| 6 | AboutUrl="!(loc.AboutUrl)" HelpUrl="!(loc.SupportUrl)" UpdateUrl="!(loc.UpdateUrl)"> | 6 | AboutUrl="!(loc.AboutUrl)" HelpUrl="!(loc.SupportUrl)" UpdateUrl="!(loc.UpdateUrl)"> |
| 7 | <BootstrapperApplication> | 7 | <BootstrapperApplication> |
| 8 | <bal:WixStandardBootstrapperApplication | 8 | <bal:WixStandardBootstrapperApplication |
| 9 | LicenseUrl="!(loc.LicenseUrl)" | 9 | LicenseFile="..\OSMFEULA.rtf" |
| 10 | Theme="hyperlinkLicense" | 10 | Theme="rtfLicense" |
| 11 | ShowVersion="true" | 11 | ShowVersion="true" |
| 12 | LogoFile="wix-logo-sq.png" /> | 12 | LogoFile="wix-logo-sq.png" /> |
| 13 | </BootstrapperApplication> | 13 | </BootstrapperApplication> |