Skip to content

Commit

Permalink
MIT License
Browse files Browse the repository at this point in the history
* Relicensed all code under MIT-style license
  * See LICENSE.txt for more information
* All files now "Copyright © 2000-2016 SharpZipLib Contributors"
* Removed header comments from all source files
* Removed CompressionLevel.cs, CompressionMode.cs, and ZipArchiveMode.cs
  • Loading branch information
McNeight committed May 16, 2016
1 parent 0498929 commit c9454d5
Show file tree
Hide file tree
Showing 79 changed files with 1,191 additions and 4,774 deletions.
340 changes: 0 additions & 340 deletions Documentation/COPYING.txt

This file was deleted.

8 changes: 4 additions & 4 deletions GlobalAssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// associated with an assembly.
[assembly: AssemblyCompany("ICSharpCode")]
[assembly: AssemblyProduct("SharpZipLib (#ziplib)")]
[assembly: AssemblyCopyright("Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team")]
[assembly: AssemblyCopyright("Copyright © 2000-2016 SharpZipLib Contributors")]
[assembly: AssemblyTrademark("")]

#if DEBUG
Expand Down Expand Up @@ -38,11 +38,11 @@
// Revision: the number of two second intervals since midnight in local time; i.e. 31308 = 17:23:36 local time.

// Specifies the version of the assembly being attributed.
[assembly: AssemblyVersion("0.87.*")]
[assembly: AssemblyVersion("1.0.*")]

// Instructs a compiler to use a specific version number for the Win32 file version resource.
// The Win32 file version is not required to be the same as the assembly's version number.
[assembly: AssemblyFileVersion("0.87")]
[assembly: AssemblyFileVersion("1.0")]

// Defines additional version information for an assembly manifest.
[assembly: AssemblyInformationalVersion("0.87 Cleanup Build")]
[assembly: AssemblyInformationalVersion("1.0")]
3 changes: 2 additions & 1 deletion ICSharpCode.SharpZipLib.Tests/Checksum/ChecksumTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ public void CRC_32()
exceptionTesting(underTestCrc32);
}

