Skip to content

Commit 88e49b8

Browse files
McNeightMcNeight
committed
Merge branch 'master' of https://github.com/McNeight/SharpZipLib into McNeight-master
# Conflicts: # ICSharpCode.SharpZipLib/Tar/TarHeader.cs # ICSharpCode.SharpZipLib/Tar/TarOutputStream.cs # README.md
1 parent 3fd4516 commit 88e49b8

File tree

328 files changed

+124411
-10927
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

328 files changed

+124411
-10927
lines changed

‎.editorconfig

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# editorconfig.org
2+
3+
# top-most EditorConfig file
4+
root = true
5+
6+
# Default settings:
7+
# A newline ending every file
8+
# Use 4 spaces as indentation
9+
[*]
10+
insert_final_newline = true
11+
indent_style = tab
12+
indent_size = 4
13+
14+
# C++ Files
15+
[*.{cpp,h,in}]
16+
curly_bracket_next_line = true
17+
indent_brace_style = Allman
18+
19+
# Xml project files
20+
[*.{csproj,vcxproj,vcxproj.filters,proj,nativeproj,locproj}]
21+
indent_size = 2
22+
23+
# Xml files
24+
[*.{xml,stylecop,resx,ruleset}]
25+
indent_size = 2
26+
27+
# Xml config files
28+
[*.{props,targets,config,nuspec}]
29+
indent_size = 2
30+
31+
# Shell scripts
32+
[*.sh]
33+
end_of_line = lf
34+
[*.{cmd, bat}]
35+
end_of_line = crlf

‎.gitattributes

+67
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
###############################################################################
2+
# Set default behavior to automatically normalize line endings.
3+
###############################################################################
4+
* text=auto
5+
6+
###############################################################################
7+
# Set default behavior for command prompt diff.
8+
#
9+
# This is need for earlier builds of msysgit that does not have it on by
10+
# default for csharp files.
11+
# Note: This is only used by command line
12+
###############################################################################
13+
#*.cs diff=csharp
14+
15+
###############################################################################
16+
# Set the merge driver for project and solution files
17+
#
18+
# Merging from the command prompt will add diff markers to the files if there
19+
# are conflicts (Merging from VS is not affected by the settings below, in VS
20+
# the diff markers are never inserted). Diff markers may cause the following
21+
# file extensions to fail to load in VS. An alternative would be to treat
22+
# these files as binary and thus will always conflict and require user
23+
# intervention with every merge. To do so, just uncomment the entries below
24+
###############################################################################
25+
#*.sln merge=binary
26+
#*.csproj merge=binary
27+
#*.vbproj merge=binary
28+
#*.vcxproj merge=binary
29+
#*.vcproj merge=binary
30+
#*.dbproj merge=binary
31+
#*.fsproj merge=binary
32+
#*.lsproj merge=binary
33+
#*.wixproj merge=binary
34+
#*.modelproj merge=binary
35+
#*.sqlproj merge=binary
36+
#*.wwaproj merge=binary
37+
38+
###############################################################################
39+
# behavior for image files
40+
#
41+
# image files are treated as binary by default.
42+
###############################################################################
43+
#*.jpg binary
44+
#*.png binary
45+
#*.gif binary
46+
47+
###############################################################################
48+
# diff behavior for common document formats
49+
#
50+
# Convert binary document formats to text before diffing them. This feature
51+
# is only available from the command line. Turn it on by uncommenting the
52+
# entries below.
53+
###############################################################################
54+
#*.doc diff=astextplain
55+
#*.DOC diff=astextplain
56+
#*.docx diff=astextplain
57+
#*.DOCX diff=astextplain
58+
#*.dot diff=astextplain
59+
#*.DOT diff=astextplain
60+
#*.pdf diff=astextplain
61+
#*.PDF diff=astextplain
62+
#*.rtf diff=astextplain
63+
#*.RTF diff=astextplain
64+
65+
# Force bash scripts to always use lf line endings so that if a repo is accessed
66+
# in Unix via a file share from Windows, the scripts will work.
67+
*.sh text eol=lf

‎Documentation/CONTRIBUTING.md renamed to ‎.github/CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Thanks for helping to improve SharpZipLib.
44

55
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:
66

7-
_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._
7+
_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._
88

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

‎.github/ISSUE_TEMPLATE.md

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
### Steps to reproduce
2+
1.
3+
2.
4+
3.
5+
6+
### Expected behavior
7+
Tell us what should happen
8+
9+
### Actual behavior
10+
Tell us what happens instead
11+
12+
### Version of SharpZipLib
13+
14+
### Obtained from (place an x between the brackets for all that apply)
15+
- [ ] Compiled from source
16+
- branch: _______
17+
- commit: _______
18+
- [ ] Downloaded DLL from GitHub
19+
- [ ] Downloaded DLL from SourceForge
20+
- [ ] Downloaded DLL from _______
21+
- [ ] DLL included as part of
22+
- Package installed using:
23+
- [ ] NuGet
24+
- [ ] MyGet
25+
- [ ] Chocolatey

