Skip to content

Commit 3ec77d6

Browse files
squid-boxsquid-box
committed
Fixed some issues related to GitHub Actions migration.
1 parent 9868d31 commit 3ec77d6

9 files changed

+106
-85
lines changed

‎.github/workflows/deploy.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
branches: [ "master" ]
44

55
env:
6-
VERSION: '1.5.1.${{ github.run_number }}'
6+
VERSION: '1.5.2.${{ github.run_number }}'
77

88
jobs:
99
build:
@@ -23,13 +23,13 @@ jobs:
2323

2424
- name: Compile solution
2525
run: |
26-
dotnet build -c Release /p:AssemblyVersion=$env:VERSION /p:Version=$env:VERSION
27-
dotnet build -c LiteRelease /p:AssemblyVersion=$env:VERSION /p:Version=$env:VERSION
26+
dotnet build -c Release /p:AssemblyVersion=${{ env.VERSION }} /p:Version=${{ env.VERSION }}
27+
dotnet build -c LiteRelease /p:AssemblyVersion=${{ env.VERSION }} /p:Version=${{ env.VERSION }}
2828
2929
- name: Pack NuGets
3030
run: |
31-
nuget pack package.regular.nuspec -version $env:VERSION
32-
nuget pack package.lite.nuspec -version $env:VERSION
31+
nuget pack package.regular.nuspec -version ${{ env.VERSION }}
32+
nuget pack package.lite.nuspec -version ${{ env.VERSION }}
3333
3434
- name: Push NuGet packages
3535
run: nuget push Squid-Box.SevenZipSharp*.nupkg -ApiKey ${{ secrets.NUGET_API_KEY }} -Source https://api.nuget.org/v3/index.json

