Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/McNeight/SharpZipLib into…
Browse files Browse the repository at this point in the history
… McNeight-master

# Conflicts:
#	ICSharpCode.SharpZipLib/Tar/TarHeader.cs
#	ICSharpCode.SharpZipLib/Tar/TarOutputStream.cs
#	README.md
  • Loading branch information
McNeight committed Apr 26, 2016
1 parent 3fd4516 commit 88e49b8
Show file tree
Hide file tree
Showing 328 changed files with 124,411 additions and 10,927 deletions.
35 changes: 35 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# editorconfig.org

# top-most EditorConfig file
root = true

# Default settings:
# A newline ending every file
# Use 4 spaces as indentation
[*]
insert_final_newline = true
indent_style = tab
indent_size = 4

# C++ Files
[*.{cpp,h,in}]
curly_bracket_next_line = true
indent_brace_style = Allman

# Xml project files
[*.{csproj,vcxproj,vcxproj.filters,proj,nativeproj,locproj}]
indent_size = 2

# Xml files
[*.{xml,stylecop,resx,ruleset}]
indent_size = 2

# Xml config files
[*.{props,targets,config,nuspec}]
indent_size = 2

# Shell scripts
[*.sh]
end_of_line = lf
[*.{cmd, bat}]
end_of_line = crlf
67 changes: 67 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
###############################################################################
# Set default behavior to automatically normalize line endings.
###############################################################################
* text=auto

###############################################################################
# Set default behavior for command prompt diff.
#
# This is need for earlier builds of msysgit that does not have it on by
# default for csharp files.
# Note: This is only used by command line
###############################################################################
#*.cs diff=csharp

###############################################################################
# Set the merge driver for project and solution files
#
# Merging from the command prompt will add diff markers to the files if there
# are conflicts (Merging from VS is not affected by the settings below, in VS
# the diff markers are never inserted). Diff markers may cause the following
# file extensions to fail to load in VS. An alternative would be to treat
# these files as binary and thus will always conflict and require user
# intervention with every merge. To do so, just uncomment the entries below
###############################################################################
#*.sln merge=binary
#*.csproj merge=binary
#*.vbproj merge=binary
#*.vcxproj merge=binary
#*.vcproj merge=binary
#*.dbproj merge=binary
#*.fsproj merge=binary
#*.lsproj merge=binary
#*.wixproj merge=binary
#*.modelproj merge=binary
#*.sqlproj merge=binary
#*.wwaproj merge=binary

###############################################################################
# behavior for image files
#
# image files are treated as binary by default.
###############################################################################
#*.jpg binary
#*.png binary
#*.gif binary

###############################################################################
# diff behavior for common document formats
#
# Convert binary document formats to text before diffing them. This feature
# is only available from the command line. Turn it on by uncommenting the
# entries below.
###############################################################################
#*.doc diff=astextplain
#*.DOC diff=astextplain
#*.docx diff=astextplain
#*.DOCX diff=astextplain
#*.dot diff=astextplain
#*.DOT diff=astextplain
#*.pdf diff=astextplain
#*.PDF diff=astextplain
#*.rtf diff=astextplain
#*.RTF diff=astextplain

# Force bash scripts to always use lf line endings so that if a repo is accessed
# in Unix via a file share from Windows, the scripts will work.
*.sh text eol=lf
2 changes: 1 addition & 1 deletion Documentation/CONTRIBUTING.md → .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Thanks for helping to improve SharpZipLib.

