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.

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

Update License #2176

Merged
merged 9 commits into from
Jul 16, 2022
Merged

Update License #2176

merged 9 commits into from
Jul 16, 2022

Conversation

JimBobSquarePants
Copy link
Member

Prerequisites

  • I have written a descriptive pull-request title
  • I have verified that there are no overlapping pull-requests open
  • I have verified that I am following the existing coding patterns and practice as demonstrated in the repository. These follow strict Stylecop rules 👮.
  • I have provided test coverage for my change (where applicable)

Description

Updates the license for v3 to use the Six Labors Split License #2151

Sorry, something went wrong.

Verified

This commit was signed with the committer’s verified signature.
nakatanakatana nakatanakatana

Verified

This commit was signed with the committer’s verified signature.
nakatanakatana nakatanakatana

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.

Verified

This commit was signed with the committer’s verified signature. The key has expired.
suzuki-shunsuke Shunsuke Suzuki

Verified

This commit was signed with the committer’s verified signature. The key has expired.
suzuki-shunsuke Shunsuke Suzuki
@JimBobSquarePants JimBobSquarePants requested a review from a team July 15, 2022 05:22

Verified

This commit was signed with the committer’s verified signature. The key has expired.
suzuki-shunsuke Shunsuke Suzuki
@JimBobSquarePants
Copy link
Member Author

I'm not going to update the license at the top of each file until someone has a chance to review these changes because it's too much noise.

After the review I will merge this PR SixLabors/SharedInfrastructure#31 which will update the style config to use our new license. Then I'll do a simple find/replace to update each file before merging this PR.

@gfoidl
Copy link
Contributor

gfoidl commented Jul 15, 2022

Then I'll do a simple find/replace to update each file before merging this PR.

VS can assist you by updating the file_header_template. Once the other PR is merged, just open one code-file, position the cursor at the old header, wait for the 💡 to show up, then quick actions -> add file header and from the dialog at the bottom "Solution".

@JimBobSquarePants
Copy link
Member Author

JimBobSquarePants commented Jul 15, 2022

@antonfirsov Seeing a new Windows issue here. 2X in a row

 Xunit.Sdk.TrueException: leakCounter did not count enough leaks (2 only)
Expected: True
Actual:   False
   at SixLabors.ImageSharp.Tests.Memory.Allocators.MemoryDiagnosticsTests.<MissingCleanup_LeaksAreReported>g__RunTest|4_0(String isGroupInner, String subscribeLeakHandleInner) in D:\a\ImageSharp\ImageSharp\tests\ImageSharp.Tests\Memory\Allocators\MemoryDiagnosticsTests.cs:line 0
SixLabors.ImageSharp.Tests: BenchmarkDotNet=v0.13.0, OS=Windows 10.0.20348
Intel Xeon Platinum 8370C CPU 2.80GHz, 1 CPU, 2 logical and 2 physical cores
.NET SDK=7.0.100-preview.6.22352.1
  [Host] : .NET 6.0.7 (6.0.722.32202), X64 RyuJIT

I'm gonna split out the SDK installers to completely isolate the preview SDK.

Update.
That fixed it.

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
@JimBobSquarePants
Copy link
Member Author

I'm gonna merge this. I've updated everything to point at the new license and supplementary docs too.

@JimBobSquarePants JimBobSquarePants merged commit 2c42e41 into main Jul 16, 2022
@JimBobSquarePants JimBobSquarePants deleted the js/license branch July 16, 2022 11:34
@VisualMelon
Copy link

Sorry to ask a boring question, but wanted to ask for clarification on the point of OSS dependents which don't have restrictions on commercial use (e.g. MIT). In OxyPlot, we may update to ImageSharp 2.1.3 and ImageSharp.Drawing 1.0.0-beta15, and I'd like to be sure that we're not missing anything with regard to licensing now or going forward (current diff under consideration: https://github.com/oxyplot/oxyplot/pull/1934/files#diff-cf34a87e1e75e04322c9c3dacb6efdc814544befbfbf56567f144835d394aa92 ). My reading of the recent blog post is that the situation after version 3 will be the same as version 2, and from my reading I think the situation is that we wouldn't need to do anything for 2.0 (per the first bullet in https://github.com/SixLabors/ImageSharp/blob/main/LICENSE and the nature of nuget), but I would like to sure on this matter.

@mistial-dev
Copy link

How does this work, practically speaking?

Suppose large company XYZ wants to use ImageSharp, and not pay for it.

Works in Source or Object form are licensed to You under the Apache License, Version 2.0 if.
You are consuming the Work in for use in software licensed under an Open Source or Source Available license.

Company XYZ integrates ImageSharp into XYZImageSharp, an open source slightly extended version of ImageSharp, with the new code under the Apache 2 license.

That's "for use in software licensed under an Open Source license." Their revenue doesn't matter anymore.

@JimBobSquarePants
Copy link
Member Author

@mistial-dev

See the following discussion.

#2151 (reply in thread)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants