Skip to content

Commit f16ddaf

Browse files
author
Remo Gloor
committed
Merge branch 'master' of https://github.com/icsharpcode/SharpZipLib into zis_aes
# Conflicts: # src/ICSharpCode.SharpZipLib/Zip/ZipInputStream.cs
2 parents 460f067 + 5c4e4d3 commit f16ddaf

Some content is hidden

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

61 files changed

+921
-648
lines changed

‎.github/workflows/on-push.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
matrix:
1717
configuration: [debug, release]
1818
os: [ubuntu, windows, macos]
19-
libtarget: [netstandard2]
19+
libtarget: [netstandard2.0, netstandard2.1]
2020
testtarget: [netcoreapp3.1]
2121
include:
2222
- configuration: debug
@@ -31,7 +31,6 @@ jobs:
3131
- uses: actions/checkout@v2
3232

3333
- name: Setup .NET Core
34-
if: matrix.libtarget == 'netstandard2'
3534
uses: actions/setup-dotnet@v1
3635
with:
3736
dotnet-version: '3.1.x'

‎.github/workflows/pull-request.yml

+20-24
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@ jobs:
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
configuration: [debug, release]
1413
os: [ubuntu, windows, macos]
15-
target: [netstandard2]
14+
target: [netstandard2.0, netstandard2.1]
1615
include:
1716
- configuration: Debug
1817
os: windows
@@ -24,20 +23,21 @@ jobs:
2423
- uses: actions/checkout@v2
2524

2625
- name: Setup .NET Core
27-
if: matrix.target == 'netstandard2'
2826
uses: actions/setup-dotnet@v1
2927
with:
3028
dotnet-version: '3.1.x'
3129

32-
- name: Build library
33-
run: dotnet build -c ${{ matrix.configuration }} -f ${{ matrix.target }} src/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.csproj
30+
- name: Build library (Debug)
31+
run: dotnet build -c debug -f ${{ matrix.target }} src/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.csproj
32+
33+
- name: Build library (Release)
34+
run: dotnet build -c release -f ${{ matrix.target }} src/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.csproj
3435

3536
Test:
3637
runs-on: ${{ matrix.os }}-latest
3738
strategy:
3839
fail-fast: false
3940
matrix:
40-
configuration: [debug, release]
4141
os: [ubuntu, windows, macos]
4242
target: [netcoreapp3.1]
4343
include:
@@ -56,26 +56,20 @@ jobs:
5656
with:
5757
dotnet-version: '3.1.x'
5858

59+
# NOTE: This is the temporary fix for https://github.com/actions/virtual-environments/issues/1090
60+
- name: Cleanup before restore
61+
if: ${{ matrix.os == 'windows' }}
62+
run: dotnet clean ICSharpCode.SharpZipLib.sln && dotnet nuget locals all --clear
63+
5964
- name: Restore test dependencies
6065
run: dotnet restore
6166

62-
- name: Run tests
63-
run: dotnet test -c ${{ matrix.configuration }} -f ${{ matrix.target }} --no-restore
67+
- name: Run tests (Debug)
68+
run: dotnet test -c debug -f ${{ matrix.target }} --no-restore
6469

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-
70+
- name: Run tests (Release)
71+
run: dotnet test -c release -f ${{ matrix.target }} --no-restore
72+
7973
Pack:
8074
needs: [Build, Test]
8175
runs-on: windows-latest
@@ -92,8 +86,10 @@ jobs:
9286
with:
9387
dotnet-version: '3.1.x'
9488

95-
- name: Build library for .NET Standard 2
96-
run: dotnet build -c Release -f netstandard2 src/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.csproj
89+
- name: Build library for .NET Standard 2.0
90+
run: dotnet build -c Release -f netstandard2.0 src/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.csproj
91+
- name: Build library for .NET Standard 2.1
92+
run: dotnet build -c Release -f netstandard2.1 src/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.csproj
9793
- name: Build library for .NET Framework 4.5
9894
run: dotnet build -c Release -f net45 src/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.csproj
9995

