From 6a51c34680dd5ec7d59a0ea4e573fc4db2c78056 Mon Sep 17 00:00:00 2001 From: AraHaan Date: Wed, 29 May 2024 09:47:06 -0400 Subject: [PATCH 1/4] Forgot to add the repository readme to nuget package. The readme in the package would be very helpful to users. --- contrib/nuget/nuget.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/nuget/nuget.csproj b/contrib/nuget/nuget.csproj index 852e45039..4027ac12b 100644 --- a/contrib/nuget/nuget.csproj +++ b/contrib/nuget/nuget.csproj @@ -20,6 +20,7 @@ + From f1c06a4599c417695f4d91296735d5f65bb0bfff Mon Sep 17 00:00:00 2001 From: AraHaan Date: Wed, 29 May 2024 10:02:47 -0400 Subject: [PATCH 2/4] Update git ignores for VS2022. --- .gitignore | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index bd44d84af..a854dfcbc 100644 --- a/.gitignore +++ b/.gitignore @@ -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 From 100b08a42780c5a769d6930e91c9ac490a77cd4a Mon Sep 17 00:00:00 2001 From: AraHaan Date: Wed, 29 May 2024 10:08:23 -0400 Subject: [PATCH 3/4] Update readme.txt --- contrib/vstudio/readme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/vstudio/readme.txt b/contrib/vstudio/readme.txt index e866d9582..d944fd540 100644 --- a/contrib/vstudio/readme.txt +++ b/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 From 07c7263f30995353620c370a61278a1aec40456c Mon Sep 17 00:00:00 2001 From: AraHaan Date: Wed, 29 May 2024 20:04:02 -0400 Subject: [PATCH 4/4] Update nuget.csproj --- contrib/nuget/nuget.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/nuget/nuget.csproj b/contrib/nuget/nuget.csproj index 4027ac12b..1e249b198 100644 --- a/contrib/nuget/nuget.csproj +++ b/contrib/nuget/nuget.csproj @@ -9,6 +9,7 @@ (C) 1995-2024 Jean-loup Gailly and Mark Adler 1.3.1.1 NuGet Package for consuming native builds of zlib into .NET without complexity. + README