Skip to content

Commit 52f7faf

Browse files
authored
Merge pull request #132 from McNeight/master
Pull from McNeight/SharpZipLib
2 parents 803232d + f4e28fc commit 52f7faf

177 files changed

Lines changed: 82175 additions & 87343 deletions

File tree

Some content is hidden

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

Build/ICSharpCode.SharpZipLib.nuspec

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package>
33
<metadata minClientVersion="2.0">
44
<id>ICSharpCode.SharpZipLib-dogfood</id>
5-
<version>0.87-dogfood</version>
5+
<version>1.0</version>
66
<title>SharpZipLib-dogfood</title>
77
<authors>IC#Code</authors>
88
<owners>IC#Code</owners>
@@ -13,24 +13,22 @@
1313
<projectUrl>http://icsharpcode.github.io/SharpZipLib/</projectUrl>
1414
<!-- iconUrl -->
1515
<licenseUrl>http://icsharpcode.github.io/SharpZipLib/#license</licenseUrl>
16-
<copyright>Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team</copyright>
16+
<copyright>Copyright © 2000-2016 SharpZipLib Contributors</copyright>
1717
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1818
<!-- dependencies -->
1919
<!-- references -->
20-
<frameworkAssemblies>
21-
<frameworkAssembly assemblyName="System" />
22-
</frameworkAssemblies>
23-
<tags>Compression Library Zip GZip BZip2 Tar</tags>
20+
<!-- frameworkAssemblies -->
21+
<tags>Compression Library Zip GZip BZip2 LZW Tar</tags>
2422
</metadata>
2523
<files>
26-
<file src="..\bin\Release\ICSharpCode.SharpZipLib.dll" target="lib\Net45\" />
27-
<file src="..\bin\Release\ICSharpCode.SharpZipLib.pdb" target="lib\Net45\" />
28-
<file src="..\bin\Release\ICSharpCode.SharpZipLib.xml" target="lib\Net45\" />
29-
<file src="..\bin\Release\ICSharpCode.SharpZipLib.dll" target="lib\dnx451\" />
30-
<file src="..\bin\Release\ICSharpCode.SharpZipLib.pdb" target="lib\dnx451\" />
31-
<file src="..\bin\Release\ICSharpCode.SharpZipLib.xml" target="lib\dnx451\" />
32-
<file src="..\bin\Release\ICSharpCode.SharpZipLib.dll" target="lib\dnxcore50\" />
33-
<file src="..\bin\Release\ICSharpCode.SharpZipLib.pdb" target="lib\dnxcore50\" />
34-
<file src="..\bin\Release\ICSharpCode.SharpZipLib.xml" target="lib\dnxcore50\" />
24+
<file src="ICSharpCode.SharpZipLib.dll" target="lib\Net45\" />
25+
<file src="ICSharpCode.SharpZipLib.pdb" target="lib\Net45\" />
26+
<file src="ICSharpCode.SharpZipLib.xml" target="lib\Net45\" />
27+
<file src="ICSharpCode.SharpZipLib.dll" target="lib\dnx451\" />
28+
<file src="ICSharpCode.SharpZipLib.pdb" target="lib\dnx451\" />
29+
<file src="ICSharpCode.SharpZipLib.xml" target="lib\dnx451\" />
30+
<file src="ICSharpCode.SharpZipLib.dll" target="lib\dnxcore50\" />
31+
<file src="ICSharpCode.SharpZipLib.pdb" target="lib\dnxcore50\" />
32+
<file src="ICSharpCode.SharpZipLib.xml" target="lib\dnxcore50\" />
3533
</files>
3634
</package>

Build/run-appveyor-build.ps1

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Define build command.
2+
$buildCmd = "C:\Program Files (x86)\MSBuild\14.0\bin\msbuild.exe";
3+
$buildArgs = @(
4+
"ICSharpCode.SharpZipLib.sln"
5+
"/l:C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll",
6+
"/m",
7+
"/p:UseSharedCompilation=false",
8+
"/p:Configuration=Release",
9+
"/p:Platform=Any CPU");
10+
11+
# If build is not a scheduled one, then simply build the project with MSBuild.
12+
if ($env:APPVEYOR_SCHEDULED_BUILD -ne "True") {
13+
& $buildCmd $buildArgs
14+
# & nuget pack <project_file> -OutputDirectory <temp_path>
15+
return # exit script
16+
}
17+
18+
# Else, build project with Coverity Scan.
19+
$publishCoverityExe = $env:APPVEYOR_BUILD_FOLDER + "\packages\PublishCoverity.0.11.0\tools\PublishCoverity.exe";
20+
"Building project with Coverity Scan..."
21+
& cov-build --dir Documentation\cov-int $buildCmd $buildArgs;
22+
23+
# Compress scan data.
24+
& $publishCoverityExe compress -o Documentation\coverity.zip -i Documentation\cov-int;
25+
26+
# Upload scan data.
27+
& $publishCoverityExe publish -z Documentation\coverity.zip -r McNeight/SharpZipLib -t $env:Coverity_Token -e $env:Coverity_Email -d "AppVeyor scheduled build";

Build/run-nunit3-tests-debug.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +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
1+
packages\NUnit.ConsoleRunner.3.2.1\tools\nunit3-console.exe --framework=net-4.5 --domain=Single --testlist=ICSharpCode.SharpZipLib.Tests\PassingTests.txt --result=Documentation\nunit3-test-results-debug.xml bin\Debug\ICSharpCode.SharpZipLib.Tests.dll

Build/run-nunit3-tests-release.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +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
1+
packages\NUnit.ConsoleRunner.3.2.1\tools\nunit3-console.exe --framework=net-4.5 --domain=Single --testlist=ICSharpCode.SharpZipLib.Tests\PassingTests.txt --result=Documentation\nunit3-test-results-release.xml bin\Release\ICSharpCode.SharpZipLib.Tests.dll

Build/run-opencover.cmd

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
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
1+
packages\OpenCover.4.6.519\tools\OpenCover.Console.exe -register:user -filter:+[ICSharpCode.SharpZipLib]* -target:Build\run-nunit3-tests-release.cmd -output:Documentation\opencover-results-release.xml

Build/run-reportgenerator.cmd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
packages\ReportGenerator.2.4.5.0\tools\ReportGenerator.exe -reports:Documentation\opencover-results-release.xml -targetdir:Documentation\opencover

0 commit comments

Comments
 (0)