From 0c5db69975710f32de8c7341f3b20a28dab140ef Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Wed, 24 Feb 2021 14:14:26 +0000 Subject: [PATCH 1/5] Include Windows pdb in Nuget --- azure-pipelines.yml | 8 ++++++-- libZipSharp.csproj | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 13b5e3c5..d9ce1974 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -32,14 +32,18 @@ stages: displayName: "Build" - task: ArchiveFiles@2 inputs: - rootFolderOrFile: build\Windows\32\lib\Release\zip.dll + rootFolderOrFile: + - build\Windows\32\lib\Release\zip.dll + - build\Windows\32\lib\Release\zip.pdb 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\Release\zip.dll + - build\Windows\64\lib\Release\zip.pdb includeRootFolder: false archiveType: 7z replaceExistingArchive: true diff --git a/libZipSharp.csproj b/libZipSharp.csproj index 1b358d6a..fa70420c 100644 --- a/libZipSharp.csproj +++ b/libZipSharp.csproj @@ -53,7 +53,9 @@ + + From a5039842e4cbaf332e8ad58ca18b89ddbb534934 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Wed, 24 Feb 2021 14:15:31 +0000 Subject: [PATCH 2/5] Bump version --- LibZipSharp.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LibZipSharp.props b/LibZipSharp.props index a6825f42..bd1d2c2c 100644 --- a/LibZipSharp.props +++ b/LibZipSharp.props @@ -1,5 +1,5 @@ - <_LibZipSharpNugetVersion>1.0.22 + <_LibZipSharpNugetVersion>1.0.23 From 7dfa8ef3063cb264805381cb8462e5c2e467ff13 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Wed, 24 Feb 2021 14:21:20 +0000 Subject: [PATCH 3/5] use a wildcard --- azure-pipelines.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d9ce1974..a3948ae6 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -32,18 +32,14 @@ stages: displayName: "Build" - task: ArchiveFiles@2 inputs: - rootFolderOrFile: - - build\Windows\32\lib\Release\zip.dll - - build\Windows\32\lib\Release\zip.pdb + rootFolderOrFile: build\Windows\32\lib\Release\zip.* 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 - - build\Windows\64\lib\Release\zip.pdb + rootFolderOrFile: build\Windows\64\lib\Release\zip.* includeRootFolder: false archiveType: 7z replaceExistingArchive: true From 435539b60cba448482ec2a5d4b3d5f2a198b36fc Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Wed, 24 Feb 2021 14:33:47 +0000 Subject: [PATCH 4/5] use a wildcard --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a3948ae6..1c6c6967 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -32,14 +32,14 @@ stages: displayName: "Build" - task: ArchiveFiles@2 inputs: - rootFolderOrFile: build\Windows\32\lib\Release\zip.* + rootFolderOrFile: build\Windows\32\lib\Release\ includeRootFolder: false archiveType: 7z replaceExistingArchive: true archiveFile: $(Build.ArtifactStagingDirectory)\libzip-windows-x86.7z - task: ArchiveFiles@2 inputs: - rootFolderOrFile: build\Windows\64\lib\Release\zip.* + rootFolderOrFile: build\Windows\64\lib\Release\ includeRootFolder: false archiveType: 7z replaceExistingArchive: true From 1b6437a7fb1854b65b885e6c16203edcb6eb4b6d Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Wed, 24 Feb 2021 16:05:43 +0000 Subject: [PATCH 5/5] use RelWithDebInfo configuration for the build --- azure-pipelines.yml | 6 ++++-- build_windows.bat | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1c6c6967..335ee851 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -32,14 +32,14 @@ stages: displayName: "Build" - task: ArchiveFiles@2 inputs: - rootFolderOrFile: build\Windows\32\lib\Release\ + 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\ + rootFolderOrFile: build\Windows\64\lib\RelWithDebInfo\ includeRootFolder: false archiveType: 7z replaceExistingArchive: true @@ -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' diff --git a/build_windows.bat b/build_windows.bat index db3851c5..7a5f1344 100644 --- a/build_windows.bat +++ b/build_windows.bat @@ -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