diff --git a/EUPLv.1.1 - Licence.pdf b/EUPLv.1.1 - Licence.pdf deleted file mode 100644 index 80b5007..0000000 Binary files a/EUPLv.1.1 - Licence.pdf and /dev/null differ diff --git a/EUPLv.1.1 - Licence.txt b/EUPLv.1.1 - Licence.txt deleted file mode 100644 index 5fa0901..0000000 --- a/EUPLv.1.1 - Licence.txt +++ /dev/null @@ -1,268 +0,0 @@ - European Union Public Licence - V. 1.1 - EUPL © the European Community 2007 - -This European Union Public Licence (the “EUPL”) applies to the Work or Software -(as defined below) which is provided under the terms of this Licence. Any use of the -Work, other than as authorised under this Licence is prohibited (to the extent such use -is covered by a right of the copyright holder of the Work). - -The Original Work is provided under the terms of this Licence when the Licensor (as -defined below) has placed the following notice immediately following the copyright -notice for the Original Work: - -Licensed under the EUPL V.1.1 - -or has expressed by any other mean his willingness to license under the EUPL. - -1. Definitions - -In this Licence, the following terms have the following meaning: - -- The Licence: this Licence. - -- The Original Work or the Software: the software distributed and/or communicated -by the Licensor under this Licence, available as Source Code and also as Executable -Code as the case may be. - -- Derivative Works: the works or software that could be created by the Licensee, -based upon the Original Work or modifications thereof. This Licence does not define -the extent of modification or dependence on the Original Work required in order to -classify a work as a Derivative Work; this extent is determined by copyright law -applicable in the country mentioned in Article 15. - -- The Work: the Original Work and/or its Derivative Works. - -- The Source Code: the human-readable form of the Work which is the most -convenient for people to study and modify. - -- The Executable Code: any code which has generally been compiled and which is -meant to be interpreted by a computer as a program. - -- The Licensor: the natural or legal person that distributes and/or communicates the -Work under the Licence. - -- Contributor(s): any natural or legal person who modifies the Work under the -Licence, or otherwise contributes to the creation of a Derivative Work. - -- The Licensee or “You”: any natural or legal person who makes any usage of the -Software under the terms of the Licence. - -- Distribution and/or Communication: any act of selling, giving, lending, renting, -distributing, communicating, transmitting, or otherwise making available, on-line or -off-line, copies of the Work or providing access to its essential functionalities at the -disposal of any other natural or legal person. - -2. Scope of the rights granted by the Licence - -The Licensor hereby grants You a world-wide, royalty-free, non-exclusive, sublicensable -licence to do the following, for the duration of copyright vested in the -Original Work: - -- use the Work in any circumstance and for all usage, -- reproduce the Work, -- modify the Original Work, and make Derivative Works based upon the Work, -- communicate to the public, including the right to make available or display the -Work or copies thereof to the public and perform publicly, as the case may be, -the Work, -- distribute the Work or copies thereof, -- lend and rent the Work or copies thereof, -- sub-license rights in the Work or copies thereof. - -Those rights can be exercised on any media, supports and formats, whether now -known or later invented, as far as the applicable law permits so. - -In the countries where moral rights apply, the Licensor waives his right to exercise his -moral right to the extent allowed by law in order to make effective the licence of the -economic rights here above listed. - -The Licensor grants to the Licensee royalty-free, non exclusive usage rights to any -patents held by the Licensor, to the extent necessary to make use of the rights granted -on the Work under this Licence. - -3. Communication of the Source Code - -The Licensor may provide the Work either in its Source Code form, or as Executable -Code. If the Work is provided as Executable Code, the Licensor provides in addition a -machine-readable copy of the Source Code of the Work along with each copy of the -Work that the Licensor distributes or indicates, in a notice following the copyright -notice attached to the Work, a repository where the Source Code is easily and freely -accessible for as long as the Licensor continues to distribute and/or communicate the -Work. - -4. Limitations on copyright - -Nothing in this Licence is intended to deprive the Licensee of the benefits from any -exception or limitation to the exclusive rights of the rights owners in the Original -Work or Software, of the exhaustion of those rights or of other applicable limitations -thereto. - -5. Obligations of the Licensee - -The grant of the rights mentioned above is subject to some restrictions and obligations -imposed on the Licensee. Those obligations are the following: -Attribution right: the Licensee shall keep intact all copyright, patent or trademarks -notices and all notices that refer to the Licence and to the disclaimer of warranties. - -The Licensee must include a copy of such notices and a copy of the Licence with -every copy of the Work he/she distributes and/or communicates. The Licensee must -cause any Derivative Work to carry prominent notices stating that the Work has been -modified and the date of modification. - -Copyleft clause: If the Licensee distributes and/or communicates copies of the -Original Works or Derivative Works based upon the Original Work, this Distribution -and/or Communication will be done under the terms of this Licence or of a later -version of this Licence unless the Original Work is expressly distributed only under -this version of the Licence. The Licensee (becoming Licensor) cannot offer or impose -any additional terms or conditions on the Work or Derivative Work that alter or -restrict the terms of the Licence. - -Compatibility clause: If the Licensee Distributes and/or Communicates Derivative -Works or copies thereof based upon both the Original Work and another work -licensed under a Compatible Licence, this Distribution and/or Communication can be -done under the terms of this Compatible Licence. For the sake of this clause, -“Compatible Licence” refers to the licences listed in the appendix attached to this -Licence. Should the Licensee’s obligations under the Compatible Licence conflict -with his/her obligations under this Licence, the obligations of the Compatible Licence -shall prevail. - -Provision of Source Code: When distributing and/or communicating copies of the -Work, the Licensee will provide a machine-readable copy of the Source Code or -indicate a repository where this Source will be easily and freely available for as long -as the Licensee continues to distribute and/or communicate the Work. - -Legal Protection: This Licence does not grant permission to use the trade names, -trademarks, service marks, or names of the Licensor, except as required for -reasonable and customary use in describing the origin of the Work and reproducing -the content of the copyright notice. - -6. Chain of Authorship - -The original Licensor warrants that the copyright in the Original Work granted -hereunder is owned by him/her or licensed to him/her and that he/she has the power -and authority to grant the Licence. - -Each Contributor warrants that the copyright in the modifications he/she brings to the -Work are owned by him/her or licensed to him/her and that he/she has the power and -authority to grant the Licence. - -Each time You accept the Licence, the original Licensor and subsequent Contributors -grant You a licence to their contributions to the Work, under the terms of this -Licence. - -7. Disclaimer of Warranty - -The Work is a work in progress, which is continuously improved by numerous -contributors. It is not a finished work and may therefore contain defects or “bugs” -inherent to this type of software development. - -For the above reason, the Work is provided under the Licence on an “as is” basis and -without warranties of any kind concerning the Work, including without limitation -merchantability, fitness for a particular purpose, absence of defects or errors, -accuracy, non-infringement of intellectual property rights other than copyright as -stated in Article 6 of this Licence. - -This disclaimer of warranty is an essential part of the Licence and a condition for the -grant of any rights to the Work. - -8. Disclaimer of Liability - -Except in the cases of wilful misconduct or damages directly caused to natural -persons, the Licensor will in no event be liable for any direct or indirect, material or -moral, damages of any kind, arising out of the Licence or of the use of the Work, -including without limitation, damages for loss of goodwill, work stoppage, computer -failure or malfunction, loss of data or any commercial damage, even if the Licensor -has been advised of the possibility of such damage. However, the Licensor will be -liable under statutory product liability laws as far such laws apply to the Work. - -9. Additional agreements - -While distributing the Original Work or Derivative Works, You may choose to -conclude an additional agreement to offer, and charge a fee for, acceptance of support, -warranty, indemnity, or other liability obligations and/or services consistent with this -Licence. However, in accepting such obligations, You may act only on your own -behalf and on your sole responsibility, not on behalf of the original Licensor or any -other Contributor, and only if You agree to indemnify, defend, and hold each -Contributor harmless for any liability incurred by, or claims asserted against such -Contributor by the fact You have accepted any such warranty or additional liability. - -10. Acceptance of the Licence - -The provisions of this Licence can be accepted by clicking on an icon “I agree” -placed under the bottom of a window displaying the text of this Licence or by -affirming consent in any other similar way, in accordance with the rules of applicable -law. Clicking on that icon indicates your clear and irrevocable acceptance of this -Licence and all of its terms and conditions. - -Similarly, you irrevocably accept this Licence and all of its terms and conditions by -exercising any rights granted to You by Article 2 of this Licence, such as the use of -the Work, the creation by You of a Derivative Work or the Distribution and/or -Communication by You of the Work or copies thereof. - -11. Information to the public - -In case of any Distribution and/or Communication of the Work by means of electronic -communication by You (for example, by offering to download the Work from a -remote location) the distribution channel or media (for example, a website) must at -least provide to the public the information requested by the applicable law regarding -the Licensor, the Licence and the way it may be accessible, concluded, stored and -reproduced by the Licensee. - -12. Termination of the Licence - -The Licence and the rights granted hereunder will terminate automatically upon any -breach by the Licensee of the terms of the Licence. -Such a termination will not terminate the licences of any person who has received the -Work from the Licensee under the Licence, provided such persons remain in full -compliance with the Licence. - -13. Miscellaneous - -Without prejudice of Article 9 above, the Licence represents the complete agreement -between the Parties as to the Work licensed hereunder. - -If any provision of the Licence is invalid or unenforceable under applicable law, this -will not affect the validity or enforceability of the Licence as a whole. Such provision -will be construed and/or reformed so as necessary to make it valid and enforceable. -The European Commission may publish other linguistic versions and/or new versions -of this Licence, so far this is required and reasonable, without reducing the scope of -the rights granted by the Licence. New versions of the Licence will be published with -a unique version number. - -All linguistic versions of this Licence, approved by the European Commission, have -identical value. Parties can take advantage of the linguistic version of their choice. - -14. Jurisdiction - -Any litigation resulting from the interpretation of this License, arising between the -European Commission, as a Licensor, and any Licensee, will be subject to the -jurisdiction of the Court of Justice of the European Communities, as laid down in -article 238 of the Treaty establishing the European Community. -Any litigation arising between Parties, other than the European Commission, and -resulting from the interpretation of this License, will be subject to the exclusive -jurisdiction of the competent court where the Licensor resides or conducts its primary -business. - -15. Applicable Law - -This Licence shall be governed by the law of the European Union country where the -Licensor resides or has his registered office. - -This licence shall be governed by the Belgian law if: - -- a litigation arises between the European Commission, as a Licensor, and any -Licensee; -- the Licensor, other than the European Commission, has no residence or -registered office inside a European Union country. - -=== - -Appendix - -“Compatible Licences” according to article 5 EUPL are: - -- GNU General Public License (GNU GPL) v. 2 -- Open Software License (OSL) v. 2.1, v. 3.0 -- Common Public License v. 1.0 -- Eclipse Public License v. 1.0 -- Cecill v. 2.0 \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..3cced03 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright © 2014-2017 Jon Hanna + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/SpookilySharp/ExceptionHelper.cs b/SpookilySharp/ExceptionHelper.cs index 5a7abb2..46328cc 100644 --- a/SpookilySharp/ExceptionHelper.cs +++ b/SpookilySharp/ExceptionHelper.cs @@ -3,15 +3,9 @@ // Author: // Jon Hanna // -// © 2014 Jon Hanna +// © 2014–2017 Jon Hanna // -// This source code is licensed under the EUPL, Version 1.1 only (the “Licence”). -// You may not use, modify or distribute this work except in compliance with the Licence. -// You may obtain a copy of the Licence at: -// -// A copy is also distributed with this source code. -// Unless required by applicable law or agreed to in writing, software distributed under the -// Licence is distributed on an “AS IS” basis, without warranties or conditions of any kind. +// Licensed under the MIT license. See the LICENSE file in the repository root for more details. using System; using System.IO; diff --git a/SpookilySharp/HashCode128.cs b/SpookilySharp/HashCode128.cs index 67878c7..2afe988 100644 --- a/SpookilySharp/HashCode128.cs +++ b/SpookilySharp/HashCode128.cs @@ -3,15 +3,9 @@ // Author: // Jon Hanna // -// © 2014 Jon Hanna +// © 2014–2017 Jon Hanna // -// Licensed under the EUPL, Version 1.1 only (the “Licence”). -// You may not use, modify or distribute this work except in compliance with the Licence. -// You may obtain a copy of the Licence at: -// -// A copy is also distributed with this source code. -// Unless required by applicable law or agreed to in writing, software distributed under the -// Licence is distributed on an “AS IS” basis, without warranties or conditions of any kind. +// Licensed under the MIT license. See the LICENSE file in the repository root for more details. using System; diff --git a/SpookilySharp/HashedStream.cs b/SpookilySharp/HashedStream.cs index 5f52cc6..66bb174 100644 --- a/SpookilySharp/HashedStream.cs +++ b/SpookilySharp/HashedStream.cs @@ -3,15 +3,9 @@ // Author: // Jon Hanna // -// © 2014 Jon Hanna +// © 2014–2017 Jon Hanna // -// This source code is licensed under the EUPL, Version 1.1 only (the “Licence”). -// You may not use, modify or distribute this work except in compliance with the Licence. -// You may obtain a copy of the Licence at: -// -// A copy is also distributed with this source code. -// Unless required by applicable law or agreed to in writing, software distributed under the -// Licence is distributed on an “AS IS” basis, without warranties or conditions of any kind. +// Licensed under the MIT license. See the LICENSE file in the repository root for more details. using System; using System.IO; diff --git a/SpookilySharp/Properties/AssemblyInfo.cs b/SpookilySharp/Properties/AssemblyInfo.cs index 6658da7..3134c37 100755 --- a/SpookilySharp/Properties/AssemblyInfo.cs +++ b/SpookilySharp/Properties/AssemblyInfo.cs @@ -3,15 +3,9 @@ // Author: // Jon Hanna // -// © 2014 Jon Hanna +// © 2014–2017 Jon Hanna // -// Licensed under the EUPL, Version 1.1 only (the “Licence”). -// You may not use, modify or distribute this work except in compliance with the Licence. -// You may obtain a copy of the Licence at: -// -// A copy is also distributed with this source code. -// Unless required by applicable law or agreed to in writing, software distributed under the -// Licence is distributed on an “AS IS” basis, without warranties or conditions of any kind. +// Licensed under the MIT license. See the LICENSE file in the repository root for more details. using System; using System.Runtime.InteropServices; diff --git a/SpookilySharp/Redistributor.cs b/SpookilySharp/Redistributor.cs index 557d486..b63d048 100644 --- a/SpookilySharp/Redistributor.cs +++ b/SpookilySharp/Redistributor.cs @@ -3,15 +3,9 @@ // Author: // Jon Hanna // -// © 2014 Jon Hanna +// © 2014–2017 Jon Hanna // -// Licensed under the EUPL, Version 1.1 only (the “Licence”). -// You may not use, modify or distribute this work except in compliance with the Licence. -// You may obtain a copy of the Licence at: -// -// A copy is also distributed with this source code. -// Unless required by applicable law or agreed to in writing, software distributed under the -// Licence is distributed on an “AS IS” basis, without warranties or conditions of any kind. +// Licensed under the MIT license. See the LICENSE file in the repository root for more details. using System; diff --git a/SpookilySharp/SpookierEqualityComparer.cs b/SpookilySharp/SpookierEqualityComparer.cs index 06703da..46e0998 100644 --- a/SpookilySharp/SpookierEqualityComparer.cs +++ b/SpookilySharp/SpookierEqualityComparer.cs @@ -3,15 +3,9 @@ // Author: // Jon Hanna // -// © 2014 Jon Hanna +// © 2014–2017 Jon Hanna // -// Licensed under the EUPL, Version 1.1 only (the “Licence”). -// You may not use, modify or distribute this work except in compliance with the Licence. -// You may obtain a copy of the Licence at: -// -// A copy is also distributed with this source code. -// Unless required by applicable law or agreed to in writing, software distributed under the -// Licence is distributed on an “AS IS” basis, without warranties or conditions of any kind. +// Licensed under the MIT license. See the LICENSE file in the repository root for more details. using System; using System.Collections; diff --git a/SpookilySharp/SpookilySharp.csproj b/SpookilySharp/SpookilySharp.csproj index b557b52..a782015 100644 --- a/SpookilySharp/SpookilySharp.csproj +++ b/SpookilySharp/SpookilySharp.csproj @@ -8,13 +8,25 @@ Spookily Sharp © 2014–2017 Jon Hanna - .NET/Mono implementation of SpookyHash + A .NET/Mono implementation of Bob Jenkins’ SpookyHash version 2. Offers 32-, 64- and 128-bit hashes. + A .NET/Mono implementation of Bob Jenkins’ SpookyHash version 2. Offers 32-, 64- and 128-bit hashes of strings, char and byte arrays, streams and any type of object represented by an array of simple types. + true + https://opensource.org/licenses/MIT + https://github.com/JonHanna/SpookilySharp/ + git@github.com:JonHanna/SpookilySharp.git + git + SpookyHash hashcode hash hashing + true + + + + true + latest + 162856960 TRACE;DEBUG;NETSTANDARD2_0 - true - latest full true diff --git a/SpookilySharp/SpookyHash.cs b/SpookilySharp/SpookyHash.cs index 08a82a6..0157da1 100755 --- a/SpookilySharp/SpookyHash.cs +++ b/SpookilySharp/SpookyHash.cs @@ -3,20 +3,9 @@ // Author: // Jon Hanna // -// © 2014 Jon Hanna +// © 2014–2017 Jon Hanna // -// Licensed under the EUPL, Version 1.1 only (the “Licence”). -// You may not use, modify or distribute this work except in compliance with the Licence. -// You may obtain a copy of the Licence at: -// -// A copy is also distributed with this source code. -// Unless required by applicable law or agreed to in writing, software distributed under the -// Licence is distributed on an “AS IS” basis, without warranties or conditions of any kind. - -// Based on Bob Jenkins’ SpookyHash version 2. -// Described by Jenkins as “public domain” which may or may not be legally possible for the -// work of a living person in your jurisdiction. If not, it may be reasonably inferred that -// permission is given by him to port the algorithm into other languages, as per here. +// Licensed under the MIT license. See the LICENSE file in the repository root for more details. using System; using System.Collections.Generic; diff --git a/SpookilySharp/SpookyHashOverloads.generated.cs b/SpookilySharp/SpookyHashOverloads.generated.cs index 152c374..967af63 100644 --- a/SpookilySharp/SpookyHashOverloads.generated.cs +++ b/SpookilySharp/SpookyHashOverloads.generated.cs @@ -2,13 +2,7 @@ // // Generated File. DO NOT EDIT THIS FILE. Edit SpookyHashOverloads.tt to change the produced file. // -// Licensed under the EUPL, Version 1.1 only (the “Licence”). -// You may not use, modify or distribute this work except in compliance with the Licence. -// You may obtain a copy of the Licence at: -// -// A copy is also distributed with this source code. -// Unless required by applicable law or agreed to in writing, software distributed under the -// Licence is distributed on an “AS IS” basis, without warranties or conditions of any kind. +// Licensed under the MIT license. See the LICENSE file in the repository root for more details. using System; using System.Collections.Generic; diff --git a/SpookilySharp/SpookyHashOverloads.tt b/SpookilySharp/SpookyHashOverloads.tt index f81028f..58fc5fd 100644 --- a/SpookilySharp/SpookyHashOverloads.tt +++ b/SpookilySharp/SpookyHashOverloads.tt @@ -6,27 +6,15 @@ // Author: // Jon Hanna // -// © 2014 Jon Hanna +// © 2014–2017 Jon Hanna // -// Licensed under the EUPL, Version 1.1 only (the “Licence”). -// You may not use, modify or distribute this work except in compliance with the Licence. -// You may obtain a copy of the Licence at: -// -// A copy is also distributed with this source code. -// Unless required by applicable law or agreed to in writing, software distributed under the -// Licence is distributed on an “AS IS” basis, without warranties or conditions of any kind. +// Licensed under the MIT license. See the LICENSE file in the repository root for more details. #> // SpookyHashOverloads.generated.cs // // Generated File. DO NOT EDIT THIS FILE. Edit SpookyHashOverloads.tt to change the produced file. // -// Licensed under the EUPL, Version 1.1 only (the “Licence”). -// You may not use, modify or distribute this work except in compliance with the Licence. -// You may obtain a copy of the Licence at: -// -// A copy is also distributed with this source code. -// Unless required by applicable law or agreed to in writing, software distributed under the -// Licence is distributed on an “AS IS” basis, without warranties or conditions of any kind. +// Licensed under the MIT license. See the LICENSE file in the repository root for more details. using System; using System.Collections.Generic; diff --git a/SpookilySharp/SpookyHasher.cs b/SpookilySharp/SpookyHasher.cs index ff58dbb..e369637 100644 --- a/SpookilySharp/SpookyHasher.cs +++ b/SpookilySharp/SpookyHasher.cs @@ -3,15 +3,9 @@ // Author: // Jon Hanna // -// © 2014 Jon Hanna +// © 2014–2017 Jon Hanna // -// Licensed under the EUPL, Version 1.1 only (the “Licence”). -// You may not use, modify or distribute this work except in compliance with the Licence. -// You may obtain a copy of the Licence at: -// -// A copy is also distributed with this source code. -// Unless required by applicable law or agreed to in writing, software distributed under the -// Licence is distributed on an “AS IS” basis, without warranties or conditions of any kind. +// Licensed under the MIT license. See the LICENSE file in the repository root for more details. using System; using System.IO; @@ -53,7 +47,7 @@ public static HashCode128 SpookyHash128(this string message, int startIndex, int { if (message == null) { - return default(HashCode128); + return default; } ExceptionHelper.CheckBounds(message, startIndex, length); @@ -84,7 +78,7 @@ public static HashCode128 SpookyHash128(this string message, int startIndex, int [SecuritySafeCritical] public static HashCode128 SpookyHash128(this string message, long seed0, long seed1) => message == null - ? default(HashCode128) + ? default : unchecked(SpookyHash128Unchecked(message, 0, message.Length, (ulong)seed0, (ulong)seed1)); /// Produces an 128-bit SpookyHash of a , using a default seed. @@ -102,7 +96,7 @@ public static HashCode128 SpookyHash128(this string message, int startIndex, int { if (message == null) { - return default(HashCode128); + return default; } ExceptionHelper.CheckBounds(message, startIndex, length); diff --git a/SpookilySharp/SpookyStringEqualityComparer.cs b/SpookilySharp/SpookyStringEqualityComparer.cs index c2dc093..2e6ae0c 100644 --- a/SpookilySharp/SpookyStringEqualityComparer.cs +++ b/SpookilySharp/SpookyStringEqualityComparer.cs @@ -3,15 +3,9 @@ // Author: // Jon Hanna // -// © 2014 Jon Hanna +// © 2014–2017 Jon Hanna // -// Licensed under the EUPL, Version 1.1 only (the “Licence”). -// You may not use, modify or distribute this work except in compliance with the Licence. -// You may obtain a copy of the Licence at: -// -// A copy is also distributed with this source code. -// Unless required by applicable law or agreed to in writing, software distributed under the -// Licence is distributed on an “AS IS” basis, without warranties or conditions of any kind. +// Licensed under the MIT license. See the LICENSE file in the repository root for more details. using System; using System.Collections.Generic; diff --git a/SpookilySharp/WellDistributedHashAttribute.cs b/SpookilySharp/WellDistributedHashAttribute.cs index 64df9e2..5242bdb 100644 --- a/SpookilySharp/WellDistributedHashAttribute.cs +++ b/SpookilySharp/WellDistributedHashAttribute.cs @@ -3,15 +3,9 @@ // Author: // Jon Hanna // -// © 2014 Jon Hanna +// © 2014–2017 Jon Hanna // -// Licensed under the EUPL, Version 1.1 only (the “Licence”). -// You may not use, modify or distribute this work except in compliance with the Licence. -// You may obtain a copy of the Licence at: -// -// A copy is also distributed with this source code. -// Unless required by applicable law or agreed to in writing, software distributed under the -// Licence is distributed on an “AS IS” basis, without warranties or conditions of any kind. +// Licensed under the MIT license. See the LICENSE file in the repository root for more details. using System; using System.Collections.Generic; diff --git a/SpookilySharp/pkg/SpookilySharp.1.1.5129-alpha.nuspec b/SpookilySharp/pkg/SpookilySharp.1.1.5129-alpha.nuspec deleted file mode 100644 index aa2414f..0000000 --- a/SpookilySharp/pkg/SpookilySharp.1.1.5129-alpha.nuspec +++ /dev/null @@ -1,37 +0,0 @@ - - - - SpookilySharp - 1.1.5129-alpha - Spookily Sharp - Jon Hanna - http://joinup.ec.europa.eu/software/page/eupl/licence-eupl - https://bitbucket.org/JonHanna/spookilysharp - true - A .NET/Mono implementation of Bob Jenkins’ SpookyHash version 2. Offers 32-, 64- and 128-bit hashes of strings, char and byte arrays, streams and any type of object represented by an array of simple types. - A .NET/Mono implementation of Bob Jenkins’ SpookyHash version 2. Offers 32-, 64- and 128-bit hashes. - © 2014 Jon Hanna - SpookyHash hashcode hash hashing - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/SpookyHashTesting/EqualityComparerTests.cs b/SpookyHashTesting/EqualityComparerTests.cs index 2e35809..1cd5769 100644 --- a/SpookyHashTesting/EqualityComparerTests.cs +++ b/SpookyHashTesting/EqualityComparerTests.cs @@ -3,15 +3,9 @@ // Author: // Jon Hanna // -// © 2014 Jon Hanna +// © 2014–2017 Jon Hanna // -// Licensed under the EUPL, Version 1.1 only (the “Licence”). -// You may not use, modify or distribute this work except in compliance with the Licence. -// You may obtain a copy of the Licence at: -// -// A copy is also distributed with this source code. -// Unless required by applicable law or agreed to in writing, software distributed under the -// Licence is distributed on an “AS IS” basis, without warranties or conditions of any kind. +// Licensed under the MIT license. See the LICENSE file in the repository root for more details. using System; using System.Collections.Generic; diff --git a/SpookyHashTesting/Hash128Tests.cs b/SpookyHashTesting/Hash128Tests.cs index 87f5bf5..a0c5368 100644 --- a/SpookyHashTesting/Hash128Tests.cs +++ b/SpookyHashTesting/Hash128Tests.cs @@ -3,15 +3,9 @@ // Author: // Jon Hanna // -// © 2014 Jon Hanna +// © 2014–2017 Jon Hanna // -// This source code is licensed under the EUPL, Version 1.1 only (the “Licence”). -// You may not use, modify or distribute this work except in compliance with the Licence. -// You may obtain a copy of the Licence at: -// -// A copy is also distributed with this source code. -// Unless required by applicable law or agreed to in writing, software distributed under the -// Licence is distributed on an “AS IS” basis, without warranties or conditions of any kind. +// Licensed under the MIT license. See the LICENSE file in the repository root for more details. using System; using SpookilySharp; @@ -39,8 +33,8 @@ public void Parsing() Assert.Equal(0, HashCode128.Zero.GetHashCode()); Assert.Equal(0x123456789abcdef0, hash.UHash1); Assert.Equal(0x0fedcba987654321, hash.UHash2); - Assert.Equal(hash.Hash1, 0x123456789abcdef0); - Assert.Equal(hash.Hash2, 0x0fedcba987654321); + Assert.Equal(0x123456789abcdef0, hash.Hash1); + Assert.Equal(0x0fedcba987654321, hash.Hash2); Assert.Equal(hash, new HashCode128(0x123456789abcdef0u, 0x0fedcba987654321)); Assert.Equal(hash, new HashCode128(0x123456789abcdef0, 0x0fedcba987654321)); Assert.Equal(hash, HashCode128.Parse("0x123456789abcdef00fedcba987654321")); diff --git a/SpookyHashTesting/HashTests.cs b/SpookyHashTesting/HashTests.cs index a000bf8..a39e04a 100644 --- a/SpookyHashTesting/HashTests.cs +++ b/SpookyHashTesting/HashTests.cs @@ -3,15 +3,9 @@ // Author: // Jon Hanna // -// © 2014 Jon Hanna +// © 2014–2017 Jon Hanna // -// Licensed under the EUPL, Version 1.1 only (the “Licence”). -// You may not use, modify or distribute this work except in compliance with the Licence. -// You may obtain a copy of the Licence at: -// -// A copy is also distributed with this source code. -// Unless required by applicable law or agreed to in writing, software distributed under the -// Licence is distributed on an “AS IS” basis, without warranties or conditions of any kind. +// Licensed under the MIT license. See the LICENSE file in the repository root for more details. // Based on Bob Jenkins’ tests. diff --git a/SpookyHashTesting/HasherTests.cs b/SpookyHashTesting/HasherTests.cs index f60c042..36d8802 100644 --- a/SpookyHashTesting/HasherTests.cs +++ b/SpookyHashTesting/HasherTests.cs @@ -3,15 +3,9 @@ // Author: // Jon Hanna // -// © 2014 Jon Hanna +// © 2014–2017 Jon Hanna // -// This source code is licensed under the EUPL, Version 1.1 only (the “Licence”). -// You may not use, modify or distribute this work except in compliance with the Licence. -// You may obtain a copy of the Licence at: -// -// A copy is also distributed with this source code. -// Unless required by applicable law or agreed to in writing, software distributed under the -// Licence is distributed on an “AS IS” basis, without warranties or conditions of any kind. +// Licensed under the MIT license. See the LICENSE file in the repository root for more details. using System; using System.IO; diff --git a/SpookyHashTesting/IncrementalTest.cs b/SpookyHashTesting/IncrementalTest.cs index 5fc24a5..a6bf327 100644 --- a/SpookyHashTesting/IncrementalTest.cs +++ b/SpookyHashTesting/IncrementalTest.cs @@ -3,15 +3,9 @@ // Author: // Jon Hanna // -// © 2014 Jon Hanna +// © 2014–2017 Jon Hanna // -// Licensed under the EUPL, Version 1.1 only (the “Licence”). -// You may not use, modify or distribute this work except in compliance with the Licence. -// You may obtain a copy of the Licence at: -// -// A copy is also distributed with this source code. -// Unless required by applicable law or agreed to in writing, software distributed under the -// Licence is distributed on an “AS IS” basis, without warranties or conditions of any kind. +// Licensed under the MIT license. See the LICENSE file in the repository root for more details. // Based on Bob Jenkins’ tests. diff --git a/SpookyHashTesting/Overloads.generated.cs b/SpookyHashTesting/Overloads.generated.cs index a2a674c..7e735a0 100644 --- a/SpookyHashTesting/Overloads.generated.cs +++ b/SpookyHashTesting/Overloads.generated.cs @@ -2,13 +2,7 @@ // // Generated File. DO NOT EDIT THIS FILE. Edit Overloads.tt to change the produced file. // -// Licensed under the EUPL, Version 1.1 only (the “Licence”). -// You may not use, modify or distribute this work except in compliance with the Licence. -// You may obtain a copy of the Licence at: -// -// A copy is also distributed with this source code. -// Unless required by applicable law or agreed to in writing, software distributed under the -// Licence is distributed on an “AS IS” basis, without warranties or conditions of any kind. +// Licensed under the MIT license. See the LICENSE file in the repository root for more details. using System; using System.Collections.Generic; diff --git a/SpookyHashTesting/Overloads.tt b/SpookyHashTesting/Overloads.tt index 7c9532b..f093a5e 100644 --- a/SpookyHashTesting/Overloads.tt +++ b/SpookyHashTesting/Overloads.tt @@ -3,30 +3,19 @@ <# // Overloads.tt // +// // Author: // Jon Hanna // -// © 2014 Jon Hanna +// © 2014–2017 Jon Hanna // -// Licensed under the EUPL, Version 1.1 only (the “Licence”). -// You may not use, modify or distribute this work except in compliance with the Licence. -// You may obtain a copy of the Licence at: -// -// A copy is also distributed with this source code. -// Unless required by applicable law or agreed to in writing, software distributed under the -// Licence is distributed on an “AS IS” basis, without warranties or conditions of any kind. +// Licensed under the MIT license. See the LICENSE file in the repository root for more details. #> // Overloads.generated.cs // // Generated File. DO NOT EDIT THIS FILE. Edit Overloads.tt to change the produced file. // -// Licensed under the EUPL, Version 1.1 only (the “Licence”). -// You may not use, modify or distribute this work except in compliance with the Licence. -// You may obtain a copy of the Licence at: -// -// A copy is also distributed with this source code. -// Unless required by applicable law or agreed to in writing, software distributed under the -// Licence is distributed on an “AS IS” basis, without warranties or conditions of any kind. +// Licensed under the MIT license. See the LICENSE file in the repository root for more details. using System; using System.Collections.Generic; diff --git a/SpookyHashTesting/StreamTests.cs b/SpookyHashTesting/StreamTests.cs index 65ceae0..24e0f22 100644 --- a/SpookyHashTesting/StreamTests.cs +++ b/SpookyHashTesting/StreamTests.cs @@ -3,15 +3,9 @@ // Author: // Jon Hanna // -// © 2014 Jon Hanna +// © 2014–2017 Jon Hanna // -// Licensed under the EUPL, Version 1.1 only (the “Licence”). -// You may not use, modify or distribute this work except in compliance with the Licence. -// You may obtain a copy of the Licence at: -// -// A copy is also distributed with this source code. -// Unless required by applicable law or agreed to in writing, software distributed under the -// Licence is distributed on an “AS IS” basis, without warranties or conditions of any kind. +// Licensed under the MIT license. See the LICENSE file in the repository root for more details. using System; using System.IO; diff --git a/SpookyHashTesting/WellDistributedHashAttributeTests.cs b/SpookyHashTesting/WellDistributedHashAttributeTests.cs index 25c37f9..9331bc9 100644 --- a/SpookyHashTesting/WellDistributedHashAttributeTests.cs +++ b/SpookyHashTesting/WellDistributedHashAttributeTests.cs @@ -3,15 +3,9 @@ // Author: // Jon Hanna // -// © 2014 Jon Hanna +// © 2014–2017 Jon Hanna // -// Licensed under the EUPL, Version 1.1 only (the “Licence”). -// You may not use, modify or distribute this work except in compliance with the Licence. -// You may obtain a copy of the Licence at: -// -// A copy is also distributed with this source code. -// Unless required by applicable law or agreed to in writing, software distributed under the -// Licence is distributed on an “AS IS” basis, without warranties or conditions of any kind. +// Licensed under the MIT license. See the LICENSE file in the repository root for more details. using System.Collections.Generic; using SpookilySharp; diff --git a/readme.md b/readme.md index cd9c8f6..4f5f3b7 100644 --- a/readme.md +++ b/readme.md @@ -2,15 +2,11 @@ A .NET/Mono implementation of Bob Jenkins’ [SpookyHash version 2](http://burtleburtle.net/bob/hash/spooky.html). Offers 32- 64- and 128-bit hashes of strings, char and byte arrays, streams and any type of object represented by an array of simple types. +Development is only active for .NET Standard 2.0 (.NET Core 2.0, .NET Framework 4.6.1, Mono 5.4, etc.). Packages for previous frameworks down to .NET Framework 2.0 are available but will only be updated if serious issues are discovered. + # License -> Licensed under the EUPL, Version 1.1 only (the “Licence”). -> You may not use, modify or distribute this work except in compliance with the Licence. -> You may obtain a copy of the Licence at: -> -> A copy is also distributed with this source code. -> Unless required by applicable law or agreed to in writing, software distributed under the -> Licence is distributed on an “AS IS” basis, without warranties or conditions of any kind. +> Licensed under the MIT license. See the LICENSE file in the repository root for more details. # NuGet Package