‎.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ install:
1515
# - nuget restore ICSharpCode.SharpZipLib.sln
1616
# - nuget install NUnit.Console -Version 3.8.0 -OutputDirectory _testRunner
1717
script:
18-
- dotnet build -f netstandard2 src/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.csproj
18+
- dotnet build -f netstandard2.0 src/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.csproj
1919
- dotnet run -c Debug -f netcoreapp2 -p test/ICSharpCode.SharpZipLib.TestBootstrapper/ICSharpCode.SharpZipLib.TestBootstrapper.csproj -- --where "class !~ WindowsNameTransformHandling & test !~ ZipEntryFactoryHandling.CreatedValues & test !~ ZipNameTransformHandling.FilenameCleaning" --result=docs/nunit3-test-results-debug.xml
2020
- dotnet run -c Release -f netcoreapp2 -p test/ICSharpCode.SharpZipLib.TestBootstrapper/ICSharpCode.SharpZipLib.TestBootstrapper.csproj -- --where "class !~ WindowsNameTransformHandling & test !~ ZipEntryFactoryHandling.CreatedValues & test !~ ZipNameTransformHandling.FilenameCleaning" --result=docs\nunit3-test-results-release.xml
2121
# - dotnet test test/ICSharpCode.SharpZipLib.Tests/ICSharpCode.SharpZipLib.Tests.csproj
2222
# - xbuild /p:Configuration=Release ICSharpCode.SharpZipLib.sln
2323
# - mono ./packages/NUnit.ConsoleRunner.3.2.1/tools/nunit3-console.exe --framework=mono-4.0 --labels=All --result=./Documentation/nunit3-test-results-travis.xml ./bin/Release/ICSharpCode.SharpZipLib.Tests.dll
2424
after_script:
25-
- dotnet pack -f netstandard2 -o _dist/ src/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.csproj
25+
- dotnet pack -f netstandard2.0 -o _dist/ src/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.csproj
2626
#cache:
2727
# directories:
2828
# - bin

‎samples/ICSharpCode.SharpZipLib.Samples/cs/Cmd_BZip2/Cmd_BZip2.csproj

+6-5
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,6 @@ copy Cmd_BZip2.exe bunzip2.exe</PostBuildEvent>
8080
<FileAlignment>4096</FileAlignment>
8181
</PropertyGroup>
8282
<ItemGroup>
83-
<Reference Include="ICSharpCode.SharpZipLib, Version=1.3.0.8, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
84-
<HintPath>..\..\packages\SharpZipLib.1.3.0\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
85-
</Reference>
8683
<Reference Include="System" />
8784
</ItemGroup>
8885
<ItemGroup>
@@ -91,7 +88,6 @@ copy Cmd_BZip2.exe bunzip2.exe</PostBuildEvent>
9188
</ItemGroup>
9289
<ItemGroup>
9390
<None Include="app.config" />
94-
<None Include="packages.config" />
9591
</ItemGroup>
9692
<ItemGroup>
9793
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
@@ -103,5 +99,10 @@ copy Cmd_BZip2.exe bunzip2.exe</PostBuildEvent>
10399
<ItemGroup>
104100
<Content Include="readme.txt" />
105101
</ItemGroup>
102+
<ItemGroup>
103+
<PackageReference Include="SharpZipLib">
104+
<Version>1.3.1</Version>
105+
</PackageReference>
106+
</ItemGroup>
106107
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
107-
</Project>
108+
</Project>

‎samples/ICSharpCode.SharpZipLib.Samples/cs/Cmd_BZip2/packages.config

-4
This file was deleted.

‎samples/ICSharpCode.SharpZipLib.Samples/cs/Cmd_Checksum/Cmd_Checksum.csproj