‎.github/PULL_REQUEST_TEMPLATE.md

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<!---
2+
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.
3+
-->
4+
_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._

‎.travis.yml

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
language: csharp
22
mono:
33
- latest
4-
- 3.12.0
5-
- 2.10.8
4+
os:
5+
- linux
6+
- osx
67
solution: ICSharpCode.SharpZipLib.sln
7-
#install:
8-
# - nuget restore ICSharpCode.SharpZipLib.sln
9-
# - nuget install NUnit.Runners -Version 2.6.4 -OutputDirectory testrunner
8+
install:
9+
- nuget restore ICSharpCode.SharpZipLib.sln
10+
# - nuget install NUnit.ConsoleRunner -Version 3.2.0 -OutputDirectory testrunner
1011
script:
1112
- xbuild /p:Configuration=Debug ICSharpCode.SharpZipLib.sln
1213
- xbuild /p:Configuration=Release ICSharpCode.SharpZipLib.sln
13-
# - mono ./testrunner/NUnit.Runners.2.6.4/tools/nunit-console.exe ./ICSharpCode.SharpZipLib.Tests/bin/Release/ICSharpCode.SharpZipLib.Tests.dll
14+
- 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

‎Build/ICSharpCode.SharpZipLib.nuspec

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0"?>
2+
<package>
3+
<metadata>
4+
<id>ICSharpCode.SharpZipLib</id>
5+
<version>1.0.0</version>
6+
<title>SharpZipLib</title>
7+
<authors>IC#Code</authors>
8+
<owners>IC#Code</owners>
9+
<licenseUrl>https://visualstudiogallery.msdn.microsoft.com/site/68c1575b-e0bf-420d-a94b-1b0f4bcdcbcc/eula?licenseType=None</licenseUrl>
10+
<projectUrl>http://icsharpcode.github.io/SharpZipLib/</projectUrl>
11+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
12+
<description>Compression library for Zip, GZip, BZip2, LZW, and Tar written entirely in C# for the .NET platform.</description>
13+
<releaseNotes>Please see https://github.com/icsharpcode/SharpZipLib/wiki/Release-1.0 for more information.</releaseNotes>
14+
<copyright>Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team</copyright>
15+
<tags>Compression Library Zip Gzip BZip2 LZW Tar</tags>
16+
<dependencies>
17+
<dependency id="System" version="1.0.0" />
18+
</dependencies>
19+
</metadata>
20+
<files>
21+
<file src="ICSharpCode.SharpZipLib.dll" target="lib\Net45\" />
22+
<file src="ICSharpCode.SharpZipLib.dll" target="lib\dnx451\" />
23+
<file src="ICSharpCode.SharpZipLib.dll" target="lib\dnxcore50\" />
24+
</files>
25+
</package>

‎Build/ICSharpCode.SharpZipLib.version

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
nuget_version=1.0.0
2+
full_version=1.0.0.0
3+
release_notes_link=https://github.com/icsharpcode/SharpZipLib/wiki/Release-1.0/
4+
copyright=Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team

‎Build/install-fxmicroframework-43-44.ps1

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
Write-Host "Installing .NET MicroFramework 4.3 ..."
2+
$msiPath = "$($env:USERPROFILE)\MicroFrameworkSDK43.MSI"
3+
(New-Object Net.WebClient).DownloadFile('http://download-codeplex.sec.s-msft.com/Download/Release?ProjectName=netmf&DownloadId=1423116&FileTime=130667921437670000&Build=21031', $msiPath)
4+
cmd /c start /wait msiexec /i $msiPath /quiet
5+
Write-Host "Installed" -ForegroundColor green
6+
7+
Write-Host "Installing .NET MicroFramework 4.4 ..."
8+
$msiPath = "$($env:USERPROFILE)\MicroFrameworkSDK44.MSI"
9+
(New-Object Net.WebClient).DownloadFile('https://github.com/NETMF/netmf-interpreter/releases/download/v4.4-RTW-20-Oct-2015/MicroFrameworkSDK.MSI', $msiPath)
10+
cmd /c start /wait msiexec /i $msiPath /quiet
11+
Write-Host "Installed" -ForegroundColor green

‎Build/run-nunit3-tests-debug.cmd

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
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

‎Build/run-nunit3-tests-release.cmd

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
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

