-
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
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| name: NuGet | ||
| on: | ||
| push: | ||
| tags: | ||
| - v* | ||
|
|
||
| jobs: | ||
| ci-nuget: | ||
| name: ${{ matrix.name }} | ||
| runs-on: ${{ matrix.os }} | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| include: [windows-latest, ubuntu-latest, macos-latest] | ||
| env: | ||
| DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true | ||
| DOTNET_CLI_TELEMETRY_OPTOUT: true | ||
| DOTNET_NOLOGO: true | ||
| NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }} | ||
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/checkout@main | ||
|
|
||
| - uses: actions/setup-dotnet@main | ||
| with: | ||
| dotnet-version: '6.0.x' | ||
|
|
||
| - name: Install packages (Ubuntu) | ||
| if: runner.OS == 'Linux' | ||
| run: | | ||
| sudo apt-get install gcc-multilib | ||
| sudo apt-get install gcc-arm-linux-gnueabihf -y | ||
| sudo apt-get install gcc-aarch64-linux-gnu -y | ||
|
|
||
| - name: Build (Windows) | ||
| if: runner.OS == 'Windows' | ||
| run: | | ||
| cd contrib/vstudio/v143/ | ||
| msbuild zlibvc.sln -p:Configuration=Release -p:Platform=Win32 | ||
| msbuild zlibvc.sln -p:Configuration=Release -p:Platform=x64 | ||
| msbuild zlibvc.sln -p:Configuration=Release -p:Platform=ARM | ||
| msbuild zlibvc.sln -p:Configuration=Release -p:Platform=ARM64 | ||
| cd ../../../ | ||
|
|
||
| - name: Build (Ubuntu) | ||
| if: runner.OS == 'Linux' | ||
| run: | | ||
| ./configure | ||
| mkdir contrib/nuget/linux-x86/ | ||
| mkdir contrib/nuget/linux-x64/ | ||
| mkdir contrib/nuget/linux-arm/ | ||
| mkdir contrib/nuget/linux-arm64/ | ||
| gcc -O3 -Wall -m32 -shared -Wl,--out-implib,contrib/nuget/linux-x86/libz.a -o contrib/nuget/linux-x86/libz.so adler32.c compress.c crc32.c deflate.c gzclose.c gzlib.c gzread.c gzwrite.c infback.c inffast.c inflate.c inftrees.c trees.c uncompr.c zutil.c -fPIC | ||
| gcc -O3 -Wall -m64 -shared -Wl,--out-implib,contrib/nuget/linux-x64/libz.a -o contrib/nuget/linux-x64/libz.so adler32.c compress.c crc32.c deflate.c gzclose.c gzlib.c gzread.c gzwrite.c infback.c inffast.c inflate.c inftrees.c trees.c uncompr.c zutil.c -fPIC | ||
| arm-linux-gnueabihf-gcc -O3 -Wall -shared -Wl,--out-implib,contrib/nuget/linux-arm/libz.a -o contrib/nuget/linux-arm/libz.so adler32.c compress.c crc32.c deflate.c gzclose.c gzlib.c gzread.c gzwrite.c infback.c inffast.c inflate.c inftrees.c trees.c uncompr.c zutil.c -fPIC | ||
| aarch64-linux-gnu-gcc -O3 -Wall -shared -Wl,--out-implib,contrib/nuget/linux-arm64/libz.a -o contrib/nuget/linux-arm64/libz.so adler32.c compress.c crc32.c deflate.c gzclose.c gzlib.c gzread.c gzwrite.c infback.c inffast.c inflate.c inftrees.c trees.c uncompr.c zutil.c -fPIC | ||
|
|
||
| - name: Build (MacOS) | ||
| if: runner.OS == 'MacOS' | ||
| run: | | ||
| ./configure | ||
| mkdir contrib/nuget/osx-x64/ | ||
| mkdir contrib/nuget/osx-arm64/ | ||
| gcc -O3 -Wall -m64 -dynamiclib -o contrib/nuget/osx-x64/libz.dylib adler32.c compress.c crc32.c deflate.c gzclose.c gzlib.c gzread.c gzwrite.c infback.c inffast.c inflate.c inftrees.c trees.c uncompr.c zutil.c -fPIC | ||
| gcc -O3 -Wall -arch arm64 -dynamiclib -o contrib/nuget/osx-arm64/libz.dylib adler32.c compress.c crc32.c deflate.c gzclose.c gzlib.c gzread.c gzwrite.c infback.c inffast.c inflate.c inftrees.c trees.c uncompr.c zutil.c -fPIC | ||
|
|
||
| - name: Build & Push NuGet Packages | ||
| uses: Elskom/build-dotnet@main | ||
| with: | ||
| SOLUTION_FILE_PATH: 'contrib/nuget/nuget.sln' | ||
| RESTORE: false | ||
| PUSH: true | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| <Project Sdk="Microsoft.Build.NoTargets/3.5.6"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>net6.0</TargetFramework> | ||
| <PackageId>madler.zlib.redist</PackageId> | ||
| <PackageId Condition="$([MSBuild]::IsOSPlatform('Windows'))">$(PackageId).win</PackageId> | ||
| <PackageId Condition="$([MSBuild]::IsOSPlatform('Linux'))">$(PackageId).linux</PackageId> | ||
| <PackageId Condition="$([MSBuild]::IsOSPlatform('OSX'))">$(PackageId).osx</PackageId> | ||
| <Copyright>(C) 1995-2022 Jean-loup Gailly and Mark Adler</Copyright> | ||
| <version>1.2.13</version> | ||
| <PackageDescription>NuGet Package for consuming native builds of zlib into .NET without complexity.</PackageDescription> | ||
| <!-- | ||
| 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. | ||
| --> | ||
| <NoWarn>NU5128</NoWarn> | ||
| <PackageOutputPath>$(MSBuildProjectDirectory)</PackageOutputPath> | ||
| <Authors>Jean-loup Gailly and Mark Adler</Authors> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <None Include="../../LICENSE" Pack="true" PackagePath="" /> | ||
| <!-- Package up Windows builds. --> | ||
| <None Condition="$([MSBuild]::IsOSPlatform('Windows'))" Include="../vstudio/vc143/x86/ZlibDll$(Configuration)/zlibwapi.dll" Pack="true" PackagePath="runtimes/win-x86/native" /> | ||
| <None Condition="$([MSBuild]::IsOSPlatform('Windows'))" Include="../vstudio/vc143/x64/ZlibDll$(Configuration)/zlibwapi.dll" Pack="true" PackagePath="runtimes/win-x64/native" /> | ||
| <None Condition="$([MSBuild]::IsOSPlatform('Windows'))" Include="../vstudio/vc143/arm/ZlibDll$(Configuration)/zlibwapi.dll" Pack="true" PackagePath="runtimes/win-arm/native" /> | ||
| <None Condition="$([MSBuild]::IsOSPlatform('Windows'))" Include="../vstudio/vc143/arm64/ZlibDll$(Configuration)/zlibwapi.dll" Pack="true" PackagePath="runtimes/win-arm64/native" /> | ||
| <!-- Include debug symbols as well as we never know if they might actually be needed in the future. --> | ||
| <None Condition="$([MSBuild]::IsOSPlatform('Windows'))" Include="../vstudio/vc143/x86/ZlibDll$(Configuration)/zlibwapi.pdb" Pack="true" PackagePath="runtimes/win-x86/native" /> | ||
| <None Condition="$([MSBuild]::IsOSPlatform('Windows'))" Include="../vstudio/vc143/x64/ZlibDll$(Configuration)/zlibwapi.pdb" Pack="true" PackagePath="runtimes/win-x64/native" /> | ||
| <None Condition="$([MSBuild]::IsOSPlatform('Windows'))" Include="../vstudio/vc143/arm/ZlibDll$(Configuration)/zlibwapi.pdb" Pack="true" PackagePath="runtimes/win-arm/native" /> | ||
| <None Condition="$([MSBuild]::IsOSPlatform('Windows'))" Include="../vstudio/vc143/arm64/ZlibDll$(Configuration)/zlibwapi.pdb" Pack="true" PackagePath="runtimes/win-arm64/native" /> | ||
| <!-- Package up Linux builds. --> | ||
| <None Condition="$([MSBuild]::IsOSPlatform('Linux'))" Include="./linux-x86/libz.so" Pack="true" PackagePath="runtimes/linux-x86/native" /> | ||
| <None Condition="$([MSBuild]::IsOSPlatform('Linux'))" Include="./linux-x64/libz.so" Pack="true" PackagePath="runtimes/linux-x64/native" /> | ||
| <None Condition="$([MSBuild]::IsOSPlatform('Linux'))" Include="./linux-arm/libz.so" Pack="true" PackagePath="runtimes/linux-arm/native" /> | ||
| <None Condition="$([MSBuild]::IsOSPlatform('Linux'))" Include="./linux-arm64/libz.so" Pack="true" PackagePath="runtimes/linux-arm64/native" /> | ||
| <!-- Package up MacOS builds. --> | ||
| <None Condition="$([MSBuild]::IsOSPlatform('OSX'))" Include="./osx-x64/libz.dylib" Pack="true" PackagePath="runtimes/osx-x64/native" /> | ||
| <None Condition="$([MSBuild]::IsOSPlatform('OSX'))" Include="./osx-arm64/libz.dylib" Pack="true" PackagePath="runtimes/osx-arm64/native" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| | ||
| Microsoft Visual Studio Solution File, Format Version 12.00 | ||
| # Visual Studio Version 17 | ||
| VisualStudioVersion = 17.0.31903.59 | ||
| MinimumVisualStudioVersion = 10.0.40219.1 | ||
| Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nuget", "nuget.csproj", "{B1BD3984-EF8F-4E9D-9A94-EB784E5EB1E8}" | ||
| EndProject | ||
| Global | ||
| GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
| Debug|Any CPU = Debug|Any CPU | ||
| Release|Any CPU = Release|Any CPU | ||
| EndGlobalSection | ||
| GlobalSection(SolutionProperties) = preSolution | ||
| HideSolutionNode = FALSE | ||
| EndGlobalSection | ||
| GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
| {B1BD3984-EF8F-4E9D-9A94-EB784E5EB1E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| {B1BD3984-EF8F-4E9D-9A94-EB784E5EB1E8}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| {B1BD3984-EF8F-4E9D-9A94-EB784E5EB1E8}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| {B1BD3984-EF8F-4E9D-9A94-EB784E5EB1E8}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| EndGlobalSection | ||
| EndGlobal |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -40,6 +40,12 @@ Build instructions for Visual Studio 2015 (32 bits or 64 bits) | |
| - Decompress current zlib, including all contrib/* files | ||
| - Open contrib\vstudio\vc14\zlibvc.sln with Microsoft Visual C++ 2015 | ||
|
|
||
| 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 | ||
|
|
||
|
|
||
|
|
||
| Important | ||
| --------- | ||
|
|
@@ -71,5 +77,5 @@ Additional notes | |
| Gilles Vollant | ||
| [email protected] | ||
|
|
||
| Visual Studio 2013 and 2015 Projects from Sean Hunt | ||
| Visual Studio 2013, 2015, and 2022 Projects from Sean Hunt | ||
| [email protected] | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.