Skip to content

Commit b99fc04

Browse files
committed
Add more references to the Open Source Maintenance Fee
Feedback came in that the WiX Toolset docs did not reference the introduction of the OSMF in WiX v6. This was good feedback, and hopefully it is easier to discover the change now.
1 parent 0858dae commit b99fc04

5 files changed

Lines changed: 38 additions & 10 deletions

File tree

137 KB
Loading

src/content/docs/quick-start/install.mdx

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ import { Code, Steps } from '@astrojs/starlight/components';
1212

1313
You've created your first installation package, so let's take it out for a spin.
1414

15+
:::caution[Do as we say, not as we do]
16+
We don't generally recommend testing your package on your development machine. It's better to test in a virtual machine or the Windows Sandbox but this package is about as safe as it can get. YOLO!
17+
:::
18+
1519
<Steps>
1620

1721
1. Install the MSI package you built.
@@ -28,10 +32,10 @@ You've created your first installation package, so let's take it out for a spin.
2832

2933
</Steps>
3034

31-
:::caution[Do as we say, not as we do]
32-
We don't generally recommend testing your package on your development machine. It's better to test in a virtual machine or the Windows Sandbox but this package is about as safe as it can get. YOLO!
33-
:::
34-
3535
## What's next?
3636

3737
Now that you've completed the most basic of setup development tasks, let's throw you on to a virtual team to build something a bit more realistic even if it is all pretend.
38+
39+
:::note[Professional Developers read this]
40+
If you are a professional developer using the WiX Toolset for your product or organization, be sure to read about the [Open Source Maintenance Fee in the WiX Toolset](/wix/#open-source-maintenance-fee) and what it might mean for your organization.
41+
:::

src/content/docs/wix/index.md

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,17 @@ the Windows installation engine.
2727
C++.
2828

2929

30+
## Open Source Maintenance Fee
31+
32+
<a href="https://opensourcemaintenancefee.org/"><img src='/images/osmf-logo-square-dark.png' width='146' align='right' /></a>
33+
34+
To ensure the long-term sustainability of the WiX Toolset, use of the project requires an [Open Source Maintenance Fee](https://opensourcemaintenancefee.org). While the source code is freely available under the terms of the [LICENSE](https://github.com/wixtoolset/wix/blob/main/LICENSE.TXT), other aspects of the project--including opening issues and downloading releases--require adherence to the Maintenance Fee.
35+
36+
In short, if you use this project to generate revenue, the [Open Source Maintenance Fee is required](https://opensourcemaintenancefee.org).
37+
38+
To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixtoolset).
39+
40+
3041
## System requirements
3142

3243
### Running packages built with WiX
@@ -79,13 +90,13 @@ This provides consumers with security updates for 22 months and ensures they are
7990
Of course, FireGiant customers get [security fixes just like bug fixes as per their support contract](https://www.firegiant.com/services/wix-extended-support/?utm_source=wixtoolset.org&utm_medium=Display&utm_campaign=lifecycle&utm_term=of_course&utm_content=about_page).
8091

8192

82-
## License
93+
## Source Code License
8394

84-
The WiX toolset is released under the [Microsoft Reciprocal License (MS-RL)](http://opensource.org/licenses/ms-rl). A reciprocal license is used to ensure that others who build on the effort of the WiX community give back to the WiX community. Specifically the license requires that fixes and improvements to the WiX toolset must be published using the same license.
95+
The WiX Toolset source code is released under the [Microsoft Reciprocal License (MS-RL)](http://opensource.org/licenses/ms-rl). A reciprocal license is used to ensure that others who build on the effort of the WiX community give back to the WiX community. Specifically the license requires that fixes and improvements to the WiX Toolset must be published using the same license.
8596

86-
Sometimes the reciprocal license is incorrectly interpreted to also apply to bundles, packages, and custom actions built using the WiX toolset. The Outercurve Foundation has previously provided this statement below to clarify which now the .NET Foundation reaffirms:
97+
Sometimes the reciprocal license is incorrectly interpreted to also apply to bundles, packages, and custom actions built using the WiX Toolset. The Outercurve Foundation has previously provided this statement below to clarify which now the .NET Foundation reaffirms:
8798

88-
> The WiX toolset (WiX) is licensed under the Microsoft Reciprocal License (MS-RL). The MS-RL governs the distribution of the software licensed under it, as well as derivative works, and incorporates the definition of a derivative work provided in U.S. copyright law. OuterCurve Foundation (and the .NET Foundation) does not view the installer packages generated by WiX as falling within the definition of a derivative work, merely because they are produced using WiX. Thus, the installer packages generated by WiX will normally fall outside the scope of the MS-RL, and any of your source code, binaries, libraries, routines or other software components that are incorporated in installer packages generated by WiX can be governed by other licensing terms.
99+
> The WiX Toolset (WiX) is licensed under the Microsoft Reciprocal License (MS-RL). The MS-RL governs the distribution of the software licensed under it, as well as derivative works, and incorporates the definition of a derivative work provided in U.S. copyright law. OuterCurve Foundation (and the .NET Foundation) does not view the installer packages generated by WiX as falling within the definition of a derivative work, merely because they are produced using WiX. Thus, the installer packages generated by WiX will normally fall outside the scope of the MS-RL, and any of your source code, binaries, libraries, routines or other software components that are incorporated in installer packages generated by WiX can be governed by other licensing terms.
89100
90101
The full text of the MS-RL license is reproduced below. It can also be found in the LICENSE.TXT file included with the source code.
91102

@@ -171,7 +182,7 @@ Users should be encouraged to participate in the life of the project and the com
171182

172183
Users who continue to engage with the project and its community will often find themselves becoming more and more involved. Such users may then go on to become Contributors, as described above.
173184

174-
**How to become a User:** Use the WiX toolset and participate on the [mailing lists](gethelp.md#mailinglists) and [discussion forum](gethelp.md#forum).
185+
**How to become a User:** Use the WiX Toolset and participate on the [mailing lists](gethelp.md#mailinglists) and [discussion forum](gethelp.md#forum).
175186

176187

177188
## Contribution License Agreement

src/content/docs/wix/whatsnew/index.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,19 @@ sidebar:
88

99
WiX v6 continues to be highly compatible in its language syntax with WiX v5 and even v4. We're liking how easy it is to pick up new versions of WiX without worrying about code conversion.
1010

11-
WiX v6 contains a number of bug fixes and new features, including these favorites:
11+
WiX v6 contains a number of bug fixes and new features, and introduces an Open Source Maintenance Fee:
12+
13+
14+
### Open Source Maintenance Fee
15+
16+
<a href="https://opensourcemaintenancefee.org/"><img src='/images/osmf-logo-square-dark.png' width='146' align='right' /></a>
17+
18+
To ensure the long-term sustainability of the WiX Toolset, starting in WiX v6, use of the project requires an [Open Source Maintenance Fee](https://opensourcemaintenancefee.org). While the source code is freely available under the terms of the [LICENSE](https://github.com/wixtoolset/wix/blob/main/LICENSE.TXT), other aspects of the project--including opening issues and downloading releases--require adherence to the Maintenance Fee.
19+
20+
In short, if you use this project to generate revenue, the [Open Source Maintenance Fee is required](https://opensourcemaintenancefee.org).
21+
22+
To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixtoolset).
23+
1224

1325
### GUIDs are now optional for upgrade codes
1426

src/content/docs/wix/whatsnew/releasenotes.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ WiX v6 is the second annual release since WiX v4. WiX v6 continues in the tradit
2323
| [8882](https://github.com/wixtoolset/issues/issues/8882), [8939](https://github.com/wixtoolset/issues/issues/8939) | Use a different approach to construct the default feature and add components to it. |
2424
| [8913](https://github.com/wixtoolset/issues/issues/8913) | Using Heat now shows a deprecation warning. It's still present and works with WiX v6, mostly by nature of the WiX v6 language not changing. But we plan to remove Heat in WiX v7, so this warning serves as eviction notice. | https://github.com/wixtoolset/issues/issues/ |
2525
| [8914](https://github.com/wixtoolset/issues/issues/8914) | Lock files extracted from Burn bundles as additional mitigation against attacks. No protection is perfect but locking files as read-only helps prevent malware from overwriting temporary files used during bundle installation. |
26+
| [8974](https://github.com/wixtoolset/issues/issues/8974) | Introduce the Open Source Maintenance Fee. |
2627

2728

2829
### Get started

0 commit comments

Comments
 (0)