-
Notifications
You must be signed in to change notification settings - Fork 2.5k
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
Added VS2022 project files. #732
Conversation
57f969d
to
28b0976
Compare
Also replaced Itanium with ARM and ARM64 configurations. Itanium can be added back by those who do have it's build tools fully installed for it (or copied back from the vc14 directory manually).
28b0976
to
5b1b821
Compare
~~Also this might be a little delayed, note: the nuget packaging step would be as simple as: |
9d9fb58
to
8a19d80
Compare
It works on building nuget a nuget package for Windows at the moment. |
It seems that I cant get |
I can test it on my mac when and if I get a chance to recharge it. |
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true | ||
DOTNET_CLI_TELEMETRY_OPTOUT: true | ||
DOTNET_NOLOGO: true | ||
NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This will require that @madler or the other contributor (owner) to create a nuget.org account (if one does not already exist) and an api key and add it to their github secrets that github actions can then read.
Alright I think this should be ready to merge. |
To follow :) |
479a5c2
to
e9b27ae
Compare
So far, I see the changes in this pull request still works when I use them in my experimental zlib implementation that calls into the native library without issues. Infact, I think I have improved code that would normally use .NET System.IO.Compression in a way that allows the developer more control over what they want zlib to do (e.g. create deflate/zlib/gzip streams and any of the compression levels they want to use (because with my code they have access to them all unlike .NET's implementation)). |
@madler mind reviewing this? |
I tried applying this before the 1.3 release earlier today, but it ran into a conflict. (Despite the "no conflicts" note below.) I think there was an issue with carriage returns. |
I checked, and it's only on the changes to contrib/vstudio/readme.txt. That file does consistently have carriage returns, so it seems like it should work, but it does not. Perhaps for now separate out the changes to that file to a different pull request, and I can retry what remains. |
Perhaps I should purge the carriage returns from all of the contrib/vstudio files. Does Visual Studio need them? |
Visual Studio has a habit of mixing newlines yes, perhaps the best option would be to mark those files specifically as CRLF. |
My question is: if I remove all of the carriage returns from any Visual Studio files that have them, will they still work ok? |
I think so, it's just that when edited when they become CRLF again. |
Ok. I removed the carriage returns from readme.txt, as well as from the patch, and I was able to apply it. |
@madler You might want to carefully look at the version numbers in the vc17 folder and also change the vc143 references in the nuget.csproj to vc17 as well so nuget packaging would work. hint: it says v1.2.13 on those files. |
Corrected. Thanks. |
@AraHaan: Good job for VS2022 support and @madler merging! cc: @neacsum, @amyspark, @Mr-Clam, @mtl1979, @adamhathcock, @kaoh, @Spatzendame. Now missing supports are VS2017 (VC15) and VS2019 (VC16). Time to look for VS2017: @kiyolee, @yumetodo, @Sav0966, @tbeu, @jeking3, @lukasf, @praiskup, @bad-blue-bull, @vveider, @selgas, @sgarske, @vaerksted, @spaette, @AfterWaLifu, @AhmedX6, @irwir:
Time to look for VS2019: @kouzhudong, @PieboyMcGillicuddy, @adammarks, @0ric1, @Tricky1975, @yyc12345, @jaykrell, @JuYanYan, @1939938853, @mrserb, @zchrissirhcz, @topwizprogramming: |
@Neustradamus |
There will need to be some changes to the vc14 files I think to match the arch changes from here as some cleanup. |
Also the contrib/nuget files is another place where version of zlib is stored and would need updates too, along with there is a missing .github/workflows/nuget.yml file (probably because of missing nuget api key?) |
Fixed version and date. I elected to not include the new workflow. |
Regarding the line endings: can you configure git to handle this for you? If you add the specific files to a .gitattibutes file in the root folder with their text type and EOL handling, git on Windows will convert the endings to CRLF on checkout and back to LF when committing. There's even an example for *.vcproj files in the documentation: https://www.git-scm.com/docs/gitattributes |
Also replaced Itanium with ARM and ARM64 configurations. Itanium can be added back by those who do have it's build tools fully installed for it (or copied back from the vc14 directory manually).
cc: @madler