Skip to content

Commit

Permalink
Merge branch 'icsharpcode/master' into ebg/master
Browse files Browse the repository at this point in the history
* icsharpcode/master: (168 commits)
  Update readme with State of the Union August 2017 link + looking for new maintainer
  -alpha2 preview package with latest fixes from @siegfriedpammer
  Remove metrics
  Fix icsharpcode#13 - TAR does not have enough EOF blocks
  [BZip2] Enforce baseStream to be non-null in BZip2InputStream and BZip2OutputStream (constructor now throws an ArgumentNullException).
  fix icsharpcode#11 - BZip2InputStream CanSeek should be false
  Minimal build server is back online (only build & run unit tests)
  For testing purposes, rename appveyor.yml
  Minimal text to direct developers to either generated API documentation, Wiki or other important URLs.
  Help building instructions (intentionally atm not checking in api/*.yml)
  Fix all warnings
  Fix XML comment warnings
  "docfx metadata" currently failing
  docfx init -q
  Switch samples from source reference to Nuget package reference (currently alpha1)
  Remove old SHFB-generated help file (.chm)
  Enable Nuget package generation as well as Xml doc gen
  Zip: Move tests to separate files
  Disable PasswordCheckingWithDateInExtraData test
  Disable ReadingOfLockedDataFiles test
  ...

# Conflicts:
#	.gitignore
#	README.md
#	src/ICSharpCode.SharpZLib.csproj
#	src/ICSharpCode.SharpZipLib/Zip/ZipFile.cs
  • Loading branch information
mo ko committed Dec 24, 2017
2 parents fffe201 + 4ad264b commit 577d6e9
Show file tree
Hide file tree
Showing 551 changed files with 145,453 additions and 31,262 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
11 changes: 11 additions & 0 deletions .github/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).
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._
Loading

0 comments on commit 577d6e9

Please sign in to comment.