+6-5
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,6 @@
7474
<RunCodeAnalysis>true</RunCodeAnalysis>
7575
</PropertyGroup>
7676
<ItemGroup>
77-
<Reference Include="ICSharpCode.SharpZipLib, Version=1.3.0.8, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
78-
<HintPath>..\..\packages\SharpZipLib.1.3.0\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
79-
</Reference>
8077
<Reference Include="System" />
8178
<Reference Include="System.ComponentModel.Composition" />
8279
<Reference Include="System.IO.Compression.FileSystem" />
@@ -90,7 +87,6 @@
9087
</ItemGroup>
9188
<ItemGroup>
9289
<None Include="app.config" />
93-
<None Include="packages.config" />
9490
</ItemGroup>
9591
<ItemGroup>
9692
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
@@ -102,5 +98,10 @@
10298
<ItemGroup>
10399
<Content Include="readme.txt" />
104100
</ItemGroup>
101+
<ItemGroup>
102+
<PackageReference Include="SharpZipLib">
103+
<Version>1.3.1</Version>
104+
</PackageReference>
105+
</ItemGroup>
105106
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
106-
</Project>
107+
</Project>

‎samples/ICSharpCode.SharpZipLib.Samples/cs/Cmd_Checksum/packages.config

-4
This file was deleted.

‎samples/ICSharpCode.SharpZipLib.Samples/cs/Cmd_GZip/Cmd_GZip.csproj

+6-5
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,6 @@ copy Cmd_GZip.exe gunzip.exe</PostBuildEvent>
7474
<RunCodeAnalysis>true</RunCodeAnalysis>
7575
</PropertyGroup>
7676
<ItemGroup>
77-
<Reference Include="ICSharpCode.SharpZipLib, Version=1.3.0.8, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
78-
<HintPath>..\..\packages\SharpZipLib.1.3.0\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
79-
</Reference>
8077
<Reference Include="System" />
8178
<Reference Include="System.ComponentModel.Composition" />
8279
<Reference Include="System.IO.Compression.FileSystem" />
@@ -90,7 +87,6 @@ copy Cmd_GZip.exe gunzip.exe</PostBuildEvent>
9087
</ItemGroup>
9188
<ItemGroup>
9289
<None Include="app.config" />
93-
<None Include="packages.config" />
9490
</ItemGroup>
9591
<ItemGroup>
9692
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
@@ -102,5 +98,10 @@ copy Cmd_GZip.exe gunzip.exe</PostBuildEvent>
10298
<ItemGroup>
10399
<Content Include="readme.txt" />
104100
</ItemGroup>
101+
<ItemGroup>
102+
<PackageReference Include="SharpZipLib">
103+
<Version>1.3.1</Version>
104+
</PackageReference>
105+
</ItemGroup>
105106
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
106-
</Project>
107+
</Project>

‎samples/ICSharpCode.SharpZipLib.Samples/cs/Cmd_GZip/packages.config

-4
This file was deleted.

‎samples/ICSharpCode.SharpZipLib.Samples/cs/Cmd_Tar/Cmd_Tar.csproj

+6-5
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,6 @@
6666
<StartupObject>Cmd_Tar</StartupObject>
6767
</PropertyGroup>
6868
<ItemGroup>
69-
<Reference Include="ICSharpCode.SharpZipLib, Version=1.3.0.8, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
70-
<HintPath>..\..\packages\SharpZipLib.1.3.0\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
71-
</Reference>
7269
<Reference Include="System" />
7370
<Reference Include="System.ComponentModel.Composition" />
7471
<Reference Include="System.Core" />
@@ -84,7 +81,6 @@
8481
</ItemGroup>
8582
<ItemGroup>
8683
<None Include="app.config" />
87-
<None Include="packages.config" />
8884
</ItemGroup>
8985
<ItemGroup>
9086
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
@@ -93,8 +89,13 @@
9389
<Install>true</Install>
9490
</BootstrapperPackage>
9591
</ItemGroup>
92+
<ItemGroup>
93+
<PackageReference Include="SharpZipLib">
94+
<Version>1.3.1</Version>
95+
</PackageReference>
96+
</ItemGroup>
9697
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
9798
<ProjectExtensions>
9899
<VisualStudio AllowExistingFolder="true" />
99100
</ProjectExtensions>
100-
</Project>
101+
</Project>