‎SevenZip/COM.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System.Globalization;
66
using System.IO;
77
using System.Runtime.InteropServices;
8-
#if NET45 || NETSTANDARD2_0
8+
#if NET472 || NETSTANDARD2_0
99
using System.Security.Permissions;
1010
#endif
1111
using FILETIME = System.Runtime.InteropServices.ComTypes.FILETIME;
@@ -122,7 +122,7 @@ public object Object
122122
{
123123
get
124124
{
125-
#if NET45 || NETSTANDARD2_0
125+
#if NET472 || NETSTANDARD2_0
126126
var sp = new SecurityPermission(SecurityPermissionFlag.UnmanagedCode);
127127
sp.Demand();
128128
#endif

‎SevenZip/LibraryManager.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ namespace SevenZip
44
using System.Collections.Generic;
55
using System.Configuration;
66
using System.Diagnostics;
7-
#if NET45 || NETSTANDARD2_0
7+
#if NET472 || NETSTANDARD2_0
88
using System.Security.Permissions;
99
#endif
1010
using System.IO;
@@ -345,7 +345,7 @@ public static LibraryFeature CurrentLibraryFeatures
345345
/// <param name="format">Archive format</param>
346346
public static void FreeLibrary(object user, Enum format)
347347
{
348-
#if NET45 || NETSTANDARD2_0
348+
#if NET472 || NETSTANDARD2_0
349349
var sp = new SecurityPermission(SecurityPermissionFlag.UnmanagedCode);
350350
sp.Demand();
351351
#endif
@@ -423,7 +423,7 @@ public static IInArchive InArchive(InArchiveFormat format, object user)
423423
{
424424
if (_inArchives[user][format] == null)
425425
{
426-
#if NET45 || NETSTANDARD2_0
426+
#if NET472 || NETSTANDARD2_0
427427
var sp = new SecurityPermission(SecurityPermissionFlag.UnmanagedCode);
428428
sp.Demand();
429429
#endif
@@ -480,7 +480,7 @@ public static IOutArchive OutArchive(OutArchiveFormat format, object user)
480480
{
481481
if (_outArchives[user][format] == null)
482482
{
483-
#if NET45 || NETSTANDARD2_0
483+
#if NET472 || NETSTANDARD2_0
484484
var sp = new SecurityPermission(SecurityPermissionFlag.UnmanagedCode);
485485
sp.Demand();
486486
#endif

‎SevenZip/SevenZip.csproj

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<AssemblyName>SevenZipSharp</AssemblyName>
4-
<TargetFrameworks>netstandard2.0;net472;net6.0-windows</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net472;netcoreapp3.1</TargetFrameworks>
55
<SignAssembly>true</SignAssembly>
66
<AssemblyOriginatorKeyFile>SevenZip.snk</AssemblyOriginatorKeyFile>
77
<AssemblyTitle>SevenZipSharp</AssemblyTitle>
88
<Company>Markovtsev Vadim</Company>
99
<Product>SevenZipSharp</Product>
10-
<ProductVersion>1.0.0.0</ProductVersion>
11-
<AssemblyVersion>1.0.0.0</AssemblyVersion>
12-
<FileVersion>1.0.0.0</FileVersion>
13-
<InformationalVersion>1.0.0.0</InformationalVersion>
1410
<Description>7-zip native library wrapper</Description>
1511
<Copyright>Copyright (C) Markovtsev Vadim 2009, 2010, licensed under LGPLv3</Copyright>
1612
<IntermediateOutputPath>..\Stage\obj\$(Configuration)\</IntermediateOutputPath>
@@ -76,11 +72,11 @@
7672
<EmbeddedResource Include="arch\Test.zip" />
7773
</ItemGroup>
7874
<ItemGroup>
79-
<PackageReference Condition="'$(TargetFramework)' != 'net45'" Include="System.Configuration.ConfigurationManager" Version="4.5.0" />
75+
<PackageReference Condition="'$(TargetFramework)' != 'net472'" Include="System.Configuration.ConfigurationManager" Version="4.5.0" />
8076
<PackageReference Condition="'$(TargetFramework)' == 'netstandard2.0'" Include="System.Security.Permissions" Version="4.5.0" />
8177
</ItemGroup>
8278
<ItemGroup>
83-
<Reference Include="System.Configuration" Condition="'$(TargetFramework)' == 'net45'">
79+
<Reference Include="System.Configuration" Condition="'$(TargetFramework)' == 'net472'">
8480
<HintPath>C:\Windows\Microsoft.NET\assembly\GAC_MSIL\System.Configuration\v4.0_4.0.0.0__b03f5f7f11d50a3a\System.Configuration.dll</HintPath>
8581
</Reference>
8682
</ItemGroup>

‎SevenZip/SevenZipCompressor.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace SevenZip
66
using System.IO;
77
using System.Linq;
88
using System.Runtime.InteropServices;
9-
#if NET45 || NETSTANDARD2_0
9+
#if NET472 || NETSTANDARD2_0
1010
using System.Security.Permissions;
1111
#endif
1212

@@ -311,8 +311,8 @@ private void SetCompressionProperties()
311311
var names = new List<IntPtr>(2 + CustomParameters.Count);
312312
var values = new List<PropVariant>(2 + CustomParameters.Count);
313313

314-
#if NET45 || NETSTANDARD2_0
315-
var sp = new SecurityPermission(SecurityPermissionFlag.UnmanagedCode);
314+
#if NET472 || NETSTANDARD2_0
315+
var sp = new SecurityPermission(SecurityPermissionFlag.UnmanagedCode);
316316
sp.Demand();
317317
#endif
318318

‎changelog.md

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
# Changelog
22

3-
## 1.5.0 (2021-05-xx)
4-
- Added .NET 5.0 (Windows only) variant.
3+
## 1.5.2 (2023-03-22)
4+
- Fixed an issue when seeking in streams with SeekOrigin.End, thanks to GitHub user bneidhold.
5+
- Fixed an issue when checking multi-volume 7z archives, thanks to GitHub user panda73111.
6+
- Changed CI from AppVeyor to GitHub Actions.
7+
- .NET Framework version bumped from 4.5 to 4.7.2.
8+
9+
## 1.5.0 (2021-08-15)
510
- Added separate NuGet (Lite) excluding creation of self-extracting archives.
611

712
## 1.4.0 (2021-04-12)

‎package.lite.nuspec

+39-30
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,42 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
3-
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
4-
<id>Squid-Box.SevenZipSharp.Lite</id>
5-
<version>1.0.0</version>
6-
<authors>Joel Ahlgren</authors>
7-
<summary>Managed 7-zip library written in C# that provides data extraction and compression (all 7-zip formats are supported).</summary>
8-
<description>Wraps 7z.dll or any compatible one and makes use of LZMA SDK. Excludes creation of self-extracting executables, reducing file size.</description>
9-
<language>en-US</language>
10-
<license type="expression">LGPL-3.0-only</license>
11-
<projectUrl>https://github.com/squid-box/SevenZipSharp</projectUrl>
12-
<tags>7z sevenzip sevenzipsharp 7-zip</tags>
13-
<dependencies>
14-
<group targetFramework="net472" />
15-
<group targetFramework="netstandard2.0">
16-
<dependency id="System.Configuration.ConfigurationManager" version="4.5.0" />
17-
<dependency id="System.Security.Permissions" version="4.5.0" />
18-
</group>
19-
<group targetFramework="net6.0">
20-
<dependency id="System.Configuration.ConfigurationManager" version="4.5.0" />
21-
</group>
22-
</dependencies>
23-
</metadata>
24-
<files>
25-
<file src="Stage\LiteRelease\netstandard2.0\SevenZipSharp.dll" target="lib\netstandard2.0" />
26-
<file src="Stage\LiteRelease\netstandard2.0\SevenZipSharp.xml" target="lib\netstandard2.0" />
27-
<file src="Stage\LiteRelease\net6.0\SevenZipSharp.dll" target="lib\net6.0" />
28-
<file src="Stage\LiteRelease\net6.0\SevenZipSharp.xml" target="lib\net6.0" />
29-
<file src="Stage\LiteRelease\net472\SevenZipSharp.dll" target="lib\net472" />
30-
<file src="Stage\LiteRelease\net472\SevenZipSharp.xml" target="lib\net472" />
31-
<file src="license" />
32-
</files>
3+
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
4+
<id>Squid-Box.SevenZipSharp.Lite</id>
5+
<version>1.0.0</version>
6+
<authors>Joel Ahlgren</authors>
7+
<summary>Managed 7-zip library written in C# that provides data extraction and compression (all 7-zip formats are supported).</summary>
8+
<description>Wraps 7z.dll or any compatible one and makes use of LZMA SDK. Excludes creation of self-extracting executables, reducing file size.</description>
9+
<readme>docs\readme.md</readme>
10+
<language>en-US</language>
11+
<license type="expression">LGPL-3.0-only</license>
12+
<projectUrl>https://github.com/squid-box/SevenZipSharp</projectUrl>
13+
<tags>7z sevenzip sevenzipsharp 7-zip</tags>
14+
<releaseNotes>
15+
Fixed an issue when seeking in streams with SeekOrigin.End, thanks to GitHub user bneidhold.
16+
Fixed an issue when checking multi-volume 7z archives, thanks to GitHub user panda73111.
17+
</releaseNotes>
18+
<dependencies>
19+
<group targetFramework="netstandard2.0">
20+
<dependency id="System.Configuration.ConfigurationManager" version="4.5.0" />
21+
<dependency id="System.Security.Permissions" version="4.5.0" />
22+
</group>
23+
<group targetFramework="net472" />
24+
<group targetFramework="netcoreapp3.1">
25+
<dependency id="System.Configuration.ConfigurationManager" version="4.5.0" />
26+
</group>
27+
</dependencies>
28+
</metadata>
29+
<files>
30+
<file src="Stage\LiteRelease\netstandard2.0\SevenZipSharp.dll" target="lib\netstandard2.0" />
31+
<file src="Stage\LiteRelease\netstandard2.0\SevenZipSharp.xml" target="lib\netstandard2.0" />
32+
<file src="Stage\LiteRelease\netstandard2.0\SevenZipSharp.pdb" target="lib\netstandard2.0" />
33+
<file src="Stage\LiteRelease\net472\SevenZipSharp.dll" target="lib\net472" />
34+
<file src="Stage\LiteRelease\net472\SevenZipSharp.xml" target="lib\net472" />
35+
<file src="Stage\LiteRelease\net472\SevenZipSharp.pdb" target="lib\net472" />
36+
<file src="Stage\LiteRelease\netcoreapp3.1\SevenZipSharp.dll" target="lib\netcoreapp3.1" />
37+
<file src="Stage\LiteRelease\netcoreapp3.1\SevenZipSharp.xml" target="lib\netcoreapp3.1" />
38+
<file src="Stage\LiteRelease\netcoreapp3.1\SevenZipSharp.pdb" target="lib\netcoreapp3.1" />
39+
<file src="license" />
40+
<file src="readme.md" target="docs\" />
41+
</files>
3342
</package>

‎package.regular.nuspec

+39-30
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,42 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
3-
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
4-
<id>Squid-Box.SevenZipSharp</id>
5-
<version>1.0.0</version>
6-
<authors>Joel Ahlgren</authors>
7-
<summary>Managed 7-zip library written in C# that provides data (self-)extraction and compression (all 7-zip formats are supported).</summary>
8-
<description>Wraps 7z.dll or any compatible one and makes use of LZMA SDK, includes self-extraction functionality.</description>
9-
<language>en-US</language>
10-
<license type="expression">LGPL-3.0-only</license>
11-
<projectUrl>https://github.com/squid-box/SevenZipSharp</projectUrl>
12-
<tags>7z sevenzip sevenzipsharp 7-zip</tags>
13-
<dependencies>
14-
<group targetFramework="net472" />
15-
<group targetFramework="netstandard2.0">
16-
<dependency id="System.Configuration.ConfigurationManager" version="4.5.0" />
17-
<dependency id="System.Security.Permissions" version="4.5.0" />
18-
</group>
19-
<group targetFramework="net6.0">
20-
<dependency id="System.Configuration.ConfigurationManager" version="4.5.0" />
21-
</group>
22-
</dependencies>
23-
</metadata>
24-
<files>
25-
<file src="Stage\Release\netstandard2.0\SevenZipSharp.dll" target="lib\netstandard2.0" />
26-
<file src="Stage\Release\netstandard2.0\SevenZipSharp.xml" target="lib\netstandard2.0" />
27-
<file src="Stage\Release\net6.0\SevenZipSharp.dll" target="lib\net6.0" />
28-
<file src="Stage\Release\net6.0\SevenZipSharp.xml" target="lib\net6.0" />
29-
<file src="Stage\Release\net472\SevenZipSharp.dll" target="lib\net472" />
30-
<file src="Stage\Release\net472\SevenZipSharp.xml" target="lib\net472" />
31-
<file src="license" />
32-
</files>
3+
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
4+
<id>Squid-Box.SevenZipSharp</id>
5+
<version>1.0.0</version>
6+
<authors>Joel Ahlgren</authors>
7+
<summary>Managed 7-zip library written in C# that provides data (self-)extraction and compression (all 7-zip formats are supported).</summary>
8+
<description>Wraps 7z.dll or any compatible one and makes use of LZMA SDK, includes self-extraction functionality.</description>
9+
<readme>docs\readme.md</readme>
10+
<language>en-US</language>
11+
<license type="expression">LGPL-3.0-only</license>
12+
<projectUrl>https://github.com/squid-box/SevenZipSharp</projectUrl>
13+
<tags>7z sevenzip sevenzipsharp 7-zip</tags>
14+
<releaseNotes>
15+
Fixed an issue when seeking in streams with SeekOrigin.End, thanks to GitHub user bneidhold.
16+
Fixed an issue when checking multi-volume 7z archives, thanks to GitHub user panda73111.
17+
</releaseNotes>
18+
<dependencies>
19+
<group targetFramework="netstandard2.0">
20+
<dependency id="System.Configuration.ConfigurationManager" version="4.5.0" />
21+
<dependency id="System.Security.Permissions" version="4.5.0" />
22+
</group>
23+
<group targetFramework="net472" />
24+
<group targetFramework="netcoreapp3.1">
25+
<dependency id="System.Configuration.ConfigurationManager" version="4.5.0" />
26+
</group>
27+
</dependencies>
28+
</metadata>
29+
<files>
30+
<file src="Stage\Release\netstandard2.0\SevenZipSharp.dll" target="lib\netstandard2.0" />
31+
<file src="Stage\Release\netstandard2.0\SevenZipSharp.xml" target="lib\netstandard2.0" />
32+
<file src="Stage\Release\netstandard2.0\SevenZipSharp.pdb" target="lib\netstandard2.0" />
33+
<file src="Stage\Release\net472\SevenZipSharp.dll" target="lib\net472" />
34+
<file src="Stage\Release\net472\SevenZipSharp.xml" target="lib\net472" />
35+
<file src="Stage\Release\net472\SevenZipSharp.pdb" target="lib\net472" />
36+
<file src="Stage\Release\netcoreapp3.1\SevenZipSharp.dll" target="lib\netcoreapp3.1" />
37+
<file src="Stage\Release\netcoreapp3.1\SevenZipSharp.xml" target="lib\netcoreapp3.1" />
38+
<file src="Stage\Release\netcoreapp3.1\SevenZipSharp.pdb" target="lib\netcoreapp3.1" />
39+
<file src="license" />
40+
<file src="readme.md" target="docs\" />
41+
</files>
3342
</package>

‎readme.md

+4-2
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,14 @@ This is a fork from [tomap's fork](https://github.com/tomap/SevenZipSharp) of th
99
## Changes from original project
1010
As required by the GNU GPL 3.0 license, here's a rough list of what has changed since the original CodePlex project, including changes made in tomap's fork.
1111

12-
* Target .NET framework changed from 2.0 to .NET 4.5, .NET Core 3.1 and .NET Standard 2.0 (ie. .NET Framework 4.5+, .Net Core 2.0+, Mono 5.4+, UWP 10.0.16299+, Unity 2018.1+).
13-
* Produces two multi-framework NuGet packages, one full-feature package and a `Lite` variant without SFX support (and significantly smaller size).
12+
* Target .NET version changed from .NET Framework 2.0 to .NET Standard 2.0, .NET Framework 4.7.2 and .NET Core 3.1.
13+
* Produces two NuGet packages, one full-feature package and a `Lite` variant without SFX support (and significantly smaller size).
1414
* Continous Integration added, both building and deploying.
1515
* Tests re-written to NUnit 3 test cases.
1616
* General code cleanup.
1717

18+
As well as a number of improvements and bug fixes.
19+
1820
-------------------------------------------------------------
1921

2022
Original project information below, some information might be outdated or won't apply to this fork:

0 commit comments

Comments
 (0)