diff --git a/public/images/osmf-logo-square-dark.png b/public/images/osmf-logo-square-dark.png new file mode 100644 index 0000000..867fffb Binary files /dev/null and b/public/images/osmf-logo-square-dark.png differ diff --git a/src/content/docs/quick-start/install.mdx b/src/content/docs/quick-start/install.mdx index 6158be5..7d5537b 100644 --- a/src/content/docs/quick-start/install.mdx +++ b/src/content/docs/quick-start/install.mdx @@ -12,6 +12,10 @@ import { Code, Steps } from '@astrojs/starlight/components'; You've created your first installation package, so let's take it out for a spin. +:::caution[Do as we say, not as we do] +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! +::: + 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. -:::caution[Do as we say, not as we do] -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! -::: - ## What's next? 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. + +:::note[Professional Developers read this] +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. +::: diff --git a/src/content/docs/wix/index.md b/src/content/docs/wix/index.md index 8f764e2..eb26f2e 100644 --- a/src/content/docs/wix/index.md +++ b/src/content/docs/wix/index.md @@ -27,6 +27,17 @@ the Windows installation engine. C++. +## Open Source Maintenance Fee + + + +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. + +In short, if you use this project to generate revenue, the [Open Source Maintenance Fee is required](https://opensourcemaintenancefee.org). + +To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixtoolset). + + ## System requirements ### Running packages built with WiX @@ -79,13 +90,13 @@ This provides consumers with security updates for 22 months and ensures they are 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). -## License +## Source Code License -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. +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. -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: +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: -> 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. +> 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. 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. @@ -171,7 +182,7 @@ Users should be encouraged to participate in the life of the project and the com 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. -**How to become a User:** Use the WiX toolset and participate on the [mailing lists](gethelp.md#mailinglists) and [discussion forum](gethelp.md#forum). +**How to become a User:** Use the WiX Toolset and participate on the [mailing lists](gethelp.md#mailinglists) and [discussion forum](gethelp.md#forum). ## Contribution License Agreement diff --git a/src/content/docs/wix/whatsnew/index.md b/src/content/docs/wix/whatsnew/index.md index 5ef2d4d..80a2388 100644 --- a/src/content/docs/wix/whatsnew/index.md +++ b/src/content/docs/wix/whatsnew/index.md @@ -8,7 +8,19 @@ sidebar: 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. -WiX v6 contains a number of bug fixes and new features, including these favorites: +WiX v6 contains a number of bug fixes and new features, and introduces an Open Source Maintenance Fee: + + +### Open Source Maintenance Fee + + + +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. + +In short, if you use this project to generate revenue, the [Open Source Maintenance Fee is required](https://opensourcemaintenancefee.org). + +To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixtoolset). + ### GUIDs are now optional for upgrade codes diff --git a/src/content/docs/wix/whatsnew/releasenotes.md b/src/content/docs/wix/whatsnew/releasenotes.md index be99cad..a331cad 100644 --- a/src/content/docs/wix/whatsnew/releasenotes.md +++ b/src/content/docs/wix/whatsnew/releasenotes.md @@ -23,6 +23,7 @@ WiX v6 is the second annual release since WiX v4. WiX v6 continues in the tradit | [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. | | [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/ | | [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. | +| [8974](https://github.com/wixtoolset/issues/issues/8974) | Introduce the Open Source Maintenance Fee. | ### Get started