In order for your changes to be accepted you can either sign the [Joint Copyright Assignment](http://www.icsharpcode.net/TechNotes/JointCopyrightAssignment.pdf) or add the following statement to your pull request:

_I certify that I own, and have sufficient rights to contribute, all source code and related material intended to be compiled or integrated with the source code for the #ziplib open source product (the "Contribution"). My Contribution is licensed under the MIT License._
_I certify that I own, and have sufficient rights to contribute, all source code and related material intended to be compiled or integrated with the source code for the SharpZipLib open source product (the "Contribution"). My Contribution is licensed under the MIT License._

Unless we have a Joint Copyright Agreement on file or this statement is in your pull request, we cannot accept it.

Expand Down
25 changes: 25 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
### Steps to reproduce
1.
2.
3.

### Expected behavior
Tell us what should happen

### Actual behavior
Tell us what happens instead

### Version of SharpZipLib

### Obtained from (place an x between the brackets for all that apply)
- [ ] Compiled from source
- branch: _______
- commit: _______
- [ ] Downloaded DLL from GitHub
- [ ] Downloaded DLL from SourceForge
- [ ] Downloaded DLL from _______
- [ ] DLL included as part of
- Package installed using:
- [ ] NuGet
- [ ] MyGet
- [ ] Chocolatey
4 changes: 4 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<!---
Please remember that unless we have a Joint Copyright Agreement on file or the following statement is in your pull request, we cannot accept it.
-->
_I certify that I own, and have sufficient rights to contribute, all source code and related material intended to be compiled or integrated with the source code for the SharpZipLib open source product (the "Contribution"). My Contribution is licensed under the MIT License._
13 changes: 7 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
language: csharp
mono:
- latest
- 3.12.0
- 2.10.8
os:
- linux
- osx
solution: ICSharpCode.SharpZipLib.sln
#install:
# - nuget restore ICSharpCode.SharpZipLib.sln
# - nuget install NUnit.Runners -Version 2.6.4 -OutputDirectory testrunner
install:
- nuget restore ICSharpCode.SharpZipLib.sln
# - nuget install NUnit.ConsoleRunner -Version 3.2.0 -OutputDirectory testrunner
script:
- xbuild /p:Configuration=Debug ICSharpCode.SharpZipLib.sln
- xbuild /p:Configuration=Release ICSharpCode.SharpZipLib.sln
# - mono ./testrunner/NUnit.Runners.2.6.4/tools/nunit-console.exe ./ICSharpCode.SharpZipLib.Tests/bin/Release/ICSharpCode.SharpZipLib.Tests.dll
- mono ./packages/NUnit.ConsoleRunner.3.2.0/tools/nunit3-console.exe /framework:mono-4.0 /result:./Documentation/nunit3-test-results-travis.xml ./bin/Release/ICSharpCode.SharpZipLib.Tests.dll
25 changes: 25 additions & 0 deletions Build/ICSharpCode.SharpZipLib.nuspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?xml version="1.0"?>
<package>
<metadata>
<id>ICSharpCode.SharpZipLib</id>
<version>1.0.0</version>
<title>SharpZipLib</title>
<authors>IC#Code</authors>
<owners>IC#Code</owners>
<licenseUrl>https://visualstudiogallery.msdn.microsoft.com/site/68c1575b-e0bf-420d-a94b-1b0f4bcdcbcc/eula?licenseType=None</licenseUrl>
<projectUrl>http://icsharpcode.github.io/SharpZipLib/</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Compression library for Zip, GZip, BZip2, LZW, and Tar written entirely in C# for the .NET platform.</description>
<releaseNotes>Please see https://github.com/icsharpcode/SharpZipLib/wiki/Release-1.0 for more information.</releaseNotes>
<copyright>Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team</copyright>
<tags>Compression Library Zip Gzip BZip2 LZW Tar</tags>
<dependencies>
<dependency id="System" version="1.0.0" />
</dependencies>
</metadata>
<files>
<file src="ICSharpCode.SharpZipLib.dll" target="lib\Net45\" />
<file src="ICSharpCode.SharpZipLib.dll" target="lib\dnx451\" />
<file src="ICSharpCode.SharpZipLib.dll" target="lib\dnxcore50\" />
</files>
</package>
4 changes: 4 additions & 0 deletions Build/ICSharpCode.SharpZipLib.version
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
nuget_version=1.0.0
full_version=1.0.0.0
release_notes_link=https://github.com/icsharpcode/SharpZipLib/wiki/Release-1.0/
copyright=Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team
11 changes: 11 additions & 0 deletions Build/install-fxmicroframework-43-44.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Write-Host "Installing .NET MicroFramework 4.3 ..."
$msiPath = "$($env:USERPROFILE)\MicroFrameworkSDK43.MSI"
(New-Object Net.WebClient).DownloadFile('http://download-codeplex.sec.s-msft.com/Download/Release?ProjectName=netmf&DownloadId=1423116&FileTime=130667921437670000&Build=21031', $msiPath)
cmd /c start /wait msiexec /i $msiPath /quiet
Write-Host "Installed" -ForegroundColor green

Write-Host "Installing .NET MicroFramework 4.4 ..."
$msiPath = "$($env:USERPROFILE)\MicroFrameworkSDK44.MSI"
(New-Object Net.WebClient).DownloadFile('https://github.com/NETMF/netmf-interpreter/releases/download/v4.4-RTW-20-Oct-2015/MicroFrameworkSDK.MSI', $msiPath)
cmd /c start /wait msiexec /i $msiPath /quiet
Write-Host "Installed" -ForegroundColor green
1 change: 1 addition & 0 deletions Build/run-nunit3-tests-debug.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
..\packages\NUnit.ConsoleRunner.3.2.0\tools\nunit3-console.exe /framework:net-4.5 /result:..\Documentation\nunit3-test-results-debug.xml ..\bin\Debug\ICSharpCode.SharpZipLib.Tests.dll
1 change: 1 addition & 0 deletions Build/run-nunit3-tests-release.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
..\packages\NUnit.ConsoleRunner.3.2.0\tools\nunit3-console.exe /framework:net-4.5 /result:..\Documentation\nunit3-test-results-release.xml ..\bin\Release\ICSharpCode.SharpZipLib.Tests.dll
2 changes: 2 additions & 0 deletions Build/run-opencover.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
..\packages\OpenCover.4.6.519\tools\OpenCover.Console.exe -target:run-nunit3-tests-release.cmd -register:user -filter:+[ICSharpCode.SharpZipLib]* -output:..\Documentation\opencover-results-release.xml
..\packages\ReportGenerator.2.4.4.0\tools\ReportGenerator.exe -reports:..\Documentation\opencover-results-release.xml -targetdir:..\Documentation\opencover
11 changes: 11 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Contributing to SharpZipLib

Thanks for helping to improve SharpZipLib.

In order for your changes to be accepted you can either sign the [Joint Copyright Assignment](http://www.icsharpcode.net/TechNotes/JointCopyrightAssignment.pdf) or add the following statement to your pull request:

_I certify that I own, and have sufficient rights to contribute, all source code and related material intended to be compiled or integrated with the source code for the SharpZipLib open source product (the "Contribution"). My Contribution is licensed under the MIT License._

Unless we have a Joint Copyright Agreement on file or this statement is in your pull request, we cannot accept it.

More information is available on [joining the team](https://github.com/icsharpcode/SharpDevelop/wiki/Joining-the-Team).
Binary file added Documentation/SharpZipLib.chm
Binary file not shown.
20 changes: 20 additions & 0 deletions Documentation/SharpZipLib.msha
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>ICSharpCode.SharpZipLib Compression Library</title>
</head>
<body class="vendor-book">
<div class="details">
<span class="vendor">Vendor Name</span>
<span class="locale">en-us</span>
<span class="product">ICSharpCode.SharpZipLib Compression Library</span>
<span class="name">ICSharpCode.SharpZipLib Compression Library</span>
</div>
<div class="package-list">
<div class="package">
<!-- NOTE: The "name" span value cannot contain any periods! -->
<span class="name">SharpZipLib</span>
<a class="current-link" href="SharpZipLib.mshc">SharpZipLib.mshc</a>
</div>
</div>
</body>
</html>
Binary file added Documentation/SharpZipLib.mshc
Binary file not shown.
15 changes: 12 additions & 3 deletions Documentation/SharpZipLib_VS2013.shfbproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@
<HtmlHelpName>SharpZipLib</HtmlHelpName>
<Language>en-US</Language>
<ProjectSummary>#ziplib compression library</ProjectSummary>
<MissingTags>Summary, Parameter, Returns, AutoDocumentCtors, Namespace, TypeParameter</MissingTags>
<MissingTags>Summary, Parameter, Returns, Value, Remarks, AutoDocumentCtors, Namespace, TypeParameter, IncludeTargets, AutoDocumentDispose</MissingTags>
<VisibleItems>InheritedMembers, InheritedFrameworkMembers, Protected, SealedProtected</VisibleItems>
<HtmlHelp1xCompilerPath />
<WorkingPath />
<HelpTitle>ICSharpCode.SharpZipLib Compression Library</HelpTitle>
<PresentationStyle>VS2013</PresentationStyle>
<DocumentationSources>
<DocumentationSource sourceFile="..\bin\ICSharpCode.SharpZipLib.dll" />
<DocumentationSource sourceFile="..\bin\ICSharpCode.SharpZipLib.XML" />
</DocumentationSources>
<DocumentationSource sourceFile="..\bin\ICSharpCode.SharpZipLib.XML" />
<DocumentationSource sourceFile="..\ICSharpCode.SharpZipLib\ICSharpCode.SharpZipLib.csproj" /></DocumentationSources>
<NamespaceSummaries>
<NamespaceSummaryItem name="(global)" isDocumented="False" xmlns="" />
<NamespaceSummaryItem name="ICSharpCode.SharpZipLib" isDocumented="True" xmlns="">The root namespace for this library.</NamespaceSummaryItem>
Expand All @@ -48,6 +48,15 @@
<KeepLogFile>True</KeepLogFile>
<DisableCodeBlockComponent>False</DisableCodeBlockComponent>
<CleanIntermediates>True</CleanIntermediates>
<HelpFileVersion>0.87.0.0</HelpFileVersion>
<MaximumGroupParts>2</MaximumGroupParts>
<NamespaceGrouping>False</NamespaceGrouping>
<SyntaxFilters>Standard</SyntaxFilters>
<SdkLinkTarget>Blank</SdkLinkTarget>
<RootNamespaceContainer>False</RootNamespaceContainer>
<Preliminary>False</Preliminary>
<NamingMethod>MemberName</NamingMethod>
<ContentPlacement>AboveNamespaces</ContentPlacement>
</PropertyGroup>
<!-- There are no properties for these groups. AnyCPU needs to appear in order for Visual Studio to perform
the build. The others are optional common platform types that may appear. -->
Expand Down
Loading

0 comments on commit 88e49b8

Please sign in to comment.