Merge 07c7263f30 into 8a844d434f

.gitignore

@@ -30,10 +30,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

contrib/nuget/nuget.csproj

@@ -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.
@@ -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" />

contrib/vstudio/readme.txt

@@ -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