Skip to content
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.

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

Forgot to add the repository readme to nuget package. #975

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
.vs
*.user
*.nupkg
contrib/vstudio/vc143/x86
contrib/vstudio/vc143/x64
contrib/vstudio/vc143/arm
contrib/vstudio/vc143/arm64
contrib/vstudio/vc17/x86
contrib/vstudio/vc17/x64
contrib/vstudio/vc17/arm
contrib/vstudio/vc17/arm64
contrib/nuget/bin
contrib/nuget/obj
*.included
2 changes: 2 additions & 0 deletions contrib/nuget/nuget.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<Copyright>(C) 1995-2024 Jean-loup Gailly and Mark Adler</Copyright>
<version>1.3.1.1</version>
<PackageDescription>NuGet Package for consuming native builds of zlib into .NET without complexity.</PackageDescription>
<PackageReadmeFile>README</PackageReadmeFile>
<!--
Warns about not having any lib or ref assemblies (.NET Assemblies) in those directories.
Native only packages that is to be consumed in .NET should not require these.
Expand All @@ -20,6 +21,7 @@

<ItemGroup>
<None Include="../../LICENSE" Pack="true" PackagePath="" />
<None Include="../../README" Pack="true" PackagePath="" />
<!-- Package up Windows builds. -->
<None Condition="$([MSBuild]::IsOSPlatform('Windows'))" Include="../vstudio/vc17/x86/ZlibDll$(Configuration)/zlibwapi.dll" Pack="true" PackagePath="runtimes/win-x86/native" />
<None Condition="$([MSBuild]::IsOSPlatform('Windows'))" Include="../vstudio/vc17/x64/ZlibDll$(Configuration)/zlibwapi.dll" Pack="true" PackagePath="runtimes/win-x64/native" />
Expand Down
2 changes: 1 addition & 1 deletion contrib/vstudio/readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Build instructions for Visual Studio 2015 (32 bits or 64 bits)
Build instructions for Visual Studio 2022 (64 bits)
--------------------------------------------------------------
- Decompress current zlib, including all contrib/* files
- Open contrib\vstudio\vc143\zlibvc.sln with Microsoft Visual C++ 2022
- Open contrib\vstudio\vc17\zlibvc.sln with Microsoft Visual C++ 2022



Expand Down