‎Build/run-opencover.cmd

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
..\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
2+
..\packages\ReportGenerator.2.4.4.0\tools\ReportGenerator.exe -reports:..\Documentation\opencover-results-release.xml -targetdir:..\Documentation\opencover

‎CONTRIBUTING.md

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Contributing to SharpZipLib
2+
3+
Thanks for helping to improve SharpZipLib.
4+
5+
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:
6+
7+
_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._
8+
9+
Unless we have a Joint Copyright Agreement on file or this statement is in your pull request, we cannot accept it.
10+
11+
More information is available on [joining the team](https://github.com/icsharpcode/SharpDevelop/wiki/Joining-the-Team).

‎Documentation/SharpZipLib.chm

1.21 MB
Binary file not shown.

‎Documentation/SharpZipLib.msha

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<html xmlns="http://www.w3.org/1999/xhtml">
2+
<head>
3+
<title>ICSharpCode.SharpZipLib Compression Library</title>
4+
</head>
5+
<body class="vendor-book">
6+
<div class="details">
7+
<span class="vendor">Vendor Name</span>
8+
<span class="locale">en-us</span>
9+
<span class="product">ICSharpCode.SharpZipLib Compression Library</span>
10+
<span class="name">ICSharpCode.SharpZipLib Compression Library</span>
11+
</div>
12+
<div class="package-list">
13+
<div class="package">
14+
<!-- NOTE: The "name" span value cannot contain any periods! -->
15+
<span class="name">SharpZipLib</span>
16+
<a class="current-link" href="SharpZipLib.mshc">SharpZipLib.mshc</a>
17+
</div>
18+
</div>
19+
</body>
20+
</html>

‎Documentation/SharpZipLib.mshc

2.93 MB
Binary file not shown.

‎Documentation/SharpZipLib_VS2013.shfbproj

+12-3
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@
1818
<HtmlHelpName>SharpZipLib</HtmlHelpName>
1919
<Language>en-US</Language>
2020
<ProjectSummary>#ziplib compression library</ProjectSummary>
21-
<MissingTags>Summary, Parameter, Returns, AutoDocumentCtors, Namespace, TypeParameter</MissingTags>
21+
<MissingTags>Summary, Parameter, Returns, Value, Remarks, AutoDocumentCtors, Namespace, TypeParameter, IncludeTargets, AutoDocumentDispose</MissingTags>
2222
<VisibleItems>InheritedMembers, InheritedFrameworkMembers, Protected, SealedProtected</VisibleItems>
2323
<HtmlHelp1xCompilerPath />
2424
<WorkingPath />
2525
<HelpTitle>ICSharpCode.SharpZipLib Compression Library</HelpTitle>
2626
<PresentationStyle>VS2013</PresentationStyle>
2727
<DocumentationSources>
2828
<DocumentationSource sourceFile="..\bin\ICSharpCode.SharpZipLib.dll" />
29-
<DocumentationSource sourceFile="..\bin\ICSharpCode.SharpZipLib.XML" />
30-
</DocumentationSources>
29+
<DocumentationSource sourceFile="..\bin\ICSharpCode.SharpZipLib.XML" />
30+
<DocumentationSource sourceFile="..\ICSharpCode.SharpZipLib\ICSharpCode.SharpZipLib.csproj" /></DocumentationSources>
3131
<NamespaceSummaries>
3232
<NamespaceSummaryItem name="(global)" isDocumented="False" xmlns="" />
3333
<NamespaceSummaryItem name="ICSharpCode.SharpZipLib" isDocumented="True" xmlns="">The root namespace for this library.</NamespaceSummaryItem>
@@ -48,6 +48,15 @@
4848
<KeepLogFile>True</KeepLogFile>
4949
<DisableCodeBlockComponent>False</DisableCodeBlockComponent>
5050
<CleanIntermediates>True</CleanIntermediates>
51+
<HelpFileVersion>0.87.0.0</HelpFileVersion>
52+
<MaximumGroupParts>2</MaximumGroupParts>
53+
<NamespaceGrouping>False</NamespaceGrouping>
54+
<SyntaxFilters>Standard</SyntaxFilters>
55+
<SdkLinkTarget>Blank</SdkLinkTarget>
56+
<RootNamespaceContainer>False</RootNamespaceContainer>
57+
<Preliminary>False</Preliminary>
58+
<NamingMethod>MemberName</NamingMethod>
59+
<ContentPlacement>AboveNamespaces</ContentPlacement>
5160
</PropertyGroup>
5261
<!-- There are no properties for these groups. AnyCPU needs to appear in order for Visual Studio to perform
5362
the build. The others are optional common platform types that may appear. -->

0 commit comments

Comments
 (0)