private void exceptionTesting(IChecksum crcUnderTest) {
private void exceptionTesting(IChecksum crcUnderTest)
{

bool exception = false;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,12 @@
<HintPath>..\packages\NUnit.3.2.1\lib\net45\nunit.framework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Ploeh.AutoFixture, Version=3.45.1.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
<HintPath>..\packages\AutoFixture.3.45.1\lib\net40\Ploeh.AutoFixture.dll</HintPath>
<Reference Include="Ploeh.AutoFixture, Version=3.46.0.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
<HintPath>..\packages\AutoFixture.3.46.0\lib\net40\Ploeh.AutoFixture.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Ploeh.AutoFixture.NUnit3, Version=3.45.1.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
<HintPath>..\packages\AutoFixture.NUnit3.3.45.1\lib\net40\Ploeh.AutoFixture.NUnit3.dll</HintPath>
<Reference Include="Ploeh.AutoFixture.NUnit3, Version=3.46.0.0, Culture=neutral, PublicKeyToken=b24654c590009d4f, processorArchitecture=MSIL">
<HintPath>..\packages\AutoFixture.NUnit3.3.46.0\lib\net40\Ploeh.AutoFixture.NUnit3.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
Expand Down
4 changes: 2 additions & 2 deletions ICSharpCode.SharpZipLib.Tests/Lzw/LzwTests.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using System.IO;
using ICSharpCode.SharpZipLib.LZW;
using ICSharpCode.SharpZipLib.Lzw;
using ICSharpCode.SharpZipLib.Tests.TestSupport;
using NUnit.Framework;

namespace ICSharpCode.SharpZipLib.Tests.LZW
namespace ICSharpCode.SharpZipLib.Tests.Lzw
{

[TestFixture]
Expand Down
33 changes: 11 additions & 22 deletions ICSharpCode.SharpZipLib.Tests/TestSupport/RingBuffer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -271,58 +271,47 @@ public int Read(byte[] buffer, int index, int count)
/// <summary>
/// Gets a value indicating wether the buffer is empty or not.
/// </summary>
public bool IsEmpty
{
public bool IsEmpty {
get { return count_ == 0; }
}

public bool IsFull
{
get
{
public bool IsFull {
get {
return (count_ == array_.Length);
}
}

public bool IsClosed
{
public bool IsClosed {
get { return isClosed_; }
}

/// <summary>
/// Gets the number of elements in the buffer.
/// </summary>
public int Count
{
get
{
public int Count {
get {
return count_;
}
}


public int Length
{
public int Length {
get { return array_.Length; }
}

public long BytesWritten
{
public long BytesWritten {
get { return bytesWritten_; }
}

public long BytesRead
{
public long BytesRead {
get { return bytesRead_; }
}

/// <summary>
/// Indexer - Get an element from the tail of the RingBuffer.
/// </summary>
public byte this[int index]
{
get
{
public byte this[int index] {
get {
if ((index < 0) || (index >= array_.Length)) {
throw new ArgumentOutOfRangeException(nameof(index));
}
Expand Down
63 changes: 21 additions & 42 deletions ICSharpCode.SharpZipLib.Tests/TestSupport/Streams.cs
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,7 @@ public override void Close()
/// Gets a value indicating whether this instance is closed.
/// </summary>
/// <value><c>true</c> if this instance is closed; otherwise, <c>false</c>.</value>
public bool IsClosed
{
public bool IsClosed {
get { return isClosed_; }
}

Expand All @@ -83,8 +82,7 @@ public bool IsClosed
/// <value>
/// <c>true</c> if this instance is disposed; otherwise, <c>false</c>.
/// </value>
public bool IsDisposed
{
public bool IsDisposed {
get { return isDisposed_; }
}

Expand All @@ -105,10 +103,8 @@ public class MemoryStreamWithoutSeek : TrackedMemoryStream
/// </summary>
/// <value></value>
/// <returns>true if the stream is open.</returns>
public override bool CanSeek
{
get
{
public override bool CanSeek {
get {
return false;
}
}
Expand All @@ -124,8 +120,7 @@ public class NullStream : Stream
/// </summary>
/// <value></value>
/// <returns>true if the stream supports reading; otherwise, false.</returns>
public override bool CanRead
{
public override bool CanRead {
get { return false; }
}

Expand All @@ -134,8 +129,7 @@ public override bool CanRead
/// </summary>
/// <value></value>
/// <returns>true if the stream supports seeking; otherwise, false.</returns>
public override bool CanSeek
{
public override bool CanSeek {
get { return false; }
}

Expand All @@ -144,8 +138,7 @@ public override bool CanSeek
/// </summary>
/// <value></value>
/// <returns>true if the stream supports writing; otherwise, false.</returns>
public override bool CanWrite
{
public override bool CanWrite {
get { return true; }
}

Expand All @@ -165,8 +158,7 @@ public override void Flush()
/// <returns>A long value representing the length of the stream in bytes.</returns>
/// <exception cref="T:System.NotSupportedException">A class derived from Stream does not support seeking. </exception>
/// <exception cref="T:System.ObjectDisposedException">Methods were called after the stream was closed. </exception>
public override long Length
{
public override long Length {
get { throw new Exception("The method or operation is not implemented."); }
}

Expand All @@ -178,14 +170,11 @@ public override long Length
/// <exception cref="T:System.IO.IOException">An I/O error occurs. </exception>
/// <exception cref="T:System.NotSupportedException">The stream does not support seeking. </exception>
/// <exception cref="T:System.ObjectDisposedException">Methods were called after the stream was closed. </exception>
public override long Position
{
get
{
public override long Position {
get {
throw new Exception("The method or operation is not implemented.");
}
set
{
set {
throw new Exception("The method or operation is not implemented.");
}
}
Expand Down Expand Up @@ -281,8 +270,7 @@ public WindowedStream(int size)
/// </summary>
/// <value></value>
/// <returns>true if the stream supports reading; otherwise, false.</returns>
public override bool CanRead
{
public override bool CanRead {
get { return true; }
}

Expand All @@ -291,8 +279,7 @@ public override bool CanRead
/// </summary>
/// <value></value>
/// <returns>true if the stream supports seeking; otherwise, false.</returns>
public override bool CanSeek
{
public override bool CanSeek {
get { return false; }
}

Expand All @@ -301,8 +288,7 @@ public override bool CanSeek
/// </summary>
/// <value></value>
/// <returns>true if the stream supports writing; otherwise, false.</returns>
public override bool CanWrite
{
public override bool CanWrite {
get { return true; }
}

Expand All @@ -322,8 +308,7 @@ public override void Flush()
/// <returns>A long value representing the length of the stream in bytes.</returns>
/// <exception cref="T:System.NotSupportedException">A class derived from Stream does not support seeking. </exception>
/// <exception cref="T:System.ObjectDisposedException">Methods were called after the stream was closed. </exception>
public override long Length
{
public override long Length {
// A bit of a HAK as its not true in the stream sense.
get { return ringBuffer_.Count; }
}
Expand All @@ -336,14 +321,11 @@ public override long Length
/// <exception cref="T:System.IO.IOException">An I/O error occurs. </exception>
/// <exception cref="T:System.NotSupportedException">The stream does not support seeking. </exception>
/// <exception cref="T:System.ObjectDisposedException">Methods were called after the stream was closed. </exception>
public override long Position
{
get
{
public override long Position {
get {
throw new Exception("The method or operation is not implemented.");
}
set
{
set {
throw new Exception("The method or operation is not implemented.");
}
}
Expand Down Expand Up @@ -436,8 +418,7 @@ public override void Write(byte[] buffer, int offset, int count)
/// Gets a value indicating whether this instance is closed.
/// </summary>
/// <value><c>true</c> if this instance is closed; otherwise, <c>false</c>.</value>
public bool IsClosed
{
public bool IsClosed {
get { return ringBuffer_.IsClosed; }
}

Expand All @@ -453,17 +434,15 @@ public override void Close()
/// Gets the bytes written.
/// </summary>
/// <value>The bytes written.</value>
public long BytesWritten
{
public long BytesWritten {
get { return ringBuffer_.BytesWritten; }
}

/// <summary>
/// Gets the bytes read.
/// </summary>
/// <value>The bytes read.</value>
public long BytesRead
{
public long BytesRead {
get { return ringBuffer_.BytesRead; }
}

Expand Down
24 changes: 8 additions & 16 deletions ICSharpCode.SharpZipLib.Tests/Zip/ZipTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -54,43 +54,35 @@ public RuntimeInfo(string password, bool isDirectory)
original = new byte[0];
}

public byte[] Original
{
public byte[] Original {
get { return original; }
}

public CompressionMethod Method
{
public CompressionMethod Method {
get { return method; }
}

public int CompressionLevel
{
public int CompressionLevel {
get { return compressionLevel; }
}

public int Size
{
public int Size {
get { return size; }
}

public string Password
{
public string Password {
get { return password; }
}

bool Random
{
bool Random {
get { return random; }
}

public long Crc
{
public long Crc {
get { return crc; }
}

public bool IsDirectory
{
public bool IsDirectory {
get { return isDirectory_; }
}

Expand Down
5 changes: 3 additions & 2 deletions ICSharpCode.SharpZipLib.Tests/packages.config
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AutoFixture" version="3.45.1" targetFramework="net45" />
<package id="AutoFixture.NUnit3" version="3.45.1" targetFramework="net45" />
<package id="AutoFixture" version="3.46.0" targetFramework="net45" />
<package id="AutoFixture.NUnit3" version="3.46.0" targetFramework="net45" />
<package id="coveralls.io" version="1.3.4" targetFramework="net45" />
<package id="NUnit" version="3.2.1" targetFramework="net45" />
<package id="NUnit.Console" version="3.2.1" targetFramework="net45" />
<package id="NUnit.ConsoleRunner" version="3.2.1" targetFramework="net45" />
Expand Down
Loading

0 comments on commit c9454d5

Please sign in to comment.