‎samples/ICSharpCode.SharpZipLib.Samples/cs/Cmd_Tar/packages.config

-4
This file was deleted.

‎samples/ICSharpCode.SharpZipLib.Samples/cs/Cmd_ZipInfo/Cmd_ZipInfo.csproj

+6-5
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,6 @@
7373
<RunCodeAnalysis>true</RunCodeAnalysis>
7474
</PropertyGroup>
7575
<ItemGroup>
76-
<Reference Include="ICSharpCode.SharpZipLib, Version=1.3.0.8, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
77-
<HintPath>..\..\packages\SharpZipLib.1.3.0\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
78-
</Reference>
7976
<Reference Include="System" />
8077
<Reference Include="System.ComponentModel.Composition" />
8178
<Reference Include="System.IO.Compression.FileSystem" />
@@ -89,7 +86,6 @@
8986
</ItemGroup>
9087
<ItemGroup>
9188
<None Include="app.config" />
92-
<None Include="packages.config" />
9389
</ItemGroup>
9490
<ItemGroup>
9591
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
@@ -101,5 +97,10 @@
10197
<ItemGroup>
10298
<Content Include="readme.txt" />
10399
</ItemGroup>
100+
<ItemGroup>
101+
<PackageReference Include="SharpZipLib">
102+
<Version>1.3.1</Version>
103+
</PackageReference>
104+
</ItemGroup>
104105
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
105-
</Project>
106+
</Project>

‎samples/ICSharpCode.SharpZipLib.Samples/cs/Cmd_ZipInfo/packages.config

-4
This file was deleted.

‎samples/ICSharpCode.SharpZipLib.Samples/cs/CreateZipFile/CreateZipFile.csproj

+6-5
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,6 @@
8181
</DefineConstants>
8282
</PropertyGroup>
8383
<ItemGroup>
84-
<Reference Include="ICSharpCode.SharpZipLib, Version=1.3.0.8, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
85-
<HintPath>..\..\packages\SharpZipLib.1.3.0\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
86-
</Reference>
8784
<Reference Include="System" />
8885
<Reference Include="System.ComponentModel.Composition" />
8986
<Reference Include="System.IO.Compression.FileSystem" />
@@ -97,7 +94,6 @@
9794
</ItemGroup>
9895
<ItemGroup>
9996
<None Include="app.config" />
100-
<None Include="packages.config" />
10197
</ItemGroup>
10298
<ItemGroup>
10399
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
@@ -109,5 +105,10 @@
109105
<ItemGroup>
110106
<Content Include="readme.txt" />
111107
</ItemGroup>
108+
<ItemGroup>
109+
<PackageReference Include="SharpZipLib">
110+
<Version>1.3.1</Version>
111+
</PackageReference>
112+
</ItemGroup>
112113
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
113-
</Project>
114+
</Project>

‎samples/ICSharpCode.SharpZipLib.Samples/cs/CreateZipFile/packages.config

-4
This file was deleted.

‎samples/ICSharpCode.SharpZipLib.Samples/cs/FastZip/FastZip.csproj

+6-2
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@
8080
</ItemGroup>
8181
<ItemGroup>
8282
<None Include="app.config" />
83-
<None Include="packages.config" />
8483
</ItemGroup>
8584
<ItemGroup>
8685
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
@@ -89,5 +88,10 @@
8988
<Install>true</Install>
9089
</BootstrapperPackage>
9190
</ItemGroup>
91+
<ItemGroup>
92+
<PackageReference Include="SharpZipLib">
93+
<Version>1.3.1</Version>
94+
</PackageReference>
95+
</ItemGroup>
9296
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
93-
</Project>
97+
</Project>

‎samples/ICSharpCode.SharpZipLib.Samples/cs/FastZip/packages.config

-4
This file was deleted.

‎samples/ICSharpCode.SharpZipLib.Samples/cs/sz/packages.config

-4
This file was deleted.

0 commit comments

Comments
 (0)