Skip to content

Include Windows pdb in Nuget #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
grendello merged 5 commits into from
Feb 24, 2021
Merged

Include Windows pdb in Nuget #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0c5db69
Include Windows pdb in Nuget
dellis1972 Feb 24, 2021
a503984
Bump version
dellis1972 Feb 24, 2021
7dfa8ef
use a wildcard
dellis1972 Feb 24, 2021
435539b
use a wildcard
dellis1972 Feb 24, 2021
1b6437a
use RelWithDebInfo configuration for the build
dellis1972 Feb 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion LibZipSharp.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_LibZipSharpNugetVersion>1.0.22</_LibZipSharpNugetVersion>
<_LibZipSharpNugetVersion>1.0.23</_LibZipSharpNugetVersion>
</PropertyGroup>
</Project>
6 changes: 4 additions & 2 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ stages:
displayName: "Build"
- task: ArchiveFiles@2
inputs:
rootFolderOrFile: build\Windows\32\lib\Release\zip.dll
rootFolderOrFile: build\Windows\32\lib\RelWithDebInfo\
includeRootFolder: false
archiveType: 7z
replaceExistingArchive: true
archiveFile: $(Build.ArtifactStagingDirectory)\libzip-windows-x86.7z
- task: ArchiveFiles@2
inputs:
rootFolderOrFile: build\Windows\64\lib\Release\zip.dll
rootFolderOrFile: build\Windows\64\lib\RelWithDebInfo\
includeRootFolder: false
archiveType: 7z
replaceExistingArchive: true
Expand Down Expand Up @@ -144,6 +144,8 @@ stages:
mv build/Linux/64/libzip.so.5.3 build/Linux/64/libzip.so
mv build/Windows/32/zip.dll build/Windows/32/libzip.dll
mv build/Windows/64/zip.dll build/Windows/64/libzip.dll
mv build/Windows/32/zip.pdb build/Windows/32/libzip.pdb
mv build/Windows/64/zip.pdb build/Windows/64/libzip.pdb
rm $(Build.ArtifactStagingDirectory)/native/libzip-linux-*.7z
rm $(Build.ArtifactStagingDirectory)/native/libzip-windows-*.7z
displayName: 'Find libzip'
Expand Down
4 changes: 2 additions & 2 deletions build_windows.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ pushd .
mkdir .\build\Windows\64
cd .\build\Windows\64
cmake %LIBZIP_FEATURES% %COMMON_CMAKE_PARAMS% -DZLIB_ROOT=..\..\..\external\vcpkg\installed\x64-windows-static -A x64 ..\..\..\external\libzip
cmake --build . --config Release -v
cmake --build . --config RelWithDebInfo -v
popd
pushd .

mkdir .\build\Windows\32
cd .\build\Windows\32
cmake %LIBZIP_FEATURES% %COMMON_CMAKE_PARAMS% -DZLIB_ROOT=..\..\..\external\vcpkg\installed\x86-windows-static -A Win32 ..\..\..\external\libzip
cmake --build . --config Release -v
cmake --build . --config RelWithDebInfo -v
popd
2 changes: 2 additions & 0 deletions libZipSharp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@
</None>
<None Include="build\Darwin\64\lib\libzip.5.3.dylib" PackagePath="runtimes\osx\native\libzip.dylib" Pack="true" />
<None Include="build\Windows\64\libzip.dll" PackagePath="runtimes\win-x64\native\libzip.dll" Pack="true" />
<None Include="build\Windows\64\libzip.pdb" PackagePath="runtimes\win-x64\native\libzip.pdb" Pack="true" />
<None Include="build\Windows\32\libzip.dll" PackagePath="runtimes\win-x86\native\libzip.dll" Pack="true" />
<None Include="build\Windows\32\libzip.pdb" PackagePath="runtimes\win-x86\native\libzip.pdb" Pack="true" />
<None Include="build\Linux\64\libzip.so" PackagePath="runtimes\linux-x64\native\libzip.so" Pack="true" />
<None Include="build\Linux\32\libzip.so" PackagePath="runtimes\linux-x86\native\libzip.so" Pack="true" />
<None Include="LICENSE" PackagePath="Licences" Pack="true" />
Expand Down