Skip to content

Commit 5392e57

Browse files
author
Remo Gloor
committed
Merge branch 'master' into zis_aes
2 parents b73aebc + b7bc4e0 commit 5392e57

File tree

102 files changed

+2826
-2797
lines changed

Some content is hidden

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

102 files changed

+2826
-2797
lines changed

‎.codacy.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
exclude_paths:
3+
- 'docs/**/*'

‎.editorconfig‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,7 @@ indent_size = 2
3333
end_of_line = lf
3434
[*.{cmd, bat}]
3535
end_of_line = crlf
36+
37+
[*.yml]
38+
indent_style = space
39+
indent_size = 2

‎.github/workflows/on-push.yml‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
name: Build master on push
2+
3+
env:
4+
PUBLISH_DEV_PACKS: disabled
5+
6+
on:
7+
push:
8+
branches: [ master ]
9+
release:
10+
11+
jobs:
12+
BuildAndTest:
13+
runs-on: ${{ matrix.os }}-latest
14+
strategy:
15+
fail-fast: false
16+
matrix:
17+
configuration: [debug, release]
18+
os: [ubuntu, windows, macos]
19+
libtarget: [netstandard2]
20+
testtarget: [netcoreapp3.1]
21+
include:
22+
- configuration: debug
23+
os: windows
24+
libtarget: net45
25+
testtarget: net45
26+
- configuration: release
27+
os: windows
28+
libtarget: net45
29+
testtarget: net45
30+
steps:
31+
- uses: actions/checkout@v2
32+
33+
- name: Setup .NET Core
34+
if: matrix.libtarget == 'netstandard2'
35+
uses: actions/setup-dotnet@v1
36+
with:
37+
dotnet-version: '3.1.x'
38+
39+
- name: Build library
40+
run: dotnet build -c ${{ matrix.configuration }} -f ${{ matrix.libtarget }} src/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.csproj
41+
42+
- name: Restore test dependencies
43+
run: dotnet restore
44+
45+
- name: Run tests
46+
run: dotnet test -c ${{ matrix.configuration }} -f ${{ matrix.testtarget }} --no-restore
47+
48+
Codacy-Analysis:
49+
runs-on: ubuntu-latest
50+
name: Codacy Analysis CLI
51+
steps:
52+
- name: Checkout code
53+
uses: actions/checkout@v2
54+
- name: Run codacy-analysis-cli
55+
uses: codacy/[email protected]
56+
with:
57+
# The current issues needs to be fixed before this can be removed
58+
max-allowed-issues: 9999
59+
project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
60+
upload: true
61+
62+
Package:
63+
needs: [BuildAndTest]
64+
runs-on: windows-latest
65+
env:
66+
NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
67+
68+
steps:
69+
- uses: actions/checkout@v2
70+
with:
71+
fetch-depth: 0
72+
73+
- name: Setup .NET Core
74+
uses: actions/setup-dotnet@v1
75+
with:
76+
dotnet-version: '3.1.x'
77+
source-url: https://nuget.pkg.github.com/icsharpcode/index.json
78+
79+
- name: Build and pack
80+
run: dotnet build -c Release -o dist /p:ContinuousIntegrationBuild=true /p:EmbedUntrackedSources=true /p:Version=$(git describe --abbrev | % { $_.substring(1) }) src/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.csproj
81+
82+
- name: Upload nuget package artifact
83+
uses: actions/upload-artifact@v2
84+
with:
85+
name: Nuget package
86+
path: dist/*.nupkg

‎.github/workflows/pull-request.yml‎

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
name: Build and Test PR
2+
3+
on:
4+
pull_request:
5+
branches: [ master ]
6+
7+
jobs:
8+
Build:
9+
runs-on: ${{ matrix.os }}-latest
10+
strategy:
11+
fail-fast: false
12+
matrix:
13+
configuration: [debug, release]
14+
os: [ubuntu, windows, macos]
15+
target: [netstandard2]
16+
include:
17+
- configuration: Debug
18+
os: windows
19+
target: net45
20+
- configuration: Release
21+
os: windows
22+
target: net45
23+
steps:
24+
- uses: actions/checkout@v2
25+
26+
- name: Setup .NET Core
27+
if: matrix.target == 'netstandard2'
28+
uses: actions/setup-dotnet@v1
29+
with:
30+
dotnet-version: '3.1.x'
31+
32+
- name: Build library
33+
run: dotnet build -c ${{ matrix.configuration }} -f ${{ matrix.target }} src/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.csproj
34+
35+
Test:
36+
runs-on: ${{ matrix.os }}-latest
37+
strategy:
38+
fail-fast: false
39+
matrix:
40+
configuration: [debug, release]
41+
os: [ubuntu, windows, macos]
42+
target: [netcoreapp3.1]
43+
include:
44+
- configuration: debug
45+
os: windows
46+
target: net45
47+
- configuration: release
48+
os: windows
49+
target: net45
50+
steps:
51+
- uses: actions/checkout@v2
52+
53+
- name: Setup .NET Core
54+
if: matrix.target == 'netcoreapp3.1'
55+
uses: actions/setup-dotnet@v1
56+
with:
57+
dotnet-version: '3.1.x'
58+
59+
- name: Restore test dependencies
60+
run: dotnet restore
61+
62+
- name: Run tests
63+
run: dotnet test -c ${{ matrix.configuration }} -f ${{ matrix.target }} --no-restore
64+
65+
Codacy-Analysis:
66+
runs-on: ubuntu-latest
67+
name: Codacy Analysis CLI
68+
steps:
69+
- name: Checkout code
70+
uses: actions/checkout@v2
71+
- name: Run codacy-analysis-cli
72+
uses: codacy/[email protected]
73+
with:
74+
# The current issues needs to be fixed before this can be removed
75+
max-allowed-issues: 9999
76+
project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
77+
upload: true
78+
79+
Pack:
80+
needs: [Build, Test]
81+
runs-on: windows-latest
82+
env:
83+
NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
84+
85+
steps:
86+
- uses: actions/checkout@v2
87+
with:
88+
fetch-depth: 0
89+
90+
- name: Setup .NET Core
91+
uses: actions/setup-dotnet@v1
92+
with:
93+
dotnet-version: '3.1.x'
94+
95+
- name: Build library for .NET Standard 2
96+
run: dotnet build -c Release -f netstandard2 src/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.csproj
97+
- name: Build library for .NET Framework 4.5
98+
run: dotnet build -c Release -f net45 src/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.csproj
99+
100+
- name: Create nuget package
101+
run: dotnet pack src/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.csproj --configuration Release --output dist /p:Version=$(git describe --abbrev | % { $_.substring(1) })-PR
102+
103+
- name: Upload nuget package artifact
104+
uses: actions/upload-artifact@v2
105+
with:
106+
name: Nuget package
107+
path: dist/*.nupkg

‎.github/workflows/release.yml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# Workflow to execute when a new version is released
2+
name: Release
3+
4+
on:
5+
release:
6+
7+
# Used for testing and manual execution
8+
workflow_dispatch:
9+
inputs:
10+
tag:
11+
description: 'Tag Ref'
12+
required: true
13+
14+
jobs:
15+
docfx:
16+
runs-on: ubuntu-latest
17+
name: Update DocFX documentation
18+
steps:
19+
- uses: actions/checkout@v2
20+
with:
21+
ref: ${{ github.events.inputs.tag }}
22+
- uses: nikeee/[email protected]
23+
name: Build Documentation
24+
with:
25+
args: docs/help/docfx.json
26+
27+
- uses: JamesIves/[email protected]
28+
name: Publish documentation to Github Pages
29+
with:
30+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
31+
BRANCH: gh-pages
32+
FOLDER: docs/help/_site
33+
TARGET_FOLDER: help
34+
CLEAN: false
35+
36+
- name: Upload documentation as artifact
37+
uses: actions/upload-artifact@v2
38+
with:
39+
path: docs/help/_site

‎README.md‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
# SharpZipLib [![Build status](https://ci.appveyor.com/api/projects/status/wuf8l79mypqsbor3/branch/master?svg=true)](https://ci.appveyor.com/project/icsharpcode/sharpziplib/branch/master) [![Join the chat at https://gitter.im/icsharpcode/SharpZipLib](https://badges.gitter.im/icsharpcode/SharpZipLib.svg)](https://gitter.im/icsharpcode/SharpZipLib?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
2-
3-
The SharpZipLib project is looking for a new maintainer - please read [State of the Union August 2017](https://github.com/icsharpcode/SharpZipLib/issues/187)
1+
# SharpZipLib [![Build status](https://ci.appveyor.com/api/projects/status/wuf8l79mypqsbor3/branch/master?svg=true)](https://ci.appveyor.com/project/icsharpcode/sharpziplib/branch/master) [![NuGet Version](https://img.shields.io/nuget/v/SharpZipLib.svg)](https://www.nuget.org/packages/SharpZipLib/)
42

53
Introduction
64
------------

‎SECURITY.md‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Security Policy
2+
3+
## Supported Versions
4+
5+
| Version | Supported |
6+
| ------- | ------------------ |
7+
| 1.3.x | :white_check_mark: |
8+
| 1.2.x | :white_check_mark: |
9+
| 1.1.x | :white_check_mark: |
10+
| 1.0.x | :white_check_mark: |
11+
| < 1.0 | :x: |
12+
13+
## Reporting a Vulnerability
14+
15+
Send an e-mail to [email protected]

‎appveyor.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
version: '{build}'
2-
image: Visual Studio 2017
2+
image: Visual Studio 2019
33
configuration:
44
- Debug
55
- Release
@@ -31,4 +31,4 @@ test_script:
3131
artifacts:
3232
- path: docs\help\_site
3333
type: zip
34-
name: Documentation
34+
name: Documentation

‎src/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.snk‎ renamed to ‎assets/ICSharpCode.SharpZipLib.snk‎

File renamed without changes.

‎assets/sharpziplib-nuget-256x256.png‎

5.31 KB
Loading

0 commit comments

Comments
 (0)